@marimo-team/islands 0.24.3-dev9 → 0.25.0

package/dist/{ConnectedDataExplorerComponent-C9OF_75w.js → ConnectedDataExplorerComponent-KVhjDMSe.js}

@@ -1,24 +1,24 @@
 import { a as e, i as t, n, r, t as i } from "./rolldown-runtime-Cb76FRpK.js";
-import { g as a, h as o, t as s } from "./button-CKBkqR9J.js";
-import { t as c } from "./react-DMWcHin-.js";
-import { t as l } from "./compiler-runtime-CAH9RLw2.js";
-import { u } from "./dist-3_o3T78I.js";
-import { D as d, t as f } from "./spec-CutWdqo3.js";
-import { a as p, c as m, i as h, o as g, r as _, s as v, t as y } from "./useLifecycle-B4RGlyf0.js";
-import { a as b, t as x } from "./useDateFormatter-Cp9Jdxls.js";
-import { a as S, b as C, c as w, i as T, n as ee, o as E, r as te, s as ne, t as re, w as D } from "./select-3qHpFKF9.js";
-import { t as O } from "./jsx-runtime-CpoKNRgu.js";
-import { n as ie } from "./error-banner-CsXbEEjo.js";
-import { t as ae } from "./label-lwzzBHUW.js";
-import { t as oe } from "./tooltip-Dt77sBeT.js";
-import { C as se, D as ce, E as le, n as ue, x as de } from "./useTheme-CVJ0UOf2.js";
-import { t as fe } from "./invariant-DLmrl-hA.js";
-import { t as pe } from "./objects-CzUgoMIF.js";
-import { t as me } from "./useAsyncData-CH6-CgJF.js";
-import { A as he } from "./vega-loader.browser-DEggZzni.js";
-import { n as ge, r as _e } from "./react-vega-DSD5aT7_.js";
-import { a as ve, n as ye } from "./loader-VZ__bv4g.js";
-var be = u("chart-column-big", [
+import { g as a, h as o, t as s } from "./button-DdXAm8iz.js";
+import { t as c } from "./react-ofJbxM4x.js";
+import { t as l } from "./compiler-runtime-Cj8ZWiNS.js";
+import { g as u, t as d } from "./tooltip-qB8NlSqV.js";
+import { D as f, t as p } from "./spec-CAYwFeV6.js";
+import { a as m, c as h, i as g, o as _, r as v, s as y, t as b } from "./useLifecycle-DPgiiwwU.js";
+import { a as x, t as S } from "./useDateFormatter-BRTPsUK7.js";
+import { a as C, b as w, c as T, i as E, n as D, o as O, r as ee, s as te, t as ne } from "./select-C6plhmZr.js";
+import { t as k } from "./jsx-runtime-DgDPJV9S.js";
+import { n as re } from "./error-banner-B94dcDmP.js";
+import { t as ie } from "./label-BJ49YTvk.js";
+import { t as ae } from "./useNumberFormatter-BfDpa21j.js";
+import { C as oe, D as se, E as ce, n as le, x as ue } from "./useTheme-DzXmYZ5V.js";
+import { t as de } from "./invariant-DLmrl-hA.js";
+import { t as fe } from "./objects-CzUgoMIF.js";
+import { t as pe } from "./useAsyncData-BD6AStMt.js";
+import { M as me } from "./vega-loader.browser-D95WfUcj.js";
+import { n as he, r as ge } from "./react-vega-5AcMW8gG.js";
+import { a as _e, n as ve } from "./loader-D2W4oM-3.js";
+var ye = u("chart-column-big", [
 	["path", {
 		d: "M3 3v16a2 2 0 0 0 2 2h16",
 		key: "c24i48"
@@ -39,7 +39,7 @@ var be = u("chart-column-big", [
 		rx: "1",
 		key: "sr5ea"
 	}]
-]), xe = u("list-ordered", [
+]), be = u("list-ordered", [
 	["path", {
 		d: "M11 5h10",
 		key: "1cz7ny"
@@ -64,8 +64,8 @@ var be = u("chart-column-big", [
 		d: "M6.5 20H3.4c0-1 2.6-1.925 2.6-3.5a1.5 1.5 0 0 0-2.6-1.02",
 		key: "xtkcd5"
 	}]
-]), Se = l();
-function Ce(e, t) {
+]), xe = l();
+function Se(e, t) {
 	var n = {};
 	for (var r in e) Object.prototype.hasOwnProperty.call(e, r) && t.indexOf(r) < 0 && (n[r] = e[r]);
 	if (e != null && typeof Object.getOwnPropertySymbols == "function") for (var i = 0, r = Object.getOwnPropertySymbols(e); i < r.length; i++) t.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(e, r[i]) && (n[r[i]] = e[r[i]]);
@@ -73,7 +73,7 @@ function Ce(e, t) {
 }
 //#endregion
 //#region ../node_modules/.pnpm/clone@2.1.2/node_modules/clone/clone.js
-var we = /* @__PURE__ */ i(((e, t) => {
+var Ce = /* @__PURE__ */ i(((e, t) => {
 	var n = (function() {
 		function e(e, t) {
 			return t != null && e instanceof t;
@@ -174,7 +174,7 @@ var we = /* @__PURE__ */ i(((e, t) => {
 		return i.__getRegExpFlags = l, i;
 	})();
 	typeof t == "object" && t.exports && (t.exports = n);
-})), Te = /* @__PURE__ */ i(((e, t) => {
+})), we = /* @__PURE__ */ i(((e, t) => {
 	var n = Array.isArray, r = Object.keys, i = Object.prototype.hasOwnProperty;
 	t.exports = function e(t, a) {
 		if (t === a) return !0;
@@ -200,7 +200,7 @@ var we = /* @__PURE__ */ i(((e, t) => {
 		}
 		return t !== t && a !== a;
 	};
-})), Ee = /* @__PURE__ */ i(((e, t) => {
+})), Te = /* @__PURE__ */ i(((e, t) => {
 	t.exports = function(e, t) {
 		t ||= {}, typeof t == "function" && (t = { cmp: t });
 		var n = typeof t.cycles == "boolean" && t.cycles, r = t.cmp && (function(e) {
@@ -240,19 +240,19 @@ var we = /* @__PURE__ */ i(((e, t) => {
 		})(e);
 	};
 }));
-we(), Te();
-var De = /* @__PURE__ */ e(Ee());
-function Oe(e, t, n) {
+Ce(), we();
+var Ee = /* @__PURE__ */ e(Te());
+function De(e, t, n) {
 	return e.fields = t || [], e.fname = n, e;
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-util@1.10.0/node_modules/vega-util/src/error.js
-function ke(e) {
+function Oe(e) {
 	throw Error(e);
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-util@1.10.0/node_modules/vega-util/src/splitAccessPath.js
-function Ae(e) {
+function ke(e) {
 	var t = [], n = null, r = 0, i = e.length, a = "", o, s, c;
 	e += "";
 	function l() {
@@ -261,131 +261,131 @@ function Ae(e) {
 	for (o = s = 0; s < i; ++s) if (c = e[s], c === "\\") a += e.substring(o, s), o = ++s;
 	else if (c === n) l(), n = null, r = -1;
 	else if (n) continue;
-	else o === r && c === "\"" || o === r && c === "'" ? (o = s + 1, n = c) : c === "." && !r ? s > o ? l() : o = s + 1 : c === "[" ? (s > o && l(), r = o = s + 1) : c === "]" && (r || ke("Access path missing open bracket: " + e), r > 0 && l(), r = 0, o = s + 1);
-	return r && ke("Access path missing closing bracket: " + e), n && ke("Access path missing closing quote: " + e), s > o && (s++, l()), t;
+	else o === r && c === "\"" || o === r && c === "'" ? (o = s + 1, n = c) : c === "." && !r ? s > o ? l() : o = s + 1 : c === "[" ? (s > o && l(), r = o = s + 1) : c === "]" && (r || Oe("Access path missing open bracket: " + e), r > 0 && l(), r = 0, o = s + 1);
+	return r && Oe("Access path missing closing bracket: " + e), n && Oe("Access path missing closing quote: " + e), s > o && (s++, l()), t;
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-util@1.10.0/node_modules/vega-util/src/isArray.js
-var je = Array.isArray;
+var Ae = Array.isArray;
 //#endregion
 //#region ../node_modules/.pnpm/vega-util@1.10.0/node_modules/vega-util/src/isObject.js
-function Me(e) {
+function je(e) {
 	return e === Object(e);
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-util@1.10.0/node_modules/vega-util/src/isString.js
-function Ne(e) {
+function Me(e) {
 	return typeof e == "string";
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-util@1.10.0/node_modules/vega-util/src/stringValue.js
-function Pe(e) {
-	return je(e) ? "[" + e.map(Pe) + "]" : Me(e) || Ne(e) ? JSON.stringify(e).replace("\u2028", "\\u2028").replace("\u2029", "\\u2029") : e;
+function Ne(e) {
+	return Ae(e) ? "[" + e.map(Ne) + "]" : je(e) || Me(e) ? JSON.stringify(e).replace("\u2028", "\\u2028").replace("\u2029", "\\u2029") : e;
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-util@1.10.0/node_modules/vega-util/src/field.js
-function Fe(e, t) {
-	var n = Ae(e), r = "return _[" + n.map(Pe).join("][") + "];";
-	return Oe(Function("_", r), [e = n.length === 1 ? n[0] : e], t || e);
+function Pe(e, t) {
+	var n = ke(e), r = "return _[" + n.map(Ne).join("][") + "];";
+	return De(Function("_", r), [e = n.length === 1 ? n[0] : e], t || e);
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-util@1.10.0/node_modules/vega-util/src/accessors.js
-var Ie = [];
-Fe("id"), Oe(function(e) {
+var Fe = [];
+Pe("id"), De(function(e) {
 	return e;
-}, Ie, "identity"), Oe(function() {
+}, Fe, "identity"), De(function() {
 	return 0;
-}, Ie, "zero"), Oe(function() {
+}, Fe, "zero"), De(function() {
 	return 1;
-}, Ie, "one"), Oe(function() {
+}, Fe, "one"), De(function() {
 	return !0;
-}, Ie, "true"), Oe(function() {
+}, Fe, "true"), De(function() {
 	return !1;
-}, Ie, "false");
+}, Fe, "false");
 //#endregion
 //#region ../node_modules/.pnpm/vega-util@1.10.0/node_modules/vega-util/src/logger.js
-function Le(e, t, n) {
+function Ie(e, t, n) {
 	var r = [t].concat([].slice.call(n));
 	console[e](...r);
 }
-function Re(e, t) {
+function Le(e, t) {
 	var n = e || 0;
 	return {
 		level: function(e) {
 			return arguments.length ? (n = +e, this) : n;
 		},
 		error: function() {
-			return n >= 1 && Le(t || "error", "ERROR", arguments), this;
+			return n >= 1 && Ie(t || "error", "ERROR", arguments), this;
 		},
 		warn: function() {
-			return n >= 2 && Le(t || "warn", "WARN", arguments), this;
+			return n >= 2 && Ie(t || "warn", "WARN", arguments), this;
 		},
 		info: function() {
-			return n >= 3 && Le(t || "log", "INFO", arguments), this;
+			return n >= 3 && Ie(t || "log", "INFO", arguments), this;
 		},
 		debug: function() {
-			return n >= 4 && Le(t || "log", "DEBUG", arguments), this;
+			return n >= 4 && Ie(t || "log", "DEBUG", arguments), this;
 		}
 	};
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-util@1.10.0/node_modules/vega-util/src/isBoolean.js
-function ze(e) {
+function Re(e) {
 	return typeof e == "boolean";
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-util@1.10.0/node_modules/vega-util/src/toSet.js
-function Be(e) {
+function ze(e) {
 	for (var t = {}, n = 0, r = e.length; n < r; ++n) t[e[n]] = !0;
 	return t;
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/util.js
 Set.prototype.toJSON = function() {
-	return `Set(${[...this].map((e) => (0, De.default)(e)).join(",")})`;
+	return `Set(${[...this].map((e) => (0, Ee.default)(e)).join(",")})`;
 };
-var k = De.default;
-function A(e, t) {
+var A = Ee.default;
+function j(e, t) {
 	return e.indexOf(t) > -1;
 }
-function Ve(e, t) {
+function Be(e, t) {
 	let n = 0;
 	for (let [r, i] of e.entries()) if (t(i, r, n++)) return !0;
 	return !1;
 }
-var j = Object.keys;
-function He(e) {
+var M = Object.keys;
+function Ve(e) {
 	let t = e.replace(/\W/g, "_");
 	return (e.match(/^\d+/) ? "_" : "") + t;
 }
-function Ue(e, t = "datum") {
-	return `${t}[${Pe(Ae(e).join("."))}]`;
+function He(e, t = "datum") {
+	return `${t}[${Ne(ke(e).join("."))}]`;
 }
-function We(e) {
-	return `${Ae(e).map((e) => e.replace(".", "\\.")).join("\\.")}`;
+function Ue(e) {
+	return `${ke(e).map((e) => e.replace(".", "\\.")).join("\\.")}`;
 }
-function Ge(...e) {
+function We(...e) {
 	for (let t of e) if (t !== void 0) return t;
 }
-function Ke(e) {
-	return qe(e) ? e : `__${e}`;
+function Ge(e) {
+	return Ke(e) ? e : `__${e}`;
 }
-function qe(e) {
+function Ke(e) {
 	return e.indexOf("__") === 0;
 }
-var Je = "column", Ye = "facet", Xe = "latitude", Ze = "longitude", Qe = "latitude2", $e = "longitude2", et = "color", tt = "fill", nt = "stroke", rt = "shape", it = "size", at = "opacity", ot = "fillOpacity", st = "strokeOpacity", ct = "strokeWidth", lt = "text", ut = "order", dt = "detail", ft = "tooltip", pt = "href", mt = {
+var qe = "column", Je = "facet", Ye = "latitude", Xe = "longitude", Ze = "latitude2", Qe = "longitude2", $e = "color", et = "fill", tt = "stroke", nt = "shape", rt = "size", it = "opacity", at = "fillOpacity", ot = "strokeOpacity", st = "strokeWidth", ct = "text", lt = "order", ut = "detail", dt = "tooltip", ft = "href", pt = {
 	x: 1,
 	y: 1,
 	x2: 1,
 	y2: 1
-}, ht = {
+}, mt = {
 	longitude: 1,
 	longitude2: 1,
 	latitude: 1,
 	latitude2: 1
 };
-j(ht);
-var gt = Object.assign({}, mt, ht, {
+M(mt);
+var ht = Object.assign({}, pt, mt, {
 	color: 1,
 	fill: 1,
 	stroke: 1,
@@ -402,24 +402,24 @@ var gt = Object.assign({}, mt, ht, {
 	tooltip: 1,
 	href: 1
 });
-function _t(e) {
+function gt(e) {
 	return e === "color" || e === "fill" || e === "stroke";
 }
-var vt = {
+var _t = {
 	row: 1,
 	column: 1,
 	facet: 1
 };
-j(vt);
-var yt = Object.assign({}, gt, vt), bt = j(yt), { order: xt, detail: St } = yt, Ct = Ce(yt, ["order", "detail"]), { order: wt, detail: Tt, row: Et, column: Dt, facet: Ot } = yt, kt = Ce(yt, [
+M(_t);
+var vt = Object.assign({}, ht, _t), yt = M(vt), { order: bt, detail: xt } = vt, St = Se(vt, ["order", "detail"]), { order: Ct, detail: wt, row: Tt, column: Et, facet: Dt } = vt, Ot = Se(vt, [
 	"order",
 	"detail",
 	"row",
 	"column",
 	"facet"
 ]);
-j(Ct), j(kt), j(gt);
-var { x: At, y: jt, x2: Mt, y2: Nt, latitude: Pt, longitude: Ft, latitude2: It, longitude2: Lt } = gt, Rt = Ce(gt, [
+M(St), M(Ot), M(ht);
+var { x: kt, y: At, x2: jt, y2: Mt, latitude: Nt, longitude: Pt, latitude2: Ft, longitude2: It } = ht, Lt = Se(ht, [
 	"x",
 	"y",
 	"x2",
@@ -428,12 +428,12 @@ var { x: At, y: jt, x2: Mt, y2: Nt, latitude: Pt, longitude: Ft, latitude2: It,
 	"longitude",
 	"latitude2",
 	"longitude2"
-]), zt = j(Rt), Bt = {
+]), Rt = M(Lt), zt = {
 	x: 1,
 	y: 1
 };
-j(Bt);
-var { text: Vt, tooltip: Ht, href: Ut, detail: Wt, key: Gt, order: Kt } = Rt, qt = Ce(Rt, [
+M(zt);
+var { text: Bt, tooltip: Vt, href: Ht, detail: Ut, key: Wt, order: Gt } = Lt, Kt = Se(Lt, [
 	"text",
 	"tooltip",
 	"href",
@@ -441,16 +441,16 @@ var { text: Vt, tooltip: Ht, href: Ut, detail: Wt, key: Gt, order: Kt } = Rt, qt
 	"key",
 	"order"
 ]);
-j(qt);
-var Jt = Object.assign({}, Bt, qt);
-j(Jt);
-function Yt(e) {
-	return !!Jt[e];
+M(Kt);
+var qt = Object.assign({}, zt, Kt);
+M(qt);
+function Jt(e) {
+	return !!qt[e];
 }
-function Xt(e, t) {
-	return en(e)[t];
+function Yt(e, t) {
+	return $t(e)[t];
 }
-var Zt = {
+var Xt = {
 	area: "always",
 	bar: "always",
 	circle: "always",
@@ -463,32 +463,32 @@ var Zt = {
 	trail: "always",
 	text: "always",
 	tick: "always"
-}, { geoshape: Qt } = Zt, $t = Ce(Zt, ["geoshape"]);
-function en(e) {
+}, { geoshape: Zt } = Xt, Qt = Se(Xt, ["geoshape"]);
+function $t(e) {
 	switch (e) {
+		case $e:
 		case et:
 		case tt:
-		case nt:
-		case dt:
+		case ut:
 		case "key":
+		case dt:
 		case ft:
-		case pt:
-		case ut:
+		case lt:
+		case it:
 		case at:
 		case ot:
 		case st:
-		case ct:
-		case Ye:
+		case Je:
 		case "row":
-		case Je: return Zt;
+		case qe: return Xt;
 		case "x":
 		case "y":
-		case Xe:
-		case Ze: return $t;
+		case Ye:
+		case Xe: return Qt;
 		case "x2":
 		case "y2":
-		case Qe:
-		case $e: return {
+		case Ze:
+		case Qe: return {
 			rule: "always",
 			bar: "always",
 			rect: "always",
@@ -500,7 +500,7 @@ function en(e) {
 			line: "binned",
 			trail: "binned"
 		};
-		case it: return {
+		case rt: return {
 			point: "always",
 			tick: "always",
 			rule: "always",
@@ -511,48 +511,48 @@ function en(e) {
 			line: "always",
 			trail: "always"
 		};
-		case rt: return {
+		case nt: return {
 			point: "always",
 			geoshape: "always"
 		};
-		case lt: return { text: "always" };
+		case ct: return { text: "always" };
 	}
 }
-function tn(e) {
+function en(e) {
 	switch (e) {
 		case "x":
 		case "y":
+		case rt:
+		case st:
 		case it:
-		case ct:
 		case at:
 		case ot:
-		case st:
 		case "x2":
 		case "y2": return;
-		case Ye:
-		case "row":
 		case Je:
-		case rt:
-		case lt:
-		case ft:
-		case pt: return "discrete";
+		case "row":
+		case qe:
+		case nt:
+		case ct:
+		case dt:
+		case ft: return "discrete";
+		case $e:
 		case et:
-		case tt:
-		case nt: return "flexible";
+		case tt: return "flexible";
+		case Ye:
 		case Xe:
 		case Ze:
 		case Qe:
-		case $e:
-		case dt:
+		case ut:
 		case "key":
-		case ut: return;
+		case lt: return;
 	}
 	/* istanbul ignore next: should never reach here. */
 	throw Error("rangeType not implemented for " + e);
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/axis.js
-var nn = {
+var tn = {
 	orient: 1,
 	bandPosition: 1,
 	domain: 1,
@@ -619,12 +619,12 @@ var nn = {
 	titleY: 1,
 	values: 1,
 	zindex: 1
-}, rn = Object.assign({}, nn, { encoding: 1 });
-j(Object.assign({
+}, nn = Object.assign({}, tn, { encoding: 1 });
+M(Object.assign({
 	gridScale: 1,
 	scale: 1
-}, nn, { encode: 1 }));
-var an = j(rn), on = {
+}, tn, { encode: 1 }));
+var rn = M(nn), an = {
 	clipHeight: 1,
 	columnPadding: 1,
 	columns: 1,
@@ -686,7 +686,7 @@ var an = j(rn), on = {
 	type: 1,
 	values: 1,
 	zindex: 1
-}, sn = Object.assign({}, on, {
+}, on = Object.assign({}, an, {
 	opacity: 1,
 	shape: 1,
 	stroke: 1,
@@ -694,286 +694,286 @@ var an = j(rn), on = {
 	size: 1,
 	strokeWidth: 1,
 	encode: 1
-}), cn = j(on);
-j(sn);
+}), sn = M(an);
+M(on);
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/log/message.js
-var ln = /* @__PURE__ */ r({
-	BAR_WITH_POINT_SCALE_AND_RANGESTEP_NULL: () => Wn,
-	CANNOT_FIX_RANGE_STEP_WITH_FIT: () => fn,
-	CANNOT_UNION_CUSTOM_DOMAIN_WITH_FIELD_DOMAIN: () => qn,
-	CONCAT_CANNOT_SHARE_AXIS: () => xn,
-	FIT_NON_SINGLE: () => dn,
-	INVALID_CHANNEL_FOR_AXIS: () => ur,
-	INVALID_SPEC: () => un,
-	LINE_WITH_VARYING_SIZE: () => Rn,
-	MORE_THAN_ONE_SORT: () => lr,
-	NO_FIELDS_NEEDS_AS: () => En,
-	NO_INIT_SCALE_BINDINGS: () => vn,
-	REPEAT_CANNOT_SHARE_AXIS: () => Sn,
-	SCALE_BINDINGS_CONTINUOUS: () => _n,
-	UNABLE_TO_MERGE_DOMAINS: () => cr,
-	cannotApplySizeToNonOrientedMark: () => Qn,
-	cannotProjectOnChannelWithoutField: () => pn,
-	cannotStackNonLinearScale: () => fr,
-	cannotStackRangedMark: () => dr,
-	cannotUseScalePropertyWithNonColor: () => Jn,
-	channelRequiredForBinned: () => Sr,
-	columnsNotSupportByRowCol: () => bn,
-	dayReplacedWithDate: () => hr,
-	differentParse: () => wn,
-	discreteChannelCannotEncode: () => Un,
-	domainRequiredForThresholdScale: () => Cr,
-	domainSortDropped: () => sr,
-	droppedDay: () => gr,
-	droppingColor: () => Fn,
-	emptyFieldDef: () => In,
-	encodingOverridden: () => Dn,
-	errorBand1DNotSupport: () => xr,
-	errorBarCenterAndExtentAreNotNeeded: () => _r,
-	errorBarCenterIsNotNeeded: () => br,
-	errorBarCenterIsUsedWithWrongExtent: () => vr,
-	errorBarContinuousAxisHasCustomizedAggregate: () => yr,
-	facetChannelDropped: () => Hn,
-	facetChannelShouldBeDiscrete: () => Vn,
-	incompatibleChannel: () => zn,
-	independentScaleMeansIndependentGuide: () => or,
-	invalidAggregate: () => Nn,
-	invalidEncodingChannel: () => Bn,
-	invalidFieldType: () => An,
-	invalidFieldTypeForCountAggregate: () => Mn,
-	invalidTimeUnit: () => mr,
-	invalidTransformIgnored: () => Tn,
-	latLongDeprecated: () => Ln,
-	lineWithRange: () => Gn,
-	mergeConflictingDomainProperty: () => ar,
-	mergeConflictingProperty: () => ir,
-	missingFieldType: () => Pn,
-	nearestNotSupportForContinuous: () => mn,
-	noSuchRepeatedValue: () => yn,
-	nonZeroScaleUsedWithLengthMark: () => jn,
-	orientOverridden: () => Kn,
-	primitiveChannelDef: () => kn,
-	projectionOverridden: () => On,
-	rangeStepDropped: () => $n,
-	scalePropertyNotWorkWithScaleType: () => nr,
-	scaleTypeNotWorkWithChannel: () => er,
-	scaleTypeNotWorkWithFieldDef: () => tr,
-	scaleTypeNotWorkWithMark: () => rr,
-	selectionNotFound: () => gn,
-	selectionNotSupported: () => hn,
-	stackNonSummativeAggregate: () => pr,
-	unaggregateDomainHasNoEffectForRawField: () => Yn,
-	unaggregateDomainWithNonSharedDomainOp: () => Xn,
-	unaggregatedDomainWithLogScale: () => Zn,
-	unrecognizedParse: () => Cn
-}), un = "Invalid spec", dn = "Autosize \"fit\" only works for single views and layered views.", fn = "Cannot use a fixed value of \"rangeStep\" when \"autosize\" is \"fit\".";
-function pn(e) {
+var cn = /* @__PURE__ */ r({
+	BAR_WITH_POINT_SCALE_AND_RANGESTEP_NULL: () => Un,
+	CANNOT_FIX_RANGE_STEP_WITH_FIT: () => dn,
+	CANNOT_UNION_CUSTOM_DOMAIN_WITH_FIELD_DOMAIN: () => Kn,
+	CONCAT_CANNOT_SHARE_AXIS: () => bn,
+	FIT_NON_SINGLE: () => un,
+	INVALID_CHANNEL_FOR_AXIS: () => lr,
+	INVALID_SPEC: () => ln,
+	LINE_WITH_VARYING_SIZE: () => Ln,
+	MORE_THAN_ONE_SORT: () => cr,
+	NO_FIELDS_NEEDS_AS: () => Tn,
+	NO_INIT_SCALE_BINDINGS: () => _n,
+	REPEAT_CANNOT_SHARE_AXIS: () => xn,
+	SCALE_BINDINGS_CONTINUOUS: () => gn,
+	UNABLE_TO_MERGE_DOMAINS: () => sr,
+	cannotApplySizeToNonOrientedMark: () => Zn,
+	cannotProjectOnChannelWithoutField: () => fn,
+	cannotStackNonLinearScale: () => dr,
+	cannotStackRangedMark: () => ur,
+	cannotUseScalePropertyWithNonColor: () => qn,
+	channelRequiredForBinned: () => xr,
+	columnsNotSupportByRowCol: () => yn,
+	dayReplacedWithDate: () => mr,
+	differentParse: () => Cn,
+	discreteChannelCannotEncode: () => Hn,
+	domainRequiredForThresholdScale: () => Sr,
+	domainSortDropped: () => or,
+	droppedDay: () => hr,
+	droppingColor: () => Pn,
+	emptyFieldDef: () => Fn,
+	encodingOverridden: () => En,
+	errorBand1DNotSupport: () => br,
+	errorBarCenterAndExtentAreNotNeeded: () => gr,
+	errorBarCenterIsNotNeeded: () => yr,
+	errorBarCenterIsUsedWithWrongExtent: () => _r,
+	errorBarContinuousAxisHasCustomizedAggregate: () => vr,
+	facetChannelDropped: () => Vn,
+	facetChannelShouldBeDiscrete: () => Bn,
+	incompatibleChannel: () => Rn,
+	independentScaleMeansIndependentGuide: () => ar,
+	invalidAggregate: () => Mn,
+	invalidEncodingChannel: () => zn,
+	invalidFieldType: () => kn,
+	invalidFieldTypeForCountAggregate: () => jn,
+	invalidTimeUnit: () => pr,
+	invalidTransformIgnored: () => wn,
+	latLongDeprecated: () => In,
+	lineWithRange: () => Wn,
+	mergeConflictingDomainProperty: () => ir,
+	mergeConflictingProperty: () => rr,
+	missingFieldType: () => Nn,
+	nearestNotSupportForContinuous: () => pn,
+	noSuchRepeatedValue: () => vn,
+	nonZeroScaleUsedWithLengthMark: () => An,
+	orientOverridden: () => Gn,
+	primitiveChannelDef: () => On,
+	projectionOverridden: () => Dn,
+	rangeStepDropped: () => Qn,
+	scalePropertyNotWorkWithScaleType: () => tr,
+	scaleTypeNotWorkWithChannel: () => $n,
+	scaleTypeNotWorkWithFieldDef: () => er,
+	scaleTypeNotWorkWithMark: () => nr,
+	selectionNotFound: () => hn,
+	selectionNotSupported: () => mn,
+	stackNonSummativeAggregate: () => fr,
+	unaggregateDomainHasNoEffectForRawField: () => Jn,
+	unaggregateDomainWithNonSharedDomainOp: () => Yn,
+	unaggregatedDomainWithLogScale: () => Xn,
+	unrecognizedParse: () => Sn
+}), ln = "Invalid spec", un = "Autosize \"fit\" only works for single views and layered views.", dn = "Cannot use a fixed value of \"rangeStep\" when \"autosize\" is \"fit\".";
+function fn(e) {
 	return `Cannot project a selection on encoding channel "${e}", which has no field.`;
 }
-function mn(e) {
+function pn(e) {
 	return `The "nearest" transform is not supported for ${e} marks.`;
 }
-function hn(e) {
+function mn(e) {
 	return `Selection not supported for ${e} yet`;
 }
-function gn(e) {
+function hn(e) {
 	return `Cannot find a selection named "${e}"`;
 }
-var _n = "Scale bindings are currently only supported for scales with unbinned, continuous domains.", vn = "Selections bound to scales cannot be separately initialized.";
-function yn(e) {
+var gn = "Scale bindings are currently only supported for scales with unbinned, continuous domains.", _n = "Selections bound to scales cannot be separately initialized.";
+function vn(e) {
 	return `Unknown repeated value "${e}".`;
 }
-function bn(e) {
+function yn(e) {
 	return `The "columns" property cannot be used when "${e}" has nested row/column.`;
 }
-var xn = "Axes cannot be shared in concatenated views yet (https://github.com/vega/vega-lite/issues/2415).", Sn = "Axes cannot be shared in repeated views yet (https://github.com/vega/vega-lite/issues/2415).";
-function Cn(e) {
+var bn = "Axes cannot be shared in concatenated views yet (https://github.com/vega/vega-lite/issues/2415).", xn = "Axes cannot be shared in repeated views yet (https://github.com/vega/vega-lite/issues/2415).";
+function Sn(e) {
 	return `Unrecognized parse "${e}".`;
 }
-function wn(e, t, n) {
+function Cn(e, t, n) {
 	return `An ancestor parsed field "${e}" as ${n} but a child wants to parse the field as ${t}.`;
 }
-function Tn(e) {
-	return `Ignoring an invalid transform: ${k(e)}.`;
+function wn(e) {
+	return `Ignoring an invalid transform: ${A(e)}.`;
 }
-var En = "If \"from.fields\" is not specified, \"as\" has to be a string that specifies the key to be used for the data from the secondary source.";
-function Dn(e) {
+var Tn = "If \"from.fields\" is not specified, \"as\" has to be a string that specifies the key to be used for the data from the secondary source.";
+function En(e) {
 	return `Layer's shared ${e.join(",")} channel ${e.length === 1 ? "is" : "are"} overriden`;
 }
-function On(e) {
+function Dn(e) {
 	let { parentProjection: t, projection: n } = e;
-	return `Layer's shared projection ${k(t)} is overridden by a child projection ${k(n)}.`;
+	return `Layer's shared projection ${A(t)} is overridden by a child projection ${A(n)}.`;
 }
-function kn(e, t, n) {
-	return `Channel ${e} is a ${t}. Converted to {value: ${k(n)}}.`;
+function On(e, t, n) {
+	return `Channel ${e} is a ${t}. Converted to {value: ${A(n)}}.`;
 }
-function An(e) {
+function kn(e) {
 	return `Invalid field type "${e}"`;
 }
-function jn(e, t, n) {
+function An(e, t, n) {
 	return `A ${n.scaleType ? `${n.scaleType} scale` : n.zeroFalse ? "scale with zero=false" : "scale with custom domain that excludes zero"} is used to encode ${e}'s ${t}. This can be misleading as the ${t === "x" ? "width" : "height"} of the ${e} can be arbitrary based on the scale domain. You may want to use point mark instead.`;
 }
-function Mn(e, t) {
+function jn(e, t) {
 	return `Invalid field type "${e}" for aggregate: "${t}", using "quantitative" instead.`;
 }
-function Nn(e) {
+function Mn(e) {
 	return `Invalid aggregation operator "${e}"`;
 }
-function Pn(e, t) {
+function Nn(e, t) {
 	return `Missing type for channel "${e}", using "${t}" instead.`;
 }
-function Fn(e, t) {
+function Pn(e, t) {
 	let { fill: n, stroke: r } = t;
 	return `Dropping color ${e} as the plot also has ` + (n && r ? "fill and stroke" : n ? "fill" : "stroke");
 }
-function In(e, t) {
-	return `Dropping ${k(e)} from channel "${t}" since it does not contain data field or value.`;
+function Fn(e, t) {
+	return `Dropping ${A(e)} from channel "${t}" since it does not contain data field or value.`;
 }
-function Ln(e, t, n) {
+function In(e, t, n) {
 	return `${e}-encoding with type ${t} is deprecated. Replacing with ${n}-encoding.`;
 }
-var Rn = "Line marks cannot encode size with a non-groupby field. You may want to use trail marks instead.";
-function zn(e, t, n) {
+var Ln = "Line marks cannot encode size with a non-groupby field. You may want to use trail marks instead.";
+function Rn(e, t, n) {
 	return `${e} dropped as it is incompatible with "${t}"${n ? ` when ${n}` : ""}.`;
 }
-function Bn(e) {
+function zn(e) {
 	return `${e}-encoding is dropped as ${e} is not a valid encoding channel.`;
 }
-function Vn(e) {
+function Bn(e) {
 	return `${e} encoding should be discrete (ordinal / nominal / binned).`;
 }
-function Hn(e) {
+function Vn(e) {
 	return `Facet encoding dropped as ${e.join(" and ")} ${e.length > 1 ? "are" : "is"} also specified.`;
 }
-function Un(e, t) {
+function Hn(e, t) {
 	return `Using discrete channel "${e}" to encode "${t}" field can be misleading as it does not encode ${t === "ordinal" ? "order" : "magnitude"}.`;
 }
-var Wn = "Bar mark should not be used with point scale when rangeStep is null. Please use band scale instead.";
-function Gn(e, t) {
+var Un = "Bar mark should not be used with point scale when rangeStep is null. Please use band scale instead.";
+function Wn(e, t) {
 	return `Line mark is for continuous lines and thus cannot be used with ${e && t ? "x2 and y2" : e ? "x2" : "y2"}. We will use the rule mark (line segments) instead.`;
 }
-function Kn(e, t) {
+function Gn(e, t) {
 	return `Specified orient "${e}" overridden with "${t}"`;
 }
-var qn = "custom domain scale cannot be unioned with default field-based domain";
-function Jn(e) {
+var Kn = "custom domain scale cannot be unioned with default field-based domain";
+function qn(e) {
 	return `Cannot use the scale property "${e}" with non-color channel.`;
 }
+function Jn(e) {
+	return `Using unaggregated domain with raw field has no effect (${A(e)}).`;
+}
 function Yn(e) {
-	return `Using unaggregated domain with raw field has no effect (${k(e)}).`;
+	return `Unaggregated domain not applicable for "${e}" since it produces values outside the origin domain of the source data.`;
 }
 function Xn(e) {
-	return `Unaggregated domain not applicable for "${e}" since it produces values outside the origin domain of the source data.`;
+	return `Unaggregated domain is currently unsupported for log scale (${A(e)}).`;
 }
 function Zn(e) {
-	return `Unaggregated domain is currently unsupported for log scale (${k(e)}).`;
-}
-function Qn(e) {
 	return `Cannot apply size to non-oriented mark "${e}".`;
 }
-function $n(e) {
+function Qn(e) {
 	return `rangeStep for "${e}" is dropped as top-level ${e === "x" ? "width" : "height"} is provided.`;
 }
-function er(e, t, n) {
+function $n(e, t, n) {
 	return `Channel "${e}" does not work with "${t}" scale. We are using "${n}" scale instead.`;
 }
-function tr(e, t) {
+function er(e, t) {
 	return `FieldDef does not work with "${e}" scale. We are using "${t}" scale instead.`;
 }
-function nr(e, t, n) {
+function tr(e, t, n) {
 	return `${n}-scale's "${t}" is dropped as it does not work with ${e} scale.`;
 }
-function rr(e, t) {
+function nr(e, t) {
 	return `Scale type "${t}" does not work with mark "${e}".`;
 }
-function ir(e, t, n, r) {
-	return `Conflicting ${t.toString()} property "${e.toString()}" (${k(n)} and ${k(r)}).  Using ${k(n)}.`;
+function rr(e, t, n, r) {
+	return `Conflicting ${t.toString()} property "${e.toString()}" (${A(n)} and ${A(r)}).  Using ${A(n)}.`;
 }
-function ar(e, t, n, r) {
-	return `Conflicting ${t.toString()} property "${e.toString()}" (${k(n)} and ${k(r)}).  Using the union of the two domains.`;
+function ir(e, t, n, r) {
+	return `Conflicting ${t.toString()} property "${e.toString()}" (${A(n)} and ${A(r)}).  Using the union of the two domains.`;
 }
-function or(e) {
+function ar(e) {
 	return `Setting the scale to be independent for "${e}" means we also have to set the guide (axis or legend) to be independent.`;
 }
-function sr(e) {
-	return `Dropping sort property ${k(e)} as unioned domains only support boolean or op 'count'.`;
+function or(e) {
+	return `Dropping sort property ${A(e)} as unioned domains only support boolean or op 'count'.`;
 }
-var cr = "Unable to merge domains", lr = "Domains that should be unioned has conflicting sort properties. Sort will be set to true.", ur = "Invalid channel for axis.";
-function dr(e) {
+var sr = "Unable to merge domains", cr = "Domains that should be unioned has conflicting sort properties. Sort will be set to true.", lr = "Invalid channel for axis.";
+function ur(e) {
 	return `Cannot stack "${e}" if there is already "${e}2"`;
 }
-function fr(e) {
+function dr(e) {
 	return `Cannot stack non-linear scale (${e})`;
 }
-function pr(e) {
+function fr(e) {
 	return `Stacking is applied even though the aggregate function is non-summative ("${e}")`;
 }
-function mr(e, t) {
-	return `Invalid ${e}: ${k(t)}`;
+function pr(e, t) {
+	return `Invalid ${e}: ${A(t)}`;
 }
-function hr(e) {
+function mr(e) {
 	return `Time unit "${e}" is not supported. We are replacing it with ${e.replace("day", "date")}.`;
 }
-function gr(e) {
-	return `Dropping day from datetime ${k(e)} as day cannot be combined with other units.`;
+function hr(e) {
+	return `Dropping day from datetime ${A(e)} as day cannot be combined with other units.`;
 }
-function _r(e, t) {
+function gr(e, t) {
 	return `${t ? "extent " : ""}${t && e ? "and " : ""}${e ? "center " : ""}${t && e ? "are " : "is "}not needed when data are aggregated.`;
 }
-function vr(e, t, n) {
+function _r(e, t, n) {
 	return `${e} is not usually used with ${t} for ${n}.`;
 }
-function yr(e, t) {
+function vr(e, t) {
 	return `Continuous axis should not have customized aggregation function ${e}; ${t} already agregates the axis.`;
 }
-function br(e, t) {
+function yr(e, t) {
 	return `Center is not needed to be specified in ${t} when extent is ${e}.`;
 }
-function xr(e) {
+function br(e) {
 	return `1D error band does not support ${e}`;
 }
-function Sr(e) {
+function xr(e) {
 	return `Channel ${e} is required for "binned" bin`;
 }
-function Cr(e) {
+function Sr(e) {
 	return `Domain for ${e} is required for threshold scale`;
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/log/index.js
-var M = ln, wr = Re(2);
-function Tr(...e) {
-	wr.warn.apply(wr, arguments);
+var N = cn, Cr = Le(2);
+function wr(...e) {
+	Cr.warn.apply(Cr, arguments);
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/type.js
-var Er = {
+var Tr = {
 	quantitative: 1,
 	ordinal: 1,
 	temporal: 1,
 	nominal: 1,
 	geojson: 1
-}, N = "quantitative", Dr = "ordinal", Or = "temporal", kr = "nominal", Ar = "geojson";
-function jr(e) {
+}, P = "quantitative", Er = "ordinal", Dr = "temporal", Or = "nominal", kr = "geojson";
+function Ar(e) {
 	if (e) switch (e = e.toLowerCase(), e) {
 		case "q":
-		case N: return "quantitative";
+		case P: return "quantitative";
 		case "t":
-		case Or: return "temporal";
+		case Dr: return "temporal";
 		case "o":
-		case Dr: return "ordinal";
+		case Er: return "ordinal";
 		case "n":
-		case kr: return "nominal";
-		case Ar: return "geojson";
+		case Or: return "nominal";
+		case kr: return "geojson";
 	}
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/scale.js
-var P;
+var F;
 (function(e) {
 	e.LINEAR = "linear", e.LOG = "log", e.POW = "pow", e.SQRT = "sqrt", e.SYMLOG = "symlog", e.TIME = "time", e.UTC = "utc", e.QUANTILE = "quantile", e.QUANTIZE = "quantize", e.THRESHOLD = "threshold", e.BIN_ORDINAL = "bin-ordinal", e.ORDINAL = "ordinal", e.POINT = "point", e.BAND = "band";
-})(P ||= {});
-var Mr = j({
+})(F ||= {});
+var jr = M({
 	linear: "numeric",
 	log: "numeric",
 	pow: "numeric",
@@ -988,7 +988,7 @@ var Mr = j({
 	quantile: "discretizing",
 	quantize: "discretizing",
 	threshold: "discretizing"
-}), Nr = [
+}), Mr = [
 	"linear",
 	"log",
 	"pow",
@@ -996,33 +996,33 @@ var Mr = j({
 	"symlog",
 	"time",
 	"utc"
-], Pr = Be(Nr), Fr = Be([
+], Nr = ze(Mr), Pr = ze([
 	"quantile",
 	"quantize",
 	"threshold"
-]), Ir = Be(Nr.concat([
+]), Fr = ze(Mr.concat([
 	"quantile",
 	"quantize",
 	"threshold"
-])), Lr = Be([
+])), Ir = ze([
 	"ordinal",
 	"bin-ordinal",
 	"point",
 	"band"
 ]);
+function Lr(e) {
+	return e in Ir;
+}
 function Rr(e) {
-	return e in Lr;
+	return e in Fr;
 }
 function zr(e) {
-	return e in Ir;
+	return e in Nr;
 }
 function Br(e) {
 	return e in Pr;
 }
-function Vr(e) {
-	return e in Fr;
-}
-var Hr = {
+var Vr = {
 	type: 1,
 	domain: 1,
 	align: 1,
@@ -1042,44 +1042,44 @@ var Hr = {
 	padding: 1,
 	paddingInner: 1,
 	paddingOuter: 1
-}, Ur = j(Hr), { type: Wr, domain: Gr, range: Kr, rangeStep: qr, scheme: Jr } = Hr;
-j(Ce(Hr, [
+}, Hr = M(Vr), { type: Ur, domain: Wr, range: Gr, rangeStep: Kr, scheme: qr } = Vr;
+M(Se(Vr, [
 	"type",
 	"domain",
 	"range",
 	"rangeStep",
 	"scheme"
-])), $r();
-function Yr(e, t) {
+])), Qr();
+function Jr(e, t) {
 	switch (t) {
 		case "type":
 		case "domain":
 		case "reverse":
 		case "range": return !0;
 		case "scheme":
-		case "interpolate": return !A([
+		case "interpolate": return !j([
 			"point",
 			"band",
 			"identity"
 		], e);
-		case "bins": return !A([
+		case "bins": return !j([
 			"point",
 			"band",
 			"identity",
 			"ordinal"
 		], e);
-		case "round": return Br(e) || e === "band" || e === "point";
-		case "padding": return Br(e) || A(["point", "band"], e);
+		case "round": return zr(e) || e === "band" || e === "point";
+		case "padding": return zr(e) || j(["point", "band"], e);
 		case "paddingOuter":
 		case "rangeStep":
-		case "align": return A(["point", "band"], e);
+		case "align": return j(["point", "band"], e);
 		case "paddingInner": return e === "band";
-		case "clamp": return Br(e);
-		case "nice": return Br(e) || e === "quantize" || e === "threshold";
+		case "clamp": return zr(e);
+		case "nice": return zr(e) || e === "quantize" || e === "threshold";
 		case "exponent": return e === "pow";
 		case "base": return e === "log";
 		case "constant": return e === "symlog";
-		case "zero": return zr(e) && !A([
+		case "zero": return Rr(e) && !j([
 			"log",
 			"time",
 			"utc",
@@ -1088,10 +1088,10 @@ function Yr(e, t) {
 		], e);
 	}
 }
-function Xr(e, t) {
+function Yr(e, t) {
 	switch (t) {
 		case "interpolate":
-		case "scheme": return _t(e) ? void 0 : M.cannotUseScalePropertyWithNonColor(e);
+		case "scheme": return gt(e) ? void 0 : N.cannotUseScalePropertyWithNonColor(e);
 		case "align":
 		case "type":
 		case "bins":
@@ -1111,54 +1111,54 @@ function Xr(e, t) {
 		case "zero": return;
 	}
 }
-function Zr(e, t) {
-	return A(["ordinal", "nominal"], t) ? e === void 0 || Rr(e) : t === "temporal" ? A([
-		P.TIME,
-		P.UTC,
+function Xr(e, t) {
+	return j(["ordinal", "nominal"], t) ? e === void 0 || Lr(e) : t === "temporal" ? j([
+		F.TIME,
+		F.UTC,
 		void 0
-	], e) : t !== "quantitative" || A([
-		P.LOG,
-		P.POW,
-		P.SQRT,
-		P.SYMLOG,
-		P.QUANTILE,
-		P.QUANTIZE,
-		P.THRESHOLD,
-		P.LINEAR,
+	], e) : t !== "quantitative" || j([
+		F.LOG,
+		F.POW,
+		F.SQRT,
+		F.SYMLOG,
+		F.QUANTILE,
+		F.QUANTIZE,
+		F.THRESHOLD,
+		F.LINEAR,
 		void 0
 	], e);
 }
-function Qr(e, t) {
+function Zr(e, t) {
 	switch (e) {
 		case "x":
-		case "y": return Br(t) || A(["band", "point"], t);
+		case "y": return zr(t) || j(["band", "point"], t);
+		case rt:
+		case st:
 		case it:
-		case ct:
 		case at:
-		case ot:
-		case st: return Br(t) || Vr(t) || A(["band", "point"], t);
+		case ot: return zr(t) || Br(t) || j(["band", "point"], t);
+		case $e:
 		case et:
-		case tt:
-		case nt: return t !== "band";
-		case rt: return t === "ordinal";
+		case tt: return t !== "band";
+		case nt: return t === "ordinal";
 	}
 	/* istanbul ignore next: it should never reach here */
 	return !1;
 }
-function $r() {
+function Qr() {
 	let e = {};
-	for (let t of bt) for (let n of j(Er)) for (let r of Mr) {
-		let i = ei(t, n);
-		Qr(t, r) && Zr(r, n) && (e[i] = e[i] || [], e[i].push(r));
+	for (let t of yt) for (let n of M(Tr)) for (let r of jr) {
+		let i = $r(t, n);
+		Zr(t, r) && Xr(r, n) && (e[i] = e[i] || [], e[i].push(r));
 	}
 	return e;
 }
-function ei(e, t) {
+function $r(e, t) {
 	return e + "_" + t;
 }
 //#endregion
 //#region ../node_modules/.pnpm/datalib@1.7.3/node_modules/datalib/src/util.js
-var ti = /* @__PURE__ */ i(((e, t) => {
+var ei = /* @__PURE__ */ i(((e, t) => {
 	var n = t.exports, r = "__name__";
 	n.namedfunc = function(e, t) {
 		return t[r] = e, t;
@@ -1319,37 +1319,37 @@ var ti = /* @__PURE__ */ i(((e, t) => {
 		}), e.length ? e.join("").trim() : i[0].slice(0, t);
 	}
 	var c = /([\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u2028\u2029\u3000\uFEFF])/;
-})), F = ti();
-function I(e, t) {
+})), I = ei();
+function L(e, t) {
 	return e.indexOf(t) !== -1;
 }
-function ni(e, t) {
+function ti(e, t) {
 	for (let n = 0; n < e.length; n++) if (!t(e[n], n)) return !1;
 	return !0;
 }
-function L(e, t, n) {
+function R(e, t, n) {
 	if (e.forEach) e.forEach.call(n, t);
 	else for (let r in e) t.call(n, e[r], r, e);
 }
-function ri(e, t) {
+function ni(e, t) {
 	let n = 0, r;
 	for (r in e) if (t(e[r], r, n++)) return !0;
 	return !1;
 }
-function ii(e, t) {
+function ri(e, t) {
 	return e.filter(function(e) {
-		return !I(t, e);
+		return !L(t, e);
 	});
 }
-function ai(e) {
+function ii(e) {
 	return Object.keys(e);
 }
 //#endregion
 //#region ../node_modules/.pnpm/compassql@0.21.2_vega@6.2.0/node_modules/compassql/build/src/property.js
-function oi(e) {
+function ai(e) {
 	return !!e.parent;
 }
-var si = {
+var oi = {
 	channel: 1,
 	aggregate: 1,
 	autoCount: 1,
@@ -1365,21 +1365,21 @@ var si = {
 	axis: 1,
 	legend: 1,
 	value: 1
-}, ci = ai(si);
-function li(e) {
-	return e in si;
+}, si = ii(oi);
+function ci(e) {
+	return e in oi;
 }
-var ui = {
+var li = {
 	bin: 1,
 	scale: 1,
 	sort: 1,
 	axis: 1,
 	legend: 1
 };
-function di(e) {
-	return ui[e];
+function ui(e) {
+	return li[e];
 }
-var fi = [
+var di = [
 	"maxbins",
 	"divide",
 	"extent",
@@ -1387,37 +1387,37 @@ var fi = [
 	"step",
 	"steps",
 	"minstep"
-], pi = [
+], fi = [
 	"field",
 	"op",
 	"order"
-], mi = fi.map((e) => ({
+], pi = di.map((e) => ({
 	parent: "bin",
 	child: e
-})), hi = pi.map((e) => ({
+})), mi = fi.map((e) => ({
 	parent: "sort",
 	child: e
-})), gi = Ur.map((e) => ({
+})), hi = Hr.map((e) => ({
 	parent: "scale",
 	child: e
-})), _i = an.map((e) => ({
+})), gi = rn.map((e) => ({
 	parent: "axis",
 	child: e
-})), vi = cn.map((e) => ({
+})), _i = sn.map((e) => ({
 	parent: "legend",
 	child: e
-})), yi = [].concat(mi, hi, gi, _i, vi), bi = [
+})), vi = [].concat(pi, mi, hi, gi, _i), yi = [
 	"width",
 	"height",
 	"background",
 	"padding",
 	"title"
-], xi = ".";
-function Si(e) {
-	return oi(e) ? e.parent + xi + e.child : e;
+], bi = ".";
+function xi(e) {
+	return ai(e) ? e.parent + bi + e.child : e;
 }
-function Ci(e) {
-	let t = e.split(xi);
+function Si(e) {
+	let t = e.split(bi);
 	/* istanbul ignore else */
 	if (t.length === 1) return e;
 	if (t.length === 2) return {
@@ -1426,14 +1426,14 @@ function Ci(e) {
 	};
 	throw "Invalid property key with " + t.length + " dots: " + e;
 }
-var wi = yi.reduce((e, t) => (e[t.parent] = e[t.parent] || [], e[t.parent][t.child] = t, e), {});
-function Ti(e, t) {
-	return (wi[e] || {})[t];
+var Ci = vi.reduce((e, t) => (e[t.parent] = e[t.parent] || [], e[t.parent][t.child] = t, e), {});
+function wi(e, t) {
+	return (Ci[e] || {})[t];
 }
-function Ei(e) {
-	return li(e) || oi(e);
+function Ti(e) {
+	return ci(e) || ai(e);
 }
-var Di = [].concat(ci, yi), Oi = [
+var Ei = [].concat(si, vi), Di = [
 	"type",
 	"field",
 	"bin",
@@ -1447,13 +1447,13 @@ var Di = [].concat(ci, yi), Oi = [
 	"sort",
 	"axis",
 	"legend"
-].concat(mi, gi, _i, vi, hi), R;
+].concat(pi, hi, gi, _i, mi), z;
 (function(e) {
 	e.MARK = "mark", e.TRANSFORM = "transform", e.STACK = "stack", e.FORMAT = "format", e.CHANNEL = "channel", e.AGGREGATE = "aggregate", e.AUTOCOUNT = "autoCount", e.BIN = "bin", e.HAS_FN = "hasFn", e.TIMEUNIT = "timeUnit", e.FIELD = "field", e.TYPE = "type", e.SORT = "sort", e.SCALE = "scale", e.AXIS = "axis", e.LEGEND = "legend", e.WIDTH = "width", e.HEIGHT = "height", e.BACKGROUND = "background", e.PADDING = "padding", e.TITLE = "title";
-})(R ||= {});
+})(z ||= {});
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/mark.js
-var ki = "area", Ai = "line", ji = "point", Mi = "rect", Ni = "rule", Pi = "text", Fi = "tick", Ii = "circle", Li = "square", Ri = {
+var Oi = "area", ki = "line", Ai = "point", ji = "rect", Mi = "rule", Ni = "text", Pi = "tick", Fi = "circle", Ii = "square", Li = {
 	area: 1,
 	bar: 1,
 	line: 1,
@@ -1467,18 +1467,18 @@ var ki = "area", Ai = "line", ji = "point", Mi = "rect", Ni = "rule", Pi = "text
 	circle: 1,
 	square: 1
 };
-function zi(e) {
-	return A([
+function Ri(e) {
+	return j([
 		"line",
 		"area",
 		"trail"
 	], e);
 }
-var Bi = j(Ri);
-function Vi(e) {
+var zi = M(Li);
+function Bi(e) {
 	return e.type;
 }
-Be(Bi), [
+ze(zi), [
 	"january",
 	"february",
 	"march",
@@ -1502,11 +1502,11 @@ Be(Bi), [
 ].map((e) => e.substr(0, 3));
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/timeunit.js
-var z;
+var B;
 (function(e) {
 	e.YEAR = "year", e.MONTH = "month", e.DAY = "day", e.DATE = "date", e.HOURS = "hours", e.MINUTES = "minutes", e.SECONDS = "seconds", e.MILLISECONDS = "milliseconds", e.YEARMONTH = "yearmonth", e.YEARMONTHDATE = "yearmonthdate", e.YEARMONTHDATEHOURS = "yearmonthdatehours", e.YEARMONTHDATEHOURSMINUTES = "yearmonthdatehoursminutes", e.YEARMONTHDATEHOURSMINUTESSECONDS = "yearmonthdatehoursminutesseconds", e.MONTHDATE = "monthdate", e.MONTHDATEHOURS = "monthdatehours", e.HOURSMINUTES = "hoursminutes", e.HOURSMINUTESSECONDS = "hoursminutesseconds", e.MINUTESSECONDS = "minutesseconds", e.SECONDSMILLISECONDS = "secondsmilliseconds", e.QUARTER = "quarter", e.YEARQUARTER = "yearquarter", e.QUARTERMONTH = "quartermonth", e.YEARQUARTERMONTH = "yearquartermonth", e.UTCYEAR = "utcyear", e.UTCMONTH = "utcmonth", e.UTCDAY = "utcday", e.UTCDATE = "utcdate", e.UTCHOURS = "utchours", e.UTCMINUTES = "utcminutes", e.UTCSECONDS = "utcseconds", e.UTCMILLISECONDS = "utcmilliseconds", e.UTCYEARMONTH = "utcyearmonth", e.UTCYEARMONTHDATE = "utcyearmonthdate", e.UTCYEARMONTHDATEHOURS = "utcyearmonthdatehours", e.UTCYEARMONTHDATEHOURSMINUTES = "utcyearmonthdatehoursminutes", e.UTCYEARMONTHDATEHOURSMINUTESSECONDS = "utcyearmonthdatehoursminutesseconds", e.UTCMONTHDATE = "utcmonthdate", e.UTCMONTHDATEHOURS = "utcmonthdatehours", e.UTCHOURSMINUTES = "utchoursminutes", e.UTCHOURSMINUTESSECONDS = "utchoursminutesseconds", e.UTCMINUTESSECONDS = "utcminutesseconds", e.UTCSECONDSMILLISECONDS = "utcsecondsmilliseconds", e.UTCQUARTER = "utcquarter", e.UTCYEARQUARTER = "utcyearquarter", e.UTCQUARTERMONTH = "utcquartermonth", e.UTCYEARQUARTERMONTH = "utcyearquartermonth";
-})(z ||= {});
-var Hi = {
+})(B ||= {});
+var Vi = {
 	year: 1,
 	quarter: 1,
 	month: 1,
@@ -1516,11 +1516,11 @@ var Hi = {
 	minutes: 1,
 	seconds: 1,
 	milliseconds: 1
-}, Ui = j(Hi);
-function Wi(e) {
-	return !!Hi[e];
+}, Hi = M(Vi);
+function Ui(e) {
+	return !!Vi[e];
 }
-var Gi = {
+var Wi = {
 	utcyear: 1,
 	utcquarter: 1,
 	utcmonth: 1,
@@ -1531,10 +1531,10 @@ var Gi = {
 	utcseconds: 1,
 	utcmilliseconds: 1
 };
-function Ki(e) {
-	return !!Gi[e];
+function Gi(e) {
+	return !!Wi[e];
 }
-var qi = {
+var Ki = {
 	yearquarter: 1,
 	yearquartermonth: 1,
 	yearmonth: 1,
@@ -1549,7 +1549,7 @@ var qi = {
 	hoursminutesseconds: 1,
 	minutesseconds: 1,
 	secondsmilliseconds: 1
-}, Ji = {
+}, qi = {
 	utcyearquarter: 1,
 	utcyearquartermonth: 1,
 	utcyearmonth: 1,
@@ -1564,16 +1564,16 @@ var qi = {
 	utchoursminutesseconds: 1,
 	utcminutesseconds: 1,
 	utcsecondsmilliseconds: 1
-}, Yi = Object.assign({}, Gi, Ji);
-function Xi(e) {
-	return !!Yi[e];
+}, Ji = Object.assign({}, Wi, qi);
+function Yi(e) {
+	return !!Ji[e];
 }
-var Zi = Object.assign({}, Hi, Gi, qi, Ji);
-j(Zi);
-function Qi(e) {
-	return !!Zi[e];
+var Xi = Object.assign({}, Vi, Wi, Ki, qi);
+M(Xi);
+function Zi(e) {
+	return !!Xi[e];
 }
-var $i = {
+var Qi = {
 	year: "setFullYear",
 	month: "setMonth",
 	date: "setDate",
@@ -1584,49 +1584,49 @@ var $i = {
 	quarter: null,
 	day: null
 };
-function ea(e, t) {
-	let n = Xi(e), r = n ? new Date(Date.UTC(1972, 0, 1, 0, 0, 0, 0)) : new Date(1972, 0, 1, 0, 0, 0, 0);
-	for (let i of Ui) if (na(e, i)) switch (i) {
-		case z.DAY: throw Error("Cannot convert to TimeUnits containing 'day'");
-		case z.QUARTER: {
-			let { getDateMethod: e, setDateMethod: i } = ta("month", n);
+function $i(e, t) {
+	let n = Yi(e), r = n ? new Date(Date.UTC(1972, 0, 1, 0, 0, 0, 0)) : new Date(1972, 0, 1, 0, 0, 0, 0);
+	for (let i of Hi) if (ta(e, i)) switch (i) {
+		case B.DAY: throw Error("Cannot convert to TimeUnits containing 'day'");
+		case B.QUARTER: {
+			let { getDateMethod: e, setDateMethod: i } = ea("month", n);
 			r[i](Math.floor(t[e]() / 3) * 3);
 			break;
 		}
 		default: {
-			let { getDateMethod: e, setDateMethod: a } = ta(i, n);
+			let { getDateMethod: e, setDateMethod: a } = ea(i, n);
 			r[a](t[e]());
 		}
 	}
 	return r;
 }
-function ta(e, t) {
-	let n = $i[e];
+function ea(e, t) {
+	let n = Qi[e];
 	return {
 		setDateMethod: t ? "setUTC" + n.substr(3) : n,
 		getDateMethod: "get" + (t ? "UTC" : "") + n.substr(3)
 	};
 }
-function na(e, t) {
+function ta(e, t) {
 	let n = e.indexOf(t);
-	return n > -1 && (t !== z.SECONDS || n === 0 || e.charAt(n - 1) !== "i");
+	return n > -1 && (t !== B.SECONDS || n === 0 || e.charAt(n - 1) !== "i");
 }
-function B(e) {
-	return ra(e) || ia(e);
+function V(e) {
+	return na(e) || ra(e);
 }
-function ra(e) {
+function na(e) {
 	return e === "?";
 }
-function ia(e) {
-	return e !== void 0 && e != null && (!!e.enum || !!e.name) && !(0, F.isArray)(e);
+function ra(e) {
+	return e !== void 0 && e != null && (!!e.enum || !!e.name) && !(0, I.isArray)(e);
 }
-function aa(e, t, n) {
-	return (0, F.extend)({}, {
+function ia(e, t, n) {
+	return (0, I.extend)({}, {
 		name: t,
 		enum: n
 	}, e === "?" ? {} : e);
 }
-function oa(e) {
+function aa(e) {
 	let t = {}, n = {};
 	for (let r of e) {
 		let e = [0];
@@ -1650,7 +1650,7 @@ function oa(e) {
 	}
 	return t;
 }
-var sa = {
+var oa = {
 	mark: "m",
 	channel: "c",
 	aggregate: "a",
@@ -1682,17 +1682,17 @@ var sa = {
 		op: "o",
 		order: "or"
 	},
-	scaleProps: oa(Ur),
-	axisProps: oa(an),
-	legendProps: oa(cn)
+	scaleProps: aa(Hr),
+	axisProps: aa(rn),
+	legendProps: aa(sn)
 };
-function ca(e) {
-	if (oi(e)) return sa[e.parent] + "-" + sa[e.parent + "Props"][e.child];
-	if (sa[e]) return sa[e];
+function sa(e) {
+	if (ai(e)) return oa[e.parent] + "-" + oa[e.parent + "Props"][e.child];
+	if (oa[e]) return oa[e];
 	/* istanbul ignore next */
 	throw Error("Default name undefined for " + e);
 }
-var V = [!1, !0], la = {
+var H = [!1, !0], ca = {
 	maxbins: [
 		5,
 		10,
@@ -1707,22 +1707,22 @@ var V = [!1, !0], la = {
 	binned: [!1],
 	anchor: [void 0],
 	nice: [!0]
-}, ua = {
+}, la = {
 	field: [void 0],
 	op: ["min", "mean"],
 	order: ["ascending", "descending"]
-}, da = {
-	type: [void 0, P.LOG],
+}, ua = {
+	type: [void 0, F.LOG],
 	domain: [void 0],
 	base: [void 0],
 	exponent: [1, 2],
 	constant: [void 0],
 	bins: [void 0],
-	clamp: V,
-	nice: V,
-	reverse: V,
-	round: V,
-	zero: V,
+	clamp: H,
+	nice: H,
+	reverse: H,
+	round: H,
+	zero: H,
 	padding: [void 0],
 	paddingInner: [void 0],
 	paddingOuter: [void 0],
@@ -1730,28 +1730,28 @@ var V = [!1, !0], la = {
 	range: [void 0],
 	rangeStep: [17, 21],
 	scheme: [void 0]
-}, fa = {
+}, da = {
 	zindex: [1, 0],
 	offset: [void 0],
 	orient: [void 0],
 	values: [void 0],
 	bandPosition: [void 0],
 	encoding: [void 0],
-	domain: V,
+	domain: H,
 	domainColor: [void 0],
 	domainDash: [void 0],
 	domainDashOffset: [void 0],
 	domainOpacity: [void 0],
 	domainWidth: [void 0],
 	formatType: [void 0],
-	grid: V,
+	grid: H,
 	gridColor: [void 0],
 	gridDash: [void 0],
 	gridDashOffset: [void 0],
 	gridOpacity: [void 0],
 	gridWidth: [void 0],
 	format: [void 0],
-	labels: V,
+	labels: H,
 	labelAlign: [void 0],
 	labelAngle: [void 0],
 	labelBaseline: [void 0],
@@ -1771,7 +1771,7 @@ var V = [!1, !0], la = {
 	maxExtent: [void 0],
 	minExtent: [void 0],
 	position: [void 0],
-	ticks: V,
+	ticks: H,
 	tickColor: [void 0],
 	tickCount: [void 0],
 	tickDash: [void 0],
@@ -1798,41 +1798,41 @@ var V = [!1, !0], la = {
 	titlePadding: [void 0],
 	titleX: [void 0],
 	titleY: [void 0]
-}, pa = {
+}, fa = {
 	mark: [
-		ji,
-		"bar",
 		Ai,
+		"bar",
 		ki,
-		Mi,
-		Fi,
-		Pi
+		Oi,
+		ji,
+		Pi,
+		Ni
 	],
 	channel: [
 		"x",
 		"y",
 		"row",
-		Je,
-		it,
-		et
+		qe,
+		rt,
+		$e
 	],
 	aggregate: [void 0, "mean"],
-	autoCount: V,
-	bin: V,
-	hasFn: V,
+	autoCount: H,
+	bin: H,
+	hasFn: H,
 	timeUnit: [
 		void 0,
-		z.YEAR,
-		z.MONTH,
-		z.MINUTES,
-		z.SECONDS
+		B.YEAR,
+		B.MONTH,
+		B.MINUTES,
+		B.SECONDS
 	],
 	field: [void 0],
 	type: [
-		kr,
-		Dr,
-		N,
-		Or
+		Or,
+		Er,
+		P,
+		Dr
 	],
 	sort: ["ascending", "descending"],
 	stack: [
@@ -1845,12 +1845,12 @@ var V = [!1, !0], la = {
 	format: [void 0],
 	title: [void 0],
 	scale: [!0],
-	axis: V,
-	legend: V,
-	binProps: la,
-	sortProps: ua,
-	scaleProps: da,
-	axisProps: fa,
+	axis: H,
+	legend: H,
+	binProps: ca,
+	sortProps: la,
+	scaleProps: ua,
+	axisProps: da,
 	legendProps: {
 		orient: ["left", "right"],
 		format: [void 0],
@@ -1916,23 +1916,23 @@ var V = [!1, !0], la = {
 		titlePadding: [void 0]
 	}
 };
-function ma(e, t, n) {
-	if (e === "field" || oi(e) && e.parent === "sort" && e.child === "field") return t.fieldNames();
+function pa(e, t, n) {
+	if (e === "field" || ai(e) && e.parent === "sort" && e.child === "field") return t.fieldNames();
 	let r;
-	if (r = oi(e) ? n.enum[e.parent + "Props"][e.child] : n.enum[e], r !== void 0) return r;
+	if (r = ai(e) ? n.enum[e.parent + "Props"][e.child] : n.enum[e], r !== void 0) return r;
 	/* istanbul ignore next */
 	throw Error("No default enumValues for " + JSON.stringify(e));
 }
 //#endregion
 //#region ../node_modules/.pnpm/compassql@0.21.2_vega@6.2.0/node_modules/compassql/build/src/config.js
-var ha = {
+var ma = {
 	verbose: !1,
 	defaultSpecConfig: {
 		line: { point: !0 },
 		scale: { useUnaggregatedDomain: !0 }
 	},
-	propertyPrecedence: Oi.map(Si),
-	enum: pa,
+	propertyPrecedence: Di.map(xi),
+	enum: fa,
 	numberNominalProportion: .05,
 	numberNominalLimit: 40,
 	constraintManuallySpecifiedValue: !1,
@@ -1977,7 +1977,7 @@ var ha = {
 	maxGoodCardinalityForColor: 7,
 	minPercentUniqueForKey: .8,
 	minCardinalityForKey: 50
-}, ga = {
+}, ha = {
 	argmax: 1,
 	argmin: 1,
 	average: 1,
@@ -2001,24 +2001,24 @@ var ha = {
 	variance: 1,
 	variancep: 1
 };
-function _a(e) {
+function ga(e) {
 	return !!e && !!e.argmin;
 }
-function va(e) {
+function _a(e) {
 	return !!e && !!e.argmax;
 }
-j(ga);
-function ya(e) {
-	return Ne(e) && !!ga[e];
+M(ha);
+function va(e) {
+	return Me(e) && !!ha[e];
 }
-var ba = [
+var ya = [
 	"count",
 	"sum",
 	"distinct",
 	"valid",
 	"missing"
 ];
-Be([
+ze([
 	"mean",
 	"average",
 	"median",
@@ -2029,62 +2029,62 @@ Be([
 ]);
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/bin.js
+function ba(e) {
+	return Re(e) && (e = Na(e, void 0)), "bin" + M(e).map((t) => Ve(`_${t}_${e[t]}`)).join("");
+}
 function xa(e) {
-	return ze(e) && (e = Pa(e, void 0)), "bin" + j(e).map((t) => He(`_${t}_${e[t]}`)).join("");
+	return e === !0 || Sa(e) && !e.binned;
 }
 function Sa(e) {
-	return e === !0 || Ca(e) && !e.binned;
+	return je(e);
 }
 function Ca(e) {
-	return Me(e);
-}
-function wa(e) {
 	switch (e) {
 		case "row":
-		case Je:
-		case it:
+		case qe:
+		case rt:
+		case $e:
 		case et:
 		case tt:
-		case nt:
-		case ct:
+		case st:
+		case it:
 		case at:
 		case ot:
-		case st:
-		case rt: return 6;
+		case nt: return 6;
 		default: return 10;
 	}
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/channeldef.js
+function wa(e) {
+	return !!e && !!e.condition && !Ae(e.condition) && Ta(e.condition);
+}
 function Ta(e) {
-	return !!e && !!e.condition && !je(e.condition) && Ea(e.condition);
+	return !!e && (!!e.field || e.aggregate === "count");
 }
 function Ea(e) {
-	return !!e && (!!e.field || e.aggregate === "count");
+	return Ta(e) && Me(e.field);
 }
 function Da(e) {
-	return Ea(e) && Ne(e.field);
-}
-function Oa(e) {
 	return !!e.op;
 }
-function ka(e, t = {}) {
+function Oa(e, t = {}) {
 	let n = e.field, r = t.prefix, i = t.suffix, a = "";
-	if (Ma(e)) n = Ke("count");
+	if (ja(e)) n = Ge("count");
 	else {
 		let r;
 		if (!t.nofn) {
-			if (Oa(e)) r = e.op;
+			if (Da(e)) r = e.op;
 			else {
 				let { bin: o, aggregate: s, timeUnit: c } = e;
-				Sa(o) ? (r = xa(o), i = (t.binSuffix || "") + (t.suffix || "")) : s ? va(s) ? (a = `.${n}`, n = `argmax_${s.argmax}`) : _a(s) ? (a = `.${n}`, n = `argmin_${s.argmin}`) : r = String(s) : c && (r = String(c));
+				xa(o) ? (r = ba(o), i = (t.binSuffix || "") + (t.suffix || "")) : s ? _a(s) ? (a = `.${n}`, n = `argmax_${s.argmax}`) : ga(s) ? (a = `.${n}`, n = `argmin_${s.argmin}`) : r = String(s) : c && (r = String(c));
 			}
 		}
 		r && (n = n ? `${r}_${n}` : r);
 	}
-	return i && (n = `${n}_${i}`), r && (n = `${r}_${n}`), t.forAs ? n : t.expr ? Ue(n, t.expr) + a : We(n) + a;
+	return i && (n = `${n}_${i}`), r && (n = `${r}_${n}`), t.forAs ? n : t.expr ? He(n, t.expr) + a : Ue(n) + a;
 }
-function Aa(e) {
+function ka(e) {
 	switch (e.type) {
 		case "nominal":
 		case "ordinal":
@@ -2092,23 +2092,23 @@ function Aa(e) {
 		case "quantitative": return !!e.bin;
 		case "temporal": return !1;
 	}
-	throw Error(M.invalidFieldType(e.type));
+	throw Error(N.invalidFieldType(e.type));
 }
-function ja(e) {
-	return !Aa(e);
+function Aa(e) {
+	return !ka(e);
 }
-function Ma(e) {
+function ja(e) {
 	return e.aggregate === "count";
 }
-function Na(e) {
-	if (Ea(e)) return e;
-	if (Ta(e)) return e.condition;
+function Ma(e) {
+	if (Ta(e)) return e;
+	if (wa(e)) return e.condition;
 }
-function Pa(e, t) {
-	return ze(e) ? { maxbins: wa(t) } : e === "binned" ? { binned: !0 } : !e.maxbins && !e.step ? Object.assign({}, e, { maxbins: wa(t) }) : e;
+function Na(e, t) {
+	return Re(e) ? { maxbins: Ca(t) } : e === "binned" ? { binned: !0 } : !e.maxbins && !e.step ? Object.assign({}, e, { maxbins: Ca(t) }) : e;
 }
-var Fa = { compatible: !0 };
-function Ia(e, t) {
+var Pa = { compatible: !0 };
+function Fa(e, t) {
 	let n = e.type;
 	if (n === "geojson" && t !== "shape") return {
 		compatible: !1,
@@ -2117,10 +2117,10 @@ function Ia(e, t) {
 	switch (t) {
 		case "row":
 		case "column":
-		case "facet": return ja(e) ? {
+		case "facet": return Aa(e) ? {
 			compatible: !1,
-			warning: M.facetChannelShouldBeDiscrete(t)
-		} : Fa;
+			warning: N.facetChannelShouldBeDiscrete(t)
+		} : Pa;
 		case "x":
 		case "y":
 		case "color":
@@ -2130,11 +2130,11 @@ function Ia(e, t) {
 		case "detail":
 		case "key":
 		case "tooltip":
-		case "href": return Fa;
+		case "href": return Pa;
 		case "longitude":
 		case "longitude2":
 		case "latitude":
-		case "latitude2": return n === "quantitative" ? Fa : {
+		case "latitude2": return n === "quantitative" ? Pa : {
 			compatible: !1,
 			warning: `Channel ${t} should be used with a quantitative field only, not ${e.type} field.`
 		};
@@ -2147,51 +2147,51 @@ function Ia(e, t) {
 		case "y2": return n === "nominal" && !e.sort ? {
 			compatible: !1,
 			warning: `Channel ${t} should not be used with an unsorted discrete field.`
-		} : Fa;
-		case "shape": return A([
+		} : Pa;
+		case "shape": return j([
 			"ordinal",
 			"nominal",
 			"geojson"
-		], e.type) ? Fa : {
+		], e.type) ? Pa : {
 			compatible: !1,
 			warning: "Shape channel should be used with only either discrete or geojson data."
 		};
 		case "order": return e.type === "nominal" && !("sort" in e) ? {
 			compatible: !1,
 			warning: "Channel order is inappropriate for nominal field, which has no inherent order."
-		} : Fa;
+		} : Pa;
 	}
 	throw Error("channelCompatability not implemented for channel " + t);
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/compile/scale/type.js
-function La(e, t, n, r) {
-	let i = Ra(t, n, r), { type: a } = e;
-	return Yt(t) ? a === void 0 ? i : Qr(t, a) ? Zr(a, n.type) ? a : (Tr(M.scaleTypeNotWorkWithFieldDef(a, i)), i) : (Tr(M.scaleTypeNotWorkWithChannel(t, a, i)), i) : null;
+function Ia(e, t, n, r) {
+	let i = La(t, n, r), { type: a } = e;
+	return Jt(t) ? a === void 0 ? i : Zr(t, a) ? Xr(a, n.type) ? a : (wr(N.scaleTypeNotWorkWithFieldDef(a, i)), i) : (wr(N.scaleTypeNotWorkWithChannel(t, a, i)), i) : null;
 }
-function Ra(e, t, n) {
+function La(e, t, n) {
 	switch (t.type) {
 		case "nominal":
-		case "ordinal": return _t(e) || tn(e) === "discrete" ? (e === "shape" && t.type === "ordinal" && Tr(M.discreteChannelCannotEncode(e, "ordinal")), "ordinal") : A(["x", "y"], e) && (A([
+		case "ordinal": return gt(e) || en(e) === "discrete" ? (e === "shape" && t.type === "ordinal" && wr(N.discreteChannelCannotEncode(e, "ordinal")), "ordinal") : j(["x", "y"], e) && (j([
 			"rect",
 			"bar",
 			"rule"
 		], n) || n === "bar") ? "band" : "point";
-		case "temporal": return _t(e) ? "time" : tn(e) === "discrete" ? (Tr(M.discreteChannelCannotEncode(e, "temporal")), "ordinal") : "time";
-		case "quantitative": return _t(e) ? Sa(t.bin) ? "bin-ordinal" : "linear" : tn(e) === "discrete" ? (Tr(M.discreteChannelCannotEncode(e, "quantitative")), "ordinal") : "linear";
+		case "temporal": return gt(e) ? "time" : en(e) === "discrete" ? (wr(N.discreteChannelCannotEncode(e, "temporal")), "ordinal") : "time";
+		case "quantitative": return gt(e) ? xa(t.bin) ? "bin-ordinal" : "linear" : en(e) === "discrete" ? (wr(N.discreteChannelCannotEncode(e, "quantitative")), "ordinal") : "linear";
 		case "geojson": return;
 	}
 	/* istanbul ignore next: should never reach this */
-	throw Error(M.invalidFieldType(t.type));
+	throw Error(N.invalidFieldType(t.type));
 }
 //#endregion
 //#region ../node_modules/.pnpm/compassql@0.21.2_vega@6.2.0/node_modules/compassql/build/src/query/expandedtype.js
-var H;
+var Ra;
 (function(e) {
-	e.QUANTITATIVE = N, e.ORDINAL = Dr, e.TEMPORAL = Or, e.NOMINAL = kr, e.KEY = "key";
-})(H ||= {});
+	e.QUANTITATIVE = P, e.ORDINAL = Er, e.TEMPORAL = Dr, e.NOMINAL = Or, e.KEY = "key";
+})(Ra ||= {});
 function za(e) {
-	return e === "ordinal" || e === "nominal" || e === H.KEY;
+	return e === "ordinal" || e === "nominal" || e === Ra.KEY;
 }
 //#endregion
 //#region ../node_modules/.pnpm/compassql@0.21.2_vega@6.2.0/node_modules/compassql/build/src/propindex.js
@@ -2200,13 +2200,13 @@ var U = class e {
 		this.index = e ? Object.assign({}, e) : {};
 	}
 	has(e) {
-		return Si(e) in this.index;
+		return xi(e) in this.index;
 	}
 	get(e) {
-		return this.index[Si(e)];
+		return this.index[xi(e)];
 	}
 	set(e, t) {
-		return this.index[Si(e)] = t, this;
+		return this.index[xi(e)] = t, this;
 	}
 	setByKey(e, t) {
 		this.index[e] = t;
@@ -2217,7 +2217,7 @@ var U = class e {
 		return n;
 	}
 	size() {
-		return (0, F.keys)(this.index).length;
+		return (0, I.keys)(this.index).length;
 	}
 	duplicate() {
 		return new e(this.index);
@@ -2227,7 +2227,7 @@ var U = class e {
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/encoding.js
 function Ba(e, t) {
 	let n = e && e[t];
-	return n ? je(n) ? Ve(n, (e) => !!e.field) : Ea(n) || Ta(n) : !1;
+	return n ? Ae(n) ? Be(n, (e) => !!e.field) : Ta(n) || wa(n) : !1;
 }
 //#endregion
 //#region ../node_modules/.pnpm/vega-lite@3.4.0_vega@6.2.0/node_modules/vega-lite/build/src/stack.js
@@ -2241,39 +2241,39 @@ function Ha(e) {
 }
 var Ua = [
 	"bar",
+	Oi,
+	Mi,
+	Ai,
+	Fi,
+	Ii,
 	ki,
 	Ni,
-	ji,
-	Ii,
-	Li,
-	Ai,
-	Pi,
-	Fi
-], Wa = ["bar", ki];
+	Pi
+], Wa = ["bar", Oi];
 function Ga(e) {
 	let t = e.x, n = e.y;
-	if (Ea(t) && Ea(n)) {
+	if (Ta(t) && Ta(n)) {
 		if (t.type === "quantitative" && n.type === "quantitative") {
 			if (t.stack) return "x";
 			if (n.stack) return "y";
 			if (!!t.aggregate != !!n.aggregate) return t.aggregate ? "x" : "y";
 		} else if (t.type === "quantitative") return "x";
 		else if (n.type === "quantitative") return "y";
-	} else if (Ea(t) && t.type === "quantitative") return "x";
-	else if (Ea(n) && n.type === "quantitative") return "y";
+	} else if (Ta(t) && t.type === "quantitative") return "x";
+	else if (Ta(n) && n.type === "quantitative") return "y";
 }
 function Ka(e, t, n, r = {}) {
-	let i = Vi(e) ? e.type : e;
-	if (!A(Ua, i)) return null;
+	let i = Bi(e) ? e.type : e;
+	if (!j(Ua, i)) return null;
 	let a = Ga(t);
 	if (!a) return null;
-	let o = t[a], s = Da(o) ? ka(o, {}) : void 0, c = a === "x" ? "y" : "x", l = t[c], u = Da(l) ? ka(l, {}) : void 0, d = zt.reduce((e, n) => {
+	let o = t[a], s = Ea(o) ? Oa(o, {}) : void 0, c = a === "x" ? "y" : "x", l = t[c], u = Ea(l) ? Oa(l, {}) : void 0, d = Rt.reduce((e, n) => {
 		if (n !== "tooltip" && Ba(t, n)) {
 			let r = t[n];
-			(je(r) ? r : [r]).forEach((t) => {
-				let r = Na(t);
+			(Ae(r) ? r : [r]).forEach((t) => {
+				let r = Ma(t);
 				if (r.aggregate) return;
-				let i = Da(r) ? ka(r, {}) : void 0;
+				let i = Ea(r) ? Oa(r, {}) : void 0;
 				(!i || i !== u && i !== s) && e.push({
 					channel: n,
 					fieldDef: r
@@ -2282,15 +2282,15 @@ function Ka(e, t, n, r = {}) {
 		}
 		return e;
 	}, []), f;
-	if (o.stack === void 0 ? d.length > 0 && (f = A(Wa, i) ? Ge(n, "zero") : n) : f = ze(o.stack) ? o.stack ? "zero" : null : o.stack, !f || !Ha(f)) return null;
-	if (o.scale && o.scale.type && o.scale.type !== P.LINEAR) {
+	if (o.stack === void 0 ? d.length > 0 && (f = j(Wa, i) ? We(n, "zero") : n) : f = Re(o.stack) ? o.stack ? "zero" : null : o.stack, !f || !Ha(f)) return null;
+	if (o.scale && o.scale.type && o.scale.type !== F.LINEAR) {
 		if (r.disallowNonLinearStack) return null;
-		Tr(M.cannotStackNonLinearScale(o.scale.type));
+		wr(N.cannotStackNonLinearScale(o.scale.type));
 	}
-	return Ba(t, a === "x" ? "x2" : "y2") ? (o.stack !== void 0 && Tr(M.cannotStackRangedMark(a)), null) : (o.aggregate && !A(ba, o.aggregate) && Tr(M.stackNonSummativeAggregate(o.aggregate)), {
+	return Ba(t, a === "x" ? "x2" : "y2") ? (o.stack !== void 0 && wr(N.cannotStackRangedMark(a)), null) : (o.aggregate && !j(ya, o.aggregate) && wr(N.stackNonSummativeAggregate(o.aggregate)), {
 		groupbyChannel: l ? c : void 0,
 		fieldChannel: a,
-		impute: zi(i),
+		impute: Ri(i),
 		stackBy: d,
 		offset: f
 	});
@@ -2298,7 +2298,7 @@ function Ka(e, t, n, r = {}) {
 //#endregion
 //#region ../node_modules/.pnpm/compassql@0.21.2_vega@6.2.0/node_modules/compassql/build/src/query/spec.js
 function qa(e) {
-	return ri(e.encodings, (e) => G(e) && !B(e.aggregate) && !!e.aggregate || mo(e));
+	return ni(e.encodings, (e) => G(e) && !V(e.aggregate) && !!e.aggregate || mo(e));
 }
 function Ja(e) {
 	if (!Za(e)) return null;
@@ -2309,31 +2309,31 @@ function Ja(e) {
 	return Ka(n, t, void 0, { disallowNonLinearStack: !0 });
 }
 function Ya(e) {
-	for (let t of e.encodings) if (t[R.STACK] !== void 0 && !B(t[R.STACK])) return t[R.STACK];
+	for (let t of e.encodings) if (t[z.STACK] !== void 0 && !V(t[z.STACK])) return t[z.STACK];
 }
 function Xa(e) {
-	for (let t of e.encodings) if (t[R.STACK] !== void 0 && !B(t.channel)) return t.channel;
+	for (let t of e.encodings) if (t[z.STACK] !== void 0 && !V(t.channel)) return t.channel;
 	return null;
 }
 function Za(e) {
-	if (B(e.mark)) return !1;
+	if (V(e.mark)) return !1;
 	let t = [
-		R.STACK,
-		R.CHANNEL,
-		R.MARK,
-		R.FIELD,
-		R.AGGREGATE,
-		R.AUTOCOUNT,
-		R.SCALE,
-		Ti("scale", "type"),
-		R.TYPE
-	], n = (0, F.toMap)(ii(Di, t)), r = e.encodings.filter((e) => !q(e));
+		z.STACK,
+		z.CHANNEL,
+		z.MARK,
+		z.FIELD,
+		z.AGGREGATE,
+		z.AUTOCOUNT,
+		z.SCALE,
+		wi("scale", "type"),
+		z.TYPE
+	], n = (0, I.toMap)(ri(Ei, t)), r = e.encodings.filter((e) => !q(e));
 	for (let e of r) if (Qa(e, { exclude: n })) return !1;
 	return !0;
 }
 function Qa(e, t = {}) {
-	if (!(0, F.isObject)(e)) return !1;
-	for (let n in e) if (e.hasOwnProperty(n) && (B(e[n]) && (!t.exclude || !t.exclude[n]) || Qa(e[n], t))) return !0;
+	if (!(0, I.isObject)(e)) return !1;
+	for (let n in e) if (e.hasOwnProperty(n) && (V(e[n]) && (!t.exclude || !t.exclude[n]) || Qa(e[n], t))) return !0;
 	return !1;
 }
 //#endregion
@@ -2345,12 +2345,12 @@ function eo(e) {
 	return (t) => e[t] === void 0 ? t : e[t];
 }
 function to(e, t) {
-	return B(e) ? !ra(e) && e.enum ? "?" + JSON.stringify(e.enum) : "?" : t ? t(e) : e;
+	return V(e) ? !na(e) && e.enum ? "?" + JSON.stringify(e.enum) : "?" : t ? t(e) : e;
 }
 function no(e, t) {
 	return t ? t(e) : e;
 }
-var ro = new U(), io = [].concat(Oi, hi, [R.TRANSFORM, R.STACK], bi).reduce((e, t) => e.set(t, !0), new U()), ao = {
+var ro = new U(), io = [].concat(Di, mi, [z.TRANSFORM, z.STACK], yi).reduce((e, t) => e.set(t, !0), new U()), ao = {
 	axis: {
 		x: !0,
 		y: !0,
@@ -2386,9 +2386,9 @@ var ro = new U(), io = [].concat(Oi, hi, [R.TRANSFORM, R.STACK], bi).reduce((e,
 };
 function oo(e, t = io, n = ro) {
 	let r = [];
-	t.get(R.MARK) && r.push(to(e.mark, n.get(R.MARK))), e.transform && e.transform.length > 0 && r.push("transform:" + JSON.stringify(e.transform));
+	t.get(z.MARK) && r.push(to(e.mark, n.get(z.MARK))), e.transform && e.transform.length > 0 && r.push("transform:" + JSON.stringify(e.transform));
 	let i;
-	if (t.get(R.STACK) && (i = Ja(e)), e.encodings) {
+	if (t.get(z.STACK) && (i = Ja(e)), e.encodings) {
 		let a = e.encodings.reduce((e, r) => {
 			if (!q(r)) {
 				let a;
@@ -2398,7 +2398,7 @@ function oo(e, t = io, n = ro) {
 		}, []).sort().join("|");
 		a && r.push(a);
 	}
-	for (let n of bi) {
+	for (let n of yi) {
 		let i = n.toString();
 		if (t.get(n) && e[i]) {
 			let t = e[i];
@@ -2409,21 +2409,21 @@ function oo(e, t = io, n = ro) {
 }
 function so(e, t = io, n = ro) {
 	let r = [];
-	if (t.get(R.CHANNEL) && r.push(to(e.channel, n.get(R.CHANNEL))), G(e)) {
+	if (t.get(z.CHANNEL) && r.push(to(e.channel, n.get(z.CHANNEL))), G(e)) {
 		let i = co(e, t, n);
 		i && r.push(i);
 	} else W(e) ? r.push(e.value) : K(e) && r.push("autocount()");
 	return r.join(":");
 }
 function co(e, t = io, n = ro) {
-	if (t.get(R.AGGREGATE) && q(e)) return "-";
+	if (t.get(z.AGGREGATE) && q(e)) return "-";
 	let r = lo(e, t, n), i = uo(e, t, n), a;
 	if (G(e)) {
-		if (a = t.get("field") ? to(e.field, n.get("field")) : "...", t.get(R.TYPE)) {
-			if (B(e.type)) a += "," + to(e.type, n.get(R.TYPE));
+		if (a = t.get("field") ? to(e.field, n.get("field")) : "...", t.get(z.TYPE)) {
+			if (V(e.type)) a += "," + to(e.type, n.get(z.TYPE));
 			else {
 				let t = ((e.type || "quantitative") + "").substr(0, 1);
-				a += "," + to(t, n.get(R.TYPE));
+				a += "," + to(t, n.get(z.TYPE));
 			}
 		}
 		a += i.map((e) => {
@@ -2431,33 +2431,33 @@ function co(e, t = io, n = ro) {
 			return "," + e.key + "=" + t;
 		}).join("");
 	} else K(e) && (a = "*,q");
-	return a ? r ? ((0, F.isString)(r) ? r : "?" + ((0, F.keys)(r).length > 0 ? JSON.stringify(r) : "")) + "(" + a + ")" : a : null;
+	return a ? r ? ((0, I.isString)(r) ? r : "?" + ((0, I.keys)(r).length > 0 ? JSON.stringify(r) : "")) + "(" + a + ")" : a : null;
 }
 function lo(e, t, n) {
-	if (t.get(R.AGGREGATE) && e.aggregate && !B(e.aggregate)) return no(e.aggregate, n.get(R.AGGREGATE));
-	if (t.get(R.AGGREGATE) && mo(e)) return no("count", n.get(R.AGGREGATE));
-	if (t.get(R.TIMEUNIT) && e.timeUnit && !B(e.timeUnit)) return no(e.timeUnit, n.get(R.TIMEUNIT));
-	if (t.get(R.BIN) && e.bin && !B(e.bin)) return "bin";
+	if (t.get(z.AGGREGATE) && e.aggregate && !V(e.aggregate)) return no(e.aggregate, n.get(z.AGGREGATE));
+	if (t.get(z.AGGREGATE) && mo(e)) return no("count", n.get(z.AGGREGATE));
+	if (t.get(z.TIMEUNIT) && e.timeUnit && !V(e.timeUnit)) return no(e.timeUnit, n.get(z.TIMEUNIT));
+	if (t.get(z.BIN) && e.bin && !V(e.bin)) return "bin";
 	{
 		let n = null;
 		for (let r of [
-			R.AGGREGATE,
-			R.AUTOCOUNT,
-			R.TIMEUNIT,
-			R.BIN
+			z.AGGREGATE,
+			z.AUTOCOUNT,
+			z.TIMEUNIT,
+			z.BIN
 		]) {
 			let i = e[r];
-			t.get(r) && e[r] && B(i) && (n ||= {}, n[r] = ra(i) ? i : i.enum);
+			t.get(r) && e[r] && V(i) && (n ||= {}, n[r] = na(i) ? i : i.enum);
 		}
 		return n && e.hasFn && (n.hasFn = !0), n;
 	}
 }
 function uo(e, t, n) {
 	let r = [];
-	if (!(0, F.isBoolean)(e.bin) && !ra(e.bin)) {
+	if (!(0, I.isBoolean)(e.bin) && !na(e.bin)) {
 		let i = e.bin;
 		for (let e in i) {
-			let a = Ti("bin", e);
+			let a = wi("bin", e);
 			a && t.get(a) && i[e] !== void 0 && r.push({
 				key: e,
 				value: to(i[e], n.get(a))
@@ -2466,25 +2466,25 @@ function uo(e, t, n) {
 		r.sort((e, t) => e.key.localeCompare(t.key));
 	}
 	for (let i of [
-		R.SCALE,
-		R.SORT,
-		R.STACK,
-		R.AXIS,
-		R.LEGEND
-	]) if (!(!B(e.channel) && !ao[i][e.channel]) && t.get(i) && e[i] !== void 0) {
+		z.SCALE,
+		z.SORT,
+		z.STACK,
+		z.AXIS,
+		z.LEGEND
+	]) if (!(!V(e.channel) && !ao[i][e.channel]) && t.get(i) && e[i] !== void 0) {
 		let a = e[i];
-		if ((0, F.isBoolean)(a) || a === null) r.push({
+		if ((0, I.isBoolean)(a) || a === null) r.push({
 			key: i + "",
 			value: a || !1
 		});
-		else if ((0, F.isString)(a)) r.push({
+		else if ((0, I.isString)(a)) r.push({
 			key: i + "",
 			value: no(JSON.stringify(a), n.get(i))
 		});
 		else {
 			let e = [];
 			for (let r in a) {
-				let o = Ti(i, r);
+				let o = wi(i, r);
 				o && t.get(o) && a[r] !== void 0 && e.push({
 					key: r,
 					value: to(a[r], n.get(o))
@@ -2520,7 +2520,7 @@ var po;
 	e.encoding = t;
 	function n(e) {
 		let t = {};
-		t.field = e[0], t.type = jr(e[1].toUpperCase()) || "?";
+		t.field = e[0], t.type = Ar(e[1].toUpperCase()) || "?";
 		let n = e[2], i = 0, a = 0;
 		for (; a < n.length;) {
 			let e = n.indexOf("=", a), o;
@@ -2538,7 +2538,7 @@ var po;
 					let e = a, t = n.indexOf(",", a + s.length);
 					t === -1 && (t = n.length), a = t + 1, o = JSON.parse(n.substring(e + s.length + 1, t));
 				}
-				di(s) ? t[s] = o : (t.bin = t.bin || {}, t.bin[s] = o);
+				ui(s) ? t[s] = o : (t.bin = t.bin || {}, t.bin[s] = o);
 			} else break;
 		}
 		return t;
@@ -2552,13 +2552,13 @@ var po;
 		let t = {};
 		if (e[0] === "?") {
 			let i = r(1, e, "}"), a = JSON.parse(e.substring(1, i + 1));
-			for (let e in a) t[e] = (0, F.isArray)(a[e]) ? { enum: a[e] } : a[e];
+			for (let e in a) t[e] = (0, I.isArray)(a[e]) ? { enum: a[e] } : a[e];
 			return Object.assign({}, t, n(fo(e.substring(i + 2, e.length - 1), ",", 2)));
 		}
 		{
 			let t = e.substring(0, e.indexOf("(")), r = fo(e.substring(t.length + 1, e.length - 1), ",", 2);
-			if (ya(t)) return Object.assign({ aggregate: t }, n(r));
-			if (Qi(t)) return Object.assign({ timeUnit: t }, n(r));
+			if (va(t)) return Object.assign({ aggregate: t }, n(r));
+			if (Zi(t)) return Object.assign({ timeUnit: t }, n(r));
 			if (t === "bin") return Object.assign({ bin: {} }, n(r));
 		}
 	}
@@ -2582,24 +2582,24 @@ function mo(e) {
 	return K(e) && e.autoCount === !0;
 }
 var ho = [
-	R.AGGREGATE,
-	R.BIN,
-	R.TIMEUNIT,
-	R.FIELD,
-	R.TYPE,
-	R.SCALE,
-	R.SORT,
-	R.AXIS,
-	R.LEGEND,
-	R.STACK,
-	R.FORMAT
+	z.AGGREGATE,
+	z.BIN,
+	z.TIMEUNIT,
+	z.FIELD,
+	z.TYPE,
+	z.SCALE,
+	z.SORT,
+	z.AXIS,
+	z.LEGEND,
+	z.STACK,
+	z.FORMAT
 ];
 function go(e, t) {
 	let { wildcardMode: n = "skip" } = t, r = {};
 	for (let n of e) {
 		if (q(n)) continue;
 		let { channel: e } = n;
-		if (B(e)) throw Error("Cannot convert wildcard channel to a fixed channel");
+		if (V(e)) throw Error("Cannot convert wildcard channel to a fixed channel");
 		let i = W(n) ? _o(n) : vo(n, t);
 		if (i === null) {
 			if (t.wildcardMode === "null") return null;
@@ -2611,7 +2611,7 @@ function go(e, t) {
 }
 function _o(e) {
 	let { value: t } = e;
-	return B(t) ? null : { value: t };
+	return V(t) ? null : { value: t };
 }
 function vo(e, t = {}) {
 	let { props: n = ho, schema: r, wildcardMode: i = "skip" } = t;
@@ -2619,15 +2619,15 @@ function vo(e, t = {}) {
 		let t = {};
 		for (let a of n) {
 			let n = e[a];
-			if (B(n)) {
+			if (V(n)) {
 				if (i === "skip") continue;
 				return null;
 			}
 			if (n !== void 0) {
 				if (!(!ao[a] || ao[a][e.channel])) continue;
-				if (di(a) && (0, F.isObject)(n)) {
+				if (ui(a) && (0, I.isObject)(n)) {
 					n = Object.assign({}, n);
-					for (let e in n) if (B(n[e])) {
+					for (let e in n) if (V(n[e])) {
 						if (i === "null") return null;
 						delete n[e];
 					}
@@ -2635,9 +2635,9 @@ function vo(e, t = {}) {
 				if (a === "bin" && n === !1) continue;
 				a === "type" && n === "key" ? t.type = "nominal" : t[a] = n;
 			}
-			if (a === R.SCALE && r && e.type === "ordinal") {
+			if (a === z.SCALE && r && e.type === "ordinal") {
 				let n = e.scale, { ordinalDomain: i } = r.fieldSchema(e.field);
-				n !== null && i && (t[R.SCALE] = Object.assign({ domain: i }, (0, F.isObject)(n) ? n : {}));
+				n !== null && i && (t[z.SCALE] = Object.assign({ domain: i }, (0, I.isObject)(n) ? n : {}));
 			}
 		}
 		return t;
@@ -2659,21 +2659,21 @@ function bo(e) {
 			"timeUnit",
 			"type"
 		] });
-		return Aa(t) || !!t.timeUnit;
+		return ka(t) || !!t.timeUnit;
 	}
 	return !1;
 }
 function xo(e) {
 	let t = e.scale === !0 || e.scale === "?" ? {} : e.scale || {}, { type: n, channel: r, timeUnit: i, bin: a } = e;
-	if (B(t.type) || B(n) || B(r) || B(a)) return;
+	if (V(t.type) || V(n) || V(r) || V(a)) return;
 	if (t.type) return t.type;
-	if (n === "temporal" && B(i) || n === "quantitative" && B(a)) return;
+	if (n === "temporal" && V(i) || n === "quantitative" && V(a)) return;
 	let o = {
-		type: n === H.KEY ? "nominal" : n,
+		type: n === Ra.KEY ? "nominal" : n,
 		timeUnit: i,
 		bin: a
 	};
-	return La({ type: t.type }, r, o, void 0);
+	return Ia({ type: t.type }, r, o, void 0);
 }
 //#endregion
 //#region ../node_modules/.pnpm/d3-time@0.1.1/node_modules/d3-time/src/interval.js
@@ -3077,7 +3077,7 @@ var ns, rs, is, as, os, ss, cs, ls = n((() => {
 	}
 	n.exports = m(u), n.exports.utc = m(d);
 })), Js = /* @__PURE__ */ i(((e, t) => {
-	var n = ti(), r = qs(), i = 1e-15;
+	var n = ei(), r = qs(), i = 1e-15;
 	function a(e) {
 		if (!e) throw Error("Missing binning options.");
 		var t = e.maxbins || 15, n = e.base || 10, r = Math.log(n), i = e.div || [5, 2], a = e.min, l = e.max, u = l - a, d, f, p, m, h, g, _;
@@ -3117,7 +3117,7 @@ var ns, rs, is, as, os, ss, cs, ls = n((() => {
 	}
 	a.date = function(e) {
 		if (!e) throw Error("Missing date binning options.");
-		var t = e.utc ? r.utc : r, n = e.min, i = e.max, o = e.maxbins || 20, s = e.minbins || 4, c = i - +n, d = e.unit ? t[e.unit] : t.find(c, s, o), f = a({
+		var t = e.utc ? r.utc : r, n = e.min, i = e.max, o = e.maxbins || 20, s = e.minbins || 4, c = +i - n, d = e.unit ? t[e.unit] : t.find(c, s, o), f = a({
 			min: d.min == null ? d.unit(n) : d.min,
 			max: d.max == null ? d.unit(i) : d.max,
 			maxbins: o,
@@ -3127,7 +3127,7 @@ var ns, rs, is, as, os, ss, cs, ls = n((() => {
 		return f.unit = d, f.index = u, e.raw || (f.value = l), f;
 	}, t.exports = a;
 })), Ys = /* @__PURE__ */ i(((e, t) => {
-	var n = ti(), r = "__types__", i = {
+	var n = ei(), r = "__types__", i = {
 		boolean: n.boolean,
 		integer: n.number,
 		number: n.number,
@@ -3196,7 +3196,7 @@ var ns, rs, is, as, os, ss, cs, ls = n((() => {
 	}
 	l.annotation = o, l.all = u, l.infer = d, l.inferAll = f, l.parsers = i, t.exports = l;
 })), Xs = /* @__PURE__ */ i(((e, t) => {
-	var n = ti(), r = t.exports;
+	var n = ei(), r = t.exports;
 	r.repeat = function(e, t) {
 		var n = Array(t), r;
 		for (r = 0; r < t; ++r) n[r] = e;
@@ -3275,7 +3275,7 @@ var ns, rs, is, as, os, ss, cs, ls = n((() => {
 		}, s;
 	};
 })), Zs = /* @__PURE__ */ i(((e, t) => {
-	var n = ti(), r = Ys(), i = Xs(), a = t.exports;
+	var n = ei(), r = Ys(), i = Xs(), a = t.exports;
 	a.unique = function(e, t, r) {
 		t = n.$(t), r ||= [];
 		var i = {}, a, o, s;
@@ -3516,19 +3516,19 @@ var ns, rs, is, as, os, ss, cs, ls = n((() => {
 	};
 })), Qs = /* @__PURE__ */ e(Js()), $s = Ys(), ec = Zs(), tc = Qs.default;
 function nc(e, t = {}, n = { fields: [] }) {
-	t = (0, F.extend)({}, ha, t);
+	t = (0, I.extend)({}, ma, t);
 	let r = (0, ec.summary)(e), i = (0, $s.inferAll)(e), a = n.fields.reduce((e, t) => (e[t.name] = t, e), {}), o = r.map(function(n, r) {
 		let o = n.field, s = i[o] === "date" ? X.DATETIME : i[o], c = n.distinct, l;
-		if (s === X.NUMBER) l = N;
-		else if (s === X.INTEGER) l = c < t.numberNominalLimit && c / n.count < t.numberNominalProportion ? kr : N;
+		if (s === X.NUMBER) l = P;
+		else if (s === X.INTEGER) l = c < t.numberNominalLimit && c / n.count < t.numberNominalProportion ? Or : P;
 		else if (s === X.DATETIME) {
-			l = Or, n.min = new Date(e[0][o]), n.max = new Date(e[0][o]);
+			l = Dr, n.min = new Date(e[0][o]), n.max = new Date(e[0][o]);
 			for (let t of e) {
 				let e = new Date(t[o]).getTime();
 				e < n.min.getTime() && (n.min = new Date(e)), e > n.max.getTime() && (n.max = new Date(e));
 			}
-		} else l = kr;
-		l === "nominal" && c / n.count > t.minPercentUniqueForKey && n.count > t.minCardinalityForKey && (l = H.KEY);
+		} else l = Or;
+		l === "nominal" && c / n.count > t.minPercentUniqueForKey && n.count > t.minCardinalityForKey && (l = Ra.KEY);
 		let u = {
 			name: o,
 			originalIndex: r,
@@ -3538,7 +3538,7 @@ function nc(e, t = {}, n = { fields: [] }) {
 			timeStats: {},
 			binStats: {}
 		}, d = a[u.name];
-		return u = (0, F.extend)(u, d), u;
+		return u = (0, I.extend)(u, d), u;
 	});
 	for (let e of o) if (e.vlType === "quantitative") for (let n of t.enum.binProps.maxbins) e.binStats[n] = ac(n, e.stats);
 	else if (e.vlType === "temporal") for (let n of t.enum.timeUnit) n !== void 0 && (e.timeStats[n] = oc(n, e.stats));
@@ -3566,7 +3566,7 @@ var rc = {
 		return this._fieldSchemaIndex[e];
 	}
 	tableSchema() {
-		let e = (0, F.duplicate)(this._tableSchema);
+		let e = (0, I.duplicate)(this._tableSchema);
 		return e.fields.sort((e, t) => e.originalIndex - t.originalIndex), e;
 	}
 	primitiveType(e) {
@@ -3580,20 +3580,20 @@ var rc = {
 		if (e.aggregate || K(e) && e.autoCount) return 1;
 		if (e.bin) {
 			let t;
-			t = typeof e.bin == "boolean" ? { maxbins: wa(e.channel) } : e.bin === "?" ? { enum: [!0, !1] } : e.bin;
+			t = typeof e.bin == "boolean" ? { maxbins: Ca(e.channel) } : e.bin === "?" ? { enum: [!0, !1] } : e.bin;
 			let n = t.maxbins;
 			return r.binStats[n] || (r.binStats[n] = ac(n, r.stats)), r.binStats[n].distinct;
 		}
 		if (e.timeUnit) {
 			if (t) switch (e.timeUnit) {
-				case z.SECONDS: return 60;
-				case z.MINUTES: return 60;
-				case z.HOURS: return 24;
-				case z.DAY: return 7;
-				case z.DATE: return 31;
-				case z.MONTH: return 12;
-				case z.QUARTER: return 4;
-				case z.MILLISECONDS: return 1e3;
+				case B.SECONDS: return 60;
+				case B.MINUTES: return 60;
+				case B.HOURS: return 24;
+				case B.DAY: return 7;
+				case B.DATE: return 31;
+				case B.MONTH: return 12;
+				case B.QUARTER: return 4;
+				case B.MILLISECONDS: return 1e3;
 			}
 			let i = e.timeUnit, a = r.timeStats;
 			return (!a || !a[i]) && (a = Object.assign({}, a, { [i]: oc(e.timeUnit, r.stats) })), n ? a[i].distinct - cc(a[i].unique, ["Invalid Date", null]) : a[i].distinct;
@@ -3602,20 +3602,20 @@ var rc = {
 	}
 	timeUnitHasVariation(e) {
 		if (!e.timeUnit) return;
-		if (e.timeUnit === z.DAY) {
-			let t = (0, F.extend)({}, e, { timeUnit: z.DATE });
+		if (e.timeUnit === B.DAY) {
+			let t = (0, I.extend)({}, e, { timeUnit: B.DATE });
 			if (this.cardinality(t, !1, !0) <= 1) return !1;
 		}
 		let t = e.timeUnit;
-		for (let n of Ui) if (na(t, n)) {
-			let t = (0, F.extend)({}, e, { timeUnit: n });
+		for (let n of Hi) if (ta(t, n)) {
+			let t = (0, I.extend)({}, e, { timeUnit: n });
 			if (this.cardinality(t, !1, !0) <= 1) return !1;
 		}
 		return !0;
 	}
 	domain(e) {
-		let t = this._fieldSchemaIndex[e.field], n = (0, F.keys)(t.stats.unique);
-		return t.vlType === "quantitative" ? [+t.stats.min, +t.stats.max] : t.type === X.DATETIME ? [t.stats.min, t.stats.max] : t.type === X.INTEGER || t.type === X.NUMBER ? (n = n.map((e) => +e), n.sort(F.cmp)) : t.vlType === "ordinal" && t.ordinalDomain ? t.ordinalDomain : n.map((e) => e === "null" ? null : e).sort(F.cmp);
+		let t = this._fieldSchemaIndex[e.field], n = (0, I.keys)(t.stats.unique);
+		return t.vlType === "quantitative" ? [+t.stats.min, +t.stats.max] : t.type === X.DATETIME ? [t.stats.min, t.stats.max] : t.type === X.INTEGER || t.type === X.NUMBER ? (n = n.map((e) => +e), n.sort(I.cmp)) : t.vlType === "ordinal" && t.ordinalDomain ? t.ordinalDomain : n.map((e) => e === "null" ? null : e).sort(I.cmp);
 	}
 	stats(e) {
 		let t = this._fieldSchemaIndex[e.field];
@@ -3627,15 +3627,15 @@ function ac(e, t) {
 		min: t.min,
 		max: t.max,
 		maxbins: e
-	}), r = (0, F.extend)({}, t);
+	}), r = (0, I.extend)({}, t);
 	return r.unique = sc(n, t.unique), r.distinct = (n.stop - n.start) / n.step, r.min = n.start, r.max = n.stop, r;
 }
 function oc(e, t) {
-	let n = (0, F.extend)({}, t), r = {};
-	return (0, F.keys)(t.unique).forEach(function(n) {
+	let n = (0, I.extend)({}, t), r = {};
+	return (0, I.keys)(t.unique).forEach(function(n) {
 		let i = n === "null" ? null : new Date(n), a;
-		a = i === null ? null : isNaN(i.getTime()) ? "Invalid Date" : (e === z.DAY ? i.getDay() : ea(e, i)).toString(), r[a] = (r[a] || 0) + t.unique[n];
-	}), n.unique = r, n.distinct = (0, F.keys)(r).length, n;
+		a = i === null ? null : isNaN(i.getTime()) ? "Invalid Date" : (e === B.DAY ? i.getDay() : $i(e, i)).toString(), r[a] = (r[a] || 0) + t.unique[n];
+	}), n.unique = r, n.distinct = (0, I.keys)(r).length, n;
 }
 function sc(e, t) {
 	let n = {};
@@ -3677,12 +3677,12 @@ var lc = class {
 		super(e);
 	}
 	hasAllRequiredPropertiesSpecific(e) {
-		return ni(this.constraint.properties, (t) => {
-			if (oi(t)) {
+		return ti(this.constraint.properties, (t) => {
+			if (ai(t)) {
 				let n = t.parent, r = t.child;
-				return !e[n] || !B(e[n][r]);
+				return !e[n] || !V(e[n][r]);
 			}
-			return !e[t] || !B(e[t]);
+			return !e[t] || !V(e[t]);
 		});
 	}
 	satisfy(e, t, n, r) {
@@ -3692,7 +3692,7 @@ var lc = class {
 	{
 		name: "aggregateOpSupportedByType",
 		description: "Aggregate function should be supported by data type.",
-		properties: [R.TYPE, R.AGGREGATE],
+		properties: [z.TYPE, z.AGGREGATE],
 		allowWildcardForProperties: !1,
 		strict: !0,
 		satisfy: (e, t, n, r) => !e.aggregate || !za(e.type)
@@ -3700,7 +3700,7 @@ var lc = class {
 	{
 		name: "asteriskFieldWithCountOnly",
 		description: "Field=\"*\" should be disallowed except aggregate=\"count\"",
-		properties: [R.FIELD, R.AGGREGATE],
+		properties: [z.FIELD, z.AGGREGATE],
 		allowWildcardForProperties: !1,
 		strict: !0,
 		satisfy: (e, t, n, r) => e.field === "*" == (e.aggregate === "count")
@@ -3709,9 +3709,9 @@ var lc = class {
 		name: "minCardinalityForBin",
 		description: "binned quantitative field should not have too low cardinality",
 		properties: [
-			R.BIN,
-			R.FIELD,
-			R.TYPE
+			z.BIN,
+			z.FIELD,
+			z.TYPE
 		],
 		allowWildcardForProperties: !1,
 		strict: !0,
@@ -3730,19 +3730,19 @@ var lc = class {
 	{
 		name: "binAppliedForQuantitative",
 		description: "bin should be applied to quantitative field only.",
-		properties: [R.TYPE, R.BIN],
+		properties: [z.TYPE, z.BIN],
 		allowWildcardForProperties: !1,
 		strict: !0,
-		satisfy: (e, t, n, r) => !e.bin || e.type === N
+		satisfy: (e, t, n, r) => !e.bin || e.type === P
 	},
 	{
 		name: "channelFieldCompatible",
 		description: "encoding channel's range type be compatible with channel type.",
 		properties: [
-			R.CHANNEL,
-			R.TYPE,
-			R.BIN,
-			R.TIMEUNIT
+			z.CHANNEL,
+			z.TYPE,
+			z.BIN,
+			z.TIMEUNIT
 		],
 		allowWildcardForProperties: !1,
 		strict: !0,
@@ -3754,17 +3754,17 @@ var lc = class {
 					"timeUnit",
 					"type"
 				]
-			})), { compatible: a } = Ia(i, e.channel);
-			return a ? !0 : !!((e.channel === "row" || e.channel === "column") && (Wi(i.timeUnit) || Ki(i.timeUnit)));
+			})), { compatible: a } = Fa(i, e.channel);
+			return a ? !0 : !!((e.channel === "row" || e.channel === "column") && (Ui(i.timeUnit) || Gi(i.timeUnit)));
 		}
 	},
 	{
 		name: "hasFn",
 		description: "A field with as hasFn flag should have one of aggregate, timeUnit, or bin.",
 		properties: [
-			R.AGGREGATE,
-			R.BIN,
-			R.TIMEUNIT
+			z.AGGREGATE,
+			z.BIN,
+			z.TIMEUNIT
 		],
 		allowWildcardForProperties: !0,
 		strict: !0,
@@ -3774,9 +3774,9 @@ var lc = class {
 		name: "omitScaleZeroWithBinnedField",
 		description: "Do not use scale zero with binned field",
 		properties: [
-			R.SCALE,
-			Ti("scale", "zero"),
-			R.BIN
+			z.SCALE,
+			wi("scale", "zero"),
+			z.BIN
 		],
 		allowWildcardForProperties: !1,
 		strict: !0,
@@ -3786,19 +3786,19 @@ var lc = class {
 		name: "onlyOneTypeOfFunction",
 		description: "Only of of aggregate, autoCount, timeUnit, or bin should be applied at the same time.",
 		properties: [
-			R.AGGREGATE,
-			R.AUTOCOUNT,
-			R.TIMEUNIT,
-			R.BIN
+			z.AGGREGATE,
+			z.AUTOCOUNT,
+			z.TIMEUNIT,
+			z.BIN
 		],
 		allowWildcardForProperties: !0,
 		strict: !0,
-		satisfy: (e, t, n, r) => !G(e) || (!B(e.aggregate) && e.aggregate ? 1 : 0) + (!B(e.bin) && e.bin ? 1 : 0) + (!B(e.timeUnit) && e.timeUnit ? 1 : 0) <= 1
+		satisfy: (e, t, n, r) => !G(e) || (!V(e.aggregate) && e.aggregate ? 1 : 0) + (!V(e.bin) && e.bin ? 1 : 0) + (!V(e.timeUnit) && e.timeUnit ? 1 : 0) <= 1
 	},
 	{
 		name: "timeUnitAppliedForTemporal",
 		description: "Time unit should be applied to temporal field only.",
-		properties: [R.TYPE, R.TIMEUNIT],
+		properties: [z.TYPE, z.TIMEUNIT],
 		allowWildcardForProperties: !1,
 		strict: !0,
 		satisfy: (e, t, n, r) => !(e.timeUnit && e.type !== "temporal")
@@ -3806,7 +3806,7 @@ var lc = class {
 	{
 		name: "timeUnitShouldHaveVariation",
 		description: "A particular time unit should be applied only if they produce unique values.",
-		properties: [R.TIMEUNIT, R.TYPE],
+		properties: [z.TIMEUNIT, z.TYPE],
 		allowWildcardForProperties: !1,
 		strict: !1,
 		satisfy: (e, t, n, r) => e.timeUnit && e.type === "temporal" ? !n.has("timeUnit") && !r.constraintManuallySpecifiedValue || t.timeUnitHasVariation(e) : !0
@@ -3814,7 +3814,7 @@ var lc = class {
 	{
 		name: "scalePropertiesSupportedByScaleType",
 		description: "Scale properties must be supported by correct scale type",
-		properties: [].concat(gi, [R.SCALE, R.TYPE]),
+		properties: [].concat(hi, [z.SCALE, z.TYPE]),
 		allowWildcardForProperties: !0,
 		strict: !0,
 		satisfy: (e, t, n, r) => {
@@ -3825,8 +3825,8 @@ var lc = class {
 					if (e === "type" || e === "name" || e === "enum") continue;
 					let t = e;
 					if (n === "point") {
-						if (!Yr("point", t) && !Yr("band", t)) return !1;
-					} else if (!Yr(n, t)) return !1;
+						if (!Jr("point", t) && !Jr("band", t)) return !1;
+					} else if (!Jr(n, t)) return !1;
 				}
 			}
 			return !0;
@@ -3835,15 +3835,15 @@ var lc = class {
 	{
 		name: "scalePropertiesSupportedByChannel",
 		description: "Not all scale properties are supported by all encoding channels",
-		properties: [].concat(gi, [R.SCALE, R.CHANNEL]),
+		properties: [].concat(hi, [z.SCALE, z.CHANNEL]),
 		allowWildcardForProperties: !0,
 		strict: !0,
 		satisfy: (e, t, n, r) => {
 			if (e) {
 				let t = e.channel, n = e.scale;
-				if (t && !B(t) && n) {
+				if (t && !V(t) && n) {
 					if (t === "row" || t === "column") return !1;
-					for (let e in n) if (n.hasOwnProperty(e) && e !== "type" && e !== "name" && e !== "enum" && Xr(t, e) !== void 0) return !1;
+					for (let e in n) if (n.hasOwnProperty(e) && e !== "type" && e !== "name" && e !== "enum" && Yr(t, e) !== void 0) return !1;
 				}
 			}
 			return !0;
@@ -3852,7 +3852,7 @@ var lc = class {
 	{
 		name: "typeMatchesPrimitiveType",
 		description: "Data type should be supported by field's primitive type.",
-		properties: [R.FIELD, R.TYPE],
+		properties: [z.FIELD, z.TYPE],
 		allowWildcardForProperties: !1,
 		strict: !0,
 		satisfy: (e, t, n, r) => {
@@ -3863,8 +3863,8 @@ var lc = class {
 				case X.BOOLEAN:
 				case X.STRING: return a !== "quantitative" && a !== "temporal";
 				case X.NUMBER:
-				case X.INTEGER: return a !== Or;
-				case X.DATETIME: return a === Or;
+				case X.INTEGER: return a !== Dr;
+				case X.DATETIME: return a === Dr;
 				case null: return !1;
 			}
 			throw Error("Not implemented");
@@ -3873,27 +3873,27 @@ var lc = class {
 	{
 		name: "typeMatchesSchemaType",
 		description: "Enumerated data type of a field should match the field's type in the schema.",
-		properties: [R.FIELD, R.TYPE],
+		properties: [z.FIELD, z.TYPE],
 		allowWildcardForProperties: !1,
 		strict: !1,
-		satisfy: (e, t, n, r) => !n.has("field") && !n.has("type") && !r.constraintManuallySpecifiedValue ? !0 : e.field === "*" ? e.type === N : t.vlType(e.field) === e.type
+		satisfy: (e, t, n, r) => !n.has("field") && !n.has("type") && !r.constraintManuallySpecifiedValue ? !0 : e.field === "*" ? e.type === P : t.vlType(e.field) === e.type
 	},
 	{
 		name: "maxCardinalityForCategoricalColor",
 		description: "Categorical channel should not have too high cardinality",
-		properties: [R.CHANNEL, R.FIELD],
+		properties: [z.CHANNEL, z.FIELD],
 		allowWildcardForProperties: !1,
 		strict: !1,
-		satisfy: (e, t, n, r) => e.channel === "color" && (e.type === "nominal" || e.type === H.KEY) ? t.cardinality(e) <= r.maxCardinalityForCategoricalColor : !0
+		satisfy: (e, t, n, r) => e.channel === "color" && (e.type === "nominal" || e.type === Ra.KEY) ? t.cardinality(e) <= r.maxCardinalityForCategoricalColor : !0
 	},
 	{
 		name: "maxCardinalityForFacet",
 		description: "Row/column channel should not have too high cardinality",
 		properties: [
-			R.CHANNEL,
-			R.FIELD,
-			R.BIN,
-			R.TIMEUNIT
+			z.CHANNEL,
+			z.FIELD,
+			z.BIN,
+			z.TIMEUNIT
 		],
 		allowWildcardForProperties: !1,
 		strict: !1,
@@ -3903,10 +3903,10 @@ var lc = class {
 		name: "maxCardinalityForShape",
 		description: "Shape channel should not have too high cardinality",
 		properties: [
-			R.CHANNEL,
-			R.FIELD,
-			R.BIN,
-			R.TIMEUNIT
+			z.CHANNEL,
+			z.FIELD,
+			z.BIN,
+			z.TIMEUNIT
 		],
 		allowWildcardForProperties: !1,
 		strict: !1,
@@ -3916,34 +3916,34 @@ var lc = class {
 		name: "dataTypeAndFunctionMatchScaleType",
 		description: "Scale type must match data type",
 		properties: [
-			R.TYPE,
-			R.SCALE,
-			Ti("scale", "type"),
-			R.TIMEUNIT,
-			R.BIN
+			z.TYPE,
+			z.SCALE,
+			wi("scale", "type"),
+			z.TIMEUNIT,
+			z.BIN
 		],
 		allowWildcardForProperties: !1,
 		strict: !0,
 		satisfy: (e, t, n, r) => {
 			if (e.scale) {
 				let t = e.type, n = xo(e);
-				if (za(t)) return n === void 0 || Rr(n);
-				if (t === "temporal") return e.timeUnit ? I([
-					P.TIME,
-					P.UTC,
+				if (za(t)) return n === void 0 || Lr(n);
+				if (t === "temporal") return e.timeUnit ? L([
+					F.TIME,
+					F.UTC,
 					void 0
-				], n) || Rr(n) : I([
-					P.TIME,
-					P.UTC,
+				], n) || Lr(n) : L([
+					F.TIME,
+					F.UTC,
 					void 0
 				], n);
-				if (t === "quantitative") return e.bin ? I([P.LINEAR, void 0], n) : I([
-					P.LOG,
-					P.POW,
-					P.SQRT,
-					P.QUANTILE,
-					P.QUANTIZE,
-					P.LINEAR,
+				if (t === "quantitative") return e.bin ? L([F.LINEAR, void 0], n) : L([
+					F.LOG,
+					F.POW,
+					F.SQRT,
+					F.QUANTILE,
+					F.QUANTIZE,
+					F.LINEAR,
 					void 0
 				], n);
 			}
@@ -3953,7 +3953,7 @@ var lc = class {
 	{
 		name: "stackIsOnlyUsedWithXY",
 		description: "stack should only be allowed for x and y channels",
-		properties: [R.STACK, R.CHANNEL],
+		properties: [z.STACK, z.CHANNEL],
 		allowWildcardForProperties: !1,
 		strict: !0,
 		satisfy: (e, t, n, r) => !e.stack || e.channel === "x" || e.channel === "y"
@@ -3966,10 +3966,10 @@ var fc = dc.reduce((e, t) => {
 }, new U()), pc = [{
 	name: "doesNotSupportConstantValue",
 	description: "row, column, x, y, order, and detail should not work with constant values.",
-	properties: [R.TYPE, R.AGGREGATE],
+	properties: [z.TYPE, z.AGGREGATE],
 	allowWildcardForProperties: !1,
 	strict: !0,
-	satisfy: (e, t, n, r) => !I([
+	satisfy: (e, t, n, r) => !L([
 		"row",
 		"column",
 		"x",
@@ -4000,19 +4000,19 @@ function hc(e, t, n, r, i, a) {
 }
 //#endregion
 //#region ../node_modules/.pnpm/compassql@0.21.2_vega@6.2.0/node_modules/compassql/build/src/constraint/spec.js
-var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
+var gc = Rt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 	constructor(e) {
 		super(e);
 	}
 	hasAllRequiredPropertiesSpecific(e) {
-		return ni(this.constraint.properties, (t) => {
-			if (t === R.MARK) return !B(e.getMark());
-			if (oi(t)) {
+		return ti(this.constraint.properties, (t) => {
+			if (t === z.MARK) return !V(e.getMark());
+			if (ai(t)) {
 				let n = t.parent, r = t.child;
-				return ni(e.getEncodings(), (e) => !e[n] || !B(e[n][r]));
+				return ti(e.getEncodings(), (e) => !e[n] || !V(e[n][r]));
 			}
-			if (!Ei(t)) throw Error("UNIMPLEMENTED");
-			return ni(e.getEncodings(), (e) => !e[t] || !B(e[t]));
+			if (!Ti(t)) throw Error("UNIMPLEMENTED");
+			return ti(e.getEncodings(), (e) => !e[t] || !V(e[t]));
 		});
 	}
 	satisfy(e, t, n) {
@@ -4022,23 +4022,23 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 	{
 		name: "noRepeatedChannel",
 		description: "Each encoding channel should only be used once.",
-		properties: [R.CHANNEL],
+		properties: [z.CHANNEL],
 		allowWildcardForProperties: !0,
 		strict: !0,
 		satisfy: (e, t, n) => {
 			let r = {};
-			return ni(e.getEncodings(), (e) => B(e.channel) ? !0 : !r[e.channel] && (r[e.channel] = !0, !0));
+			return ti(e.getEncodings(), (e) => V(e.channel) ? !0 : !r[e.channel] && (r[e.channel] = !0, !0));
 		}
 	},
 	{
 		name: "alwaysIncludeZeroInScaleWithBarMark",
 		description: "Do not recommend bar mark if scale does not start at zero",
 		properties: [
-			R.MARK,
-			R.SCALE,
-			Ti("scale", "zero"),
-			R.CHANNEL,
-			R.TYPE
+			z.MARK,
+			z.SCALE,
+			wi("scale", "zero"),
+			z.CHANNEL,
+			z.TYPE
 		],
 		allowWildcardForProperties: !1,
 		strict: !0,
@@ -4054,59 +4054,59 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 		name: "autoAddCount",
 		description: "Automatically adding count only for plots with only ordinal, binned quantitative, or temporal with timeunit fields.",
 		properties: [
-			R.BIN,
-			R.TIMEUNIT,
-			R.TYPE,
-			R.AUTOCOUNT
+			z.BIN,
+			z.TIMEUNIT,
+			z.TYPE,
+			z.AUTOCOUNT
 		],
 		allowWildcardForProperties: !0,
 		strict: !1,
-		satisfy: (e, t, n) => ri(e.getEncodings(), (e) => mo(e)) ? ni(e.getEncodings(), (e) => {
+		satisfy: (e, t, n) => ni(e.getEncodings(), (e) => mo(e)) ? ti(e.getEncodings(), (e) => {
 			if (W(e) || K(e)) return !0;
 			switch (e.type) {
-				case N: return !!e.bin;
-				case Or: return !!e.timeUnit;
-				case Dr:
-				case H.KEY:
-				case kr: return !0;
+				case P: return !!e.bin;
+				case Dr: return !!e.timeUnit;
+				case Er:
+				case Ra.KEY:
+				case Or: return !0;
 			}
 			/* istanbul ignore next */
 			throw Error("Unsupported Type");
-		}) : !ni(e.wildcardIndex.encodingIndicesByProperty.get("autoCount") || [], (t) => {
+		}) : !ti(e.wildcardIndex.encodingIndicesByProperty.get("autoCount") || [], (t) => {
 			let n = e.getEncodingQueryByIndex(t);
-			return K(n) && !B(n.autoCount);
-		}) || ri(e.getEncodings(), (e) => (G(e) || K(e)) && e.type === "quantitative" ? !q(e) && G(e) && (!e.bin || B(e.bin)) : G(e) && e.type === "temporal" ? !e.timeUnit || B(e.timeUnit) : !1)
+			return K(n) && !V(n.autoCount);
+		}) || ni(e.getEncodings(), (e) => (G(e) || K(e)) && e.type === "quantitative" ? !q(e) && G(e) && (!e.bin || V(e.bin)) : G(e) && e.type === "temporal" ? !e.timeUnit || V(e.timeUnit) : !1)
 	},
 	{
 		name: "channelPermittedByMarkType",
 		description: "Each encoding channel should be supported by the mark type",
-		properties: [R.CHANNEL, R.MARK],
+		properties: [z.CHANNEL, z.MARK],
 		allowWildcardForProperties: !0,
 		strict: !0,
 		satisfy: (e, t, n) => {
 			let r = e.getMark();
-			return B(r) ? !0 : ni(e.getEncodings(), (e) => B(e.channel) ? !0 : !!Xt(e.channel, r));
+			return V(r) ? !0 : ti(e.getEncodings(), (e) => V(e.channel) ? !0 : !!Yt(e.channel, r));
 		}
 	},
 	{
 		name: "hasAllRequiredChannelsForMark",
 		description: "All required channels for the specified mark should be specified",
-		properties: [R.CHANNEL, R.MARK],
+		properties: [z.CHANNEL, z.MARK],
 		allowWildcardForProperties: !1,
 		strict: !0,
 		satisfy: (e, t, n) => {
 			let r = e.getMark();
 			switch (r) {
-				case ki:
-				case Ai: return e.channelUsed("x") && e.channelUsed("y");
-				case Pi: return e.channelUsed(lt);
+				case Oi:
+				case ki: return e.channelUsed("x") && e.channelUsed("y");
+				case Ni: return e.channelUsed(ct);
 				case "bar":
-				case Ii:
-				case Li:
 				case Fi:
-				case Ni:
-				case Mi: return e.channelUsed("x") || e.channelUsed("y");
-				case ji: return !e.wildcardIndex.hasProperty(R.CHANNEL) || e.channelUsed("x") || e.channelUsed("y");
+				case Ii:
+				case Pi:
+				case Mi:
+				case ji: return e.channelUsed("x") || e.channelUsed("y");
+				case Ai: return !e.wildcardIndex.hasProperty(z.CHANNEL) || e.channelUsed("x") || e.channelUsed("y");
 			}
 			/* istanbul ignore next */
 			throw Error("hasAllRequiredChannelsForMark not implemented for mark" + JSON.stringify(r));
@@ -4115,7 +4115,7 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 	{
 		name: "omitAggregate",
 		description: "Omit aggregate plots.",
-		properties: [R.AGGREGATE, R.AUTOCOUNT],
+		properties: [z.AGGREGATE, z.AUTOCOUNT],
 		allowWildcardForProperties: !0,
 		strict: !1,
 		satisfy: (e, t, n) => !e.isAggregate()
@@ -4124,9 +4124,9 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 		name: "omitAggregatePlotWithDimensionOnlyOnFacet",
 		description: "Omit aggregate plots with dimensions only on facets as that leads to inefficient use of space.",
 		properties: [
-			R.CHANNEL,
-			R.AGGREGATE,
-			R.AUTOCOUNT
+			z.CHANNEL,
+			z.AGGREGATE,
+			z.AUTOCOUNT
 		],
 		allowWildcardForProperties: !1,
 		strict: !1,
@@ -4134,7 +4134,7 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 			if (e.isAggregate()) {
 				let t = !1, r = !1, i = !1;
 				if (e.specQuery.encodings.forEach((n, a) => {
-					W(n) || q(n) || G(n) && !n.aggregate && (r = !0, I(["row", "column"], n.channel) ? e.wildcardIndex.hasEncodingProperty(a, R.CHANNEL) && (i = !0) : t = !0);
+					W(n) || q(n) || G(n) && !n.aggregate && (r = !0, L(["row", "column"], n.channel) ? e.wildcardIndex.hasEncodingProperty(a, z.CHANNEL) && (i = !0) : t = !0);
 				}), r && !t && (i || n.constraintManuallySpecifiedValue)) return !1;
 			}
 			return !0;
@@ -4144,27 +4144,27 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 		name: "omitAggregatePlotWithoutDimension",
 		description: "Aggregate plots without dimension should be omitted",
 		properties: [
-			R.AGGREGATE,
-			R.AUTOCOUNT,
-			R.BIN,
-			R.TIMEUNIT,
-			R.TYPE
+			z.AGGREGATE,
+			z.AUTOCOUNT,
+			z.BIN,
+			z.TIMEUNIT,
+			z.TYPE
 		],
 		allowWildcardForProperties: !1,
 		strict: !1,
-		satisfy: (e, t, n) => !e.isAggregate() || ri(e.getEncodings(), (e) => !!(bo(e) || G(e) && e.type === "temporal"))
+		satisfy: (e, t, n) => !e.isAggregate() || ni(e.getEncodings(), (e) => !!(bo(e) || G(e) && e.type === "temporal"))
 	},
 	{
 		name: "omitBarLineAreaWithOcclusion",
 		description: "Don't use bar, line or area to visualize raw plot as they often lead to occlusion.",
 		properties: [
-			R.MARK,
-			R.AGGREGATE,
-			R.AUTOCOUNT
+			z.MARK,
+			z.AGGREGATE,
+			z.AUTOCOUNT
 		],
 		allowWildcardForProperties: !1,
 		strict: !1,
-		satisfy: (e, t, n) => !I([
+		satisfy: (e, t, n) => !L([
 			"bar",
 			"line",
 			"area"
@@ -4173,15 +4173,15 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 	{
 		name: "omitBarTickWithSize",
 		description: "Do not map field to size channel with bar and tick mark",
-		properties: [R.CHANNEL, R.MARK],
+		properties: [z.CHANNEL, z.MARK],
 		allowWildcardForProperties: !0,
 		strict: !1,
 		satisfy: (e, t, n) => {
-			if (I(["tick", "bar"], e.getMark()) && e.channelEncodingField("size")) {
+			if (L(["tick", "bar"], e.getMark()) && e.channelEncodingField("size")) {
 				if (n.constraintManuallySpecifiedValue) return !1;
 				{
 					let t = e.specQuery.encodings;
-					for (let n = 0; n < t.length; n++) if (t[n].channel === "size") return !e.wildcardIndex.hasEncodingProperty(n, R.CHANNEL);
+					for (let n = 0; n < t.length; n++) if (t[n].channel === "size") return !e.wildcardIndex.hasEncodingProperty(n, z.CHANNEL);
 				}
 			}
 			return !0;
@@ -4191,18 +4191,18 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 		name: "omitBarAreaForLogScale",
 		description: "Do not use bar and area mark for x and y's log scale",
 		properties: [
-			R.MARK,
-			R.CHANNEL,
-			R.SCALE,
-			Ti("scale", "type"),
-			R.TYPE
+			z.MARK,
+			z.CHANNEL,
+			z.SCALE,
+			wi("scale", "type"),
+			z.TYPE
 		],
 		allowWildcardForProperties: !1,
 		strict: !0,
 		satisfy: (e, t, n) => {
 			let r = e.getMark(), i = e.getEncodings();
 			if (r === "area" || r === "bar") {
-				for (let e of i) if (G(e) && (e.channel === "x" || e.channel === "y") && e.scale && xo(e) === P.LOG) return !1;
+				for (let e of i) if (G(e) && (e.channel === "x" || e.channel === "y") && e.scale && xo(e) === F.LOG) return !1;
 			}
 			return !0;
 		}
@@ -4210,7 +4210,7 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 	{
 		name: "omitMultipleNonPositionalChannels",
 		description: "Unless manually specified, do not use multiple non-positional encoding channel to avoid over-encoding.",
-		properties: [R.CHANNEL],
+		properties: [z.CHANNEL],
 		allowWildcardForProperties: !0,
 		strict: !1,
 		satisfy: (e, t, n) => {
@@ -4219,7 +4219,7 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 				let o = r[t];
 				if (W(o) || q(o)) continue;
 				let s = o.channel;
-				if (!B(s) && gc[s + ""] && (i += 1, e.wildcardIndex.hasEncodingProperty(t, R.CHANNEL) && (a = !0), i > 1 && (a || n.constraintManuallySpecifiedValue))) return !1;
+				if (!V(s) && gc[s + ""] && (i += 1, e.wildcardIndex.hasEncodingProperty(t, z.CHANNEL) && (a = !0), i > 1 && (a || n.constraintManuallySpecifiedValue))) return !1;
 			}
 			return !0;
 		}
@@ -4227,7 +4227,7 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 	{
 		name: "omitNonPositionalOrFacetOverPositionalChannels",
 		description: "Do not use non-positional channels unless all positional channels are used",
-		properties: [R.CHANNEL],
+		properties: [z.CHANNEL],
 		allowWildcardForProperties: !1,
 		strict: !1,
 		satisfy: (e, t, n) => {
@@ -4236,7 +4236,7 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 				let n = r[t];
 				if (W(n) || q(n)) continue;
 				let c = n.channel;
-				c === "x" ? o = !0 : c === "y" ? s = !0 : B(c) || (i = !0, e.wildcardIndex.hasEncodingProperty(t, R.CHANNEL) && (a = !0));
+				c === "x" ? o = !0 : c === "y" ? s = !0 : V(c) || (i = !0, e.wildcardIndex.hasEncodingProperty(t, z.CHANNEL) && (a = !0));
 			}
 			return a || n.constraintManuallySpecifiedValue && i ? o && s : !0;
 		}
@@ -4244,7 +4244,7 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 	{
 		name: "omitRaw",
 		description: "Omit raw plots.",
-		properties: [R.AGGREGATE, R.AUTOCOUNT],
+		properties: [z.AGGREGATE, z.AUTOCOUNT],
 		allowWildcardForProperties: !1,
 		strict: !1,
 		satisfy: (e, t, n) => !!e.isAggregate()
@@ -4253,11 +4253,11 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 		name: "omitRawContinuousFieldForAggregatePlot",
 		description: "Aggregate plot should not use raw continuous field as group by values. (Quantitative should be binned. Temporal should have time unit.)",
 		properties: [
-			R.AGGREGATE,
-			R.AUTOCOUNT,
-			R.TIMEUNIT,
-			R.BIN,
-			R.TYPE
+			z.AGGREGATE,
+			z.AUTOCOUNT,
+			z.TIMEUNIT,
+			z.BIN,
+			z.TYPE
 		],
 		allowWildcardForProperties: !0,
 		strict: !1,
@@ -4266,7 +4266,7 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 				let t = e.specQuery.encodings;
 				for (let r = 0; r < t.length; r++) {
 					let i = t[r];
-					if (!(W(i) || q(i)) && (G(i) && i.type === "temporal" && !i.timeUnit && (e.wildcardIndex.hasEncodingProperty(r, R.TIMEUNIT) || n.constraintManuallySpecifiedValue) || i.type === "quantitative" && G(i) && !i.bin && !i.aggregate && (e.wildcardIndex.hasEncodingProperty(r, R.BIN) || e.wildcardIndex.hasEncodingProperty(r, R.AGGREGATE) || e.wildcardIndex.hasEncodingProperty(r, R.AUTOCOUNT) || n.constraintManuallySpecifiedValue))) return !1;
+					if (!(W(i) || q(i)) && (G(i) && i.type === "temporal" && !i.timeUnit && (e.wildcardIndex.hasEncodingProperty(r, z.TIMEUNIT) || n.constraintManuallySpecifiedValue) || i.type === "quantitative" && G(i) && !i.bin && !i.aggregate && (e.wildcardIndex.hasEncodingProperty(r, z.BIN) || e.wildcardIndex.hasEncodingProperty(r, z.AGGREGATE) || e.wildcardIndex.hasEncodingProperty(r, z.AUTOCOUNT) || n.constraintManuallySpecifiedValue))) return !1;
 				}
 			}
 			return !0;
@@ -4276,18 +4276,18 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 		name: "omitRawDetail",
 		description: "Do not use detail channel with raw plot.",
 		properties: [
-			R.CHANNEL,
-			R.AGGREGATE,
-			R.AUTOCOUNT
+			z.CHANNEL,
+			z.AGGREGATE,
+			z.AUTOCOUNT
 		],
 		allowWildcardForProperties: !1,
 		strict: !0,
-		satisfy: (e, t, n) => e.isAggregate() ? !0 : ni(e.specQuery.encodings, (t, r) => W(t) || q(t) ? !0 : !(t.channel === "detail" && (e.wildcardIndex.hasEncodingProperty(r, R.CHANNEL) || n.constraintManuallySpecifiedValue)))
+		satisfy: (e, t, n) => e.isAggregate() ? !0 : ti(e.specQuery.encodings, (t, r) => W(t) || q(t) ? !0 : !(t.channel === "detail" && (e.wildcardIndex.hasEncodingProperty(r, z.CHANNEL) || n.constraintManuallySpecifiedValue)))
 	},
 	{
 		name: "omitRepeatedField",
 		description: "Each field should be mapped to only one channel",
-		properties: [R.FIELD],
+		properties: [z.FIELD],
 		allowWildcardForProperties: !0,
 		strict: !1,
 		satisfy: (e, t, n) => {
@@ -4296,8 +4296,8 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 				let o = a[t];
 				if (W(o) || K(o)) continue;
 				let s;
-				if (o.field && !B(o.field) && (s = o.field), K(o) && !B(o.autoCount) && (s = "count_*"), s) {
-					if (e.wildcardIndex.hasEncodingProperty(t, R.FIELD) && (i[s] = !0), r[s] && (i[s] || n.constraintManuallySpecifiedValue)) return !1;
+				if (o.field && !V(o.field) && (s = o.field), K(o) && !V(o.autoCount) && (s = "count_*"), s) {
+					if (e.wildcardIndex.hasEncodingProperty(t, z.FIELD) && (i[s] = !0), r[s] && (i[s] || n.constraintManuallySpecifiedValue)) return !1;
 					r[s] = !0;
 				}
 			}
@@ -4307,7 +4307,7 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 	{
 		name: "omitVerticalDotPlot",
 		description: "Do not output vertical dot plot.",
-		properties: [R.CHANNEL],
+		properties: [z.CHANNEL],
 		allowWildcardForProperties: !0,
 		strict: !1,
 		satisfy: (e, t, n) => {
@@ -4319,41 +4319,41 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 		name: "hasAppropriateGraphicTypeForMark",
 		description: "Has appropriate graphic type for mark",
 		properties: [
-			R.CHANNEL,
-			R.MARK,
-			R.TYPE,
-			R.TIMEUNIT,
-			R.BIN,
-			R.AGGREGATE,
-			R.AUTOCOUNT
+			z.CHANNEL,
+			z.MARK,
+			z.TYPE,
+			z.TIMEUNIT,
+			z.BIN,
+			z.AGGREGATE,
+			z.AUTOCOUNT
 		],
 		allowWildcardForProperties: !1,
 		strict: !1,
 		satisfy: (e, t, n) => {
 			let r = e.getMark();
 			switch (r) {
+				case Oi:
 				case ki:
-				case Ai:
 					if (e.isAggregate()) {
 						let t = e.getEncodingQueryByChannel("x"), n = e.getEncodingQueryByChannel("y"), r = yo(t), i = yo(n);
-						return t && n && r !== i && !(G(t) && !r && I(["nominal", "key"], t.type)) && !(G(n) && !i && I(["nominal", "key"], n.type));
+						return t && n && r !== i && !(G(t) && !r && L(["nominal", "key"], t.type)) && !(G(n) && !i && L(["nominal", "key"], n.type));
 					}
 					return !0;
-				case Pi: return !0;
+				case Ni: return !0;
 				case "bar":
-				case Fi:
+				case Pi:
 					if (e.channelEncodingField("size")) return !1;
 					{
 						let t = e.getEncodingQueryByChannel("x"), n = e.getEncodingQueryByChannel("y");
 						return yo(t) !== yo(n);
 					}
-				case Mi:
-					let t = e.getEncodingQueryByChannel("x"), n = e.getEncodingQueryByChannel("y"), r = bo(t), i = bo(n), a = e.getEncodingQueryByChannel(et), o = yo(a), s = G(a) ? a.type === Dr : !1;
+				case ji:
+					let t = e.getEncodingQueryByChannel("x"), n = e.getEncodingQueryByChannel("y"), r = bo(t), i = bo(n), a = e.getEncodingQueryByChannel($e), o = yo(a), s = G(a) ? a.type === Er : !1;
 					return (r && i || r && !e.channelUsed("y") || i && !e.channelUsed("x")) && (!a || a && (o || s));
+				case Fi:
+				case Ai:
 				case Ii:
-				case ji:
-				case Li:
-				case Ni: return !0;
+				case Mi: return !0;
 			}
 			/* istanbul ignore next */
 			throw Error("hasAllRequiredChannelsForMark not implemented for mark" + r);
@@ -4363,20 +4363,20 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 		name: "omitInvalidStackSpec",
 		description: "If stack is specified, must follow Vega-Lite stack rules",
 		properties: [
-			R.STACK,
-			R.FIELD,
-			R.CHANNEL,
-			R.MARK,
-			R.AGGREGATE,
-			R.AUTOCOUNT,
-			R.SCALE,
-			Ti("scale", "type"),
-			R.TYPE
+			z.STACK,
+			z.FIELD,
+			z.CHANNEL,
+			z.MARK,
+			z.AGGREGATE,
+			z.AUTOCOUNT,
+			z.SCALE,
+			wi("scale", "type"),
+			z.TYPE
 		],
 		allowWildcardForProperties: !1,
 		strict: !0,
 		satisfy: (e, t, n) => {
-			if (!e.wildcardIndex.hasProperty(R.STACK)) return !0;
+			if (!e.wildcardIndex.hasProperty(z.STACK)) return !0;
 			let r = e.getVlStack();
 			return !(r === null && e.getStackOffset() !== null || r.fieldChannel !== e.getStackChannel());
 		}
@@ -4385,38 +4385,38 @@ var gc = zt.reduce((e, t) => (e[t] = !0, e), {}), _c = class extends lc {
 		name: "omitNonSumStack",
 		description: "Stack specifications that use non-summative aggregates should be omitted (even implicit ones)",
 		properties: [
-			R.CHANNEL,
-			R.MARK,
-			R.AGGREGATE,
-			R.AUTOCOUNT,
-			R.SCALE,
-			Ti("scale", "type"),
-			R.TYPE
+			z.CHANNEL,
+			z.MARK,
+			z.AGGREGATE,
+			z.AUTOCOUNT,
+			z.SCALE,
+			wi("scale", "type"),
+			z.TYPE
 		],
 		allowWildcardForProperties: !1,
 		strict: !0,
 		satisfy: (e, t, n) => {
 			let r = e.getVlStack();
-			return !(r != null && !I(ba, e.getEncodingQueryByChannel(r.fieldChannel).aggregate));
+			return !(r != null && !L(ya, e.getEncodingQueryByChannel(r.fieldChannel).aggregate));
 		}
 	},
 	{
 		name: "omitTableWithOcclusionIfAutoAddCount",
 		description: "Plots without aggregation or autocount where x and y are both discrete should be omitted if autoAddCount is enabled as they often lead to occlusion",
 		properties: [
-			R.CHANNEL,
-			R.TYPE,
-			R.TIMEUNIT,
-			R.BIN,
-			R.AGGREGATE,
-			R.AUTOCOUNT
+			z.CHANNEL,
+			z.TYPE,
+			z.TIMEUNIT,
+			z.BIN,
+			z.AGGREGATE,
+			z.AUTOCOUNT
 		],
 		allowWildcardForProperties: !1,
 		strict: !1,
 		satisfy: (e, t, n) => {
 			if (n.autoAddCount) {
 				let t = e.getEncodingQueryByChannel("x"), n = e.getEncodingQueryByChannel("y");
-				if ((!G(t) || bo(t)) && (!G(n) || bo(n))) return e.isAggregate() ? ni(e.getEncodings(), (e) => {
+				if ((!G(t) || bo(t)) && (!G(n) || bo(n))) return e.isAggregate() ? ti(e.getEncodings(), (e) => {
 					let t = e.channel;
 					return !(t !== "x" && t !== "y" && t !== "row" && t !== "column" && G(e) && !e.aggregate);
 				}) : !1;
@@ -4446,9 +4446,9 @@ function Sc(e) {
 }
 xc.set("mark", (e, t, n) => (r, i) => (i.getMark().enum.forEach((a) => {
 	i.setMark(a), bc("mark", e.mark, i, t, n) || r.push(i.duplicate());
-}), i.resetMark(), r)), ci.forEach((e) => {
+}), i.resetMark(), r)), si.forEach((e) => {
 	xc.set(e, Cc(e));
-}), yi.forEach((e) => {
+}), vi.forEach((e) => {
 	xc.set(e, Cc(e));
 });
 function Cc(e) {
@@ -4470,7 +4470,7 @@ function Cc(e) {
 //#endregion
 //#region ../node_modules/.pnpm/compassql@0.21.2_vega@6.2.0/node_modules/compassql/build/src/query/groupby.js
 function wc(e) {
-	return (0, F.isObject)(e) && !!e.property;
+	return (0, I.isObject)(e) && !!e.property;
 }
 function Tc(e, t, n) {
 	return t ||= new U(), n ||= new U(), e.forEach((e) => {
@@ -4482,14 +4482,14 @@ function Tc(e, t, n) {
 	};
 }
 var Ec = [
-	R.FIELD,
-	R.TYPE,
-	R.AGGREGATE,
-	R.BIN,
-	R.TIMEUNIT,
-	R.STACK
+	z.FIELD,
+	z.TYPE,
+	z.AGGREGATE,
+	z.BIN,
+	z.TIMEUNIT,
+	z.STACK
 ], Dc = Ec.concat([{
-	property: R.CHANNEL,
+	property: z.CHANNEL,
 	replace: {
 		x: "xy",
 		y: "xy",
@@ -4515,7 +4515,7 @@ function Pc(e, t) {
 		for (let e = 0; e < t.length; e++) {
 			i.push(e > 0 ? i[e - 1].duplicate() : new U()), a.push(e > 0 ? a[e - 1].duplicate() : new U());
 			let n = t[e].groupBy;
-			if ((0, F.isArray)(n)) {
+			if ((0, I.isArray)(n)) {
 				let t = Tc(n, i[e], a[e]);
 				o.push(t.replacer);
 			}
@@ -4525,7 +4525,7 @@ function Pc(e, t) {
 			for (let n = 0; n < t.length; n++) {
 				let c = s.groupBy = t[n].groupBy;
 				s.orderGroupBy = t[n].orderGroupBy;
-				let l = (0, F.isArray)(c) ? oo(e.specQuery, i[n], o[n]) : Oc[c](e.specQuery);
+				let l = (0, I.isArray)(c) ? oo(e.specQuery, i[n], o[n]) : Oc[c](e.specQuery);
 				a += "/" + l, r[a] || (r[a] = {
 					name: l,
 					path: a,
@@ -4541,7 +4541,7 @@ function Pc(e, t) {
 		items: e
 	};
 }
-var Fc = Tc([R.FIELD]);
+var Fc = Tc([z.FIELD]);
 function Ic(e, t) {
 	return Oc[t](e);
 }
@@ -4566,7 +4566,7 @@ var zc = class {
 		return !!this._encodings[e] && this._encodings[e].has(t);
 	}
 	hasProperty(e) {
-		if (Ei(e)) return this.encodingIndicesByProperty.has(e);
+		if (Ti(e)) return this.encodingIndicesByProperty.has(e);
 		if (e === "mark") return !!this.mark;
 		/* istanbul ignore next */
 		throw Error("Unimplemented for property " + e);
@@ -4588,45 +4588,45 @@ var zc = class {
 	}
 }, Bc = class e {
 	constructor(e, t, n, r, i) {
-		this._rankingScore = {}, this._spec = e, this._channelFieldCount = e.encodings.reduce((e, t) => (!B(t.channel) && (!K(t) || t.autoCount !== !1) && (e[t.channel + ""] = 1), e), {}), this._wildcardIndex = t, this._assignedWildcardIndex = i, this._opt = r, this._schema = n;
+		this._rankingScore = {}, this._spec = e, this._channelFieldCount = e.encodings.reduce((e, t) => (!V(t.channel) && (!K(t) || t.autoCount !== !1) && (e[t.channel + ""] = 1), e), {}), this._wildcardIndex = t, this._assignedWildcardIndex = i, this._opt = r, this._schema = n;
 	}
 	static build(t, n, r) {
 		let i = new zc();
-		if (B(t.mark)) {
-			let e = ca(R.MARK);
-			t.mark = aa(t.mark, e, r.enum.mark), i.setMark(t.mark);
+		if (V(t.mark)) {
+			let e = sa(z.MARK);
+			t.mark = ia(t.mark, e, r.enum.mark), i.setMark(t.mark);
 		}
 		if (t.encodings.forEach((e, t) => {
-			K(e) && (console.warn("A field with autoCount should not be included as autoCount meant to be an internal object."), e.type = N), G(e) && e.type === void 0 && (e.type = "?"), ci.forEach((a) => {
-				if (B(e[a])) {
-					let o = ca(a) + t, s = ma(a, n, r), c = e[a] = aa(e[a], o, s);
+			K(e) && (console.warn("A field with autoCount should not be included as autoCount meant to be an internal object."), e.type = P), G(e) && e.type === void 0 && (e.type = "?"), si.forEach((a) => {
+				if (V(e[a])) {
+					let o = sa(a) + t, s = pa(a, n, r), c = e[a] = ia(e[a], o, s);
 					i.setEncodingProperty(t, a, c);
 				}
-			}), yi.forEach((a) => {
+			}), vi.forEach((a) => {
 				let o = e[a.parent];
 				if (o) {
 					let e = a.child;
-					if (B(o[e])) {
-						let s = ca(a) + t, c = ma(a, n, r), l = o[e] = aa(o[e], s, c);
+					if (V(o[e])) {
+						let s = sa(a) + t, c = pa(a, n, r), l = o[e] = ia(o[e], s, c);
 						i.setEncodingProperty(t, a, l);
 					}
 				}
 			});
 		}), r.autoAddCount) {
 			let e = {
-				name: ca(R.CHANNEL) + t.encodings.length,
-				enum: ma(R.CHANNEL, n, r)
+				name: sa(z.CHANNEL) + t.encodings.length,
+				enum: pa(z.CHANNEL, n, r)
 			}, a = {
-				name: ca(R.AUTOCOUNT) + t.encodings.length,
+				name: sa(z.AUTOCOUNT) + t.encodings.length,
 				enum: [!1, !0]
 			}, o = {
 				channel: e,
 				autoCount: a,
-				type: N
+				type: P
 			};
 			t.encodings.push(o);
 			let s = t.encodings.length - 1;
-			i.setEncodingProperty(s, R.CHANNEL, e), i.setEncodingProperty(s, R.AUTOCOUNT, a);
+			i.setEncodingProperty(s, z.CHANNEL, e), i.setEncodingProperty(s, z.AUTOCOUNT, a);
 		}
 		return new e(t, i, n, r, {});
 	}
@@ -4640,7 +4640,7 @@ var zc = class {
 		return this._spec;
 	}
 	duplicate() {
-		return new e((0, F.duplicate)(this._spec), this._wildcardIndex, this._schema, this._opt, (0, F.duplicate)(this._assignedWildcardIndex));
+		return new e((0, I.duplicate)(this._spec), this._wildcardIndex, this._schema, this._opt, (0, I.duplicate)(this._assignedWildcardIndex));
 	}
 	setMark(e) {
 		let t = this._wildcardIndex.mark.name;
@@ -4655,18 +4655,18 @@ var zc = class {
 	}
 	getEncodingProperty(e, t) {
 		let n = this._spec.encodings[e];
-		return oi(t) ? n[t.parent][t.child] : n[t];
+		return ai(t) ? n[t.parent][t.child] : n[t];
 	}
 	setEncodingProperty(e, t, n, r) {
 		let i = this._spec.encodings[e];
-		t === R.CHANNEL && i.channel && !B(i.channel) && this._channelFieldCount[i.channel]--, oi(t) ? i[t.parent][t.child] = n : i[t] = di(t) && n === !0 ? (0, F.extend)({}, i[t], {
+		t === z.CHANNEL && i.channel && !V(i.channel) && this._channelFieldCount[i.channel]--, ai(t) ? i[t.parent][t.child] = n : i[t] = ui(t) && n === !0 ? (0, I.extend)({}, i[t], {
 			enum: void 0,
 			name: void 0
-		}) : n, this._assignedWildcardIndex[r.name] = n, t === R.CHANNEL && (this._channelFieldCount[n] = (this._channelFieldCount[n] || 0) + 1);
+		}) : n, this._assignedWildcardIndex[r.name] = n, t === z.CHANNEL && (this._channelFieldCount[n] = (this._channelFieldCount[n] || 0) + 1);
 	}
 	resetEncodingProperty(e, t, n) {
 		let r = this._spec.encodings[e];
-		t === R.CHANNEL && this._channelFieldCount[r.channel]--, oi(t) ? r[t.parent][t.child] = n : r[t] = n, delete this._assignedWildcardIndex[n.name];
+		t === z.CHANNEL && this._channelFieldCount[r.channel]--, ai(t) ? r[t.parent][t.child] = n : r[t] = n, delete this._assignedWildcardIndex[n.name];
 	}
 	channelUsed(e) {
 		return this._channelFieldCount[e] > 0;
@@ -4697,19 +4697,19 @@ var zc = class {
 	}
 	toShorthand(e) {
 		if (e) {
-			if ((0, F.isString)(e)) return Ic(this.specQuery, e);
+			if ((0, I.isString)(e)) return Ic(this.specQuery, e);
 			let t = Tc(e);
 			return oo(this._spec, t.include, t.replacer);
 		}
 		return oo(this._spec);
 	}
 	toSpec(e) {
-		if (B(this._spec.mark)) return null;
+		if (V(this._spec.mark)) return null;
 		let t = {};
 		return e ||= this._spec.data, e && (t.data = e), this._spec.transform && (t.transform = this._spec.transform), t.mark = this._spec.mark, t.encoding = go(this.specQuery.encodings, {
 			schema: this._schema,
 			wildcardMode: "null"
-		}), this._spec.width && (t.width = this._spec.width), this._spec.height && (t.height = this._spec.height), this._spec.background && (t.background = this._spec.background), this._spec.padding && (t.padding = this._spec.padding), this._spec.title && (t.title = this._spec.title), t.encoding === null ? null : ((this._spec.config || this._opt.defaultSpecConfig) && (t.config = (0, F.extend)({}, this._opt.defaultSpecConfig, this._spec.config)), t);
+		}), this._spec.width && (t.width = this._spec.width), this._spec.height && (t.height = this._spec.height), this._spec.background && (t.background = this._spec.background), this._spec.padding && (t.padding = this._spec.padding), this._spec.title && (t.title = this._spec.title), t.encoding === null ? null : ((this._spec.config || this._opt.defaultSpecConfig) && (t.config = (0, I.extend)({}, this._opt.defaultSpecConfig, this._spec.config)), t);
 	}
 	getRankingScore(e) {
 		return this._rankingScore[e];
@@ -4725,12 +4725,12 @@ function Vc(e) {
 		let t = { groupBy: e.groupBy };
 		e.orderBy && (t.orderGroupBy = e.orderBy);
 		let n = {
-			spec: (0, F.duplicate)(e.spec),
+			spec: (0, I.duplicate)(e.spec),
 			nest: [t]
 		};
 		return e.chooseBy && (n.chooseBy = e.chooseBy), e.config && (n.config = e.config), n;
 	}
-	return (0, F.duplicate)(e);
+	return (0, I.duplicate)(e);
 }
 //#endregion
 //#region ../node_modules/.pnpm/compassql@0.21.2_vega@6.2.0/node_modules/compassql/build/src/result.js
@@ -4758,11 +4758,11 @@ var Wc = class {
 	}
 }, Z;
 (function(e) {
-	e[e.Q = N] = "Q", e[e.BIN_Q = "bin_" + N] = "BIN_Q", e[e.T = Or] = "T", e[e.TIMEUNIT_T = "timeUnit_time"] = "TIMEUNIT_T", e[e.TIMEUNIT_O = "timeUnit_" + Dr] = "TIMEUNIT_O", e[e.O = Dr] = "O", e[e.N = kr] = "N", e[e.K = H.KEY] = "K", e[e.NONE = "-"] = "NONE";
+	e[e.Q = P] = "Q", e[e.BIN_Q = "bin_" + P] = "BIN_Q", e[e.T = Dr] = "T", e[e.TIMEUNIT_T = "timeUnit_time"] = "TIMEUNIT_T", e[e.TIMEUNIT_O = "timeUnit_" + Er] = "TIMEUNIT_O", e[e.O = Er] = "O", e[e.N = Or] = "N", e[e.K = Ra.KEY] = "K", e[e.NONE = "-"] = "NONE";
 })(Z ||= {});
 var Gc = Z.Q, Kc = Z.BIN_Q, qc = Z.T, Jc = Z.TIMEUNIT_T, Yc = Z.TIMEUNIT_O, Xc = Z.O, Zc = Z.N, Qc = Z.K, $c = Z.NONE;
 function el(e) {
-	return e.bin ? Z.BIN_Q : e.timeUnit ? Rr(xo(e)) ? Z.TIMEUNIT_O : Z.TIMEUNIT_T : e.type;
+	return e.bin ? Z.BIN_Q : e.timeUnit ? Lr(xo(e)) ? Z.TIMEUNIT_O : Z.TIMEUNIT_T : e.type;
 }
 //#endregion
 //#region ../node_modules/.pnpm/compassql@0.21.2_vega@6.2.0/node_modules/compassql/build/src/ranking/effectiveness/axis.js
@@ -4771,7 +4771,7 @@ var tl = class extends Wc {
 		super("Axis");
 	}
 	initScore(e = {}) {
-		e = Object.assign({}, ha, e);
+		e = Object.assign({}, ma, e);
 		let t = {};
 		return [
 			{
@@ -4846,9 +4846,9 @@ var tl = class extends Wc {
 		super("Facet");
 	}
 	initScore(e) {
-		e = Object.assign({}, ha, e);
+		e = Object.assign({}, ma, e);
 		let t = {};
-		return e.preferredFacet === "row" ? t[Je] = -.01 : e.preferredFacet === "column" && (t.row = -.01), t;
+		return e.preferredFacet === "row" ? t[qe] = -.01 : e.preferredFacet === "column" && (t.row = -.01), t;
 	}
 	getScore(e, t, n) {
 		return e.getEncodings().reduce((e, t) => {
@@ -4901,11 +4901,11 @@ var tl = class extends Wc {
 			qc,
 			Jc
 		].forEach((n) => {
-			(0, F.keys)(t).forEach((r) => {
+			(0, I.keys)(t).forEach((r) => {
 				e[this.featurize(n, r)] = t[r];
 			});
 		});
-		let n = (0, F.extend)({}, t, {
+		let n = (0, I.extend)({}, t, {
 			row: -.75,
 			column: -.75,
 			shape: -3.1,
@@ -4917,7 +4917,7 @@ var tl = class extends Wc {
 			Yc,
 			Xc
 		].forEach((t) => {
-			(0, F.keys)(n).forEach((r) => {
+			(0, I.keys)(n).forEach((r) => {
 				e[this.featurize(t, r)] = n[r];
 			});
 		});
@@ -4933,8 +4933,8 @@ var tl = class extends Wc {
 			size: -3,
 			opacity: -3.1
 		};
-		return (0, F.keys)(r).forEach((t) => {
-			e[this.featurize(Zc, t)] = r[t], e[this.featurize(Qc, t)] = I([
+		return (0, I.keys)(r).forEach((t) => {
+			e[this.featurize(Zc, t)] = r[t], e[this.featurize(Qc, t)] = L([
 				"x",
 				"y",
 				"detail"
@@ -4952,7 +4952,7 @@ var tl = class extends Wc {
 			}
 			return e;
 		}, {}), i = [];
-		return L(r, (e) => {
+		return R(r, (e) => {
 			let t = e.reduce((e, t) => {
 				if (G(t) || K(t)) {
 					let n = el(t), r = this.featurize(n, t.channel), i = this.getFeatureScore(r);
@@ -4972,7 +4972,7 @@ var tl = class extends Wc {
 	}
 	getScore(e, t, n) {
 		let r = e.getMark();
-		(r === "circle" || r === "square") && (r = ji);
+		(r === "circle" || r === "square") && (r = Ai);
 		let i = e.getEncodingQueryByChannel("x"), a = i ? el(i) : $c, o = e.getEncodingQueryByChannel("y"), s = o ? el(o) : $c, c = !e.isAggregate(), l = a + "_" + s + "_" + c + "_" + r, u = this.getFeatureScore(l);
 		return u ? [u] : (console.error("feature score missing for", l), []);
 	}
@@ -4991,7 +4991,7 @@ function sl() {
 	], n = {};
 	e.forEach((t) => {
 		e.forEach((e) => {
-			L({
+			R({
 				point: 0,
 				text: -.2,
 				tick: -.5,
@@ -5003,7 +5003,7 @@ function sl() {
 			}, (r, i) => {
 				let a = Q(t, e, !0, i);
 				n[a] = r;
-			}), L({
+			}), R({
 				point: 0,
 				text: -.2,
 				tick: -.5,
@@ -5018,7 +5018,7 @@ function sl() {
 		});
 	}), e.forEach((e) => {
 		t.forEach((t) => {
-			L({
+			R({
 				tick: 0,
 				point: -.2,
 				text: -.5,
@@ -5033,7 +5033,7 @@ function sl() {
 				n[o] = r;
 			});
 		}), [Jc].forEach((t) => {
-			L({
+			R({
 				point: 0,
 				text: -.5,
 				tick: -1,
@@ -5053,7 +5053,7 @@ function sl() {
 			Xc,
 			Qc
 		].forEach((t) => {
-			L({
+			R({
 				bar: 0,
 				point: -.2,
 				tick: -.25,
@@ -5068,7 +5068,7 @@ function sl() {
 				n[o] = r;
 			});
 		}), [Kc].forEach((t) => {
-			L({
+			R({
 				bar: 0,
 				point: -.2,
 				tick: -.25,
@@ -5083,7 +5083,7 @@ function sl() {
 				n[o] = r;
 			});
 		}), [Jc, Yc].forEach((t) => {
-			L({
+			R({
 				line: 0,
 				area: -.1,
 				bar: -.2,
@@ -5110,10 +5110,10 @@ function sl() {
 				area: -2,
 				rule: -2.5
 			};
-			L(r, (r, i) => {
+			R(r, (r, i) => {
 				let a = Q(e, t, !0, i);
 				n[a] = r;
-			}), L(r, (r, i) => {
+			}), R(r, (r, i) => {
 				let a = Q(e, t, !1, i);
 				n[a] = r;
 			});
@@ -5128,16 +5128,16 @@ function sl() {
 				area: -2,
 				rule: -2.5
 			};
-			L(r, (r, i) => {
+			R(r, (r, i) => {
 				let a = Q(e, t, !0, i);
 				n[a] = r;
-			}), L(r, (r, i) => {
+			}), R(r, (r, i) => {
 				let a = Q(t, e, !0, i);
 				n[a] = r;
-			}), L(r, (r, i) => {
+			}), R(r, (r, i) => {
 				let a = Q(e, t, !1, i);
 				n[a] = r;
-			}), L(r, (r, i) => {
+			}), R(r, (r, i) => {
 				let a = Q(t, e, !1, i);
 				n[a] = r;
 			});
@@ -5154,10 +5154,10 @@ function sl() {
 			area: -2,
 			rule: -2.5
 		};
-		L(t, (t, i) => {
+		R(t, (t, i) => {
 			let a = Q(e, r, !0, i);
 			n[a] = t;
-		}), L(t, (t, i) => {
+		}), R(t, (t, i) => {
 			let a = Q(e, r, !1, i);
 			n[a] = t;
 		});
@@ -5197,13 +5197,13 @@ function dl(e, t, n) {
 function fl(e, t, n) {
 	let r = e.getEncodings();
 	if (e.isAggregate()) {
-		if (ri(r, (e) => G(e) && (e.type === "quantitative" && !e.bin && !e.aggregate || e.type === "temporal" && !e.timeUnit))) return {
+		if (ni(r, (e) => G(e) && (e.type === "quantitative" && !e.bin && !e.aggregate || e.type === "temporal" && !e.timeUnit))) return {
 			type: ul,
 			score: .1,
 			feature: "Aggregate with raw continuous"
 		};
-		if (ri(r, (e) => G(e) && bo(e))) {
-			let e = ri(r, (e) => G(e) && e.aggregate === "count" || mo(e)), t = ri(r, (e) => G(e) && !!e.bin);
+		if (ni(r, (e) => G(e) && bo(e))) {
+			let e = ni(r, (e) => G(e) && e.aggregate === "count" || mo(e)), t = ni(r, (e) => G(e) && !!e.bin);
 			return e ? {
 				type: ul,
 				score: .8,
@@ -5224,7 +5224,7 @@ function fl(e, t, n) {
 			feature: "Aggregate without dimension"
 		};
 	}
-	return ri(r, (e) => G(e) && !bo(e)) ? {
+	return ni(r, (e) => G(e) && !bo(e)) ? {
 		type: ul,
 		score: 1,
 		feature: "Raw with measure"
@@ -5308,7 +5308,7 @@ function wl(e, t, n, r) {
 	[
 		"row",
 		"y",
-		Je,
+		qe,
 		"x"
 	].forEach((t) => {
 		n[t] = e.getEncodingQueryByChannel(t);
@@ -5317,40 +5317,40 @@ function wl(e, t, n, r) {
 	if (i !== void 0 && G(i) && (n.row || t.cardinality(i) > r.smallRangeStepForHighCardinalityOrFacet.maxCardinality)) {
 		i.scale === void 0 && (i.scale = {});
 		let e = xo(i);
-		i.scale && (e === void 0 || Rr(e)) && (i.scale.rangeStep || (i.scale.rangeStep = 12));
+		i.scale && (e === void 0 || Lr(e)) && (i.scale.rangeStep || (i.scale.rangeStep = 12));
 	}
 	let a = n.x;
 	if (G(a) && (n.column || t.cardinality(a) > r.smallRangeStepForHighCardinalityOrFacet.maxCardinality)) {
 		a.scale === void 0 && (a.scale = {});
 		let e = xo(a);
-		a.scale && (e === void 0 || Rr(e)) && (a.scale.rangeStep || (a.scale.rangeStep = 12));
+		a.scale && (e === void 0 || Lr(e)) && (a.scale.rangeStep || (a.scale.rangeStep = 12));
 	}
 	return e;
 }
 function Tl(e, t, n, r) {
-	n[et] = e.getEncodingQueryByChannel(et);
-	let i = n[et];
-	return G(i) && i !== void 0 && (i.type === "nominal" || i.type === H.KEY) && t.cardinality(i) > r.nominalColorScaleForHighCardinality.maxCardinality && (i.scale === void 0 && (i.scale = {}), i.scale && (i.scale.range || (i.scale.scheme = r.nominalColorScaleForHighCardinality.palette))), e;
+	n[$e] = e.getEncodingQueryByChannel($e);
+	let i = n[$e];
+	return G(i) && i !== void 0 && (i.type === "nominal" || i.type === Ra.KEY) && t.cardinality(i) > r.nominalColorScaleForHighCardinality.maxCardinality && (i.scale === void 0 && (i.scale = {}), i.scale && (i.scale.range || (i.scale.scheme = r.nominalColorScaleForHighCardinality.palette))), e;
 }
 function El(e, t, n, r) {
 	if ([
-		Je,
+		qe,
 		"x",
 		"y"
 	].forEach((t) => {
 		n[t] = e.getEncodingQueryByChannel(t);
 	}), n.column === void 0) {
 		let e = n.x, i = n.y;
-		G(e) && G(i) && i !== void 0 && i.field && Rr(xo(i)) && e !== void 0 && t.cardinality(i) > r.xAxisOnTopForHighYCardinalityWithoutColumn.maxCardinality && (e.axis === void 0 && (e.axis = {}), e.axis && !e.axis.orient && (e.axis.orient = "top"));
+		G(e) && G(i) && i !== void 0 && i.field && Lr(xo(i)) && e !== void 0 && t.cardinality(i) > r.xAxisOnTopForHighYCardinalityWithoutColumn.maxCardinality && (e.axis === void 0 && (e.axis = {}), e.axis && !e.axis.orient && (e.axis.orient = "top"));
 	}
 	return e;
 }
 //#endregion
 //#region ../node_modules/.pnpm/compassql@0.21.2_vega@6.2.0/node_modules/compassql/build/src/generate.js
-function Dl(e, t, n = ha) {
+function Dl(e, t, n = ma) {
 	let r = Bc.build(e, t, n), i = r.wildcardIndex, a = [r];
 	return n.propertyPrecedence.forEach((e) => {
-		let r = Ci(e);
+		let r = Si(e);
 		if (i.hasProperty(r)) {
 			let e = Sc(r)(i, t, n);
 			a = a.reduce(e, []);
@@ -5360,7 +5360,7 @@ function Dl(e, t, n = ha) {
 //#endregion
 //#region ../node_modules/.pnpm/compassql@0.21.2_vega@6.2.0/node_modules/compassql/build/src/recommend.js
 function Ol(e, t, n) {
-	e = Object.assign({}, Vc(e), { config: Object.assign({}, ha, n, e.config) });
+	e = Object.assign({}, Vc(e), { config: Object.assign({}, ma, n, e.config) });
 	let r = vl(Pc(Dl(e.spec, t, e.config), e.nest), e, t, 0);
 	return {
 		query: e,
@@ -5369,14 +5369,14 @@ function Ol(e, t, n) {
 }
 //#endregion
 //#region src/plugins/impl/data-explorer/components/icons.tsx
-var kl = /* @__PURE__ */ e(c(), 1), $ = O(), Al = {
-	[X.BOOLEAN]: /* @__PURE__ */ (0, $.jsx)(g, { className: "h-5 w-5 inline-flex opacity-60" }),
-	[X.DATETIME]: /* @__PURE__ */ (0, $.jsx)(m, { className: "h-5 w-5 inline-flex opacity-60" }),
-	[X.NUMBER]: /* @__PURE__ */ (0, $.jsx)(v, { className: "h-5 w-5 inline-flex opacity-60" }),
-	[X.STRING]: /* @__PURE__ */ (0, $.jsx)(p, { className: "h-5 w-5 inline-flex opacity-60" }),
-	[X.INTEGER]: /* @__PURE__ */ (0, $.jsx)(xe, { className: "h-5 w-5 inline-flex opacity-60" })
+var kl = /* @__PURE__ */ e(c(), 1), $ = k(), Al = {
+	[X.BOOLEAN]: /* @__PURE__ */ (0, $.jsx)(_, { className: "h-5 w-5 inline-flex opacity-60" }),
+	[X.DATETIME]: /* @__PURE__ */ (0, $.jsx)(h, { className: "h-5 w-5 inline-flex opacity-60" }),
+	[X.NUMBER]: /* @__PURE__ */ (0, $.jsx)(y, { className: "h-5 w-5 inline-flex opacity-60" }),
+	[X.STRING]: /* @__PURE__ */ (0, $.jsx)(m, { className: "h-5 w-5 inline-flex opacity-60" }),
+	[X.INTEGER]: /* @__PURE__ */ (0, $.jsx)(be, { className: "h-5 w-5 inline-flex opacity-60" })
 }, jl = 12, Ml = (e) => {
-	let t = (0, Se.c)(45), { schema: n } = e, [r, i] = (0, kl.useState)(), [a, c] = (0, kl.useState)(), l, u, d, f, p, m, h, g;
+	let t = (0, xe.c)(45), { schema: n } = e, [r, i] = (0, kl.useState)(), [a, c] = (0, kl.useState)(), l, u, d, f, p, m, h, g;
 	if (t[0] !== n || t[1] !== r || t[2] !== a) {
 		l = n.fieldNames();
 		let e;
@@ -5385,7 +5385,7 @@ var kl = /* @__PURE__ */ e(c(), 1), $ = O(), Al = {
 			channel: "x"
 		}) : void 0, t[11] = n, t[12] = r, t[13] = e) : e = t[13], d = e;
 		let s;
-		t[14] === Symbol.for("react.memo_cache_sentinel") ? (s = /* @__PURE__ */ (0, $.jsx)(be, {
+		t[14] === Symbol.for("react.memo_cache_sentinel") ? (s = /* @__PURE__ */ (0, $.jsx)(ye, {
 			className: "text-muted-foreground",
 			width: 40,
 			height: 40,
@@ -5445,12 +5445,12 @@ var kl = /* @__PURE__ */ e(c(), 1), $ = O(), Al = {
 		i(e);
 	}, t[25] = x) : x = t[25];
 	let S;
-	t[26] === Symbol.for("react.memo_cache_sentinel") ? (S = /* @__PURE__ */ (0, $.jsx)(ne, {
+	t[26] === Symbol.for("react.memo_cache_sentinel") ? (S = /* @__PURE__ */ (0, $.jsx)(te, {
 		className: "min-w-[210px] h-full",
-		children: /* @__PURE__ */ (0, $.jsx)(w, { placeholder: "Select a column" })
+		children: /* @__PURE__ */ (0, $.jsx)(T, { placeholder: "Select a column" })
 	}), t[26] = S) : S = t[26];
 	let C;
-	t[27] === n ? C = t[28] : (C = n.fieldNames().map((e) => /* @__PURE__ */ (0, $.jsx)(T, {
+	t[27] === n ? C = t[28] : (C = n.fieldNames().map((e) => /* @__PURE__ */ (0, $.jsx)(E, {
 		value: e.toString(),
 		children: /* @__PURE__ */ (0, $.jsxs)("span", {
 			className: "flex items-center gap-2 flex-1",
@@ -5471,21 +5471,21 @@ var kl = /* @__PURE__ */ e(c(), 1), $ = O(), Al = {
 			]
 		})
 	}, e)), t[27] = n, t[28] = C);
-	let E;
-	t[29] === C ? E = t[30] : (E = /* @__PURE__ */ (0, $.jsx)(ee, { children: /* @__PURE__ */ (0, $.jsx)(te, { children: C }) }), t[29] = C, t[30] = E);
-	let D;
-	t[31] !== E || t[32] !== y || t[33] !== b ? (D = /* @__PURE__ */ (0, $.jsx)("div", {
+	let w;
+	t[29] === C ? w = t[30] : (w = /* @__PURE__ */ (0, $.jsx)(D, { children: /* @__PURE__ */ (0, $.jsx)(ee, { children: C }) }), t[29] = C, t[30] = w);
+	let O;
+	t[31] !== w || t[32] !== y || t[33] !== b ? (O = /* @__PURE__ */ (0, $.jsx)("div", {
 		className: "lg:hidden",
-		children: /* @__PURE__ */ (0, $.jsxs)(re, {
+		children: /* @__PURE__ */ (0, $.jsxs)(ne, {
 			"data-testid": "marimo-plugin-data-explorer-column-select",
 			value: y,
 			disabled: b,
 			onValueChange: x,
-			children: [S, E]
+			children: [S, w]
 		})
-	}), t[31] = E, t[32] = y, t[33] = b, t[34] = D) : D = t[34];
-	let O;
-	t[35] !== r || t[36] !== d ? (O = r && /* @__PURE__ */ (0, $.jsx)("div", {
+	}), t[31] = w, t[32] = y, t[33] = b, t[34] = O) : O = t[34];
+	let k;
+	t[35] !== r || t[36] !== d ? (k = r && /* @__PURE__ */ (0, $.jsx)("div", {
 		className: "grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-2 p-2 text-sm",
 		children: Nl.map((e) => /* @__PURE__ */ (0, $.jsxs)("div", {
 			className: "flex flex-row gap-2 min-w-[100px]",
@@ -5494,18 +5494,18 @@ var kl = /* @__PURE__ */ e(c(), 1), $ = O(), Al = {
 				children: e
 			}), /* @__PURE__ */ (0, $.jsx)("span", { children: /* @__PURE__ */ (0, $.jsx)(Pl, { value: d?.[e] }) })]
 		}, e))
-	}), t[35] = r, t[36] = d, t[37] = O) : O = t[37];
-	let ie;
-	return t[38] !== D || t[39] !== O || t[40] !== m || t[41] !== h || t[42] !== g || t[43] !== v ? (ie = /* @__PURE__ */ (0, $.jsxs)("div", {
+	}), t[35] = r, t[36] = d, t[37] = k) : k = t[37];
+	let re;
+	return t[38] !== O || t[39] !== k || t[40] !== m || t[41] !== h || t[42] !== g || t[43] !== v ? (re = /* @__PURE__ */ (0, $.jsxs)("div", {
 		className: m,
 		children: [
 			h,
 			g,
 			v,
-			D,
-			O
+			O,
+			k
 		]
-	}), t[38] = D, t[39] = O, t[40] = m, t[41] = h, t[42] = g, t[43] = v, t[44] = ie) : ie = t[44], ie;
+	}), t[38] = O, t[39] = k, t[40] = m, t[41] = h, t[42] = g, t[43] = v, t[44] = re) : re = t[44], re;
 }, Nl = [
 	"distinct",
 	"min",
@@ -5516,15 +5516,15 @@ var kl = /* @__PURE__ */ e(c(), 1), $ = O(), Al = {
 	"q3",
 	"stdev"
 ], Pl = (e) => {
-	let t = (0, Se.c)(8), { value: n } = e, r;
+	let t = (0, xe.c)(8), { value: n } = e, r;
 	t[0] === Symbol.for("react.memo_cache_sentinel") ? (r = { maximumFractionDigits: 2 }, t[0] = r) : r = t[0];
-	let i = D(r), a;
+	let i = ae(r), a;
 	t[1] === Symbol.for("react.memo_cache_sentinel") ? (a = {
 		year: "numeric",
 		month: "short",
 		day: "numeric"
 	}, t[1] = a) : a = t[1];
-	let o = x(a);
+	let o = S(a);
 	if (typeof n == "number") {
 		let e;
 		return t[2] !== i || t[3] !== n ? (e = i.format(n), t[2] = i, t[3] = n, t[4] = e) : e = t[4], e;
@@ -5671,14 +5671,14 @@ function ql(e, t) {
 }
 function Jl(e) {
 	let { aggregate: t, bin: n, timeUnit: r, field: i, scale: o, legend: s, axis: c, sort: l, description: u } = e, { type: d } = e;
-	if (B(d)) throw Error("Wildcard not support");
+	if (V(d)) throw Error("Wildcard not support");
 	d === "ordinal" && (a.warn("Ordinal type is not supported. Using nominal type instead."), d = "nominal");
 	let f = Ul({
 		aggregate: t,
 		bin: n,
 		timeUnit: r
 	});
-	return fe(i !== void 0, "Field is required for fieldQ"), Kl({
+	return de(i !== void 0, "Field is required for fieldQ"), Kl({
 		field: i,
 		fn: f,
 		type: d,
@@ -5786,7 +5786,7 @@ function iu(e) {
 }
 function au(e) {
 	let t = !1, n = !1, r = !1;
-	for (let i of e.encodings) W(i) || (K(i) ? B(i.autoCount) && (n = !0) : (B(i.field) && (t = !0), (B(i.aggregate) || B(i.bin) || B(i.timeUnit)) && (n = !0), B(i.channel) && (r = !0)));
+	for (let i of e.encodings) W(i) || (K(i) ? V(i.autoCount) && (n = !0) : (V(i.field) && (t = !0), (V(i.aggregate) || V(i.bin) || V(i.timeUnit)) && (n = !0), V(i.channel) && (r = !0)));
 	return {
 		hasAnyWildcard: r || t || n,
 		hasWildcardField: t,
@@ -5800,7 +5800,7 @@ var ou = { name: "source" };
 function su(e) {
 	let t = !1, n = !1, r = !1;
 	return e.encodings.forEach((e) => {
-		e.channel === "x" || e.channel === "y" ? t = !0 : e.channel === "row" || e.channel === "column" ? r = !0 : typeof e.channel == "string" && _e(tu, e.channel) && (n = !0);
+		e.channel === "x" || e.channel === "y" ? t = !0 : e.channel === "row" || e.channel === "column" ? r = !0 : typeof e.channel == "string" && ge(tu, e.channel) && (n = !0);
 	}), {
 		hasOpenPosition: t,
 		hasStyleChannel: n,
@@ -5875,7 +5875,7 @@ function hu() {
 		schema: null
 	};
 }
-var { valueAtom: gu, useActions: _u } = h(hu, {
+var { valueAtom: gu, useActions: _u } = g(hu, {
 	setSchema: (e, t) => ({
 		...e,
 		schema: t
@@ -5905,7 +5905,7 @@ var { valueAtom: gu, useActions: _u } = h(hu, {
 function vu() {
 	return _u();
 }
-var yu = le((e) => {
+var yu = ce((e) => {
 	let t = e(gu);
 	if (!t.schema) return {};
 	let n = pu({
@@ -5929,7 +5929,7 @@ var yu = le((e) => {
 	"size",
 	"shape"
 ], Su = (e) => {
-	let t = (0, Se.c)(26), { schema: n, mark: r } = e, i = se(gu), a = vu(), o = i.encoding.x && i.encoding.y, s;
+	let t = (0, xe.c)(26), { schema: n, mark: r } = e, i = oe(gu), a = vu(), o = i.encoding.x && i.encoding.y, s;
 	t[0] !== a || t[1] !== o || t[2] !== n || t[3] !== i.encoding ? (s = (e) => /* @__PURE__ */ (0, $.jsx)(Cu, {
 		schema: n,
 		label: e,
@@ -5942,11 +5942,11 @@ var yu = le((e) => {
 	let u;
 	t[7] === a ? u = t[8] : (u = (e) => a.setMark(e), t[7] = a, t[8] = u);
 	let d;
-	t[9] === Symbol.for("react.memo_cache_sentinel") ? (d = /* @__PURE__ */ (0, $.jsx)(ne, { children: /* @__PURE__ */ (0, $.jsx)(w, { placeholder: "Mark" }) }), t[9] = d) : d = t[9];
+	t[9] === Symbol.for("react.memo_cache_sentinel") ? (d = /* @__PURE__ */ (0, $.jsx)(te, { children: /* @__PURE__ */ (0, $.jsx)(T, { placeholder: "Mark" }) }), t[9] = d) : d = t[9];
 	let f;
-	t[10] === Symbol.for("react.memo_cache_sentinel") ? (f = /* @__PURE__ */ (0, $.jsx)(ee, { children: /* @__PURE__ */ (0, $.jsxs)(te, { children: [/* @__PURE__ */ (0, $.jsx)(S, { children: "Mark" }), Wl.map(Eu)] }) }), t[10] = f) : f = t[10];
+	t[10] === Symbol.for("react.memo_cache_sentinel") ? (f = /* @__PURE__ */ (0, $.jsx)(D, { children: /* @__PURE__ */ (0, $.jsxs)(ee, { children: [/* @__PURE__ */ (0, $.jsx)(C, { children: "Mark" }), Wl.map(Eu)] }) }), t[10] = f) : f = t[10];
 	let p;
-	t[11] !== l || t[12] !== u ? (p = /* @__PURE__ */ (0, $.jsxs)(re, {
+	t[11] !== l || t[12] !== u ? (p = /* @__PURE__ */ (0, $.jsxs)(ne, {
 		"data-testid": "marimo-plugin-data-explorer-mark-select",
 		value: l,
 		onValueChange: u,
@@ -5982,7 +5982,7 @@ var yu = le((e) => {
 		]
 	}), t[22] = v, t[23] = y, t[24] = g, t[25] = b) : b = t[25], b;
 }, Cu = (e) => {
-	let t = (0, Se.c)(43), { label: n, schema: r, fieldDefinition: i, disabled: a, onChange: o } = e, s;
+	let t = (0, xe.c)(43), { label: n, schema: r, fieldDefinition: i, disabled: a, onChange: o } = e, s;
 	t[0] !== i || t[1] !== r ? (s = () => {
 		if (!i) return "--";
 		if (i.field === "*") return /* @__PURE__ */ (0, $.jsxs)("span", {
@@ -6008,7 +6008,7 @@ var yu = le((e) => {
 	let u = l, d;
 	t[5] === i?.field ? d = t[6] : (d = i?.field.toString() ?? "", t[5] = i?.field, t[6] = d);
 	let f = d, p;
-	t[7] === n ? p = t[8] : (p = /* @__PURE__ */ (0, $.jsx)(ae, {
+	t[7] === n ? p = t[8] : (p = /* @__PURE__ */ (0, $.jsx)(ie, {
 		className: "text-(--slate-11) font-semibold",
 		children: n
 	}), t[7] = n, t[8] = p);
@@ -6026,13 +6026,13 @@ var yu = le((e) => {
 	let h = f ? u : void 0, g;
 	t[12] === c ? g = t[13] : (g = c(), t[12] = c, t[13] = g);
 	let _;
-	t[14] !== h || t[15] !== g ? (_ = /* @__PURE__ */ (0, $.jsx)(ne, {
+	t[14] !== h || t[15] !== g ? (_ = /* @__PURE__ */ (0, $.jsx)(te, {
 		className: "min-w-[140px] lg:min-w-[210px] h-full",
 		onClear: h,
 		children: g
 	}), t[14] = h, t[15] = g, t[16] = _) : _ = t[16];
 	let v;
-	t[17] === r ? v = t[18] : (v = r.fieldNames().map((e) => /* @__PURE__ */ (0, $.jsx)(T, {
+	t[17] === r ? v = t[18] : (v = r.fieldNames().map((e) => /* @__PURE__ */ (0, $.jsx)(E, {
 		value: e.toString(),
 		children: /* @__PURE__ */ (0, $.jsxs)("span", {
 			className: "flex items-center gap-2 flex-1",
@@ -6054,15 +6054,15 @@ var yu = le((e) => {
 		})
 	}, e)), t[17] = r, t[18] = v);
 	let y;
-	t[19] === r ? y = t[20] : (y = r.fieldNames().length === 0 && /* @__PURE__ */ (0, $.jsx)(T, {
+	t[19] === r ? y = t[20] : (y = r.fieldNames().length === 0 && /* @__PURE__ */ (0, $.jsx)(E, {
 		disabled: !0,
 		value: "--",
 		children: "No columns"
 	}), t[19] = r, t[20] = y);
 	let b;
-	t[21] === Symbol.for("react.memo_cache_sentinel") ? (b = /* @__PURE__ */ (0, $.jsx)(E, {}), t[21] = b) : b = t[21];
+	t[21] === Symbol.for("react.memo_cache_sentinel") ? (b = /* @__PURE__ */ (0, $.jsx)(O, {}), t[21] = b) : b = t[21];
 	let x;
-	t[22] === Symbol.for("react.memo_cache_sentinel") ? (x = /* @__PURE__ */ (0, $.jsx)(T, {
+	t[22] === Symbol.for("react.memo_cache_sentinel") ? (x = /* @__PURE__ */ (0, $.jsx)(E, {
 		value: "*",
 		children: /* @__PURE__ */ (0, $.jsxs)("span", {
 			className: "flex items-center gap-1 flex-1",
@@ -6073,14 +6073,14 @@ var yu = le((e) => {
 		})
 	}, "*"), t[22] = x) : x = t[22];
 	let S;
-	t[23] !== y || t[24] !== v ? (S = /* @__PURE__ */ (0, $.jsx)(ee, { children: /* @__PURE__ */ (0, $.jsxs)(te, { children: [
+	t[23] !== y || t[24] !== v ? (S = /* @__PURE__ */ (0, $.jsx)(D, { children: /* @__PURE__ */ (0, $.jsxs)(ee, { children: [
 		v,
 		y,
 		b,
 		x
 	] }) }), t[23] = y, t[24] = v, t[25] = S) : S = t[25];
 	let C;
-	t[26] !== a || t[27] !== f || t[28] !== S || t[29] !== m || t[30] !== _ ? (C = /* @__PURE__ */ (0, $.jsxs)(re, {
+	t[26] !== a || t[27] !== f || t[28] !== S || t[29] !== m || t[30] !== _ ? (C = /* @__PURE__ */ (0, $.jsxs)(ne, {
 		value: f,
 		disabled: a,
 		onValueChange: m,
@@ -6091,53 +6091,53 @@ var yu = le((e) => {
 		field: i,
 		onChange: o
 	}), t[32] = i, t[33] = o, t[34] = w) : w = t[34];
-	let D;
-	t[35] === w ? D = t[36] : (D = /* @__PURE__ */ (0, $.jsx)("div", {
+	let T;
+	t[35] === w ? T = t[36] : (T = /* @__PURE__ */ (0, $.jsx)("div", {
 		className: "w-[26px]",
 		children: w
-	}), t[35] = w, t[36] = D);
-	let O;
-	t[37] !== C || t[38] !== D ? (O = /* @__PURE__ */ (0, $.jsxs)("div", {
+	}), t[35] = w, t[36] = T);
+	let k;
+	t[37] !== C || t[38] !== T ? (k = /* @__PURE__ */ (0, $.jsxs)("div", {
 		className: "flex flex-row gap-1 h-[26px]",
-		children: [C, D]
-	}), t[37] = C, t[38] = D, t[39] = O) : O = t[39];
-	let ie;
-	return t[40] !== O || t[41] !== p ? (ie = /* @__PURE__ */ (0, $.jsxs)($.Fragment, { children: [p, O] }), t[40] = O, t[41] = p, t[42] = ie) : ie = t[42], ie;
+		children: [C, T]
+	}), t[37] = C, t[38] = T, t[39] = k) : k = t[39];
+	let re;
+	return t[40] !== k || t[41] !== p ? (re = /* @__PURE__ */ (0, $.jsxs)($.Fragment, { children: [p, k] }), t[40] = k, t[41] = p, t[42] = re) : re = t[42], re;
 }, wu = "__", Tu = (e) => {
-	let t = (0, Se.c)(10), { field: n, onChange: r } = e;
+	let t = (0, xe.c)(10), { field: n, onChange: r } = e;
 	if (n.field === "*") return null;
 	let i;
 	if (t[0] !== n || t[1] !== r) {
 		i = Symbol.for("react.early_return_sentinel");
 		bb0: {
 			let e = [];
-			if (n.type === H.QUANTITATIVE && (e = [["", Bl]]), n.type === H.TEMPORAL && (e = [["Single", Vl], ["Multi", Hl]]), e.length > 0) {
+			if (n.type === Ra.QUANTITATIVE && (e = [["", Bl]]), n.type === Ra.TEMPORAL && (e = [["Single", Vl], ["Multi", Hl]]), e.length > 0) {
 				let a = (e) => {
 					r({
 						...n,
 						fn: e === wu ? void 0 : e
 					});
 				}, o;
-				t[3] === Symbol.for("react.memo_cache_sentinel") ? (o = /* @__PURE__ */ (0, $.jsx)(ne, {
+				t[3] === Symbol.for("react.memo_cache_sentinel") ? (o = /* @__PURE__ */ (0, $.jsx)(te, {
 					className: "h-full px-1",
 					hideChevron: !0,
 					variant: "ghost",
-					children: /* @__PURE__ */ (0, $.jsx)(d, {
+					children: /* @__PURE__ */ (0, $.jsx)(f, {
 						size: 14,
 						strokeWidth: 1.5
 					})
 				}), t[3] = o) : o = t[3];
 				let s, c;
-				t[4] === Symbol.for("react.memo_cache_sentinel") ? (s = /* @__PURE__ */ (0, $.jsx)(te, { children: /* @__PURE__ */ (0, $.jsx)(T, {
+				t[4] === Symbol.for("react.memo_cache_sentinel") ? (s = /* @__PURE__ */ (0, $.jsx)(ee, { children: /* @__PURE__ */ (0, $.jsx)(E, {
 					value: wu,
 					children: "None"
-				}) }), c = /* @__PURE__ */ (0, $.jsx)(E, {}), t[4] = s, t[5] = c) : (s = t[4], c = t[5]);
-				let l = /* @__PURE__ */ (0, $.jsxs)(ee, { children: [
+				}) }), c = /* @__PURE__ */ (0, $.jsx)(O, {}), t[4] = s, t[5] = c) : (s = t[4], c = t[5]);
+				let l = /* @__PURE__ */ (0, $.jsxs)(D, { children: [
 					s,
 					c,
 					e.map(Ou)
 				] }), u;
-				t[6] !== n.fn || t[7] !== a || t[8] !== l ? (u = /* @__PURE__ */ (0, $.jsxs)(re, {
+				t[6] !== n.fn || t[7] !== a || t[8] !== l ? (u = /* @__PURE__ */ (0, $.jsxs)(ne, {
 					"data-testid": "marimo-plugin-data-explorer-field-options",
 					value: n.fn,
 					onValueChange: a,
@@ -6151,26 +6151,26 @@ var yu = le((e) => {
 	return i === Symbol.for("react.early_return_sentinel") ? null : i;
 };
 function Eu(e) {
-	return /* @__PURE__ */ (0, $.jsx)(T, {
+	return /* @__PURE__ */ (0, $.jsx)(E, {
 		value: e,
 		children: e === "?" ? "auto" : e
 	}, e);
 }
 function Du(e) {
-	return /* @__PURE__ */ (0, $.jsx)(T, {
+	return /* @__PURE__ */ (0, $.jsx)(E, {
 		value: e ?? wu,
-		children: C.startCase(e)
+		children: w.startCase(e)
 	}, e);
 }
 function Ou(e) {
 	let [t, n] = e;
-	return /* @__PURE__ */ (0, $.jsxs)(te, { children: [t && /* @__PURE__ */ (0, $.jsx)(S, { children: t }), n.map(Du)] }, t);
+	return /* @__PURE__ */ (0, $.jsxs)(ee, { children: [t && /* @__PURE__ */ (0, $.jsx)(C, { children: t }), n.map(Du)] }, t);
 }
 //#endregion
 //#region src/plugins/impl/data-explorer/ConnectedDataExplorerComponent.tsx
 var ku = (e) => {
-	let t = (0, Se.c)(5), n;
-	t[0] === Symbol.for("react.memo_cache_sentinel") ? (n = ce(), t[0] = n) : n = t[0];
+	let t = (0, xe.c)(5), n;
+	t[0] === Symbol.for("react.memo_cache_sentinel") ? (n = se(), t[0] = n) : n = t[0];
 	let r = n, i;
 	t[1] === e ? i = t[2] : (i = () => {
 		let t = r.sub(gu, () => {
@@ -6178,9 +6178,9 @@ var ku = (e) => {
 			e.setValue(n);
 		}), n = e.value;
 		return n && Object.keys(n).length > 0 && r.set(gu, n), t;
-	}, t[1] = e, t[2] = i), y(i);
+	}, t[1] = e, t[2] = i), b(i);
 	let a;
-	return t[3] === e ? a = t[4] : (a = /* @__PURE__ */ (0, $.jsx)(de, {
+	return t[3] === e ? a = t[4] : (a = /* @__PURE__ */ (0, $.jsx)(ue, {
 		store: r,
 		children: /* @__PURE__ */ (0, $.jsx)(ju, { ...e })
 	}), t[3] = e, t[4] = a), a;
@@ -6203,15 +6203,15 @@ function Au(e) {
 			editor: !1
 		},
 		theme: e === "dark" ? "dark" : void 0,
-		tooltip: ve.call,
+		tooltip: _e.call,
 		renderer: "canvas"
 	};
 }
 var ju = (e) => {
-	let t = (0, Se.c)(43), { data: n } = e, r = vu(), i;
+	let t = (0, xe.c)(43), { data: n } = e, r = vu(), i;
 	t[0] !== r || t[1] !== n ? (i = async () => {
 		if (!n) return {};
-		let e = await ye(n, {
+		let e = await ve(n, {
 			type: "csv",
 			parse: "auto"
 		}, { replacePeriod: !0 }), t = nc(e);
@@ -6222,94 +6222,94 @@ var ju = (e) => {
 	}, t[0] = r, t[1] = n, t[2] = i) : i = t[2];
 	let a;
 	t[3] === n ? a = t[4] : (a = [n], t[3] = n, t[4] = a);
-	let { data: c, isPending: l, error: u } = me(i, a), { mark: d } = se(gu), p = se(yu), { theme: m } = ue();
+	let { data: c, isPending: l, error: u } = pe(i, a), { mark: f } = oe(gu), m = oe(yu), { theme: h } = le();
 	if (u) {
 		let e;
-		return t[5] === u ? e = t[6] : (e = /* @__PURE__ */ (0, $.jsx)(ie, { error: u }), t[5] = u, t[6] = e), e;
+		return t[5] === u ? e = t[6] : (e = /* @__PURE__ */ (0, $.jsx)(re, { error: u }), t[5] = u, t[6] = e), e;
 	}
 	if (!c) {
 		let e;
 		return t[7] === Symbol.for("react.memo_cache_sentinel") ? (e = /* @__PURE__ */ (0, $.jsx)("div", {}), t[7] = e) : e = t[7], e;
 	}
-	let { chartData: h, schema: g } = c;
-	if (l || !g) {
+	let { chartData: g, schema: _ } = c;
+	if (l || !_) {
 		let e;
 		return t[8] === Symbol.for("react.memo_cache_sentinel") ? (e = /* @__PURE__ */ (0, $.jsx)("div", {}), t[8] = e) : e = t[8], e;
 	}
-	let v = p.main?.plots?.[0], y;
-	t[9] === v?.fieldInfos ? y = t[10] : (y = new Set(v?.fieldInfos.map(Fu)), t[9] = v?.fieldInfos, t[10] = y);
-	let x = y, S;
-	t[11] !== h || t[12] !== v || t[13] !== g || t[14] !== m ? (S = () => {
-		if (!v) return /* @__PURE__ */ (0, $.jsx)(Ml, { schema: g });
-		let e = v.spec, t = Pu(e), n = f(t, h);
+	let y = m.main?.plots?.[0], b;
+	t[9] === y?.fieldInfos ? b = t[10] : (b = new Set(y?.fieldInfos.map(Fu)), t[9] = y?.fieldInfos, t[10] = b);
+	let S = b, C;
+	t[11] !== g || t[12] !== y || t[13] !== _ || t[14] !== h ? (C = () => {
+		if (!y) return /* @__PURE__ */ (0, $.jsx)(Ml, { schema: _ });
+		let e = y.spec, t = Pu(e), n = p(t, g);
 		return /* @__PURE__ */ (0, $.jsx)("div", {
 			className: o("flex overflow-y-auto justify-center items-center flex-1 w-[90%]"),
-			children: /* @__PURE__ */ (0, $.jsx)(ge, {
-				"data-container-width": he(n),
+			children: /* @__PURE__ */ (0, $.jsx)(he, {
+				"data-container-width": me(n),
 				spec: n,
-				options: Au(m)
+				options: Au(h)
 			})
 		});
-	}, t[11] = h, t[12] = v, t[13] = g, t[14] = m, t[15] = S) : S = t[15];
-	let C = S, w;
-	t[16] !== d || t[17] !== g ? (w = /* @__PURE__ */ (0, $.jsx)(Su, {
-		mark: d,
-		schema: g
-	}), t[16] = d, t[17] = g, t[18] = w) : w = t[18];
-	let T;
-	t[19] === C ? T = t[20] : (T = C(), t[19] = C, t[20] = T);
-	let ee;
-	t[21] !== w || t[22] !== T ? (ee = /* @__PURE__ */ (0, $.jsxs)("div", {
+	}, t[11] = g, t[12] = y, t[13] = _, t[14] = h, t[15] = C) : C = t[15];
+	let w = C, T;
+	t[16] !== f || t[17] !== _ ? (T = /* @__PURE__ */ (0, $.jsx)(Su, {
+		mark: f,
+		schema: _
+	}), t[16] = f, t[17] = _, t[18] = T) : T = t[18];
+	let E;
+	t[19] === w ? E = t[20] : (E = w(), t[19] = w, t[20] = E);
+	let D;
+	t[21] !== T || t[22] !== E ? (D = /* @__PURE__ */ (0, $.jsxs)("div", {
 		className: "flex items-center gap-2",
-		children: [w, T]
-	}), t[21] = w, t[22] = T, t[23] = ee) : ee = t[23];
-	let E = p.histograms?.plots, te = p.addCategoricalField?.plots, ne = p.addQuantitativeField?.plots, re = p.addTemporalField?.plots, D;
-	if (t[24] !== r || t[25] !== h || t[26] !== x || t[27] !== ne || t[28] !== re || t[29] !== E || t[30] !== te || t[31] !== m) {
+		children: [T, E]
+	}), t[21] = T, t[22] = E, t[23] = D) : D = t[23];
+	let O = m.histograms?.plots, ee = m.addCategoricalField?.plots, te = m.addQuantitativeField?.plots, ne = m.addTemporalField?.plots, k;
+	if (t[24] !== r || t[25] !== g || t[26] !== S || t[27] !== te || t[28] !== ne || t[29] !== O || t[30] !== ee || t[31] !== h) {
 		let e;
-		t[33] !== r || t[34] !== h || t[35] !== x || t[36] !== m ? (e = (e, t) => /* @__PURE__ */ (0, $.jsx)(Nu, {
+		t[33] !== r || t[34] !== g || t[35] !== S || t[36] !== h ? (e = (e, t) => /* @__PURE__ */ (0, $.jsx)(Nu, {
 			title: /* @__PURE__ */ (0, $.jsx)("div", {
 				className: "flex flex-row gap-1",
 				children: e.fieldInfos.map((e) => {
 					let t = e.fieldDef.field === "*" ? "Count" : e.fieldDef.fn ? `${e.fieldDef.fn}(${e.fieldDef.field})` : e.fieldDef.field.toString();
-					return /* @__PURE__ */ (0, $.jsx)(_, {
-						variant: x.has(e.fieldDef.field) ? "secondary" : "defaultOutline",
+					return /* @__PURE__ */ (0, $.jsx)(v, {
+						variant: S.has(e.fieldDef.field) ? "secondary" : "defaultOutline",
 						children: t
 					}, t);
 				})
 			}),
-			actions: /* @__PURE__ */ (0, $.jsx)(oe, {
+			actions: /* @__PURE__ */ (0, $.jsx)(d, {
 				content: "Make main plot",
 				children: /* @__PURE__ */ (0, $.jsx)(s, {
 					"data-testid": "marimo-plugin-data-explorer-make-main-plot",
 					variant: "text",
 					size: "icon",
 					onClick: () => {
-						let t = pe.fromEntries(e.fieldInfos.map(Iu));
+						let t = fe.fromEntries(e.fieldInfos.map(Iu));
 						r.setEncoding(t);
 					},
-					children: /* @__PURE__ */ (0, $.jsx)(b, { className: "w-4 h-4" })
+					children: /* @__PURE__ */ (0, $.jsx)(x, { className: "w-4 h-4" })
 				})
 			}),
-			children: /* @__PURE__ */ (0, $.jsx)(ge, {
-				options: Au(m),
-				spec: f(e.spec, h)
+			children: /* @__PURE__ */ (0, $.jsx)(he, {
+				options: Au(h),
+				spec: p(e.spec, g)
 			}, t)
-		}, t), t[33] = r, t[34] = h, t[35] = x, t[36] = m, t[37] = e) : e = t[37], D = [
-			E,
+		}, t), t[33] = r, t[34] = g, t[35] = S, t[36] = h, t[37] = e) : e = t[37], k = [
+			O,
+			ee,
 			te,
-			ne,
-			re
-		].filter(Boolean).flat().map(e), t[24] = r, t[25] = h, t[26] = x, t[27] = ne, t[28] = re, t[29] = E, t[30] = te, t[31] = m, t[32] = D;
-	} else D = t[32];
-	let O;
-	t[38] === D ? O = t[39] : (O = /* @__PURE__ */ (0, $.jsx)(Mu, { children: D }), t[38] = D, t[39] = O);
+			ne
+		].filter(Boolean).flat().map(e), t[24] = r, t[25] = g, t[26] = S, t[27] = te, t[28] = ne, t[29] = O, t[30] = ee, t[31] = h, t[32] = k;
+	} else k = t[32];
+	let ie;
+	t[38] === k ? ie = t[39] : (ie = /* @__PURE__ */ (0, $.jsx)(Mu, { children: k }), t[38] = k, t[39] = ie);
 	let ae;
-	return t[40] !== O || t[41] !== ee ? (ae = /* @__PURE__ */ (0, $.jsxs)("div", {
+	return t[40] !== ie || t[41] !== D ? (ae = /* @__PURE__ */ (0, $.jsxs)("div", {
 		className: "flex flex-col gap-2",
-		children: [ee, O]
-	}), t[40] = O, t[41] = ee, t[42] = ae) : ae = t[42], ae;
+		children: [D, ie]
+	}), t[40] = ie, t[41] = D, t[42] = ae) : ae = t[42], ae;
 }, Mu = (e) => {
-	let t = (0, Se.c)(2), { children: n } = e;
+	let t = (0, xe.c)(2), { children: n } = e;
 	if (kl.Children.count(n) === 0) return null;
 	let r;
 	return t[0] === n ? r = t[1] : (r = /* @__PURE__ */ (0, $.jsx)("div", {
@@ -6317,7 +6317,7 @@ var ju = (e) => {
 		children: n
 	}), t[0] = n, t[1] = r), r;
 }, Nu = (e) => {
-	let t = (0, Se.c)(10), { title: n, children: r, actions: i } = e, a;
+	let t = (0, xe.c)(10), { title: n, children: r, actions: i } = e, a;
 	t[0] === n ? a = t[1] : (a = /* @__PURE__ */ (0, $.jsx)("div", {
 		className: "text-sm font-medium",
 		children: n