@marimo-team/islands 0.15.2 → 0.15.3

package/dist/{ConnectedDataExplorerComponent-C39nQwtD.js → ConnectedDataExplorerComponent-DfvW3rBn.js}

@@ -1,7 +1,7 @@
-import { bx as sr, M as cr, by as Ki, j as S, bz as Xi, bA as Ji, bB as Zi, bC as Qi, c as Ce, G as Ln, bD as Ae, aS as ea, aT as ur, bE as Ot, bF as lr, bG as bt, bH as Ke, bI as xt, L as ta, bJ as na, bK as ra, bL as ia, bM as on, bN as dr, bO as aa, bP as fr, bQ as oa, bR as sa, bS as ca, bT as ua, bU as la, T as da, W as fa, S as ga, E as ha, a3 as ma, bV as pa, _ as ya, bW as Ea, J as Sa } from "./main-B5yML0bw.js";
-import { i as Na, c as _a, N as Ca, V as Bn } from "./index-Bfk9dnyS.js";
+import { bm as sr, y as cr, bn as Ki, j as S, bo as Xi, bp as Ji, bq as Zi, br as Qi, A as Ce, r as Ln, bs as Ae, aH as ea, aI as ur, bt as Ot, bu as lr, bv as bt, bw as Ke, bx as xt, L as ta, by as na, bz as ra, bA as ia, bB as on, bC as dr, bD as aa, bE as fr, bF as oa, bG as sa, bH as ca, bI as ua, bJ as la, G as da, J as fa, F as ga, E as ha, U as ma, bK as pa, O as ya, bL as Ea, w as Sa } from "./main-BD2KGFpU.js";
+import { i as Na, c as _a, N as Ca, V as Bn } from "./index-6qYeHHjQ.js";
 /**
- * @license lucide-react v0.525.0 - ISC
+ * @license lucide-react v0.542.0 - ISC
  *
  * This source code is licensed under the ISC license.
  * See the LICENSE file in the root directory of this source tree.
@@ -12,7 +12,7 @@ const Ta = [
   ["rect", { x: "7", y: "8", width: "4", height: "9", rx: "1", key: "sr5ea" }]
 ], Aa = sr("chart-column-big", Ta);
 /**
- * @license lucide-react v0.525.0 - ISC
+ * @license lucide-react v0.542.0 - ISC
  *
  * This source code is licensed under the ISC license.
  * See the LICENSE file in the root directory of this source tree.
@@ -49,8 +49,8 @@ function Me(e, t) {
 }
 var $t = { exports: {} }, $n;
 function xa() {
-  return $n || ($n = 1, function(e) {
-    var t = function() {
+  return $n || ($n = 1, (function(e) {
+    var t = (function() {
       function n(l, g) {
         return g != null && l instanceof g;
       }
@@ -84,7 +84,7 @@ function xa() {
             return null;
           if (b === 0)
             return N;
-          var C, M;
+          var C, P;
           if (typeof N != "object")
             return N;
           if (n(N, a))
@@ -108,12 +108,12 @@ function xa() {
           else {
             if (T && Buffer.isBuffer(N))
               return Buffer.allocUnsafe ? C = Buffer.allocUnsafe(N.length) : C = new Buffer(N.length), N.copy(C), C;
-            n(N, Error) ? C = Object.create(N) : typeof p > "u" ? (M = Object.getPrototypeOf(N), C = Object.create(M)) : (C = Object.create(p), M = p);
+            n(N, Error) ? C = Object.create(N) : typeof p > "u" ? (P = Object.getPrototypeOf(N), C = Object.create(P)) : (C = Object.create(p), P = p);
           }
           if (g) {
-            var $ = E.indexOf(N);
-            if ($ != -1)
-              return _[$];
+            var w = E.indexOf(N);
+            if (w != -1)
+              return _[w];
             E.push(N), _.push(C);
           }
           n(N, a) && N.forEach(function(pe, je) {
@@ -123,20 +123,20 @@ function xa() {
             var je = A(pe, b - 1);
             C.add(je);
           });
-          for (var v in N) {
-            var w;
-            M && (w = Object.getOwnPropertyDescriptor(M, v)), !(w && w.set == null) && (C[v] = A(N[v], b - 1));
+          for (var D in N) {
+            var q;
+            P && (q = Object.getOwnPropertyDescriptor(P, D)), !(q && q.set == null) && (C[D] = A(N[D], b - 1));
           }
           if (Object.getOwnPropertySymbols)
-            for (var L = Object.getOwnPropertySymbols(N), v = 0; v < L.length; v++) {
-              var D = L[v], Z = Object.getOwnPropertyDescriptor(N, D);
-              Z && !Z.enumerable && !y || (C[D] = A(N[D], b - 1), Z.enumerable || Object.defineProperty(C, D, {
+            for (var B = Object.getOwnPropertySymbols(N), D = 0; D < B.length; D++) {
+              var v = B[D], Z = Object.getOwnPropertyDescriptor(N, v);
+              Z && !Z.enumerable && !y || (C[v] = A(N[v], b - 1), Z.enumerable || Object.defineProperty(C, v, {
                 enumerable: false
               }));
             }
           if (y)
-            for (var $e = Object.getOwnPropertyNames(N), v = 0; v < $e.length; v++) {
-              var Q = $e[v], Z = Object.getOwnPropertyDescriptor(N, Q);
+            for (var $e = Object.getOwnPropertyNames(N), D = 0; D < $e.length; D++) {
+              var Q = $e[D], Z = Object.getOwnPropertyDescriptor(N, Q);
               Z && Z.enumerable || (C[Q] = A(N[Q], b - 1), Object.defineProperty(C, Q, {
                 enumerable: false
               }));
@@ -173,24 +173,24 @@ function xa() {
         return l.global && (g += "g"), l.ignoreCase && (g += "i"), l.multiline && (g += "m"), g;
       }
       return c.__getRegExpFlags = u, c;
-    }();
+    })();
     e.exports && (e.exports = t);
-  }($t)), $t.exports;
+  })($t)), $t.exports;
 }
 xa();
 var jt, jn;
 function Ia() {
   return jn || (jn = 1, jt = function(e, t) {
     t || (t = {}), typeof t == "function" && (t = { cmp: t });
-    var n = typeof t.cycles == "boolean" ? t.cycles : false, a = t.cmp && /* @__PURE__ */ function(o) {
+    var n = typeof t.cycles == "boolean" ? t.cycles : false, a = t.cmp && /* @__PURE__ */ (function(o) {
       return function(c) {
         return function(f, i) {
           var s = { key: f, value: c[f] }, d = { key: i, value: c[i] };
           return o(s, d);
         };
       };
-    }(t.cmp), r = [];
-    return function o(c) {
+    })(t.cmp), r = [];
+    return (function o(c) {
       if (c && c.toJSON && typeof c.toJSON == "function" && (c = c.toJSON()), c !== void 0) {
         if (typeof c == "number") return isFinite(c) ? "" + c : "null";
         if (typeof c != "object") return JSON.stringify(c);
@@ -212,7 +212,7 @@ function Ia() {
         }
         return r.splice(s, 1), "{" + i + "}";
       }
-    }(e);
+    })(e);
   }), jt;
 }
 var wa = Ia();
@@ -316,7 +316,7 @@ Set.prototype.toJSON = function() {
   return `Set(${[...this].map((e) => gr(e)).join(",")})`;
 };
 const V = gr;
-function z(e, t) {
+function Y(e, t) {
   return e.indexOf(t) > -1;
 }
 function Ma(e, t) {
@@ -928,15 +928,15 @@ const Es = {
   temporal: 1,
   nominal: 1,
   geojson: 1
-}, P = "quantitative", se = "ordinal", Y = "temporal", ae = "nominal", Ss = "geojson";
+}, M = "quantitative", se = "ordinal", W = "temporal", ae = "nominal", Ss = "geojson";
 function Ns(e) {
   if (e)
     switch (e = e.toLowerCase(), e) {
       case "q":
-      case P:
+      case M:
         return "quantitative";
       case "t":
-      case Y:
+      case W:
         return "temporal";
       case "o":
       case se:
@@ -1020,17 +1020,17 @@ function Wt(e, t) {
       return true;
     case "scheme":
     case "interpolate":
-      return !z(["point", "band", "identity"], e);
+      return !Y(["point", "band", "identity"], e);
     case "bins":
-      return !z(["point", "band", "identity", "ordinal"], e);
+      return !Y(["point", "band", "identity", "ordinal"], e);
     case "round":
       return De(e) || e === "band" || e === "point";
     case "padding":
-      return De(e) || z(["point", "band"], e);
+      return De(e) || Y(["point", "band"], e);
     case "paddingOuter":
     case "rangeStep":
     case "align":
-      return z(["point", "band"], e);
+      return Y(["point", "band"], e);
     case "paddingInner":
       return e === "band";
     case "clamp":
@@ -1044,7 +1044,7 @@ function Wt(e, t) {
     case "constant":
       return e === "symlog";
     case "zero":
-      return vs(e) && !z([
+      return vs(e) && !Y([
         "log",
         "time",
         "utc",
@@ -1080,7 +1080,7 @@ function Fs(e, t) {
   }
 }
 function Fr(e, t) {
-  return z([se, ae], t) ? e === void 0 || be(e) : t === Y ? z([k.TIME, k.UTC, void 0], e) : t === P ? z([
+  return Y([se, ae], t) ? e === void 0 || be(e) : t === W ? Y([k.TIME, k.UTC, void 0], e) : t === M ? Y([
     k.LOG,
     k.POW,
     k.SQRT,
@@ -1096,14 +1096,14 @@ function Rr(e, t) {
   switch (e) {
     case R:
     case F:
-      return De(t) || z(["band", "point"], t);
+      return De(t) || Y(["band", "point"], t);
     case Ne:
     // TODO: size and opacity can support ordinal with more modification
     case kt:
     case Dt:
     case Ft:
     case Rt:
-      return De(t) || Ds(t) || z(["band", "point"], t);
+      return De(t) || Ds(t) || Y(["band", "point"], t);
     case le:
     case wt:
     case vt:
@@ -1129,7 +1129,7 @@ function ks(e, t) {
 }
 var Yt = { exports: {} }, Hn;
 function Qe() {
-  return Hn || (Hn = 1, function(e) {
+  return Hn || (Hn = 1, (function(e) {
     var t = e.exports, n = "__name__";
     t.namedfunc = function(i, s) {
       return s[n] = i, s;
@@ -1307,7 +1307,7 @@ function Qe() {
       }), i.length ? i.join("").trim() : l[0].slice(0, s);
     }
     var f = /([\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])/;
-  }(Yt)), Yt.exports;
+  })(Yt)), Yt.exports;
 }
 var I = Qe();
 function ee(e, t) {
@@ -1319,7 +1319,7 @@ function ue(e, t) {
       return false;
   return true;
 }
-function q(e, t, n) {
+function z(e, t, n) {
   if (e.forEach)
     e.forEach.call(n, t);
   else
@@ -1433,7 +1433,7 @@ const Te = "area", ge = "bar", Ye = "line", qe = "point", sn = "rect", cn = "rul
   square: 1
 };
 function Ys(e) {
-  return z(["line", "area", "trail"], e);
+  return Y(["line", "area", "trail"], e);
 }
 const zs = fe(Ws);
 function qs(e) {
@@ -1457,10 +1457,10 @@ const Vs = [
 Vs.map((e) => e.substr(0, 3));
 const Ks = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"];
 Ks.map((e) => e.substr(0, 3));
-var G;
+var j;
 (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";
-})(G || (G = {}));
+})(j || (j = {}));
 const wn = {
   year: 1,
   quarter: 1,
@@ -1547,9 +1547,9 @@ function ic(e, t) {
   for (const r of Gr)
     if (Wr(e, r))
       switch (r) {
-        case G.DAY:
+        case j.DAY:
           throw new Error("Cannot convert to TimeUnits containing 'day'");
-        case G.QUARTER: {
+        case j.QUARTER: {
           const { getDateMethod: o, setDateMethod: c } = Wn("month", n);
           a[c](Math.floor(t[o]() / 3) * 3);
           break;
@@ -1567,7 +1567,7 @@ function Wn(e, t) {
 }
 function Wr(e, t) {
   const n = e.indexOf(t);
-  return n > -1 && (t !== G.SECONDS || n === 0 || e.charAt(n - 1) !== "i");
+  return n > -1 && (t !== j.SECONDS || n === 0 || e.charAt(n - 1) !== "i");
 }
 const U = "?";
 function O(e) {
@@ -1825,9 +1825,9 @@ const X = [false, true], oc = {
   autoCount: X,
   bin: X,
   hasFn: X,
-  timeUnit: [void 0, G.YEAR, G.MONTH, G.MINUTES, G.SECONDS],
+  timeUnit: [void 0, j.YEAR, j.MONTH, j.MINUTES, j.SECONDS],
   field: [void 0],
-  type: [ae, se, P, Y],
+  type: [ae, se, M, W],
   sort: ["ascending", "descending"],
   stack: ["zero", "normalize", "center", null],
   value: [void 0],
@@ -2059,7 +2059,7 @@ function Ac(e, t) {
     case "longitude2":
     case "latitude":
     case "latitude2":
-      return n !== P ? {
+      return n !== M ? {
         compatible: false,
         warning: `Channel ${t} should be used with a quantitative field only, not ${e.type} field.`
       } : ve;
@@ -2075,7 +2075,7 @@ function Ac(e, t) {
         warning: `Channel ${t} should not be used with an unsorted discrete field.`
       } : ve;
     case "shape":
-      return z(["ordinal", "nominal", "geojson"], e.type) ? ve : {
+      return Y(["ordinal", "nominal", "geojson"], e.type) ? ve : {
         compatible: false,
         warning: "Shape channel should be used with only either discrete or geojson data."
       };
@@ -2095,7 +2095,7 @@ function bc(e, t, n) {
   switch (t.type) {
     case "nominal":
     case "ordinal":
-      return st(e) || Ht(e) === "discrete" ? (e === "shape" && t.type === "ordinal" && _e(ie.discreteChannelCannotEncode(e, "ordinal")), "ordinal") : z(["x", "y"], e) && z(["rect", "bar", "rule"], n) ? "band" : "point";
+      return st(e) || Ht(e) === "discrete" ? (e === "shape" && t.type === "ordinal" && _e(ie.discreteChannelCannotEncode(e, "ordinal")), "ordinal") : Y(["x", "y"], e) && Y(["rect", "bar", "rule"], n) ? "band" : "point";
     case "temporal":
       return st(e) ? "time" : Ht(e) === "discrete" ? (_e(ie.discreteChannelCannotEncode(e, "temporal")), "ordinal") : "time";
     case "quantitative":
@@ -2107,7 +2107,7 @@ function bc(e, t, n) {
 }
 var ce;
 (function(e) {
-  e.QUANTITATIVE = P, e.ORDINAL = se, e.TEMPORAL = Y, e.NOMINAL = ae, e.KEY = "key";
+  e.QUANTITATIVE = M, e.ORDINAL = se, e.TEMPORAL = W, e.NOMINAL = ae, e.KEY = "key";
 })(ce || (ce = {}));
 function Yn(e) {
   return e === se || e === ae || e === ce.KEY;
@@ -2179,7 +2179,7 @@ function Dc(e) {
 }
 function Fc(e, t, n, a = {}) {
   const r = qs(e) ? e.type : e;
-  if (!z(wc, r))
+  if (!Y(wc, r))
     return null;
   const o = Dc(t);
   if (!o)
@@ -2199,14 +2199,14 @@ function Fc(e, t, n, a = {}) {
     return g;
   }, []);
   let l;
-  if (c.stack !== void 0 ? yn(c.stack) ? l = c.stack ? "zero" : null : l = c.stack : u.length > 0 && (z(vc, r) ? l = $a(n, "zero") : l = n), !l || !Ic(l))
+  if (c.stack !== void 0 ? yn(c.stack) ? l = c.stack ? "zero" : null : l = c.stack : u.length > 0 && (Y(vc, r) ? l = $a(n, "zero") : l = n), !l || !Ic(l))
     return null;
   if (c.scale && c.scale.type && c.scale.type !== k.LINEAR) {
     if (a.disallowNonLinearStack)
       return null;
     _e(ie.cannotStackNonLinearScale(c.scale.type));
   }
-  return zn(t, o === R ? En : Sn) ? (c.stack !== void 0 && _e(ie.cannotStackRangedMark(o)), null) : (c.aggregate && !z(Yr, c.aggregate) && _e(ie.stackNonSummativeAggregate(c.aggregate)), {
+  return zn(t, o === R ? En : Sn) ? (c.stack !== void 0 && _e(ie.cannotStackRangedMark(o)), null) : (c.aggregate && !Y(Yr, c.aggregate) && _e(ie.stackNonSummativeAggregate(c.aggregate)), {
     groupbyChannel: s ? i : void 0,
     fieldChannel: o,
     impute: Ys(r),
@@ -2311,7 +2311,7 @@ function qn(e, t = Fn, n = Dn) {
   if (t.get(m.CHANNEL) && a.push(Oe(e.channel, n.get(m.CHANNEL))), x(e)) {
     const r = Jr(e, t, n);
     r && a.push(r);
-  } else ne(e) ? a.push(e.value) : H(e) && a.push("autocount()");
+  } else ne(e) ? a.push(e.value) : G(e) && a.push("autocount()");
   return a.join(":");
 }
 function Jr(e, t = Fn, n = Dn) {
@@ -2324,14 +2324,14 @@ function Jr(e, t = Fn, n = Dn) {
       if (O(e.type))
         o += "," + Oe(e.type, n.get(m.TYPE));
       else {
-        const c = ((e.type || P) + "").substr(0, 1);
+        const c = ((e.type || M) + "").substr(0, 1);
         o += "," + Oe(c, n.get(m.TYPE));
       }
     o += r.map((c) => {
       let f = c.value instanceof Array ? "[" + c.value + "]" : c.value;
       return "," + c.key + "=" + f;
     }).join("");
-  } else H(e) && (o = "*,q");
+  } else G(e) && (o = "*,q");
   return o ? a ? (I.isString(a) ? a : U + (I.keys(a).length > 0 ? JSON.stringify(a) : "")) + "(" + o + ")" : o : null;
 }
 function Bc(e, t, n) {
@@ -2479,14 +2479,14 @@ function ne(e) {
 function x(e) {
   return e != null && (e.field || e.aggregate === "count");
 }
-function H(e) {
+function G(e) {
   return e != null && "autoCount" in e;
 }
 function re(e) {
-  return H(e) && e.autoCount === false;
+  return G(e) && e.autoCount === false;
 }
 function Pt(e) {
-  return H(e) && e.autoCount === true;
+  return G(e) && e.autoCount === true;
 }
 const jc = [
   m.AGGREGATE,
@@ -2568,7 +2568,7 @@ function Rn(e, t = {}) {
   }
 }
 function We(e) {
-  return x(e) ? !Ee(e) && e.type !== "temporal" : H(e);
+  return x(e) ? !Ee(e) && e.type !== "temporal" : G(e);
 }
 function Ee(e) {
   if (x(e)) {
@@ -2592,7 +2592,7 @@ function xe(e) {
   return Oc({ type: t.type }, a, i, c);
 }
 var it = { exports: {} }, Zt = /* @__PURE__ */ new Date(), Qt = /* @__PURE__ */ new Date();
-function W(e, t, n, a) {
+function H(e, t, n, a) {
   function r(o) {
     return e(o = /* @__PURE__ */ new Date(+o)), o;
   }
@@ -2609,7 +2609,7 @@ function W(e, t, n, a) {
     for (t(o, 1), e(o), o < c && i.push(/* @__PURE__ */ new Date(+o)); t(o, f), e(o), o < c; ) i.push(/* @__PURE__ */ new Date(+o));
     return i;
   }, r.filter = function(o) {
-    return W(function(c) {
+    return H(function(c) {
       for (; e(c), !o(c); ) c.setTime(c - 1);
     }, function(c, f) {
       for (; --f >= 0; ) for (; t(c, 1), !o(c); ) ;
@@ -2624,14 +2624,14 @@ function W(e, t, n, a) {
     }) : r;
   }), r;
 }
-var Ve = W(function() {
+var Ve = H(function() {
 }, function(e, t) {
   e.setTime(+e + t);
 }, function(e, t) {
   return t - e;
 });
 Ve.every = function(e) {
-  return e = Math.floor(e), !isFinite(e) || !(e > 0) ? null : e > 1 ? W(function(t) {
+  return e = Math.floor(e), !isFinite(e) || !(e > 0) ? null : e > 1 ? H(function(t) {
     t.setTime(Math.floor(t / e) * e);
   }, function(t, n) {
     t.setTime(+t + n * e);
@@ -2639,7 +2639,7 @@ Ve.every = function(e) {
     return (n - t) / e;
   }) : Ve;
 };
-const Qr = W(function(e) {
+const Qr = H(function(e) {
   e.setMilliseconds(0);
 }, function(e, t) {
   e.setTime(+e + t * 1e3);
@@ -2647,7 +2647,7 @@ const Qr = W(function(e) {
   return (t - e) / 1e3;
 }, function(e) {
   return e.getSeconds();
-}), ei = W(function(e) {
+}), ei = H(function(e) {
   e.setSeconds(0, 0);
 }, function(e, t) {
   e.setTime(+e + t * 6e4);
@@ -2655,7 +2655,7 @@ const Qr = W(function(e) {
   return (t - e) / 6e4;
 }, function(e) {
   return e.getMinutes();
-}), ti = W(function(e) {
+}), ti = H(function(e) {
   e.setMinutes(0, 0, 0);
 }, function(e, t) {
   e.setTime(+e + t * 36e5);
@@ -2663,7 +2663,7 @@ const Qr = W(function(e) {
   return (t - e) / 36e5;
 }, function(e) {
   return e.getHours();
-}), ni = W(function(e) {
+}), ni = H(function(e) {
   e.setHours(0, 0, 0, 0);
 }, function(e, t) {
   e.setDate(e.getDate() + t);
@@ -2673,7 +2673,7 @@ const Qr = W(function(e) {
   return e.getDate() - 1;
 });
 function Ie(e) {
-  return W(function(t) {
+  return H(function(t) {
     t.setHours(0, 0, 0, 0), t.setDate(t.getDate() - (t.getDay() + 7 - e) % 7);
   }, function(t, n) {
     t.setDate(t.getDate() + n * 7);
@@ -2682,7 +2682,7 @@ function Ie(e) {
   });
 }
 var mt = Ie(0), ri = Ie(1), ii = Ie(2), ai = Ie(3), oi = Ie(4), si = Ie(5), ci = Ie(6);
-const ui = W(function(e) {
+const ui = H(function(e) {
   e.setHours(0, 0, 0, 0), e.setDate(1);
 }, function(e, t) {
   e.setMonth(e.getMonth() + t);
@@ -2690,7 +2690,7 @@ const ui = W(function(e) {
   return t.getMonth() - e.getMonth() + (t.getFullYear() - e.getFullYear()) * 12;
 }, function(e) {
   return e.getMonth();
-}), li = W(function(e) {
+}), li = H(function(e) {
   e.setHours(0, 0, 0, 0), e.setMonth(0, 1);
 }, function(e, t) {
   e.setFullYear(e.getFullYear() + t);
@@ -2698,7 +2698,7 @@ const ui = W(function(e) {
   return t.getFullYear() - e.getFullYear();
 }, function(e) {
   return e.getFullYear();
-}), di = W(function(e) {
+}), di = H(function(e) {
   e.setUTCMilliseconds(0);
 }, function(e, t) {
   e.setTime(+e + t * 1e3);
@@ -2706,7 +2706,7 @@ const ui = W(function(e) {
   return (t - e) / 1e3;
 }, function(e) {
   return e.getUTCSeconds();
-}), fi = W(function(e) {
+}), fi = H(function(e) {
   e.setUTCSeconds(0, 0);
 }, function(e, t) {
   e.setTime(+e + t * 6e4);
@@ -2714,7 +2714,7 @@ const ui = W(function(e) {
   return (t - e) / 6e4;
 }, function(e) {
   return e.getUTCMinutes();
-}), gi = W(function(e) {
+}), gi = H(function(e) {
   e.setUTCMinutes(0, 0, 0);
 }, function(e, t) {
   e.setTime(+e + t * 36e5);
@@ -2722,7 +2722,7 @@ const ui = W(function(e) {
   return (t - e) / 36e5;
 }, function(e) {
   return e.getUTCHours();
-}), hi = W(function(e) {
+}), hi = H(function(e) {
   e.setUTCHours(0, 0, 0, 0);
 }, function(e, t) {
   e.setUTCDate(e.getUTCDate() + t);
@@ -2732,7 +2732,7 @@ const ui = W(function(e) {
   return e.getUTCDate() - 1;
 });
 function we(e) {
-  return W(function(t) {
+  return H(function(t) {
     t.setUTCHours(0, 0, 0, 0), t.setUTCDate(t.getUTCDate() - (t.getUTCDay() + 7 - e) % 7);
   }, function(t, n) {
     t.setUTCDate(t.getUTCDate() + n * 7);
@@ -2741,7 +2741,7 @@ function we(e) {
   });
 }
 var pt = we(0), mi = we(1), pi = we(2), yi = we(3), Ei = we(4), Si = we(5), Ni = we(6);
-const _i = W(function(e) {
+const _i = H(function(e) {
   e.setUTCHours(0, 0, 0, 0), e.setUTCDate(1);
 }, function(e, t) {
   e.setUTCMonth(e.getUTCMonth() + t);
@@ -2749,7 +2749,7 @@ const _i = W(function(e) {
   return t.getUTCMonth() - e.getUTCMonth() + (t.getUTCFullYear() - e.getUTCFullYear()) * 12;
 }, function(e) {
   return e.getUTCMonth();
-}), Ci = W(function(e) {
+}), Ci = H(function(e) {
   e.setUTCHours(0, 0, 0, 0), e.setUTCMonth(0, 1);
 }, function(e, t) {
   e.setUTCFullYear(e.getUTCFullYear() + t);
@@ -2767,7 +2767,7 @@ const Su = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   fridays: Zc,
   hour: ti,
   hours: Yc,
-  interval: W,
+  interval: H,
   millisecond: Ve,
   milliseconds: Ti,
   minute: ei,
@@ -3215,7 +3215,7 @@ function Ai() {
 }
 var Ou = Ai(), nn = { exports: {} }, rn = { exports: {} }, Zn;
 function bu() {
-  return Zn || (Zn = 1, function(e) {
+  return Zn || (Zn = 1, (function(e) {
     var t = Qe(), n = e.exports;
     n.repeat = function(a, r) {
       var o = Array(r), c;
@@ -3296,11 +3296,11 @@ function bu() {
         return n.zeros(s).map(i);
       }, i;
     };
-  }(rn)), rn.exports;
+  })(rn)), rn.exports;
 }
 var Qn;
 function xu() {
-  return Qn || (Qn = 1, function(e) {
+  return Qn || (Qn = 1, (function(e) {
     var t = Qe(), n = Ai(), a = bu(), r = e.exports;
     r.unique = function(i, s, d) {
       s = t.$(s), d = d || [];
@@ -3577,21 +3577,21 @@ function xu() {
       });
       return d.__summary__ = true, d;
     };
-  }(nn)), nn.exports;
+  })(nn)), nn.exports;
 }
 var Iu = xu();
 const wu = Au;
 function vu(e, t = {}, n = { fields: [] }) {
   t = I.extend({}, et, t);
   let a = Iu.summary(e), r = Ou.inferAll(e), o = n.fields.reduce((i, s) => (i[s.name] = s, i), {}), c = a.map(function(i, s) {
-    const d = i.field, u = r[d] === "date" ? B.DATETIME : r[d];
+    const d = i.field, u = r[d] === "date" ? L.DATETIME : r[d];
     let l = i.distinct, g;
-    if (u === B.NUMBER)
-      g = P;
-    else if (u === B.INTEGER)
-      l < t.numberNominalLimit && l / i.count < t.numberNominalProportion ? g = ae : g = P;
-    else if (u === B.DATETIME) {
-      g = Y, i.min = new Date(e[0][d]), i.max = new Date(e[0][d]);
+    if (u === L.NUMBER)
+      g = M;
+    else if (u === L.INTEGER)
+      l < t.numberNominalLimit && l / i.count < t.numberNominalProportion ? g = ae : g = M;
+    else if (u === L.DATETIME) {
+      g = W, i.min = new Date(e[0][d]), i.max = new Date(e[0][d]);
       for (const y of e) {
         const E = new Date(y[d]).getTime();
         E < i.min.getTime() && (i.min = new Date(E)), E > i.max.getTime() && (i.max = new Date(E));
@@ -3613,10 +3613,10 @@ function vu(e, t = {}, n = { fields: [] }) {
     return h = I.extend(h, p), h;
   });
   for (let i of c)
-    if (i.vlType === P)
+    if (i.vlType === M)
       for (let s of t.enum.binProps.maxbins)
         i.binStats[s] = Oi(s, i.stats);
-    else if (i.vlType === Y)
+    else if (i.vlType === W)
       for (let s of t.enum.timeUnit)
         s !== void 0 && (i.timeStats[s] = bi(s, i.stats));
   const f = Object.assign({}, n, { fields: c });
@@ -3667,7 +3667,7 @@ class Du {
    */
   cardinality(t, n = true, a = false) {
     const r = this._fieldSchemaIndex[t.field];
-    if (t.aggregate || H(t) && t.autoCount)
+    if (t.aggregate || G(t) && t.autoCount)
       return 1;
     if (t.bin) {
       let o;
@@ -3682,21 +3682,21 @@ class Du {
       if (n)
         switch (t.timeUnit) {
           // TODO: this should not always be the case once Vega-Lite supports turning off domain augmenting (VL issue #1385)
-          case G.SECONDS:
+          case j.SECONDS:
             return 60;
-          case G.MINUTES:
+          case j.MINUTES:
             return 60;
-          case G.HOURS:
+          case j.HOURS:
             return 24;
-          case G.DAY:
+          case j.DAY:
             return 7;
-          case G.DATE:
+          case j.DATE:
             return 31;
-          case G.MONTH:
+          case j.MONTH:
             return 12;
-          case G.QUARTER:
+          case j.QUARTER:
             return 4;
-          case G.MILLISECONDS:
+          case j.MILLISECONDS:
             return 1e3;
         }
       let o = t.timeUnit, c = r.timeStats;
@@ -3715,8 +3715,8 @@ class Du {
   timeUnitHasVariation(t) {
     if (!t.timeUnit)
       return;
-    if (t.timeUnit === G.DAY) {
-      const a = I.extend({}, t, { timeUnit: G.DATE });
+    if (t.timeUnit === j.DAY) {
+      const a = I.extend({}, t, { timeUnit: j.DATE });
       if (this.cardinality(a, false, true) <= 1)
         return false;
     }
@@ -3732,7 +3732,7 @@ class Du {
   domain(t) {
     const n = this._fieldSchemaIndex[t.field];
     let a = I.keys(n.stats.unique);
-    return n.vlType === P ? [+n.stats.min, +n.stats.max] : n.type === B.DATETIME ? [n.stats.min, n.stats.max] : n.type === B.INTEGER || n.type === B.NUMBER ? (a = a.map((r) => +r), a.sort(I.cmp)) : n.vlType === se && n.ordinalDomain ? n.ordinalDomain : a.map((r) => r === "null" ? null : r).sort(I.cmp);
+    return n.vlType === M ? [+n.stats.min, +n.stats.max] : n.type === L.DATETIME ? [n.stats.min, n.stats.max] : n.type === L.INTEGER || n.type === L.NUMBER ? (a = a.map((r) => +r), a.sort(I.cmp)) : n.vlType === se && n.ordinalDomain ? n.ordinalDomain : a.map((r) => r === "null" ? null : r).sort(I.cmp);
   }
   /**
    * @return a Summary corresponding to the field of the given EncodingQuery
@@ -3755,7 +3755,7 @@ function bi(e, t) {
   let a = {};
   return I.keys(t.unique).forEach(function(r) {
     let o = r === "null" ? null : new Date(r), c;
-    o === null ? c = null : isNaN(o.getTime()) ? c = "Invalid Date" : c = (e === G.DAY ? o.getDay() : ic(e, o)).toString(), a[c] = (a[c] || 0) + t.unique[r];
+    o === null ? c = null : isNaN(o.getTime()) ? c = "Invalid Date" : c = (e === j.DAY ? o.getDay() : ic(e, o)).toString(), a[c] = (a[c] || 0) + t.unique[r];
   }), n.unique = a, n.distinct = I.keys(a).length, n;
 }
 function Fu(e, t) {
@@ -3771,10 +3771,10 @@ function er(e, t) {
     return e[a] ? n + 1 : n;
   }, 0);
 }
-var B;
+var L;
 (function(e) {
   e[e.STRING = "string"] = "STRING", e[e.NUMBER = "number"] = "NUMBER", e[e.INTEGER = "integer"] = "INTEGER", e[e.BOOLEAN = "boolean"] = "BOOLEAN", e[e.DATETIME = "datetime"] = "DATETIME";
-})(B || (B = {}));
+})(L || (L = {}));
 class xi {
   constructor(t) {
     this.constraint = t;
@@ -3833,7 +3833,7 @@ const wi = [
     allowWildcardForProperties: false,
     strict: true,
     satisfy: (e, t, n, a) => {
-      if (e.bin && e.type === P) {
+      if (e.bin && e.type === M) {
         let r = {
           channel: e.channel,
           field: e.field,
@@ -3850,7 +3850,7 @@ const wi = [
     properties: [m.TYPE, m.BIN],
     allowWildcardForProperties: false,
     strict: true,
-    satisfy: (e, t, n, a) => e.bin ? e.type === P : true
+    satisfy: (e, t, n, a) => e.bin ? e.type === M : true
   },
   {
     name: "channelFieldCompatible",
@@ -3893,7 +3893,7 @@ const wi = [
     properties: [m.TYPE, m.TIMEUNIT],
     allowWildcardForProperties: false,
     strict: true,
-    satisfy: (e, t, n, a) => !(e.timeUnit && e.type !== Y)
+    satisfy: (e, t, n, a) => !(e.timeUnit && e.type !== W)
   },
   {
     name: "timeUnitShouldHaveVariation",
@@ -3901,7 +3901,7 @@ const wi = [
     properties: [m.TIMEUNIT, m.TYPE],
     allowWildcardForProperties: false,
     strict: false,
-    satisfy: (e, t, n, a) => e.timeUnit && e.type === Y ? !n.has("timeUnit") && !a.constraintManuallySpecifiedValue ? true : t.timeUnitHasVariation(e) : true
+    satisfy: (e, t, n, a) => e.timeUnit && e.type === W ? !n.has("timeUnit") && !a.constraintManuallySpecifiedValue ? true : t.timeUnitHasVariation(e) : true
   },
   {
     name: "scalePropertiesSupportedByScaleType",
@@ -3964,14 +3964,14 @@ const wi = [
       if (!n.has("field") && !n.has("type") && !a.constraintManuallySpecifiedValue)
         return true;
       switch (r) {
-        case B.BOOLEAN:
-        case B.STRING:
-          return o !== P && o !== Y;
-        case B.NUMBER:
-        case B.INTEGER:
-          return o !== Y;
-        case B.DATETIME:
-          return o === Y;
+        case L.BOOLEAN:
+        case L.STRING:
+          return o !== M && o !== W;
+        case L.NUMBER:
+        case L.INTEGER:
+          return o !== W;
+        case L.DATETIME:
+          return o === W;
         case null:
           return false;
       }
@@ -3984,7 +3984,7 @@ const wi = [
     properties: [m.FIELD, m.TYPE],
     allowWildcardForProperties: false,
     strict: false,
-    satisfy: (e, t, n, a) => !n.has("field") && !n.has("type") && !a.constraintManuallySpecifiedValue ? true : e.field === "*" ? e.type === P : t.vlType(e.field) === e.type
+    satisfy: (e, t, n, a) => !n.has("field") && !n.has("type") && !a.constraintManuallySpecifiedValue ? true : e.field === "*" ? e.type === M : t.vlType(e.field) === e.type
   },
   {
     name: "maxCardinalityForCategoricalColor",
@@ -4027,9 +4027,9 @@ const wi = [
         const r = e.type, o = xe(e);
         if (Yn(r))
           return o === void 0 || be(o);
-        if (r === Y)
+        if (r === W)
           return e.timeUnit ? ee([k.TIME, k.UTC, void 0], o) || be(o) : ee([k.TIME, k.UTC, void 0], o);
-        if (r === P)
+        if (r === M)
           return e.bin ? ee([k.LINEAR, void 0], o) : ee([
             k.LOG,
             k.POW,
@@ -4138,7 +4138,7 @@ const Di = [
       const a = e.getMark(), r = e.getEncodings();
       if (a === ge) {
         for (let o of r)
-          if (x(o) && (o.channel === R || o.channel === F) && o.type === P && o.scale && o.scale.zero === false)
+          if (x(o) && (o.channel === R || o.channel === F) && o.type === M && o.scale && o.scale.zero === false)
             return false;
       }
       return true;
@@ -4153,12 +4153,12 @@ const Di = [
     satisfy: (e, t, n) => {
       if (he(e.getEncodings(), (r) => Pt(r)))
         return ue(e.getEncodings(), (r) => {
-          if (ne(r) || H(r))
+          if (ne(r) || G(r))
             return true;
           switch (r.type) {
-            case P:
+            case M:
               return !!r.bin;
-            case Y:
+            case W:
               return !!r.timeUnit;
             case se:
             case ce.KEY:
@@ -4171,9 +4171,9 @@ const Di = [
         const r = e.wildcardIndex.encodingIndicesByProperty.get("autoCount") || [];
         if (ue(r, (c) => {
           let f = e.getEncodingQueryByIndex(c);
-          return H(f) && !O(f.autoCount);
+          return G(f) && !O(f.autoCount);
         }))
-          return he(e.getEncodings(), (c) => (x(c) || H(c)) && c.type === P ? re(c) ? false : x(c) && (!c.bin || O(c.bin)) : x(c) && c.type === Y ? !c.timeUnit || O(c.timeUnit) : false);
+          return he(e.getEncodings(), (c) => (x(c) || G(c)) && c.type === M ? re(c) ? false : x(c) && (!c.bin || O(c.bin)) : x(c) && c.type === W ? !c.timeUnit || O(c.timeUnit) : false);
       }
       return true;
     }
@@ -4359,7 +4359,7 @@ const Di = [
         const a = e.specQuery.encodings;
         for (let r = 0; r < a.length; r++) {
           const o = a[r];
-          if (!(ne(o) || re(o)) && (x(o) && o.type === Y && !o.timeUnit && (e.wildcardIndex.hasEncodingProperty(r, m.TIMEUNIT) || n.constraintManuallySpecifiedValue) || o.type === P && x(o) && !o.bin && !o.aggregate && (e.wildcardIndex.hasEncodingProperty(r, m.BIN) || e.wildcardIndex.hasEncodingProperty(r, m.AGGREGATE) || e.wildcardIndex.hasEncodingProperty(r, m.AUTOCOUNT) || n.constraintManuallySpecifiedValue)))
+          if (!(ne(o) || re(o)) && (x(o) && o.type === W && !o.timeUnit && (e.wildcardIndex.hasEncodingProperty(r, m.TIMEUNIT) || n.constraintManuallySpecifiedValue) || o.type === M && x(o) && !o.bin && !o.aggregate && (e.wildcardIndex.hasEncodingProperty(r, m.BIN) || e.wildcardIndex.hasEncodingProperty(r, m.AGGREGATE) || e.wildcardIndex.hasEncodingProperty(r, m.AUTOCOUNT) || n.constraintManuallySpecifiedValue)))
             return false;
         }
       }
@@ -4385,10 +4385,10 @@ const Di = [
       const o = e.specQuery.encodings;
       for (let c = 0; c < o.length; c++) {
         const f = o[c];
-        if (ne(f) || H(f))
+        if (ne(f) || G(f))
           continue;
         let i;
-        if (f.field && !O(f.field) && (i = f.field), H(f) && !O(f.autoCount) && (i = "count_*"), i) {
+        if (f.field && !O(f.field) && (i = f.field), G(f) && !O(f.autoCount) && (i = "count_*"), i) {
           if (e.wildcardIndex.hasEncodingProperty(c, m.FIELD) && (r[i] = true), a[i] && (r[i] || n.constraintManuallySpecifiedValue))
             return false;
           a[i] = true;
@@ -4705,7 +4705,7 @@ class Ku {
 }
 class yt {
   constructor(t, n, a, r, o) {
-    this._rankingScore = {}, this._spec = t, this._channelFieldCount = t.encodings.reduce((c, f) => (!O(f.channel) && (!H(f) || f.autoCount !== false) && (c[f.channel + ""] = 1), c), {}), this._wildcardIndex = n, this._assignedWildcardIndex = o, this._opt = r, this._schema = a;
+    this._rankingScore = {}, this._spec = t, this._channelFieldCount = t.encodings.reduce((c, f) => (!O(f.channel) && (!G(f) || f.autoCount !== false) && (c[f.channel + ""] = 1), c), {}), this._wildcardIndex = n, this._assignedWildcardIndex = o, this._opt = r, this._schema = a;
   }
   /**
    * Build a WildcardIndex by detecting wildcards
@@ -4721,7 +4721,7 @@ class yt {
       t.mark = zt(t.mark, o, a.enum.mark), r.setMark(t.mark);
     }
     if (t.encodings.forEach((o, c) => {
-      H(o) && (console.warn("A field with autoCount should not be included as autoCount meant to be an internal object."), o.type = P), x(o) && o.type === void 0 && (o.type = U), bn.forEach((f) => {
+      G(o) && (console.warn("A field with autoCount should not be included as autoCount meant to be an internal object."), o.type = M), x(o) && o.type === void 0 && (o.type = U), bn.forEach((f) => {
         if (O(o[f])) {
           const i = He(f) + c, s = Vt(f, n, a), d = o[f] = zt(o[f], i, s);
           r.setEncodingProperty(c, f, d);
@@ -4746,7 +4746,7 @@ class yt {
       }, f = {
         channel: o,
         autoCount: c,
-        type: P
+        type: M
       };
       t.encodings.push(f);
       const i = t.encodings.length - 1;
@@ -4898,7 +4898,7 @@ class Be {
 }
 var J;
 (function(e) {
-  e[e.Q = P] = "Q", e[e.BIN_Q = "bin_" + P] = "BIN_Q", e[e.T = Y] = "T", e[e.TIMEUNIT_T = "timeUnit_time"] = "TIMEUNIT_T", e[e.TIMEUNIT_O = "timeUnit_" + se] = "TIMEUNIT_O", e[e.O = se] = "O", e[e.N = ae] = "N", e[e.K = ce.KEY] = "K", e[e.NONE = "-"] = "NONE";
+  e[e.Q = M] = "Q", e[e.BIN_Q = "bin_" + M] = "BIN_Q", e[e.T = W] = "T", e[e.TIMEUNIT_T = "timeUnit_time"] = "TIMEUNIT_T", e[e.TIMEUNIT_O = "timeUnit_" + se] = "TIMEUNIT_O", e[e.O = se] = "O", e[e.N = ae] = "N", e[e.K = ce.KEY] = "K", e[e.NONE = "-"] = "NONE";
 })(J || (J = {}));
 const Mi = J.Q, Et = J.BIN_Q, Un = J.T, Fe = J.TIMEUNIT_T, St = J.TIMEUNIT_O, Nt = J.O, _t = J.N, fn = J.K, Ct = J.NONE;
 function Tt(e) {
@@ -4951,7 +4951,7 @@ class Ju extends Be {
   }
   getScore(t, n, a) {
     return t.getEncodings().reduce((r, o) => {
-      if (x(o) || H(o)) {
+      if (x(o) || G(o)) {
         const c = Tt(o), f = this.featurize(c, o.channel), i = this.getFeatureScore(f);
         i && r.push(i);
       }
@@ -4975,7 +4975,7 @@ class Zu extends Be {
   }
   getScore(t, n, a) {
     return t.isAggregate() && t.getEncodings().reduce((r, o) => {
-      if (H(o) || x(o) && !o.aggregate) {
+      if (G(o) || x(o) && !o.aggregate) {
         const c = this.getFeatureScore(o.channel + "");
         if (c && c.score > r.score)
           return c;
@@ -4995,7 +4995,7 @@ class Qu extends Be {
   }
   getScore(t, n, a) {
     return t.getEncodings().reduce((r, o) => {
-      if (x(o) || H(o)) {
+      if (x(o) || G(o)) {
         const c = this.getFeatureScore(o.channel);
         c && r.push(c);
       }
@@ -5016,7 +5016,7 @@ class el extends Be {
   getScore(t, n, a) {
     const r = t.getMark();
     return t.getEncodings().reduce((o, c) => {
-      if (x(c) || H(c)) {
+      if (x(c) || G(c)) {
         const f = r + "_" + c.channel, i = this.getFeatureScore(f);
         i && o.push(i);
       }
@@ -5082,15 +5082,15 @@ class tl extends Be {
   }
   getScore(t, n, a) {
     const r = t.getEncodings().reduce((c, f) => {
-      if (x(f) || H(f)) {
+      if (x(f) || G(f)) {
         const i = Jr(f);
         (c[i] = c[i] || []).push(f);
       }
       return c;
     }, {}), o = [];
-    return q(r, (c) => {
+    return z(r, (c) => {
       const f = c.reduce((i, s) => {
-        if (x(s) || H(s)) {
+        if (x(s) || G(s)) {
           const d = Tt(s), u = this.featurize(d, s.channel), l = this.getFeatureScore(u);
           if (i === null || l.score > i.score)
             return l;
@@ -5115,7 +5115,7 @@ class nl extends Be {
     return u ? [u] : (console.error("feature score missing for", d), []);
   }
 }
-function j(e, t, n, a) {
+function $(e, t, n, a) {
   return e + "_" + t + "_" + n + "_" + a;
 }
 function rl() {
@@ -5123,7 +5123,7 @@ function rl() {
   let a = {};
   e.forEach((r) => {
     e.forEach((o) => {
-      q({
+      z({
         point: 0,
         text: -0.2,
         tick: -0.5,
@@ -5133,9 +5133,9 @@ function rl() {
         area: -2,
         rule: -2.5
       }, (i, s) => {
-        const d = j(r, o, true, s);
+        const d = $(r, o, true, s);
         a[d] = i;
-      }), q({
+      }), z({
         point: 0,
         text: -0.2,
         tick: -0.5,
@@ -5144,13 +5144,13 @@ function rl() {
         area: -2,
         rule: -2.5
       }, (i, s) => {
-        const d = j(r, o, false, s);
+        const d = $(r, o, false, s);
         a[d] = i;
       });
     });
   }), e.forEach((r) => {
     n.forEach((o) => {
-      q({
+      z({
         tick: 0,
         point: -0.2,
         text: -0.5,
@@ -5159,13 +5159,13 @@ function rl() {
         area: -2,
         rule: -2.5
       }, (f, i) => {
-        const s = j(r, o, true, i);
+        const s = $(r, o, true, i);
         a[s] = f;
-        const d = j(o, r, true, i);
+        const d = $(o, r, true, i);
         a[d] = f;
       });
     }), [Fe].forEach((o) => {
-      q({
+      z({
         // For Time Dimension with time scale, tick is not good
         point: 0,
         text: -0.5,
@@ -5175,13 +5175,13 @@ function rl() {
         area: -2,
         rule: -2.5
       }, (f, i) => {
-        const s = j(r, o, true, i);
+        const s = $(r, o, true, i);
         a[s] = f;
-        const d = j(o, r, true, i);
+        const d = $(o, r, true, i);
         a[d] = f;
       });
     }), [Ct, _t, Nt, fn].forEach((o) => {
-      q({
+      z({
         bar: 0,
         point: -0.2,
         tick: -0.25,
@@ -5192,13 +5192,13 @@ function rl() {
         // Non-sense to use rule here
         rule: -2.5
       }, (f, i) => {
-        const s = j(r, o, false, i);
+        const s = $(r, o, false, i);
         a[s] = f;
-        const d = j(o, r, false, i);
+        const d = $(o, r, false, i);
         a[d] = f;
       });
     }), [Et].forEach((o) => {
-      q({
+      z({
         bar: 0,
         point: -0.2,
         tick: -0.25,
@@ -5209,13 +5209,13 @@ function rl() {
         // Non-sense to use rule here
         rule: -2.5
       }, (f, i) => {
-        const s = j(r, o, false, i);
+        const s = $(r, o, false, i);
         a[s] = f;
-        const d = j(o, r, false, i);
+        const d = $(o, r, false, i);
         a[d] = f;
       });
     }), [Fe, St].forEach((o) => {
-      q({
+      z({
         line: 0,
         area: -0.1,
         bar: -0.2,
@@ -5225,9 +5225,9 @@ function rl() {
         // Non-sense to use rule here
         rule: -2.5
       }, (f, i) => {
-        const s = j(r, o, false, i);
+        const s = $(r, o, false, i);
         a[s] = f;
-        const d = j(o, r, false, i);
+        const d = $(o, r, false, i);
         a[d] = f;
       });
     });
@@ -5243,11 +5243,11 @@ function rl() {
         area: -2,
         rule: -2.5
       };
-      q(c, (f, i) => {
-        const s = j(r, o, true, i);
+      z(c, (f, i) => {
+        const s = $(r, o, true, i);
         a[s] = f;
-      }), q(c, (f, i) => {
-        const s = j(r, o, false, i);
+      }), z(c, (f, i) => {
+        const s = $(r, o, false, i);
         a[s] = f;
       });
     }), n.forEach((o) => {
@@ -5261,17 +5261,17 @@ function rl() {
         area: -2,
         rule: -2.5
       };
-      q(c, (f, i) => {
-        const s = j(r, o, true, i);
+      z(c, (f, i) => {
+        const s = $(r, o, true, i);
         a[s] = f;
-      }), q(c, (f, i) => {
-        const s = j(o, r, true, i);
+      }), z(c, (f, i) => {
+        const s = $(o, r, true, i);
         a[s] = f;
-      }), q(c, (f, i) => {
-        const s = j(r, o, false, i);
+      }), z(c, (f, i) => {
+        const s = $(r, o, false, i);
         a[s] = f;
-      }), q(c, (f, i) => {
-        const s = j(o, r, false, i);
+      }), z(c, (f, i) => {
+        const s = $(o, r, false, i);
         a[s] = f;
       });
     });
@@ -5288,11 +5288,11 @@ function rl() {
         area: -2,
         rule: -2.5
       };
-      q(c, (f, i) => {
-        const s = j(r, o, true, i);
+      z(c, (f, i) => {
+        const s = $(r, o, true, i);
         a[s] = f;
-      }), q(c, (f, i) => {
-        const s = j(r, o, false, i);
+      }), z(c, (f, i) => {
+        const s = $(r, o, false, i);
         a[s] = f;
       });
     }
@@ -5327,7 +5327,7 @@ function ol(e, t, n) {
 function sl(e, t, n) {
   const a = e.getEncodings();
   if (e.isAggregate()) {
-    if (he(a, (o) => x(o) && (o.type === P && !o.bin && !o.aggregate || o.type === Y && !o.timeUnit)))
+    if (he(a, (o) => x(o) && (o.type === M && !o.bin && !o.aggregate || o.type === W && !o.timeUnit)))
       return {
         type: ye,
         score: 0.1,
@@ -5491,13 +5491,13 @@ function Bi(e, t, n) {
   };
 }
 const Re = {
-  [B.BOOLEAN]: /* @__PURE__ */ S.jsx(Qi, { className: "h-5 w-5 inline-flex opacity-60" }),
-  [B.DATETIME]: /* @__PURE__ */ S.jsx(Zi, { className: "h-5 w-5 inline-flex opacity-60" }),
-  [B.NUMBER]: /* @__PURE__ */ S.jsx(Ji, { className: "h-5 w-5 inline-flex opacity-60" }),
-  [B.STRING]: /* @__PURE__ */ S.jsx(Xi, { className: "h-5 w-5 inline-flex opacity-60" }),
-  [B.INTEGER]: /* @__PURE__ */ S.jsx(ba, { className: "h-5 w-5 inline-flex opacity-60" })
+  [L.BOOLEAN]: /* @__PURE__ */ S.jsx(Qi, { className: "h-5 w-5 inline-flex opacity-60" }),
+  [L.DATETIME]: /* @__PURE__ */ S.jsx(Zi, { className: "h-5 w-5 inline-flex opacity-60" }),
+  [L.NUMBER]: /* @__PURE__ */ S.jsx(Ji, { className: "h-5 w-5 inline-flex opacity-60" }),
+  [L.STRING]: /* @__PURE__ */ S.jsx(Xi, { className: "h-5 w-5 inline-flex opacity-60" }),
+  [L.INTEGER]: /* @__PURE__ */ S.jsx(ba, { className: "h-5 w-5 inline-flex opacity-60" })
 }, ar = 12, Sl = (e) => {
-  const t = Ce.c(26), {
+  const t = Ce.c(24), {
     schema: n
   } = e, [a, r] = Ln.useState(), [o, c] = Ln.useState();
   let f;
@@ -5508,15 +5508,10 @@ const Re = {
     }) : void 0;
     let d;
     t[4] === Symbol.for("react.memo_cache_sentinel") ? (d = /* @__PURE__ */ S.jsx(Aa, { className: "text-muted-foreground", width: 40, height: 40, strokeWidth: 1.5 }), t[4] = d) : d = t[4];
-    const u = d, l = o ? i : i.slice(0, ar), g = i.length > ar, h = i.length > 0 ? i.length : "No";
-    let p;
-    t[5] !== h ? (p = /* @__PURE__ */ S.jsxs("span", { className: "text-muted-foreground font-semibold", children: [
-      h,
-      " fields"
-    ] }), t[5] = h, t[6] = p) : p = t[6];
-    let y;
-    t[7] !== n || t[8] !== a ? (y = (w) => {
-      const L = n.cardinality({
+    const u = d, l = o ? i : i.slice(0, ar), g = i.length > ar;
+    let h;
+    t[5] !== n || t[6] !== a ? (h = (w) => {
+      const D = n.cardinality({
         channel: "x",
         field: w
       });
@@ -5529,30 +5524,30 @@ const Re = {
       }, children: [
         Re[n.primitiveType(w)],
         w,
-        L > 1 && /* @__PURE__ */ S.jsxs("span", { className: "text-xs text-muted-foreground", children: [
+        D > 1 && /* @__PURE__ */ S.jsxs("span", { className: "text-xs text-muted-foreground", children: [
           "(",
-          L,
+          D,
           ")"
         ] })
       ] }, w);
-    }, t[7] = n, t[8] = a, t[9] = y) : y = t[9];
-    const E = l.map(y);
-    let _;
-    t[10] !== g || t[11] !== o ? (_ = g && /* @__PURE__ */ S.jsx(ur, { "data-testid": "marimo-plugin-data-explorer-show-more-columns", variant: "link", size: "sm", className: "self-center col-span-3 -mt-1", onClick: () => c(Cl), children: o ? "Show less" : "Show more" }), t[10] = g, t[11] = o, t[12] = _) : _ = t[12];
-    let T;
-    t[13] !== E || t[14] !== _ ? (T = /* @__PURE__ */ S.jsxs("div", { className: "hidden lg:grid grid-cols-2 xl:grid-cols-3 gap-2 p-2 bg-(--slate-1) border rounded lg:items-center items-start w-fit grid-flow-dense max-h-[300px] overflow-auto", children: [
-      E,
-      _
-    ] }), t[13] = E, t[14] = _, t[15] = T) : T = t[15];
-    const A = a || "", N = i.length === 0;
-    let b;
-    t[16] === Symbol.for("react.memo_cache_sentinel") ? (b = (w) => {
+    }, t[5] = n, t[6] = a, t[7] = h) : h = t[7];
+    const p = l.map(h);
+    let y;
+    t[8] !== g || t[9] !== o ? (y = g && /* @__PURE__ */ S.jsx(ur, { "data-testid": "marimo-plugin-data-explorer-show-more-columns", variant: "link", size: "sm", className: "self-center col-span-3 -mt-1", onClick: () => c(Cl), children: o ? "Show less" : "Show more" }), t[8] = g, t[9] = o, t[10] = y) : y = t[10];
+    let E;
+    t[11] !== p || t[12] !== y ? (E = /* @__PURE__ */ S.jsxs("div", { className: "hidden lg:grid grid-cols-2 xl:grid-cols-3 gap-2 p-2 bg-(--slate-1) border rounded lg:items-center items-start w-fit grid-flow-dense max-h-[300px] overflow-auto", children: [
+      p,
+      y
+    ] }), t[11] = p, t[12] = y, t[13] = E) : E = t[13];
+    const _ = a || "", T = i.length === 0;
+    let A;
+    t[14] === Symbol.for("react.memo_cache_sentinel") ? (A = (w) => {
       r(w);
-    }, t[16] = b) : b = t[16];
-    let C;
-    t[17] === Symbol.for("react.memo_cache_sentinel") ? (C = /* @__PURE__ */ S.jsx(Ot, { className: "min-w-[210px] h-full", children: /* @__PURE__ */ S.jsx(lr, { placeholder: "Select a column" }) }), t[17] = C) : C = t[17];
-    let M;
-    t[18] !== n ? (M = n.fieldNames().map((w) => /* @__PURE__ */ S.jsx(Ae, { value: w.toString(), children: /* @__PURE__ */ S.jsxs("span", { className: "flex items-center gap-2 flex-1", children: [
+    }, t[14] = A) : A = t[14];
+    let N;
+    t[15] === Symbol.for("react.memo_cache_sentinel") ? (N = /* @__PURE__ */ S.jsx(Ot, { className: "min-w-[210px] h-full", children: /* @__PURE__ */ S.jsx(lr, { placeholder: "Select a column" }) }), t[15] = N) : N = t[15];
+    let b;
+    t[16] !== n ? (b = n.fieldNames().map((w) => /* @__PURE__ */ S.jsx(Ae, { value: w.toString(), children: /* @__PURE__ */ S.jsxs("span", { className: "flex items-center gap-2 flex-1", children: [
       Re[n.primitiveType(w)],
       /* @__PURE__ */ S.jsx("span", { className: "flex-1", children: w }),
       /* @__PURE__ */ S.jsxs("span", { className: "text-muted-foreground text-xs font-semibold", children: [
@@ -5560,18 +5555,21 @@ const Re = {
         n.vlType(w),
         ")"
       ] })
-    ] }) }, w)), t[18] = n, t[19] = M) : M = t[19];
-    let $;
-    t[20] !== M ? ($ = /* @__PURE__ */ S.jsx(bt, { children: /* @__PURE__ */ S.jsx(Ke, { children: M }) }), t[20] = M, t[21] = $) : $ = t[21];
-    let v;
-    t[22] !== N || t[23] !== $ || t[24] !== A ? (v = /* @__PURE__ */ S.jsx("div", { className: "lg:hidden", children: /* @__PURE__ */ S.jsxs(xt, { "data-testid": "marimo-plugin-data-explorer-column-select", value: A, disabled: N, onValueChange: b, children: [
-      C,
-      $
-    ] }) }), t[22] = N, t[23] = $, t[24] = A, t[25] = v) : v = t[25], f = /* @__PURE__ */ S.jsxs("div", { className: "flex flex-col justify-center items-center h-full flex-1 gap-2", children: [
+    ] }) }, w)), t[16] = n, t[17] = b) : b = t[17];
+    let C;
+    t[18] !== b ? (C = /* @__PURE__ */ S.jsx(bt, { children: /* @__PURE__ */ S.jsx(Ke, { children: b }) }), t[18] = b, t[19] = C) : C = t[19];
+    let P;
+    t[20] !== C || t[21] !== _ || t[22] !== T ? (P = /* @__PURE__ */ S.jsx("div", { className: "lg:hidden", children: /* @__PURE__ */ S.jsxs(xt, { "data-testid": "marimo-plugin-data-explorer-column-select", value: _, disabled: T, onValueChange: A, children: [
+      N,
+      C
+    ] }) }), t[20] = C, t[21] = _, t[22] = T, t[23] = P) : P = t[23], f = /* @__PURE__ */ S.jsxs("div", { className: "flex flex-col justify-center items-center h-full flex-1 gap-2", children: [
       u,
-      p,
-      T,
-      v,
+      /* @__PURE__ */ S.jsxs("span", { className: "text-muted-foreground font-semibold", children: [
+        i.length > 0 ? i.length : "No",
+        " fields"
+      ] }),
+      E,
+      P,
       a && /* @__PURE__ */ S.jsx("div", { className: "grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-2 p-2 text-sm", children: Nl.map((w) => /* @__PURE__ */ S.jsxs("div", { className: "flex flex-row gap-2 min-w-[100px]", children: [
         /* @__PURE__ */ S.jsx("span", { className: "font-semibold", children: w }),
         /* @__PURE__ */ S.jsx("span", { children: _l(s == null ? void 0 : s[w]) })
@@ -5779,7 +5777,7 @@ function Hi(e) {
 function Wi(e) {
   let t = false, n = false, a = false;
   for (const r of e.encodings)
-    ne(r) || (H(r) ? O(r.autoCount) && (n = true) : (O(r.field) && (t = true), (O(r.aggregate) || O(r.bin) || O(r.timeUnit)) && (n = true), O(r.channel) && (a = true)));
+    ne(r) || (G(r) ? O(r.autoCount) && (n = true) : (O(r.field) && (t = true), (O(r.aggregate) || O(r.bin) || O(r.timeUnit)) && (n = true), O(r.channel) && (a = true)));
   return {
     hasAnyWildcard: a || t || n,
     hasWildcardField: t,
@@ -5940,8 +5938,8 @@ const Wl = ia((e) => {
   let f;
   t[0] !== o || t[1] !== c || t[2] !== n || t[3] !== r.encoding ? (f = (N) => {
     const C = (N === "row" || N === "column") && !c;
-    return /* @__PURE__ */ S.jsx(Vl, { schema: n, label: N, disabled: C, fieldDefinition: r.encoding[N], onChange: (M) => o.setEncoding({
-      [N]: M
+    return /* @__PURE__ */ S.jsx(Vl, { schema: n, label: N, disabled: C, fieldDefinition: r.encoding[N], onChange: (P) => o.setEncoding({
+      [N]: P
     }) }, N);
   }, t[0] = o, t[1] = c, t[2] = n, t[3] = r.encoding, t[4] = f) : f = t[4];
   const i = f;
@@ -5996,13 +5994,13 @@ const Wl = ia((e) => {
       return "--";
     if (r.field === "*")
       return /* @__PURE__ */ S.jsxs("span", { className: "flex gap-2 flex-1", children: [
-        Re[B.NUMBER],
+        Re[L.NUMBER],
         /* @__PURE__ */ S.jsx("span", { className: "text-left flex-1", children: "Count" })
       ] });
-    const L = r.field.toString(), D = () => r.fn ? `${r.fn}(${r.field})` : L;
+    const B = r.field.toString(), v = () => r.fn ? `${r.fn}(${r.field})` : B;
     return /* @__PURE__ */ S.jsxs("span", { className: "flex gap-2 flex-1", children: [
-      Re[a.primitiveType(L)],
-      /* @__PURE__ */ S.jsx("span", { className: "text-left flex-1", children: D() })
+      Re[a.primitiveType(B)],
+      /* @__PURE__ */ S.jsx("span", { className: "text-left flex-1", children: v() })
     ] });
   }, t[0] = r, t[1] = a, t[2] = f) : f = t[2];
   const i = f;
@@ -6017,14 +6015,14 @@ const Wl = ia((e) => {
   let g;
   t[7] !== n ? (g = /* @__PURE__ */ S.jsx(aa, { className: "text-(--slate-11) font-semibold", children: n }), t[7] = n, t[8] = g) : g = t[8];
   let h;
-  t[9] !== c || t[10] !== a ? (h = (L) => {
-    c(L === "*" ? {
+  t[9] !== c || t[10] !== a ? (h = (B) => {
+    c(B === "*" ? {
       field: "*",
       fn: "count",
       type: "quantitative"
     } : {
-      field: L,
-      type: a.vlType(L)
+      field: B,
+      type: a.vlType(B)
     });
   }, t[9] = c, t[10] = a, t[11] = h) : h = t[11];
   const p = l ? d : void 0;
@@ -6033,22 +6031,22 @@ const Wl = ia((e) => {
   let E;
   t[14] !== p || t[15] !== y ? (E = /* @__PURE__ */ S.jsx(Ot, { className: "min-w-[140px] lg:min-w-[210px] h-full", onClear: p, children: y }), t[14] = p, t[15] = y, t[16] = E) : E = t[16];
   let _;
-  t[17] !== a ? (_ = a.fieldNames().map((L) => /* @__PURE__ */ S.jsx(Ae, { value: L.toString(), children: /* @__PURE__ */ S.jsxs("span", { className: "flex items-center gap-2 flex-1", children: [
-    Re[a.primitiveType(L)],
-    /* @__PURE__ */ S.jsx("span", { className: "flex-1", children: L }),
+  t[17] !== a ? (_ = a.fieldNames().map((B) => /* @__PURE__ */ S.jsx(Ae, { value: B.toString(), children: /* @__PURE__ */ S.jsxs("span", { className: "flex items-center gap-2 flex-1", children: [
+    Re[a.primitiveType(B)],
+    /* @__PURE__ */ S.jsx("span", { className: "flex-1", children: B }),
     /* @__PURE__ */ S.jsxs("span", { className: "text-muted-foreground text-xs font-semibold", children: [
       "(",
-      a.vlType(L),
+      a.vlType(B),
       ")"
     ] })
-  ] }) }, L)), t[17] = a, t[18] = _) : _ = t[18];
+  ] }) }, B)), t[17] = a, t[18] = _) : _ = t[18];
   let T;
   t[19] !== a ? (T = a.fieldNames().length === 0 && /* @__PURE__ */ S.jsx(Ae, { disabled: true, value: "--", children: "No columns" }), t[19] = a, t[20] = T) : T = t[20];
   let A;
   t[21] === Symbol.for("react.memo_cache_sentinel") ? (A = /* @__PURE__ */ S.jsx(fr, {}), t[21] = A) : A = t[21];
   let N;
   t[22] === Symbol.for("react.memo_cache_sentinel") ? (N = /* @__PURE__ */ S.jsx(Ae, { value: "*", children: /* @__PURE__ */ S.jsxs("span", { className: "flex items-center gap-1 flex-1", children: [
-    Re[B.NUMBER],
+    Re[L.NUMBER],
     /* @__PURE__ */ S.jsx("span", { className: "flex-1", children: "Count" })
   ] }) }, "*"), t[22] = N) : N = t[22];
   let b;
@@ -6063,63 +6061,60 @@ const Wl = ia((e) => {
     E,
     b
   ] }), t[26] = o, t[27] = l, t[28] = b, t[29] = h, t[30] = E, t[31] = C) : C = t[31];
-  let M;
-  t[32] !== r || t[33] !== c ? (M = r && /* @__PURE__ */ S.jsx(Kl, { field: r, onChange: c }), t[32] = r, t[33] = c, t[34] = M) : M = t[34];
-  let $;
-  t[35] !== M ? ($ = /* @__PURE__ */ S.jsx("div", { className: "w-[26px]", children: M }), t[35] = M, t[36] = $) : $ = t[36];
-  let v;
-  t[37] !== C || t[38] !== $ ? (v = /* @__PURE__ */ S.jsxs("div", { className: "flex flex-row gap-1 h-[26px]", children: [
-    C,
-    $
-  ] }), t[37] = C, t[38] = $, t[39] = v) : v = t[39];
+  let P;
+  t[32] !== r || t[33] !== c ? (P = r && /* @__PURE__ */ S.jsx(Kl, { field: r, onChange: c }), t[32] = r, t[33] = c, t[34] = P) : P = t[34];
   let w;
-  return t[40] !== v || t[41] !== g ? (w = /* @__PURE__ */ S.jsxs(S.Fragment, { children: [
+  t[35] !== P ? (w = /* @__PURE__ */ S.jsx("div", { className: "w-[26px]", children: P }), t[35] = P, t[36] = w) : w = t[36];
+  let D;
+  t[37] !== C || t[38] !== w ? (D = /* @__PURE__ */ S.jsxs("div", { className: "flex flex-row gap-1 h-[26px]", children: [
+    C,
+    w
+  ] }), t[37] = C, t[38] = w, t[39] = D) : D = t[39];
+  let q;
+  return t[40] !== D || t[41] !== g ? (q = /* @__PURE__ */ S.jsxs(S.Fragment, { children: [
     g,
-    v
-  ] }), t[40] = v, t[41] = g, t[42] = w) : w = t[42], w;
+    D
+  ] }), t[40] = D, t[41] = g, t[42] = q) : q = t[42], q;
 }, gn = "__", Kl = (e) => {
-  const t = Ce.c(15), {
+  const t = Ce.c(10), {
     field: n,
     onChange: a
   } = e;
   if (n.field === "*")
     return null;
   let r;
-  t[0] === Symbol.for("react.memo_cache_sentinel") ? (r = [], t[0] = r) : r = t[0];
-  let o = r;
-  if (n.type === ce.QUANTITATIVE) {
-    let c;
-    t[1] === Symbol.for("react.memo_cache_sentinel") ? (c = [["", Ol]], t[1] = c) : c = t[1], o = c;
-  }
-  if (n.type === ce.TEMPORAL) {
-    let c;
-    t[2] === Symbol.for("react.memo_cache_sentinel") ? (c = [["Single", $i], ["Multi", ji]], t[2] = c) : c = t[2], o = c;
-  }
-  if (o.length > 0) {
-    let c;
-    t[3] !== n || t[4] !== a ? (c = (l) => {
-      a({
-        ...n,
-        fn: l === gn ? void 0 : l
-      });
-    }, t[3] = n, t[4] = a, t[5] = c) : c = t[5];
-    let f;
-    t[6] === Symbol.for("react.memo_cache_sentinel") ? (f = /* @__PURE__ */ S.jsx(Ot, { className: "h-full px-1", hideChevron: true, variant: "ghost", children: /* @__PURE__ */ S.jsx(sa, { size: 14, strokeWidth: 1.5 }) }), t[6] = f) : f = t[6];
-    let i, s;
-    t[7] === Symbol.for("react.memo_cache_sentinel") ? (i = /* @__PURE__ */ S.jsx(Ke, { children: /* @__PURE__ */ S.jsx(Ae, { value: gn, children: "None" }) }), s = /* @__PURE__ */ S.jsx(fr, {}), t[7] = i, t[8] = s) : (i = t[7], s = t[8]);
-    let d;
-    t[9] !== o ? (d = /* @__PURE__ */ S.jsxs(bt, { children: [
-      i,
-      s,
-      o.map(Zl)
-    ] }), t[9] = o, t[10] = d) : d = t[10];
-    let u;
-    return t[11] !== n.fn || t[12] !== c || t[13] !== d ? (u = /* @__PURE__ */ S.jsxs(xt, { "data-testid": "marimo-plugin-data-explorer-field-options", value: n.fn, onValueChange: c, children: [
-      f,
-      d
-    ] }), t[11] = n.fn, t[12] = c, t[13] = d, t[14] = u) : u = t[14], u;
-  }
-  return null;
+  if (t[0] !== n || t[1] !== a) {
+    r = Symbol.for("react.early_return_sentinel");
+    e: {
+      let o = [];
+      if (n.type === ce.QUANTITATIVE && (o = [["", Ol]]), n.type === ce.TEMPORAL && (o = [["Single", $i], ["Multi", ji]]), o.length > 0) {
+        const c = (l) => {
+          a({
+            ...n,
+            fn: l === gn ? void 0 : l
+          });
+        };
+        let f;
+        t[3] === Symbol.for("react.memo_cache_sentinel") ? (f = /* @__PURE__ */ S.jsx(Ot, { className: "h-full px-1", hideChevron: true, variant: "ghost", children: /* @__PURE__ */ S.jsx(sa, { size: 14, strokeWidth: 1.5 }) }), t[3] = f) : f = t[3];
+        let i, s;
+        t[4] === Symbol.for("react.memo_cache_sentinel") ? (i = /* @__PURE__ */ S.jsx(Ke, { children: /* @__PURE__ */ S.jsx(Ae, { value: gn, children: "None" }) }), s = /* @__PURE__ */ S.jsx(fr, {}), t[4] = i, t[5] = s) : (i = t[4], s = t[5]);
+        const d = /* @__PURE__ */ S.jsxs(bt, { children: [
+          i,
+          s,
+          o.map(Zl)
+        ] });
+        let u;
+        t[6] !== n.fn || t[7] !== c || t[8] !== d ? (u = /* @__PURE__ */ S.jsxs(xt, { "data-testid": "marimo-plugin-data-explorer-field-options", value: n.fn, onValueChange: c, children: [
+          f,
+          d
+        ] }), t[6] = n.fn, t[7] = c, t[8] = d, t[9] = u) : u = t[9], r = u;
+        break e;
+      }
+    }
+    t[0] = n, t[1] = a, t[2] = r;
+  } else
+    r = t[2];
+  return r !== Symbol.for("react.early_return_sentinel") ? r : null;
 };
 function Xl(e) {
   return /* @__PURE__ */ S.jsx(Ae, { value: e, children: e === U ? "auto" : e }, e);
@@ -6136,22 +6131,22 @@ function Zl(e) {
 }
 const Md = (e) => {
   const t = Ce.c(5);
-  let n, a;
-  t[0] === Symbol.for("react.memo_cache_sentinel") ? (a = ca(), t[0] = a) : a = t[0], n = a;
-  const r = n;
+  let n;
+  t[0] === Symbol.for("react.memo_cache_sentinel") ? (n = ca(), t[0] = n) : n = t[0];
+  const a = n;
+  let r;
+  t[1] !== e ? (r = () => {
+    const c = a.sub(ke, () => {
+      const i = a.get(ke), {
+        schema: s,
+        ...d
+      } = i;
+      e.setValue(d);
+    }), f = e.value;
+    return f && Object.keys(f).length > 0 && a.set(ke, f), c;
+  }, t[1] = e, t[2] = r) : r = t[2], ua(r);
   let o;
-  t[1] !== e ? (o = () => {
-    const f = r.sub(ke, () => {
-      const s = r.get(ke), {
-        schema: d,
-        ...u
-      } = s;
-      e.setValue(u);
-    }), i = e.value;
-    return i && Object.keys(i).length > 0 && r.set(ke, i), f;
-  }, t[1] = e, t[2] = o) : o = t[2], ua(o);
-  let c;
-  return t[3] !== e ? (c = /* @__PURE__ */ S.jsx(la, { store: r, children: /* @__PURE__ */ S.jsx(td, { ...e }) }), t[3] = e, t[4] = c) : c = t[4], c;
+  return t[3] !== e ? (o = /* @__PURE__ */ S.jsx(la, { store: a, children: /* @__PURE__ */ S.jsx(td, { ...e }) }), t[3] = e, t[4] = o) : o = t[4], o;
 }, Ql = {
   export: {
     svg: true,
@@ -6174,14 +6169,14 @@ const Md = (e) => {
   t[0] !== a || t[1] !== n ? (r = async () => {
     if (!n)
       return {};
-    const D = await ga(n, {
+    const v = await ga(n, {
       type: "csv",
       parse: "auto"
     }, {
       replacePeriod: true
-    }), Z = vu(D);
+    }), Z = vu(v);
     return a.setSchema(Z), {
-      chartData: D,
+      chartData: v,
       schema: Z
     };
   }, t[0] = a, t[1] = n, t[2] = r) : r = t[2];
@@ -6197,20 +6192,20 @@ const Md = (e) => {
     theme: u
   } = fa();
   if (i) {
-    let D;
-    return t[5] !== i ? (D = /* @__PURE__ */ S.jsx(ha, { error: i }), t[5] = i, t[6] = D) : D = t[6], D;
+    let v;
+    return t[5] !== i ? (v = /* @__PURE__ */ S.jsx(ha, { error: i }), t[5] = i, t[6] = v) : v = t[6], v;
   }
   if (!c) {
-    let D;
-    return t[7] === Symbol.for("react.memo_cache_sentinel") ? (D = /* @__PURE__ */ S.jsx("div", {}), t[7] = D) : D = t[7], D;
+    let v;
+    return t[7] === Symbol.for("react.memo_cache_sentinel") ? (v = /* @__PURE__ */ S.jsx("div", {}), t[7] = v) : v = t[7], v;
   }
   const {
     chartData: l,
     schema: g
   } = c;
   if (f || !g) {
-    let D;
-    return t[8] === Symbol.for("react.memo_cache_sentinel") ? (D = /* @__PURE__ */ S.jsx("div", {}), t[8] = D) : D = t[8], D;
+    let v;
+    return t[8] === Symbol.for("react.memo_cache_sentinel") ? (v = /* @__PURE__ */ S.jsx("div", {}), t[8] = v) : v = t[8], v;
   }
   const h = (_b = (_a2 = d.main) == null ? void 0 : _a2.plots) == null ? void 0 : _b[0];
   let p;
@@ -6230,11 +6225,11 @@ const Md = (e) => {
     T,
     A
   ] }), t[21] = T, t[22] = A, t[23] = N) : N = t[23];
-  const b = (_c2 = d.histograms) == null ? void 0 : _c2.plots, C = (_d2 = d.addCategoricalField) == null ? void 0 : _d2.plots, M = (_e2 = d.addQuantitativeField) == null ? void 0 : _e2.plots, $ = (_f = d.addTemporalField) == null ? void 0 : _f.plots;
-  let v;
-  if (t[24] !== a || t[25] !== l || t[26] !== y || t[27] !== M || t[28] !== $ || t[29] !== b || t[30] !== C || t[31] !== u) {
-    let D;
-    t[33] !== a || t[34] !== l || t[35] !== y || t[36] !== u ? (D = (Z, $e) => /* @__PURE__ */ S.jsx(rd, { title: /* @__PURE__ */ S.jsx("div", { className: "flex flex-row gap-1", children: Z.fieldInfos.map((Q) => {
+  const b = (_c2 = d.histograms) == null ? void 0 : _c2.plots, C = (_d2 = d.addCategoricalField) == null ? void 0 : _d2.plots, P = (_e2 = d.addQuantitativeField) == null ? void 0 : _e2.plots, w = (_f = d.addTemporalField) == null ? void 0 : _f.plots;
+  let D;
+  if (t[24] !== a || t[25] !== l || t[26] !== y || t[27] !== P || t[28] !== w || t[29] !== b || t[30] !== C || t[31] !== u) {
+    let v;
+    t[33] !== a || t[34] !== l || t[35] !== y || t[36] !== u ? (v = (Z, $e) => /* @__PURE__ */ S.jsx(rd, { title: /* @__PURE__ */ S.jsx("div", { className: "flex flex-row gap-1", children: Z.fieldInfos.map((Q) => {
       const pe = Q.fieldDef.field === "*" ? "Count" : Q.fieldDef.fn ? `${Q.fieldDef.fn}(${Q.fieldDef.field})` : Q.fieldDef.field.toString();
       return /* @__PURE__ */ S.jsx(Ea, { variant: y.has(Q.fieldDef.field) ? "secondary" : "defaultOutline", children: pe }, pe);
     }) }), actions: /* @__PURE__ */ S.jsx(ma, { content: "Make main plot", children: /* @__PURE__ */ S.jsx(ur, { "data-testid": "marimo-plugin-data-explorer-make-main-plot", variant: "text", size: "icon", onClick: () => {
@@ -6242,16 +6237,16 @@ const Md = (e) => {
       a.setEncoding(Q);
     }, children: /* @__PURE__ */ S.jsx(pa, { className: "w-4 h-4" }) }) }), children: /* @__PURE__ */ S.jsx(Bn, { data: {
       source: l
-    }, actions: false, spec: Z.spec, theme: u === "dark" ? "dark" : void 0 }, $e) }, $e), t[33] = a, t[34] = l, t[35] = y, t[36] = u, t[37] = D) : D = t[37], v = [b, C, M, $].filter(Boolean).flat().map(D), t[24] = a, t[25] = l, t[26] = y, t[27] = M, t[28] = $, t[29] = b, t[30] = C, t[31] = u, t[32] = v;
+    }, actions: false, spec: Z.spec, theme: u === "dark" ? "dark" : void 0 }, $e) }, $e), t[33] = a, t[34] = l, t[35] = y, t[36] = u, t[37] = v) : v = t[37], D = [b, C, P, w].filter(Boolean).flat().map(v), t[24] = a, t[25] = l, t[26] = y, t[27] = P, t[28] = w, t[29] = b, t[30] = C, t[31] = u, t[32] = D;
   } else
-    v = t[32];
-  let w;
-  t[38] !== v ? (w = /* @__PURE__ */ S.jsx(nd, { children: v }), t[38] = v, t[39] = w) : w = t[39];
-  let L;
-  return t[40] !== w || t[41] !== N ? (L = /* @__PURE__ */ S.jsxs("div", { className: "flex flex-col gap-2", children: [
+    D = t[32];
+  let q;
+  t[38] !== D ? (q = /* @__PURE__ */ S.jsx(nd, { children: D }), t[38] = D, t[39] = q) : q = t[39];
+  let B;
+  return t[40] !== q || t[41] !== N ? (B = /* @__PURE__ */ S.jsxs("div", { className: "flex flex-col gap-2", children: [
     N,
-    w
-  ] }), t[40] = w, t[41] = N, t[42] = L) : L = t[42], L;
+    q
+  ] }), t[40] = q, t[41] = N, t[42] = B) : B = t[42], B;
 }, nd = (e) => {
   const t = Ce.c(2), {
     children: n