@marimo-team/islands 0.16.5 → 0.17.1

package/dist/{esm-1_Mp6VD2.js → esm-YVnxJqkD.js}

@@ -1,26 +1,26 @@
 var _a;
 import { r as __export, s as __toESM, t as __commonJSMin } from "./chunk-DgPTj83v.js";
 import { t as require_react } from "./react-DHL_F5hS.js";
-import { n as __awaiter } from "./tslib.es6-DofFyd9S.js";
-import { t as require_prop_types } from "./prop-types-0wNc-99T.js";
-import { $ as compare, $t as zoomLog, A as timeOffset, At as one$1, B as week, Bt as splitAccessPath, C as TIME_UNITS, Ct as isString, D as dayofyear, Dt as lruCache, E as bin$2, Et as logger, F as utcInterval, Ft as panSymlog, G as None$2, Gt as toString, H as Debug, Ht as toDate, I as utcOffset, It as peek$1, J as accessorFields, Jt as utcquarter, K as Warn, Kt as truncate, L as utcSequence, Lt as quarter, M as timeUnitSpecifier, Mt as panLinear, N as timeUnits, Nt as panLog, O as timeFloor, Ot as merge$3, P as utcFloor, Pt as panPow, Q as clampRange, Qt as zoomLinear, R as utcdayofyear, Rt as repeat, S as SECONDS, St as isRegExp, T as YEAR, Tt as lerp, U as Error$1, Ut as toNumber, V as $, Vt as toBoolean, W as Info, Wt as toSet, X as array, Xt as writeConfig, Y as accessorName, Yt as visitArray, Z as ascending, Zt as zero$2, _ as HOURS, _t as isDate, a as loader, at as extentIndex, b as MONTH, bt as isNumber, c as typeParsers, ct as field$1, d as numberFormatDefaultLocale, dt as id, en as zoomPow, et as constant, f as resetDefaultLocale, ft as identity, g as DAYOFYEAR, gt as isBoolean, h as DAY, ht as isArray, i as inferTypes, it as extent, j as timeSequence, jt as pad, k as timeInterval, kt as mergeConfig, l as defaultLocale, lt as flush, m as DATE, mt as inrange, n as formats$1, nt as error$1, o as read, ot as falsy, p as timeFormatDefaultLocale, pt as inherits, q as accessor, qt as truthy, r as inferType, rt as extend, s as responseType, st as fastmap, t as format$3, tn as zoomSymlog, tt as debounce, u as locale, ut as has, v as MILLISECONDS, vt as isFunction$1, w as WEEK, wt as key, x as QUARTER, xt as isObject, y as MINUTES, yt as isIterable, z as utcweek, zt as span } from "./vega-loader.browser.module-Bi3ttvdj.js";
-import { a as tickStep, c as ascending$2, o as ticks, s as bisector } from "./precisionRound-DbP73hkf.js";
-import { a as copy$2, c as number$4, d as bisect_default, f as number$5, l as bisectLeft$1, n as linearish, o as identity$1, p as numbers$2, r as tickFormat$1, s as transformer$3, t as linear$1, u as bisectRight$1 } from "./linear-DyTdUIqX.js";
-import { n as ordinal, r as InternSet, t as implicit } from "./ordinal-BXk5xAj2.js";
-import { a as utcTicks, i as utcTickInterval, n as time$1, o as min$1, r as nice$1, s as max, t as calendar } from "./time-D3tzCqJ6.js";
-import { t as range$2 } from "./range-PcytnUSJ.js";
-import { i as formatSpecifier, t as format$2 } from "./defaultLocale-471SYAPk.js";
-import { S as utcHour, T as second, _ as utcSunday, b as utcDay, l as utcMonth, r as utcFormat$1, s as utcYear, w as utcMinute } from "./defaultLocale-BAgEOGks.js";
-import { n as path, r as constant_default$2, t as withPath } from "./path-VDkDgx1I.js";
-import { f as sqrt$3, p as tau$3, u as pi$2 } from "./math-C7wLpe9K.js";
-import { t as arc_default } from "./arc-B1iVbHTB.js";
-import { t as array_default$1 } from "./array-aAxy08hN.js";
-import { _ as basis_default, a as monotoneX, c as catmullRomOpen_default, d as cardinalOpen_default, f as cardinalClosed_default, g as basisClosed_default, h as basisOpen_default, i as natural_default, l as catmullRomClosed_default, m as bundle_default, n as stepBefore, o as monotoneY, p as cardinal_default, r as step_default, s as linearClosed_default, t as stepAfter, u as catmullRom_default, v as linear_default } from "./step-IHYrujTc.js";
-import { n as x$3, r as y$3, t as line_default$1 } from "./line-C6-zz71o.js";
-import { n as initRange, t as initInterpolator } from "./init-D6eDd7H0.js";
-import { a as src_exports$2, d as value_default, g as lab, h as hcl, i as dispatch_default, n as now, o as piecewise, r as timer$1, t as Timer$1, u as round_default$1, v as hsl, y as rgb } from "./timer-D3Zlu9ow.js";
-import { t as colors_default } from "./colors-Cr_mZ2aH.js";
-import { a as slice_default, c as constantZero, d as Node, f as computeHeight, i as squarify_default, l as constant_default, n as phi, o as dice_default, p as hierarchy, r as squarifyRatio, s as round_default, t as treemap_default, u as optional } from "./treemap-BpgMKHv-.js";
+import { n as __awaiter } from "./tslib.es6-3ZL768sZ.js";
+import { t as require_prop_types } from "./prop-types-Bd16OEUP.js";
+import { $ as compare, $t as zoomLog, A as timeOffset, At as one$1, B as week, Bt as splitAccessPath, C as TIME_UNITS, Ct as isString, D as dayofyear, Dt as lruCache, E as bin$2, Et as logger, F as utcInterval, Ft as panSymlog, G as None$2, Gt as toString, H as Debug, Ht as toDate, I as utcOffset, It as peek$1, J as accessorFields, Jt as utcquarter, K as Warn, Kt as truncate, L as utcSequence, Lt as quarter, M as timeUnitSpecifier, Mt as panLinear, N as timeUnits, Nt as panLog, O as timeFloor, Ot as merge$3, P as utcFloor, Pt as panPow, Q as clampRange, Qt as zoomLinear, R as utcdayofyear, Rt as repeat, S as SECONDS, St as isRegExp, T as YEAR, Tt as lerp, U as Error$1, Ut as toNumber, V as $, Vt as toBoolean, W as Info, Wt as toSet, X as array, Xt as writeConfig, Y as accessorName, Yt as visitArray, Z as ascending, Zt as zero$2, _ as HOURS, _t as isDate, a as loader, at as extentIndex, b as MONTH, bt as isNumber, c as typeParsers, ct as field$1, d as numberFormatDefaultLocale, dt as id, en as zoomPow, et as constant, f as resetDefaultLocale, ft as identity, g as DAYOFYEAR, gt as isBoolean, h as DAY, ht as isArray, i as inferTypes, it as extent, j as timeSequence, jt as pad, k as timeInterval, kt as mergeConfig, l as defaultLocale, lt as flush, m as DATE, mt as inrange, n as formats$1, nt as error$1, o as read, ot as falsy, p as timeFormatDefaultLocale, pt as inherits, q as accessor, qt as truthy, r as inferType, rt as extend, s as responseType, st as fastmap, t as format$3, tn as zoomSymlog, tt as debounce, u as locale, ut as has, v as MILLISECONDS, vt as isFunction$1, w as WEEK, wt as key, x as QUARTER, xt as isObject, y as MINUTES, yt as isIterable, z as utcweek, zt as span } from "./vega-loader.browser.module-CFMtdrNw.js";
+import { a as tickStep, c as ascending$2, o as ticks, s as bisector } from "./precisionRound-7YYJq2rW.js";
+import { a as copy$2, c as number$4, d as bisect_default, f as number$5, l as bisectLeft$1, n as linearish, o as identity$1, p as numbers$2, r as tickFormat$1, s as transformer$3, t as linear$1, u as bisectRight$1 } from "./linear-DeGGALuc.js";
+import { n as ordinal, r as InternSet, t as implicit } from "./ordinal-DpEbSVPc.js";
+import { a as utcTicks, i as utcTickInterval, n as time$1, o as min$1, r as nice$1, s as max, t as calendar } from "./time-BB30r1tK.js";
+import { t as range$2 } from "./range-CQvYp_qE.js";
+import { i as formatSpecifier, t as format$2 } from "./defaultLocale-Cto8YOmX.js";
+import { S as utcHour, T as second, _ as utcSunday, b as utcDay, l as utcMonth, r as utcFormat$1, s as utcYear, w as utcMinute } from "./defaultLocale-CYgZlqDF.js";
+import { n as path, r as constant_default$2, t as withPath } from "./path-Bbv2tLY1.js";
+import { f as sqrt$3, p as tau$3, u as pi$2 } from "./math-qsHyz2Eo.js";
+import { t as arc_default } from "./arc-C_O2hc-b.js";
+import { t as array_default$1 } from "./array-DYSXIreg.js";
+import { _ as basis_default, a as monotoneX, c as catmullRomOpen_default, d as cardinalOpen_default, f as cardinalClosed_default, g as basisClosed_default, h as basisOpen_default, i as natural_default, l as catmullRomClosed_default, m as bundle_default, n as stepBefore, o as monotoneY, p as cardinal_default, r as step_default, s as linearClosed_default, t as stepAfter, u as catmullRom_default, v as linear_default } from "./step-2RJrMSSG.js";
+import { n as x$3, r as y$3, t as line_default$1 } from "./line-B7-GoF1m.js";
+import { n as initRange, t as initInterpolator } from "./init-tZ42Torz.js";
+import { a as src_exports$2, d as value_default, g as lab, h as hcl, i as dispatch_default, n as now, o as piecewise, r as timer$1, t as Timer$1, u as round_default$1, v as hsl, y as rgb } from "./timer-CcUhugb0.js";
+import { t as colors_default } from "./colors-BXlG8Lmz.js";
+import { a as slice_default, c as constantZero, d as Node, f as computeHeight, i as squarify_default, l as constant_default, n as phi, o as dice_default, p as hierarchy, r as squarifyRatio, s as round_default, t as treemap_default, u as optional } from "./treemap-BYLUKIzA.js";
 var require_fast_deep_equal = /* @__PURE__ */ __commonJSMin(((e35, t) => {
   t.exports = function e36(t2, n) {
     if (t2 === n) return true;
@@ -118,16 +118,16 @@ function quantile$1(e35, t, n) {
   if (e35 = Float64Array.from(numbers$2(e35, n)), !(!(r = e35.length) || isNaN(t = +t))) {
     if (t <= 0 || r < 2) return min$1(e35);
     if (t >= 1) return max(e35);
-    var r, i = (r - 1) * t, o = Math.floor(i), s = max(quickselect(e35, o).subarray(0, o + 1)), l = min$1(e35.subarray(o + 1));
-    return s + (l - s) * (i - o);
+    var r, i = (r - 1) * t, o = Math.floor(i), s = max(quickselect(e35, o).subarray(0, o + 1));
+    return s + (min$1(e35.subarray(o + 1)) - s) * (i - o);
   }
 }
 function quantileSorted(e35, t, n = number$5) {
   if (!(!(r = e35.length) || isNaN(t = +t))) {
     if (t <= 0 || r < 2) return +n(e35[0], 0, e35);
     if (t >= 1) return +n(e35[r - 1], r - 1, e35);
-    var r, i = (r - 1) * t, o = Math.floor(i), s = +n(e35[o], o, e35), l = +n(e35[o + 1], o + 1, e35);
-    return s + (l - s) * (i - o);
+    var r, i = (r - 1) * t, o = Math.floor(i), s = +n(e35[o], o, e35);
+    return s + (+n(e35[o + 1], o + 1, e35) - s) * (i - o);
   }
 }
 function mean(e35, t) {
@@ -344,10 +344,9 @@ var PatchError = (function(e35) {
     };
   },
   remove: function(e35, t, n) {
-    var r = e35.splice(t, 1);
     return {
       newDocument: n,
-      removed: r[0]
+      removed: e35.splice(t, 1)[0]
     };
   },
   replace: function(e35, t, n) {
@@ -433,12 +432,12 @@ function validator(e35, t, n, r) {
       } else if (e35.op === "replace" || e35.op === "remove" || e35.op === "_get") {
         if (e35.path !== r) throw new JsonPatchError("Cannot perform the operation at a path that does not exist", "OPERATION_PATH_UNRESOLVABLE", t, e35, n);
       } else if (e35.op === "move" || e35.op === "copy") {
-        var s = {
+        var s = validate([{
           op: "_get",
           path: e35.from,
           value: void 0
-        }, l = validate([s], n);
-        if (l && l.name === "OPERATION_PATH_UNRESOLVABLE") throw new JsonPatchError("Cannot perform the operation from a path that does not exist", "OPERATION_FROM_UNRESOLVABLE", t, e35, n);
+        }], n);
+        if (s && s.name === "OPERATION_PATH_UNRESOLVABLE") throw new JsonPatchError("Cannot perform the operation from a path that does not exist", "OPERATION_FROM_UNRESOLVABLE", t, e35, n);
       }
     }
   } else throw new JsonPatchError("Operation `op` property is not one of operations defined in RFC-6902", "OPERATION_OP_INVALID", t, e35, n);
@@ -607,12 +606,12 @@ var require_json_stringify_pretty_compact = /* @__PURE__ */ __commonJSMin(((e35,
     })(e36, "", 0);
   };
 })), require_constants = /* @__PURE__ */ __commonJSMin(((e35, t) => {
-  var n = "2.0.0", r = 256, i = 2 ** 53 - 1 || 9007199254740991, o = 16, s = r - 6;
+  var n = "2.0.0", r = 256;
   t.exports = {
     MAX_LENGTH: r,
-    MAX_SAFE_COMPONENT_LENGTH: o,
-    MAX_SAFE_BUILD_LENGTH: s,
-    MAX_SAFE_INTEGER: i,
+    MAX_SAFE_COMPONENT_LENGTH: 16,
+    MAX_SAFE_BUILD_LENGTH: r - 6,
+    MAX_SAFE_INTEGER: 2 ** 53 - 1 || 9007199254740991,
     RELEASE_TYPES: [
       "major",
       "premajor",
@@ -918,8 +917,8 @@ var require_json_stringify_pretty_compact = /* @__PURE__ */ __commonJSMin(((e35,
       n2.lastIndex = -1;
     }
     if (s === null) return null;
-    let l = s[2], u = s[3] || "0", d = s[4] || "0", f = t2.includePrerelease && s[5] ? `-${s[5]}` : "", p = t2.includePrerelease && s[6] ? `+${s[6]}` : "";
-    return r(`${l}.${u}.${d}${f}${p}`, t2);
+    let l = s[2];
+    return r(`${l}.${s[3] || "0"}.${s[4] || "0"}${t2.includePrerelease && s[5] ? `-${s[5]}` : ""}${t2.includePrerelease && s[6] ? `+${s[6]}` : ""}`, t2);
   };
 })), require_lrucache = /* @__PURE__ */ __commonJSMin(((e35, t) => {
   t.exports = class {
@@ -1265,45 +1264,45 @@ var require_json_stringify_pretty_compact = /* @__PURE__ */ __commonJSMin(((e35,
   };
   t.exports = l;
 })), require_semver = /* @__PURE__ */ __commonJSMin(((e35, t) => {
-  var n = require_re(), r = require_constants(), i = require_semver$1(), o = require_identifiers(), s = require_parse(), l = require_valid$1(), u = require_clean(), d = require_inc(), f = require_diff(), p = require_major(), g = require_minor(), _ = require_patch(), v = require_prerelease(), S = require_compare(), T = require_rcompare(), E = require_compare_loose(), O = require_compare_build(), k = require_sort(), A = require_rsort(), j = require_gt(), N = require_lt(), P = require_eq(), F = require_neq(), I = require_gte(), L = require_lte(), R = require_cmp(), z = require_coerce(), V = require_comparator(), H = require_range(), U = require_satisfies(), W = require_to_comparators(), G = require_max_satisfying(), K = require_min_satisfying(), q = require_min_version(), J = require_valid(), Y = require_outside(), X = require_gtr(), V9 = require_ltr(), H9 = require_intersects(), U9 = require_simplify(), Z = require_subset();
+  var n = require_re(), r = require_constants(), i = require_semver$1(), o = require_identifiers();
   t.exports = {
-    parse: s,
-    valid: l,
-    clean: u,
-    inc: d,
-    diff: f,
-    major: p,
-    minor: g,
-    patch: _,
-    prerelease: v,
-    compare: S,
-    rcompare: T,
-    compareLoose: E,
-    compareBuild: O,
-    sort: k,
-    rsort: A,
-    gt: j,
-    lt: N,
-    eq: P,
-    neq: F,
-    gte: I,
-    lte: L,
-    cmp: R,
-    coerce: z,
-    Comparator: V,
-    Range: H,
-    satisfies: U,
-    toComparators: W,
-    maxSatisfying: G,
-    minSatisfying: K,
-    minVersion: q,
-    validRange: J,
-    outside: Y,
-    gtr: X,
-    ltr: V9,
-    intersects: H9,
-    simplifyRange: U9,
-    subset: Z,
+    parse: require_parse(),
+    valid: require_valid$1(),
+    clean: require_clean(),
+    inc: require_inc(),
+    diff: require_diff(),
+    major: require_major(),
+    minor: require_minor(),
+    patch: require_patch(),
+    prerelease: require_prerelease(),
+    compare: require_compare(),
+    rcompare: require_rcompare(),
+    compareLoose: require_compare_loose(),
+    compareBuild: require_compare_build(),
+    sort: require_sort(),
+    rsort: require_rsort(),
+    gt: require_gt(),
+    lt: require_lt(),
+    eq: require_eq(),
+    neq: require_neq(),
+    gte: require_gte(),
+    lte: require_lte(),
+    cmp: require_cmp(),
+    coerce: require_coerce(),
+    Comparator: require_comparator(),
+    Range: require_range(),
+    satisfies: require_satisfies(),
+    toComparators: require_to_comparators(),
+    maxSatisfying: require_max_satisfying(),
+    minSatisfying: require_min_satisfying(),
+    minVersion: require_min_version(),
+    validRange: require_valid(),
+    outside: require_outside(),
+    gtr: require_gtr(),
+    ltr: require_ltr(),
+    intersects: require_intersects(),
+    simplifyRange: require_simplify(),
+    subset: require_subset(),
     SemVer: i,
     re: n.re,
     src: n.src,
@@ -2023,8 +2022,8 @@ function bin$1(e35) {
     for (p = 0, g = i.length; p < g; ++p) f = l / i[p], f >= d && _ / f <= t && (l = f);
   }
   f = Math.log(l);
-  let v = f >= 0 ? 0 : ~~(-f / r) + 1, S = n ** (-v - 1);
-  return (e35.nice || e35.nice === void 0) && (f = Math.floor(o / l + S) * l, o = o < f ? f - l : f, s = Math.ceil(s / l) * l), {
+  let v = n ** (-(f >= 0 ? 0 : ~~(-f / r) + 1) - 1);
+  return (e35.nice || e35.nice === void 0) && (f = Math.floor(o / l + v) * l, o = o < f ? f - l : f, s = Math.ceil(s / l) * l), {
     start: o,
     stop: s === o ? o + l : s,
     step: l
@@ -3814,8 +3813,8 @@ KDE.Definition = {
   if (!this.value || t.changed() || e35.modified()) {
     let r = t.materialize(t.SOURCE).source, i = partition$1$1(r, e35.groupby, e35.field), o = (e35.groupby || []).map(accessorName), s = e35.bandwidth, l = e35.cumulative ? "cdf" : "pdf", u = e35.as || ["value", "density"], d = [], f = e35.extent, p = e35.steps || e35.minsteps || 25, g = e35.steps || e35.maxsteps || 200;
     l !== "pdf" && l !== "cdf" && error$1("Invalid density method: " + l), e35.resolve === "shared" && (f || (f = extent(r, e35.field)), p = g = e35.steps || g), i.forEach((t2) => {
-      let n2 = kde(t2, s)[l], r2 = e35.counts ? t2.length : 1, i2 = f || extent(t2);
-      sampleCurve(n2, i2, p, g).forEach((e36) => {
+      let n2 = kde(t2, s)[l], r2 = e35.counts ? t2.length : 1;
+      sampleCurve(n2, f || extent(t2), p, g).forEach((e36) => {
         let n3 = {};
         for (let e37 = 0; e37 < o.length; ++e37) n3[o[e37]] = t2.dims[e37];
         n3[u[0]] = e36[0], n3[u[1]] = e36[1] * r2, d.push(ingest$1(n3));
@@ -5428,19 +5427,16 @@ function segments(e35, t, n, r, i, o, s, l, u) {
   let L = 0.5 * (A + N) - I * (P - j), R = 0.5 * (j + P) + I * (N - A), z = Math.atan2(j - R, A - L), V = Math.atan2(P - R, N - L) - z;
   V < 0 && o === 1 ? V += Tau : V > 0 && o === 0 && (V -= Tau);
   let H = Math.ceil(Math.abs(V / (HalfPi + 1e-3))), U = [];
-  for (let e36 = 0; e36 < H; ++e36) {
-    let t2 = z + e36 * V / H, i2 = z + (e36 + 1) * V / H;
-    U[e36] = [
-      L,
-      R,
-      t2,
-      i2,
-      n,
-      r,
-      p,
-      g
-    ];
-  }
+  for (let e36 = 0; e36 < H; ++e36) U[e36] = [
+    L,
+    R,
+    z + e36 * V / H,
+    z + (e36 + 1) * V / H,
+    n,
+    r,
+    p,
+    g
+  ];
   return segmentCache[d] = U;
 }
 function bezier(e35) {
@@ -5938,8 +5934,8 @@ function intersectRect(e35, t) {
   return t.intersects(b.set(n, r, n + i, r + o));
 }
 function intersectRule(e35, t) {
-  let n = e35.x || 0, r = e35.y || 0, i = e35.x2 == null ? n : e35.x2, o = e35.y2 == null ? r : e35.y2;
-  return intersectBoxLine(t, n, r, i, o);
+  let n = e35.x || 0, r = e35.y || 0;
+  return intersectBoxLine(t, n, r, e35.x2 == null ? n : e35.x2, e35.y2 == null ? r : e35.y2);
 }
 function intersectBoxLine(e35, t, n, r, i) {
   let { x1: o, y1: s, x2: l, y2: u } = e35, d = r - t, f = i - n, p = 0, g = 1, _, v, S, T;
@@ -6160,8 +6156,7 @@ function foreground(e35, t) {
   e35("class", "foreground"), e35("aria-hidden", true), t.strokeForeground ? emitRectangle(e35, t) : e35("d", "");
 }
 function content(e35, t, n) {
-  let r = t.clip ? clip$1(n, t, t) : null;
-  e35("clip-path", r);
+  e35("clip-path", t.clip ? clip$1(n, t, t) : null);
 }
 function bound$5(e35, t) {
   if (!t.clip && t.items) {
@@ -6240,8 +6235,8 @@ function imageYOffset(e35, t) {
   return e35 === "middle" ? t / 2 : e35 === "bottom" ? t : 0;
 }
 function attr$4(e35, t, n) {
-  let r = getImage(t, n), i = imageWidth(t, r), o = imageHeight(t, r), s = (t.x || 0) - imageXOffset(t.align, i), l = (t.y || 0) - imageYOffset(t.baseline, o), u = !r.src && r.toDataURL ? r.toDataURL() : r.src || "";
-  e35("href", u, metadata["xmlns:xlink"], "xlink:href"), e35("transform", translate$2(s, l)), e35("width", i), e35("height", o), e35("preserveAspectRatio", t.aspect === false ? "none" : "xMidYMid");
+  let r = getImage(t, n), i = imageWidth(t, r), o = imageHeight(t, r), s = (t.x || 0) - imageXOffset(t.align, i), l = (t.y || 0) - imageYOffset(t.baseline, o);
+  e35("href", !r.src && r.toDataURL ? r.toDataURL() : r.src || "", metadata["xmlns:xlink"], "xlink:href"), e35("transform", translate$2(s, l)), e35("width", i), e35("height", o), e35("preserveAspectRatio", t.aspect === false ? "none" : "xMidYMid");
 }
 function bound$4(e35, t) {
   let n = t.image, r = imageWidth(t, n), i = imageHeight(t, n), o = (t.x || 0) - imageXOffset(t.align, r), s = (t.y || 0) - imageYOffset(t.baseline, i);
@@ -6458,16 +6453,7 @@ function intersectText(e35, t) {
   let n = bound(tempBounds$1, e35, 2);
   return intersectBoxLine(t, n[0], n[1], n[2], n[3]) || intersectBoxLine(t, n[0], n[1], n[4], n[5]) || intersectBoxLine(t, n[4], n[5], n[6], n[7]) || intersectBoxLine(t, n[2], n[3], n[6], n[7]);
 }
-var text$2 = {
-  type: "text",
-  tag: "text",
-  nested: false,
-  attr,
-  bound,
-  draw: draw$5,
-  pick: pick$1(hit),
-  isect: intersectText
-}, trail$2 = markMultiItemPath("trail", trail$1, pickTrail), Marks = {
+var Marks = {
   arc: arc$2,
   area: area$2,
   group,
@@ -6478,8 +6464,17 @@ var text$2 = {
   rule: rule$2,
   shape,
   symbol,
-  text: text$2,
-  trail: trail$2
+  text: {
+    type: "text",
+    tag: "text",
+    nested: false,
+    attr,
+    bound,
+    draw: draw$5,
+    pick: pick$1(hit),
+    isect: intersectText
+  },
+  trail: markMultiItemPath("trail", trail$1, pickTrail)
 };
 function boundItem$1(e35, t, n) {
   var r = Marks[e35.mark.marktype], i = t || r.bound;
@@ -6497,8 +6492,7 @@ function sceneToJSON(e35, t) {
   return JSON.stringify(e35, keys$2, t);
 }
 function sceneFromJSON(e35) {
-  let t = typeof e35 == "string" ? JSON.parse(e35) : e35;
-  return initialize$1(t);
+  return initialize$1(typeof e35 == "string" ? JSON.parse(e35) : e35);
 }
 function initialize$1(e35) {
   var t = e35.marktype, n = e35.items, r, i, o;
@@ -6941,8 +6935,8 @@ function ariaMarkAttributes(e35) {
   return e35.aria === false ? { [ARIA_HIDDEN]: true } : AriaIgnore[e35.role] ? null : AriaGuides[e35.role] ? ariaGuide(e35, AriaGuides[e35.role]) : ariaMark(e35);
 }
 function ariaMark(e35) {
-  let t = e35.marktype, n = t === "group" || t === "text" || e35.items.some((e36) => e36.description != null && e36.aria !== false);
-  return bundle(n ? GRAPHICS_OBJECT : GRAPHICS_SYMBOL, `${t} mark container`, e35.description);
+  let t = e35.marktype;
+  return bundle(t === "group" || t === "text" || e35.items.some((e36) => e36.description != null && e36.aria !== false) ? GRAPHICS_OBJECT : GRAPHICS_SYMBOL, `${t} mark container`, e35.description);
 }
 function ariaGuide(e35, t) {
   try {
@@ -8028,11 +8022,11 @@ function AxisTicks$1(e35) {
 }
 inherits(AxisTicks$1, Transform, { transform(e35, t) {
   if (this.value && !e35.modified()) return t.StopPropagation;
-  var n = t.dataflow.locale(), r = t.fork(t.NO_SOURCE | t.NO_FIELDS), i = this.value, o = e35.scale, s = e35.count == null ? e35.values ? e35.values.length : 10 : e35.count, l = tickCount(o, s, e35.minstep), u = e35.format || tickFormat(n, o, l, e35.formatSpecifier, e35.formatType, !!e35.values), d = e35.values ? validTicks(o, e35.values, l) : tickValues(o, l);
-  return i && (r.rem = i), i = d.map((e36, t2) => ingest$1({
-    index: t2 / (d.length - 1 || 1),
+  var n = t.dataflow.locale(), r = t.fork(t.NO_SOURCE | t.NO_FIELDS), i = this.value, o = e35.scale, s = tickCount(o, e35.count == null ? e35.values ? e35.values.length : 10 : e35.count, e35.minstep), l = e35.format || tickFormat(n, o, s, e35.formatSpecifier, e35.formatType, !!e35.values), u = e35.values ? validTicks(o, e35.values, s) : tickValues(o, s);
+  return i && (r.rem = i), i = u.map((e36, t2) => ingest$1({
+    index: t2 / (u.length - 1 || 1),
     value: e36,
-    label: u(e36)
+    label: l(e36)
   })), e35.extra && i.length && i.push(ingest$1({
     index: -1,
     extra: { value: i[0].value },
@@ -8578,14 +8572,14 @@ function boundsPoint$1(e35, t) {
 function linePoint(e35, t) {
   var n = cartesian([e35 * radians$1, t * radians$1]);
   if (p0) {
-    var r = cartesianCross(p0, n), i = [
+    var r = cartesianCross(p0, n), i = cartesianCross([
       r[1],
       -r[0],
       0
-    ], o = cartesianCross(i, r);
-    cartesianNormalizeInPlace(o), o = spherical(o);
-    var s = e35 - lambda2, l = s > 0 ? 1 : -1, u = o[0] * degrees$1 * l, d, f = abs$1(s) > 180;
-    f ^ (l * lambda2 < u && u < l * e35) ? (d = o[1] * degrees$1, d > phi1 && (phi1 = d)) : (u = (u + 360) % 360 - 180, f ^ (l * lambda2 < u && u < l * e35) ? (d = -o[1] * degrees$1, d < phi0 && (phi0 = d)) : (t < phi0 && (phi0 = t), t > phi1 && (phi1 = t))), f ? e35 < lambda2 ? angle(lambda0, e35) > angle(lambda0, lambda1) && (lambda1 = e35) : angle(e35, lambda1) > angle(lambda0, lambda1) && (lambda0 = e35) : lambda1 >= lambda0 ? (e35 < lambda0 && (lambda0 = e35), e35 > lambda1 && (lambda1 = e35)) : e35 > lambda2 ? angle(lambda0, e35) > angle(lambda0, lambda1) && (lambda1 = e35) : angle(e35, lambda1) > angle(lambda0, lambda1) && (lambda0 = e35);
+    ], r);
+    cartesianNormalizeInPlace(i), i = spherical(i);
+    var o = e35 - lambda2, s = o > 0 ? 1 : -1, l = i[0] * degrees$1 * s, u, d = abs$1(o) > 180;
+    d ^ (s * lambda2 < l && l < s * e35) ? (u = i[1] * degrees$1, u > phi1 && (phi1 = u)) : (l = (l + 360) % 360 - 180, d ^ (s * lambda2 < l && l < s * e35) ? (u = -i[1] * degrees$1, u < phi0 && (phi0 = u)) : (t < phi0 && (phi0 = t), t > phi1 && (phi1 = t))), d ? e35 < lambda2 ? angle(lambda0, e35) > angle(lambda0, lambda1) && (lambda1 = e35) : angle(e35, lambda1) > angle(lambda0, lambda1) && (lambda0 = e35) : lambda1 >= lambda0 ? (e35 < lambda0 && (lambda0 = e35), e35 > lambda1 && (lambda1 = e35)) : e35 > lambda2 ? angle(lambda0, e35) > angle(lambda0, lambda1) && (lambda1 = e35) : angle(e35, lambda1) > angle(lambda0, lambda1) && (lambda0 = e35);
   } else ranges.push(range$4 = [lambda0 = e35, lambda1 = e35]);
   t < phi0 && (phi0 = t), t > phi1 && (phi1 = t), p0 = n, lambda2 = e35;
 }
@@ -8966,18 +8960,18 @@ function circle_default(e35) {
       0
     ], l2 = cartesianCross(i2, o2), u2 = cartesianDot(l2, l2), d2 = l2[0], f = u2 - d2 * d2;
     if (!f) return !r2 && e36;
-    var p = t * u2 / f, g = -t * d2 / f, _ = cartesianCross(s2, l2), v = cartesianScale(s2, p), S = cartesianScale(l2, g);
-    cartesianAddInPlace(v, S);
-    var T = _, E = cartesianDot(v, T), O = cartesianDot(T, T), k = E * E - O * (cartesianDot(v, v) - 1);
-    if (!(k < 0)) {
-      var A = sqrt$1(k), j = cartesianScale(T, (-E - A) / O);
-      if (cartesianAddInPlace(j, v), j = spherical(j), !r2) return j;
-      var N = e36[0], P = n2[0], F = e36[1], I = n2[1], L;
-      P < N && (L = N, N = P, P = L);
-      var R = P - N, z = abs$1(R - pi$1) < epsilon$3, V = z || R < 1e-6;
-      if (!z && I < F && (L = F, F = I, I = L), V ? z ? F + I > 0 ^ j[1] < (abs$1(j[0] - N) < 1e-6 ? F : I) : F <= j[1] && j[1] <= I : R > pi$1 ^ (N <= j[0] && j[0] <= P)) {
-        var H = cartesianScale(T, (-E + A) / O);
-        return cartesianAddInPlace(H, v), [j, spherical(H)];
+    var p = t * u2 / f, g = -t * d2 / f, _ = cartesianCross(s2, l2), v = cartesianScale(s2, p);
+    cartesianAddInPlace(v, cartesianScale(l2, g));
+    var S = _, T = cartesianDot(v, S), E = cartesianDot(S, S), O = T * T - E * (cartesianDot(v, v) - 1);
+    if (!(O < 0)) {
+      var k = sqrt$1(O), A = cartesianScale(S, (-T - k) / E);
+      if (cartesianAddInPlace(A, v), A = spherical(A), !r2) return A;
+      var j = e36[0], N = n2[0], P = e36[1], F = n2[1], I;
+      N < j && (I = j, j = N, N = I);
+      var L = N - j, R = abs$1(L - pi$1) < epsilon$3, z = R || L < 1e-6;
+      if (!R && F < P && (I = P, P = F, F = I), z ? R ? P + F > 0 ^ A[1] < (abs$1(A[0] - j) < 1e-6 ? P : F) : P <= A[1] && A[1] <= F : L > pi$1 ^ (j <= A[0] && A[0] <= N)) {
+        var V = cartesianScale(S, (-T + k) / E);
+        return cartesianAddInPlace(V, v), [A, spherical(V)];
       }
     }
   }
@@ -12821,9 +12815,7 @@ function orient2dadapt(e35, t, n, r, i, o, s) {
   let U = sum(4, B, 4, u$2, C1);
   A = I * f, g = splitter * I, _ = g - (g - I), v = I - _, g = splitter * f, S = g - (g - f), T = f - S, j = v * T - (A - _ * S - v * S - _ * T), N = R * d, g = splitter * R, _ = g - (g - R), v = R - _, g = splitter * d, S = g - (g - d), T = d - S, P = v * T - (N - _ * S - v * S - _ * T), E = j - P, p = j - E, u$2[0] = j - (E + p) + (p - P), O = A + E, p = O - A, k = A - (O - p) + (E - p), E = k - N, p = k - E, u$2[1] = k - (E + p) + (p - N), F = O + E, p = F - O, u$2[2] = O - (F - p) + (E - p), u$2[3] = F;
   let W = sum(U, C1, 4, u$2, C2);
-  A = l * f, g = splitter * l, _ = g - (g - l), v = l - _, g = splitter * f, S = g - (g - f), T = f - S, j = v * T - (A - _ * S - v * S - _ * T), N = u * d, g = splitter * u, _ = g - (g - u), v = u - _, g = splitter * d, S = g - (g - d), T = d - S, P = v * T - (N - _ * S - v * S - _ * T), E = j - P, p = j - E, u$2[0] = j - (E + p) + (p - P), O = A + E, p = O - A, k = A - (O - p) + (E - p), E = k - N, p = k - E, u$2[1] = k - (E + p) + (p - N), F = O + E, p = F - O, u$2[2] = O - (F - p) + (E - p), u$2[3] = F;
-  let G = sum(W, C2, 4, u$2, D);
-  return D[G - 1];
+  return A = l * f, g = splitter * l, _ = g - (g - l), v = l - _, g = splitter * f, S = g - (g - f), T = f - S, j = v * T - (A - _ * S - v * S - _ * T), N = u * d, g = splitter * u, _ = g - (g - u), v = u - _, g = splitter * d, S = g - (g - d), T = d - S, P = v * T - (N - _ * S - v * S - _ * T), E = j - P, p = j - E, u$2[0] = j - (E + p) + (p - P), O = A + E, p = O - A, k = A - (O - p) + (E - p), E = k - N, p = k - E, u$2[1] = k - (E + p) + (p - N), F = O + E, p = F - O, u$2[2] = O - (F - p) + (E - p), u$2[3] = F, D[sum(W, C2, 4, u$2, D) - 1];
 }
 function orient2d(e35, t, n, r, i, o) {
   let s = (t - o) * (n - i), l = (e35 - i) * (r - o), u = s - l, d = Math.abs(s + l);
@@ -12975,10 +12967,10 @@ function circumradius(e35, t, n, r, i, o) {
   return _ * _ + v * v;
 }
 function circumcenter(e35, t, n, r, i, o) {
-  let s = n - e35, l = r - t, u = i - e35, d = o - t, f = s * s + l * l, p = u * u + d * d, g = 0.5 / (s * d - l * u), _ = e35 + (d * f - l * p) * g, v = t + (s * p - u * f) * g;
+  let s = n - e35, l = r - t, u = i - e35, d = o - t, f = s * s + l * l, p = u * u + d * d, g = 0.5 / (s * d - l * u);
   return {
-    x: _,
-    y: v
+    x: e35 + (d * f - l * p) * g,
+    y: t + (s * p - u * f) * g
   };
 }
 function quicksort(e35, t, n, r) {
@@ -13841,8 +13833,7 @@ function Bitmaps() {
       r[e36] &= ~t2;
     },
     resize(t2, n2) {
-      let o = r.length;
-      (t2 > o || n2 > e35) && (e35 = Math.max(n2, e35), r = array$2(t2, e35, r), i = array$2(t2, e35));
+      (t2 > r.length || n2 > e35) && (e35 = Math.max(n2, e35), r = array$2(t2, e35, r), i = array$2(t2, e35));
     }
   };
 }
@@ -15154,8 +15145,8 @@ function containerSize() {
 }
 function intersect$1(e35, t, n) {
   if (!e35) return [];
-  let [r, i] = e35, o = new Bounds().set(r[0], r[1], i[0], i[1]), s = n || this.context.dataflow.scenegraph().root;
-  return intersect(s, o, filter(t));
+  let [r, i] = e35, o = new Bounds().set(r[0], r[1], i[0], i[1]);
+  return intersect(n || this.context.dataflow.scenegraph().root, o, filter(t));
 }
 function filter(e35) {
   let t = null;
@@ -15387,10 +15378,7 @@ var expressionCodegen = {
   operator: (e35, t) => expression$1(e35, ["_"], t.code),
   parameter: (e35, t) => expression$1(e35, ["datum", "_"], t.code),
   event: (e35, t) => expression$1(e35, ["event"], t.code),
-  handler: (e35, t) => {
-    let n = `var datum=event.item&&event.item.datum;return ${t.code};`;
-    return expression$1(e35, ["_", "event"], n);
-  },
+  handler: (e35, t) => expression$1(e35, ["_", "event"], `var datum=event.item&&event.item.datum;return ${t.code};`),
   encode: (e35, t) => {
     let { marktype: n, channels: r } = t, i = "var o=item,datum=o.datum,m=0,$;";
     for (let e36 in r) {
@@ -16526,12 +16514,12 @@ function eventSource(e35) {
   return e35 === Scope$1 ? View$1 : e35 || View$1;
 }
 function mergeStream(e35, t) {
-  let n = e35.merge.map((e36) => parseStream(e36, t)), r = streamParameters({ merge: n }, e35, t);
-  return t.addStream(r).id;
+  let n = streamParameters({ merge: e35.merge.map((e36) => parseStream(e36, t)) }, e35, t);
+  return t.addStream(n).id;
 }
 function nestedStream(e35, t) {
-  let n = parseStream(e35.stream, t), r = streamParameters({ stream: n }, e35, t);
-  return t.addStream(r).id;
+  let n = streamParameters({ stream: parseStream(e35.stream, t) }, e35, t);
+  return t.addStream(n).id;
 }
 function eventStream(e35, t) {
   let n;
@@ -16633,19 +16621,19 @@ function fieldRef(e35, t) {
   };
 }
 function ordinalMultipleDomain(e35, t, n) {
-  let r = parseSort(e35.sort, true), i, o, s = n.map((e36) => {
-    let n2 = t.getData(e36.data);
-    return n2 || dataLookupError(e36.data), n2.countsRef(t, e36.field, r);
-  }), l = {
+  let r = parseSort(e35.sort, true), i, o, s = {
     groupby: keyFieldRef,
-    pulse: s
+    pulse: n.map((e36) => {
+      let n2 = t.getData(e36.data);
+      return n2 || dataLookupError(e36.data), n2.countsRef(t, e36.field, r);
+    })
   };
-  r && (i = r.op || "count", o = r.field ? aggrField(i, r.field) : "count", l.ops = [MULTIDOMAIN_SORT_OPS[i]], l.fields = [t.fieldRef(o)], l.as = [o]), i = t.add(Aggregate(l));
-  let u = t.add(Collect({ pulse: ref(i) }));
+  r && (i = r.op || "count", o = r.field ? aggrField(i, r.field) : "count", s.ops = [MULTIDOMAIN_SORT_OPS[i]], s.fields = [t.fieldRef(o)], s.as = [o]), i = t.add(Aggregate(s));
+  let l = t.add(Collect({ pulse: ref(i) }));
   return o = t.add(Values({
     field: keyFieldRef,
     sort: t.sortRef(r),
-    pulse: ref(u)
+    pulse: ref(l)
   })), ref(o);
 }
 function parseSort(e35, t) {
@@ -16968,7 +16956,7 @@ function legendSymbolLayout(e35, t) {
     }
   };
 }
-var isL = 'item.orient === "left"', isR = 'item.orient === "right"', isLR = `(${isL} || ${isR})`, isVG = `datum.vgrad && ${isLR}`, baseline$1 = anchorExpr('"top"', '"bottom"', '"middle"'), alignFlip = anchorExpr('"right"', '"left"', '"center"'), exprAlign = `datum.vgrad && ${isR} ? (${alignFlip}) : (${isLR} && !(datum.vgrad && ${isL})) ? "left" : ${alignExpr$1}`, exprAnchor = `item._anchor || (${isLR} ? "middle" : "start")`, exprAngle = `${isVG} ? (${isL} ? -90 : 90) : 0`, exprBaseline = `${isLR} ? (datum.vgrad ? (${isR} ? "bottom" : "top") : ${baseline$1}) : "top"`;
+var isL = 'item.orient === "left"', isR = 'item.orient === "right"', isLR = `(${isL} || ${isR})`, isVG = `datum.vgrad && ${isLR}`, baseline$1 = anchorExpr('"top"', '"bottom"', '"middle"'), exprAlign = `datum.vgrad && ${isR} ? (${anchorExpr('"right"', '"left"', '"center"')}) : (${isLR} && !(datum.vgrad && ${isL})) ? "left" : ${alignExpr$1}`, exprAnchor = `item._anchor || (${isLR} ? "middle" : "start")`, exprAngle = `${isVG} ? (${isL} ? -90 : 90) : 0`, exprBaseline = `${isLR} ? (datum.vgrad ? (${isR} ? "bottom" : "top") : ${baseline$1}) : "top"`;
 function legendTitle(e35, t, n, r) {
   let i = lookup(e35, t), o = {
     enter: { opacity: zero$1 },
@@ -17177,14 +17165,14 @@ function parseSubflow(e35, t, n) {
   i.add(Sieve()), i.addSignal("parent", null), r.params.subflow = { $subflow: i.parse(e35).toRuntime() };
 }
 function parseTrigger(e35, t, n) {
-  let r = e35.remove, i = e35.insert, o = e35.toggle, s = e35.modify, l = e35.values, u = t.add(operator()), d = "if(" + e35.trigger + ',modify("' + n + '",' + [
+  let r = e35.remove, i = e35.insert, o = e35.toggle, s = e35.modify, l = e35.values, u = t.add(operator()), d = parser$2("if(" + e35.trigger + ',modify("' + n + '",' + [
     i,
     r,
     o,
     s,
     l
-  ].map((e36) => e36 ?? "null").join(",") + "),0)", f = parser$2(d, t);
-  u.update = f.$expr, u.params = f.$params;
+  ].map((e36) => e36 ?? "null").join(",") + "),0)", t);
+  u.update = d.$expr, u.params = d.$params;
 }
 function parseMark(e35, t) {
   let n = getRole(e35), r = e35.type === GroupMark, i = e35.from && e35.from.facet, o = e35.overlap, s = e35.layout || n === "scope" || n === "frame", l, u, d, f, p, g, _, v = n === "mark" || s || i, S = parseData$1(e35.from, r, t);
@@ -17314,8 +17302,7 @@ function buildLegendEncode(e35, t, n) {
   }), r;
 }
 function sizeExpression(e35, t, n) {
-  let r = deref(getChannel("size", e35, n)), i = deref(getChannel("strokeWidth", e35, n)), o = deref(getFontSize(n[1].encode, t, GuideLabelStyle));
-  return parser$2(`max(ceil(sqrt(${r})+${i}),${o})`, t);
+  return parser$2(`max(ceil(sqrt(${deref(getChannel("size", e35, n))})+${deref(getChannel("strokeWidth", e35, n))}),${deref(getFontSize(n[1].encode, t, GuideLabelStyle))})`, t);
 }
 function getChannel(e35, t, n) {
   return t[e35] ? `scale("${t[e35]}",datum)` : getEncoding(e35, n[0].encode);
@@ -19368,16 +19355,16 @@ function extractTitleConfig(e35) {
     ...g ? { subtitleFontWeight: g } : {},
     ..._ ? { subtitleLineHeight: _ } : {},
     ...v ? { subtitlePadding: v } : {}
-  }, k = pick(e35, [
-    "align",
-    "baseline",
-    "dx",
-    "dy",
-    "limit"
-  ]);
+  };
   return {
     titleMarkConfig: T,
-    subtitleMarkConfig: k,
+    subtitleMarkConfig: pick(e35, [
+      "align",
+      "baseline",
+      "dx",
+      "dy",
+      "limit"
+    ]),
     nonMarkTitleProperties: E,
     subtitle: O
   };
@@ -19983,9 +19970,7 @@ function fieldExpr(e35, t, { end: n } = { end: false }) {
   return n && (l[s] += "+1"), dateTimeExprToExpr(l);
 }
 function timeUnitSpecifierExpression(e35) {
-  if (!e35) return;
-  let t = getTimeUnitParts(e35);
-  return `timeUnitSpecifier(${stringify$2(t)}, ${stringify$2(VEGALITE_TIMEFORMAT)})`;
+  if (e35) return `timeUnitSpecifier(${stringify$2(getTimeUnitParts(e35))}, ${stringify$2(VEGALITE_TIMEFORMAT)})`;
 }
 function formatExpression(e35, t, n) {
   if (!e35) return;
@@ -20018,11 +20003,11 @@ function durationExpr(e35, t = (e36) => e36) {
       minutes: 0,
       seconds: 0,
       milliseconds: 0
-    }, { step: i, part: o } = getDateTimePartAndStep(r, n.step), s = {
+    }, { step: i, part: o } = getDateTimePartAndStep(r, n.step);
+    return `${t(dateTimeToExpr({
       ...e36,
       [o]: +e36[o] + i
-    };
-    return `${t(dateTimeToExpr(s))} - ${t(dateTimeToExpr(e36))}`;
+    }))} - ${t(dateTimeToExpr(e36))}`;
   }
 }
 var DATE_PARTS = {
@@ -20594,14 +20579,14 @@ function scaledZeroOrMinOrMax({ scaleName: e35, scale: t, mode: n }) {
 }
 function getConditionalValueRefForIncludingInvalidValue({ scaleChannel: e35, channelDef: t, scale: n, scaleName: r, markDef: i, config: o }) {
   var _a2;
-  let s = n == null ? void 0 : n.get("type"), l = getFieldDef(t), u = isCountingAggregateOp(l == null ? void 0 : l.aggregate), d = getScaleInvalidDataMode({
+  let s = n == null ? void 0 : n.get("type"), l = getFieldDef(t), u = getScaleInvalidDataMode({
     scaleChannel: e35,
     markDef: i,
     config: o,
     scaleType: s,
-    isCountAggregate: u
+    isCountAggregate: isCountingAggregateOp(l == null ? void 0 : l.aggregate)
   });
-  if (l && d === "show") {
+  if (l && u === "show") {
     let t2 = ((_a2 = o.scale.invalid) == null ? void 0 : _a2[e35]) ?? "zero-or-min";
     return {
       test: fieldValidPredicate(vgField(l, { expr: "datum" }), false),
@@ -20655,19 +20640,14 @@ function interpolatedSignalRef({ scaleName: e35, fieldOrDatumDef: t, fieldOrDatu
     suffix: o,
     expr: l
   }) : vgField(n, { expr: l }), f = {};
-  if (s === 0 || s === 1) f.scale = e35, f.field = s === 0 ? u : d;
-  else {
-    let t2 = isSignalRef(s) ? `(1-${s.signal}) * ${u} + ${s.signal} * ${d}` : `${1 - s} * ${u} + ${s} * ${d}`;
-    f.signal = `scale("${e35}", ${t2})`;
-  }
-  return r && (f.offset = r), f;
+  return s === 0 || s === 1 ? (f.scale = e35, f.field = s === 0 ? u : d) : f.signal = `scale("${e35}", ${isSignalRef(s) ? `(1-${s.signal}) * ${u} + ${s.signal} * ${d}` : `${1 - s} * ${u} + ${s} * ${d}`})`, r && (f.offset = r), f;
 }
 function binSizeExpr({ scaleName: e35, fieldDef: t }) {
-  let n = vgField(t, { expr: "datum" }), r = vgField(t, {
+  let n = vgField(t, { expr: "datum" });
+  return `abs(scale("${e35}", ${vgField(t, {
     expr: "datum",
     suffix: "end"
-  });
-  return `abs(scale("${e35}", ${r}) - scale("${e35}", ${n}))`;
+  })}) - scale("${e35}", ${n}))`;
 }
 function midPoint({ channel: e35, channelDef: t, channel2Def: n, markDef: r, config: i, scaleName: o, scale: s, stack: l, offset: u, defaultRef: d, bandPosition: f }) {
   if (t) {
@@ -20770,19 +20750,15 @@ function formatSignalRef({ fieldOrDatumDef: e35, format: t, formatType: n, expr:
     });
     return n2 ? { signal: n2 } : void 0;
   }
-  if (t = numberFormat({
+  return t = numberFormat({
     type: l,
     specifiedFormat: t,
     config: o,
     normalizeStack: i
-  }), isFieldDef(e35) && isBinning(e35.bin)) {
-    let i2 = vgField(e35, {
-      expr: r,
-      binSuffix: "end"
-    });
-    return { signal: binFormatExpression(s, i2, t, n, o) };
-  } else if (t || channelDefType(e35) === "quantitative") return { signal: `${formatExpr(s, t)}` };
-  else return { signal: `isValid(${s}) ? ${s} : ""+${s}` };
+  }), isFieldDef(e35) && isBinning(e35.bin) ? { signal: binFormatExpression(s, vgField(e35, {
+    expr: r,
+    binSuffix: "end"
+  }), t, n, o) } : t || channelDefType(e35) === "quantitative" ? { signal: `${formatExpr(s, t)}` } : { signal: `isValid(${s}) ? ${s} : ""+${s}` };
 }
 function fieldToFormat(e35, t, n) {
   return isFieldDef(e35) ? n ? `${vgField(e35, {
@@ -21137,11 +21113,7 @@ function getFieldOrDatumDef(e35) {
   if (hasConditionalFieldOrDatumDef(e35)) return e35.condition;
 }
 function initChannelDef(e35, t, n, r = {}) {
-  if (isString(e35) || isNumber(e35) || isBoolean(e35)) {
-    let n2 = isString(e35) ? "string" : isNumber(e35) ? "number" : "boolean";
-    return warn(primitiveChannelDef(t, n2, e35)), { value: e35 };
-  }
-  return isFieldOrDatumDef(e35) ? initFieldOrDatumDef(e35, t, n, r) : hasConditionalFieldOrDatumDef(e35) ? {
+  return isString(e35) || isNumber(e35) || isBoolean(e35) ? (warn(primitiveChannelDef(t, isString(e35) ? "string" : isNumber(e35) ? "number" : "boolean", e35)), { value: e35 }) : isFieldOrDatumDef(e35) ? initFieldOrDatumDef(e35, t, n, r) : hasConditionalFieldOrDatumDef(e35) ? {
     ...e35,
     condition: initFieldOrDatumDef(e35.condition, t, n, r)
   } : e35;
@@ -21301,12 +21273,12 @@ function valueExpr(e35, { timeUnit: t, type: n, wrapTime: r, undefinedIfExprNotR
 function valueArray(e35, t) {
   let { type: n } = e35;
   return t.map((t2) => {
-    let r = isFieldDef(e35) && !isBinnedTimeUnit(e35.timeUnit) ? e35.timeUnit : void 0, i = valueExpr(t2, {
-      timeUnit: r,
+    let r = valueExpr(t2, {
+      timeUnit: isFieldDef(e35) && !isBinnedTimeUnit(e35.timeUnit) ? e35.timeUnit : void 0,
       type: n,
       undefinedIfExprNotRequired: true
     });
-    return i === void 0 ? t2 : { signal: i };
+    return r === void 0 ? t2 : { signal: r };
   });
 }
 function binRequiresRange(e35, t) {
@@ -21612,10 +21584,7 @@ function channelHasFieldOrDatum(e35, t) {
 function channelHasNestedOffsetScale(e35, t) {
   if (isXorY(t)) {
     let n = e35[t];
-    if ((isFieldDef(n) || isDatumDef(n)) && (isDiscrete(n.type) || isFieldDef(n) && n.timeUnit)) {
-      let n2 = getOffsetScaleChannel(t);
-      return channelHasFieldOrDatum(e35, n2);
-    }
+    if ((isFieldDef(n) || isDatumDef(n)) && (isDiscrete(n.type) || isFieldDef(n) && n.timeUnit)) return channelHasFieldOrDatum(e35, getOffsetScaleChannel(t));
   }
   return false;
 }
@@ -22160,19 +22129,19 @@ function boxParams(e35, t, n) {
       calculate: `max(${accessWithDatumToUnescapedPath(`lower_box_${l}`)} - ${accessWithDatumToUnescapedPath(`iqr_${l}`)} * ${t}, ${accessWithDatumToUnescapedPath(`min_${l}`)})`,
       as: `lower_whisker_${l}`
     }
-  ], { [o]: p, ...g } = e35.encoding, { customTooltipWithoutAggregatedField: _, filteredEncoding: v } = filterTooltipWithAggregatedField(g), { bins: S, timeUnits: T, aggregate: E, groupby: O, encoding: k } = extractTransformsFromEncoding(v, n), A = r === "vertical" ? "horizontal" : "vertical", j = r, N = [
-    ...S,
-    ...T,
-    {
-      aggregate: [...E, ...d],
-      groupby: O
-    },
-    ...f
-  ];
+  ], { [o]: p, ...g } = e35.encoding, { customTooltipWithoutAggregatedField: _, filteredEncoding: v } = filterTooltipWithAggregatedField(g), { bins: S, timeUnits: T, aggregate: E, groupby: O, encoding: k } = extractTransformsFromEncoding(v, n), A = r === "vertical" ? "horizontal" : "vertical", j = r;
   return {
     bins: S,
     timeUnits: T,
-    transform: N,
+    transform: [
+      ...S,
+      ...T,
+      {
+        aggregate: [...E, ...d],
+        groupby: O
+      },
+      ...f
+    ],
     groupby: O,
     aggregate: E,
     continuousAxisChannelDef: i,
@@ -22698,8 +22667,7 @@ function getViewConfigDiscreteStep(e35, t) {
   return isStep(n) ? n.step : 20;
 }
 function getViewConfigDiscreteSize(e35, t) {
-  let n = e35[t] ?? e35[t === "width" ? "discreteWidth" : "discreteHeight"];
-  return getFirstDefined(n, { step: e35.step });
+  return getFirstDefined(e35[t] ?? e35[t === "width" ? "discreteWidth" : "discreteHeight"], { step: e35.step });
 }
 const defaultConfig$1 = {
   background: "white",
@@ -23057,8 +23025,8 @@ function potentialStackedChannel(e35, t, { orient: n, type: r }) {
     if (isUnbinnedQuantitative(s) && isUnbinnedQuantitative(l)) {
       if (s.stack) return t;
       if (l.stack) return i;
-      let e36 = isFieldDef(s) && !!s.aggregate, r2 = isFieldDef(l) && !!l.aggregate;
-      if (e36 !== r2) return e36 ? t : i;
+      let e36 = isFieldDef(s) && !!s.aggregate;
+      if (e36 !== (isFieldDef(l) && !!l.aggregate)) return e36 ? t : i;
       if (o) {
         if (n === "vertical") return i;
         if (n === "horizontal") return t;
@@ -23362,8 +23330,8 @@ var RuleForRangedLineNormalizer = class {
     if (isUnitSpec(e35)) {
       let { encoding: t, mark: n } = e35;
       if (n === "line" || isMarkDef(n) && n.type === "line") for (let e36 of SECONDARY_RANGE_CHANNEL) {
-        let n2 = getMainRangeChannel(e36), r = t[n2];
-        if (t[e36] && (isFieldDef(r) && !isBinned(r.bin) || isDatumDef(r))) return true;
+        let n2 = t[getMainRangeChannel(e36)];
+        if (t[e36] && (isFieldDef(n2) && !isBinned(n2.bin) || isDatumDef(n2))) return true;
       }
     }
     return false;
@@ -23754,11 +23722,11 @@ function normalizeBinExtent(e35) {
 function normalizePredicate(e35, t) {
   let n = (e36) => normalizeLogicalComposition(e36, (e37) => {
     var n2;
-    let r = t.emptySelections[e37] ?? true, i = {
+    let r = {
       param: e37,
-      empty: r
+      empty: t.emptySelections[e37] ?? true
     };
-    return (n2 = t.selectionPredicates)[e37] ?? (n2[e37] = []), t.selectionPredicates[e37].push(i), i;
+    return (n2 = t.selectionPredicates)[e37] ?? (n2[e37] = []), t.selectionPredicates[e37].push(r), r;
   });
   return e35.selection ? n(e35.selection) : normalizeLogicalComposition(e35.test || e35.filter, (e36) => e36.selection ? n(e36.selection) : e36);
 }
@@ -24160,8 +24128,8 @@ var TimeUnitNode = class e5 extends DataFlowNode {
 };
 const OFFSETTED_RECT_START_SUFFIX = "offsetted_rect_start", OFFSETTED_RECT_END_SUFFIX = "offsetted_rect_end";
 function offsetExpr({ timeUnit: e35, field: t, reverse: n }) {
-  let { unit: r, utc: i } = e35, o = getSmallestTimeUnitPart(r), { part: s, step: l } = getDateTimePartAndStep(o, e35.step);
-  return `${i ? "utcOffset" : "timeOffset"}('${s}', ${accessWithDatumToUnescapedPath(t)}, ${n ? -l : l})`;
+  let { unit: r, utc: i } = e35, { part: o, step: s } = getDateTimePartAndStep(getSmallestTimeUnitPart(r), e35.step);
+  return `${i ? "utcOffset" : "timeOffset"}('${o}', ${accessWithDatumToUnescapedPath(t)}, ${n ? -s : s})`;
 }
 function offsetedRectFormulas([e35, t], n, r) {
   if (n !== void 0 && n !== 0.5) {
@@ -24527,19 +24495,19 @@ var INIT = "_init", CENTER = "_center", interval_default = {
         name: u,
         update: `invert(${l}, [${S("width")}/2, ${S("height")}/2])`
       })));
-      let E = `intersect(${T}, {markname: ${$(e35.getName("marks"))}}, unit.mark)`, O = `{unit: ${unitName(e35)}}`, k = `vlSelectionTuples(${E}, ${O})`, A = o.map((e36) => e36.signals.visual);
+      let E = `vlSelectionTuples(${`intersect(${T}, {markname: ${$(e35.getName("marks"))}}, unit.mark)`}, ${`{unit: ${unitName(e35)}}`})`, O = o.map((e36) => e36.signals.visual);
       return n.concat({
         name: i,
         on: [{
-          events: [...A.length ? [{ signal: A.join(" || ") }] : [], ...s ? [{ signal: GEO_INIT_TICK }] : []],
-          update: k
+          events: [...O.length ? [{ signal: O.join(" || ") }] : [], ...s ? [{ signal: GEO_INIT_TICK }] : []],
+          update: E
         }]
       });
     } else {
       if (!scales_default.defined(t)) {
         let t2 = r + SCALE_TRIGGER, i2 = o.map((t3) => {
-          let n2 = t3.channel, { data: r2, visual: i3 } = t3.signals, o2 = $(e35.scaleName(n2)), s2 = e35.getScaleComponent(n2).get("type"), l2 = hasContinuousDomain(s2) ? "+" : "";
-          return `(!isArray(${r2}) || (${l2}invert(${o2}, ${i3})[0] === ${l2}${r2}[0] && ${l2}invert(${o2}, ${i3})[1] === ${l2}${r2}[1]))`;
+          let n2 = t3.channel, { data: r2, visual: i3 } = t3.signals, o2 = $(e35.scaleName(n2)), s2 = hasContinuousDomain(e35.getScaleComponent(n2).get("type")) ? "+" : "";
+          return `(!isArray(${r2}) || (${s2}invert(${o2}, ${i3})[0] === ${s2}${r2}[0] && ${s2}invert(${o2}, ${i3})[1] === ${s2}${r2}[1]))`;
         });
         i2.length && n.push({
           name: t2,
@@ -24651,10 +24619,10 @@ function channelSignals(e35, t, n, r) {
       }]
     }];
   } else {
-    let e36 = o === "x" ? 0 : 1, n2 = t.name + INIT, i2 = r ? { init: `[${n2}[0][${e36}], ${n2}[1][${e36}]]` } : { value: [] };
+    let e36 = o === "x" ? 0 : 1, n2 = t.name + INIT;
     return [{
       name: s,
-      ...i2,
+      ...r ? { init: `[${n2}[0][${e36}], ${n2}[1][${e36}]]` } : { value: [] },
       on: p
     }];
   }
@@ -24735,17 +24703,17 @@ function tooltipData(e35, t, n, { reactiveGeom: r } = {}) {
     let u2 = getMainRangeChannel(r2), d2 = isTypedFieldDef(n2) ? n2 : {
       ...n2,
       type: e35[u2].type
-    }, f = d2.title || defaultTitle(d2, i), p = array(f).join(", ").replaceAll(/"/g, '\\"'), g;
+    }, f = array(d2.title || defaultTitle(d2, i)).join(", ").replaceAll(/"/g, '\\"'), p;
     if (isXorY(r2)) {
       let t2 = r2 === "x" ? "x2" : "y2", n3 = getFieldDef(e35[t2]);
       if (isBinned(d2.bin) && n3) {
         let e36 = vgField(d2, { expr: s }), r3 = vgField(n3, { expr: s }), { format: l2, formatType: u3 } = getFormatMixins(d2);
-        g = binFormatExpression(e36, r3, l2, u3, i), o.add(t2);
+        p = binFormatExpression(e36, r3, l2, u3, i), o.add(t2);
       }
     }
     if ((isXorY(r2) || r2 === "theta" || r2 === "radius") && t && t.fieldChannel === r2 && t.offset === "normalize") {
       let { format: e36, formatType: t2 } = getFormatMixins(d2);
-      g = formatSignalRef({
+      p = formatSignalRef({
         fieldOrDatumDef: d2,
         format: e36,
         formatType: t2,
@@ -24754,10 +24722,10 @@ function tooltipData(e35, t, n, { reactiveGeom: r } = {}) {
         normalizeStack: true
       }).signal;
     }
-    g ?? (g = textRef(d2, i, s).signal), l.push({
+    p ?? (p = textRef(d2, i, s).signal), l.push({
       channel: r2,
-      key: p,
-      value: g
+      key: f,
+      value: p
     });
   }
   forEach(e35, (e36, t2) => {
@@ -24768,8 +24736,8 @@ function tooltipData(e35, t, n, { reactiveGeom: r } = {}) {
   return d;
 }
 function tooltipRefForEncoding(e35, t, n, { reactiveGeom: r } = {}) {
-  let i = tooltipData(e35, t, n, { reactiveGeom: r }), o = entries$1(i).map(([e36, t2]) => `"${e36}": ${t2}`);
-  return o.length > 0 ? { signal: `{${o.join(", ")}}` } : void 0;
+  let i = entries$1(tooltipData(e35, t, n, { reactiveGeom: r })).map(([e36, t2]) => `"${e36}": ${t2}`);
+  return i.length > 0 ? { signal: `{${i.join(", ")}}` } : void 0;
 }
 function aria(e35) {
   let { markDef: t, config: n } = e35, r = getMarkPropOrConfig("aria", t, n);
@@ -24934,8 +24902,8 @@ function positionRef(e35) {
 function pointPositionDefaultRef({ model: e35, defaultPos: t, channel: n, scaleName: r, scale: i }) {
   let { markDef: o, config: s } = e35;
   return () => {
-    let l = getMainRangeChannel(n), u = getVgPositionChannel(n), d = getMarkPropOrConfig(n, o, s, { vgChannel: u });
-    if (d !== void 0) return widthHeightValueOrSignalRef(n, d);
+    let l = getMainRangeChannel(n), u = getMarkPropOrConfig(n, o, s, { vgChannel: getVgPositionChannel(n) });
+    if (u !== void 0) return widthHeightValueOrSignalRef(n, u);
     switch (t) {
       case "zeroOrMin":
         return zeroOrMinOrMaxPosition({
@@ -25002,11 +24970,11 @@ function pointOrRangePosition(e35, t, { defaultPos: n, defaultPos2: r, range: i
   }) : pointPosition(e35, t, { defaultPos: n });
 }
 function rangePosition(e35, t, { defaultPos: n, defaultPos2: r }) {
-  let { markDef: i, config: o } = t, s = getSecondaryRangeChannel(e35), l = getSizeChannel(e35), u = pointPosition2OrSize(t, r, s), d = u[l] ? vgAlignedPositionChannel(e35, i, o) : getVgPositionChannel(e35);
+  let { markDef: i, config: o } = t, s = getSecondaryRangeChannel(e35), l = getSizeChannel(e35), u = pointPosition2OrSize(t, r, s);
   return {
     ...pointPosition(e35, t, {
       defaultPos: n,
-      vgChannel: d
+      vgChannel: u[l] ? vgAlignedPositionChannel(e35, i, o) : getVgPositionChannel(e35)
     }),
     ...u
   };
@@ -25127,13 +25095,13 @@ function positionAndSize(e35, t, n) {
     useVlSizeChannel: S
   });
   T || (T = { [f]: defaultSizeRef(f, _ || u, v || d, o, O, !!e35, r.type) });
-  let k = ((_b = d || v) == null ? void 0 : _b.get("type")) === "band" && isRelativeBandSize(O) && !E ? "top" : "middle", A = vgAlignedPositionChannel(t, r, o, k), j = A === "xc" || A === "yc", { offset: N, offsetType: P } = positionOffset({
+  let k = vgAlignedPositionChannel(t, r, o, ((_b = d || v) == null ? void 0 : _b.get("type")) === "band" && isRelativeBandSize(O) && !E ? "top" : "middle"), A = k === "xc" || k === "yc", { offset: j, offsetType: N } = positionOffset({
     channel: t,
     markDef: r,
     encoding: i,
     model: n,
-    bandPosition: j ? 0.5 : 0
-  }), F = midPointRefWithPositionInvalidTest({
+    bandPosition: A ? 0.5 : 0
+  }), P = midPointRefWithPositionInvalidTest({
     channel: t,
     channelDef: e35,
     markDef: r,
@@ -25141,7 +25109,7 @@ function positionAndSize(e35, t, n) {
     scaleName: u,
     scale: d,
     stack: s,
-    offset: N,
+    offset: j,
     defaultRef: pointPositionDefaultRef({
       model: n,
       defaultPos: "mid",
@@ -25149,24 +25117,24 @@ function positionAndSize(e35, t, n) {
       scaleName: u,
       scale: d
     }),
-    bandPosition: j ? P === "encoding" ? 0 : 0.5 : isSignalRef(O) ? { signal: `(1-${O})/2` } : isRelativeBandSize(O) ? (1 - O.band) / 2 : 0
+    bandPosition: A ? N === "encoding" ? 0 : 0.5 : isSignalRef(O) ? { signal: `(1-${O})/2` } : isRelativeBandSize(O) ? (1 - O.band) / 2 : 0
   });
   if (f) return {
-    [A]: F,
+    [k]: P,
     ...T
   };
   {
-    let e36 = getVgPositionChannel(p), t2 = T[f], n2 = N ? {
+    let e36 = getVgPositionChannel(p), t2 = T[f], n2 = j ? {
       ...t2,
-      offset: N
+      offset: j
     } : t2;
     return {
-      [A]: F,
-      [e36]: isArray(F) ? [F[0], {
-        ...F[1],
+      [k]: P,
+      [e36]: isArray(P) ? [P[0], {
+        ...P[1],
         offset: n2
       }] : {
-        ...F,
+        ...P,
         offset: n2
       }
     };
@@ -25289,14 +25257,14 @@ function defined(e35) {
     var _a2;
     let s;
     if (!isScaleChannel(o) || !(s = e35.getScaleType(o))) return;
-    let l = isCountingAggregateOp(i.aggregate), u = getScaleInvalidDataMode({
+    let l = isCountingAggregateOp(i.aggregate);
+    if (shouldBreakPath(getScaleInvalidDataMode({
       scaleChannel: o,
       markDef: n,
       config: t,
       scaleType: s,
       isCountAggregate: l
-    });
-    if (shouldBreakPath(u)) {
+    }))) {
       let t2 = e35.vgField(o, {
         expr: "datum",
         binSuffix: ((_a2 = e35.stack) == null ? void 0 : _a2.impute) ? "mid" : void 0
@@ -25402,10 +25370,7 @@ var toggle_default = {
     }
     if (t.type === "interval") for (let e36 of t.project.items) {
       let t2 = n.findIndex((t3) => t3.name === e36.signals.visual);
-      if (r(t2, "[0, 0]"), t2 === -1) {
-        let t3 = n.findIndex((t4) => t4.name === e36.signals.data);
-        r(t3, "null");
-      }
+      r(t2, "[0, 0]"), t2 === -1 && r(n.findIndex((t3) => t3.name === e36.signals.data), "null");
     }
     else {
       let e36 = n.findIndex((e37) => e37.name === t.name + TUPLE);
@@ -25506,10 +25471,10 @@ var ANCHOR$1 = "_translate_anchor", DELTA$1 = "_translate_delta", translate_defa
   }
 };
 function onDelta$1(e35, t, n, r, i) {
-  let o = t.name, s = o + ANCHOR$1, l = o + DELTA$1, u = n.channel, d = scales_default.defined(t), f = i.find((e36) => e36.name === n.signals[d ? "data" : "visual"]), p = e35.getSizeSignalRef(r).signal, g = e35.getScaleComponent(u), _ = g && g.get("type"), v = g && g.get("reverse"), S = d ? u === "x" ? v ? "" : "-" : v ? "-" : "" : "", T = `${s}.extent_${u}`, E = `${S}${l}.${u} / ${d ? `${p}` : `span(${T})`}`, O = !d || !g ? "panLinear" : _ === "log" ? "panLog" : _ === "symlog" ? "panSymlog" : _ === "pow" ? "panPow" : "panLinear", k = d ? _ === "pow" ? `, ${g.get("exponent") ?? 1}` : _ === "symlog" ? `, ${g.get("constant") ?? 1}` : "" : "", A = `${O}(${T}, ${E}${k})`;
+  let o = t.name, s = o + ANCHOR$1, l = o + DELTA$1, u = n.channel, d = scales_default.defined(t), f = i.find((e36) => e36.name === n.signals[d ? "data" : "visual"]), p = e35.getSizeSignalRef(r).signal, g = e35.getScaleComponent(u), _ = g && g.get("type"), v = g && g.get("reverse"), S = d ? u === "x" ? v ? "" : "-" : v ? "-" : "" : "", T = `${s}.extent_${u}`, E = `${S}${l}.${u} / ${d ? `${p}` : `span(${T})`}`, O = `${!d || !g ? "panLinear" : _ === "log" ? "panLog" : _ === "symlog" ? "panSymlog" : _ === "pow" ? "panPow" : "panLinear"}(${T}, ${E}${d ? _ === "pow" ? `, ${g.get("exponent") ?? 1}` : _ === "symlog" ? `, ${g.get("constant") ?? 1}` : "" : ""})`;
   f.on.push({
     events: { signal: l },
-    update: d ? A : `clampRange(${A}, 0, ${p})`
+    update: d ? O : `clampRange(${O}, 0, ${p})`
   });
 }
 var ANCHOR = "_zoom_anchor", DELTA = "_zoom_delta", zoom_default = {
@@ -25533,10 +25498,10 @@ var ANCHOR = "_zoom_anchor", DELTA = "_zoom_delta", zoom_default = {
   }
 };
 function onDelta(e35, t, n, r, i) {
-  let o = t.name, s = n.channel, l = scales_default.defined(t), u = i.find((e36) => e36.name === n.signals[l ? "data" : "visual"]), d = e35.getSizeSignalRef(r).signal, f = e35.getScaleComponent(s), p = f && f.get("type"), g = l ? domain(e35, s) : u.name, _ = o + DELTA, v = `${o}${ANCHOR}.${s}`, S = !l || !f ? "zoomLinear" : p === "log" ? "zoomLog" : p === "symlog" ? "zoomSymlog" : p === "pow" ? "zoomPow" : "zoomLinear", T = l ? p === "pow" ? `, ${f.get("exponent") ?? 1}` : p === "symlog" ? `, ${f.get("constant") ?? 1}` : "" : "", E = `${S}(${g}, ${v}, ${_}${T})`;
+  let o = t.name, s = n.channel, l = scales_default.defined(t), u = i.find((e36) => e36.name === n.signals[l ? "data" : "visual"]), d = e35.getSizeSignalRef(r).signal, f = e35.getScaleComponent(s), p = f && f.get("type"), g = l ? domain(e35, s) : u.name, _ = o + DELTA, v = `${o}${ANCHOR}.${s}`, S = `${!l || !f ? "zoomLinear" : p === "log" ? "zoomLog" : p === "symlog" ? "zoomSymlog" : p === "pow" ? "zoomPow" : "zoomLinear"}(${g}, ${v}, ${_}${l ? p === "pow" ? `, ${f.get("exponent") ?? 1}` : p === "symlog" ? `, ${f.get("constant") ?? 1}` : "" : ""})`;
   u.on.push({
     events: { signal: _ },
-    update: l ? E : `clampRange(${E}, 0, ${d})`
+    update: l ? S : `clampRange(${S}, 0, ${d})`
   });
 }
 const STORE = "_store", TUPLE = "_tuple", MODIFY = "_modify", VL_SELECTION_RESOLVE = "vlSelectionResolve", selectionCompilers = [
@@ -26263,8 +26228,8 @@ function parseSelectionPredicate(e35, t, n, r = "datum") {
     let t2 = n ?? e35.component.data.raw, r2 = l.project.timeUnit.clone();
     t2.parent ? r2.insertAsParentOf(t2) : t2.parent = r2;
   }
-  let u = l.project.hasSelectionId ? "vlSelectionIdTest(" : "vlSelectionTest(", d = l.resolve === "global" ? ")" : `, ${$(l.resolve)})`, f = `${u}${s}, ${r}${d}`, p = `length(data(${s}))`;
-  return t.empty === false ? `${p} && ${f}` : `!${p} || ${f}`;
+  let u = `${l.project.hasSelectionId ? "vlSelectionIdTest(" : "vlSelectionTest("}${s}, ${r}${l.resolve === "global" ? ")" : `, ${$(l.resolve)})`}`, d = `length(data(${s}))`;
+  return t.empty === false ? `${d} && ${u}` : `!${d} || ${u}`;
 }
 function parseSelectionExtent(e35, t, n) {
   let r = varName(t), i = n.encoding, o = n.field, s;
@@ -26306,14 +26271,14 @@ function assembleAxis(e35, t, n, r = { header: false }) {
       else if (isConditionalAxisValue(i2)) {
         let { condition: e37, ...t2 } = i2, r3 = array(e37), o2 = CONDITIONAL_AXIS_PROP_INDEX[n2];
         if (o2) {
-          let { vgProp: e38, part: i3 } = o2, s2 = [...r3.map((e39) => {
+          let { vgProp: e38, part: i3 } = o2;
+          setAxisEncode(f, i3, e38, [...r3.map((e39) => {
             let { test: t3, ...n3 } = e39;
             return {
               test: expression(null, t3),
               ...n3
             };
-          }), t2];
-          setAxisEncode(f, i3, e38, s2), delete f[n2];
+          }), t2]), delete f[n2];
         } else o2 === null && (f[n2] = { signal: r3.map((e38) => {
           let { test: t3, ...n3 } = e38;
           return `${expression(null, t3)} ? ${exprFromValueRefOrSignalRef(n3)} : `;
@@ -26494,8 +26459,8 @@ function normalizeAngleExpr(e35) {
 function defaultLabelBaseline(e35, t, n, r) {
   if (e35 !== void 0) if (n === "x") {
     if (isSignalRef(e35)) {
-      let n2 = normalizeAngleExpr(e35), r2 = isSignalRef(t) ? `(${t.signal} === "top")` : t === "top";
-      return { signal: `(45 < ${n2} && ${n2} < 135) || (225 < ${n2} && ${n2} < 315) ? "middle" :(${n2} <= 45 || 315 <= ${n2}) === ${r2} ? "bottom" : "top"` };
+      let n2 = normalizeAngleExpr(e35);
+      return { signal: `(45 < ${n2} && ${n2} < 135) || (225 < ${n2} && ${n2} < 315) ? "middle" :(${n2} <= 45 || 315 <= ${n2}) === ${isSignalRef(t) ? `(${t.signal} === "top")` : t === "top"} ? "bottom" : "top"` };
     }
     if (45 < e35 && e35 < 135 || 225 < e35 && e35 < 315) return "middle";
     if (isSignalRef(t)) {
@@ -26808,12 +26773,12 @@ function sizeSignals(e35, t) {
     }
     throw Error("layout size is step although width/height is not step.");
   } else if (r == "container") {
-    let t2 = i.endsWith("width"), n2 = t2 ? "containerSize()[0]" : "containerSize()[1]", r2 = getViewConfigContinuousSize(e35.config.view, t2 ? "width" : "height"), o = `isFinite(${n2}) ? ${n2} : ${r2}`;
+    let t2 = i.endsWith("width"), n2 = t2 ? "containerSize()[0]" : "containerSize()[1]", r2 = `isFinite(${n2}) ? ${n2} : ${getViewConfigContinuousSize(e35.config.view, t2 ? "width" : "height")}`;
     return [{
       name: i,
-      init: o,
+      init: r2,
       on: [{
-        update: o,
+        update: r2,
         events: "window:resize"
       }]
     }];
@@ -26861,7 +26826,7 @@ function parseGuideResolve(e35, t) {
   let n = e35.scale[t], r = isXorY(t) ? "axis" : "legend";
   return n === "independent" ? (e35[r][t] === "shared" && warn(independentScaleMeansIndependentGuide(t)), "independent") : e35[r][t] || "shared";
 }
-var LEGEND_COMPONENT_PROPERTY_INDEX = {
+const LEGEND_COMPONENT_PROPERTIES = keys({
   ...COMMON_LEGEND_PROPERTY_INDEX,
   disable: 1,
   labelExpr: 1,
@@ -26874,8 +26839,7 @@ var LEGEND_COMPONENT_PROPERTY_INDEX = {
   strokeWidth: 1,
   strokeDash: 1,
   encode: 1
-};
-const LEGEND_COMPONENT_PROPERTIES = keys(LEGEND_COMPONENT_PROPERTY_INDEX);
+});
 var LegendComponent = class extends Split {
 };
 const legendEncodeRules = {
@@ -27217,9 +27181,9 @@ function setLegendEncode(e35, t, n, r) {
 function assembleLegends(e35) {
   let t = e35.component.legends, n = {};
   for (let r of keys(t)) {
-    let i = e35.getScaleComponent(r), o = stringify$2(i.get("domains"));
-    if (n[o]) for (let e36 of n[o]) mergeLegendComponent(e36, t[r]) || n[o].push(t[r]);
-    else n[o] = [t[r].clone()];
+    let i = stringify$2(e35.getScaleComponent(r).get("domains"));
+    if (n[i]) for (let e36 of n[i]) mergeLegendComponent(e36, t[r]) || n[i].push(t[r]);
+    else n[i] = [t[r].clone()];
   }
   return vals(n).flat().map((t2) => assembleLegend(t2, e35.config)).filter((e36) => e36 !== void 0);
 }
@@ -27367,8 +27331,8 @@ function getSignalsFromModel(e35, t) {
   };
 }
 function getBinSignalName(e35, t, n) {
-  let r = normalizeBin(n, void 0) ?? {}, i = binKey(r, t);
-  return e35.getName(`${i}_bins`);
+  let r = binKey(normalizeBin(n, void 0) ?? {}, t);
+  return e35.getName(`${r}_bins`);
 }
 function isBinTransform(e35) {
   return "as" in e35;
@@ -27384,17 +27348,16 @@ function createBinComponent(e35, t, n) {
     let e36 = o.extent;
     i = parseSelectionExtent(n, e36.param, e36), delete o.extent;
   }
-  let d = {
-    bin: o,
-    field: e35.field,
-    as: [r],
-    ...l ? { signal: l } : {},
-    ...u ? { extentSignal: u } : {},
-    ...i ? { span: i } : {}
-  };
   return {
     key: s,
-    binComponent: d
+    binComponent: {
+      bin: o,
+      field: e35.field,
+      as: [r],
+      ...l ? { signal: l } : {},
+      ...u ? { extentSignal: u } : {},
+      ...i ? { span: i } : {}
+    }
   };
 }
 var BinNode = class e8 extends DataFlowNode {
@@ -27615,8 +27578,8 @@ var AggregateNode = class e9 extends DataFlowNode {
       if (n && !n.merged) {
         let r = n.get("type"), i = n.get("range");
         if (hasDiscreteDomain(r) && isVgRangeStep(i)) {
-          let n2 = assembleDomain(this.childModel, t), r2 = getFieldFromDomain(n2);
-          r2 ? e35[t] = r2 : warn(unknownField(t));
+          let n2 = getFieldFromDomain(assembleDomain(this.childModel, t));
+          n2 ? e35[t] = n2 : warn(unknownField(t));
         }
       }
     }
@@ -27703,18 +27666,7 @@ function unquote(e35) {
 }
 function parseExpression(e35, t) {
   let n = accessPathWithDatum(e35);
-  if (t === "number") return `toNumber(${n})`;
-  if (t === "boolean") return `toBoolean(${n})`;
-  if (t === "string") return `toString(${n})`;
-  if (t === "date") return `toDate(${n})`;
-  if (t === "flatten") return n;
-  if (t.startsWith("date:")) {
-    let e36 = unquote(t.slice(5, t.length));
-    return `timeParse(${n},'${e36}')`;
-  } else if (t.startsWith("utc:")) {
-    let e36 = unquote(t.slice(4, t.length));
-    return `utcParse(${n},'${e36}')`;
-  } else return warn(unrecognizedParse(t)), null;
+  return t === "number" ? `toNumber(${n})` : t === "boolean" ? `toBoolean(${n})` : t === "string" ? `toString(${n})` : t === "date" ? `toDate(${n})` : t === "flatten" ? n : t.startsWith("date:") ? `timeParse(${n},'${unquote(t.slice(5, t.length))}')` : t.startsWith("utc:") ? `utcParse(${n},'${unquote(t.slice(4, t.length))}')` : (warn(unrecognizedParse(t)), null);
 }
 function getImplicitFromFilterTransform(e35) {
   let t = {};
@@ -27742,8 +27694,8 @@ function getImplicitFromEncoding(e35) {
   }), isUnitModel(e35)) {
     let { mark: n2, markDef: r, encoding: i } = e35;
     if (isPathMark(n2) && !e35.encoding.order) {
-      let e36 = r.orient === "horizontal" ? "y" : "x", n3 = i[e36];
-      isFieldDef(n3) && n3.type === "quantitative" && !(n3.field in t) && (t[n3.field] = "number");
+      let e36 = i[r.orient === "horizontal" ? "y" : "x"];
+      isFieldDef(e36) && e36.type === "quantitative" && !(e36.field in t) && (t[e36.field] = "number");
     }
   }
   return t;
@@ -28502,8 +28454,8 @@ function parseSingleChannelDomain(e35, t, n, r) {
     isPath: isPathMark(s)
   });
   if (isDomainUnionWith(t)) {
-    let i2 = parseSingleChannelDomain(e35, void 0, n, r), o2 = convertDomainIfItIsDateTime(t.unionWith, f, p);
-    return makeExplicit([...o2, ...i2.value]);
+    let i2 = parseSingleChannelDomain(e35, void 0, n, r);
+    return makeExplicit([...convertDomainIfItIsDateTime(t.unionWith, f, p), ...i2.value]);
   } else if (isSignalRef(t)) return makeExplicit([t]);
   else if (t && t !== "unaggregated" && !isParameterDomain(t)) return makeExplicit(convertDomainIfItIsDateTime(t, f, p));
   if (u && r === u.fieldChannel) {
@@ -28518,10 +28470,7 @@ function parseSingleChannelDomain(e35, t, n, r) {
     }]);
   }
   let _ = isScaleChannel(r) && isFieldDef(d) ? domainSort(n, r, e35) : void 0;
-  if (isDatumDef(d)) {
-    let e36 = convertDomainIfItIsDateTime([d.datum], f, p);
-    return makeImplicit(e36);
-  }
+  if (isDatumDef(d)) return makeImplicit(convertDomainIfItIsDateTime([d.datum], f, p));
   let v = d;
   if (t === "unaggregated") {
     let { field: e36 } = d;
@@ -28609,10 +28558,8 @@ function domainSort(e35, t, n) {
     order: "ascending"
   };
   let { stack: o } = e35, s = o ? /* @__PURE__ */ new Set([...o.groupbyFields, ...o.stackBy.map((e36) => e36.fieldDef.field)]) : void 0;
-  if (isSortField(i)) {
-    let e36 = o && !s.has(i.field);
-    return normalizeSortField(i, e36);
-  } else if (isSortByEncoding(i)) {
+  if (isSortField(i)) return normalizeSortField(i, o && !s.has(i.field));
+  if (isSortByEncoding(i)) {
     let { encoding: t2, order: n2 } = i, r2 = e35.fieldDef(t2), { aggregate: l, field: u } = r2, d = o && !s.has(u);
     if (isArgminDef(l) || isArgmaxDef(l)) return normalizeSortField({
       field: vgField(r2),
@@ -28710,8 +28657,7 @@ function getFieldFromDomain(e35) {
   }
 }
 function assembleDomain(e35, t) {
-  let n = e35.component.scales[t].get("domains").map((t2) => (isDataRefDomain(t2) && (t2.data = e35.lookupDataSource(t2.data)), t2));
-  return mergeDomains(n);
+  return mergeDomains(e35.component.scales[t].get("domains").map((t2) => (isDataRefDomain(t2) && (t2.data = e35.lookupDataSource(t2.data)), t2)));
 }
 function assembleScales(e35) {
   return isLayerModel(e35) || isConcatModel(e35) ? e35.children.reduce((e36, t) => e36.concat(assembleScales(t)), assembleScalesForModel(e35)) : assembleScalesForModel(e35);
@@ -28887,10 +28833,7 @@ function defaultRange(e35, t) {
     case ANGLE:
       return [0, 360];
     case RADIUS:
-      return [0, new SignalRefWrapper(() => {
-        let e36 = t.getSignalName(isFacetModel(t.parent) ? "child_width" : "width"), n2 = t.getSignalName(isFacetModel(t.parent) ? "child_height" : "height");
-        return `min(${e36},${n2})/2`;
-      })];
+      return [0, new SignalRefWrapper(() => `min(${t.getSignalName(isFacetModel(t.parent) ? "child_width" : "width")},${t.getSignalName(isFacetModel(t.parent) ? "child_height" : "height")})/2`)];
     case TIME:
       return { step: 1e3 / r.scale.framesPerSecond };
     case STROKEWIDTH:
@@ -29088,10 +29031,7 @@ const scaleRules = {
   padding: ({ channel: e35, scaleType: t, fieldOrDatumDef: n, markDef: r, config: i }) => padding(e35, t, i.scale, n, r, i.bar),
   paddingInner: ({ scalePadding: e35, channel: t, markDef: n, scaleType: r, config: i, hasNestedOffsetScale: o }) => paddingInner(e35, t, n.type, r, i.scale, o),
   paddingOuter: ({ scalePadding: e35, channel: t, scaleType: n, scalePaddingInner: r, config: i, hasNestedOffsetScale: o }) => paddingOuter(e35, t, n, r, i.scale, o),
-  reverse: ({ fieldOrDatumDef: e35, scaleType: t, channel: n, config: r }) => {
-    let i = isFieldDef(e35) ? e35.sort : void 0;
-    return reverse(t, i, n, r.scale);
-  },
+  reverse: ({ fieldOrDatumDef: e35, scaleType: t, channel: n, config: r }) => reverse(t, isFieldDef(e35) ? e35.sort : void 0, n, r.scale),
   zero: ({ channel: e35, fieldOrDatumDef: t, domain: n, markDef: r, scaleType: i, config: o, hasSecondaryRangeChannel: s }) => zero(e35, t, n, r, i, o.scale, s)
 };
 function parseScaleRange(e35) {
@@ -29421,18 +29361,15 @@ var Model = class {
   }
   getSizeSignalRef(e35) {
     if (isFacetModel(this.parent)) {
-      let t = getSizeTypeFromLayoutSizeType(e35), n = getPositionScaleChannel(t), r = this.component.scales[n];
-      if (r && !r.merged) {
-        let e36 = r.get("type"), t2 = r.get("range");
-        if (hasDiscreteDomain(e36) && isVgRangeStep(t2)) {
-          let e37 = r.get("name"), t3 = assembleDomain(this, n), i = getFieldFromDomain(t3);
-          if (i) {
-            let t4 = vgField({
-              aggregate: "distinct",
-              field: i
-            }, { expr: "datum" });
-            return { signal: sizeExpr(e37, r, t4) };
-          } else return warn(unknownField(n)), null;
+      let t = getPositionScaleChannel(getSizeTypeFromLayoutSizeType(e35)), n = this.component.scales[t];
+      if (n && !n.merged) {
+        let e36 = n.get("type"), r = n.get("range");
+        if (hasDiscreteDomain(e36) && isVgRangeStep(r)) {
+          let e37 = n.get("name"), r2 = getFieldFromDomain(assembleDomain(this, t));
+          return r2 ? { signal: sizeExpr(e37, n, vgField({
+            aggregate: "distinct",
+            field: r2
+          }, { expr: "datum" })) } : (warn(unknownField(t)), null);
         }
       }
     }
@@ -29739,8 +29676,9 @@ var Model = class {
       ...i ? { groupby: i } : {},
       value: !r || r === "value" ? o : null
     };
-    if (r && r !== "value") {
-      let t2 = {
+    return r && r !== "value" ? [
+      l,
+      {
         type: "window",
         as: [`imputed_${e35}_value`],
         ops: [r],
@@ -29748,17 +29686,13 @@ var Model = class {
         frame: s,
         ignorePeers: false,
         ...i ? { groupby: i } : {}
-      }, n2 = {
+      },
+      {
         type: "formula",
         expr: `datum.${e35} === null ? datum.imputed_${e35}_value : datum.${e35}`,
         as: e35
-      };
-      return [
-        l,
-        t2,
-        n2
-      ];
-    } else return [l];
+      }
+    ] : [l];
   }
 }, LoessTransformNode = class e26 extends DataFlowNode {
   clone() {
@@ -30016,11 +29950,7 @@ function assembleFacetData(e35) {
 }
 function assembleRootData(e35, t) {
   let n = [], r = makeWalkTree(n), i = 0;
-  for (let t2 of e35.sources) {
-    t2.hasName() || (t2.dataName = `source_${i++}`);
-    let e36 = t2.assemble();
-    r(t2, e36);
-  }
+  for (let t2 of e35.sources) t2.hasName() || (t2.dataName = `source_${i++}`), r(t2, t2.assemble());
   for (let e36 of n) e36.transform.length === 0 && delete e36.transform;
   let o = 0;
   for (let [e36, t2] of n.entries()) (t2.transform ?? []).length === 0 && !t2.source && n.splice(o++, 0, n.splice(e36, 1)[0]);
@@ -30251,8 +30181,8 @@ var FacetModel = class e32 extends ModelWithField {
       if (i && !i.merged) {
         let o = i.get("type"), s = i.get("range");
         if (hasDiscreteDomain(o) && isVgRangeStep(s)) {
-          let i2 = assembleDomain(this.child, e35), o2 = getFieldFromDomain(i2);
-          o2 ? (t.push(o2), n.push("distinct"), r.push(`distinct_${o2}`)) : warn(unknownField(e35));
+          let i2 = getFieldFromDomain(assembleDomain(this.child, e35));
+          i2 ? (t.push(i2), n.push("distinct"), r.push(`distinct_${i2}`)) : warn(unknownField(e35));
         }
       }
     }
@@ -30443,11 +30373,11 @@ function parseData(e35) {
   }
   let f, p;
   if (isUnitModel(e35)) {
-    let { markDef: n2, mark: r2, config: i2 } = e35, o2 = getMarkPropOrConfig("invalid", n2, i2), { marks: s2, scales: l2 } = p = getDataSourcesForHandlingInvalidValues({
-      invalid: o2,
+    let { markDef: n2, mark: r2, config: i2 } = e35, { marks: o2, scales: s2 } = p = getDataSourcesForHandlingInvalidValues({
+      invalid: getMarkPropOrConfig("invalid", n2, i2),
       isPath: isPathMark(r2)
     });
-    s2 !== l2 && l2 === "include-invalid-values" && (f = t = makeOutputNode(DataSourceType.PreFilterInvalid, e35, t)), s2 === "exclude-invalid-values" && (t = FilterInvalidNode.make(t, e35, p) ?? t);
+    o2 !== s2 && s2 === "include-invalid-values" && (f = t = makeOutputNode(DataSourceType.PreFilterInvalid, e35, t)), o2 === "exclude-invalid-values" && (t = FilterInvalidNode.make(t, e35, p) ?? t);
   }
   let g = t = makeOutputNode(DataSourceType.Main, e35, t), _;
   if (isUnitModel(e35) && p) {
@@ -30549,15 +30479,14 @@ var ConcatModel = class extends Model {
 function isFalseOrNull(e35) {
   return e35 === false || e35 === null;
 }
-var AXIS_COMPONENT_PROPERTIES_INDEX = {
+const AXIS_COMPONENT_PROPERTIES = keys({
   disable: 1,
   gridScale: 1,
   scale: 1,
   ...COMMON_AXIS_PROPERTIES_INDEX,
   labelExpr: 1,
   encode: 1
-};
-const AXIS_COMPONENT_PROPERTIES = keys(AXIS_COMPONENT_PROPERTIES_INDEX);
+});
 var AxisComponent = class e33 extends Split {
   constructor(e35 = {}, t = {}, n = false) {
     super(), this.explicit = e35, this.implicit = t, this.mainExtracted = n;
@@ -31051,31 +30980,28 @@ function getPathGroups(e35, t) {
 var STACK_GROUP_PREFIX = "stack_group_";
 function getGroupsForStackedBarWithCornerRadius(e35) {
   var _a2;
-  let [t] = getMarkGroup(e35, { fromPrefix: STACK_GROUP_PREFIX }), n = e35.scaleName(e35.stack.fieldChannel), r = (t2 = {}) => e35.vgField(e35.stack.fieldChannel, t2), i = (e36, t2) => {
-    let i2 = [
-      r({
-        prefix: "min",
-        suffix: "start",
-        expr: t2
-      }),
-      r({
-        prefix: "max",
-        suffix: "start",
-        expr: t2
-      }),
-      r({
-        prefix: "min",
-        suffix: "end",
-        expr: t2
-      }),
-      r({
-        prefix: "max",
-        suffix: "end",
-        expr: t2
-      })
-    ];
-    return `${e36}(${i2.map((e37) => `scale('${n}',${e37})`).join(",")})`;
-  }, o, s;
+  let [t] = getMarkGroup(e35, { fromPrefix: STACK_GROUP_PREFIX }), n = e35.scaleName(e35.stack.fieldChannel), r = (t2 = {}) => e35.vgField(e35.stack.fieldChannel, t2), i = (e36, t2) => `${e36}(${[
+    r({
+      prefix: "min",
+      suffix: "start",
+      expr: t2
+    }),
+    r({
+      prefix: "max",
+      suffix: "start",
+      expr: t2
+    }),
+    r({
+      prefix: "min",
+      suffix: "end",
+      expr: t2
+    }),
+    r({
+      prefix: "max",
+      suffix: "end",
+      expr: t2
+    })
+  ].map((e37) => `scale('${n}',${e37})`).join(",")})`, o, s;
   e35.stack.fieldChannel === "x" ? (o = {
     ...pick(t.encode.update, [
       "y",
@@ -31520,14 +31446,17 @@ var src_exports = /* @__PURE__ */ __export({
   version: () => version$3
 });
 const version$3 = package_default$1.version;
-function vega_schema_url_parser_default(e35) {
-  let [t, n] = /\/schema\/([\w-]+)\/([\w\.\-]+)\.json$/g.exec(e35).slice(1, 3);
-  return {
-    library: t,
-    version: n
-  };
-}
-var vega_themes_module_exports = /* @__PURE__ */ __export({
+var require_vega_schema_url_parser = /* @__PURE__ */ __commonJSMin(((e35) => {
+  Object.defineProperty(e35, "__esModule", { value: true });
+  function t(e36) {
+    var t2 = /\/schema\/([\w-]+)\/([\w\.\-]+)\.json$/g.exec(e36).slice(1, 3);
+    return {
+      library: t2[0],
+      version: t2[1]
+    };
+  }
+  e35.default = t;
+})), vega_themes_module_exports = /* @__PURE__ */ __export({
   carbong10: () => carbong10,
   carbong100: () => carbong100,
   carbong90: () => carbong90,
@@ -32781,7 +32710,7 @@ function mergeDeep(e35, ...t) {
 function deepMerge_(e35, t) {
   for (let n of Object.keys(t)) writeConfig(e35, n, t[n], true);
 }
-var import_json_stringify_pretty_compact = /* @__PURE__ */ __toESM(require_json_stringify_pretty_compact()), import_semver = /* @__PURE__ */ __toESM(require_semver());
+var import_json_stringify_pretty_compact = /* @__PURE__ */ __toESM(require_json_stringify_pretty_compact()), import_semver = /* @__PURE__ */ __toESM(require_semver()), import_vega_schema_url_parser = /* @__PURE__ */ __toESM(require_vega_schema_url_parser());
 const vega = vega_module_exports;
 let vegaLite = src_exports;
 var w = typeof window < "u" ? window : void 0;
@@ -32821,7 +32750,7 @@ function viewSource(e35, t, n, r) {
 }
 function guessMode(e35, t) {
   if (e35.$schema) {
-    let n = vega_schema_url_parser_default(e35.$schema);
+    let n = (0, import_vega_schema_url_parser.default)(e35.$schema);
     t && t !== n.library && console.warn(`The given visualization spec is written in ${NAMES[n.library]}, but mode argument sets ${NAMES[t] ?? t}.`);
     let r = n.library;
     return (0, import_semver.satisfies)(VERSION[r], `^${n.version.slice(1)}`) || console.warn(`The input spec uses ${NAMES[r]} ${n.version}, but the current version of ${NAMES[r]} is v${VERSION[r]}.`), r;
@@ -32833,8 +32762,8 @@ function isLoader(e35) {
 }
 function embed(e35, t, n = {}) {
   return __awaiter(this, void 0, void 0, function* () {
-    let r = isLoader(n.loader) ? n.loader : vega.loader(n.loader), i = isString(t) ? JSON.parse(yield r.load(t)) : t, o = yield loadOpts((i.usermeta && i.usermeta.embedOptions) ?? {}, r), s = yield loadOpts(n, r), l = Object.assign(Object.assign({}, mergeDeep(s, o)), { config: mergeConfig(s.config ?? {}, o.config ?? {}) });
-    return yield _embed(e35, i, l, r);
+    let r = isLoader(n.loader) ? n.loader : vega.loader(n.loader), i = isString(t) ? JSON.parse(yield r.load(t)) : t, o = yield loadOpts((i.usermeta && i.usermeta.embedOptions) ?? {}, r), s = yield loadOpts(n, r);
+    return yield _embed(e35, i, Object.assign(Object.assign({}, mergeDeep(s, o)), { config: mergeConfig(s.config ?? {}, o.config ?? {}) }), r);
   });
 }
 function loadOpts(e35, t) {
@@ -32855,7 +32784,7 @@ function _embed(e35, t, n = {}, r) {
     }
     let p = guessMode(t, n.mode), g = PREPROCESSOR[p](t, o);
     if (p === "vega-lite" && g.$schema) {
-      let e36 = vega_schema_url_parser_default(g.$schema);
+      let e36 = (0, import_vega_schema_url_parser.default)(g.$schema);
       (0, import_semver.satisfies)(VERSION.vega, `^${e36.version.slice(1)}`) || console.warn(`The compiled spec uses Vega ${e36.version}, but current version is v${VERSION.vega}.`);
     }
     let _ = typeof e35 == "string" ? document.querySelector(e35) : e35;