@malloydata/render 0.0.194-dev241001212731 → 0.0.194

package/dist/webcomponent/malloy-render.mjs

@@ -441,9 +441,9 @@ function _le(t, e, n = {}) {
   return rg(() => wB(s)), () => {
     let a = t() || [], l, c;
     return a[YR], qs(() => {
-      let x = a.length, h, p, m, g, y, E, A, v, _;
+      let x = a.length, h, p, m, g, y, E, A, v, S;
       if (x === 0)
-        o !== 0 && (wB(s), s = [], r = [], i = [], o = 0, u && (u = [])), n.fallback && (r = [Sle], i[0] = $1((S) => (s[0] = S, n.fallback())), o = 1);
+        o !== 0 && (wB(s), s = [], r = [], i = [], o = 0, u && (u = [])), n.fallback && (r = [Sle], i[0] = $1((_) => (s[0] = _, n.fallback())), o = 1);
       else if (o === 0) {
         for (i = new Array(x), c = 0; c < x; c++)
           r[c] = a[c], i[c] = $1(f);
@@ -454,9 +454,9 @@ function _le(t, e, n = {}) {
         for (A = o - 1, v = x - 1; A >= E && v >= E && r[A] === a[v]; A--, v--)
           m[v] = i[A], g[v] = s[A], u && (y[v] = u[A]);
         for (h = /* @__PURE__ */ new Map(), p = new Array(v + 1), c = v; c >= E; c--)
-          _ = a[c], l = h.get(_), p[c] = l === void 0 ? -1 : l, h.set(_, c);
+          S = a[c], l = h.get(S), p[c] = l === void 0 ? -1 : l, h.set(S, c);
         for (l = E; l <= A; l++)
-          _ = r[l], c = h.get(_), c !== void 0 && c !== -1 ? (m[c] = i[l], g[c] = s[l], u && (y[c] = u[l]), c = p[c], h.set(_, c)) : s[l]();
+          S = r[l], c = h.get(S), c !== void 0 && c !== -1 ? (m[c] = i[l], g[c] = s[l], u && (y[c] = u[l]), c = p[c], h.set(S, c)) : s[l]();
         for (c = E; c < x; c++)
           c in m ? (i[c] = m[c], s[c] = g[c], u && (u[c] = y[c], u[c](c))) : i[c] = $1(f);
         i = i.slice(0, o = x), r = a.slice(0);
@@ -1544,8 +1544,8 @@ function A0e(t) {
     for (var p = 16; p < 80; ++p)
       x[p] = iT(x[p - 3] ^ x[p - 8] ^ x[p - 14] ^ x[p - 16], 1);
     for (var m = n[0], g = n[1], y = n[2], E = n[3], A = n[4], v = 0; v < 80; ++v) {
-      var _ = Math.floor(v / 20), S = iT(m, 5) + E0e(_, g, y, E) + A + e[_] + x[v] >>> 0;
-      A = E, E = y, y = iT(g, 30) >>> 0, g = m, m = S;
+      var S = Math.floor(v / 20), _ = iT(m, 5) + E0e(S, g, y, E) + A + e[S] + x[v] >>> 0;
+      A = E, E = y, y = iT(g, 30) >>> 0, g = m, m = _;
     }
     n[0] = n[0] + m >>> 0, n[1] = n[1] + g >>> 0, n[2] = n[2] + y >>> 0, n[3] = n[3] + E >>> 0, n[4] = n[4] + A >>> 0;
   }
@@ -2026,11 +2026,11 @@ var qf = {}, OQ = {};
     takes: { value: "number" },
     returns: "boolean",
     impl: { sql: "COALESCE(IS_INF(${value}), false)" }
-  }, _ = {
+  }, S = {
     takes: { value: "number" },
     returns: "boolean",
     impl: { sql: "COALESCE(IS_NAN(${value}), false)" }
-  }, S = {
+  }, _ = {
     ...E,
     impl: { function: "LEAST" }
   }, C = {
@@ -2404,8 +2404,8 @@ var qf = {}, OQ = {};
     greatest: E,
     ifnull: A,
     is_inf: v,
-    is_nan: _,
-    least: S,
+    is_nan: S,
+    least: _,
     length: C,
     ln: b,
     log: R,
@@ -5757,14 +5757,14 @@ var Kxe = function(e) {
     return r(Z) === "Uint32Array";
   }
   t.isUint32Array = v;
-  function _(Z) {
+  function S(Z) {
     return r(Z) === "Int8Array";
   }
-  t.isInt8Array = _;
-  function S(Z) {
+  t.isInt8Array = S;
+  function _(Z) {
     return r(Z) === "Int16Array";
   }
-  t.isInt16Array = S;
+  t.isInt16Array = _;
   function C(Z) {
     return r(Z) === "Int32Array";
   }
@@ -5925,7 +5925,7 @@ var nde = fO.exports;
     return W;
   }, r = /%[sdj%]/g;
   t.format = function(D) {
-    if (!S(D)) {
+    if (!_(D)) {
       for (var k = [], j = 0; j < arguments.length; j++)
         k.push(u(arguments[j]));
       return k.join(" ");
@@ -6038,7 +6038,7 @@ var nde = fO.exports;
     k.inspect !== t.inspect && // Also filter out any prototype objects using the circular check.
     !(k.constructor && k.constructor.prototype === k)) {
       var W = k.inspect(j, D);
-      return S(W) || (W = f(D, W, j)), W;
+      return _(W) || (W = f(D, W, j)), W;
     }
     var U = x(D, k);
     if (U)
@@ -6076,11 +6076,11 @@ var nde = fO.exports;
   function x(D, k) {
     if (b(k))
       return D.stylize("undefined", "undefined");
-    if (S(k)) {
+    if (_(k)) {
       var j = "'" + JSON.stringify(k).replace(/^"|"$/g, "").replace(/'/g, "\\'").replace(/\\"/g, '"') + "'";
       return D.stylize(j, "string");
     }
-    if (_(k))
+    if (S(k))
       return D.stylize("" + k, "number");
     if (E(k))
       return D.stylize("" + k, "boolean");
@@ -6156,14 +6156,14 @@ var nde = fO.exports;
     return D == null;
   }
   t.isNullOrUndefined = v;
-  function _(D) {
+  function S(D) {
     return typeof D == "number";
   }
-  t.isNumber = _;
-  function S(D) {
+  t.isNumber = S;
+  function _(D) {
     return typeof D == "string";
   }
-  t.isString = S;
+  t.isString = _;
   function C(D) {
     return typeof D == "symbol";
   }
@@ -6317,58 +6317,58 @@ function YQ() {
   if (o$)
     return hT;
   o$ = 1;
-  function t(_) {
+  function t(S) {
     "@babel/helpers - typeof";
-    return t = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(S) {
-      return typeof S;
-    } : function(S) {
-      return S && typeof Symbol == "function" && S.constructor === Symbol && S !== Symbol.prototype ? "symbol" : typeof S;
-    }, t(_);
+    return t = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(_) {
+      return typeof _;
+    } : function(_) {
+      return _ && typeof Symbol == "function" && _.constructor === Symbol && _ !== Symbol.prototype ? "symbol" : typeof _;
+    }, t(S);
   }
-  function e(_, S) {
-    for (var C = 0; C < S.length; C++) {
-      var b = S[C];
-      b.enumerable = b.enumerable || !1, b.configurable = !0, "value" in b && (b.writable = !0), Object.defineProperty(_, r(b.key), b);
+  function e(S, _) {
+    for (var C = 0; C < _.length; C++) {
+      var b = _[C];
+      b.enumerable = b.enumerable || !1, b.configurable = !0, "value" in b && (b.writable = !0), Object.defineProperty(S, r(b.key), b);
     }
   }
-  function n(_, S, C) {
-    return S && e(_.prototype, S), C && e(_, C), Object.defineProperty(_, "prototype", { writable: !1 }), _;
+  function n(S, _, C) {
+    return _ && e(S.prototype, _), C && e(S, C), Object.defineProperty(S, "prototype", { writable: !1 }), S;
   }
-  function r(_) {
-    var S = i(_, "string");
-    return t(S) === "symbol" ? S : String(S);
+  function r(S) {
+    var _ = i(S, "string");
+    return t(_) === "symbol" ? _ : String(_);
   }
-  function i(_, S) {
-    if (t(_) !== "object" || _ === null)
-      return _;
-    var C = _[Symbol.toPrimitive];
+  function i(S, _) {
+    if (t(S) !== "object" || S === null)
+      return S;
+    var C = S[Symbol.toPrimitive];
     if (C !== void 0) {
-      var b = C.call(_, S || "default");
+      var b = C.call(S, _ || "default");
       if (t(b) !== "object")
         return b;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return (S === "string" ? String : Number)(_);
+    return (_ === "string" ? String : Number)(S);
   }
-  function s(_, S) {
-    if (!(_ instanceof S))
+  function s(S, _) {
+    if (!(S instanceof _))
       throw new TypeError("Cannot call a class as a function");
   }
-  function o(_, S) {
-    if (typeof S != "function" && S !== null)
+  function o(S, _) {
+    if (typeof _ != "function" && _ !== null)
       throw new TypeError("Super expression must either be null or a function");
-    _.prototype = Object.create(S && S.prototype, { constructor: { value: _, writable: !0, configurable: !0 } }), Object.defineProperty(_, "prototype", { writable: !1 }), S && u(_, S);
+    S.prototype = Object.create(_ && _.prototype, { constructor: { value: S, writable: !0, configurable: !0 } }), Object.defineProperty(S, "prototype", { writable: !1 }), _ && u(S, _);
   }
-  function u(_, S) {
+  function u(S, _) {
     return u = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function(b, R) {
       return b.__proto__ = R, b;
-    }, u(_, S);
+    }, u(S, _);
   }
-  function a(_) {
-    var S = f();
+  function a(S) {
+    var _ = f();
     return function() {
-      var b = x(_), R;
-      if (S) {
+      var b = x(S), R;
+      if (_) {
         var O = x(this).constructor;
         R = Reflect.construct(b, arguments, O);
       } else
@@ -6376,17 +6376,17 @@ function YQ() {
       return l(this, R);
     };
   }
-  function l(_, S) {
-    if (S && (t(S) === "object" || typeof S == "function"))
-      return S;
-    if (S !== void 0)
+  function l(S, _) {
+    if (_ && (t(_) === "object" || typeof _ == "function"))
+      return _;
+    if (_ !== void 0)
       throw new TypeError("Derived constructors may only return object or undefined");
-    return c(_);
+    return c(S);
   }
-  function c(_) {
-    if (_ === void 0)
+  function c(S) {
+    if (S === void 0)
       throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    return _;
+    return S;
   }
   function f() {
     if (typeof Reflect > "u" || !Reflect.construct || Reflect.construct.sham)
@@ -6400,82 +6400,82 @@ function YQ() {
       return !1;
     }
   }
-  function x(_) {
+  function x(S) {
     return x = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function(C) {
       return C.__proto__ || Object.getPrototypeOf(C);
-    }, x(_);
+    }, x(S);
   }
   var h = {}, p, m;
-  function g(_, S, C) {
+  function g(S, _, C) {
     C || (C = Error);
     function b(O, L, M) {
-      return typeof S == "string" ? S : S(O, L, M);
+      return typeof _ == "string" ? _ : _(O, L, M);
     }
     var R = /* @__PURE__ */ function(O) {
       o(M, O);
       var L = a(M);
       function M(H, G, Q) {
         var Y;
-        return s(this, M), Y = L.call(this, b(H, G, Q)), Y.code = _, Y;
+        return s(this, M), Y = L.call(this, b(H, G, Q)), Y.code = S, Y;
       }
       return n(M);
     }(C);
-    h[_] = R;
+    h[S] = R;
   }
-  function y(_, S) {
-    if (Array.isArray(_)) {
-      var C = _.length;
-      return _ = _.map(function(b) {
+  function y(S, _) {
+    if (Array.isArray(S)) {
+      var C = S.length;
+      return S = S.map(function(b) {
         return String(b);
-      }), C > 2 ? "one of ".concat(S, " ").concat(_.slice(0, C - 1).join(", "), ", or ") + _[C - 1] : C === 2 ? "one of ".concat(S, " ").concat(_[0], " or ").concat(_[1]) : "of ".concat(S, " ").concat(_[0]);
+      }), C > 2 ? "one of ".concat(_, " ").concat(S.slice(0, C - 1).join(", "), ", or ") + S[C - 1] : C === 2 ? "one of ".concat(_, " ").concat(S[0], " or ").concat(S[1]) : "of ".concat(_, " ").concat(S[0]);
     } else
-      return "of ".concat(S, " ").concat(String(_));
+      return "of ".concat(_, " ").concat(String(S));
   }
-  function E(_, S, C) {
-    return _.substr(!C || C < 0 ? 0 : +C, S.length) === S;
+  function E(S, _, C) {
+    return S.substr(!C || C < 0 ? 0 : +C, _.length) === _;
   }
-  function A(_, S, C) {
-    return (C === void 0 || C > _.length) && (C = _.length), _.substring(C - S.length, C) === S;
+  function A(S, _, C) {
+    return (C === void 0 || C > S.length) && (C = S.length), S.substring(C - _.length, C) === _;
   }
-  function v(_, S, C) {
-    return typeof C != "number" && (C = 0), C + S.length > _.length ? !1 : _.indexOf(S, C) !== -1;
+  function v(S, _, C) {
+    return typeof C != "number" && (C = 0), C + _.length > S.length ? !1 : S.indexOf(_, C) !== -1;
   }
-  return g("ERR_AMBIGUOUS_ARGUMENT", 'The "%s" argument is ambiguous. %s', TypeError), g("ERR_INVALID_ARG_TYPE", function(_, S, C) {
-    p === void 0 && (p = hi()), p(typeof _ == "string", "'name' must be a string");
+  return g("ERR_AMBIGUOUS_ARGUMENT", 'The "%s" argument is ambiguous. %s', TypeError), g("ERR_INVALID_ARG_TYPE", function(S, _, C) {
+    p === void 0 && (p = hi()), p(typeof S == "string", "'name' must be a string");
     var b;
-    typeof S == "string" && E(S, "not ") ? (b = "must not be", S = S.replace(/^not /, "")) : b = "must be";
+    typeof _ == "string" && E(_, "not ") ? (b = "must not be", _ = _.replace(/^not /, "")) : b = "must be";
     var R;
-    if (A(_, " argument"))
-      R = "The ".concat(_, " ").concat(b, " ").concat(y(S, "type"));
+    if (A(S, " argument"))
+      R = "The ".concat(S, " ").concat(b, " ").concat(y(_, "type"));
     else {
-      var O = v(_, ".") ? "property" : "argument";
-      R = 'The "'.concat(_, '" ').concat(O, " ").concat(b, " ").concat(y(S, "type"));
+      var O = v(S, ".") ? "property" : "argument";
+      R = 'The "'.concat(S, '" ').concat(O, " ").concat(b, " ").concat(y(_, "type"));
     }
     return R += ". Received type ".concat(t(C)), R;
-  }, TypeError), g("ERR_INVALID_ARG_VALUE", function(_, S) {
+  }, TypeError), g("ERR_INVALID_ARG_VALUE", function(S, _) {
     var C = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "is invalid";
     m === void 0 && (m = r0);
-    var b = m.inspect(S);
-    return b.length > 128 && (b = "".concat(b.slice(0, 128), "...")), "The argument '".concat(_, "' ").concat(C, ". Received ").concat(b);
-  }, TypeError), g("ERR_INVALID_RETURN_VALUE", function(_, S, C) {
+    var b = m.inspect(_);
+    return b.length > 128 && (b = "".concat(b.slice(0, 128), "...")), "The argument '".concat(S, "' ").concat(C, ". Received ").concat(b);
+  }, TypeError), g("ERR_INVALID_RETURN_VALUE", function(S, _, C) {
     var b;
-    return C && C.constructor && C.constructor.name ? b = "instance of ".concat(C.constructor.name) : b = "type ".concat(t(C)), "Expected ".concat(_, ' to be returned from the "').concat(S, '"') + " function but got ".concat(b, ".");
+    return C && C.constructor && C.constructor.name ? b = "instance of ".concat(C.constructor.name) : b = "type ".concat(t(C)), "Expected ".concat(S, ' to be returned from the "').concat(_, '"') + " function but got ".concat(b, ".");
   }, TypeError), g("ERR_MISSING_ARGS", function() {
-    for (var _ = arguments.length, S = new Array(_), C = 0; C < _; C++)
-      S[C] = arguments[C];
-    p === void 0 && (p = hi()), p(S.length > 0, "At least one arg needs to be specified");
-    var b = "The ", R = S.length;
-    switch (S = S.map(function(O) {
+    for (var S = arguments.length, _ = new Array(S), C = 0; C < S; C++)
+      _[C] = arguments[C];
+    p === void 0 && (p = hi()), p(_.length > 0, "At least one arg needs to be specified");
+    var b = "The ", R = _.length;
+    switch (_ = _.map(function(O) {
       return '"'.concat(O, '"');
     }), R) {
       case 1:
-        b += "".concat(S[0], " argument");
+        b += "".concat(_[0], " argument");
         break;
       case 2:
-        b += "".concat(S[0], " and ").concat(S[1], " arguments");
+        b += "".concat(_[0], " and ").concat(_[1], " arguments");
         break;
       default:
-        b += S.slice(0, R - 1).join(", "), b += ", and ".concat(S[R - 1], " arguments");
+        b += _.slice(0, R - 1).join(", "), b += ", and ".concat(_[R - 1], " arguments");
         break;
     }
     return "".concat(b, " must be specified");
@@ -6627,7 +6627,7 @@ function rde() {
       return re && typeof Symbol == "function" && re.constructor === Symbol && re !== Symbol.prototype ? "symbol" : typeof re;
     }, E(X);
   }
-  var A = r0, v = A.inspect, _ = YQ(), S = _.codes.ERR_INVALID_ARG_TYPE;
+  var A = r0, v = A.inspect, S = YQ(), _ = S.codes.ERR_INVALID_ARG_TYPE;
   function C(X, re, se) {
     return (se === void 0 || se > X.length) && (se = X.length), X.substring(se - re.length, se) === re;
   }
@@ -6763,7 +6763,7 @@ function rde() {
     function Ee(D) {
       var k;
       if (r(this, Ee), E(D) !== "object" || D === null)
-        throw new S("options", "Object", D);
+        throw new _("options", "Object", D);
       var j = D.message, W = D.operator, U = D.stackStartFn, B = D.actual, T = D.expected, w = Error.stackTraceLimit;
       if (Error.stackTraceLimit = 0, j != null)
         k = se.call(this, String(j));
@@ -6895,11 +6895,11 @@ function ide() {
         for (var v = 0; v < h.length; ++v)
           E.push(String(v));
       if (g && h.length > 0)
-        for (var _ = 0; _ < h.length; ++_)
-          E.push(String(_));
+        for (var S = 0; S < h.length; ++S)
+          E.push(String(S));
       else
-        for (var S in h)
-          !(A && S === "prototype") && e.call(h, S) && E.push(String(S));
+        for (var _ in h)
+          !(A && _ === "prototype") && e.call(h, _) && E.push(String(_));
       if (s)
         for (var C = f(h), b = 0; b < u.length; ++b)
           !(C && u[b] === "constructor") && e.call(h, u[b]) && E.push(u[b]);
@@ -7214,7 +7214,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
   function h(te) {
     return te.call.bind(te);
   }
-  var p = h(Object.prototype.hasOwnProperty), m = h(Object.prototype.propertyIsEnumerable), g = h(Object.prototype.toString), y = r0.types, E = y.isAnyArrayBuffer, A = y.isArrayBufferView, v = y.isDate, _ = y.isMap, S = y.isRegExp, C = y.isSet, b = y.isNativeError, R = y.isBoxedPrimitive, O = y.isNumberObject, L = y.isStringObject, M = y.isBooleanObject, H = y.isBigIntObject, G = y.isSymbolObject, Q = y.isFloat32Array, Y = y.isFloat64Array;
+  var p = h(Object.prototype.hasOwnProperty), m = h(Object.prototype.propertyIsEnumerable), g = h(Object.prototype.toString), y = r0.types, E = y.isAnyArrayBuffer, A = y.isArrayBufferView, v = y.isDate, S = y.isMap, _ = y.isRegExp, C = y.isSet, b = y.isNativeError, R = y.isBoxedPrimitive, O = y.isNumberObject, L = y.isStringObject, M = y.isBooleanObject, H = y.isBigIntObject, G = y.isSymbolObject, Q = y.isFloat32Array, Y = y.isFloat64Array;
   function J(te) {
     if (te.length === 0 || te.length > 10)
       return !0;
@@ -7288,13 +7288,13 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       var ye = ee(te), ne = ee(le);
       return ye.length !== ne.length ? !1 : I(te, le, Re, Ue, D, ye);
     }
-    if (Pe === "[object Object]" && (!_(te) && _(le) || !C(te) && C(le)))
+    if (Pe === "[object Object]" && (!S(te) && S(le) || !C(te) && C(le)))
       return !1;
     if (v(te)) {
       if (!v(le) || Date.prototype.getTime.call(te) !== Date.prototype.getTime.call(le))
         return !1;
-    } else if (S(te)) {
-      if (!S(le) || !W(te, le))
+    } else if (_(te)) {
+      if (!_(le) || !W(te, le))
         return !1;
     } else if (b(te) || te instanceof Error) {
       if (te.message !== le.message || te.name !== le.name)
@@ -7310,8 +7310,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     } else {
       if (C(te))
         return !C(le) || te.size !== le.size ? !1 : I(te, le, Re, Ue, k);
-      if (_(te))
-        return !_(le) || te.size !== le.size ? !1 : I(te, le, Re, Ue, j);
+      if (S(te))
+        return !S(le) || te.size !== le.size ? !1 : I(te, le, Re, Ue, j);
       if (E(te)) {
         if (!T(te, le))
           return !1;
@@ -7555,10 +7555,10 @@ function hi() {
     if (!(U instanceof B))
       throw new TypeError("Cannot call a class as a function");
   }
-  var o = YQ(), u = o.codes, a = u.ERR_AMBIGUOUS_ARGUMENT, l = u.ERR_INVALID_ARG_TYPE, c = u.ERR_INVALID_ARG_VALUE, f = u.ERR_INVALID_RETURN_VALUE, x = u.ERR_MISSING_ARGS, h = rde(), p = r0, m = p.inspect, g = r0.types, y = g.isPromise, E = g.isRegExp, A = dde(), v = Dw(), _ = c4("RegExp.prototype.test"), S, C;
+  var o = YQ(), u = o.codes, a = u.ERR_AMBIGUOUS_ARGUMENT, l = u.ERR_INVALID_ARG_TYPE, c = u.ERR_INVALID_ARG_VALUE, f = u.ERR_INVALID_RETURN_VALUE, x = u.ERR_MISSING_ARGS, h = rde(), p = r0, m = p.inspect, g = r0.types, y = g.isPromise, E = g.isRegExp, A = dde(), v = Dw(), S = c4("RegExp.prototype.test"), _, C;
   function b() {
     var U = Ade();
-    S = U.isDeepEqual, C = U.isDeepStrictEqual;
+    _ = U.isDeepEqual, C = U.isDeepStrictEqual;
   }
   var R = !1, O = dT.exports = Q, L = {};
   function M(U) {
@@ -7636,7 +7636,7 @@ function hi() {
   }, O.deepEqual = function U(B, T, w) {
     if (arguments.length < 2)
       throw new x("actual", "expected");
-    S === void 0 && b(), S(B, T) || M({
+    _ === void 0 && b(), _(B, T) || M({
       actual: B,
       expected: T,
       message: w,
@@ -7646,7 +7646,7 @@ function hi() {
   }, O.notDeepEqual = function U(B, T, w) {
     if (arguments.length < 2)
       throw new x("actual", "expected");
-    S === void 0 && b(), S(B, T) && M({
+    _ === void 0 && b(), _(B, T) && M({
       actual: B,
       expected: T,
       message: w,
@@ -7656,7 +7656,7 @@ function hi() {
   }, O.deepStrictEqual = function U(B, T, w) {
     if (arguments.length < 2)
       throw new x("actual", "expected");
-    S === void 0 && b(), C(B, T) || M({
+    _ === void 0 && b(), C(B, T) || M({
       actual: B,
       expected: T,
       message: w,
@@ -7667,7 +7667,7 @@ function hi() {
   function Y(U, B, T) {
     if (arguments.length < 2)
       throw new x("actual", "expected");
-    S === void 0 && b(), C(U, B) && M({
+    _ === void 0 && b(), C(U, B) && M({
       actual: U,
       expected: B,
       message: T,
@@ -7699,7 +7699,7 @@ function hi() {
   var J = /* @__PURE__ */ n(function U(B, T, w) {
     var $ = this;
     s(this, U), T.forEach(function(q) {
-      q in B && (w !== void 0 && typeof w[q] == "string" && E(B[q]) && _(B[q], w[q]) ? $[q] = w[q] : $[q] = B[q]);
+      q in B && (w !== void 0 && typeof w[q] == "string" && E(B[q]) && S(B[q], w[q]) ? $[q] = w[q] : $[q] = B[q]);
     });
   });
   function ee(U, B, T, w, $, q) {
@@ -7725,7 +7725,7 @@ function hi() {
   function X(U, B, T, w) {
     if (typeof B != "function") {
       if (E(B))
-        return _(B, U);
+        return S(B, U);
       if (arguments.length === 2)
         throw new l("expected", ["Function", "RegExp"], B);
       if (t(U) !== "object" || U === null) {
@@ -7743,8 +7743,8 @@ function hi() {
         q.push("name", "message");
       else if (q.length === 0)
         throw new c("error", B, "may not be an empty object");
-      return S === void 0 && b(), q.forEach(function(I) {
-        typeof U[I] == "string" && E(B[I]) && _(B[I], U[I]) || ee(U, B, I, T, q, w);
+      return _ === void 0 && b(), q.forEach(function(I) {
+        typeof U[I] == "string" && E(B[I]) && S(B[I], U[I]) || ee(U, B, I, T, q, w);
       }), !0;
     }
     return B.prototype !== void 0 && U instanceof B ? !0 : Error.isPrototypeOf(B) ? !1 : B.call({}, U) === !0;
@@ -7879,7 +7879,7 @@ function hi() {
     if (!E(B))
       throw new l("regexp", "RegExp", B);
     var q = $ === "match";
-    if (typeof U != "string" || _(B, U) !== q) {
+    if (typeof U != "string" || S(B, U) !== q) {
       if (T instanceof Error)
         throw T;
       var I = !T;
@@ -8670,12 +8670,12 @@ function Do() {
      * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
      */
     var e = N && N.__decorate || function(m, g, y, E) {
-      var A = arguments.length, v = A < 3 ? g : E === null ? E = Object.getOwnPropertyDescriptor(g, y) : E, _;
+      var A = arguments.length, v = A < 3 ? g : E === null ? E = Object.getOwnPropertyDescriptor(g, y) : E, S;
       if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
         v = Reflect.decorate(m, g, y, E);
       else
-        for (var S = m.length - 1; S >= 0; S--)
-          (_ = m[S]) && (v = (A < 3 ? _(v) : A > 3 ? _(g, y, v) : _(g, y)) || v);
+        for (var _ = m.length - 1; _ >= 0; _--)
+          (S = m[_]) && (v = (A < 3 ? S(v) : A > 3 ? S(g, y, v) : S(g, y)) || v);
       return A > 3 && v && Object.defineProperty(g, y, v), v;
     }, n = N && N.__param || function(m, g) {
       return function(y, E) {
@@ -8709,8 +8709,8 @@ function Do() {
           return E ? f.EMPTY_FULL : f.EMPTY_LOCAL;
         let A;
         y._parent ? A = f.fromRuleContext(g, y._parent, E) : A = E ? f.EMPTY_FULL : f.EMPTY_LOCAL;
-        let _ = g.states[y.invokingState].transition(0);
-        return A.getChild(_.followState.stateNumber);
+        let S = g.states[y.invokingState].transition(0);
+        return A.getChild(S.followState.stateNumber);
       }
       static addEmptyContext(g) {
         return g.addEmptyContext();
@@ -8730,14 +8730,14 @@ function Do() {
           let M = E.join(g.getParent(0), y.getParent(0));
           return M === g.getParent(0) ? g : M === y.getParent(0) ? y : M.getChild(g.getReturnState(0));
         }
-        let _ = 0, S = new Array(A + v), C = new Array(S.length), b = 0, R = 0, O = !0, L = !0;
+        let S = 0, _ = new Array(A + v), C = new Array(_.length), b = 0, R = 0, O = !0, L = !0;
         for (; b < A && R < v; )
-          g.getReturnState(b) === y.getReturnState(R) ? (S[_] = E.join(g.getParent(b), y.getParent(R)), C[_] = g.getReturnState(b), O = O && S[_] === g.getParent(b), L = L && S[_] === y.getParent(R), b++, R++) : g.getReturnState(b) < y.getReturnState(R) ? (S[_] = g.getParent(b), C[_] = g.getReturnState(b), L = !1, b++) : (l(y.getReturnState(R) < g.getReturnState(b)), S[_] = y.getParent(R), C[_] = y.getReturnState(R), O = !1, R++), _++;
+          g.getReturnState(b) === y.getReturnState(R) ? (_[S] = E.join(g.getParent(b), y.getParent(R)), C[S] = g.getReturnState(b), O = O && _[S] === g.getParent(b), L = L && _[S] === y.getParent(R), b++, R++) : g.getReturnState(b) < y.getReturnState(R) ? (_[S] = g.getParent(b), C[S] = g.getReturnState(b), L = !1, b++) : (l(y.getReturnState(R) < g.getReturnState(b)), _[S] = y.getParent(R), C[S] = y.getReturnState(R), O = !1, R++), S++;
         for (; b < A; )
-          S[_] = g.getParent(b), C[_] = g.getReturnState(b), b++, L = !1, _++;
+          _[S] = g.getParent(b), C[S] = g.getReturnState(b), b++, L = !1, S++;
         for (; R < v; )
-          S[_] = y.getParent(R), C[_] = y.getReturnState(R), R++, O = !1, _++;
-        return O ? g : L ? y : (_ < S.length && (S = S.slice(0, _), C = C.slice(0, _)), S.length === 0 ? f.EMPTY_FULL : S.length === 1 ? new p(S[0], C[0]) : new h(S, C));
+          _[S] = y.getParent(R), C[S] = y.getReturnState(R), R++, O = !1, S++;
+        return O ? g : L ? y : (S < _.length && (_ = _.slice(0, S), C = C.slice(0, S)), _.length === 0 ? f.EMPTY_FULL : _.length === 1 ? new p(_[0], C[0]) : new h(_, C));
       }
       static isEmptyLocal(g) {
         return g === f.EMPTY_LOCAL;
@@ -8750,31 +8750,31 @@ function Do() {
           return A;
         if (A = y.get(g), A)
           return E.put(g, A), A;
-        let v = !1, _ = new Array(g.size);
-        for (let C = 0; C < _.length; C++) {
+        let v = !1, S = new Array(g.size);
+        for (let C = 0; C < S.length; C++) {
           let b = f.getCachedContext(g.getParent(C), y, E);
           if (v || b !== g.getParent(C)) {
             if (!v) {
-              _ = new Array(g.size);
+              S = new Array(g.size);
               for (let R = 0; R < g.size; R++)
-                _[R] = g.getParent(R);
+                S[R] = g.getParent(R);
               v = !0;
             }
-            _[C] = b;
+            S[C] = b;
           }
         }
         if (!v)
           return A = y.putIfAbsent(g, g), E.put(g, A ?? g), g;
-        let S;
-        if (_.length === 1)
-          S = new p(_[0], g.getReturnState(0));
+        let _;
+        if (S.length === 1)
+          _ = new p(S[0], g.getReturnState(0));
         else {
           let C = new Array(g.size);
           for (let b = 0; b < g.size; b++)
             C[b] = g.getReturnState(b);
-          S = new h(_, C, g.hashCode());
+          _ = new h(S, C, g.hashCode());
         }
-        return A = y.putIfAbsent(S, S), E.put(S, A || S), E.put(g, A || S), S;
+        return A = y.putIfAbsent(_, _), E.put(_, A || _), E.put(g, A || _), _;
       }
       appendSingleContext(g, y) {
         return this.appendContext(f.EMPTY_FULL.getChild(g), y);
@@ -8789,7 +8789,7 @@ function Do() {
         let A = [];
         e:
           for (let v = 0; ; v++) {
-            let _ = 0, S = !0, C = this, b = y, R = "";
+            let S = 0, _ = !0, C = this, b = y, R = "";
             for (R += "["; !C.isEmpty && C !== E; ) {
               let O = 0;
               if (C.size > 0) {
@@ -8797,9 +8797,9 @@ function Do() {
                 for (; 1 << L >>> 0 < C.size; )
                   L++;
                 let M = (1 << L >>> 0) - 1;
-                if (O = v >> _ & M, S = S && O >= C.size - 1, O >= C.size)
+                if (O = v >> S & M, _ = _ && O >= C.size - 1, O >= C.size)
                   continue e;
-                _ += L;
+                S += L;
               }
               if (g) {
                 R.length > 1 && (R += " ");
@@ -8809,7 +8809,7 @@ function Do() {
                 C.getReturnState(O) !== f.EMPTY_FULL_STATE_KEY && (C.isEmpty || (R.length > 1 && (R += " "), R += C.getReturnState(O)));
               b = C.getReturnState(O), C = C.getParent(O);
             }
-            if (R += "]", A.push(R), S)
+            if (R += "]", A.push(R), _)
               break;
           }
         return A;
@@ -8954,12 +8954,12 @@ function Do() {
           else {
             let v = g.size;
             g.hasEmpty && v--;
-            let _ = new Array(v), S = new Array(v);
+            let S = new Array(v), _ = new Array(v);
             for (let C = 0; C < v; C++)
-              S[C] = g.getReturnState(C);
+              _[C] = g.getReturnState(C);
             for (let C = 0; C < v; C++)
-              _[C] = yc.appendContextImpl(g.getParent(C), y, E);
-            _.length === 1 ? A = new p(_[0], S[0]) : (l(_.length > 1), A = new yc(_, S)), g.hasEmpty && (A = f.join(A, y));
+              S[C] = yc.appendContextImpl(g.getParent(C), y, E);
+            S.length === 1 ? A = new p(S[0], _[0]) : (l(S.length > 1), A = new yc(S, _)), g.hasEmpty && (A = f.join(A, y));
           }
           E.put(g, A);
         }
@@ -8976,25 +8976,25 @@ function Do() {
       equalsImpl(g, y) {
         let E = [], A = [];
         for (E.push(this), A.push(g); ; ) {
-          let v = E.pop(), _ = A.pop();
-          if (!v || !_)
+          let v = E.pop(), S = A.pop();
+          if (!v || !S)
             break;
-          let S = new a.PredictionContextCache.IdentityCommutativePredictionContextOperands(v, _);
-          if (!y.add(S))
+          let _ = new a.PredictionContextCache.IdentityCommutativePredictionContextOperands(v, S);
+          if (!y.add(_))
             continue;
-          let C = S.x.size;
+          let C = _.x.size;
           if (C === 0) {
-            if (!S.x.equals(S.y))
+            if (!_.x.equals(_.y))
               return !1;
             continue;
           }
-          let b = S.y.size;
+          let b = _.y.size;
           if (C !== b)
             return !1;
           for (let R = 0; R < C; R++) {
-            if (S.x.getReturnState(R) !== S.y.getReturnState(R))
+            if (_.x.getReturnState(R) !== _.y.getReturnState(R))
               return !1;
-            let O = S.x.getParent(R), L = S.y.getParent(R);
+            let O = _.x.getParent(R), L = _.y.getParent(R);
             if (O.hashCode() !== L.hashCode())
               return !1;
             O !== L && (E.push(O), A.push(L));
@@ -9252,28 +9252,28 @@ pn.toCharArray = Ide;
     }
   }
   t.SemanticContext = f, function(x) {
-    function m(_) {
-      let S = [];
-      for (let C = 0; C < _.length; C++) {
-        let b = _[C];
-        b instanceof x.PrecedencePredicate && (S.push(b), _.splice(C, 1), C--);
+    function m(S) {
+      let _ = [];
+      for (let C = 0; C < S.length; C++) {
+        let b = S[C];
+        b instanceof x.PrecedencePredicate && (_.push(b), S.splice(C, 1), C--);
       }
-      return S;
+      return _;
     }
     class g extends x {
-      constructor(S = -1, C = -1, b = !1) {
-        super(), this.ruleIndex = S, this.predIndex = C, this.isCtxDependent = b;
+      constructor(_ = -1, C = -1, b = !1) {
+        super(), this.ruleIndex = _, this.predIndex = C, this.isCtxDependent = b;
       }
-      eval(S, C) {
+      eval(_, C) {
         let b = this.isCtxDependent ? C : void 0;
-        return S.sempred(b, this.ruleIndex, this.predIndex);
+        return _.sempred(b, this.ruleIndex, this.predIndex);
       }
       hashCode() {
-        let S = s.MurmurHash.initialize();
-        return S = s.MurmurHash.update(S, this.ruleIndex), S = s.MurmurHash.update(S, this.predIndex), S = s.MurmurHash.update(S, this.isCtxDependent ? 1 : 0), S = s.MurmurHash.finish(S, 3), S;
+        let _ = s.MurmurHash.initialize();
+        return _ = s.MurmurHash.update(_, this.ruleIndex), _ = s.MurmurHash.update(_, this.predIndex), _ = s.MurmurHash.update(_, this.isCtxDependent ? 1 : 0), _ = s.MurmurHash.finish(_, 3), _;
       }
-      equals(S) {
-        return S instanceof g ? this === S ? !0 : this.ruleIndex === S.ruleIndex && this.predIndex === S.predIndex && this.isCtxDependent === S.isCtxDependent : !1;
+      equals(_) {
+        return _ instanceof g ? this === _ ? !0 : this.ruleIndex === _.ruleIndex && this.predIndex === _.predIndex && this.isCtxDependent === _.isCtxDependent : !1;
       }
       toString() {
         return "{" + this.ruleIndex + ":" + this.predIndex + "}?";
@@ -9289,25 +9289,25 @@ pn.toCharArray = Ide;
       o.Override
     ], g.prototype, "toString", null), x.Predicate = g;
     class y extends x {
-      constructor(S) {
-        super(), this.precedence = S;
+      constructor(_) {
+        super(), this.precedence = _;
       }
-      eval(S, C) {
-        return S.precpred(C, this.precedence);
+      eval(_, C) {
+        return _.precpred(C, this.precedence);
       }
-      evalPrecedence(S, C) {
-        if (S.precpred(C, this.precedence))
+      evalPrecedence(_, C) {
+        if (_.precpred(C, this.precedence))
           return x.NONE;
       }
-      compareTo(S) {
-        return this.precedence - S.precedence;
+      compareTo(_) {
+        return this.precedence - _.precedence;
       }
       hashCode() {
-        let S = 1;
-        return S = 31 * S + this.precedence, S;
+        let _ = 1;
+        return _ = 31 * _ + this.precedence, _;
       }
-      equals(S) {
-        return S instanceof y ? this === S ? !0 : this.precedence === S.precedence : !1;
+      equals(_) {
+        return _ instanceof y ? this === _ ? !0 : this.precedence === _.precedence : !1;
       }
       toString() {
         return "{" + this.precedence + ">=prec}?";
@@ -9330,18 +9330,18 @@ pn.toCharArray = Ide;
     }
     x.Operator = E;
     let A = class LE extends E {
-      constructor(S, C) {
+      constructor(_, C) {
         super();
         let b = new r.Array2DHashSet(u.ObjectEqualityComparator.INSTANCE);
-        S instanceof LE ? b.addAll(S.opnds) : b.add(S), C instanceof LE ? b.addAll(C.opnds) : b.add(C), this.opnds = b.toArray();
+        _ instanceof LE ? b.addAll(_.opnds) : b.add(_), C instanceof LE ? b.addAll(C.opnds) : b.add(C), this.opnds = b.toArray();
         let R = m(this.opnds), O = c(R);
         O && this.opnds.push(O);
       }
       get operands() {
         return this.opnds;
       }
-      equals(S) {
-        return this === S ? !0 : S instanceof LE ? i.ArrayEqualityComparator.INSTANCE.equals(this.opnds, S.opnds) : !1;
+      equals(_) {
+        return this === _ ? !0 : _ instanceof LE ? i.ArrayEqualityComparator.INSTANCE.equals(this.opnds, _.opnds) : !1;
       }
       hashCode() {
         return s.MurmurHash.hashCode(this.opnds, 40363613);
@@ -9352,16 +9352,16 @@ pn.toCharArray = Ide;
        * The evaluation of predicates by this context is short-circuiting, but
        * unordered.
        */
-      eval(S, C) {
+      eval(_, C) {
         for (let b of this.opnds)
-          if (!b.eval(S, C))
+          if (!b.eval(_, C))
             return !1;
         return !0;
       }
-      evalPrecedence(S, C) {
+      evalPrecedence(_, C) {
         let b = !1, R = [];
         for (let L of this.opnds) {
-          let M = L.evalPrecedence(S, C);
+          let M = L.evalPrecedence(_, C);
           if (b = b || M !== L, M == null)
             return;
           M !== x.NONE && R.push(M);
@@ -9396,18 +9396,18 @@ pn.toCharArray = Ide;
       n(1, o.NotNull)
     ], A), x.AND = A;
     let v = class IE extends E {
-      constructor(S, C) {
+      constructor(_, C) {
         super();
         let b = new r.Array2DHashSet(u.ObjectEqualityComparator.INSTANCE);
-        S instanceof IE ? b.addAll(S.opnds) : b.add(S), C instanceof IE ? b.addAll(C.opnds) : b.add(C), this.opnds = b.toArray();
+        _ instanceof IE ? b.addAll(_.opnds) : b.add(_), C instanceof IE ? b.addAll(C.opnds) : b.add(C), this.opnds = b.toArray();
         let R = m(this.opnds), O = l(R);
         O && this.opnds.push(O);
       }
       get operands() {
         return this.opnds;
       }
-      equals(S) {
-        return this === S ? !0 : S instanceof IE ? i.ArrayEqualityComparator.INSTANCE.equals(this.opnds, S.opnds) : !1;
+      equals(_) {
+        return this === _ ? !0 : _ instanceof IE ? i.ArrayEqualityComparator.INSTANCE.equals(this.opnds, _.opnds) : !1;
       }
       hashCode() {
         return s.MurmurHash.hashCode(this.opnds, 486279973);
@@ -9418,16 +9418,16 @@ pn.toCharArray = Ide;
        * The evaluation of predicates by this context is short-circuiting, but
        * unordered.
        */
-      eval(S, C) {
+      eval(_, C) {
         for (let b of this.opnds)
-          if (b.eval(S, C))
+          if (b.eval(_, C))
             return !0;
         return !1;
       }
-      evalPrecedence(S, C) {
+      evalPrecedence(_, C) {
         let b = !1, R = [];
         for (let L of this.opnds) {
-          let M = L.evalPrecedence(S, C);
+          let M = L.evalPrecedence(_, C);
           if (b = b || M !== L, M === x.NONE)
             return x.NONE;
           M && R.push(M);
@@ -10213,13 +10213,13 @@ function am() {
    * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
    */
   var t = N && N.__decorate || function(y, E, A, v) {
-    var _ = arguments.length, S = _ < 3 ? E : v === null ? v = Object.getOwnPropertyDescriptor(E, A) : v, C;
+    var S = arguments.length, _ = S < 3 ? E : v === null ? v = Object.getOwnPropertyDescriptor(E, A) : v, C;
     if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
-      S = Reflect.decorate(y, E, A, v);
+      _ = Reflect.decorate(y, E, A, v);
     else
       for (var b = y.length - 1; b >= 0; b--)
-        (C = y[b]) && (S = (_ < 3 ? C(S) : _ > 3 ? C(E, A, S) : C(E, A)) || S);
-    return _ > 3 && S && Object.defineProperty(E, A, S), S;
+        (C = y[b]) && (_ = (S < 3 ? C(_) : S > 3 ? C(E, A, _) : C(E, A)) || _);
+    return S > 3 && _ && Object.defineProperty(E, A, _), _;
   };
   Object.defineProperty(M2, "__esModule", { value: !0 }), M2.ATNConfigSet = void 0;
   const e = Za, n = Oo, r = Hf, i = Fo(), s = Qf, o = wo, u = Ae, a = ys, l = Do(), c = ww(), f = Gf, x = hi(), h = pn;
@@ -10287,11 +10287,11 @@ function am() {
       if (!(E instanceof s.ATNConfig))
         return !1;
       if (this.mergedConfigs && this.unmerged) {
-        let A = E, v = this.getKey(A), _ = this.mergedConfigs.get(v);
-        if (_ != null && this.canMerge(A, v, _))
-          return _.contains(A);
-        for (let S of this.unmerged)
-          if (S.contains(E))
+        let A = E, v = this.getKey(A), S = this.mergedConfigs.get(v);
+        if (S != null && this.canMerge(A, v, S))
+          return S.contains(A);
+        for (let _ of this.unmerged)
+          if (_.contains(E))
             return !0;
       } else
         for (let A of this.configs)
@@ -10309,21 +10309,21 @@ function am() {
       if (this.ensureWritable(), !this.mergedConfigs || !this.unmerged)
         throw new Error("Covered by ensureWritable but duplicated here for strict null check limitation");
       x(!this.outermostConfigSet || !E.reachesIntoOuterContext), A == null && (A = c.PredictionContextCache.UNCACHED);
-      let v, _ = this.getKey(E), S = this.mergedConfigs.get(_);
-      if (v = S == null, S != null && this.canMerge(E, _, S)) {
-        S.outerContextDepth = Math.max(S.outerContextDepth, E.outerContextDepth), E.isPrecedenceFilterSuppressed && (S.isPrecedenceFilterSuppressed = !0);
-        let C = l.PredictionContext.join(S.context, E.context, A);
-        return this.updatePropertiesForMergedConfig(E), S.context === C ? !1 : (S.context = C, !0);
+      let v, S = this.getKey(E), _ = this.mergedConfigs.get(S);
+      if (v = _ == null, _ != null && this.canMerge(E, S, _)) {
+        _.outerContextDepth = Math.max(_.outerContextDepth, E.outerContextDepth), E.isPrecedenceFilterSuppressed && (_.isPrecedenceFilterSuppressed = !0);
+        let C = l.PredictionContext.join(_.context, E.context, A);
+        return this.updatePropertiesForMergedConfig(E), _.context === C ? !1 : (_.context = C, !0);
       }
       for (let C = 0; C < this.unmerged.length; C++) {
         let b = this.unmerged[C];
-        if (this.canMerge(E, _, b)) {
+        if (this.canMerge(E, S, b)) {
           b.outerContextDepth = Math.max(b.outerContextDepth, E.outerContextDepth), E.isPrecedenceFilterSuppressed && (b.isPrecedenceFilterSuppressed = !0);
           let R = l.PredictionContext.join(b.context, E.context, A);
-          return this.updatePropertiesForMergedConfig(E), b.context === R ? !1 : (b.context = R, v && (this.mergedConfigs.put(_, b), this.unmerged.splice(C, 1)), !0);
+          return this.updatePropertiesForMergedConfig(E), b.context === R ? !1 : (b.context = R, v && (this.mergedConfigs.put(S, b), this.unmerged.splice(C, 1)), !0);
         }
       }
-      return this.configs.push(E), v ? this.mergedConfigs.put(_, E) : this.unmerged.push(E), this.updatePropertiesForAddedConfig(E), !0;
+      return this.configs.push(E), v ? this.mergedConfigs.put(S, E) : this.unmerged.push(E), this.updatePropertiesForAddedConfig(E), !0;
     }
     updatePropertiesForMergedConfig(E) {
       this._dipsIntoOuterContext = this._dipsIntoOuterContext || E.reachesIntoOuterContext, x(!this.outermostConfigSet || !this._dipsIntoOuterContext);
@@ -10346,8 +10346,8 @@ function am() {
     addAll(E, A) {
       this.ensureWritable();
       let v = !1;
-      for (let _ of E)
-        this.add(_, A) && (v = !0);
+      for (let S of E)
+        this.add(S, A) && (v = !0);
       return v;
     }
     clear() {
@@ -10367,9 +10367,9 @@ function am() {
     toString(E) {
       E == null && (E = !1);
       let A = "", v = this.configs.slice(0);
-      v.sort((_, S) => _.alt !== S.alt ? _.alt - S.alt : _.state.stateNumber !== S.state.stateNumber ? _.state.stateNumber - S.state.stateNumber : _.semanticContext.toString().localeCompare(S.semanticContext.toString())), A += "[";
-      for (let _ = 0; _ < v.length; _++)
-        _ > 0 && (A += ", "), A += v[_].toString(void 0, !0, E);
+      v.sort((S, _) => S.alt !== _.alt ? S.alt - _.alt : S.state.stateNumber !== _.state.stateNumber ? S.state.stateNumber - _.state.stateNumber : S.semanticContext.toString().localeCompare(_.semanticContext.toString())), A += "[";
+      for (let S = 0; S < v.length; S++)
+        S > 0 && (A += ", "), A += v[S].toString(void 0, !0, E);
       return A += "]", this._hasSemanticContext && (A += ",hasSemanticContext=" + this._hasSemanticContext), this._uniqueAlt !== i.ATN.INVALID_ALT_NUMBER && (A += ",uniqueAlt=" + this._uniqueAlt), this._conflictInfo != null && (A += ",conflictingAlts=" + this._conflictInfo.conflictedAlts, this._conflictInfo.isExact || (A += "*")), this._dipsIntoOuterContext && (A += ",dipsIntoOuterContext"), A.toString();
     }
     get uniqueAlt() {
@@ -12199,66 +12199,66 @@ function xm() {
      * Copyright 2016 The ANTLR Project. All rights reserved.
      * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
      */
-    var e = N && N.__decorate || function(_, S, C, b) {
-      var R = arguments.length, O = R < 3 ? S : b === null ? b = Object.getOwnPropertyDescriptor(S, C) : b, L;
+    var e = N && N.__decorate || function(S, _, C, b) {
+      var R = arguments.length, O = R < 3 ? _ : b === null ? b = Object.getOwnPropertyDescriptor(_, C) : b, L;
       if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
-        O = Reflect.decorate(_, S, C, b);
+        O = Reflect.decorate(S, _, C, b);
       else
-        for (var M = _.length - 1; M >= 0; M--)
-          (L = _[M]) && (O = (R < 3 ? L(O) : R > 3 ? L(S, C, O) : L(S, C)) || O);
-      return R > 3 && O && Object.defineProperty(S, C, O), O;
-    }, n = N && N.__param || function(_, S) {
+        for (var M = S.length - 1; M >= 0; M--)
+          (L = S[M]) && (O = (R < 3 ? L(O) : R > 3 ? L(_, C, O) : L(_, C)) || O);
+      return R > 3 && O && Object.defineProperty(_, C, O), O;
+    }, n = N && N.__param || function(S, _) {
       return function(C, b) {
-        S(C, b, _);
+        _(C, b, S);
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.LexerATNSimulator = void 0;
     const r = fm, i = Fo(), s = Qf, o = am(), u = g4(), a = p4(), l = lr, c = Ja, f = el(), x = v4, h = Xf, p = Ae, m = fhe(), g = Do(), y = I0, E = Gt, A = hi();
     let v = class Yi extends u.ATNSimulator {
-      constructor(S, C) {
-        super(S), this.optimize_tail_calls = !0, this.startIndex = -1, this._line = 1, this._charPositionInLine = 0, this.mode = f.Lexer.DEFAULT_MODE, this.prevAccept = new Yi.SimState(), this.recog = C;
+      constructor(_, C) {
+        super(_), this.optimize_tail_calls = !0, this.startIndex = -1, this._line = 1, this._charPositionInLine = 0, this.mode = f.Lexer.DEFAULT_MODE, this.prevAccept = new Yi.SimState(), this.recog = C;
       }
-      copyState(S) {
-        this._charPositionInLine = S.charPositionInLine, this._line = S._line, this.mode = S.mode, this.startIndex = S.startIndex;
+      copyState(_) {
+        this._charPositionInLine = _.charPositionInLine, this._line = _._line, this.mode = _.mode, this.startIndex = _.startIndex;
       }
-      match(S, C) {
+      match(_, C) {
         this.mode = C;
-        let b = S.mark();
+        let b = _.mark();
         try {
-          this.startIndex = S.index, this.prevAccept.reset();
+          this.startIndex = _.index, this.prevAccept.reset();
           let R = this.atn.modeToDFA[C].s0;
-          return R == null ? this.matchATN(S) : this.execATN(S, R);
+          return R == null ? this.matchATN(_) : this.execATN(_, R);
         } finally {
-          S.release(b);
+          _.release(b);
         }
       }
       reset() {
         this.prevAccept.reset(), this.startIndex = -1, this._line = 1, this._charPositionInLine = 0, this.mode = f.Lexer.DEFAULT_MODE;
       }
-      matchATN(S) {
+      matchATN(_) {
         let C = this.atn.modeToStartState[this.mode];
         Yi.debug && console.log(`matchATN mode ${this.mode} start: ${C}`);
-        let b = this.mode, R = this.computeStartState(S, C), O = R.hasSemanticContext;
+        let b = this.mode, R = this.computeStartState(_, C), O = R.hasSemanticContext;
         O && (R.hasSemanticContext = !1);
         let L = this.addDFAState(R);
         if (!O) {
           let H = this.atn.modeToDFA[this.mode];
           H.s0 ? L = H.s0 : H.s0 = L;
         }
-        let M = this.execATN(S, L);
+        let M = this.execATN(_, L);
         return Yi.debug && console.log(`DFA after matchATN: ${this.atn.modeToDFA[b].toLexerString()}`), M;
       }
-      execATN(S, C) {
-        Yi.debug && console.log(`start state closure=${C.configs}`), C.isAcceptState && this.captureSimState(this.prevAccept, S, C);
-        let b = S.LA(1), R = C;
+      execATN(_, C) {
+        Yi.debug && console.log(`start state closure=${C.configs}`), C.isAcceptState && this.captureSimState(this.prevAccept, _, C);
+        let b = _.LA(1), R = C;
         for (; ; ) {
           Yi.debug && console.log(`execATN loop starting closure: ${R.configs}`);
           let O = this.getExistingTargetState(R, b);
-          if (O == null && (O = this.computeTargetState(S, R, b)), O === u.ATNSimulator.ERROR || (b !== c.IntStream.EOF && this.consume(S), O.isAcceptState && (this.captureSimState(this.prevAccept, S, O), b === c.IntStream.EOF)))
+          if (O == null && (O = this.computeTargetState(_, R, b)), O === u.ATNSimulator.ERROR || (b !== c.IntStream.EOF && this.consume(_), O.isAcceptState && (this.captureSimState(this.prevAccept, _, O), b === c.IntStream.EOF)))
             break;
-          b = S.LA(1), R = O;
+          b = _.LA(1), R = O;
         }
-        return this.failOrAccept(this.prevAccept, S, R.configs, b);
+        return this.failOrAccept(this.prevAccept, _, R.configs, b);
       }
       /**
        * Get an existing target state for an edge in the DFA. If the target state
@@ -12271,9 +12271,9 @@ function xm() {
        * `t`, or `undefined` if the target state for this edge is not
        * already cached
        */
-      getExistingTargetState(S, C) {
-        let b = S.getTarget(C);
-        return Yi.debug && b != null && console.log("reuse state " + S.stateNumber + " edge to " + b.stateNumber), b;
+      getExistingTargetState(_, C) {
+        let b = _.getTarget(C);
+        return Yi.debug && b != null && console.log("reuse state " + _.stateNumber + " edge to " + b.stateNumber), b;
       }
       /**
        * Compute a target state for an edge in the DFA, and attempt to add the
@@ -12287,14 +12287,14 @@ function xm() {
        * `t`. If `t` does not lead to a valid DFA state, this method
        * returns {@link #ERROR}.
        */
-      computeTargetState(S, C, b) {
+      computeTargetState(_, C, b) {
         let R = new m.OrderedATNConfigSet();
-        return this.getReachableConfigSet(S, C.configs, R, b), R.isEmpty ? (R.hasSemanticContext || this.addDFAEdge(C, b, u.ATNSimulator.ERROR), u.ATNSimulator.ERROR) : this.addDFAEdge(C, b, R);
+        return this.getReachableConfigSet(_, C.configs, R, b), R.isEmpty ? (R.hasSemanticContext || this.addDFAEdge(C, b, u.ATNSimulator.ERROR), u.ATNSimulator.ERROR) : this.addDFAEdge(C, b, R);
       }
-      failOrAccept(S, C, b, R) {
-        if (S.dfaState != null) {
-          let O = S.dfaState.lexerActionExecutor;
-          return this.accept(C, O, this.startIndex, S.index, S.line, S.charPos), S.dfaState.prediction;
+      failOrAccept(_, C, b, R) {
+        if (_.dfaState != null) {
+          let O = _.dfaState.lexerActionExecutor;
+          return this.accept(C, O, this.startIndex, _.index, _.line, _.charPos), _.dfaState.prediction;
         } else {
           if (R === c.IntStream.EOF && C.index === this.startIndex)
             return E.Token.EOF;
@@ -12305,7 +12305,7 @@ function xm() {
        *  we can reach upon input `t`. Parameter `reach` is a return
        *  parameter.
        */
-      getReachableConfigSet(S, C, b, R) {
+      getReachableConfigSet(_, C, b, R) {
         let O = i.ATN.INVALID_ALT_NUMBER;
         for (let L of C) {
           let M = L.alt === O;
@@ -12317,9 +12317,9 @@ function xm() {
             let Q = L.state.getOptimizedTransition(G), Y = this.getReachableTarget(Q, R);
             if (Y != null) {
               let J = L.lexerActionExecutor, ee;
-              J != null ? (J = J.fixOffsetBeforeMatch(S.index - this.startIndex), ee = L.transform(Y, !0, J)) : (A(L.lexerActionExecutor == null), ee = L.transform(Y, !0));
+              J != null ? (J = J.fixOffsetBeforeMatch(_.index - this.startIndex), ee = L.transform(Y, !0, J)) : (A(L.lexerActionExecutor == null), ee = L.transform(Y, !0));
               let X = R === c.IntStream.EOF;
-              if (this.closure(S, ee, b, M, !0, X)) {
+              if (this.closure(_, ee, b, M, !0, X)) {
                 O = L.alt;
                 break;
               }
@@ -12327,18 +12327,18 @@ function xm() {
           }
         }
       }
-      accept(S, C, b, R, O, L) {
-        Yi.debug && console.log(`ACTION ${C}`), S.seek(R), this._line = O, this._charPositionInLine = L, C != null && this.recog != null && C.execute(this.recog, S, b);
+      accept(_, C, b, R, O, L) {
+        Yi.debug && console.log(`ACTION ${C}`), _.seek(R), this._line = O, this._charPositionInLine = L, C != null && this.recog != null && C.execute(this.recog, _, b);
       }
-      getReachableTarget(S, C) {
-        if (S.matches(C, f.Lexer.MIN_CHAR_VALUE, f.Lexer.MAX_CHAR_VALUE))
-          return S.target;
+      getReachableTarget(_, C) {
+        if (_.matches(C, f.Lexer.MIN_CHAR_VALUE, f.Lexer.MAX_CHAR_VALUE))
+          return _.target;
       }
-      computeStartState(S, C) {
+      computeStartState(_, C) {
         let b = g.PredictionContext.EMPTY_FULL, R = new m.OrderedATNConfigSet();
         for (let O = 0; O < C.numberOfTransitions; O++) {
           let L = C.transition(O).target, M = s.ATNConfig.create(L, O + 1, b);
-          this.closure(S, M, R, !1, !1, !1);
+          this.closure(_, M, R, !1, !1, !1);
         }
         return R;
       }
@@ -12352,7 +12352,7 @@ function xm() {
        * @returns `true` if an accept state is reached, otherwise
        * `false`.
        */
-      closure(S, C, b, R, O, L) {
+      closure(_, C, b, R, O, L) {
         if (Yi.debug && console.log("closure(" + C.toString(this.recog, !0) + ")"), C.state instanceof y.RuleStopState) {
           Yi.debug && (this.recog != null ? console.log(`closure at ${this.recog.ruleNames[C.state.ruleIndex]} rule stop ${C}`) : console.log(`closure at rule stop ${C}`));
           let H = C.context;
@@ -12364,20 +12364,20 @@ function xm() {
             if (Q === g.PredictionContext.EMPTY_FULL_STATE_KEY)
               continue;
             let Y = H.getParent(G), J = this.atn.states[Q], ee = C.transform(J, !1, Y);
-            R = this.closure(S, ee, b, R, O, L);
+            R = this.closure(_, ee, b, R, O, L);
           }
           return R;
         }
         C.state.onlyHasEpsilonTransitions || (!R || !C.hasPassedThroughNonGreedyDecision) && b.add(C);
         let M = C.state;
         for (let H = 0; H < M.numberOfOptimizedTransitions; H++) {
-          let G = M.getOptimizedTransition(H), Q = this.getEpsilonTarget(S, C, G, b, O, L);
-          Q != null && (R = this.closure(S, Q, b, R, O, L));
+          let G = M.getOptimizedTransition(H), Q = this.getEpsilonTarget(_, C, G, b, O, L);
+          Q != null && (R = this.closure(_, Q, b, R, O, L));
         }
         return R;
       }
       // side-effect: can alter configs.hasSemanticContext
-      getEpsilonTarget(S, C, b, R, O, L) {
+      getEpsilonTarget(_, C, b, R, O, L) {
         let M;
         switch (b.serializationType) {
           case 3:
@@ -12393,7 +12393,7 @@ function xm() {
             throw new Error("Precedence predicates are not supported in lexers.");
           case 4:
             let G = b;
-            Yi.debug && console.log("EVAL rule " + G.ruleIndex + ":" + G.predIndex), R.hasSemanticContext = !0, this.evaluatePredicate(S, G.ruleIndex, G.predIndex, O) ? M = C.transform(b.target, !0) : M = void 0;
+            Yi.debug && console.log("EVAL rule " + G.ruleIndex + ":" + G.predIndex), R.hasSemanticContext = !0, this.evaluatePredicate(_, G.ruleIndex, G.predIndex, O) ? M = C.transform(b.target, !0) : M = void 0;
             break;
           case 6:
             if (C.context.hasEmpty) {
@@ -12443,43 +12443,43 @@ function xm() {
        * @returns `true` if the specified predicate evaluates to
        * `true`.
        */
-      evaluatePredicate(S, C, b, R) {
+      evaluatePredicate(_, C, b, R) {
         if (this.recog == null)
           return !0;
         if (!R)
           return this.recog.sempred(void 0, C, b);
-        let O = this._charPositionInLine, L = this._line, M = S.index, H = S.mark();
+        let O = this._charPositionInLine, L = this._line, M = _.index, H = _.mark();
         try {
-          return this.consume(S), this.recog.sempred(void 0, C, b);
+          return this.consume(_), this.recog.sempred(void 0, C, b);
         } finally {
-          this._charPositionInLine = O, this._line = L, S.seek(M), S.release(H);
+          this._charPositionInLine = O, this._line = L, _.seek(M), _.release(H);
         }
       }
-      captureSimState(S, C, b) {
-        S.index = C.index, S.line = this._line, S.charPos = this._charPositionInLine, S.dfaState = b;
+      captureSimState(_, C, b) {
+        _.index = C.index, _.line = this._line, _.charPos = this._charPositionInLine, _.dfaState = b;
       }
-      addDFAEdge(S, C, b) {
+      addDFAEdge(_, C, b) {
         if (b instanceof o.ATNConfigSet) {
           let R = b.hasSemanticContext;
           R && (b.hasSemanticContext = !1);
           let O = this.addDFAState(b);
-          return R || this.addDFAEdge(S, C, O), O;
+          return R || this.addDFAEdge(_, C, O), O;
         } else
-          Yi.debug && console.log("EDGE " + S + " -> " + b + " upon " + String.fromCharCode(C)), S != null && S.setTarget(C, b);
+          Yi.debug && console.log("EDGE " + _ + " -> " + b + " upon " + String.fromCharCode(C)), _ != null && _.setTarget(C, b);
       }
       /** Add a new DFA state if there isn't one with this set of
        * 	configurations already. This method also detects the first
        * 	configuration containing an ATN rule stop state. Later, when
        * 	traversing the DFA, we will know which rule to accept.
        */
-      addDFAState(S) {
-        A(!S.hasSemanticContext);
-        let C = new a.DFAState(S), b = this.atn.modeToDFA[this.mode].states.get(C);
+      addDFAState(_) {
+        A(!_.hasSemanticContext);
+        let C = new a.DFAState(_), b = this.atn.modeToDFA[this.mode].states.get(C);
         if (b != null)
           return b;
-        S.optimizeConfigs(this);
-        let R = new a.DFAState(S.clone(!0)), O;
-        for (let L of S)
+        _.optimizeConfigs(this);
+        let R = new a.DFAState(_.clone(!0)), O;
+        for (let L of _)
           if (L.state instanceof y.RuleStopState) {
             O = L;
             break;
@@ -12490,31 +12490,31 @@ function xm() {
         }
         return this.atn.modeToDFA[this.mode].addState(R);
       }
-      getDFA(S) {
-        return this.atn.modeToDFA[S];
+      getDFA(_) {
+        return this.atn.modeToDFA[_];
       }
       /** Get the text matched so far for the current token.
        */
-      getText(S) {
-        return S.getText(l.Interval.of(this.startIndex, S.index - 1));
+      getText(_) {
+        return _.getText(l.Interval.of(this.startIndex, _.index - 1));
       }
       get line() {
         return this._line;
       }
-      set line(S) {
-        this._line = S;
+      set line(_) {
+        this._line = _;
       }
       get charPositionInLine() {
         return this._charPositionInLine;
       }
-      set charPositionInLine(S) {
-        this._charPositionInLine = S;
+      set charPositionInLine(_) {
+        this._charPositionInLine = _;
       }
-      consume(S) {
-        S.LA(1) === 10 ? (this._line++, this._charPositionInLine = 0) : this._charPositionInLine++, S.consume();
+      consume(_) {
+        _.LA(1) === 10 ? (this._line++, this._charPositionInLine = 0) : this._charPositionInLine++, _.consume();
       }
-      getTokenName(S) {
-        return S === -1 ? "EOF" : "'" + String.fromCharCode(S) + "'";
+      getTokenName(_) {
+        return _ === -1 ? "EOF" : "'" + String.fromCharCode(_) + "'";
       }
     };
     e([
@@ -12575,9 +12575,9 @@ function xm() {
       p.NotNull
     ], v.prototype, "getTokenName", null), v = e([
       n(0, p.NotNull)
-    ], v), t.LexerATNSimulator = v, function(_) {
-      _.debug = !1, _.dfa_debug = !1;
-      class S {
+    ], v), t.LexerATNSimulator = v, function(S) {
+      S.debug = !1, S.dfa_debug = !1;
+      class _ {
         constructor() {
           this.index = -1, this.line = 0, this.charPos = -1;
         }
@@ -12585,7 +12585,7 @@ function xm() {
           this.index = -1, this.line = 0, this.charPos = -1, this.dfaState = void 0;
         }
       }
-      _.SimState = S;
+      S.SimState = _;
     }(v = t.LexerATNSimulator || (t.LexerATNSimulator = {})), t.LexerATNSimulator = v;
   }(QT)), QT;
 }
@@ -13521,13 +13521,13 @@ function Ohe() {
    * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
    */
   var t = N && N.__decorate || function(g, y, E, A) {
-    var v = arguments.length, _ = v < 3 ? y : A === null ? A = Object.getOwnPropertyDescriptor(y, E) : A, S;
+    var v = arguments.length, S = v < 3 ? y : A === null ? A = Object.getOwnPropertyDescriptor(y, E) : A, _;
     if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
-      _ = Reflect.decorate(g, y, E, A);
+      S = Reflect.decorate(g, y, E, A);
     else
       for (var C = g.length - 1; C >= 0; C--)
-        (S = g[C]) && (_ = (v < 3 ? S(_) : v > 3 ? S(y, E, _) : S(y, E)) || _);
-    return v > 3 && _ && Object.defineProperty(y, E, _), _;
+        (_ = g[C]) && (S = (v < 3 ? _(S) : v > 3 ? _(y, E, S) : _(y, E)) || S);
+    return v > 3 && S && Object.defineProperty(y, E, S), S;
   }, e = N && N.__param || function(g, y) {
     return function(E, A) {
       y(E, A, g);
@@ -13556,8 +13556,8 @@ function Ohe() {
       for (let A = 0; A < y.numberOfTransitions; A++) {
         let v = new o.IntervalSet();
         E[A] = v;
-        let _ = new r.Array2DHashSet(l.ObjectEqualityComparator.INSTANCE);
-        this._LOOK(y.transition(A).target, void 0, c.PredictionContext.EMPTY_LOCAL, v, _, new s.BitSet(), !1, !1), (v.size === 0 || v.contains(gO.HIT_PRED)) && (v = void 0, E[A] = v);
+        let S = new r.Array2DHashSet(l.ObjectEqualityComparator.INSTANCE);
+        this._LOOK(y.transition(A).target, void 0, c.PredictionContext.EMPTY_LOCAL, v, S, new s.BitSet(), !1, !1), (v.size === 0 || v.contains(gO.HIT_PRED)) && (v = void 0, E[A] = v);
       }
       return E;
     }
@@ -13602,9 +13602,9 @@ function Ohe() {
      * outermost context is reached. This parameter has no effect if `ctx`
      * is {@link PredictionContext#EMPTY_LOCAL}.
      */
-    _LOOK(y, E, A, v, _, S, C, b) {
+    _LOOK(y, E, A, v, S, _, C, b) {
       let R = i.ATNConfig.create(y, 0, A);
-      if (!_.add(R))
+      if (!S.add(R))
         return;
       if (y === E) {
         if (c.PredictionContext.isEmptyLocal(A)) {
@@ -13620,35 +13620,35 @@ function Ohe() {
           b && v.add(h.Token.EOF);
           return;
         }
-        let L = S.get(y.ruleIndex);
+        let L = _.get(y.ruleIndex);
         try {
-          S.clear(y.ruleIndex);
+          _.clear(y.ruleIndex);
           for (let M = 0; M < A.size; M++) {
             if (A.getReturnState(M) === c.PredictionContext.EMPTY_FULL_STATE_KEY)
               continue;
             let H = this.atn.states[A.getReturnState(M)];
-            this._LOOK(H, E, A.getParent(M), v, _, S, C, b);
+            this._LOOK(H, E, A.getParent(M), v, S, _, C, b);
           }
         } finally {
-          L && S.set(y.ruleIndex);
+          L && _.set(y.ruleIndex);
         }
       }
       let O = y.numberOfTransitions;
       for (let L = 0; L < O; L++) {
         let M = y.transition(L);
         if (M instanceof x.RuleTransition) {
-          if (S.get(M.ruleIndex))
+          if (_.get(M.ruleIndex))
             continue;
           let H = A.getChild(M.followState.stateNumber);
           try {
-            S.set(M.ruleIndex), this._LOOK(M.target, E, H, v, _, S, C, b);
+            _.set(M.ruleIndex), this._LOOK(M.target, E, H, v, S, _, C, b);
           } finally {
-            S.clear(M.ruleIndex);
+            _.clear(M.ruleIndex);
           }
         } else if (M instanceof n.AbstractPredicateTransition)
-          C ? this._LOOK(M.target, E, A, v, _, S, C, b) : v.add(gO.HIT_PRED);
+          C ? this._LOOK(M.target, E, A, v, S, _, C, b) : v.add(gO.HIT_PRED);
         else if (M.isEpsilon)
-          this._LOOK(M.target, E, A, v, _, S, C, b);
+          this._LOOK(M.target, E, A, v, S, _, C, b);
         else if (M instanceof p.WildcardTransition)
           v.addAll(o.IntervalSet.of(h.Token.MIN_USER_TOKEN_TYPE, this.atn.maxTokenType));
         else {
@@ -13686,8 +13686,8 @@ function Fo() {
       if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
         A = Reflect.decorate(p, m, g, y);
       else
-        for (var _ = p.length - 1; _ >= 0; _--)
-          (v = p[_]) && (A = (E < 3 ? v(A) : E > 3 ? v(m, g, A) : v(m, g)) || A);
+        for (var S = p.length - 1; S >= 0; S--)
+          (v = p[S]) && (A = (E < 3 ? v(A) : E > 3 ? v(m, g, A) : v(m, g)) || A);
       return E > 3 && A && Object.defineProperty(m, g, A), A;
     }, n = N && N.__param || function(p, m) {
       return function(g, y) {
@@ -13786,8 +13786,8 @@ function Fo() {
           return A;
         let v = new s.IntervalSet();
         for (v.addAll(A), v.remove(f.Token.EPSILON); y != null && y.invokingState >= 0 && A.contains(f.Token.EPSILON); ) {
-          let S = this.states[y.invokingState].transition(0);
-          A = this.nextTokens(S.followState), v.addAll(A), v.remove(f.Token.EPSILON), y = y._parent;
+          let _ = this.states[y.invokingState].transition(0);
+          A = this.nextTokens(_.followState), v.addAll(A), v.remove(f.Token.EPSILON), y = y._parent;
         }
         return A.contains(f.Token.EPSILON) && v.add(f.Token.EOF), v;
       }
@@ -15395,7 +15395,7 @@ function $h() {
     };
   };
   Object.defineProperty(K2, "__esModule", { value: !0 }), K2.ParserATNSimulator = void 0;
-  const n = fm, r = ym, i = Oo, s = h4, o = Fo(), u = Qf, a = am(), l = g4(), c = cr, f = vm, x = wo, h = F4, p = Mu, m = p4(), g = Dh, y = lr, E = Ja, A = Ae, v = $w(), _ = Rm(), S = ys, C = Xs(), b = Do(), R = ww(), O = IG, L = I0, M = Nh, H = Gf, G = Bw(), Q = BG(), Y = Gt, J = Es, ee = hi(), X = 65535, re = -(1 << 31 >>> 0);
+  const n = fm, r = ym, i = Oo, s = h4, o = Fo(), u = Qf, a = am(), l = g4(), c = cr, f = vm, x = wo, h = F4, p = Mu, m = p4(), g = Dh, y = lr, E = Ja, A = Ae, v = $w(), S = Rm(), _ = ys, C = Xs(), b = Do(), R = ww(), O = IG, L = I0, M = Nh, H = Gf, G = Bw(), Q = BG(), Y = Gt, J = Es, ee = hi(), X = 65535, re = -(1 << 31 >>> 0);
   let se = class ut extends l.ATNSimulator {
     constructor(D, k) {
       super(D), this.predictionMode = O.PredictionMode.LL, this.force_global_context = !1, this.always_try_local_context = !0, this.enable_global_context_dfa = !1, this.optimize_unique_closure = !0, this.optimize_ll1 = !0, this.optimize_tail_calls = !0, this.tail_call_preserves_sll = !0, this.treat_sllk1_conflict_as_ambiguity = !1, this.reportAmbiguities = !1, this.userWantsCtxSensitive = !0, this._parser = k;
@@ -16018,7 +16018,7 @@ function $h() {
           */
     closure(D, k, j, W, U, B) {
       U == null && (U = R.PredictionContextCache.UNCACHED);
-      let T = D, w = new i.Array2DHashSet(S.ObjectEqualityComparator.INSTANCE);
+      let T = D, w = new i.Array2DHashSet(_.ObjectEqualityComparator.INSTANCE);
       for (; T.size > 0; ) {
         let $ = new a.ATNConfigSet();
         for (let q of T)
@@ -16236,7 +16236,7 @@ function $h() {
         }
     }
     noViableAlt(D, k, j, W) {
-      return new _.NoViableAltException(this._parser, D, D.get(W), D.LT(1), j, k);
+      return new S.NoViableAltException(this._parser, D, D.get(W), D.LT(1), j, k);
     }
     getUniqueAlt(D) {
       let k = o.ATN.INVALID_ALT_NUMBER;
@@ -16881,7 +16881,7 @@ function kh() {
     };
   };
   Object.defineProperty(Y2, "__esModule", { value: !0 }), Y2.ATNDeserializer = void 0;
-  const n = ym, r = Oo, i = Fo(), s = mm, o = cr, u = vm, a = C4, l = hm, c = wo, f = b4, x = Jf, h = Mu, p = hG(), m = T4, g = Kf(), y = dm, E = R4, A = O4, v = D4, _ = TG, S = RG, C = w4, b = OG, R = N4, O = bm, L = Ae, M = $w(), H = $h(), G = L4, Q = I4, Y = B4, J = wm, ee = $4, X = k4, re = I0, se = Nh, Ee = Bw(), D = M4, k = P4, j = Oh, W = Gt, U = j4, B = U4, T = gm;
+  const n = ym, r = Oo, i = Fo(), s = mm, o = cr, u = vm, a = C4, l = hm, c = wo, f = b4, x = Jf, h = Mu, p = hG(), m = T4, g = Kf(), y = dm, E = R4, A = O4, v = D4, S = TG, _ = RG, C = w4, b = OG, R = N4, O = bm, L = Ae, M = $w(), H = $h(), G = L4, Q = I4, Y = B4, J = wm, ee = $4, X = k4, re = I0, se = Nh, Ee = Bw(), D = M4, k = P4, j = Oh, W = Gt, U = j4, B = U4, T = gm;
   var w;
   (function(q) {
     q[q.UNICODE_BMP = 0] = "UNICODE_BMP", q[q.UNICODE_SMP = 1] = "UNICODE_SMP";
@@ -17469,9 +17469,9 @@ function kh() {
         case 2:
           return new v.LexerModeAction(z);
         case 3:
-          return _.LexerMoreAction.INSTANCE;
+          return S.LexerMoreAction.INSTANCE;
         case 4:
-          return S.LexerPopModeAction.INSTANCE;
+          return _.LexerPopModeAction.INSTANCE;
         case 5:
           return new C.LexerPushModeAction(z);
         case 6:
@@ -19335,13 +19335,13 @@ function VG() {
    * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
    */
   var t = N && N.__decorate || function(y, E, A, v) {
-    var _ = arguments.length, S = _ < 3 ? E : v === null ? v = Object.getOwnPropertyDescriptor(E, A) : v, C;
+    var S = arguments.length, _ = S < 3 ? E : v === null ? v = Object.getOwnPropertyDescriptor(E, A) : v, C;
     if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
-      S = Reflect.decorate(y, E, A, v);
+      _ = Reflect.decorate(y, E, A, v);
     else
       for (var b = y.length - 1; b >= 0; b--)
-        (C = y[b]) && (S = (_ < 3 ? C(S) : _ > 3 ? C(E, A, S) : C(E, A)) || S);
-    return _ > 3 && S && Object.defineProperty(E, A, S), S;
+        (C = y[b]) && (_ = (S < 3 ? C(_) : S > 3 ? C(E, A, _) : C(E, A)) || _);
+    return S > 3 && _ && Object.defineProperty(E, A, _), _;
   }, e = N && N.__param || function(y, E) {
     return function(A, v) {
       E(A, v, y);
@@ -19350,15 +19350,15 @@ function VG() {
   Object.defineProperty(sp, "__esModule", { value: !0 }), sp.ParserInterpreter = void 0;
   const n = Pu, r = cr, i = wo, s = $0, o = Zf, u = WG(), a = bm, l = Ae, c = Ae, f = jh(), x = $h(), h = Ys, p = Oh, m = Gt;
   let g = class EO extends f.Parser {
-    constructor(E, A, v, _, S) {
-      if (super(E instanceof EO ? E.inputStream : S), this._parentContextStack = [], this.overrideDecision = -1, this.overrideDecisionInputIndex = -1, this.overrideDecisionAlt = -1, this.overrideDecisionReached = !1, this._overrideDecisionRoot = void 0, E instanceof EO) {
+    constructor(E, A, v, S, _) {
+      if (super(E instanceof EO ? E.inputStream : _), this._parentContextStack = [], this.overrideDecision = -1, this.overrideDecisionInputIndex = -1, this.overrideDecisionAlt = -1, this.overrideDecisionReached = !1, this._overrideDecisionRoot = void 0, E instanceof EO) {
         let C = E;
         this._grammarFileName = C._grammarFileName, this._atn = C._atn, this.pushRecursionContextStates = C.pushRecursionContextStates, this._ruleNames = C._ruleNames, this._vocabulary = C._vocabulary, this.interpreter = new x.ParserATNSimulator(this._atn, this);
       } else {
-        A = A, v = v, _ = _, this._grammarFileName = E, this._atn = _, this._ruleNames = v.slice(0), this._vocabulary = A, this.pushRecursionContextStates = new i.BitSet(_.states.length);
-        for (let C of _.states)
+        A = A, v = v, S = S, this._grammarFileName = E, this._atn = S, this._ruleNames = v.slice(0), this._vocabulary = A, this.pushRecursionContextStates = new i.BitSet(S.states.length);
+        for (let C of S.states)
           C instanceof p.StarLoopEntryState && C.precedenceRuleDecision && this.pushRecursionContextStates.set(C.stateNumber);
-        this.interpreter = new x.ParserATNSimulator(_, this);
+        this.interpreter = new x.ParserATNSimulator(S, this);
       }
     }
     reset(E) {
@@ -19385,8 +19385,8 @@ function VG() {
           case r.ATNStateType.RULE_STOP:
             if (this._ctx.isEmpty)
               if (A.isPrecedenceRule) {
-                let _ = this._ctx, S = this._parentContextStack.pop();
-                return this.unrollRecursionContexts(S[0]), _;
+                let S = this._ctx, _ = this._parentContextStack.pop();
+                return this.unrollRecursionContexts(_[0]), S;
               } else
                 return this.exitRule(), this._rootContext;
             this.visitRuleStopState(v);
@@ -19394,18 +19394,18 @@ function VG() {
           default:
             try {
               this.visitState(v);
-            } catch (_) {
-              if (_ instanceof h.RecognitionException)
-                this.state = this._atn.ruleToStopState[v.ruleIndex].stateNumber, this.context.exception = _, this.errorHandler.reportError(this, _), this.recover(_);
+            } catch (S) {
+              if (S instanceof h.RecognitionException)
+                this.state = this._atn.ruleToStopState[v.ruleIndex].stateNumber, this.context.exception = S, this.errorHandler.reportError(this, S), this.recover(S);
               else
-                throw _;
+                throw S;
             }
             break;
         }
       }
     }
-    enterRecursionRule(E, A, v, _) {
-      this._parentContextStack.push([this._ctx, E.invokingState]), super.enterRecursionRule(E, A, v, _);
+    enterRecursionRule(E, A, v, S) {
+      this._parentContextStack.push([this._ctx, E.invokingState]), super.enterRecursionRule(E, A, v, S);
     }
     get atnState() {
       return this._atn.states[this.state];
@@ -19433,8 +19433,8 @@ function VG() {
           this.matchWildcard();
           break;
         case 3:
-          let _ = v.target, S = _.ruleIndex, C = this.createInterpreterRuleContext(this._ctx, E.stateNumber, S);
-          _.isPrecedenceRule ? this.enterRecursionRule(C, _.stateNumber, S, v.precedence) : this.enterRule(C, v.target.stateNumber, S);
+          let S = v.target, _ = S.ruleIndex, C = this.createInterpreterRuleContext(this._ctx, E.stateNumber, _);
+          S.isPrecedenceRule ? this.enterRecursionRule(C, S.stateNumber, _, v.precedence) : this.enterRule(C, v.target.stateNumber, _);
           break;
         case 4:
           let b = v;
@@ -19474,8 +19474,8 @@ function VG() {
     }
     visitRuleStopState(E) {
       if (this._atn.ruleToStartState[E.ruleIndex].isPrecedenceRule) {
-        let _ = this._parentContextStack.pop();
-        this.unrollRecursionContexts(_[0]), this.state = _[1];
+        let S = this._parentContextStack.pop();
+        this.unrollRecursionContexts(S[0]), this.state = S[1];
       } else
         this.exitRule();
       let v = this._atn.states[this.state].transition(0);
@@ -19537,7 +19537,7 @@ function VG() {
         let v = E.getOffendingToken();
         if (!v)
           throw new Error("Expected exception to have an offending token");
-        let _ = v.tokenSource, S = _ !== void 0 ? _.inputStream : void 0, C = { source: _, stream: S };
+        let S = v.tokenSource, _ = S !== void 0 ? S.inputStream : void 0, C = { source: S, stream: _ };
         if (E instanceof o.InputMismatchException) {
           let b = E.expectedTokens;
           if (b === void 0)
@@ -20157,42 +20157,42 @@ function zw() {
     // TODO: check for invalid token/rule names, bad syntax
     split(m) {
       let g = new s.XPathLexer(t.CharStreams.fromString(m));
-      g.recover = (S) => {
-        throw S;
+      g.recover = (_) => {
+        throw _;
       }, g.removeErrorListeners(), g.addErrorListener(new o.XPathLexerErrorListener());
       let y = new e.CommonTokenStream(g);
       try {
         y.fill();
-      } catch (S) {
-        if (S instanceof n.LexerNoViableAltException) {
-          let b = "Invalid tokens or characters at index " + g.charPositionInLine + " in path '" + m + "' -- " + S.message;
+      } catch (_) {
+        if (_ instanceof n.LexerNoViableAltException) {
+          let b = "Invalid tokens or characters at index " + g.charPositionInLine + " in path '" + m + "' -- " + _.message;
           throw new RangeError(b);
         }
-        throw S;
+        throw _;
       }
-      let E = y.getTokens(), A = [], v = E.length, _ = 0;
+      let E = y.getTokens(), A = [], v = E.length, S = 0;
       e:
-        for (; _ < v; ) {
-          let S = E[_], C;
-          switch (S.type) {
+        for (; S < v; ) {
+          let _ = E[S], C;
+          switch (_.type) {
             case s.XPathLexer.ROOT:
             case s.XPathLexer.ANYWHERE:
-              let b = S.type === s.XPathLexer.ANYWHERE;
-              _++, C = E[_];
+              let b = _.type === s.XPathLexer.ANYWHERE;
+              S++, C = E[S];
               let R = C.type === s.XPathLexer.BANG;
-              R && (_++, C = E[_]);
+              R && (S++, C = E[S]);
               let O = this.getXPathElement(C, b);
-              O.invert = R, A.push(O), _++;
+              O.invert = R, A.push(O), S++;
               break;
             case s.XPathLexer.TOKEN_REF:
             case s.XPathLexer.RULE_REF:
             case s.XPathLexer.WILDCARD:
-              A.push(this.getXPathElement(S, !1)), _++;
+              A.push(this.getXPathElement(_, !1)), S++;
               break;
             case i.Token.EOF:
               break e;
             default:
-              throw new Error("Unknowth path element " + S);
+              throw new Error("Unknowth path element " + _);
           }
         }
       return A;
@@ -20818,8 +20818,8 @@ function mpe() {
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.ParseTreePatternMatcher = void 0;
-    const r = QG(), i = H4, s = Mh, o = km, u = npe(), a = Ae, l = Im, c = VG(), f = Xs(), x = rpe(), h = xpe(), p = Ys, m = w0, g = dpe(), y = hpe(), E = To, A = ppe(), v = Gt, _ = gpe();
-    class S {
+    const r = QG(), i = H4, s = Mh, o = km, u = npe(), a = Ae, l = Im, c = VG(), f = Xs(), x = rpe(), h = xpe(), p = Ys, m = w0, g = dpe(), y = hpe(), E = To, A = ppe(), v = Gt, S = gpe();
+    class _ {
       /**
        * Constructs a {@link ParseTreePatternMatcher} or from a {@link Lexer} and
        * {@link Parser} object. The lexer input stream is altered for tokenizing
@@ -20877,10 +20877,10 @@ function mpe() {
         try {
           G.errorHandler = new r.BailErrorStrategy(), Q = G.parse(R);
         } catch (Y) {
-          throw Y instanceof l.ParseCancellationException ? Y.getCause() : Y instanceof p.RecognitionException ? Y : Y instanceof Error ? new S.CannotInvokeStartRule(Y) : Y;
+          throw Y instanceof l.ParseCancellationException ? Y.getCause() : Y instanceof p.RecognitionException ? Y : Y instanceof Error ? new _.CannotInvokeStartRule(Y) : Y;
         }
         if (M.LA(1) !== v.Token.EOF)
-          throw new S.StartRuleDoesNotConsumeFullPattern();
+          throw new _.StartRuleDoesNotConsumeFullPattern();
         return new h.ParseTreePattern(this, b, R, Q);
       }
       /**
@@ -20915,7 +20915,7 @@ function mpe() {
         if (b instanceof E.TerminalNode && R instanceof E.TerminalNode) {
           let L;
           if (b.symbol.type === R.symbol.type)
-            if (R.symbol instanceof _.TokenTagToken) {
+            if (R.symbol instanceof S.TokenTagToken) {
               let M = R.symbol;
               O.map(M.tokenName, b);
               const H = M.label;
@@ -20967,7 +20967,7 @@ function mpe() {
               let G = this._parser.getTokenType(M.tag);
               if (G === v.Token.INVALID_TYPE)
                 throw new Error("Unknown token " + M.tag + " in pattern: " + b);
-              let Q = new _.TokenTagToken(M.tag, G, M.label);
+              let Q = new S.TokenTagToken(M.tag, G, M.label);
               O.push(Q);
             } else if (H === H.toLowerCase()) {
               let G = this._parser.getRuleIndex(M.tag);
@@ -21034,15 +21034,15 @@ function mpe() {
     e([
       a.NotNull,
       n(1, a.NotNull)
-    ], S.prototype, "match", null), e([
+    ], _.prototype, "match", null), e([
       a.NotNull
-    ], S.prototype, "lexer", null), e([
+    ], _.prototype, "lexer", null), e([
       a.NotNull
-    ], S.prototype, "parser", null), e([
+    ], _.prototype, "parser", null), e([
       n(0, a.NotNull),
       n(1, a.NotNull),
       n(2, a.NotNull)
-    ], S.prototype, "matchImpl", null), t.ParseTreePatternMatcher = S, function(C) {
+    ], _.prototype, "matchImpl", null), t.ParseTreePatternMatcher = _, function(C) {
       class b extends Error {
         constructor(L) {
           super(`CannotInvokeStartRule: ${L}`), this.error = L;
@@ -21055,7 +21055,7 @@ function mpe() {
         }
       }
       C.StartRuleDoesNotConsumeFullPattern = R;
-    }(S = t.ParseTreePatternMatcher || (t.ParseTreePatternMatcher = {}));
+    }(_ = t.ParseTreePatternMatcher || (t.ParseTreePatternMatcher = {}));
   }(VT)), VT;
 }
 var Cp = {}, bp = {}, Tp = {}, wk;
@@ -21396,12 +21396,12 @@ function Mk() {
    * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
    */
   var t = N && N.__decorate || function(m, g, y, E) {
-    var A = arguments.length, v = A < 3 ? g : E === null ? E = Object.getOwnPropertyDescriptor(g, y) : E, _;
+    var A = arguments.length, v = A < 3 ? g : E === null ? E = Object.getOwnPropertyDescriptor(g, y) : E, S;
     if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
       v = Reflect.decorate(m, g, y, E);
     else
-      for (var S = m.length - 1; S >= 0; S--)
-        (_ = m[S]) && (v = (A < 3 ? _(v) : A > 3 ? _(g, y, v) : _(g, y)) || v);
+      for (var _ = m.length - 1; _ >= 0; _--)
+        (S = m[_]) && (v = (A < 3 ? S(v) : A > 3 ? S(g, y, v) : S(g, y)) || v);
     return A > 3 && v && Object.defineProperty(g, y, v), v;
   }, e = N && N.__param || function(m, g) {
     return function(y, E) {
@@ -21421,14 +21421,14 @@ function Mk() {
         return super.adaptivePredict(g, y, E, A);
       try {
         this._input = g, this._startIndex = g.index, this._sllStopIndex = this._startIndex - 1, this._llStopIndex = -1, this.currentDecision = y, this.currentState = void 0, this.conflictingAltResolvedBySLL = r.ATN.INVALID_ALT_NUMBER;
-        let v = process.hrtime(), _ = super.adaptivePredict(g, y, E), S = process.hrtime(), C = (S[0] - v[0]) * 1e9;
-        C === 0 ? C = S[1] - v[1] : C += 1e9 - v[1] + S[1], this.decisions[y].timeInPrediction += C, this.decisions[y].invocations++;
+        let v = process.hrtime(), S = super.adaptivePredict(g, y, E), _ = process.hrtime(), C = (_[0] - v[0]) * 1e9;
+        C === 0 ? C = _[1] - v[1] : C += 1e9 - v[1] + _[1], this.decisions[y].timeInPrediction += C, this.decisions[y].invocations++;
         let b = this._sllStopIndex - this._startIndex + 1;
-        if (this.decisions[y].SLL_TotalLook += b, this.decisions[y].SLL_MinLook = this.decisions[y].SLL_MinLook === 0 ? b : Math.min(this.decisions[y].SLL_MinLook, b), b > this.decisions[y].SLL_MaxLook && (this.decisions[y].SLL_MaxLook = b, this.decisions[y].SLL_MaxLookEvent = new l.LookaheadEventInfo(y, void 0, _, g, this._startIndex, this._sllStopIndex, !1)), this._llStopIndex >= 0) {
+        if (this.decisions[y].SLL_TotalLook += b, this.decisions[y].SLL_MinLook = this.decisions[y].SLL_MinLook === 0 ? b : Math.min(this.decisions[y].SLL_MinLook, b), b > this.decisions[y].SLL_MaxLook && (this.decisions[y].SLL_MaxLook = b, this.decisions[y].SLL_MaxLookEvent = new l.LookaheadEventInfo(y, void 0, S, g, this._startIndex, this._sllStopIndex, !1)), this._llStopIndex >= 0) {
           let R = this._llStopIndex - this._startIndex + 1;
-          this.decisions[y].LL_TotalLook += R, this.decisions[y].LL_MinLook = this.decisions[y].LL_MinLook === 0 ? R : Math.min(this.decisions[y].LL_MinLook, R), R > this.decisions[y].LL_MaxLook && (this.decisions[y].LL_MaxLook = R, this.decisions[y].LL_MaxLookEvent = new l.LookaheadEventInfo(y, void 0, _, g, this._startIndex, this._llStopIndex, !0));
+          this.decisions[y].LL_TotalLook += R, this.decisions[y].LL_MinLook = this.decisions[y].LL_MinLook === 0 ? R : Math.min(this.decisions[y].LL_MinLook, R), R > this.decisions[y].LL_MaxLook && (this.decisions[y].LL_MaxLook = R, this.decisions[y].LL_MaxLookEvent = new l.LookaheadEventInfo(y, void 0, S, g, this._startIndex, this._llStopIndex, !0));
         }
-        return _;
+        return S;
       } finally {
         this._input = void 0, this.currentDecision = -1;
       }
@@ -21458,17 +21458,17 @@ function Mk() {
       }
       return E;
     }
-    computeTargetState(g, y, E, A, v, _) {
-      let S = super.computeTargetState(g, y, E, A, v, _);
-      return v ? this.decisions[this.currentDecision].LL_ATNTransitions++ : this.decisions[this.currentDecision].SLL_ATNTransitions++, S;
+    computeTargetState(g, y, E, A, v, S) {
+      let _ = super.computeTargetState(g, y, E, A, v, S);
+      return v ? this.decisions[this.currentDecision].LL_ATNTransitions++ : this.decisions[this.currentDecision].SLL_ATNTransitions++, _;
     }
     evalSemanticContextImpl(g, y, E) {
       if (this.currentState === void 0 || this._input === void 0)
         throw new Error("Invalid state");
       let A = super.evalSemanticContextImpl(g, y, E);
       if (!(g instanceof x.SemanticContext.PrecedencePredicate)) {
-        let _ = this._llStopIndex >= 0 ? this._llStopIndex : this._sllStopIndex;
-        this.decisions[this.currentDecision].predicateEvals.push(new f.PredicateEvalInfo(this.currentState, this.currentDecision, this._input, this._startIndex, _, g, A, E));
+        let S = this._llStopIndex >= 0 ? this._llStopIndex : this._sllStopIndex;
+        this.decisions[this.currentDecision].predicateEvals.push(new f.PredicateEvalInfo(this.currentState, this.currentDecision, this._input, this._startIndex, S, g, A, E));
       }
       return A;
     }
@@ -21480,11 +21480,11 @@ function Mk() {
     reportAttemptingFullContext(g, y, E, A, v) {
       y != null ? this.conflictingAltResolvedBySLL = y.nextSetBit(0) : this.conflictingAltResolvedBySLL = E.s0.configs.getRepresentedAlternatives().nextSetBit(0), this.decisions[this.currentDecision].LL_Fallback++, super.reportAttemptingFullContext(g, y, E, A, v);
     }
-    reportAmbiguity(g, y, E, A, v, _, S) {
+    reportAmbiguity(g, y, E, A, v, S, _) {
       if (this.currentState === void 0 || this._input === void 0)
         throw new Error("Invalid state");
       let C;
-      _ != null ? C = _.nextSetBit(0) : C = S.getRepresentedAlternatives().nextSetBit(0), this.conflictingAltResolvedBySLL !== r.ATN.INVALID_ALT_NUMBER && C !== this.conflictingAltResolvedBySLL && this.decisions[this.currentDecision].contextSensitivities.push(new s.ContextSensitivityInfo(this.currentDecision, this.currentState, this._input, E, A)), this.decisions[this.currentDecision].ambiguities.push(new n.AmbiguityInfo(this.currentDecision, this.currentState, _, this._input, E, A)), super.reportAmbiguity(g, y, E, A, v, _, S);
+      S != null ? C = S.nextSetBit(0) : C = _.getRepresentedAlternatives().nextSetBit(0), this.conflictingAltResolvedBySLL !== r.ATN.INVALID_ALT_NUMBER && C !== this.conflictingAltResolvedBySLL && this.decisions[this.currentDecision].contextSensitivities.push(new s.ContextSensitivityInfo(this.currentDecision, this.currentState, this._input, E, A)), this.decisions[this.currentDecision].ambiguities.push(new n.AmbiguityInfo(this.currentDecision, this.currentState, S, this._input, E, A)), super.reportAmbiguity(g, y, E, A, v, S, _);
     }
     // ---------------------------------------------------------------------
     getDecisionInfo() {
@@ -21529,35 +21529,35 @@ function jh() {
    * Copyright 2016 The ANTLR Project. All rights reserved.
    * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
    */
-  var t = N && N.__decorate || function(A, v, _, S) {
-    var C = arguments.length, b = C < 3 ? v : S === null ? S = Object.getOwnPropertyDescriptor(v, _) : S, R;
+  var t = N && N.__decorate || function(A, v, S, _) {
+    var C = arguments.length, b = C < 3 ? v : _ === null ? _ = Object.getOwnPropertyDescriptor(v, S) : _, R;
     if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
-      b = Reflect.decorate(A, v, _, S);
+      b = Reflect.decorate(A, v, S, _);
     else
       for (var O = A.length - 1; O >= 0; O--)
-        (R = A[O]) && (b = (C < 3 ? R(b) : C > 3 ? R(v, _, b) : R(v, _)) || b);
-    return C > 3 && b && Object.defineProperty(v, _, b), b;
+        (R = A[O]) && (b = (C < 3 ? R(b) : C > 3 ? R(v, S, b) : R(v, S)) || b);
+    return C > 3 && b && Object.defineProperty(v, S, b), b;
   }, e = N && N.__param || function(A, v) {
-    return function(_, S) {
-      v(_, S, A);
+    return function(S, _) {
+      v(S, _, A);
     };
-  }, n = N && N.__awaiter || function(A, v, _, S) {
+  }, n = N && N.__awaiter || function(A, v, S, _) {
     function C(b) {
-      return b instanceof _ ? b : new _(function(R) {
+      return b instanceof S ? b : new S(function(R) {
         R(b);
       });
     }
-    return new (_ || (_ = Promise))(function(b, R) {
+    return new (S || (S = Promise))(function(b, R) {
       function O(H) {
         try {
-          M(S.next(H));
+          M(_.next(H));
         } catch (G) {
           R(G);
         }
       }
       function L(H) {
         try {
-          M(S.throw(H));
+          M(_.throw(H));
         } catch (G) {
           R(G);
         }
@@ -21565,14 +21565,14 @@ function jh() {
       function M(H) {
         H.done ? b(H.value) : C(H.value).then(O, L);
       }
-      M((S = S.apply(A, v || [])).next());
+      M((_ = _.apply(A, v || [])).next());
     });
   };
   Object.defineProperty(V2, "__esModule", { value: !0 }), V2.Parser = void 0;
   const r = pn, i = mm, s = kh(), o = kw(), u = O0, a = cm, l = el(), c = Ae, f = q4, x = $h(), h = Lm, p = N0, m = To, g = Gt;
   class y {
-    constructor(v, _) {
-      this.ruleNames = v, this.tokenStream = _;
+    constructor(v, S) {
+      this.ruleNames = v, this.tokenStream = S;
     }
     enterEveryRule(v) {
       console.log("enter   " + this.ruleNames[v.ruleIndex] + ", LT(1)=" + this.tokenStream.LT(1).text);
@@ -21583,8 +21583,8 @@ function jh() {
     visitErrorNode(v) {
     }
     visitTerminal(v) {
-      let _ = v.parent.ruleContext, S = v.symbol;
-      console.log("consume " + S + " rule " + this.ruleNames[_.ruleIndex]);
+      let S = v.parent.ruleContext, _ = v.symbol;
+      console.log("consume " + _ + " rule " + this.ruleNames[S.ruleIndex]);
     }
   }
   t([
@@ -21602,8 +21602,8 @@ function jh() {
     }
     reset(v) {
       (v === void 0 || v) && this.inputStream.seek(0), this._errHandler.reset(this), this._ctx = void 0, this._syntaxErrors = 0, this.matchedEOF = !1, this.isTrace = !1, this._precedenceStack.clear(), this._precedenceStack.push(0);
-      let _ = this.interpreter;
-      _ != null && _.reset();
+      let S = this.interpreter;
+      S != null && S.reset();
     }
     /**
      * Match current input symbol against `ttype`. If the symbol type
@@ -21625,8 +21625,8 @@ function jh() {
      * mismatched symbol
      */
     match(v) {
-      let _ = this.currentToken;
-      return _.type === v ? (v === g.Token.EOF && (this.matchedEOF = !0), this._errHandler.reportMatch(this), this.consume()) : (_ = this._errHandler.recoverInline(this), this._buildParseTrees && _.tokenIndex === -1 && this._ctx.addErrorNode(this.createErrorNode(this._ctx, _))), _;
+      let S = this.currentToken;
+      return S.type === v ? (v === g.Token.EOF && (this.matchedEOF = !0), this._errHandler.reportMatch(this), this.consume()) : (S = this._errHandler.recoverInline(this), this._buildParseTrees && S.tokenIndex === -1 && this._ctx.addErrorNode(this.createErrorNode(this._ctx, S))), S;
     }
     /**
      * Match current input symbol as a wildcard. If the symbol type matches
@@ -21724,8 +21724,8 @@ function jh() {
      * @param listener the listener to remove
      */
     removeParseListener(v) {
-      let _ = this._parseListeners.findIndex((S) => S === v);
-      _ !== -1 && this._parseListeners.splice(_, 1);
+      let S = this._parseListeners.findIndex((_) => _ === v);
+      S !== -1 && this._parseListeners.splice(S, 1);
     }
     /**
      * Remove all parse listeners.
@@ -21751,8 +21751,8 @@ function jh() {
      */
     triggerExitRuleEvent() {
       for (let v = this._parseListeners.length - 1; v >= 0; v--) {
-        let _ = this._parseListeners[v];
-        this._ctx.exitRule(_), _.exitEveryRule && _.exitEveryRule(this._ctx);
+        let S = this._parseListeners[v];
+        this._ctx.exitRule(S), S.exitEveryRule && S.exitEveryRule(this._ctx);
       }
     }
     /**
@@ -21778,25 +21778,25 @@ function jh() {
       let v = this.serializedATN;
       if (v == null)
         throw new Error("The current parser does not support an ATN with bypass alternatives.");
-      let _ = BE.bypassAltsAtnCache.get(v);
-      if (_ == null) {
-        let S = new i.ATNDeserializationOptions();
-        S.isGenerateRuleBypassTransitions = !0, _ = new s.ATNDeserializer(S).deserialize(r.toCharArray(v)), BE.bypassAltsAtnCache.set(v, _);
+      let S = BE.bypassAltsAtnCache.get(v);
+      if (S == null) {
+        let _ = new i.ATNDeserializationOptions();
+        _.isGenerateRuleBypassTransitions = !0, S = new s.ATNDeserializer(_).deserialize(r.toCharArray(v)), BE.bypassAltsAtnCache.set(v, S);
       }
-      return _;
+      return S;
     }
-    compileParseTreePattern(v, _, S) {
+    compileParseTreePattern(v, S, _) {
       return n(this, void 0, void 0, function* () {
-        if (!S) {
+        if (!_) {
           if (this.inputStream) {
             let O = this.inputStream.tokenSource;
-            O instanceof l.Lexer && (S = O);
+            O instanceof l.Lexer && (_ = O);
           }
-          if (!S)
+          if (!_)
             throw new Error("Parser can't discover a lexer to use");
         }
-        let C = S, b = yield Promise.resolve().then(() => mpe());
-        return new b.ParseTreePatternMatcher(C, this).compile(v, _);
+        let C = _, b = yield Promise.resolve().then(() => mpe());
+        return new b.ParseTreePatternMatcher(C, this).compile(v, S);
       });
     }
     get errorHandler() {
@@ -21818,12 +21818,12 @@ function jh() {
     get currentToken() {
       return this._input.LT(1);
     }
-    notifyErrorListeners(v, _, S) {
-      _ === void 0 ? _ = this.currentToken : _ === null && (_ = void 0), this._syntaxErrors++;
+    notifyErrorListeners(v, S, _) {
+      S === void 0 ? S = this.currentToken : S === null && (S = void 0), this._syntaxErrors++;
       let C = -1, b = -1;
-      _ != null && (C = _.line, b = _.charPositionInLine);
+      S != null && (C = S.line, b = S.charPositionInLine);
       let R = this.getErrorListenerDispatch();
-      R.syntaxError && R.syntaxError(this, _, C, b, v, S);
+      R.syntaxError && R.syntaxError(this, S, C, b, v, _);
     }
     /**
      * Consume and return the [current symbol](`currentToken`).
@@ -21849,18 +21849,18 @@ function jh() {
     consume() {
       let v = this.currentToken;
       v.type !== BE.EOF && this.inputStream.consume();
-      let _ = this._parseListeners.length !== 0;
-      if (this._buildParseTrees || _)
+      let S = this._parseListeners.length !== 0;
+      if (this._buildParseTrees || S)
         if (this._errHandler.inErrorRecoveryMode(this)) {
-          let S = this._ctx.addErrorNode(this.createErrorNode(this._ctx, v));
-          if (_)
+          let _ = this._ctx.addErrorNode(this.createErrorNode(this._ctx, v));
+          if (S)
             for (let C of this._parseListeners)
-              C.visitErrorNode && C.visitErrorNode(S);
+              C.visitErrorNode && C.visitErrorNode(_);
         } else {
-          let S = this.createTerminalNode(this._ctx, v);
-          if (this._ctx.addChild(S), _)
+          let _ = this.createTerminalNode(this._ctx, v);
+          if (this._ctx.addChild(_), S)
             for (let C of this._parseListeners)
-              C.visitTerminal && C.visitTerminal(S);
+              C.visitTerminal && C.visitTerminal(_);
         }
       return v;
     }
@@ -21870,8 +21870,8 @@ function jh() {
      *
      * @since 4.7
      */
-    createTerminalNode(v, _) {
-      return new m.TerminalNode(_);
+    createTerminalNode(v, S) {
+      return new m.TerminalNode(S);
     }
     /**
      * How to create an error node, given a token, associated with a parent.
@@ -21879,8 +21879,8 @@ function jh() {
      *
      * @since 4.7
      */
-    createErrorNode(v, _) {
-      return new u.ErrorNode(_);
+    createErrorNode(v, S) {
+      return new u.ErrorNode(S);
     }
     addContextToParseTree() {
       let v = this._ctx._parent;
@@ -21890,11 +21890,11 @@ function jh() {
      * Always called by generated parsers upon entry to a rule. Access field
      * {@link #_ctx} get the current context.
      */
-    enterRule(v, _, S) {
-      this.state = _, this._ctx = v, this._ctx._start = this._input.LT(1), this._buildParseTrees && this.addContextToParseTree(), this.triggerEnterRuleEvent();
+    enterRule(v, S, _) {
+      this.state = S, this._ctx = v, this._ctx._start = this._input.LT(1), this._buildParseTrees && this.addContextToParseTree(), this.triggerEnterRuleEvent();
     }
-    enterLeftFactoredRule(v, _, S) {
-      if (this.state = _, this._buildParseTrees) {
+    enterLeftFactoredRule(v, S, _) {
+      if (this.state = S, this._buildParseTrees) {
         let C = this._ctx.getChild(this._ctx.childCount - 1);
         this._ctx.removeLastChild(), C._parent = v, v.addChild(C);
       }
@@ -21903,10 +21903,10 @@ function jh() {
     exitRule() {
       this.matchedEOF ? this._ctx._stop = this._input.LT(1) : this._ctx._stop = this._input.tryLT(-1), this.triggerExitRuleEvent(), this.state = this._ctx.invokingState, this._ctx = this._ctx._parent;
     }
-    enterOuterAlt(v, _) {
-      if (v.altNumber = _, this._buildParseTrees && this._ctx !== v) {
-        let S = this._ctx._parent;
-        S != null && (S.removeLastChild(), S.addChild(v));
+    enterOuterAlt(v, S) {
+      if (v.altNumber = S, this._buildParseTrees && this._ctx !== v) {
+        let _ = this._ctx._parent;
+        _ != null && (_.removeLastChild(), _.addChild(v));
       }
       this._ctx = v;
     }
@@ -21919,31 +21919,31 @@ function jh() {
     get precedence() {
       return this._precedenceStack.isEmpty ? -1 : this._precedenceStack.peek();
     }
-    enterRecursionRule(v, _, S, C) {
-      this.state = _, this._precedenceStack.push(C), this._ctx = v, this._ctx._start = this._input.LT(1), this.triggerEnterRuleEvent();
+    enterRecursionRule(v, S, _, C) {
+      this.state = S, this._precedenceStack.push(C), this._ctx = v, this._ctx._start = this._input.LT(1), this.triggerEnterRuleEvent();
     }
     /** Like {@link #enterRule} but for recursive rules.
      *  Make the current context the child of the incoming localctx.
      */
-    pushNewRecursionContext(v, _, S) {
+    pushNewRecursionContext(v, S, _) {
       let C = this._ctx;
-      C._parent = v, C.invokingState = _, C._stop = this._input.tryLT(-1), this._ctx = v, this._ctx._start = C._start, this._buildParseTrees && this._ctx.addChild(C), this.triggerEnterRuleEvent();
+      C._parent = v, C.invokingState = S, C._stop = this._input.tryLT(-1), this._ctx = v, this._ctx._start = C._start, this._buildParseTrees && this._ctx.addChild(C), this.triggerEnterRuleEvent();
     }
     unrollRecursionContexts(v) {
       this._precedenceStack.pop(), this._ctx._stop = this._input.tryLT(-1);
-      let _ = this._ctx;
+      let S = this._ctx;
       if (this._parseListeners.length > 0)
         for (; this._ctx !== v; )
           this.triggerExitRuleEvent(), this._ctx = this._ctx._parent;
       else
         this._ctx = v;
-      _._parent = v, this._buildParseTrees && v != null && v.addChild(_);
+      S._parent = v, this._buildParseTrees && v != null && v.addChild(S);
     }
     getInvokingContext(v) {
-      let _ = this._ctx;
-      for (; _ && _.ruleIndex !== v; )
-        _ = _._parent;
-      return _;
+      let S = this._ctx;
+      for (; S && S.ruleIndex !== v; )
+        S = S._parent;
+      return S;
     }
     get context() {
       return this._ctx;
@@ -21951,8 +21951,8 @@ function jh() {
     set context(v) {
       this._ctx = v;
     }
-    precpred(v, _) {
-      return _ >= this._precedenceStack.peek();
+    precpred(v, S) {
+      return S >= this._precedenceStack.peek();
     }
     getErrorListenerDispatch() {
       return new h.ProxyParserErrorListener(this.getErrorListeners());
@@ -21975,16 +21975,16 @@ function jh() {
      * the ATN, otherwise `false`.
      */
     isExpectedToken(v) {
-      let _ = this.interpreter.atn, S = this._ctx, C = _.states[this.state], b = _.nextTokens(C);
+      let S = this.interpreter.atn, _ = this._ctx, C = S.states[this.state], b = S.nextTokens(C);
       if (b.contains(v))
         return !0;
       if (!b.contains(g.Token.EPSILON))
         return !1;
-      for (; S != null && S.invokingState >= 0 && b.contains(g.Token.EPSILON); ) {
-        let O = _.states[S.invokingState].transition(0);
-        if (b = _.nextTokens(O.followState), b.contains(v))
+      for (; _ != null && _.invokingState >= 0 && b.contains(g.Token.EPSILON); ) {
+        let O = S.states[_.invokingState].transition(0);
+        if (b = S.nextTokens(O.followState), b.contains(v))
           return !0;
-        S = S._parent;
+        _ = _._parent;
       }
       return !!(b.contains(g.Token.EPSILON) && v === g.Token.EOF);
     }
@@ -22002,13 +22002,13 @@ function jh() {
       return this.atn.getExpectedTokens(this.state, this.context);
     }
     getExpectedTokensWithinCurrentRule() {
-      let v = this.interpreter.atn, _ = v.states[this.state];
-      return v.nextTokens(_);
+      let v = this.interpreter.atn, S = v.states[this.state];
+      return v.nextTokens(S);
     }
     /** Get a rule's index (i.e., `RULE_ruleName` field) or -1 if not found. */
     getRuleIndex(v) {
-      let _ = this.getRuleIndexMap().get(v);
-      return _ ?? -1;
+      let S = this.getRuleIndexMap().get(v);
+      return S ?? -1;
     }
     get ruleContext() {
       return this._ctx;
@@ -22021,34 +22021,34 @@ function jh() {
      *  This is very useful for error messages.
      */
     getRuleInvocationStack(v = this._ctx) {
-      let _ = v, S = this.ruleNames, C = [];
-      for (; _ != null; ) {
-        let b = _.ruleIndex;
-        b < 0 ? C.push("n/a") : C.push(S[b]), _ = _._parent;
+      let S = v, _ = this.ruleNames, C = [];
+      for (; S != null; ) {
+        let b = S.ruleIndex;
+        b < 0 ? C.push("n/a") : C.push(_[b]), S = S._parent;
       }
       return C;
     }
     /** For debugging and other purposes. */
     getDFAStrings() {
       let v = [];
-      for (let _ of this._interp.atn.decisionToDFA)
-        v.push(_.toString(this.vocabulary, this.ruleNames));
+      for (let S of this._interp.atn.decisionToDFA)
+        v.push(S.toString(this.vocabulary, this.ruleNames));
       return v;
     }
     /** For debugging and other purposes. */
     dumpDFA() {
       let v = !1;
-      for (let _ of this._interp.atn.decisionToDFA)
-        _.isEmpty || (v && console.log(), console.log("Decision " + _.decision + ":"), process.stdout.write(_.toString(this.vocabulary, this.ruleNames)), v = !0);
+      for (let S of this._interp.atn.decisionToDFA)
+        S.isEmpty || (v && console.log(), console.log("Decision " + S.decision + ":"), process.stdout.write(S.toString(this.vocabulary, this.ruleNames)), v = !0);
     }
     get sourceName() {
       return this._input.sourceName;
     }
     get parseInfo() {
       return Promise.resolve().then(() => Mk()).then((v) => {
-        let _ = this.interpreter;
-        if (_ instanceof v.ProfilingATNSimulator)
-          return new f.ParseInfo(_);
+        let S = this.interpreter;
+        if (S instanceof v.ProfilingATNSimulator)
+          return new f.ParseInfo(S);
       });
     }
     /**
@@ -22056,8 +22056,8 @@ function jh() {
      */
     setProfile(v) {
       return n(this, void 0, void 0, function* () {
-        let _ = yield Promise.resolve().then(() => Mk()), S = this.interpreter;
-        v ? S instanceof _.ProfilingATNSimulator || (this.interpreter = new _.ProfilingATNSimulator(this)) : S instanceof _.ProfilingATNSimulator && (this.interpreter = new x.ParserATNSimulator(this.atn, this)), this.interpreter.setPredictionMode(S.getPredictionMode());
+        let S = yield Promise.resolve().then(() => Mk()), _ = this.interpreter;
+        v ? _ instanceof S.ProfilingATNSimulator || (this.interpreter = new S.ProfilingATNSimulator(this)) : _ instanceof S.ProfilingATNSimulator && (this.interpreter = new x.ParserATNSimulator(this.atn, this)), this.interpreter.setPredictionMode(_.getPredictionMode());
       });
     }
     /** During a parse is sometimes useful to listen in on the rule entry and exit
@@ -22255,10 +22255,10 @@ function k0() {
         return;
       let E = p.childCount;
       for (let A = 0; A < E; A++) {
-        let v = p.getChild(A), _ = v.sourceInterval;
-        if (v instanceof u.ParserRuleContext && (_.b < g || _.a > y) && Tl.isAncestorOf(v, m)) {
-          let S = new r.CommonToken(c.Token.INVALID_TYPE, "...");
-          p.children[A] = new l.TerminalNode(S);
+        let v = p.getChild(A), S = v.sourceInterval;
+        if (v instanceof u.ParserRuleContext && (S.b < g || S.a > y) && Tl.isAncestorOf(v, m)) {
+          let _ = new r.CommonToken(c.Token.INVALID_TYPE, "...");
+          p.children[A] = new l.TerminalNode(_);
         }
       }
     }
@@ -24295,19 +24295,19 @@ function l1e(t) {
   return e && (e.inherits = void 0), u1e.Tag.annotationToTag(e).tag.has("materialize");
 }
 Cd.shouldMaterialize = l1e;
-function c1e(t, e) {
+function c1e(t, e, n) {
   if (!e)
     throw new Error(`Query tagged to materialize, but its name is not specified. ${t}`);
   if (!t)
     throw new Error(`Query tagged to materialize, but its path is not specified: ${e}`);
-  const n = {
+  const r = {
     path: t,
     source: void 0,
     queryName: e
-  }, r = (0, a1e.generateHash)(JSON.stringify(n)), i = `${e}-${r}`;
+  }, i = (0, a1e.generateHash)(JSON.stringify(r)).replace(/-/g, "_"), s = `${n ? `${n}_` : ""}${e}_${i}`;
   return {
-    ...n,
-    id: i
+    ...r,
+    id: s
   };
 }
 Cd.buildQueryMaterializationSpec = c1e;
@@ -24366,16 +24366,16 @@ class DA {
     const o = `${n.udfPrefix}${this.root().udfs.length}`;
     return i = n.sqlCreateFunction(o, i), this.root().udfs.push(i), o;
   }
-  addMaterializedQuery(e, n) {
-    var r;
-    const i = n.name;
-    if (!i)
-      throw new Error(`Source ${e} on a unnamed query that is tagged as materialize, only named queries can be materialized.`);
-    const s = (r = n.location) === null || r === void 0 ? void 0 : r.url;
+  addMaterializedQuery(e, n, r) {
+    var i;
+    const s = n.name;
     if (!s)
-      throw new Error(`Trying to materialize query ${i}, but its path is not set.`);
-    const o = (0, OA.buildQueryMaterializationSpec)(s, i);
-    return this.root().dependenciesToMaterialize[o.id] = o, o.id;
+      throw new Error(`Source ${e} on a unnamed query that is tagged as materialize, only named queries can be materialized.`);
+    const o = (i = n.location) === null || i === void 0 ? void 0 : i.url;
+    if (!o)
+      throw new Error(`Trying to materialize query ${s}, but its path is not set.`);
+    const u = (0, OA.buildQueryMaterializationSpec)(o, s, r);
+    return this.root().dependenciesToMaterialize[u.id] = u, u.id;
   }
   addPDT(e, n) {
     const r = this.combineStages(!1).sql + this.withs[this.withs.length - 1], s = `scratch.${e + (0, dn.generateHash)(r)}`;
@@ -24555,8 +24555,8 @@ let fg = class extends CW {
         return this.generateDimFragment(e, n, A, i);
       });
       return n.dialect.sqlAggDistinct(f, [...h, ...m], (g) => {
-        const y = g.map((S, C) => C < l.length && this.getParamForArgIndex(a.params, C).allowedTypes.every((R) => (0, Ze.isLiteral)(R.evalSpace)) ? l[C] : (0, dn.composeSQLExpr)([S])), E = y.slice(0, h.length), A = y.slice(h.length).map((S, C) => ({ node: "functionOrderBy", e: S, dir: p[C].dir })), v = this.getFunctionOrderBy(e, n, i, A, E, a), _ = this.expandFunctionCall(n.dialect.name, a, E, v, x);
-        return this.exprToSQL(e, n, _, i);
+        const y = g.map((_, C) => C < l.length && this.getParamForArgIndex(a.params, C).allowedTypes.every((R) => (0, Ze.isLiteral)(R.evalSpace)) ? l[C] : (0, dn.composeSQLExpr)([_])), E = y.slice(0, h.length), A = y.slice(h.length).map((_, C) => ({ node: "functionOrderBy", e: _, dir: p[C].dir })), v = this.getFunctionOrderBy(e, n, i, A, E, a), S = this.expandFunctionCall(n.dialect.name, a, E, v, x);
+        return this.exprToSQL(e, n, S, i);
       });
     } else {
       const h = (0, Ze.expressionIsAggregate)(a.returnType.expressionType) ? l.map((g, y) => this.getParamForArgIndex(a.params, y).allowedTypes.every((A) => (0, Ze.isLiteral)(A.evalSpace)) ? g : (0, dn.composeSQLExpr)([
@@ -24658,19 +24658,19 @@ let fg = class extends CW {
     if (!l && m.needsWindowOrderBy) {
       const A = [];
       let v;
-      const _ = n.firstSegment.orderBy || n.calculateDefaultOrderBy();
-      for (const S of _) {
-        typeof S.field == "string" ? v = {
-          name: S.field,
-          fif: n.getField(S.field)
-        } : v = n.getFieldByNumber(S.field);
+      const S = n.firstSegment.orderBy || n.calculateDefaultOrderBy();
+      for (const _ of S) {
+        typeof _.field == "string" ? v = {
+          name: _.field,
+          fif: n.getField(_.field)
+        } : v = n.getFieldByNumber(_.field);
         const C = v.fif.f.fieldDef.expressionType;
         if (!(0, Ze.expressionIsAnalytic)(C))
           if (n.firstSegment.type === "reduce") {
             const b = v.fif.getAnalyticalSQL(!1);
-            A.push(` ${b} ${S.dir || "ASC"}`);
+            A.push(` ${b} ${_.dir || "ASC"}`);
           } else
-            n.firstSegment.type === "project" && A.push(` ${v.fif.f.generateExpression(n)} ${S.dir || "ASC"}`);
+            n.firstSegment.type === "project" && A.push(` ${v.fif.f.generateExpression(n)} ${_.dir || "ASC"}`);
       }
       A.length > 0 && (p = " " + this.parent.dialect.sqlOrderBy(A));
     }
@@ -24679,12 +24679,12 @@ let fg = class extends CW {
       const [A, v] = [
         m.between.preceding,
         m.between.following
-      ].map((_) => {
-        if (_ === -1)
+      ].map((S) => {
+        if (S === -1)
           return "UNBOUNDED";
-        if (typeof _ == "number")
-          return _;
-        const S = s.params.findIndex((b) => b.name === _), C = u[S];
+        if (typeof S == "number")
+          return S;
+        const _ = s.params.findIndex((b) => b.name === S), C = u[_];
         if (C.node !== "numberLiteral")
           throw new Error("Invalid number of rows for window spec");
         return C.literal;
@@ -26133,7 +26133,7 @@ class D1e extends ks {
 }
 class Ir extends CW {
   constructor(e, n, r, i) {
-    if (super(e), this.sourceArguments = n, this.prepareResultOptions = i, this.nameMap = /* @__PURE__ */ new Map(), this._arguments = void 0, this.setParent(r), "model" in r)
+    if (super(e), this.sourceArguments = n, this.prepareResultOptions = i, this.nameMap = /* @__PURE__ */ new Map(), this._arguments = void 0, this.stacki = new Error("").stack, this.setParent(r), "model" in r)
       if (this.model = r.model, this.pathAliasMap = /* @__PURE__ */ new Map(), e.structRelationship.type === "basetable")
         this.connectionName = e.structRelationship.connectionName;
       else
@@ -26303,11 +26303,11 @@ class Ir extends CW {
     }
   }
   structSourceSQL(e) {
-    var n;
+    var n, r;
     switch (this.fieldDef.structSource.type) {
       case "table": {
-        const r = this.fieldDef.structSource.tablePath;
-        return this.dialect.quoteTablePath(r);
+        const i = this.fieldDef.structSource.tablePath;
+        return this.dialect.quoteTablePath(i);
       }
       case "sql":
         if (this.fieldDef.structSource.method === "nested" || this.fieldDef.structSource.method === "lastStage")
@@ -26320,7 +26320,7 @@ class Ir extends CW {
       case "inline":
         return "";
       case "query":
-        return !((n = this.prepareResultOptions) === null || n === void 0) && n.replaceMaterializedReferences && (0, OA.shouldMaterialize)(this.fieldDef.structSource.query.annotation) ? e.addMaterializedQuery((0, Ze.getIdentifier)(this.fieldDef), this.fieldDef.structSource.query) : this.model.loadQuery(
+        return !((n = this.prepareResultOptions) === null || n === void 0) && n.replaceMaterializedReferences && (0, OA.shouldMaterialize)(this.fieldDef.structSource.query.annotation) ? e.addMaterializedQuery((0, Ze.getIdentifier)(this.fieldDef), this.fieldDef.structSource.query, (r = this.prepareResultOptions) === null || r === void 0 ? void 0 : r.materializedTablePrefix) : this.model.loadQuery(
           this.fieldDef.structSource.query,
           e,
           this.prepareResultOptions,
@@ -26479,7 +26479,7 @@ class RW {
       malloy: o.malloy,
       sql: o.stageWriter.generateSQLStages(),
       dependenciesToMaterialize: o.stageWriter.dependenciesToMaterialize,
-      materialization: (0, OA.shouldMaterialize)(e.annotation) ? (0, OA.buildQueryMaterializationSpec)((i = e.location) === null || i === void 0 ? void 0 : i.url, e.name) : void 0,
+      materialization: (0, OA.shouldMaterialize)(e.annotation) ? (0, OA.buildQueryMaterializationSpec)((i = e.location) === null || i === void 0 ? void 0 : i.url, e.name, n == null ? void 0 : n.materializedTablePrefix) : void 0,
       structs: o.structs,
       sourceExplore: u,
       sourceFilters: e.filterList,
@@ -41624,7 +41624,7 @@ class OAe extends TAe.ExpressionDef {
     ]);
     if (!(0, Ki.expressionIsAggregate)(m.returnType.expressionType) && this.source !== void 0)
       return this.loggedErrorExpr("non-aggregate-function-with-source", `Cannot call function ${this.name}(${h.map((R) => R.dataType).join(", ")}) with source`);
-    const _ = {
+    const S = {
       node: "function_call",
       overload: m,
       name: this.name,
@@ -41632,23 +41632,23 @@ class OAe extends TAe.ExpressionDef {
       expressionType: v,
       structPath: x
     };
-    let S = _;
+    let _ = S;
     if (n != null && n.orderBys && n.orderBys.length > 0) {
       const R = (0, Ki.expressionIsAnalytic)(m.returnType.expressionType);
       if (R || this.inExperiment("aggregate_order_by", !0) || n.orderBys[0].logError("aggregate-order-by-experiment-not-enabled", "Enable experiment `aggregate_order_by` to use `order_by` with an aggregate function"), m.supportsOrderBy || R) {
         const O = m.supportsOrderBy !== "only_default", L = n.orderBys.flatMap((M) => R ? M.getAnalyticOrderBy(e) : M.getAggregateOrderBy(e, O));
-        _.kids.orderBy = L;
+        S.kids.orderBy = L;
       } else
         n.orderBys[0].logError("function-does-not-support-order-by", `Function \`${this.name}\` does not support \`order_by\``);
     }
-    if ((n == null ? void 0 : n.limit) !== void 0 && (m.supportsLimit ? _.limit = n.limit.limit : this.logError("function-does-not-support-limit", `Function ${this.name} does not support limit`)), n != null && n.partitionBys && n.partitionBys.length > 0) {
+    if ((n == null ? void 0 : n.limit) !== void 0 && (m.supportsLimit ? S.limit = n.limit.limit : this.logError("function-does-not-support-limit", `Function ${this.name} does not support limit`)), n != null && n.partitionBys && n.partitionBys.length > 0) {
       const R = [];
       for (const O of n.partitionBys)
         for (const L of O.partitionFields) {
           const M = L.getField(e);
           M.found === void 0 ? L.logError("partition-by-not-found", `${L.refString} is not defined`) : (0, Ki.expressionIsAnalytic)(M.found.typeDesc().expressionType) || (0, Ki.expressionIsUngroupedAggregate)(M.found.typeDesc().expressionType) ? L.logError("non-scalar-or-aggregate-partition-by", "Partition expression must be scalar or aggregate") : R.push(L.nameString);
         }
-      _.partitionBy = R;
+      S.partitionBy = R;
     }
     if ([
       "sql_number",
@@ -41682,7 +41682,7 @@ class OAe extends TAe.ExpressionDef {
               return this.loggedErrorExpr("sql-function-interpolation-not-found", `Invalid interpolation: ${Y.error.message}`);
             Y.found.refType === "parameter" ? H.push({ node: "parameter", path: [G.name] }) : H.push({ node: "field", path: [G.name] });
           }
-        S = (0, SM.composeSQLExpr)(H);
+        _ = (0, SM.composeSQLExpr)(H);
       }
     }
     if (A.dataType === "any")
@@ -41691,7 +41691,7 @@ class OAe extends TAe.ExpressionDef {
     return {
       dataType: A.dataType,
       expressionType: v,
-      value: S,
+      value: _,
       evalSpace: b
     };
   }
@@ -46140,10 +46140,10 @@ class at {
     const E = h ? F4e(o) : u ? L4e(o) : RX(o), A = E || OX(o);
     if (A)
       return at.invalid(A);
-    const v = h ? GM(o) : u ? WM(o) : o, [_, S] = ME(v, s, r), C = new at({
-      ts: _,
+    const v = h ? GM(o) : u ? WM(o) : o, [S, _] = ME(v, s, r), C = new at({
+      ts: S,
       zone: r,
-      o: S,
+      o: _,
       loc: x
     });
     return o.weekday && c && e.weekday !== C.weekday ? at.invalid("mismatched weekday", `you can't specify both a weekday of ${o.weekday} and a date of ${C.toISO()}`) : C;
@@ -51072,77 +51072,77 @@ class an {
    * @param model A compiled model to build upon (optional).
    * @return A (promise of a) compiled `Model`.
    */
-  static async compile({ urlReader: e, connections: n, parse: r, model: i, refreshSchemaCache: s, noThrowOnError: o, replaceMaterializedReferences: u }) {
-    var a, l, c, f;
-    let x;
-    s && (x = typeof s == "number" ? s : Date.now());
-    const h = r._translator;
+  static async compile({ urlReader: e, connections: n, parse: r, model: i, refreshSchemaCache: s, noThrowOnError: o, replaceMaterializedReferences: u, materializedTablePrefix: a }) {
+    var l, c, f, x;
+    let h;
+    s && (h = typeof s == "number" ? s : Date.now());
+    const p = r._translator;
     for (; ; ) {
-      const p = h.translate(i == null ? void 0 : i._modelDef);
-      if (p.final) {
-        if (p.translated)
-          return new yg(p.translated.modelDef, p.translated.queryList, p.translated.sqlBlocks, p.problems || [], [...(a = i == null ? void 0 : i.fromSources) !== null && a !== void 0 ? a : [], ...(l = p.fromSources) !== null && l !== void 0 ? l : []], (m) => h.referenceAt(m), (m) => h.importAt(m));
+      const m = p.translate(i == null ? void 0 : i._modelDef);
+      if (m.final) {
+        if (m.translated)
+          return new yg(m.translated.modelDef, m.translated.queryList, m.translated.sqlBlocks, m.problems || [], [...(l = i == null ? void 0 : i.fromSources) !== null && l !== void 0 ? l : [], ...(c = m.fromSources) !== null && c !== void 0 ? c : []], (g) => p.referenceAt(g), (g) => p.importAt(g));
         if (o) {
-          const m = {
+          const g = {
             name: "modelDidNotCompile",
             exports: [],
             contents: {}
-          }, g = (i == null ? void 0 : i._modelDef) || m;
-          return new yg(g, [], [], p.problems || [], [...(c = i == null ? void 0 : i.fromSources) !== null && c !== void 0 ? c : [], ...(f = p.fromSources) !== null && f !== void 0 ? f : []], (y) => h.referenceAt(y), (y) => h.importAt(y));
+          }, y = (i == null ? void 0 : i._modelDef) || g;
+          return new yg(y, [], [], m.problems || [], [...(f = i == null ? void 0 : i.fromSources) !== null && f !== void 0 ? f : [], ...(x = m.fromSources) !== null && x !== void 0 ? x : []], (E) => p.referenceAt(E), (E) => p.importAt(E));
         } else {
-          const m = p.problems || [], g = h.prettyErrors();
+          const g = m.problems || [], y = p.prettyErrors();
           throw new KX(`Error(s) compiling model:
-${g}`, m);
+${y}`, g);
         }
       } else {
-        if (p.urls)
-          for (const g of p.urls)
+        if (m.urls)
+          for (const y of m.urls)
             try {
-              if (g.startsWith("internal://"))
+              if (y.startsWith("internal://"))
                 throw new Error("In order to use relative imports, you must compile a file via a URL.");
-              const y = await e.readURL(new URL(g)), E = { [g]: y };
-              h.update({ urls: E });
-            } catch (y) {
-              h.update({
-                errors: { urls: { [g]: y.message } }
+              const E = await e.readURL(new URL(y)), A = { [y]: E };
+              p.update({ urls: A });
+            } catch (E) {
+              p.update({
+                errors: { urls: { [y]: E.message } }
               });
             }
-        const { modelAnnotation: m } = h.modelAnnotation(i == null ? void 0 : i._modelDef);
-        if (p.tables) {
-          const g = /* @__PURE__ */ new Map();
-          for (const y in p.tables) {
-            const { connectionName: E, tablePath: A } = p.tables[y], v = g.get(E);
-            v === void 0 ? g.set(E, { [y]: A }) : v[y] = A;
+        const { modelAnnotation: g } = p.modelAnnotation(i == null ? void 0 : i._modelDef);
+        if (m.tables) {
+          const y = /* @__PURE__ */ new Map();
+          for (const E in m.tables) {
+            const { connectionName: A, tablePath: v } = m.tables[E], S = y.get(A);
+            S === void 0 ? y.set(A, { [E]: v }) : S[E] = v;
           }
-          for (const [y, E] of g)
+          for (const [E, A] of y)
             try {
-              const A = await n.lookupConnection(y), { schemas: v, errors: _ } = await A.fetchSchemaForTables(E, {
-                refreshTimestamp: x,
-                modelAnnotation: m
+              const v = await n.lookupConnection(E), { schemas: S, errors: _ } = await v.fetchSchemaForTables(A, {
+                refreshTimestamp: h,
+                modelAnnotation: g
               });
-              h.update({ tables: v, errors: { tables: _ } });
-            } catch (A) {
-              const v = {}, _ = {};
-              for (const S in E)
-                _[S] = A.toString();
-              h.update({ tables: v, errors: { tables: _ } });
+              p.update({ tables: S, errors: { tables: _ } });
+            } catch (v) {
+              const S = {}, _ = {};
+              for (const C in A)
+                _[C] = v.toString();
+              p.update({ tables: S, errors: { tables: _ } });
             }
         }
-        if (p.compileSQL) {
-          const g = p.compileSQL, y = g.connection;
+        if (m.compileSQL) {
+          const y = m.compileSQL, E = y.connection;
           try {
-            const E = await n.lookupConnection(y), A = an.compileSQLBlock(p.partialModel, g, { replaceMaterializedReferences: u }), v = await E.fetchSchemaForSQLBlock(A, {
-              refreshTimestamp: x,
-              modelAnnotation: m
+            const A = await n.lookupConnection(E), v = an.compileSQLBlock(m.partialModel, y, { replaceMaterializedReferences: u, materializedTablePrefix: a }), S = await A.fetchSchemaForSQLBlock(v, {
+              refreshTimestamp: h,
+              modelAnnotation: g
             });
-            v.error && h.update({
-              errors: { compileSQL: { [A.name]: v.error } }
-            }), v.structDef && (0, Kl.isSQLBlockStruct)(v.structDef) && h.update({
-              compileSQL: { [A.name]: v.structDef }
+            S.error && p.update({
+              errors: { compileSQL: { [v.name]: S.error } }
+            }), S.structDef && (0, Kl.isSQLBlockStruct)(S.structDef) && p.update({
+              compileSQL: { [v.name]: S.structDef }
             });
-          } catch (E) {
-            const A = {};
-            A[g.name] = E.toString(), h.update({ errors: { compileSQL: A } });
+          } catch (A) {
+            const v = {};
+            v[y.name] = A.toString(), p.update({ errors: { compileSQL: v } });
           }
         }
       }
@@ -52304,7 +52304,8 @@ class L8 {
         parse: s,
         refreshSchemaCache: r,
         noThrowOnError: i,
-        replaceMaterializedReferences: n == null ? void 0 : n.replaceMaterializedReferences
+        replaceMaterializedReferences: n == null ? void 0 : n.replaceMaterializedReferences,
+        materializedTablePrefix: n == null ? void 0 : n.materializedTablePrefix
       });
     }, n);
   }
@@ -52500,8 +52501,7 @@ class T3 {
 }
 class Ag extends T3 {
   constructor(e, n, r) {
-    var i;
-    super(e, n), this.runtime = e, this.replaceMaterializedReferences = (i = r == null ? void 0 : r.replaceMaterializedReferences) !== null && i !== void 0 ? i : !1;
+    super(e, n), this.runtime = e, this.prepareResultOptions = r;
   }
   /**
    * Load the final (unnamed) Malloy query contained within this loaded `Model`.
@@ -52511,7 +52511,7 @@ class Ag extends T3 {
    */
   loadFinalQuery(e) {
     return this.makeQueryMaterializer(async () => (await this.materialize()).getPreparedQuery(), {
-      replaceMaterializedReferences: this.replaceMaterializedReferences,
+      ...this.prepareResultOptions,
       ...e
     });
   }
@@ -52524,7 +52524,7 @@ class Ag extends T3 {
    */
   loadQueryByIndex(e, n) {
     return this.makeQueryMaterializer(async () => (await this.materialize()).getPreparedQueryByIndex(e), {
-      replaceMaterializedReferences: this.replaceMaterializedReferences,
+      ...this.prepareResultOptions,
       ...n
     });
   }
@@ -52537,7 +52537,7 @@ class Ag extends T3 {
    */
   loadQueryByName(e, n) {
     return this.makeQueryMaterializer(async () => (await this.materialize()).getPreparedQueryByName(e), {
-      replaceMaterializedReferences: this.replaceMaterializedReferences,
+      ...this.prepareResultOptions,
       ...n
     });
   }
@@ -52551,25 +52551,24 @@ class Ag extends T3 {
   loadQuery(e, n) {
     const { refreshSchemaCache: r, noThrowOnError: i } = n || {};
     return this.makeQueryMaterializer(async () => {
-      var s;
-      const o = this.runtime.urlReader, u = this.runtime.connections;
+      const s = this.runtime.urlReader, o = this.runtime.connections;
       this.runtime.isTestRuntime && (n === void 0 ? n = { testEnvironment: !0 } : n = { ...n, testEnvironment: !0 });
-      const a = e instanceof URL ? await an.parse({
+      const u = e instanceof URL ? await an.parse({
         url: e,
-        urlReader: o,
+        urlReader: s,
         options: n
       }) : an.parse({
         source: e,
         options: n
-      }), l = await this.getModel();
+      }), a = await this.getModel();
       return (await an.compile({
-        urlReader: o,
-        connections: u,
-        parse: a,
-        model: l,
+        urlReader: s,
+        connections: o,
+        parse: u,
+        model: a,
         refreshSchemaCache: r,
         noThrowOnError: i,
-        replaceMaterializedReferences: (s = n == null ? void 0 : n.replaceMaterializedReferences) !== null && s !== void 0 ? s : this.replaceMaterializedReferences
+        ...this.prepareResultOptions
       })).preparedQuery;
     });
   }
@@ -52582,23 +52581,22 @@ class Ag extends T3 {
    */
   extendModel(e, n) {
     return this.runtime.isTestRuntime && (n === void 0 ? n = { testEnvironment: !0 } : n = { ...n, testEnvironment: !0 }), new Ag(this.runtime, async () => {
-      var r;
-      const i = this.runtime.urlReader, s = this.runtime.connections, o = e instanceof URL ? await an.parse({
+      const r = this.runtime.urlReader, i = this.runtime.connections, s = e instanceof URL ? await an.parse({
         url: e,
-        urlReader: i,
+        urlReader: r,
         options: n
       }) : an.parse({
         source: e,
         options: n
-      }), u = await this.getModel();
+      }), o = await this.getModel();
       return await an.compile({
-        urlReader: i,
-        connections: s,
-        parse: o,
-        model: u,
+        urlReader: r,
+        connections: i,
+        parse: s,
+        model: o,
         refreshSchemaCache: n == null ? void 0 : n.refreshSchemaCache,
         noThrowOnError: n == null ? void 0 : n.noThrowOnError,
-        replaceMaterializedReferences: (r = n == null ? void 0 : n.replaceMaterializedReferences) !== null && r !== void 0 ? r : this.replaceMaterializedReferences
+        ...this.prepareResultOptions
       });
     }, n);
   }
@@ -52720,7 +52718,7 @@ class Ag extends T3 {
       const r = await this.materialize();
       return new cd(e, r._modelDef, r.problems);
     }, {
-      replaceMaterializedReferences: this.replaceMaterializedReferences,
+      ...this.prepareResultOptions,
       ...n
     });
   }
@@ -52732,9 +52730,7 @@ class Ag extends T3 {
    * or loading further related objects.
    */
   loadExploreByName(e) {
-    return this.makeExploreMaterializer(async () => (await this.materialize()).getExploreByName(e), {
-      replaceMaterializedReferences: this.replaceMaterializedReferences
-    });
+    return this.makeExploreMaterializer(async () => (await this.materialize()).getExploreByName(e), this.prepareResultOptions);
   }
   /**
    * Materialize an explore contained within this loaded `Model` by its name.
@@ -52757,8 +52753,7 @@ class Ag extends T3 {
 Oe.ModelMaterializer = Ag;
 class rK extends T3 {
   constructor(e, n, r) {
-    var i;
-    super(e, n), this.runtime = e, this.replaceMaterializedReferences = (i = r == null ? void 0 : r.replaceMaterializedReferences) !== null && i !== void 0 ? i : !1;
+    super(e, n), this.runtime = e, this.prepareResultOptions = r;
   }
   /**
    * Run this loaded `Query`.
@@ -52767,14 +52762,14 @@ class rK extends T3 {
    */
   async run(e) {
     const n = this.runtime.connections, r = await this.getPreparedResult({
-      replaceMaterializedReferences: this.replaceMaterializedReferences,
+      ...this.prepareResultOptions,
       ...e
     }), i = ev(r, e);
     return an.run({ connections: n, preparedResult: r, options: i });
   }
   async *runStream(e) {
     const n = await this.getPreparedResult({
-      replaceMaterializedReferences: this.replaceMaterializedReferences,
+      ...this.prepareResultOptions,
       ...e
     }), r = this.runtime.connections, i = ev(n, e), s = an.runStream({
       connections: r,
@@ -52792,7 +52787,7 @@ class rK extends T3 {
    */
   loadPreparedResult(e) {
     return this.makePreparedResultMaterializer(async () => (await this.materialize()).getPreparedResult({
-      replaceMaterializedReferences: this.replaceMaterializedReferences,
+      ...this.prepareResultOptions,
       ...e
     }));
   }
@@ -52803,7 +52798,7 @@ class rK extends T3 {
    */
   getPreparedResult(e) {
     return this.loadPreparedResult({
-      replaceMaterializedReferences: this.replaceMaterializedReferences,
+      ...this.prepareResultOptions,
       ...e
     }).getPreparedResult();
   }
@@ -52814,7 +52809,7 @@ class rK extends T3 {
    */
   async getSQL(e) {
     return (await this.getPreparedResult({
-      replaceMaterializedReferences: this.replaceMaterializedReferences,
+      ...this.prepareResultOptions,
       ...e
     })).sql;
   }
@@ -52833,7 +52828,7 @@ class rK extends T3 {
    */
   async estimateQueryCost(e) {
     const n = this.runtime.connections, r = await this.getPreparedResult({
-      replaceMaterializedReferences: this.replaceMaterializedReferences,
+      ...this.prepareResultOptions,
       ...e
     });
     return an.estimateQueryCost({ connections: n, preparedResult: r });
@@ -53767,9 +53762,9 @@ var EK = { exports: {} };
       A[v] = v - 56;
     for (v = 79; v <= 81; ++v)
       A[v] = v - 34;
-    var _ = [];
-    _[5] = _[63] = '"$"#,##0_);\\("$"#,##0\\)', _[6] = _[64] = '"$"#,##0_);[Red]\\("$"#,##0\\)', _[7] = _[65] = '"$"#,##0.00_);\\("$"#,##0.00\\)', _[8] = _[66] = '"$"#,##0.00_);[Red]\\("$"#,##0.00\\)', _[41] = '_(* #,##0_);_(* \\(#,##0\\);_(* "-"_);_(@_)', _[42] = '_("$"* #,##0_);_("$"* \\(#,##0\\);_("$"* "-"_);_(@_)', _[43] = '_(* #,##0.00_);_(* \\(#,##0.00\\);_(* "-"??_);_(@_)', _[44] = '_("$"* #,##0.00_);_("$"* \\(#,##0.00\\);_("$"* "-"??_);_(@_)';
-    function S(T, w, $) {
+    var S = [];
+    S[5] = S[63] = '"$"#,##0_);\\("$"#,##0\\)', S[6] = S[64] = '"$"#,##0_);[Red]\\("$"#,##0\\)', S[7] = S[65] = '"$"#,##0.00_);\\("$"#,##0.00\\)', S[8] = S[66] = '"$"#,##0.00_);[Red]\\("$"#,##0.00\\)', S[41] = '_(* #,##0_);_(* \\(#,##0\\);_(* "-"_);_(@_)', S[42] = '_("$"* #,##0_);_("$"* \\(#,##0\\);_("$"* "-"_);_(@_)', S[43] = '_(* #,##0.00_);_(* \\(#,##0.00\\);_(* "-"??_);_(@_)', S[44] = '_("$"* #,##0.00_);_("$"* \\(#,##0.00\\);_("$"* "-"??_);_(@_)';
+    function _(T, w, $) {
       for (var q = T < 0 ? -1 : 1, I = T * q, z = 0, P = 1, K = 0, xe = 1, oe = 0, Z = 0, fe = Math.floor(I); oe < w && (fe = Math.floor(I), K = fe * P + z, Z = fe * oe + xe, !(I - fe < 5e-8)); )
         I = 1 / (I - fe), z = P, P = K, xe = oe, oe = Z;
       if (Z > w && (oe > w ? (Z = xe, K = z) : (Z = oe, K = P)), !$)
@@ -54075,9 +54070,9 @@ var EK = { exports: {} };
           return V = le(ye, "##########", ue), "(" + V.substr(0, 3) + ") " + V.substr(3, 3) + "-" + V.substr(6);
         var nt = "";
         if (de = ne.match(/^([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return we = Math.min(de[4].length, 7), qe = S(tt, Math.pow(10, we) - 1, !1), V = "" + mt, nt = ee("n", de[1], qe[1]), nt.charAt(nt.length - 1) == " " && (nt = nt.substr(0, nt.length - 1) + "0"), V += nt + de[2] + "/" + de[3], nt = l(qe[2], we), nt.length < de[4].length && (nt = fe(de[4].substr(de[4].length - nt.length)) + nt), V += nt, V;
+          return we = Math.min(de[4].length, 7), qe = _(tt, Math.pow(10, we) - 1, !1), V = "" + mt, nt = ee("n", de[1], qe[1]), nt.charAt(nt.length - 1) == " " && (nt = nt.substr(0, nt.length - 1) + "0"), V += nt + de[2] + "/" + de[3], nt = l(qe[2], we), nt.length < de[4].length && (nt = fe(de[4].substr(de[4].length - nt.length)) + nt), V += nt, V;
         if (de = ne.match(/^# ([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return we = Math.min(Math.max(de[1].length, de[4].length), 7), qe = S(tt, Math.pow(10, we) - 1, !0), mt + (qe[0] || (qe[1] ? "" : "0")) + " " + (qe[1] ? a(qe[1], we) + de[2] + "/" + de[3] + l(qe[2], we) : o(" ", 2 * we + 1 + de[2].length + de[3].length));
+          return we = Math.min(Math.max(de[1].length, de[4].length), 7), qe = _(tt, Math.pow(10, we) - 1, !0), mt + (qe[0] || (qe[1] ? "" : "0")) + " " + (qe[1] ? a(qe[1], we) + de[2] + "/" + de[3] + l(qe[2], we) : o(" ", 2 * we + 1 + de[2].length + de[3].length));
         if (de = ne.match(/^[#0?]+$/))
           return V = h(ue, 0), ne.length <= V.length ? V : fe(ne.substr(0, ne.length - V.length)) + V;
         if (de = ne.match(/^([#0?]+)\.([#0]+)$/)) {
@@ -54176,9 +54171,9 @@ var EK = { exports: {} };
           return V = Ne(ye, "##########", ue), "(" + V.substr(0, 3) + ") " + V.substr(3, 3) + "-" + V.substr(6);
         var nt = "";
         if (de = ne.match(/^([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return we = Math.min(de[4].length, 7), qe = S(tt, Math.pow(10, we) - 1, !1), V = "" + mt, nt = ee("n", de[1], qe[1]), nt.charAt(nt.length - 1) == " " && (nt = nt.substr(0, nt.length - 1) + "0"), V += nt + de[2] + "/" + de[3], nt = l(qe[2], we), nt.length < de[4].length && (nt = fe(de[4].substr(de[4].length - nt.length)) + nt), V += nt, V;
+          return we = Math.min(de[4].length, 7), qe = _(tt, Math.pow(10, we) - 1, !1), V = "" + mt, nt = ee("n", de[1], qe[1]), nt.charAt(nt.length - 1) == " " && (nt = nt.substr(0, nt.length - 1) + "0"), V += nt + de[2] + "/" + de[3], nt = l(qe[2], we), nt.length < de[4].length && (nt = fe(de[4].substr(de[4].length - nt.length)) + nt), V += nt, V;
         if (de = ne.match(/^# ([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return we = Math.min(Math.max(de[1].length, de[4].length), 7), qe = S(tt, Math.pow(10, we) - 1, !0), mt + (qe[0] || (qe[1] ? "" : "0")) + " " + (qe[1] ? a(qe[1], we) + de[2] + "/" + de[3] + l(qe[2], we) : o(" ", 2 * we + 1 + de[2].length + de[3].length));
+          return we = Math.min(Math.max(de[1].length, de[4].length), 7), qe = _(tt, Math.pow(10, we) - 1, !0), mt + (qe[0] || (qe[1] ? "" : "0")) + " " + (qe[1] ? a(qe[1], we) + de[2] + "/" + de[3] + l(qe[2], we) : o(" ", 2 * we + 1 + de[2].length + de[3].length));
         if (de = ne.match(/^[#0?]+$/))
           return V = "" + ue, ne.length <= V.length ? V : fe(ne.substr(0, ne.length - V.length)) + V;
         if (de = ne.match(/^([#0]+)\.([#0]+)$/)) {
@@ -54614,7 +54609,7 @@ var EK = { exports: {} };
           T == "m/d/yy" && $.dateNF ? q = $.dateNF : q = T;
           break;
         case "number":
-          T == 14 && $.dateNF ? q = $.dateNF : q = ($.table != null ? $.table : E)[T], q == null && (q = $.table && $.table[A[T]] || E[A[T]]), q == null && (q = _[T] || "General");
+          T == 14 && $.dateNF ? q = $.dateNF : q = ($.table != null ? $.table : E)[T], q == null && (q = $.table && $.table[A[T]] || E[A[T]]), q == null && (q = S[T] || "General");
           break;
       }
       if (p(q, 0))
@@ -55735,27 +55730,27 @@ function qOe(t) {
         return D6;
       if (A)
         return A = !1, UP;
-      var S, C = m, b;
+      var _, C = m, b;
       if (f.charCodeAt(C) === w6) {
         for (; m++ < p && f.charCodeAt(m) !== w6 || f.charCodeAt(++m) === w6; )
           ;
-        return (S = m) >= p ? E = !0 : (b = f.charCodeAt(m++)) === Mp ? A = !0 : b === N6 && (A = !0, f.charCodeAt(m) === Mp && ++m), f.slice(C + 1, S - 1).replace(/""/g, '"');
+        return (_ = m) >= p ? E = !0 : (b = f.charCodeAt(m++)) === Mp ? A = !0 : b === N6 && (A = !0, f.charCodeAt(m) === Mp && ++m), f.slice(C + 1, _ - 1).replace(/""/g, '"');
       }
       for (; m < p; ) {
-        if ((b = f.charCodeAt(S = m++)) === Mp)
+        if ((b = f.charCodeAt(_ = m++)) === Mp)
           A = !0;
         else if (b === N6)
           A = !0, f.charCodeAt(m) === Mp && ++m;
         else if (b !== n)
           continue;
-        return f.slice(C, S);
+        return f.slice(C, _);
       }
       return E = !0, f.slice(C, p);
     }
     for (; (y = v()) !== D6; ) {
-      for (var _ = []; y !== UP && y !== D6; )
-        _.push(y), y = v();
-      x && (_ = x(_, g++)) == null || h.push(_);
+      for (var S = []; y !== UP && y !== D6; )
+        S.push(y), y = v();
+      x && (S = x(S, g++)) == null || h.push(S);
     }
     return h;
   }
@@ -56387,18 +56382,18 @@ function _J(t) {
   var e = t.grouping === void 0 || t.thousands === void 0 ? WP : f7e(VP.call(t.grouping, Number), t.thousands + ""), n = t.currency === void 0 ? "" : t.currency[0] + "", r = t.currency === void 0 ? "" : t.currency[1] + "", i = t.decimal === void 0 ? "." : t.decimal + "", s = t.numerals === void 0 ? WP : x7e(VP.call(t.numerals, String)), o = t.percent === void 0 ? "%" : t.percent + "", u = t.minus === void 0 ? "−" : t.minus + "", a = t.nan === void 0 ? "NaN" : t.nan + "";
   function l(f) {
     f = Ef(f);
-    var x = f.fill, h = f.align, p = f.sign, m = f.symbol, g = f.zero, y = f.width, E = f.comma, A = f.precision, v = f.trim, _ = f.type;
-    _ === "n" ? (E = !0, _ = "g") : GP[_] || (A === void 0 && (A = 12), v = !0, _ = "g"), (g || x === "0" && h === "=") && (g = !0, x = "0", h = "=");
-    var S = m === "$" ? n : m === "#" && /[boxX]/.test(_) ? "0" + _.toLowerCase() : "", C = m === "$" ? r : /[%p]/.test(_) ? o : "", b = GP[_], R = /[defgprs%]/.test(_);
-    A = A === void 0 ? 6 : /[gprs]/.test(_) ? Math.max(1, Math.min(21, A)) : Math.max(0, Math.min(20, A));
+    var x = f.fill, h = f.align, p = f.sign, m = f.symbol, g = f.zero, y = f.width, E = f.comma, A = f.precision, v = f.trim, S = f.type;
+    S === "n" ? (E = !0, S = "g") : GP[S] || (A === void 0 && (A = 12), v = !0, S = "g"), (g || x === "0" && h === "=") && (g = !0, x = "0", h = "=");
+    var _ = m === "$" ? n : m === "#" && /[boxX]/.test(S) ? "0" + S.toLowerCase() : "", C = m === "$" ? r : /[%p]/.test(S) ? o : "", b = GP[S], R = /[defgprs%]/.test(S);
+    A = A === void 0 ? 6 : /[gprs]/.test(S) ? Math.max(1, Math.min(21, A)) : Math.max(0, Math.min(20, A));
     function O(L) {
-      var M = S, H = C, G, Q, Y;
-      if (_ === "c")
+      var M = _, H = C, G, Q, Y;
+      if (S === "c")
         H = b(L) + H, L = "";
       else {
         L = +L;
         var J = L < 0 || 1 / L < 0;
-        if (L = isNaN(L) ? a : b(Math.abs(L), A), v && (L = h7e(L)), J && +L == 0 && p !== "+" && (J = !1), M = (J ? p === "(" ? p : u : p === "-" || p === "(" ? "" : p) + M, H = (_ === "s" ? YP[8 + SJ / 3] : "") + H + (J && p === "(" ? ")" : ""), R) {
+        if (L = isNaN(L) ? a : b(Math.abs(L), A), v && (L = h7e(L)), J && +L == 0 && p !== "+" && (J = !1), M = (J ? p === "(" ? p : u : p === "-" || p === "(" ? "" : p) + M, H = (S === "s" ? YP[8 + SJ / 3] : "") + H + (J && p === "(" ? ")" : ""), R) {
           for (G = -1, Q = L.length; ++G < Q; )
             if (Y = L.charCodeAt(G), 48 > Y || Y > 57) {
               H = (Y === 46 ? i + L.slice(G + 1) : L.slice(G)) + H, L = L.slice(0, G);
@@ -56932,7 +56927,7 @@ function MJ(t) {
     Y: XDe,
     Z: JDe,
     "%": oj
-  }, _ = {
+  }, S = {
     a: O,
     A: L,
     b: M,
@@ -56966,8 +56961,8 @@ function MJ(t) {
     Z: aDe,
     "%": gDe
   };
-  A.x = S(n, A), A.X = S(r, A), A.c = S(e, A), v.x = S(n, v), v.X = S(r, v), v.c = S(e, v);
-  function S(T, w) {
+  A.x = _(n, A), A.X = _(r, A), A.c = _(e, A), v.x = _(n, v), v.X = _(r, v), v.c = _(e, v);
+  function _(T, w) {
     return function($) {
       var q = [], I = -1, z = 0, P = T.length, K, xe, oe;
       for ($ instanceof Date || ($ = /* @__PURE__ */ new Date(+$)); ++I < P; )
@@ -56998,7 +56993,7 @@ function MJ(t) {
       if (q >= P)
         return -1;
       if (K = w.charCodeAt(I++), K === 37) {
-        if (K = w.charAt(I++), xe = _[K in ZP ? w.charAt(I++) : K], !xe || (q = xe(T, $, q)) < 0)
+        if (K = w.charAt(I++), xe = S[K in ZP ? w.charAt(I++) : K], !xe || (q = xe(T, $, q)) < 0)
           return -1;
       } else if (K != $.charCodeAt(q++))
         return -1;
@@ -57072,7 +57067,7 @@ function MJ(t) {
   }
   return {
     format: function(T) {
-      var w = S(T += "", A);
+      var w = _(T += "", A);
       return w.toString = function() {
         return T;
       }, w;
@@ -57084,7 +57079,7 @@ function MJ(t) {
       }, w;
     },
     utcFormat: function(T) {
-      var w = S(T += "", v);
+      var w = _(T += "", v);
       return w.toString = function() {
         return T;
       }, w;
@@ -59080,11 +59075,11 @@ function _Z(t, e, n) {
   let a = 0, l = 0, c = 0, f = 0, x = 0, h, p, m, g;
   for (h = 0; h < u; )
     p = r[h], m = i[h++], g = p * p, a += (g - a) / h, l += (g * p - l) / h, c += (g * g - c) / h, f += (p * m - f) / h, x += (g * m - x) / h;
-  const y = c - a * a, E = a * y - l * l, A = (x * a - f * l) / E, v = (f * y - x * l) / E, _ = -A * a, S = (C) => (C = C - s, A * C * C + v * C + _ + o);
+  const y = c - a * a, E = a * y - l * l, A = (x * a - f * l) / E, v = (f * y - x * l) / E, S = -A * a, _ = (C) => (C = C - s, A * C * C + v * C + S + o);
   return {
-    coef: [_ - v * s + A * s * s + o, v - 2 * A * s, A],
-    predict: S,
-    rSquared: p2(t, e, n, o, S)
+    coef: [S - v * s + A * s * s + o, v - 2 * A * s, A],
+    predict: _,
+    rSquared: p2(t, e, n, o, _)
   };
 }
 function _Ne(t, e, n, r) {
@@ -59154,13 +59149,13 @@ function TNe(t, e, n, r) {
     const p = [0, l - 1];
     for (let g = 0; g < a; ++g) {
       const y = i[g], E = p[0], A = p[1], v = y - i[E] > i[A] - y ? E : A;
-      let _ = 0, S = 0, C = 0, b = 0, R = 0;
+      let S = 0, _ = 0, C = 0, b = 0, R = 0;
       const O = 1 / Math.abs(i[v] - y || 1);
       for (let H = E; H <= A; ++H) {
         const G = i[H], Q = s[H], Y = RNe(Math.abs(y - G) * O) * x[H], J = G * Y;
-        _ += Y, S += J, C += Q * Y, b += Q * J, R += G * J;
+        S += Y, _ += J, C += Q * Y, b += Q * J, R += G * J;
       }
-      const [L, M] = F3(S / _, C / _, b / _, R / _);
+      const [L, M] = F3(_ / S, C / S, b / S, R / S);
       c[g] = L + M * y, f[g] = Math.abs(s[g] - c[g]), ONe(i, g + 1, p);
     }
     if (h === Ej)
@@ -60459,15 +60454,15 @@ function e8e(t) {
 }
 De(yF, pe, {
   transform(t, e) {
-    var n = e.fork(e.ALL), r = ZNe(t), i = e8e(t), s = wn(t.field), o = wn(t.key), u = (t.groupby || []).map(wn), a = t8e(e.source, t.groupby, t.key, t.keyvals), l = [], c = this.value, f = a.domain.length, x, h, p, m, g, y, E, A, v, _;
+    var n = e.fork(e.ALL), r = ZNe(t), i = e8e(t), s = wn(t.field), o = wn(t.key), u = (t.groupby || []).map(wn), a = t8e(e.source, t.groupby, t.key, t.keyvals), l = [], c = this.value, f = a.domain.length, x, h, p, m, g, y, E, A, v, S;
     for (g = 0, A = a.length; g < A; ++g)
       for (x = a[g], p = x.values, h = NaN, E = 0; E < f; ++E)
         if (x[E] == null) {
-          for (m = a.domain[E], _ = {
+          for (m = a.domain[E], S = {
             _impute: !0
           }, y = 0, v = p.length; y < v; ++y)
-            _[u[y]] = p[y];
-          _[o] = m, _[s] = Number.isNaN(h) ? h = r(x, i) : h, l.push(kt(_));
+            S[u[y]] = p[y];
+          S[o] = m, S[s] = Number.isNaN(h) ? h = r(x, i) : h, l.push(kt(S));
         }
     return l.length && (n.add = n.materialize(n.ADD).add.concat(l)), c.length && (n.rem = n.materialize(n.REM).rem.concat(c)), this.value = l, n;
   }
@@ -61474,8 +61469,8 @@ let DF = class {
       if (!(Math.abs(f * a - l * c) > Sc) || !s)
         this._append`L${this._x1 = e},${this._y1 = n}`;
       else {
-        let h = r - o, p = i - u, m = a * a + l * l, g = h * h + p * p, y = Math.sqrt(m), E = Math.sqrt(x), A = s * Math.tan((u7 - Math.acos((m + x - g) / (2 * y * E))) / 2), v = A / E, _ = A / y;
-        Math.abs(v - 1) > Sc && this._append`L${e + v * c},${n + v * f}`, this._append`A${s},${s},0,0,${+(f * h > c * p)},${this._x1 = e + _ * a},${this._y1 = n + _ * l}`;
+        let h = r - o, p = i - u, m = a * a + l * l, g = h * h + p * p, y = Math.sqrt(m), E = Math.sqrt(x), A = s * Math.tan((u7 - Math.acos((m + x - g) / (2 * y * E))) / 2), v = A / E, S = A / y;
+        Math.abs(v - 1) > Sc && this._append`L${e + v * c},${n + v * f}`, this._append`A${s},${s},0,0,${+(f * h > c * p)},${this._x1 = e + S * a},${this._y1 = n + S * l}`;
       }
   }
   arc(e, n, r, i, s, o) {
@@ -61532,14 +61527,14 @@ function O8e(t, e, n, r, i, s, o, u) {
     return x = (c * (e - s) - f * (t - i)) / x, [t + x * a, e + x * l];
 }
 function Vy(t, e, n, r, i, s, o) {
-  var u = t - n, a = e - r, l = (o ? s : -s) / Ic(u * u + a * a), c = l * a, f = -l * u, x = t + c, h = e + f, p = n + c, m = r + f, g = (x + p) / 2, y = (h + m) / 2, E = p - x, A = m - h, v = E * E + A * A, _ = i - s, S = x * m - p * h, C = (A < 0 ? -1 : 1) * Ic(E8e(0, _ * _ * v - S * S)), b = (S * A - E * C) / v, R = (-S * E - A * C) / v, O = (S * A + E * C) / v, L = (-S * E + A * C) / v, M = b - g, H = R - y, G = O - g, Q = L - y;
+  var u = t - n, a = e - r, l = (o ? s : -s) / Ic(u * u + a * a), c = l * a, f = -l * u, x = t + c, h = e + f, p = n + c, m = r + f, g = (x + p) / 2, y = (h + m) / 2, E = p - x, A = m - h, v = E * E + A * A, S = i - s, _ = x * m - p * h, C = (A < 0 ? -1 : 1) * Ic(E8e(0, S * S * v - _ * _)), b = (_ * A - E * C) / v, R = (-_ * E - A * C) / v, O = (_ * A + E * C) / v, L = (-_ * E + A * C) / v, M = b - g, H = R - y, G = O - g, Q = L - y;
   return M * M + H * H > G * G + Q * Q && (b = O, R = L), {
     cx: b,
     cy: R,
     x01: -c,
     y01: -f,
-    x11: b * (i / _ - 1),
-    y11: R * (i / _ - 1)
+    x11: b * (i / S - 1),
+    y11: R * (i / S - 1)
   };
 }
 function D8e() {
@@ -61551,12 +61546,12 @@ function D8e() {
     else if (g > KZ - Dr)
       u.moveTo(h * pc(p), h * zo(p)), u.arc(0, 0, h, p, m, !y), x > Dr && (u.moveTo(x * pc(m), x * zo(m)), u.arc(0, 0, x, m, p, y));
     else {
-      var E = p, A = m, v = p, _ = m, S = g, C = g, b = o.apply(this, arguments) / 2, R = b > Dr && (r ? +r.apply(this, arguments) : Ic(x * x + h * h)), O = q6(_j(h - x) / 2, +n.apply(this, arguments)), L = O, M = O, H, G;
+      var E = p, A = m, v = p, S = m, _ = g, C = g, b = o.apply(this, arguments) / 2, R = b > Dr && (r ? +r.apply(this, arguments) : Ic(x * x + h * h)), O = q6(_j(h - x) / 2, +n.apply(this, arguments)), L = O, M = O, H, G;
       if (R > Dr) {
         var Q = Cj(R / x * zo(b)), Y = Cj(R / h * zo(b));
-        (S -= Q * 2) > Dr ? (Q *= y ? 1 : -1, v += Q, _ -= Q) : (S = 0, v = _ = (p + m) / 2), (C -= Y * 2) > Dr ? (Y *= y ? 1 : -1, E += Y, A -= Y) : (C = 0, E = A = (p + m) / 2);
+        (_ -= Q * 2) > Dr ? (Q *= y ? 1 : -1, v += Q, S -= Q) : (_ = 0, v = S = (p + m) / 2), (C -= Y * 2) > Dr ? (Y *= y ? 1 : -1, E += Y, A -= Y) : (C = 0, E = A = (p + m) / 2);
       }
-      var J = h * pc(E), ee = h * zo(E), X = x * pc(_), re = x * zo(_);
+      var J = h * pc(E), ee = h * zo(E), X = x * pc(S), re = x * zo(S);
       if (O > Dr) {
         var se = h * pc(A), Ee = h * zo(A), D = x * pc(v), k = x * zo(v), j;
         if (g < Xd)
@@ -61566,7 +61561,7 @@ function D8e() {
           } else
             L = M = 0;
       }
-      C > Dr ? M > Dr ? (H = Vy(D, k, J, ee, h, M, y), G = Vy(se, Ee, X, re, h, M, y), u.moveTo(H.cx + H.x01, H.cy + H.y01), M < O ? u.arc(H.cx, H.cy, M, Rr(H.y01, H.x01), Rr(G.y01, G.x01), !y) : (u.arc(H.cx, H.cy, M, Rr(H.y01, H.x01), Rr(H.y11, H.x11), !y), u.arc(0, 0, h, Rr(H.cy + H.y11, H.cx + H.x11), Rr(G.cy + G.y11, G.cx + G.x11), !y), u.arc(G.cx, G.cy, M, Rr(G.y11, G.x11), Rr(G.y01, G.x01), !y))) : (u.moveTo(J, ee), u.arc(0, 0, h, E, A, !y)) : u.moveTo(J, ee), !(x > Dr) || !(S > Dr) ? u.lineTo(X, re) : L > Dr ? (H = Vy(X, re, se, Ee, x, -L, y), G = Vy(J, ee, D, k, x, -L, y), u.lineTo(H.cx + H.x01, H.cy + H.y01), L < O ? u.arc(H.cx, H.cy, L, Rr(H.y01, H.x01), Rr(G.y01, G.x01), !y) : (u.arc(H.cx, H.cy, L, Rr(H.y01, H.x01), Rr(H.y11, H.x11), !y), u.arc(0, 0, x, Rr(H.cy + H.y11, H.cx + H.x11), Rr(G.cy + G.y11, G.cx + G.x11), y), u.arc(G.cx, G.cy, L, Rr(G.y11, G.x11), Rr(G.y01, G.x01), !y))) : u.arc(0, 0, x, _, v, y);
+      C > Dr ? M > Dr ? (H = Vy(D, k, J, ee, h, M, y), G = Vy(se, Ee, X, re, h, M, y), u.moveTo(H.cx + H.x01, H.cy + H.y01), M < O ? u.arc(H.cx, H.cy, M, Rr(H.y01, H.x01), Rr(G.y01, G.x01), !y) : (u.arc(H.cx, H.cy, M, Rr(H.y01, H.x01), Rr(H.y11, H.x11), !y), u.arc(0, 0, h, Rr(H.cy + H.y11, H.cx + H.x11), Rr(G.cy + G.y11, G.cx + G.x11), !y), u.arc(G.cx, G.cy, M, Rr(G.y11, G.x11), Rr(G.y01, G.x01), !y))) : (u.moveTo(J, ee), u.arc(0, 0, h, E, A, !y)) : u.moveTo(J, ee), !(x > Dr) || !(_ > Dr) ? u.lineTo(X, re) : L > Dr ? (H = Vy(X, re, se, Ee, x, -L, y), G = Vy(J, ee, D, k, x, -L, y), u.lineTo(H.cx + H.x01, H.cy + H.y01), L < O ? u.arc(H.cx, H.cy, L, Rr(H.y01, H.x01), Rr(G.y01, G.x01), !y) : (u.arc(H.cx, H.cy, L, Rr(H.y01, H.x01), Rr(H.y11, H.x11), !y), u.arc(0, 0, x, Rr(H.cy + H.y11, H.cx + H.x11), Rr(G.cy + G.y11, G.cx + G.x11), y), u.arc(G.cx, G.cy, L, Rr(G.y11, G.x11), Rr(G.y01, G.x01), !y))) : u.arc(0, 0, x, S, v, y);
     }
     if (u.closePath(), c)
       return u = null, c + "" || null;
@@ -63126,13 +63121,13 @@ const bFe = function t(e, n, r) {
         ];
       };
     else {
-      var E = Math.sqrt(m), A = (x * x - l * l + r * m) / (2 * l * n * E), v = (x * x - l * l - r * m) / (2 * x * n * E), _ = Math.log(Math.sqrt(A * A + 1) - A), S = Math.log(Math.sqrt(v * v + 1) - v);
-      y = (S - _) / e, g = function(C) {
-        var b = C * y, R = Uj(_), O = l / (n * E) * (R * CFe(e * b + _) - _Fe(_));
+      var E = Math.sqrt(m), A = (x * x - l * l + r * m) / (2 * l * n * E), v = (x * x - l * l - r * m) / (2 * x * n * E), S = Math.log(Math.sqrt(A * A + 1) - A), _ = Math.log(Math.sqrt(v * v + 1) - v);
+      y = (_ - S) / e, g = function(C) {
+        var b = C * y, R = Uj(S), O = l / (n * E) * (R * CFe(e * b + S) - _Fe(S));
         return [
           u + O * h,
           a + O * p,
-          l * R / Uj(e * b + _)
+          l * R / Uj(e * b + S)
         ];
       };
     }
@@ -63587,21 +63582,21 @@ function VFe(t) {
 }
 function GF(t, e, n, r, i, s, o, u, a, l) {
   var c = Uee(), f = c.invert, x = c.domain, h = l(".%L"), p = l(":%S"), m = l("%I:%M"), g = l("%I %p"), y = l("%a %d"), E = l("%b %d"), A = l("%B"), v = l("%Y");
-  function _(S) {
-    return (a(S) < S ? h : u(S) < S ? p : o(S) < S ? m : s(S) < S ? g : r(S) < S ? i(S) < S ? y : E : n(S) < S ? A : v)(S);
-  }
-  return c.invert = function(S) {
-    return new Date(f(S));
-  }, c.domain = function(S) {
-    return arguments.length ? x(Array.from(S, VFe)) : x().map(WFe);
-  }, c.ticks = function(S) {
+  function S(_) {
+    return (a(_) < _ ? h : u(_) < _ ? p : o(_) < _ ? m : s(_) < _ ? g : r(_) < _ ? i(_) < _ ? y : E : n(_) < _ ? A : v)(_);
+  }
+  return c.invert = function(_) {
+    return new Date(f(_));
+  }, c.domain = function(_) {
+    return arguments.length ? x(Array.from(_, VFe)) : x().map(WFe);
+  }, c.ticks = function(_) {
     var C = x();
-    return t(C[0], C[C.length - 1], S ?? 10);
-  }, c.tickFormat = function(S, C) {
-    return C == null ? _ : l(C);
-  }, c.nice = function(S) {
+    return t(C[0], C[C.length - 1], _ ?? 10);
+  }, c.tickFormat = function(_, C) {
+    return C == null ? S : l(C);
+  }, c.nice = function(_) {
     var C = x();
-    return (!S || typeof S.range != "function") && (S = e(C[0], C[C.length - 1], S ?? 10)), S ? x(Qee(C, S)) : c;
+    return (!_ || typeof _.range != "function") && (_ = e(C[0], C[C.length - 1], _ ?? 10)), _ ? x(Qee(C, _)) : c;
   }, c.copy = function() {
     return k3(c, GF(t, e, n, r, i, s, o, u, a, l));
   }, c;
@@ -64258,13 +64253,13 @@ function M9e(t, e, n, r, i, s, o, u, a) {
   const h = x * (u - t) * 0.5 + f * (a - e) * 0.5, p = x * (a - e) * 0.5 - f * (u - t) * 0.5;
   let m = h * h / (n * n) + p * p / (r * r);
   m > 1 && (m = Math.sqrt(m), n *= m, r *= m);
-  const g = x / n, y = f / n, E = -f / r, A = x / r, v = g * u + y * a, _ = E * u + A * a, S = g * t + y * e, C = E * t + A * e;
-  let R = 1 / ((S - v) * (S - v) + (C - _) * (C - _)) - 0.25;
+  const g = x / n, y = f / n, E = -f / r, A = x / r, v = g * u + y * a, S = E * u + A * a, _ = g * t + y * e, C = E * t + A * e;
+  let R = 1 / ((_ - v) * (_ - v) + (C - S) * (C - S)) - 0.25;
   R < 0 && (R = 0);
   let O = Math.sqrt(R);
   s == i && (O = -O);
-  const L = 0.5 * (v + S) - O * (C - _), M = 0.5 * (_ + C) + O * (S - v), H = Math.atan2(_ - M, v - L);
-  let Q = Math.atan2(C - M, S - L) - H;
+  const L = 0.5 * (v + _) - O * (C - S), M = 0.5 * (S + C) + O * (_ - v), H = Math.atan2(S - M, v - L);
+  let Q = Math.atan2(C - M, _ - L) - H;
   Q < 0 && s === 1 ? Q += eu : Q > 0 && s === 0 && (Q -= eu);
   const Y = Math.ceil(Math.abs(Q / (Dc + 1e-3))), J = [];
   for (let ee = 0; ee < Y; ++ee) {
@@ -64278,8 +64273,8 @@ function P9e(t) {
   if (K6[e])
     return K6[e];
   var n = t[0], r = t[1], i = t[2], s = t[3], o = t[4], u = t[5], a = t[6], l = t[7];
-  const c = l * o, f = -a * u, x = a * o, h = l * u, p = Math.cos(i), m = Math.sin(i), g = Math.cos(s), y = Math.sin(s), E = 0.5 * (s - i), A = Math.sin(E * 0.5), v = 8 / 3 * A * A / Math.sin(E), _ = n + p - v * m, S = r + m + v * p, C = n + g, b = r + y, R = C + v * y, O = b - v * g;
-  return K6[e] = [c * _ + f * S, x * _ + h * S, c * R + f * O, x * R + h * O, c * C + f * b, x * C + h * b];
+  const c = l * o, f = -a * u, x = a * o, h = l * u, p = Math.cos(i), m = Math.sin(i), g = Math.cos(s), y = Math.sin(s), E = 0.5 * (s - i), A = Math.sin(E * 0.5), v = 8 / 3 * A * A / Math.sin(E), S = n + p - v * m, _ = r + m + v * p, C = n + g, b = r + y, R = C + v * y, O = b - v * g;
+  return K6[e] = [c * S + f * _, x * S + h * _, c * R + f * O, x * R + h * O, c * C + f * b, x * C + h * b];
 }
 const Cs = ["l", 0, 0, 0, 0, 0, 0, 0];
 function j9e(t, e, n) {
@@ -64508,12 +64503,12 @@ function Jy(t, e, n) {
 function W9e() {
   var t = z9e, e = H9e, n = Q9e, r = G9e, i = la(0), s = i, o = i, u = i, a = null;
   function l(c, f, x) {
-    var h, p = f ?? +t.call(this, c), m = x ?? +e.call(this, c), g = +n.call(this, c), y = +r.call(this, c), E = Math.min(g, y) / 2, A = Jy(+i.call(this, c), 0, E), v = Jy(+s.call(this, c), 0, E), _ = Jy(+o.call(this, c), 0, E), S = Jy(+u.call(this, c), 0, E);
-    if (a || (a = h = wF()), A <= 0 && v <= 0 && _ <= 0 && S <= 0)
+    var h, p = f ?? +t.call(this, c), m = x ?? +e.call(this, c), g = +n.call(this, c), y = +r.call(this, c), E = Math.min(g, y) / 2, A = Jy(+i.call(this, c), 0, E), v = Jy(+s.call(this, c), 0, E), S = Jy(+o.call(this, c), 0, E), _ = Jy(+u.call(this, c), 0, E);
+    if (a || (a = h = wF()), A <= 0 && v <= 0 && S <= 0 && _ <= 0)
       a.rect(p, m, g, y);
     else {
       var C = p + g, b = m + y;
-      a.moveTo(p + A, m), a.lineTo(C - v, m), a.bezierCurveTo(C - _l * v, m, C, m + _l * v, C, m + v), a.lineTo(C, b - S), a.bezierCurveTo(C, b - _l * S, C - _l * S, b, C - S, b), a.lineTo(p + _, b), a.bezierCurveTo(p + _l * _, b, p, b - _l * _, p, b - _), a.lineTo(p, m + A), a.bezierCurveTo(p, m + _l * A, p + _l * A, m, p + A, m), a.closePath();
+      a.moveTo(p + A, m), a.lineTo(C - v, m), a.bezierCurveTo(C - _l * v, m, C, m + _l * v, C, m + v), a.lineTo(C, b - _), a.bezierCurveTo(C, b - _l * _, C - _l * _, b, C - _, b), a.lineTo(p + S, b), a.bezierCurveTo(p + _l * S, b, p, b - _l * S, p, b - S), a.lineTo(p, m + A), a.bezierCurveTo(p, m + _l * A, p + _l * A, m, p + A, m), a.closePath();
     }
     if (h)
       return a = null, h + "" || null;
@@ -66918,19 +66913,19 @@ function wBe(t) {
   ];
 }
 function NBe(t, e, n, r) {
-  var i = e.items[0], s = i.datum, o = i.translate != null ? i.translate : 0.5, u = i.orient, a = wBe(s), l = i.range, c = i.offset, f = i.position, x = i.minExtent, h = i.maxExtent, p = s.title && i.items[a[2]].items[0], m = i.titlePadding, g = i.bounds, y = p && Ute(p), E = 0, A = 0, v, _;
+  var i = e.items[0], s = i.datum, o = i.translate != null ? i.translate : 0.5, u = i.orient, a = wBe(s), l = i.range, c = i.offset, f = i.position, x = i.minExtent, h = i.maxExtent, p = s.title && i.items[a[2]].items[0], m = i.titlePadding, g = i.bounds, y = p && Ute(p), E = 0, A = 0, v, S;
   switch (wr.clear().union(g), g.clear(), (v = a[0]) > -1 && g.union(i.items[v].bounds), (v = a[1]) > -1 && g.union(i.items[v].bounds), u) {
     case ih:
-      E = f || 0, A = -c, _ = Math.max(x, Math.min(h, -g.y1)), g.add(0, -_).add(l, 0), p && tE(t, p, _, m, y, 0, -1, g);
+      E = f || 0, A = -c, S = Math.max(x, Math.min(h, -g.y1)), g.add(0, -S).add(l, 0), p && tE(t, p, S, m, y, 0, -1, g);
       break;
     case ao:
-      E = -c, A = f || 0, _ = Math.max(x, Math.min(h, -g.x1)), g.add(-_, 0).add(0, l), p && tE(t, p, _, m, y, 1, -1, g);
+      E = -c, A = f || 0, S = Math.max(x, Math.min(h, -g.x1)), g.add(-S, 0).add(0, l), p && tE(t, p, S, m, y, 1, -1, g);
       break;
     case fo:
-      E = n + c, A = f || 0, _ = Math.max(x, Math.min(h, g.x2)), g.add(0, 0).add(_, l), p && tE(t, p, _, m, y, 1, 1, g);
+      E = n + c, A = f || 0, S = Math.max(x, Math.min(h, g.x2)), g.add(0, 0).add(S, l), p && tE(t, p, S, m, y, 1, 1, g);
       break;
     case A0:
-      E = f || 0, A = r + c, _ = Math.max(x, Math.min(h, g.y2)), g.add(0, 0).add(l, _), p && tE(t, p, _, m, 0, 0, 1, g);
+      E = f || 0, A = r + c, S = Math.max(x, Math.min(h, g.y2)), g.add(0, 0).add(l, S), p && tE(t, p, S, m, 0, 0, 1, g);
       break;
     default:
       E = i.x, A = i.y;
@@ -67003,13 +66998,13 @@ function wU(t) {
   return t < 0 ? Math.ceil(-t) : 0;
 }
 function Fne(t, e, n) {
-  var r = !n.nodirty, i = n.bounds === I9 ? LBe : IBe, s = wr.set(0, 0, 0, 0), o = sn(n.align, zl), u = sn(n.align, Hl), a = sn(n.padding, zl), l = sn(n.padding, Hl), c = n.columns || e.length, f = c <= 0 ? 1 : Math.ceil(e.length / c), x = e.length, h = Array(x), p = Array(c), m = 0, g = Array(x), y = Array(f), E = 0, A = Array(x), v = Array(x), _ = Array(x), S, C, b, R, O, L, M, H, G, Q, Y;
+  var r = !n.nodirty, i = n.bounds === I9 ? LBe : IBe, s = wr.set(0, 0, 0, 0), o = sn(n.align, zl), u = sn(n.align, Hl), a = sn(n.padding, zl), l = sn(n.padding, Hl), c = n.columns || e.length, f = c <= 0 ? 1 : Math.ceil(e.length / c), x = e.length, h = Array(x), p = Array(c), m = 0, g = Array(x), y = Array(f), E = 0, A = Array(x), v = Array(x), S = Array(x), _, C, b, R, O, L, M, H, G, Q, Y;
   for (C = 0; C < c; ++C)
     p[C] = 0;
   for (C = 0; C < f; ++C)
     y[C] = 0;
   for (C = 0; C < x; ++C)
-    L = e[C], O = _[C] = i(L), L.x = L.x || 0, A[C] = 0, L.y = L.y || 0, v[C] = 0, b = C % c, R = ~~(C / c), m = Math.max(m, M = Math.ceil(O.x2)), E = Math.max(E, H = Math.ceil(O.y2)), p[b] = Math.max(p[b], M), y[R] = Math.max(y[R], H), h[C] = a + wU(O.x1), g[C] = l + wU(O.y1), r && t.dirty(e[C]);
+    L = e[C], O = S[C] = i(L), L.x = L.x || 0, A[C] = 0, L.y = L.y || 0, v[C] = 0, b = C % c, R = ~~(C / c), m = Math.max(m, M = Math.ceil(O.x2)), E = Math.max(E, H = Math.ceil(O.y2)), p[b] = Math.max(p[b], M), y[R] = Math.max(y[R], H), h[C] = a + wU(O.x1), g[C] = l + wU(O.y1), r && t.dirty(e[C]);
   for (C = 0; C < x; ++C)
     C % c === 0 && (h[C] = 0), C < c && (g[C] = 0);
   if (o === N7)
@@ -67030,9 +67025,9 @@ function Fne(t, e, n) {
         h[C] += p[b - 1];
   if (u === N7)
     for (R = 1; R < f; ++R) {
-      for (Y = 0, C = R * c, S = C + c; C < S; ++C)
+      for (Y = 0, C = R * c, _ = C + c; C < _; ++C)
         Y < g[C] && (Y = g[C]);
-      for (C = R * c; C < S; ++C)
+      for (C = R * c; C < _; ++C)
         g[C] = Y + y[R - 1];
     }
   else if (u === Zy) {
@@ -67042,7 +67037,7 @@ function Fne(t, e, n) {
       g[C] = Y + E;
   } else
     for (u = !1, R = 1; R < f; ++R)
-      for (C = R * c, S = C + c; C < S; ++C)
+      for (C = R * c, _ = C + c; C < _; ++C)
         g[C] += y[R - 1];
   for (G = 0, C = 0; C < x; ++C)
     G = h[C] + (C % c ? G : 0), A[C] += G - e[C].x;
@@ -67051,12 +67046,12 @@ function Fne(t, e, n) {
       Q += g[C], v[C] += Q - e[C].y;
   if (o && sn(n.center, zl) && f > 1)
     for (C = 0; C < x; ++C)
-      O = o === Zy ? m : p[C % c], G = O - _[C].x2 - e[C].x - A[C], G > 0 && (A[C] += G / 2);
+      O = o === Zy ? m : p[C % c], G = O - S[C].x2 - e[C].x - A[C], G > 0 && (A[C] += G / 2);
   if (u && sn(n.center, Hl) && c !== 1)
     for (C = 0; C < x; ++C)
-      O = u === Zy ? E : y[~~(C / c)], Q = O - _[C].y2 - e[C].y - v[C], Q > 0 && (v[C] += Q / 2);
+      O = u === Zy ? E : y[~~(C / c)], Q = O - S[C].y2 - e[C].y - v[C], Q > 0 && (v[C] += Q / 2);
   for (C = 0; C < x; ++C)
-    s.union(_[C].translate(A[C], v[C]));
+    s.union(S[C].translate(A[C], v[C]));
   switch (G = sn(n.anchor, yBe), Q = sn(n.anchor, EBe), sn(n.anchor, zl)) {
     case ei:
       G -= s.width();
@@ -67089,7 +67084,7 @@ function kBe(t, e) {
   return t.bounds[e];
 }
 function nE(t, e, n, r, i, s, o, u, a, l, c, f, x, h) {
-  var p = n.length, m = 0, g = 0, y, E, A, v, _, S, C, b, R;
+  var p = n.length, m = 0, g = 0, y, E, A, v, S, _, C, b, R;
   if (!p)
     return m;
   for (y = c; y < p; y += f)
@@ -67099,9 +67094,9 @@ function nE(t, e, n, r, i, s, o, u, a, l, c, f, x, h) {
   for (e.length > i && (t.warn("Grid headers exceed limit: " + i), e = e.slice(0, i)), m += s, E = 0, v = e.length; E < v; ++E)
     t.dirty(e[E]), e[E].mark.bounds.clear();
   for (y = c, E = 0, v = e.length; E < v; ++E, y += f) {
-    for (S = e[E], _ = S.mark.bounds, A = y; A >= 0 && (C = n[A]) == null; A -= x)
+    for (_ = e[E], S = _.mark.bounds, A = y; A >= 0 && (C = n[A]) == null; A -= x)
       ;
-    u ? (b = h == null ? C.x : Math.round(C.bounds.x1 + h * C.bounds.width()), R = m) : (b = m, R = h == null ? C.y : Math.round(C.bounds.y1 + h * C.bounds.height())), _.union(S.bounds.translate(b - (S.x || 0), R - (S.y || 0))), S.x = b, S.y = R, t.dirty(S), g = o(g, _[l]);
+    u ? (b = h == null ? C.x : Math.round(C.bounds.x1 + h * C.bounds.width()), R = m) : (b = m, R = h == null ? C.y : Math.round(C.bounds.y1 + h * C.bounds.height())), S.union(_.bounds.translate(b - (_.x || 0), R - (_.y || 0))), _.x = b, _.y = R, t.dirty(_), g = o(g, S[l]);
   }
   return g;
 }
@@ -68183,8 +68178,8 @@ function H$e(t, e) {
   i === 1 ? r = Sn + Je : i === -1 && (r = -Sn - Je);
   for (var l = 0, c = t.length; l < c; ++l)
     if (x = (f = t[l]).length)
-      for (var f, x, h = f[x - 1], p = sR(h), m = h[1] / 2 + wv, g = Ye(m), y = et(m), E = 0; E < x; ++E, p = v, g = S, y = C, h = A) {
-        var A = f[E], v = sR(A), _ = A[1] / 2 + wv, S = Ye(_), C = et(_), b = v - p, R = b >= 0 ? 1 : -1, O = R * b, L = O > gt, M = g * S;
+      for (var f, x, h = f[x - 1], p = sR(h), m = h[1] / 2 + wv, g = Ye(m), y = et(m), E = 0; E < x; ++E, p = v, g = _, y = C, h = A) {
+        var A = f[E], v = sR(A), S = A[1] / 2 + wv, _ = Ye(S), C = et(S), b = v - p, R = b >= 0 ? 1 : -1, O = R * b, L = O > gt, M = g * _;
         if (a.add(Gs(M * R * Ye(O), y * C + M * et(O))), o += L ? b + R * yi : b, L ^ p >= n ^ v >= n) {
           var H = sh(bf(h), bf(A));
           $v(H);
@@ -68214,11 +68209,11 @@ function lre(t, e, n, r) {
         i.polygonStart(), i.lineStart(), n(null, null, 1, i), i.lineEnd(), i.polygonEnd();
       }
     };
-    function h(v, _) {
-      t(v, _) && i.point(v, _);
+    function h(v, S) {
+      t(v, S) && i.point(v, S);
     }
-    function p(v, _) {
-      s.point(v, _);
+    function p(v, S) {
+      s.point(v, S);
     }
     function m() {
       x.point = p, s.lineStart();
@@ -68226,25 +68221,25 @@ function lre(t, e, n, r) {
     function g() {
       x.point = h, s.lineEnd();
     }
-    function y(v, _) {
-      f.push([v, _]), u.point(v, _);
+    function y(v, S) {
+      f.push([v, S]), u.point(v, S);
     }
     function E() {
       u.lineStart(), f = [];
     }
     function A() {
       y(f[0][0], f[0][1]), u.lineEnd();
-      var v = u.clean(), _ = o.result(), S, C = _.length, b, R, O;
+      var v = u.clean(), S = o.result(), _, C = S.length, b, R, O;
       if (f.pop(), l.push(f), f = null, !!C) {
         if (v & 1) {
-          if (R = _[0], (b = R.length - 1) > 0) {
-            for (a || (i.polygonStart(), a = !0), i.lineStart(), S = 0; S < b; ++S)
-              i.point((O = R[S])[0], O[1]);
+          if (R = S[0], (b = R.length - 1) > 0) {
+            for (a || (i.polygonStart(), a = !0), i.lineStart(), _ = 0; _ < b; ++_)
+              i.point((O = R[_])[0], O[1]);
             i.lineEnd();
           }
           return;
         }
-        C > 1 && v & 2 && _.push(_.pop().concat(_.shift())), c.push(_.filter(Q$e));
+        C > 1 && v & 2 && S.push(S.pop().concat(S.shift())), c.push(S.filter(Q$e));
       }
     }
     return x;
@@ -68311,14 +68306,14 @@ function X$e(t) {
         p = h = !1, m = 1;
       },
       point: function(g, y) {
-        var E = [g, y], A, v = o(g, y), _ = r ? v ? 0 : l(g, y) : v ? l(g + (g < 0 ? gt : -gt), y) : 0;
+        var E = [g, y], A, v = o(g, y), S = r ? v ? 0 : l(g, y) : v ? l(g + (g < 0 ? gt : -gt), y) : 0;
         if (!f && (p = h = v) && c.lineStart(), v !== h && (A = a(f, E), (!A || KE(f, A) || KE(E, A)) && (E[2] = 1)), v !== h)
           m = 0, v ? (c.lineStart(), A = a(E, f), c.point(A[0], A[1])) : (A = a(f, E), c.point(A[0], A[1], 2), c.lineEnd()), f = A;
         else if (i && f && r ^ v) {
-          var S;
-          !(_ & x) && (S = a(E, f, !0)) && (m = 0, r ? (c.lineStart(), c.point(S[0][0], S[0][1]), c.point(S[1][0], S[1][1]), c.lineEnd()) : (c.point(S[1][0], S[1][1]), c.lineEnd(), c.lineStart(), c.point(S[0][0], S[0][1], 3)));
+          var _;
+          !(S & x) && (_ = a(E, f, !0)) && (m = 0, r ? (c.lineStart(), c.point(_[0][0], _[0][1]), c.point(_[1][0], _[1][1]), c.lineEnd()) : (c.point(_[1][0], _[1][1]), c.lineEnd(), c.lineStart(), c.point(_[0][0], _[0][1], 3)));
         }
-        v && (!f || !KE(f, E)) && c.point(E[0], E[1]), f = E, h = v, x = _;
+        v && (!f || !KE(f, E)) && c.point(E[0], E[1]), f = E, h = v, x = S;
       },
       lineEnd: function() {
         h && c.lineEnd(), f = null;
@@ -68334,9 +68329,9 @@ function X$e(t) {
     var h = bf(c), p = bf(f), m = [1, 0, 0], g = sh(h, p), y = iE(g, g), E = g[0], A = y - E * E;
     if (!A)
       return !x && c;
-    var v = e * y / A, _ = -e * E / A, S = sh(m, g), C = sE(m, v), b = sE(g, _);
+    var v = e * y / A, S = -e * E / A, _ = sh(m, g), C = sE(m, v), b = sE(g, S);
     iR(C, b);
-    var R = S, O = iE(C, R), L = iE(R, R), M = O * O - L * (iE(C, C) - 1);
+    var R = _, O = iE(C, R), L = iE(R, R), M = O * O - L * (iE(C, C) - 1);
     if (!(M < 0)) {
       var H = Ei(M), G = sE(R, (-O - H) / L);
       if (iR(G, C), G = Bv(G), !x)
@@ -68429,7 +68424,7 @@ function cre(t, e, n, r) {
     return f !== x ? f - x : f === 0 ? c[1] - l[1] : f === 1 ? l[0] - c[0] : f === 2 ? l[1] - c[1] : c[0] - l[0];
   }
   return function(l) {
-    var c = l, f = ure(), x, h, p, m, g, y, E, A, v, _, S, C = {
+    var c = l, f = ure(), x, h, p, m, g, y, E, A, v, S, _, C = {
       point: b,
       lineStart: M,
       lineEnd: H,
@@ -68446,27 +68441,27 @@ function cre(t, e, n, r) {
       return Q;
     }
     function O() {
-      c = f, x = [], h = [], S = !0;
+      c = f, x = [], h = [], _ = !0;
     }
     function L() {
-      var Q = R(), Y = S && Q, J = (x = AJ(x)).length;
+      var Q = R(), Y = _ && Q, J = (x = AJ(x)).length;
       (Y || J) && (l.polygonStart(), Y && (l.lineStart(), s(null, null, 1, l), l.lineEnd()), J && are(x, u, Q, s, l), l.polygonEnd()), c = l, x = h = p = null;
     }
     function M() {
-      C.point = G, h && h.push(p = []), _ = !0, v = !1, E = A = NaN;
+      C.point = G, h && h.push(p = []), S = !0, v = !1, E = A = NaN;
     }
     function H() {
       x && (G(m, g), y && v && f.rejoin(), x.push(f.result())), C.point = b, v && c.lineEnd();
     }
     function G(Q, Y) {
       var J = i(Q, Y);
-      if (h && p.push([Q, Y]), _)
-        m = Q, g = Y, y = J, _ = !1, J && (c.lineStart(), c.point(Q, Y));
+      if (h && p.push([Q, Y]), S)
+        m = Q, g = Y, y = J, S = !1, J && (c.lineStart(), c.point(Q, Y));
       else if (J && v)
         c.point(Q, Y);
       else {
         var ee = [E = Math.max(uE, Math.min(S1, E)), A = Math.max(uE, Math.min(S1, A))], X = [Q = Math.max(uE, Math.min(S1, Q)), Y = Math.max(uE, Math.min(S1, Y))];
-        K$e(ee, X, t, e, n, r) ? (v || (c.lineStart(), c.point(ee[0], ee[1])), c.point(X[0], X[1]), J || c.lineEnd(), S = !1) : J && (c.lineStart(), c.point(Q, Y), S = !1);
+        K$e(ee, X, t, e, n, r) ? (v || (c.lineStart(), c.point(ee[0], ee[1])), c.point(X[0], X[1]), J || c.lineEnd(), _ = !1) : J && (c.lineStart(), c.point(Q, Y), _ = !1);
       }
       E = Q, A = Y, v = J;
     }
@@ -68853,8 +68848,8 @@ function xke(t, e) {
   function n(r, i, s, o, u, a, l, c, f, x, h, p, m, g) {
     var y = l - r, E = c - i, A = y * y + E * E;
     if (A > 4 * e && m--) {
-      var v = o + x, _ = u + h, S = a + p, C = Ei(v * v + _ * _ + S * S), b = ki(S /= C), R = vt(vt(S) - 1) < Je || vt(s - f) < Je ? (s + f) / 2 : Gs(_, v), O = t(R, b), L = O[0], M = O[1], H = L - r, G = M - i, Q = E * H - y * G;
-      (Q * Q / A > e || vt((y * H + E * G) / A - 0.5) > 0.3 || o * x + u * h + a * p < cke) && (n(r, i, s, o, u, a, L, M, R, v /= C, _ /= C, S, m, g), g.point(L, M), n(L, M, R, v, _, S, l, c, f, x, h, p, m, g));
+      var v = o + x, S = u + h, _ = a + p, C = Ei(v * v + S * S + _ * _), b = ki(_ /= C), R = vt(vt(_) - 1) < Je || vt(s - f) < Je ? (s + f) / 2 : Gs(S, v), O = t(R, b), L = O[0], M = O[1], H = L - r, G = M - i, Q = E * H - y * G;
+      (Q * Q / A > e || vt((y * H + E * G) / A - 0.5) > 0.3 || o * x + u * h + a * p < cke) && (n(r, i, s, o, u, a, L, M, R, v /= C, S /= C, _, m, g), g.point(L, M), n(L, M, R, v, S, _, l, c, f, x, h, p, m, g));
     }
   }
   return function(r) {
@@ -68863,7 +68858,7 @@ function xke(t, e) {
       lineStart: E,
       lineEnd: v,
       polygonStart: function() {
-        r.polygonStart(), g.lineStart = _;
+        r.polygonStart(), g.lineStart = S;
       },
       polygonEnd: function() {
         r.polygonEnd(), g.lineStart = E;
@@ -68882,10 +68877,10 @@ function xke(t, e) {
     function v() {
       g.point = y, r.lineEnd();
     }
-    function _() {
-      E(), g.point = S, g.lineEnd = C;
+    function S() {
+      E(), g.point = _, g.lineEnd = C;
     }
-    function S(b, R) {
+    function _(b, R) {
       A(i = b, R), s = f, o = x, u = h, a = p, l = m, g.point = A;
     }
     function C() {
@@ -68932,7 +68927,7 @@ function Ju(t) {
   })();
 }
 function _re(t) {
-  var e, n = 150, r = 480, i = 250, s = 0, o = 0, u = 0, a = 0, l = 0, c, f = 0, x = 1, h = 1, p = null, m = VU, g = null, y, E, A, v = Ig, _ = 0.5, S, C, b, R, O;
+  var e, n = 150, r = 480, i = 250, s = 0, o = 0, u = 0, a = 0, l = 0, c, f = 0, x = 1, h = 1, p = null, m = VU, g = null, y, E, A, v = Ig, S = 0.5, _, C, b, R, O;
   function L(Q) {
     return b(Q[0] * dt, Q[1] * dt);
   }
@@ -68940,7 +68935,7 @@ function _re(t) {
     return Q = b.invert(Q[0], Q[1]), Q && [Q[0] * Rn, Q[1] * Rn];
   }
   L.stream = function(Q) {
-    return R && O === Q ? R : R = dke(hke(c)(m(S(v(O = Q)))));
+    return R && O === Q ? R : R = dke(hke(c)(m(_(v(O = Q)))));
   }, L.preclip = function(Q) {
     return arguments.length ? (m = Q, p = void 0, G()) : m;
   }, L.postclip = function(Q) {
@@ -68964,7 +68959,7 @@ function _re(t) {
   }, L.reflectY = function(Q) {
     return arguments.length ? (h = Q ? -1 : 1, H()) : h < 0;
   }, L.precision = function(Q) {
-    return arguments.length ? (S = iq(C, _ = Q * Q), G()) : Ei(_);
+    return arguments.length ? (_ = iq(C, S = Q * Q), G()) : Ei(S);
   }, L.fitExtent = function(Q, Y) {
     return UC(L, Q, Y);
   }, L.fitSize = function(Q, Y) {
@@ -68976,7 +68971,7 @@ function _re(t) {
   };
   function H() {
     var Q = sq(n, 0, 0, x, h, f).apply(null, e(s, o)), Y = sq(n, r - Q[0], i - Q[1], x, h, f);
-    return c = ore(u, a, l), C = q7(e, Y), b = q7(c, C), S = iq(C, _), G();
+    return c = ore(u, a, l), C = q7(e, Y), b = q7(c, C), _ = iq(C, S), G();
   }
   function G() {
     return R = O = null, L;
@@ -69219,29 +69214,29 @@ function wke() {
 }
 function Nke() {
   var t = 1, e = 0, n = 0, r = 1, i = 1, s = 0, o, u, a = null, l, c, f, x = 1, h = 1, p = jC({
-    point: function(v, _) {
-      var S = A([v, _]);
-      this.stream.point(S[0], S[1]);
+    point: function(v, S) {
+      var _ = A([v, S]);
+      this.stream.point(_[0], _[1]);
     }
   }), m = Ig, g, y;
   function E() {
     return x = t * r, h = t * i, g = y = null, A;
   }
   function A(v) {
-    var _ = v[0] * x, S = v[1] * h;
+    var S = v[0] * x, _ = v[1] * h;
     if (s) {
-      var C = S * o - _ * u;
-      _ = _ * o + S * u, S = C;
+      var C = _ * o - S * u;
+      S = S * o + _ * u, _ = C;
     }
-    return [_ + e, S + n];
+    return [S + e, _ + n];
   }
   return A.invert = function(v) {
-    var _ = v[0] - e, S = v[1] - n;
+    var S = v[0] - e, _ = v[1] - n;
     if (s) {
-      var C = S * o + _ * u;
-      _ = _ * o - S * u, S = C;
+      var C = _ * o + S * u;
+      S = S * o - _ * u, _ = C;
     }
-    return [_ / x, S / h];
+    return [S / x, _ / h];
   }, A.stream = function(v) {
     return g && y === v ? g : g = p(m(y = v));
   }, A.postclip = function(v) {
@@ -69258,14 +69253,14 @@ function Nke() {
     return arguments.length ? (r = v ? -1 : 1, E()) : r < 0;
   }, A.reflectY = function(v) {
     return arguments.length ? (i = v ? -1 : 1, E()) : i < 0;
-  }, A.fitExtent = function(v, _) {
-    return UC(A, v, _);
-  }, A.fitSize = function(v, _) {
-    return q9(A, v, _);
-  }, A.fitWidth = function(v, _) {
-    return z9(A, v, _);
-  }, A.fitHeight = function(v, _) {
-    return H9(A, v, _);
+  }, A.fitExtent = function(v, S) {
+    return UC(A, v, S);
+  }, A.fitSize = function(v, S) {
+    return q9(A, v, S);
+  }, A.fitWidth = function(v, S) {
+    return z9(A, v, S);
+  }, A.fitHeight = function(v, S) {
+    return H9(A, v, S);
   }, A;
 }
 function Nre(t, e) {
@@ -69447,19 +69442,19 @@ function Mre() {
       E = y, y = a[p * t + h + 1] >= l, ca[y << 2 | E << 3].forEach(A);
     ca[y << 3].forEach(A);
     function A(v) {
-      var _ = [v[0][0] + h, v[0][1] + p], S = [v[1][0] + h, v[1][1] + p], C = o(_), b = o(S), R, O;
-      (R = x[C]) ? (O = f[b]) ? (delete x[R.end], delete f[O.start], R === O ? (R.ring.push(S), c(R.ring)) : f[R.start] = x[O.end] = {
+      var S = [v[0][0] + h, v[0][1] + p], _ = [v[1][0] + h, v[1][1] + p], C = o(S), b = o(_), R, O;
+      (R = x[C]) ? (O = f[b]) ? (delete x[R.end], delete f[O.start], R === O ? (R.ring.push(_), c(R.ring)) : f[R.start] = x[O.end] = {
         start: R.start,
         end: O.end,
         ring: R.ring.concat(O.ring)
-      }) : (delete x[R.end], R.ring.push(S), x[R.end = b] = R) : (R = f[b]) ? (O = x[C]) ? (delete f[R.start], delete x[O.end], R === O ? (R.ring.push(S), c(R.ring)) : f[O.start] = x[R.end] = {
+      }) : (delete x[R.end], R.ring.push(_), x[R.end = b] = R) : (R = f[b]) ? (O = x[C]) ? (delete f[R.start], delete x[O.end], R === O ? (R.ring.push(_), c(R.ring)) : f[O.start] = x[R.end] = {
         start: O.start,
         end: R.end,
         ring: O.ring.concat(R.ring)
-      }) : (delete f[R.start], R.ring.unshift(_), f[R.start = C] = R) : f[C] = x[b] = {
+      }) : (delete f[R.start], R.ring.unshift(S), f[R.start = C] = R) : f[C] = x[b] = {
         start: C,
         end: b,
-        ring: [_, S]
+        ring: [S, _]
       };
     }
   }
@@ -69622,11 +69617,11 @@ function Ure() {
     const c = aq(r[0], a, t) >> o, f = aq(r[1], a, e) >> o, x = c ? c + 2 : 0, h = f ? f + 2 : 0, p = 2 * x + (i >> o), m = 2 * h + (s >> o), g = new Float32Array(p * m), y = new Float32Array(p * m);
     let E = g;
     a.forEach((v) => {
-      const _ = x + (+t(v) >> o), S = h + (+e(v) >> o);
-      _ >= 0 && _ < p && S >= 0 && S < m && (g[_ + S * p] += +n(v));
+      const S = x + (+t(v) >> o), _ = h + (+e(v) >> o);
+      S >= 0 && S < p && _ >= 0 && _ < m && (g[S + _ * p] += +n(v));
     }), c > 0 && f > 0 ? (Mx(p, m, g, y, c), Px(p, m, y, g, f), Mx(p, m, g, y, c), Px(p, m, y, g, f), Mx(p, m, g, y, c), Px(p, m, y, g, f)) : c > 0 ? (Mx(p, m, g, y, c), Mx(p, m, y, g, c), Mx(p, m, g, y, c), E = y) : f > 0 && (Px(p, m, g, y, f), Px(p, m, y, g, f), Px(p, m, g, y, f), E = y);
     const A = l ? Math.pow(2, -2 * o) : 1 / vJ(E);
-    for (let v = 0, _ = p * m; v < _; ++v)
+    for (let v = 0, S = p * m; v < S; ++v)
       E[v] *= A;
     return {
       values: E,
@@ -70245,8 +70240,8 @@ function EMe(t, e, n) {
       } else {
         var E = t - +this._x.call(null, h.data), A = e - +this._y.call(null, h.data), v = E * E + A * A;
         if (v < n) {
-          var _ = Math.sqrt(n = v);
-          i = t - _, s = e - _, c = t + _, f = e + _, r = h.data;
+          var S = Math.sqrt(n = v);
+          i = t - S, s = e - S, c = t + S, f = e + S, r = h.data;
         }
       }
   return r;
@@ -70381,7 +70376,7 @@ function FMe(t) {
     for (var l, c = e.length, f, x, h, p, m, g, y = 0; y < s; ++y)
       for (f = nL(e, wMe, NMe).visitAfter(u), l = 0; l < c; ++l)
         x = e[l], m = n[x.index], g = m * m, h = x.x + x.vx, p = x.y + x.vy, f.visit(E);
-    function E(A, v, _, S, C) {
+    function E(A, v, S, _, C) {
       var b = A.data, R = A.r, O = m + R;
       if (b) {
         if (b.index > x.index) {
@@ -70390,7 +70385,7 @@ function FMe(t) {
         }
         return;
       }
-      return v > h + O || S < h - O || _ > p + O || C < p - O;
+      return v > h + O || _ < h - O || S > p + O || C < p - O;
     }
   }
   function u(l) {
@@ -70433,12 +70428,12 @@ function IMe(t) {
   }
   function x(g) {
     for (var y = 0, E = t.length; y < c; ++y)
-      for (var A = 0, v, _, S, C, b, R, O; A < E; ++A)
-        v = t[A], _ = v.source, S = v.target, C = S.x + S.vx - _.x - _.vx || Ql(l), b = S.y + S.vy - _.y - _.vy || Ql(l), R = Math.sqrt(C * C + b * b), R = (R - s[A]) / R * g * r[A], C *= R, b *= R, S.vx -= C * (O = a[A]), S.vy -= b * O, _.vx += C * (O = 1 - O), _.vy += b * O;
+      for (var A = 0, v, S, _, C, b, R, O; A < E; ++A)
+        v = t[A], S = v.source, _ = v.target, C = _.x + _.vx - S.x - S.vx || Ql(l), b = _.y + _.vy - S.y - S.vy || Ql(l), R = Math.sqrt(C * C + b * b), R = (R - s[A]) / R * g * r[A], C *= R, b *= R, _.vx -= C * (O = a[A]), _.vy -= b * O, S.vx += C * (O = 1 - O), S.vy += b * O;
   }
   function h() {
     if (o) {
-      var g, y = o.length, E = t.length, A = new Map(o.map((_, S) => [e(_, S, o), _])), v;
+      var g, y = o.length, E = t.length, A = new Map(o.map((S, _) => [e(S, _, o), S])), v;
       for (g = 0, u = new Array(y); g < E; ++g)
         v = t[g], v.index = g, typeof v.source != "object" && (v.source = fq(A, v.source)), typeof v.target != "object" && (v.target = fq(A, v.target)), u[v.source.index] = (u[v.source.index] || 0) + 1, u[v.target.index] = (u[v.target.index] || 0) + 1;
       for (g = 0, a = new Array(E); g < E; ++g)
@@ -70684,9 +70679,9 @@ function XMe(t) {
       return arguments.length > 1 ? (g == null ? u.delete(m) : u.set(m, p(g)), e) : u.get(m);
     },
     find: function(m, g, y) {
-      var E = 0, A = t.length, v, _, S, C, b;
+      var E = 0, A = t.length, v, S, _, C, b;
       for (y == null ? y = 1 / 0 : y *= y, E = 0; E < A; ++E)
-        C = t[E], v = m - C.x, _ = g - C.y, S = v * v + _ * _, S < y && (b = C, y = S);
+        C = t[E], v = m - C.x, S = g - C.y, _ = v * v + S * S, _ < y && (b = C, y = _);
       return b;
     },
     on: function(m, g) {
@@ -71288,9 +71283,9 @@ function w1(t, e) {
   };
 }
 function tie(t, e, n) {
-  var r = t.x, i = t.y, s = t.r, o = e.x, u = e.y, a = e.r, l = n.x, c = n.y, f = n.r, x = r - o, h = r - l, p = i - u, m = i - c, g = a - s, y = f - s, E = r * r + i * i - s * s, A = E - o * o - u * u + a * a, v = E - l * l - c * c + f * f, _ = h * p - x * m, S = (p * v - m * A) / (_ * 2) - r, C = (m * g - p * y) / _, b = (h * A - x * v) / (_ * 2) - i, R = (x * y - h * g) / _, O = C * C + R * R - 1, L = 2 * (s + S * C + b * R), M = S * S + b * b - s * s, H = -(Math.abs(O) > 1e-6 ? (L + Math.sqrt(L * L - 4 * O * M)) / (2 * O) : M / L);
+  var r = t.x, i = t.y, s = t.r, o = e.x, u = e.y, a = e.r, l = n.x, c = n.y, f = n.r, x = r - o, h = r - l, p = i - u, m = i - c, g = a - s, y = f - s, E = r * r + i * i - s * s, A = E - o * o - u * u + a * a, v = E - l * l - c * c + f * f, S = h * p - x * m, _ = (p * v - m * A) / (S * 2) - r, C = (m * g - p * y) / S, b = (h * A - x * v) / (S * 2) - i, R = (x * y - h * g) / S, O = C * C + R * R - 1, L = 2 * (s + _ * C + b * R), M = _ * _ + b * b - s * s, H = -(Math.abs(O) > 1e-6 ? (L + Math.sqrt(L * L - 4 * O * M)) / (2 * O) : M / L);
   return {
-    x: r + S + C * H,
+    x: r + _ + C * H,
     y: i + b + R * H,
     r: H
   };
@@ -71429,10 +71424,10 @@ function _q() {
   function r(i) {
     var s = Array.from(i), o = t, u = e, a, l, c, f, x, h, p, m, g = /* @__PURE__ */ new Map();
     if (n != null) {
-      const y = s.map((v, _) => XPe(n(v, _, i))), E = y.map(Cq), A = new Set(y).add("");
+      const y = s.map((v, S) => XPe(n(v, S, i))), E = y.map(Cq), A = new Set(y).add("");
       for (const v of E)
         A.has(v) || (A.add(v), y.push(v), E.push(Cq(v)), s.push(fR));
-      o = (v, _) => y[_], u = (v, _) => E[_];
+      o = (v, S) => y[S], u = (v, S) => E[S];
     }
     for (c = 0, a = s.length; c < a; ++c)
       l = s[c], h = s[c] = new ah(l), (p = o(l, c, i)) != null && (p += "") && (m = h.id = p, g.set(m, g.has(m) ? Sq : h)), (p = u(l, c, i)) != null && (p += "") && (h.parent = p);
@@ -71582,13 +71577,13 @@ function HC(t, e, n, r, i) {
 }
 var rie = (1 + Math.sqrt(5)) / 2;
 function iie(t, e, n, r, i, s) {
-  for (var o = [], u = e.children, a, l, c = 0, f = 0, x = u.length, h, p, m = e.value, g, y, E, A, v, _, S; c < x; ) {
+  for (var o = [], u = e.children, a, l, c = 0, f = 0, x = u.length, h, p, m = e.value, g, y, E, A, v, S, _; c < x; ) {
     h = i - n, p = s - r;
     do
       g = u[f++].value;
     while (!g && f < x);
-    for (y = E = g, _ = Math.max(p / h, h / p) / (m * t), S = g * g * _, v = Math.max(E / S, S / y); f < x; ++f) {
-      if (g += l = u[f].value, l < y && (y = l), l > E && (E = l), S = g * g * _, A = Math.max(E / S, S / y), A > v) {
+    for (y = E = g, S = Math.max(p / h, h / p) / (m * t), _ = g * g * S, v = Math.max(E / _, _ / y); f < x; ++f) {
+      if (g += l = u[f].value, l < y && (y = l), l > E && (E = l), _ = g * g * S, A = Math.max(E / _, _ / y), A > v) {
         g -= l;
         break;
       }
@@ -71648,18 +71643,18 @@ function ije(t, e, n, r, i) {
       E.x0 = p, E.y0 = m, E.x1 = g, E.y1 = y;
       return;
     }
-    for (var A = l[f], v = h / 2 + A, _ = f + 1, S = x - 1; _ < S; ) {
-      var C = _ + S >>> 1;
-      l[C] < v ? _ = C + 1 : S = C;
+    for (var A = l[f], v = h / 2 + A, S = f + 1, _ = x - 1; S < _; ) {
+      var C = S + _ >>> 1;
+      l[C] < v ? S = C + 1 : _ = C;
     }
-    v - l[_ - 1] < l[_] - v && f + 1 < _ && --_;
-    var b = l[_] - A, R = h - b;
+    v - l[S - 1] < l[S] - v && f + 1 < S && --S;
+    var b = l[S] - A, R = h - b;
     if (g - p > y - m) {
       var O = h ? (p * R + g * b) / h : g;
-      c(f, _, b, p, m, O, y), c(_, x, R, O, m, g, y);
+      c(f, S, b, p, m, O, y), c(S, x, R, O, m, g, y);
     } else {
       var L = h ? (m * R + y * b) / h : y;
-      c(f, _, b, p, m, g, L), c(_, x, R, p, L, g, y);
+      c(f, S, b, p, m, g, L), c(S, x, R, p, L, g, y);
     }
   }
 }
@@ -72083,10 +72078,10 @@ function hje(t, e, n, r, i) {
   const s = t.width, o = t.height, u = r || i, a = Zl(s, o).getContext("2d"), l = Zl(s, o).getContext("2d"), c = u && Zl(s, o).getContext("2d");
   n.forEach((b) => tA(a, b, !1)), tA(l, e, !1), u && tA(c, e, !0);
   const f = pR(a, s, o), x = pR(l, s, o), h = u && pR(c, s, o), p = t.bitmap(), m = u && t.bitmap();
-  let g, y, E, A, v, _, S, C;
+  let g, y, E, A, v, S, _, C;
   for (y = 0; y < o; ++y)
     for (g = 0; g < s; ++g)
-      v = y * s + g, _ = f[v] & hR, C = x[v] & hR, S = u && h[v] & hR, (_ || S || C) && (E = t(g), A = t(y), !i && (_ || C) && p.set(E, A), u && (_ || S) && m.set(E, A));
+      v = y * s + g, S = f[v] & hR, C = x[v] & hR, _ = u && h[v] & hR, (S || _ || C) && (E = t(g), A = t(y), !i && (S || C) && p.set(E, A), u && (S || _) && m.set(E, A));
   return [p, m];
 }
 function pR(t, e, n) {
@@ -72210,17 +72205,17 @@ function Eje(t, e, n, r) {
   }
   return function(l) {
     const c = l.datum.datum.items[r].items, f = c.length, x = l.datum.fontSize, h = pu.width(l.datum, l.datum.text);
-    let p = n ? x : 0, m = !1, g = !1, y = 0, E, A, v, _, S, C, b, R, O, L, M, H, G, Q, Y, J, ee;
+    let p = n ? x : 0, m = !1, g = !1, y = 0, E, A, v, S, _, C, b, R, O, L, M, H, G, Q, Y, J, ee;
     for (let X = 0; X < f; ++X) {
-      for (E = c[X].x, v = c[X].y, A = c[X].x2 === void 0 ? E : c[X].x2, _ = c[X].y2 === void 0 ? v : c[X].y2, E > A && (ee = E, E = A, A = ee), v > _ && (ee = v, v = _, _ = ee), O = t(E), M = t(A), L = ~~((O + M) / 2), H = t(v), Q = t(_), G = ~~((H + Q) / 2), b = L; b >= O; --b)
+      for (E = c[X].x, v = c[X].y, A = c[X].x2 === void 0 ? E : c[X].x2, S = c[X].y2 === void 0 ? v : c[X].y2, E > A && (ee = E, E = A, A = ee), v > S && (ee = v, v = S, S = ee), O = t(E), M = t(A), L = ~~((O + M) / 2), H = t(v), Q = t(S), G = ~~((H + Q) / 2), b = L; b >= O; --b)
         for (R = G; R >= H; --R)
           J = a(b, R, p, h, x), J && ([l.x, l.y, p, m] = J);
       for (b = L; b <= M; ++b)
         for (R = G; R <= Q; ++R)
           J = a(b, R, p, h, x), J && ([l.x, l.y, p, m] = J);
-      !m && !n && (Y = Math.abs(A - E + _ - v), S = (E + A) / 2, C = (v + _) / 2, Y >= y && !iS(S, C, h, x, i, s) && !Gl(t, S, C, x, h, x, o, null) && (y = Y, l.x = S, l.y = C, g = !0));
+      !m && !n && (Y = Math.abs(A - E + S - v), _ = (E + A) / 2, C = (v + S) / 2, Y >= y && !iS(_, C, h, x, i, s) && !Gl(t, _, C, x, h, x, o, null) && (y = Y, l.x = _, l.y = C, g = !0));
     }
-    return m || g ? (S = h / 2, C = x / 2, o.setRange(t(l.x - S), t(l.y - C), t(l.x + S), t(l.y + C)), l.align = "center", l.baseline = "middle", !0) : !1;
+    return m || g ? (_ = h / 2, C = x / 2, o.setRange(t(l.x - _), t(l.y - C), t(l.x + _), t(l.y + C)), l.align = "center", l.baseline = "middle", !0) : !1;
   };
 }
 const Aje = [-1, -1, 1, 1], vje = [-1, 1, -1, 1];
@@ -72228,9 +72223,9 @@ function Sje(t, e, n, r) {
   const i = t.width, s = t.height, o = e[0], u = e[1], a = t.bitmap();
   return function(l) {
     const c = l.datum.datum.items[r].items, f = c.length, x = l.datum.fontSize, h = pu.width(l.datum, l.datum.text), p = [];
-    let m = n ? x : 0, g = !1, y = !1, E = 0, A, v, _, S, C, b, R, O, L, M, H, G;
+    let m = n ? x : 0, g = !1, y = !1, E = 0, A, v, S, _, C, b, R, O, L, M, H, G;
     for (let Q = 0; Q < f; ++Q) {
-      for (A = c[Q].x, _ = c[Q].y, v = c[Q].x2 === void 0 ? A : c[Q].x2, S = c[Q].y2 === void 0 ? _ : c[Q].y2, p.push([t((A + v) / 2), t((_ + S) / 2)]); p.length; )
+      for (A = c[Q].x, S = c[Q].y, v = c[Q].x2 === void 0 ? A : c[Q].x2, _ = c[Q].y2 === void 0 ? S : c[Q].y2, p.push([t((A + v) / 2), t((S + _) / 2)]); p.length; )
         if ([R, O] = p.pop(), !(o.get(R, O) || u.get(R, O) || a.get(R, O))) {
           a.set(R, O);
           for (let Y = 0; Y < 4; ++Y)
@@ -72241,7 +72236,7 @@ function Sje(t, e, n, r) {
             L > m && (l.x = C, l.y = b, m = L, g = !0);
           }
         }
-      !g && !n && (G = Math.abs(v - A + S - _), C = (A + v) / 2, b = (_ + S) / 2, G >= E && !iS(C, b, h, x, i, s) && !Gl(t, C, b, x, h, x, o, null) && (E = G, l.x = C, l.y = b, y = !0));
+      !g && !n && (G = Math.abs(v - A + _ - S), C = (A + v) / 2, b = (S + _) / 2, G >= E && !iS(C, b, h, x, i, s) && !Gl(t, C, b, x, h, x, o, null) && (E = G, l.x = C, l.y = b, y = !0));
     }
     return g || y ? (C = h / 2, b = x / 2, o.setRange(t(l.x - C), t(l.y - b), t(l.x + C), t(l.y + b)), l.align = "center", l.baseline = "middle", !0) : !1;
   };
@@ -72253,15 +72248,15 @@ function bje(t, e, n, r) {
     const c = l.boundary, f = l.datum.fontSize;
     if (c[2] < 0 || c[5] < 0 || c[0] > i || c[3] > s)
       return !1;
-    let x = l.textWidth ?? 0, h, p, m, g, y, E, A, v, _, S, C, b, R, O, L;
+    let x = l.textWidth ?? 0, h, p, m, g, y, E, A, v, S, _, C, b, R, O, L;
     for (let M = 0; M < a; ++M) {
-      if (h = (n[M] & 3) - 1, p = (n[M] >>> 2 & 3) - 1, m = h === 0 && p === 0 || r[M] < 0, g = h && p ? Math.SQRT1_2 : 1, y = r[M] < 0 ? -1 : 1, E = c[1 + h] + r[M] * h * g, C = c[4 + p] + y * f * p / 2 + r[M] * p * g, v = C - f / 2, _ = C + f / 2, b = t(E), O = t(v), L = t(_), !x)
-        if (Rq(b, b, O, L, o, u, E, E, v, _, c, m))
+      if (h = (n[M] & 3) - 1, p = (n[M] >>> 2 & 3) - 1, m = h === 0 && p === 0 || r[M] < 0, g = h && p ? Math.SQRT1_2 : 1, y = r[M] < 0 ? -1 : 1, E = c[1 + h] + r[M] * h * g, C = c[4 + p] + y * f * p / 2 + r[M] * p * g, v = C - f / 2, S = C + f / 2, b = t(E), O = t(v), L = t(S), !x)
+        if (Rq(b, b, O, L, o, u, E, E, v, S, c, m))
           x = pu.width(l.datum, l.datum.text);
         else
           continue;
-      if (S = E + y * x * h / 2, E = S - x / 2, A = S + x / 2, b = t(E), R = t(A), Rq(b, R, O, L, o, u, E, A, v, _, c, m))
-        return l.x = h ? h * y < 0 ? A : E : S, l.y = p ? p * y < 0 ? _ : v : C, l.align = _je[h * y + 1], l.baseline = Cje[p * y + 1], o.setRange(b, O, R, L), !0;
+      if (_ = E + y * x * h / 2, E = _ - x / 2, A = _ + x / 2, b = t(E), R = t(A), Rq(b, R, O, L, o, u, E, A, v, S, c, m))
+        return l.x = h ? h * y < 0 ? A : E : _, l.y = p ? p * y < 0 ? S : v : C, l.align = _je[h * y + 1], l.baseline = Cje[p * y + 1], o.setRange(b, O, R, L), !0;
     }
     return !1;
   };
@@ -72288,10 +72283,10 @@ function Oje(t, e, n, r, i, s, o, u, a, l, c) {
   if (!t.length)
     return t;
   const f = Math.max(r.length, i.length), x = Dje(r, f), h = wje(i, f), p = Nje(t[0].datum), m = p === "group" && t[0].datum.items[a].marktype, g = m === "area", y = Fje(p, m, u, a), E = l === null || l === 1 / 0, A = g && c === "naive";
-  let v = -1, _ = -1;
-  const S = t.map((O) => {
+  let v = -1, S = -1;
+  const _ = t.map((O) => {
     const L = E ? pu.width(O, O.text) : void 0;
-    return v = Math.max(v, L), _ = Math.max(_, O.fontSize), {
+    return v = Math.max(v, L), S = Math.max(S, O.fontSize), {
       datum: O,
       opacity: 0,
       x: void 0,
@@ -72302,19 +72297,19 @@ function Oje(t, e, n, r, i, s, o, u, a, l, c) {
       textWidth: L
     };
   });
-  l = l === null || l === 1 / 0 ? Math.max(v, _) + Math.max(...r) : l;
+  l = l === null || l === 1 / 0 ? Math.max(v, S) + Math.max(...r) : l;
   const C = mje(e[0], e[1], l);
   let b;
   if (!A) {
-    n && S.sort((M, H) => n(M.datum, H.datum));
+    n && _.sort((M, H) => n(M.datum, H.datum));
     let O = !1;
     for (let M = 0; M < h.length && !O; ++M)
       O = h[M] === 5 || x[M] < 0;
     const L = (p && o || g) && t.map((M) => M.datum);
-    b = s.length || L ? hje(C, L || [], s, O, g) : dje(C, o && S);
+    b = s.length || L ? hje(C, L || [], s, O, g) : dje(C, o && _);
   }
   const R = g ? Rje[c](C, b, o, a) : bje(C, b, h, x);
-  return S.forEach((O) => O.opacity = +R(O)), S;
+  return _.forEach((O) => O.opacity = +R(O)), _;
 }
 function Dje(t, e) {
   const n = new Float64Array(e), r = t.length;
@@ -72602,17 +72597,17 @@ function X3(t) {
 }
 const Mje = (3 + 16 * Ia) * Ia, Pje = (2 + 12 * Ia) * Ia, jje = (9 + 64 * Ia) * Ia * Ia, jx = X3(4), Oq = X3(8), Dq = X3(12), wq = X3(16), Kr = X3(4);
 function Uje(t, e, n, r, i, s, o) {
-  let u, a, l, c, f, x, h, p, m, g, y, E, A, v, _, S, C, b;
+  let u, a, l, c, f, x, h, p, m, g, y, E, A, v, S, _, C, b;
   const R = t - i, O = n - i, L = e - s, M = r - s;
-  v = R * M, x = Or * R, h = x - (x - R), p = R - h, x = Or * M, m = x - (x - M), g = M - m, _ = p * g - (v - h * m - p * m - h * g), S = L * O, x = Or * L, h = x - (x - L), p = L - h, x = Or * O, m = x - (x - O), g = O - m, C = p * g - (S - h * m - p * m - h * g), y = _ - C, f = _ - y, jx[0] = _ - (y + f) + (f - C), E = v + y, f = E - v, A = v - (E - f) + (y - f), y = A - S, f = A - y, jx[1] = A - (y + f) + (f - S), b = E + y, f = b - E, jx[2] = E - (b - f) + (y - f), jx[3] = b;
+  v = R * M, x = Or * R, h = x - (x - R), p = R - h, x = Or * M, m = x - (x - M), g = M - m, S = p * g - (v - h * m - p * m - h * g), _ = L * O, x = Or * L, h = x - (x - L), p = L - h, x = Or * O, m = x - (x - O), g = O - m, C = p * g - (_ - h * m - p * m - h * g), y = S - C, f = S - y, jx[0] = S - (y + f) + (f - C), E = v + y, f = E - v, A = v - (E - f) + (y - f), y = A - _, f = A - y, jx[1] = A - (y + f) + (f - _), b = E + y, f = b - E, jx[2] = E - (b - f) + (y - f), jx[3] = b;
   let H = kje(4, jx), G = Pje * o;
   if (H >= G || -H >= G || (f = t - R, u = t - (R + f) + (f - i), f = n - O, l = n - (O + f) + (f - i), f = e - L, a = e - (L + f) + (f - s), f = r - M, c = r - (M + f) + (f - s), u === 0 && a === 0 && l === 0 && c === 0) || (G = jje * o + $je * Math.abs(H), H += R * c + M * u - (L * l + O * a), H >= G || -H >= G))
     return H;
-  v = u * M, x = Or * u, h = x - (x - u), p = u - h, x = Or * M, m = x - (x - M), g = M - m, _ = p * g - (v - h * m - p * m - h * g), S = a * O, x = Or * a, h = x - (x - a), p = a - h, x = Or * O, m = x - (x - O), g = O - m, C = p * g - (S - h * m - p * m - h * g), y = _ - C, f = _ - y, Kr[0] = _ - (y + f) + (f - C), E = v + y, f = E - v, A = v - (E - f) + (y - f), y = A - S, f = A - y, Kr[1] = A - (y + f) + (f - S), b = E + y, f = b - E, Kr[2] = E - (b - f) + (y - f), Kr[3] = b;
+  v = u * M, x = Or * u, h = x - (x - u), p = u - h, x = Or * M, m = x - (x - M), g = M - m, S = p * g - (v - h * m - p * m - h * g), _ = a * O, x = Or * a, h = x - (x - a), p = a - h, x = Or * O, m = x - (x - O), g = O - m, C = p * g - (_ - h * m - p * m - h * g), y = S - C, f = S - y, Kr[0] = S - (y + f) + (f - C), E = v + y, f = E - v, A = v - (E - f) + (y - f), y = A - _, f = A - y, Kr[1] = A - (y + f) + (f - _), b = E + y, f = b - E, Kr[2] = E - (b - f) + (y - f), Kr[3] = b;
   const Q = SR(4, jx, 4, Kr, Oq);
-  v = R * c, x = Or * R, h = x - (x - R), p = R - h, x = Or * c, m = x - (x - c), g = c - m, _ = p * g - (v - h * m - p * m - h * g), S = L * l, x = Or * L, h = x - (x - L), p = L - h, x = Or * l, m = x - (x - l), g = l - m, C = p * g - (S - h * m - p * m - h * g), y = _ - C, f = _ - y, Kr[0] = _ - (y + f) + (f - C), E = v + y, f = E - v, A = v - (E - f) + (y - f), y = A - S, f = A - y, Kr[1] = A - (y + f) + (f - S), b = E + y, f = b - E, Kr[2] = E - (b - f) + (y - f), Kr[3] = b;
+  v = R * c, x = Or * R, h = x - (x - R), p = R - h, x = Or * c, m = x - (x - c), g = c - m, S = p * g - (v - h * m - p * m - h * g), _ = L * l, x = Or * L, h = x - (x - L), p = L - h, x = Or * l, m = x - (x - l), g = l - m, C = p * g - (_ - h * m - p * m - h * g), y = S - C, f = S - y, Kr[0] = S - (y + f) + (f - C), E = v + y, f = E - v, A = v - (E - f) + (y - f), y = A - _, f = A - y, Kr[1] = A - (y + f) + (f - _), b = E + y, f = b - E, Kr[2] = E - (b - f) + (y - f), Kr[3] = b;
   const Y = SR(Q, Oq, 4, Kr, Dq);
-  v = u * c, x = Or * u, h = x - (x - u), p = u - h, x = Or * c, m = x - (x - c), g = c - m, _ = p * g - (v - h * m - p * m - h * g), S = a * l, x = Or * a, h = x - (x - a), p = a - h, x = Or * l, m = x - (x - l), g = l - m, C = p * g - (S - h * m - p * m - h * g), y = _ - C, f = _ - y, Kr[0] = _ - (y + f) + (f - C), E = v + y, f = E - v, A = v - (E - f) + (y - f), y = A - S, f = A - y, Kr[1] = A - (y + f) + (f - S), b = E + y, f = b - E, Kr[2] = E - (b - f) + (y - f), Kr[3] = b;
+  v = u * c, x = Or * u, h = x - (x - u), p = u - h, x = Or * c, m = x - (x - c), g = c - m, S = p * g - (v - h * m - p * m - h * g), _ = a * l, x = Or * a, h = x - (x - a), p = a - h, x = Or * l, m = x - (x - l), g = l - m, C = p * g - (_ - h * m - p * m - h * g), y = S - C, f = S - y, Kr[0] = S - (y + f) + (f - C), E = v + y, f = E - v, A = v - (E - f) + (y - f), y = A - _, f = A - y, Kr[1] = A - (y + f) + (f - _), b = E + y, f = b - E, Kr[2] = E - (b - f) + (y - f), Kr[3] = b;
   const J = SR(Y, Dq, 4, Kr, wq);
   return wq[J - 1];
 }
@@ -72662,15 +72657,15 @@ class sS {
       const L = _R(y, E, e[2 * O], e[2 * O + 1]);
       L < h && L > 0 && (m = O, h = L);
     }
-    let A = e[2 * m], v = e[2 * m + 1], _ = 1 / 0;
+    let A = e[2 * m], v = e[2 * m + 1], S = 1 / 0;
     for (let O = 0; O < o; O++) {
       if (O === p || O === m)
         continue;
       const L = Hje(y, E, A, v, e[2 * O], e[2 * O + 1]);
-      L < _ && (g = O, _ = L);
+      L < S && (g = O, S = L);
     }
-    let S = e[2 * g], C = e[2 * g + 1];
-    if (_ === 1 / 0) {
+    let _ = e[2 * g], C = e[2 * g + 1];
+    if (S === 1 / 0) {
       for (let M = 0; M < o; M++)
         this._dists[M] = e[2 * M] - e[0] || e[2 * M + 1] - e[1];
       od(this._ids, this._dists, 0, o - 1);
@@ -72683,17 +72678,17 @@ class sS {
       this.hull = O.subarray(0, L), this.triangles = new Uint32Array(0), this.halfedges = new Uint32Array(0);
       return;
     }
-    if (fE(y, E, A, v, S, C) < 0) {
+    if (fE(y, E, A, v, _, C) < 0) {
       const O = m, L = A, M = v;
-      m = g, A = S, v = C, g = O, S = L, C = M;
+      m = g, A = _, v = C, g = O, _ = L, C = M;
     }
-    const b = Qje(y, E, A, v, S, C);
+    const b = Qje(y, E, A, v, _, C);
     this._cx = b.x, this._cy = b.y;
     for (let O = 0; O < o; O++)
       this._dists[O] = _R(e[2 * O], e[2 * O + 1], b.x, b.y);
     od(this._ids, this._dists, 0, o - 1), this._hullStart = p;
     let R = 3;
-    r[p] = n[g] = m, r[m] = n[p] = g, r[g] = n[m] = p, i[p] = 0, i[m] = 1, i[g] = 2, s.fill(-1), s[this._hashKey(y, E)] = p, s[this._hashKey(A, v)] = m, s[this._hashKey(S, C)] = g, this.trianglesLen = 0, this._addTriangle(p, m, g, -1, -1, -1);
+    r[p] = n[g] = m, r[m] = n[p] = g, r[g] = n[m] = p, i[p] = 0, i[m] = 1, i[g] = 2, s.fill(-1), s[this._hashKey(y, E)] = p, s[this._hashKey(A, v)] = m, s[this._hashKey(_, C)] = g, this.trianglesLen = 0, this._addTriangle(p, m, g, -1, -1, -1);
     for (let O = 0, L, M; O < this._ids.length; O++) {
       const H = this._ids[O], G = e[2 * H], Q = e[2 * H + 1];
       if (O > 0 && Math.abs(G - L) <= Nq && Math.abs(Q - M) <= Nq || (L = G, M = Q, H === p || H === m || H === g))
@@ -72900,7 +72895,7 @@ let Vje = class {
     let s, o;
     const u = this.circumcenters = this._circumcenters.subarray(0, r.length / 3 * 2);
     for (let m = 0, g = 0, y = r.length, E, A; m < y; m += 3, g += 2) {
-      const v = r[m] * 2, _ = r[m + 1] * 2, S = r[m + 2] * 2, C = e[v], b = e[v + 1], R = e[_], O = e[_ + 1], L = e[S], M = e[S + 1], H = R - C, G = O - b, Q = L - C, Y = M - b, J = (H * Y - G * Q) * 2;
+      const v = r[m] * 2, S = r[m + 1] * 2, _ = r[m + 2] * 2, C = e[v], b = e[v + 1], R = e[S], O = e[S + 1], L = e[_], M = e[_ + 1], H = R - C, G = O - b, Q = L - C, Y = M - b, J = (H * Y - G * Q) * 2;
       if (Math.abs(J) < 1e-9) {
         if (s === void 0) {
           s = o = 0;
@@ -73363,14 +73358,14 @@ var CR = Math.PI / 180, N1 = 64, nA = 2048;
 function sUe() {
   var t = [256, 256], e, n, r, i, s, o, u, a = aie, l = [], c = Math.random, f = {};
   f.layout = function() {
-    for (var p = x(Zl()), m = fUe((t[0] >> 5) * t[1]), g = null, y = l.length, E = -1, A = [], v = l.map((S) => ({
-      text: e(S),
-      font: n(S),
-      style: i(S),
-      weight: s(S),
-      rotate: o(S),
-      size: ~~(r(S) + 1e-14),
-      padding: u(S),
+    for (var p = x(Zl()), m = fUe((t[0] >> 5) * t[1]), g = null, y = l.length, E = -1, A = [], v = l.map((_) => ({
+      text: e(_),
+      font: n(_),
+      style: i(_),
+      weight: s(_),
+      rotate: o(_),
+      size: ~~(r(_) + 1e-14),
+      padding: u(_),
       xoff: 0,
       yoff: 0,
       x1: 0,
@@ -73379,16 +73374,16 @@ function sUe() {
       y0: 0,
       hasText: !1,
       sprite: null,
-      datum: S
-    })).sort((S, C) => C.size - S.size); ++E < y; ) {
-      var _ = v[E];
-      _.x = t[0] * (c() + 0.5) >> 1, _.y = t[1] * (c() + 0.5) >> 1, oUe(p, _, v, E), _.hasText && h(m, _, g) && (A.push(_), g ? aUe(g, _) : g = [{
-        x: _.x + _.x0,
-        y: _.y + _.y0
+      datum: _
+    })).sort((_, C) => C.size - _.size); ++E < y; ) {
+      var S = v[E];
+      S.x = t[0] * (c() + 0.5) >> 1, S.y = t[1] * (c() + 0.5) >> 1, oUe(p, S, v, E), S.hasText && h(m, S, g) && (A.push(S), g ? aUe(g, S) : g = [{
+        x: S.x + S.x0,
+        y: S.y + S.y0
       }, {
-        x: _.x + _.x1,
-        y: _.y + _.y1
-      }], _.x -= t[0] >> 1, _.y -= t[1] >> 1);
+        x: S.x + S.x1,
+        y: S.y + S.y1
+      }], S.x -= t[0] >> 1, S.y -= t[1] >> 1);
     }
     return A;
   };
@@ -73403,7 +73398,7 @@ function sUe() {
     };
   }
   function h(p, m, g) {
-    for (var y = m.x, E = m.y, A = Math.sqrt(t[0] * t[0] + t[1] * t[1]), v = a(t), _ = c() < 0.5 ? 1 : -1, S = -_, C, b, R; (C = v(S += _)) && (b = ~~C[0], R = ~~C[1], !(Math.min(Math.abs(b), Math.abs(R)) >= A)); )
+    for (var y = m.x, E = m.y, A = Math.sqrt(t[0] * t[0] + t[1] * t[1]), v = a(t), S = c() < 0.5 ? 1 : -1, _ = -S, C, b, R; (C = v(_ += S)) && (b = ~~C[0], R = ~~C[1], !(Math.min(Math.abs(b), Math.abs(R)) >= A)); )
       if (m.x = y + b, m.y = E + R, !(m.x + m.x0 < 0 || m.y + m.y0 < 0 || m.x + m.x1 > t[0] || m.y + m.y1 > t[1]) && (!g || !uUe(m, p, t[0])) && (!g || lUe(m, g))) {
         for (var O = m.sprite, L = m.width >> 5, M = t[0] >> 5, H = m.x - (L << 4), G = H & 127, Q = 32 - G, Y = m.y1 - m.y0, J = (m.y + m.y0) * M + (H >> 5), ee, X = 0; X < Y; X++) {
           ee = 0;
@@ -73454,22 +73449,22 @@ function oUe(t, e, n, r) {
         break;
       i.translate((o + (c >> 1)) / s, (u + (x >> 1)) / s), e.rotate && i.rotate(e.rotate * CR), i.fillText(e.text, 0, 0), e.padding && (i.lineWidth = 2 * e.padding, i.strokeText(e.text, 0, 0)), i.restore(), e.width = c, e.height = x, e.xoff = o, e.yoff = u, e.x1 = c >> 1, e.y1 = x >> 1, e.x0 = -e.x1, e.y0 = -e.y1, e.hasText = !0, o += c;
     }
-    for (var _ = i.getImageData(0, 0, (N1 << 5) / s, nA / s).data, S = []; --r >= 0; )
+    for (var S = i.getImageData(0, 0, (N1 << 5) / s, nA / s).data, _ = []; --r >= 0; )
       if (e = n[r], !!e.hasText) {
         for (c = e.width, f = c >> 5, x = e.y1 - e.y0, h = 0; h < x * f; h++)
-          S[h] = 0;
+          _[h] = 0;
         if (o = e.xoff, o == null)
           return;
         u = e.yoff;
         var C = 0, b = -1;
         for (p = 0; p < x; p++) {
           for (h = 0; h < c; h++) {
-            var R = f * p + (h >> 5), O = _[(u + p) * (N1 << 5) + (o + h) << 2] ? 1 << 31 - h % 32 : 0;
-            S[R] |= O, C |= O;
+            var R = f * p + (h >> 5), O = S[(u + p) * (N1 << 5) + (o + h) << 2] ? 1 << 31 - h % 32 : 0;
+            _[R] |= O, C |= O;
           }
           C ? b = p : (e.y0++, x--, p--, u++);
         }
-        e.y1 = e.y0 + b, e.sprite = S.slice(0, (e.y1 - e.y0) * f);
+        e.y1 = e.y0 + b, e.sprite = _.slice(0, (e.y1 - e.y0) * f);
       }
   }
 }
@@ -73789,14 +73784,14 @@ De(AL, pe, {
   },
   reinit(t, e) {
     const n = e.materialize().fork(), r = t.fields, i = t.query, s = this._indices, o = this._dims, u = this.value, a = u.curr(), l = u.prev(), c = u.all(), f = n.rem = n.add, x = n.mod, h = i.length, p = {};
-    let m, g, y, E, A, v, _, S, C;
+    let m, g, y, E, A, v, S, _, C;
     if (l.set(a), e.rem.length && (A = this.remove(t, e, n)), e.add.length && u.add(e.add), e.mod.length)
-      for (v = {}, E = e.mod, _ = 0, S = E.length; _ < S; ++_)
-        v[E[_]._index] = 1;
-    for (_ = 0; _ < h; ++_)
-      C = r[_], (!o[_] || t.modified("fields", _) || e.modified(C.fields)) && (y = C.fname, (m = p[y]) || (s[y] = g = Iq(), p[y] = m = g.insert(C, e.source, 0)), o[_] = Lq(g, _, i[_]).onAdd(m, a));
-    for (_ = 0, S = u.data().length; _ < S; ++_)
-      A[_] || (l[_] !== a[_] ? f.push(_) : v[_] && a[_] !== c && x.push(_));
+      for (v = {}, E = e.mod, S = 0, _ = E.length; S < _; ++S)
+        v[E[S]._index] = 1;
+    for (S = 0; S < h; ++S)
+      C = r[S], (!o[S] || t.modified("fields", S) || e.modified(C.fields)) && (y = C.fname, (m = p[y]) || (s[y] = g = Iq(), p[y] = m = g.insert(C, e.source, 0)), o[S] = Lq(g, S, i[S]).onAdd(m, a));
+    for (S = 0, _ = u.data().length; S < _; ++S)
+      A[S] || (l[S] !== a[S] ? f.push(S) : v[S] && a[S] !== c && x.push(S));
     return u.mask = (1 << h) - 1, n;
   },
   eval(t, e) {
@@ -74871,10 +74866,10 @@ function Vqe(t, e) {
   }, e));
 }
 function Yqe(t, e, n, r) {
-  for (var i = this.context.data[t], s = i ? i.values.value : [], o = {}, u = {}, a = {}, l, c, f, x, h, p, m, g, y, E, A = s.length, v = 0, _, S; v < A; ++v)
+  for (var i = this.context.data[t], s = i ? i.values.value : [], o = {}, u = {}, a = {}, l, c, f, x, h, p, m, g, y, E, A = s.length, v = 0, S, _; v < A; ++v)
     if (l = s[v], x = l.unit, c = l.fields, f = l.values, c && f) {
-      for (_ = 0, S = c.length; _ < S; ++_)
-        h = c[_], m = o[h.field] || (o[h.field] = {}), g = m[x] || (m[x] = []), a[h.field] = y = h.type.charAt(0), E = DR[`${y}_union`], m[x] = E(g, ke(f[_]));
+      for (S = 0, _ = c.length; S < _; ++S)
+        h = c[S], m = o[h.field] || (o[h.field] = {}), g = m[x] || (m[x] = []), a[h.field] = y = h.type.charAt(0), E = DR[`${y}_union`], m[x] = E(g, ke(f[S]));
       n && (g = u[x] || (u[x] = []), g.push(ke(f).reduce((C, b, R) => (C[c[R].field] = b, C), {})));
     } else
       h = Jo, p = Ug(l), m = o[h] || (o[h] = {}), g = m[x] || (m[x] = []), g.push(p), n && (g = u[x] || (u[x] = []), g.push({
@@ -77163,12 +77158,12 @@ function AWe(t, e, n, r, i) {
       opacity: bt
     }
   };
-  let _ = null, S = null;
-  t.fill || (_ = e.symbolBaseFillColor, S = e.symbolBaseStrokeColor), Ar(g, {
-    fill: s("symbolFillColor", _),
+  let S = null, _ = null;
+  t.fill || (S = e.symbolBaseFillColor, _ = e.symbolBaseStrokeColor), Ar(g, {
+    fill: s("symbolFillColor", S),
     shape: s("symbolType"),
     size: s("symbolSize"),
-    stroke: s("symbolStrokeColor", S),
+    stroke: s("symbolStrokeColor", _),
     strokeDash: s("symbolDash"),
     strokeDashOffset: s("symbolDashOffset"),
     strokeWidth: s("symbolStrokeWidth")
@@ -77575,8 +77570,8 @@ function sb(t, e) {
   a = c = e.add(sse(tse(t.encode, t.type, n, t.style, e, {
     mod: !1,
     pulse: y
-  }))), a.params.parent = e.encode(), t.transform && t.transform.forEach((S) => {
-    const C = XL(S, e), b = C.metadata;
+  }))), a.params.parent = e.encode(), t.transform && t.transform.forEach((_) => {
+    const C = XL(_, e), b = C.metadata;
     (b.generates || b.changes) && Se("Mark transforms should not generate new data."), b.nomod || (c.params.mod = !0), C.params.pulse = Ve(a), e.add(a = C);
   }), t.sort && (a = e.add(kGe({
     sort: e.compareRef(t.sort),
@@ -77596,11 +77591,11 @@ function sb(t, e) {
   h = Ve(A), r && (p && (u = e.operators, u.pop(), o && u.pop()), e.pushState(E, x || h, g), i ? jWe(t, e, m) : p ? UWe(t, e, m) : e.parse(t), e.popState(), p && (o && u.push(o), u.push(A))), s && (h = qWe(s, h, e));
   const v = e.add(use({
     pulse: h
-  })), _ = e.add(vx({
+  })), S = e.add(vx({
     pulse: Ve(v)
   }, void 0, e.parent()));
-  t.name != null && (f = t.name, e.addData(f, new Nf(e, l, v, _)), t.on && t.on.forEach((S) => {
-    (S.insert || S.remove || S.toggle) && Se("Marks only support modify triggers."), Ase(S, e, f);
+  t.name != null && (f = t.name, e.addData(f, new Nf(e, l, v, S)), t.on && t.on.forEach((_) => {
+    (_.insert || _.remove || _.toggle) && Se("Marks only support modify triggers."), Ase(_, e, f);
   }));
 }
 function qWe(t, e, n) {
@@ -78139,32 +78134,32 @@ function gVe(t, e, n, r, i, s) {
     value: "middle"
   }), v = BR(a, c, `-(${f})`, f, 0);
   p = p && f;
-  const _ = {
+  const S = {
     opacity: bt,
     x: sr(u, y, g),
     y: go(u, y, g)
-  }, S = {
-    enter: _,
+  }, _ = {
+    enter: S,
     update: m = {
       opacity: js,
       text: {
         field: zL
       },
-      x: _.x,
-      y: _.y,
+      x: S.x,
+      y: S.y,
       align: E,
       baseline: A
     },
     exit: {
       opacity: bt,
-      x: _.x,
-      y: _.y
+      x: S.x,
+      y: S.y
     }
   };
-  Ar(S, {
+  Ar(_, {
     dx: !x && p ? sr(u, v) : null,
     dy: !h && p ? go(u, v) : null
-  }), Ar(S, {
+  }), Ar(_, {
     angle: o("labelAngle"),
     fill: o("labelColor"),
     fillOpacity: o("labelOpacity"),
@@ -78195,7 +78190,7 @@ function gVe(t, e, n, r, i, s) {
     style: ty,
     key: Ps,
     from: r,
-    encode: S,
+    encode: _,
     overlap: b
   }, n);
 }
@@ -78855,65 +78850,65 @@ var Rse = { exports: {} };
       typeof h == "object" && (p = h.depth, m = h.prototype, g = h.includeNonEnumerable, h = h.circular);
       var y = [], E = [], A = typeof Buffer < "u";
       typeof h > "u" && (h = !0), typeof p > "u" && (p = 1 / 0);
-      function v(_, S) {
-        if (_ === null)
+      function v(S, _) {
+        if (S === null)
           return null;
-        if (S === 0)
-          return _;
+        if (_ === 0)
+          return S;
         var C, b;
-        if (typeof _ != "object")
-          return _;
-        if (n(_, r))
+        if (typeof S != "object")
+          return S;
+        if (n(S, r))
           C = new r();
-        else if (n(_, i))
+        else if (n(S, i))
           C = new i();
-        else if (n(_, s))
+        else if (n(S, s))
           C = new s(function(J, ee) {
-            _.then(function(X) {
-              J(v(X, S - 1));
+            S.then(function(X) {
+              J(v(X, _ - 1));
             }, function(X) {
-              ee(v(X, S - 1));
+              ee(v(X, _ - 1));
             });
           });
-        else if (o.__isArray(_))
+        else if (o.__isArray(S))
           C = [];
-        else if (o.__isRegExp(_))
-          C = new RegExp(_.source, f(_)), _.lastIndex && (C.lastIndex = _.lastIndex);
-        else if (o.__isDate(_))
-          C = new Date(_.getTime());
+        else if (o.__isRegExp(S))
+          C = new RegExp(S.source, f(S)), S.lastIndex && (C.lastIndex = S.lastIndex);
+        else if (o.__isDate(S))
+          C = new Date(S.getTime());
         else {
-          if (A && Buffer.isBuffer(_))
-            return Buffer.allocUnsafe ? C = Buffer.allocUnsafe(_.length) : C = new Buffer(_.length), _.copy(C), C;
-          n(_, Error) ? C = Object.create(_) : typeof m > "u" ? (b = Object.getPrototypeOf(_), C = Object.create(b)) : (C = Object.create(m), b = m);
+          if (A && Buffer.isBuffer(S))
+            return Buffer.allocUnsafe ? C = Buffer.allocUnsafe(S.length) : C = new Buffer(S.length), S.copy(C), C;
+          n(S, Error) ? C = Object.create(S) : typeof m > "u" ? (b = Object.getPrototypeOf(S), C = Object.create(b)) : (C = Object.create(m), b = m);
         }
         if (h) {
-          var R = y.indexOf(_);
+          var R = y.indexOf(S);
           if (R != -1)
             return E[R];
-          y.push(_), E.push(C);
+          y.push(S), E.push(C);
         }
-        n(_, r) && _.forEach(function(J, ee) {
-          var X = v(ee, S - 1), re = v(J, S - 1);
+        n(S, r) && S.forEach(function(J, ee) {
+          var X = v(ee, _ - 1), re = v(J, _ - 1);
           C.set(X, re);
-        }), n(_, i) && _.forEach(function(J) {
-          var ee = v(J, S - 1);
+        }), n(S, i) && S.forEach(function(J) {
+          var ee = v(J, _ - 1);
           C.add(ee);
         });
-        for (var O in _) {
+        for (var O in S) {
           var L;
-          b && (L = Object.getOwnPropertyDescriptor(b, O)), !(L && L.set == null) && (C[O] = v(_[O], S - 1));
+          b && (L = Object.getOwnPropertyDescriptor(b, O)), !(L && L.set == null) && (C[O] = v(S[O], _ - 1));
         }
         if (Object.getOwnPropertySymbols)
-          for (var M = Object.getOwnPropertySymbols(_), O = 0; O < M.length; O++) {
-            var H = M[O], G = Object.getOwnPropertyDescriptor(_, H);
-            G && !G.enumerable && !g || (C[H] = v(_[H], S - 1), G.enumerable || Object.defineProperty(C, H, {
+          for (var M = Object.getOwnPropertySymbols(S), O = 0; O < M.length; O++) {
+            var H = M[O], G = Object.getOwnPropertyDescriptor(S, H);
+            G && !G.enumerable && !g || (C[H] = v(S[H], _ - 1), G.enumerable || Object.defineProperty(C, H, {
               enumerable: !1
             }));
           }
         if (g)
-          for (var Q = Object.getOwnPropertyNames(_), O = 0; O < Q.length; O++) {
-            var Y = Q[O], G = Object.getOwnPropertyDescriptor(_, Y);
-            G && G.enumerable || (C[Y] = v(_[Y], S - 1), Object.defineProperty(C, Y, {
+          for (var Q = Object.getOwnPropertyNames(S), O = 0; O < Q.length; O++) {
+            var Y = Q[O], G = Object.getOwnPropertyDescriptor(S, Y);
+            G && G.enumerable || (C[Y] = v(S[Y], _ - 1), Object.defineProperty(C, Y, {
               enumerable: !1
             }));
           }
@@ -82147,13 +82142,13 @@ function nue(t, { config: e }) {
     l,
     // TODO: https://github.com/vega/vega-lite/issues/6245
     e
-  ), x = tue(c), { bins: h, timeUnits: p, transform: m, continuousAxisChannelDef: g, continuousAxis: y, groupby: E, aggregate: A, encodingWithoutContinuousAxis: v, ticksOrient: _, boxOrient: S, customTooltipWithoutAggregatedField: C } = tJe(t, c, e), { color: b, size: R } = v, O = fA(v, ["color", "size"]), L = (K) => QI(l, y, g, K, e.boxplot), M = L(O), H = L(v), G = L(Object.assign(Object.assign({}, O), R ? { size: R } : {})), Q = kD([
+  ), x = tue(c), { bins: h, timeUnits: p, transform: m, continuousAxisChannelDef: g, continuousAxis: y, groupby: E, aggregate: A, encodingWithoutContinuousAxis: v, ticksOrient: S, boxOrient: _, customTooltipWithoutAggregatedField: C } = tJe(t, c, e), { color: b, size: R } = v, O = fA(v, ["color", "size"]), L = (K) => QI(l, y, g, K, e.boxplot), M = L(O), H = L(v), G = L(Object.assign(Object.assign({}, O), R ? { size: R } : {})), Q = kD([
     { fieldPrefix: x === "min-max" ? "upper_whisker_" : "max_", titlePrefix: "Max" },
     { fieldPrefix: "upper_box_", titlePrefix: "Q3" },
     { fieldPrefix: "mid_box_", titlePrefix: "Median" },
     { fieldPrefix: "lower_box_", titlePrefix: "Q1" },
     { fieldPrefix: x === "min-max" ? "lower_whisker_" : "min_", titlePrefix: "Min" }
-  ], g, v), Y = { type: "tick", color: "black", opacity: 1, orient: _, invalid: null, aria: !1 }, J = x === "min-max" ? Q : (
+  ], g, v), Y = { type: "tick", color: "black", opacity: 1, orient: S, invalid: null, aria: !1 }, J = x === "min-max" ? Q : (
     // for tukey / k-IQR, just show upper/lower-whisker
     kD([
       { fieldPrefix: "upper_whisker_", titlePrefix: "Upper Whisker" },
@@ -82190,14 +82185,14 @@ function nue(t, { config: e }) {
     ...x !== "tukey" ? ee : [],
     ...H({
       partName: "box",
-      mark: Object.assign(Object.assign({ type: "bar" }, f ? { size: f } : {}), { orient: S, invalid: null, ariaRoleDescription: "box" }),
+      mark: Object.assign(Object.assign({ type: "bar" }, f ? { size: f } : {}), { orient: _, invalid: null, ariaRoleDescription: "box" }),
       positionPrefix: "lower_box",
       endPositionPrefix: "upper_box",
       extraEncoding: Q
     }),
     ...G({
       partName: "median",
-      mark: Object.assign(Object.assign(Object.assign({ type: "tick", invalid: null }, ze(e.boxplot.median) && e.boxplot.median.color ? { color: e.boxplot.median.color } : {}), f ? { size: f } : {}), { orient: _, aria: !1 }),
+      mark: Object.assign(Object.assign(Object.assign({ type: "tick", invalid: null }, ze(e.boxplot.median) && e.boxplot.median.color ? { color: e.boxplot.median.color } : {}), f ? { size: f } : {}), { orient: S, aria: !1 }),
       positionPrefix: "mid_box",
       extraEncoding: Q
     })
@@ -82308,7 +82303,7 @@ function tJe(t, e, n) {
     }
   ], c = t.encoding, f = s;
   c[f];
-  const x = fA(c, [typeof f == "symbol" ? f : f + ""]), { customTooltipWithoutAggregatedField: h, filteredEncoding: p } = JKe(x), { bins: m, timeUnits: g, aggregate: y, groupby: E, encoding: A } = Yoe(p, n), v = r === "vertical" ? "horizontal" : "vertical", _ = r, S = [
+  const x = fA(c, [typeof f == "symbol" ? f : f + ""]), { customTooltipWithoutAggregatedField: h, filteredEncoding: p } = JKe(x), { bins: m, timeUnits: g, aggregate: y, groupby: E, encoding: A } = Yoe(p, n), v = r === "vertical" ? "horizontal" : "vertical", S = r, _ = [
     ...m,
     ...g,
     {
@@ -82320,14 +82315,14 @@ function tJe(t, e, n) {
   return {
     bins: m,
     timeUnits: g,
-    transform: S,
+    transform: _,
     groupby: E,
     aggregate: y,
     continuousAxisChannelDef: i,
     continuousAxis: s,
     encodingWithoutContinuousAxis: A,
     ticksOrient: v,
-    boxOrient: _,
+    boxOrient: S,
     customTooltipWithoutAggregatedField: h
   };
 }
@@ -82425,15 +82420,15 @@ function sue(t, e, n) {
   var r;
   const { mark: i, encoding: s, params: o, projection: u } = t, a = Gz(t, ["mark", "encoding", "params", "projection"]), l = wu(i) ? i : { type: i };
   o && be(eoe(e));
-  const { orient: c, inputType: f } = iJe(t, e), { continuousAxisChannelDef: x, continuousAxisChannelDef2: h, continuousAxisChannelDefError: p, continuousAxisChannelDefError2: m, continuousAxis: g } = Zoe(t, c, e), { errorBarSpecificAggregate: y, postAggregateCalculates: E, tooltipSummary: A, tooltipTitleWithFieldName: v } = aJe(l, x, h, p, m, f, e, n), _ = s, S = g;
-  _[S];
+  const { orient: c, inputType: f } = iJe(t, e), { continuousAxisChannelDef: x, continuousAxisChannelDef2: h, continuousAxisChannelDefError: p, continuousAxisChannelDefError2: m, continuousAxis: g } = Zoe(t, c, e), { errorBarSpecificAggregate: y, postAggregateCalculates: E, tooltipSummary: A, tooltipTitleWithFieldName: v } = aJe(l, x, h, p, m, f, e, n), S = s, _ = g;
+  S[_];
   const C = g === "x" ? "x2" : "y2";
-  _[C];
+  S[C];
   const b = g === "x" ? "xError" : "yError";
-  _[b];
+  S[b];
   const R = g === "x" ? "xError2" : "yError2";
-  _[R];
-  const O = Gz(_, [typeof S == "symbol" ? S : S + "", typeof C == "symbol" ? C : C + "", typeof b == "symbol" ? b : b + "", typeof R == "symbol" ? R : R + ""]), { bins: L, timeUnits: M, aggregate: H, groupby: G, encoding: Q } = Yoe(O, n), Y = [...H, ...y], J = f !== "raw" ? [] : G, ee = kD(A, x, Q, v);
+  S[R];
+  const O = Gz(S, [typeof _ == "symbol" ? _ : _ + "", typeof C == "symbol" ? C : C + "", typeof b == "symbol" ? b : b + "", typeof R == "symbol" ? R : R + ""]), { bins: L, timeUnits: M, aggregate: H, groupby: G, encoding: Q } = Yoe(O, n), Y = [...H, ...y], J = f !== "raw" ? [] : G, ee = kD(A, x, Q, v);
   return {
     transform: [
       ...(r = a.transform) !== null && r !== void 0 ? r : [],
@@ -84535,8 +84530,8 @@ function Lue(t, e, n, { reactiveGeom: r } = {}) {
     if (vr(c)) {
       const g = c === "x" ? "x2" : "y2", y = Nu(t[g]);
       if (ii(x.bin) && y) {
-        const E = Ie(x, { expr: s }), A = Ie(y, { expr: s }), { format: v, formatType: _ } = AS(x);
-        m = vb(E, A, v, _, n), i[g] = !0;
+        const E = Ie(x, { expr: s }), A = Ie(y, { expr: s }), { format: v, formatType: S } = AS(x);
+        m = vb(E, A, v, S, n), i[g] = !0;
       } else if (e && e.fieldChannel === c && e.offset === "normalize") {
         const { format: E, formatType: A } = AS(x);
         m = II({
@@ -84882,7 +84877,7 @@ function ZZe(t, e, n) {
   m = m || {
     [c]: JZe(c, h || a, l, s, g)
   };
-  const y = (l == null ? void 0 : l.get("type")) !== "band" || !("band" in m[c]) ? "middle" : "top", E = Bue(e, r, s, y), A = E === "xc" || E === "yc", { offset: v, offsetType: _ } = Kg({ channel: e, markDef: r, encoding: i, model: n, bandPosition: A ? 0.5 : 0 }), S = NI({
+  const y = (l == null ? void 0 : l.get("type")) !== "band" || !("band" in m[c]) ? "middle" : "top", E = Bue(e, r, s, y), A = E === "xc" || E === "yc", { offset: v, offsetType: S } = Kg({ channel: e, markDef: r, encoding: i, model: n, bandPosition: A ? 0.5 : 0 }), _ = NI({
     channel: e,
     channelDef: t,
     markDef: r,
@@ -84892,16 +84887,16 @@ function ZZe(t, e, n) {
     stack: o,
     offset: v,
     defaultRef: iB({ model: n, defaultPos: "mid", channel: e, scaleName: a, scale: l }),
-    bandPosition: A ? _ === "encoding" ? 0 : 0.5 : We(g) ? { signal: `(1-${g})/2` } : T2(g) ? (1 - g.band) / 2 : 0
+    bandPosition: A ? S === "encoding" ? 0 : 0.5 : We(g) ? { signal: `(1-${g})/2` } : T2(g) ? (1 - g.band) / 2 : 0
   });
   if (c)
-    return Object.assign({ [E]: S }, m);
+    return Object.assign({ [E]: _ }, m);
   {
     const C = S0(f), b = m[c], R = v ? Object.assign(Object.assign({}, b), { offset: v }) : b;
     return {
-      [E]: S,
+      [E]: _,
       // posRef might be an array that wraps position invalid test
-      [C]: _e(S) ? [S[0], Object.assign(Object.assign({}, S[1]), { offset: R })] : Object.assign(Object.assign({}, S), { offset: R })
+      [C]: _e(_) ? [_[0], Object.assign(Object.assign({}, _[1]), { offset: R })] : Object.assign(Object.assign({}, _), { offset: R })
     };
   }
 }
@@ -84919,35 +84914,35 @@ function r1(t, e, n, r, i) {
 }
 function eet({ fieldDef: t, fieldDef2: e, channel: n, model: r }) {
   var i, s, o;
-  const { config: u, markDef: a, encoding: l } = r, c = r.getScaleComponent(n), f = r.scaleName(n), x = c ? c.get("type") : void 0, h = c.get("reverse"), p = $oe({ channel: n, fieldDef: t, markDef: a, config: u, scaleType: x }), m = (i = r.component.axes[n]) === null || i === void 0 ? void 0 : i[0], g = (s = m == null ? void 0 : m.get("translate")) !== null && s !== void 0 ? s : 0.5, y = vr(n) && (o = Mt("binSpacing", a, u)) !== null && o !== void 0 ? o : 0, E = yl(n), A = S0(n), v = S0(E), { offset: _ } = Kg({ channel: n, markDef: a, encoding: l, model: r, bandPosition: 0 }), S = We(p) ? { signal: `(1-${p.signal})/2` } : T2(p) ? (1 - p.band) / 2 : 0.5;
+  const { config: u, markDef: a, encoding: l } = r, c = r.getScaleComponent(n), f = r.scaleName(n), x = c ? c.get("type") : void 0, h = c.get("reverse"), p = $oe({ channel: n, fieldDef: t, markDef: a, config: u, scaleType: x }), m = (i = r.component.axes[n]) === null || i === void 0 ? void 0 : i[0], g = (s = m == null ? void 0 : m.get("translate")) !== null && s !== void 0 ? s : 0.5, y = vr(n) && (o = Mt("binSpacing", a, u)) !== null && o !== void 0 ? o : 0, E = yl(n), A = S0(n), v = S0(E), { offset: S } = Kg({ channel: n, markDef: a, encoding: l, model: r, bandPosition: 0 }), _ = We(p) ? { signal: `(1-${p.signal})/2` } : T2(p) ? (1 - p.band) / 2 : 0.5;
   if (Xt(t.bin) || t.timeUnit)
     return {
       [v]: lH({
         fieldDef: t,
         scaleName: f,
-        bandPosition: S,
-        offset: r1(E, y, h, g, _)
+        bandPosition: _,
+        offset: r1(E, y, h, g, S)
       }),
       [A]: lH({
         fieldDef: t,
         scaleName: f,
-        bandPosition: We(S) ? { signal: `1-${S.signal}` } : 1 - S,
-        offset: r1(n, y, h, g, _)
+        bandPosition: We(_) ? { signal: `1-${_.signal}` } : 1 - _,
+        offset: r1(n, y, h, g, S)
       })
     };
   if (ii(t.bin)) {
-    const C = Kc(t, f, {}, { offset: r1(E, y, h, g, _) });
+    const C = Kc(t, f, {}, { offset: r1(E, y, h, g, S) });
     if (Le(e))
       return {
         [v]: C,
-        [A]: Kc(e, f, {}, { offset: r1(n, y, h, g, _) })
+        [A]: Kc(e, f, {}, { offset: r1(n, y, h, g, S) })
       };
     if (bx(t.bin) && t.bin.step)
       return {
         [v]: C,
         [A]: {
           signal: `scale("${f}", ${Ie(t, { expr: "datum" })} + ${t.bin.step})`,
-          offset: r1(n, y, h, g, _)
+          offset: r1(n, y, h, g, S)
         }
       };
   }
@@ -85208,10 +85203,10 @@ const Uue = "_translate_anchor", que = "_translate_delta", uet = {
 };
 function xH(t, e, n, r, i) {
   var s, o;
-  const u = e.name, a = u + Uue, l = u + que, c = n.channel, f = C0.defined(e), x = i.filter((C) => C.name === n.signals[f ? "data" : "visual"])[0], h = t.getSizeSignalRef(r).signal, p = t.getScaleComponent(c), m = p.get("type"), g = p.get("reverse"), y = f ? c === mn ? g ? "" : "-" : g ? "-" : "" : "", E = `${a}.extent_${c}`, A = `${y}${l}.${c} / ${f ? `${h}` : `span(${E})`}`, v = f ? m === "log" ? "panLog" : m === "symlog" ? "panSymlog" : m === "pow" ? "panPow" : "panLinear" : "panLinear", _ = f ? m === "pow" ? `, ${(s = p.get("exponent")) !== null && s !== void 0 ? s : 1}` : m === "symlog" ? `, ${(o = p.get("constant")) !== null && o !== void 0 ? o : 1}` : "" : "", S = `${v}(${E}, ${A}${_})`;
+  const u = e.name, a = u + Uue, l = u + que, c = n.channel, f = C0.defined(e), x = i.filter((C) => C.name === n.signals[f ? "data" : "visual"])[0], h = t.getSizeSignalRef(r).signal, p = t.getScaleComponent(c), m = p.get("type"), g = p.get("reverse"), y = f ? c === mn ? g ? "" : "-" : g ? "-" : "" : "", E = `${a}.extent_${c}`, A = `${y}${l}.${c} / ${f ? `${h}` : `span(${E})`}`, v = f ? m === "log" ? "panLog" : m === "symlog" ? "panSymlog" : m === "pow" ? "panPow" : "panLinear" : "panLinear", S = f ? m === "pow" ? `, ${(s = p.get("exponent")) !== null && s !== void 0 ? s : 1}` : m === "symlog" ? `, ${(o = p.get("constant")) !== null && o !== void 0 ? o : 1}` : "" : "", _ = `${v}(${E}, ${A}${S})`;
   x.on.push({
     events: { signal: l },
-    update: f ? S : `clampRange(${S}, 0, ${h})`
+    update: f ? _ : `clampRange(${_}, 0, ${h})`
   });
 }
 const zue = "_zoom_anchor", Hue = "_zoom_delta", aet = {
@@ -85410,22 +85405,22 @@ function L1(t, e, n, r = { header: !1 }) {
       else if (xy(g)) {
         const { condition: y } = g, E = AE(g, ["condition"]), A = ke(y), v = Hz[p];
         if (v) {
-          const { vgProp: _, part: S } = v, C = [
+          const { vgProp: S, part: _ } = v, C = [
             ...A.map((b) => {
               const { test: R } = b, O = AE(b, ["test"]);
               return Object.assign({ test: RS(null, R) }, O);
             }),
             E
           ];
-          qR(h, S, _, C), delete h[p];
+          qR(h, _, S, C), delete h[p];
         } else if (v === null) {
-          const _ = {
-            signal: A.map((S) => {
-              const { test: C } = S, b = AE(S, ["test"]);
+          const S = {
+            signal: A.map((_) => {
+              const { test: C } = _, b = AE(_, ["test"]);
               return `${RS(null, C)} ? ${Dz(b)} : `;
             }).join("") + Dz(E)
           };
-          h[p] = _;
+          h[p] = S;
         }
       } else if (We(g)) {
         const y = Hz[p];
@@ -86009,12 +86004,12 @@ function ket(t, { fieldOrDatumDef: e, model: n, channel: r, legendCmpt: i, legen
     return;
   const { markDef: p, encoding: m, config: g, mark: y } = n, E = p.filled && y !== "trail";
   let A = Object.assign(Object.assign({}, AYe({}, n, dKe)), Iue(n, { filled: E }));
-  const v = (o = i.get("symbolOpacity")) !== null && o !== void 0 ? o : g.legend.symbolOpacity, _ = (u = i.get("symbolFillColor")) !== null && u !== void 0 ? u : g.legend.symbolFillColor, S = (a = i.get("symbolStrokeColor")) !== null && a !== void 0 ? a : g.legend.symbolStrokeColor, C = v === void 0 ? (l = lae(m.opacity)) !== null && l !== void 0 ? l : p.opacity : void 0;
+  const v = (o = i.get("symbolOpacity")) !== null && o !== void 0 ? o : g.legend.symbolOpacity, S = (u = i.get("symbolFillColor")) !== null && u !== void 0 ? u : g.legend.symbolFillColor, _ = (a = i.get("symbolStrokeColor")) !== null && a !== void 0 ? a : g.legend.symbolStrokeColor, C = v === void 0 ? (l = lae(m.opacity)) !== null && l !== void 0 ? l : p.opacity : void 0;
   if (A.fill) {
     if (r === "fill" || E && r === Mi)
       delete A.fill;
     else if (A.fill.field)
-      _ ? delete A.fill : (A.fill = en((c = g.legend.symbolBaseFillColor) !== null && c !== void 0 ? c : "black"), A.fillOpacity = en(C ?? 1));
+      S ? delete A.fill : (A.fill = en((c = g.legend.symbolBaseFillColor) !== null && c !== void 0 ? c : "black"), A.fillOpacity = en(C ?? 1));
     else if (_e(A.fill)) {
       const b = (h = (x = YD((f = m.fill) !== null && f !== void 0 ? f : m.color)) !== null && x !== void 0 ? x : p.fill) !== null && h !== void 0 ? h : E && p.color;
       b && (A.fill = en(b));
@@ -86023,7 +86018,7 @@ function ket(t, { fieldOrDatumDef: e, model: n, channel: r, legendCmpt: i, legen
   if (A.stroke) {
     if (r === "stroke" || !E && r === Mi)
       delete A.stroke;
-    else if (A.stroke.field || S)
+    else if (A.stroke.field || _)
       delete A.stroke;
     else if (_e(A.stroke)) {
       const b = Qn(YD(m.stroke || m.color), p.stroke, E ? p.color : void 0);
@@ -86258,12 +86253,12 @@ function Jet(t, e) {
       (R || a.legend[C] === void 0) && c.set(C, b, R);
     }
   }
-  const A = (r = s == null ? void 0 : s.encoding) !== null && r !== void 0 ? r : {}, v = c.get("selections"), _ = {}, S = { fieldOrDatumDef: h, model: t, channel: e, legendCmpt: c, legendType: g };
+  const A = (r = s == null ? void 0 : s.encoding) !== null && r !== void 0 ? r : {}, v = c.get("selections"), S = {}, _ = { fieldOrDatumDef: h, model: t, channel: e, legendCmpt: c, legendType: g };
   for (const C of ["labels", "legend", "title", "symbols", "gradient", "entries"]) {
-    const b = oae((i = A[C]) !== null && i !== void 0 ? i : {}, t), R = C in mH ? mH[C](b, S) : b;
-    R !== void 0 && !zt(R) && (_[C] = Object.assign(Object.assign(Object.assign({}, v != null && v.length && Le(h) ? { name: `${gn(h.field)}_legend_${C}` } : {}), v != null && v.length ? { interactive: !!v } : {}), { update: R }));
+    const b = oae((i = A[C]) !== null && i !== void 0 ? i : {}, t), R = C in mH ? mH[C](b, _) : b;
+    R !== void 0 && !zt(R) && (S[C] = Object.assign(Object.assign(Object.assign({}, v != null && v.length && Le(h) ? { name: `${gn(h.field)}_legend_${C}` } : {}), v != null && v.length ? { interactive: !!v } : {}), { update: R }));
   }
-  return zt(_) || c.set("encode", _, !!(s != null && s.encoding)), c;
+  return zt(S) || c.set("encode", S, !!(s != null && s.encoding)), c;
 }
 function Zet(t) {
   const { legends: e, resolve: n } = t.component;
@@ -89715,14 +89710,14 @@ function Gb(t) {
   (Ln(t) || yo(t)) && y && (f = (r = yu.makeFromEncoding(f, t)) !== null && r !== void 0 ? r : f), t.transforms.length > 0 && (f = Lnt(f, t, g));
   const E = Att(t), A = Ett(t);
   f = (i = kr.makeWithAncestors(f, {}, Object.assign(Object.assign({}, E), A), g)) !== null && i !== void 0 ? i : f, Ln(t) && (f = Ed.parseAll(f, t), f = Zg.parseAll(f, t)), (Ln(t) || yo(t)) && (y || (f = (s = yu.makeFromEncoding(f, t)) !== null && s !== void 0 ? s : f), f = (o = mu.makeFromEncoding(f, t)) !== null && o !== void 0 ? o : f, f = Eh.parseAllForSortIndex(f, t));
-  const v = t.getDataName(Vt.Raw), _ = new di(f, v, Vt.Raw, h);
-  if (x[v] = _, f = _, Ln(t)) {
+  const v = t.getDataName(Vt.Raw), S = new di(f, v, Vt.Raw, h);
+  if (x[v] = S, f = S, Ln(t)) {
     const R = mo.makeFromEncoding(f, t);
     R && (f = R, oB(t) && (f = new R0(f))), f = (u = Zc.makeFromEncoding(f, t)) !== null && u !== void 0 ? u : f, f = (a = Ma.makeFromEncoding(f, t)) !== null && a !== void 0 ? a : f;
   }
   Ln(t) && (f = (l = Jg.make(f, t)) !== null && l !== void 0 ? l : f);
-  const S = t.getDataName(Vt.Main), C = new di(f, S, Vt.Main, h);
-  x[S] = C, f = C, Ln(t) && det(t, C);
+  const _ = t.getDataName(Vt.Main), C = new di(f, _, Vt.Main, h);
+  x[_] = C, f = C, Ln(t) && det(t, C);
   let b = null;
   if (yo(t)) {
     const R = t.getName("facet");
@@ -89731,7 +89726,7 @@ function Gb(t) {
   return Object.assign(Object.assign({}, t.component.data), {
     outputNodes: x,
     outputNodeRefCounts: h,
-    raw: _,
+    raw: S,
     main: C,
     facetRoot: b,
     ancestorParse: g
@@ -89966,17 +89961,17 @@ function Qnt(t, e) {
     config: l
   };
   for (const E of Bae) {
-    const A = E in pH ? pH[E](m) : Qz(E) ? s[E] : void 0, v = A !== void 0, _ = znt(A, E, s, e, t);
-    if (v && _)
-      o.set(E, A, _);
+    const A = E in pH ? pH[E](m) : Qz(E) ? s[E] : void 0, v = A !== void 0, S = znt(A, E, s, e, t);
+    if (v && S)
+      o.set(E, A, S);
     else {
-      const { configValue: S = void 0, configFrom: C = void 0 } = Qz(E) && E !== "values" ? GD(E, l.style, s.style, x) : {}, b = S !== void 0;
-      v && !b ? o.set(E, A, _) : (
+      const { configValue: _ = void 0, configFrom: C = void 0 } = Qz(E) && E !== "values" ? GD(E, l.style, s.style, x) : {}, b = _ !== void 0;
+      v && !b ? o.set(E, A, S) : (
         // Cases need implicit values
         // 1. Axis config that aren't available in Vega
         (C !== "vgAxisConfig" || // 2. Certain properties are always included (see `propsToAlwaysIncludeConfig`'s declaration for more details)
         Hnt.has(E) && b || // 3. Conditional axis values and signals
-        xy(S) || We(S)) && o.set(E, S, !1)
+        xy(_) || We(_)) && o.set(E, _, !1)
       );
     }
   }
@@ -89984,8 +89979,8 @@ function Qnt(t, e) {
     var v;
     if (!o.hasAxisPart(A))
       return E;
-    const _ = oae((v = g[A]) !== null && v !== void 0 ? v : {}, e), S = A === "labels" ? knt(e, t, _) : _;
-    return S !== void 0 && !zt(S) && (E[A] = { update: S }), E;
+    const S = oae((v = g[A]) !== null && v !== void 0 ? v : {}, e), _ = A === "labels" ? knt(e, t, S) : S;
+    return _ !== void 0 && !zt(_) && (E[A] = { update: _ }), E;
   }, {});
   return zt(y) || o.set("encode", y, !!s.encoding || s.labelAngle !== void 0), o;
 }
@@ -91928,17 +91923,17 @@ const dit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, hit = dit,
       });
     }
   });
-  let _;
-  e.scrollEl && (_ = e.scrollEl);
   let S;
+  e.scrollEl && (S = e.scrollEl);
+  let _;
   const [C, b] = lo(28), R = n.root && !e.disableVirtualization;
-  R && (S = Vae({
+  R && (_ = Vae({
     count: c().length,
-    getScrollElement: () => _,
+    getScrollElement: () => S,
     estimateSize: () => C()
     // need better size estimate
   }));
-  const O = S == null ? void 0 : S.getVirtualItems();
+  const O = _ == null ? void 0 : _.getVirtualItems();
   let L, M = !1;
   const H = () => {
     M = !0, setTimeout(() => {
@@ -91969,7 +91964,7 @@ const dit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, hit = dit,
             columnWidths: {}
           })));
         }
-      }).observe(_);
+      }).observe(S);
     }
   });
   const Q = () => ({
@@ -91978,7 +91973,7 @@ const dit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, hit = dit,
   return (() => {
     var Y = fit();
     return Y.addEventListener("scroll", H), Ko((J) => {
-      e.scrollEl || (_ = J);
+      e.scrollEl || (S = J);
     }, Y), At(Y, ot(Dl, {
       get when() {
         return n.root;
@@ -92020,7 +92015,7 @@ const dit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, hit = dit,
           children: (X) => (() => {
             var re = VR();
             return Ko((se) => queueMicrotask(() => {
-              S.measureElement(se), X.index === 0 && b(se.clientHeight);
+              _.measureElement(se), X.index === 0 && b(se.clientHeight);
             }), re), At(re, ot(Dl, {
               get when() {
                 return X.index >= 0;
@@ -92042,7 +92037,7 @@ const dit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, hit = dit,
           })()
         })), Lr((X) => {
           var Ee;
-          var re = S.getTotalSize() + "px", se = `${((Ee = O[0]) == null ? void 0 : Ee.start) ?? 0}px`;
+          var re = _.getTotalSize() + "px", se = `${((Ee = O[0]) == null ? void 0 : Ee.start) ?? 0}px`;
           return re !== X.e && ((X.e = re) != null ? J.style.setProperty("height", re) : J.style.removeProperty("height")), se !== X.t && ((X.t = se) != null ? ee.style.setProperty("padding-top", se) : ee.style.removeProperty("padding-top")), X;
         }, {
           e: void 0,
@@ -92394,8 +92389,8 @@ function RB(t, e, n, r) {
   let f = n.text("size") ?? o.text("size");
   l && c ? (u = l, a = c) : (f = f || "md", [u, a] = Dit[f], a = a * bE);
   let x = 0, h = 0, p = -90, m = "right", g = "middle", y = 0, E = 0;
-  const A = f !== "spark", v = f !== "spark", _ = e.fields[fu(t)];
-  let S = f !== "spark" ? bE - 1 : 0, C;
+  const A = f !== "spark", v = f !== "spark", S = e.fields[fu(t)];
+  let _ = f !== "spark" ? bE - 1 : 0, C;
   const b = fu(s), [R, O] = ((Y = r == null ? void 0 : r.getYMinMax) == null ? void 0 : Y.call(r)) ?? [
     e.fields[b].min,
     e.fields[b].max
@@ -92409,13 +92404,13 @@ function RB(t, e, n, r) {
     const k = Math.ceil(a / 40), W = L.ticks(k).at(-1);
     if (W < J) {
       const U = (J - W) / (J - ee), B = a / (1 - U);
-      S = Math.max(0, S - (B - a)), a = B, C = k;
+      _ = Math.max(0, _ - (B - a)), a = B, C = k;
     }
   }
   if (A) {
     const J = fu(i), ee = e.fields[J].maxString, X = O6(ee, "10px Inter, sans-serif") + 4, re = 1;
     E = 26, x = Math.min(X, re * a), y = x;
-    const se = e.fields[J].values.size, D = se <= 20 ? se : _.maxRecordCt, k = u / D;
+    const se = e.fields[J].values.size, D = se <= 20 ? se : S.maxRecordCt, k = u / D;
     (k > x || k > X) && (p = 0, y = k, m = void 0, g = "top", E = 22, x = 14);
   }
   const H = a + x + E, G = Math.ceil(H / bE) * bE;
@@ -92442,7 +92437,7 @@ function RB(t, e, n, r) {
       domain: n.has("y", "independent") ? null : M
     },
     padding: Q ? { top: 0, left: 0, bottom: 0, right: 0 } : {
-      top: S + 1,
+      top: _ + 1,
       left: h,
       bottom: x + E,
       right: 0
@@ -145018,7 +145013,7 @@ function Yit(t, e, n, r) {
     yField: a,
     chartType: "bar_chart",
     getYMinMax: () => [x, h]
-  }), m = n.field(u), g = l ? n.field(l) : null, y = r.text("x", "independent") === "true", E = r.has("x", "independent") && !y, A = m.values.size <= 20, v = y || A && !E, _ = r.text("series", "independent") === "true", S = r.has("series", "independent") && !_, C = g && g.values.size <= 20, b = l && (_ || C && !S), R = {
+  }), m = n.field(u), g = l ? n.field(l) : null, y = r.text("x", "independent") === "true", E = r.has("x", "independent") && !y, A = m.values.size <= 20, v = y || A && !E, S = r.text("series", "independent") === "true", _ = r.has("series", "independent") && !S, C = g && g.values.size <= 20, b = l && (S || C && !_), R = {
     $schema: "https://vega.github.io/schema/vega-lite/v5.json",
     width: p.plotWidth,
     height: p.plotHeight,
@@ -145184,7 +145179,7 @@ function Zit(t, e, n, r) {
     yField: a,
     chartType: "line_chart",
     getYMinMax: () => [x, h]
-  }), m = n.field(u), g = l ? n.field(l) : null, y = r.text("x", "independent") === "true", E = r.has("x", "independent") && !y, A = m.values.size <= 20, v = y || A && !E, _ = r.text("series", "independent") === "true", S = r.has("series", "independent") && !_, C = g && g.values.size <= 20, b = l && (_ || C && !S), O = Ot("linear")().domain([x, h]).nice().range([p.plotHeight, 0]).domain(), L = v ? [...m.values] : null, M = {
+  }), m = n.field(u), g = l ? n.field(l) : null, y = r.text("x", "independent") === "true", E = r.has("x", "independent") && !y, A = m.values.size <= 20, v = y || A && !E, S = r.text("series", "independent") === "true", _ = r.has("series", "independent") && !S, C = g && g.values.size <= 20, b = l && (S || C && !_), O = Ot("linear")().domain([x, h]).nice().range([p.plotHeight, 0]).domain(), L = v ? [...m.values] : null, M = {
     mark: { type: "line", interpolate: e.interpolate },
     encoding: {
       x: {
@@ -145398,7 +145393,7 @@ function rst(t, e, n, r) {
     yField: a,
     chartType: "area_chart",
     getYMinMax: () => [p, m]
-  }), y = n.field(u), E = l ? n.field(l) : null, A = r.text("x", "independent") === "true", v = r.has("x", "independent") && !A, _ = y.values.size <= 20, S = A || _ && !v, C = r.text("series", "independent") === "true", b = r.has("series", "independent") && !C, R = E && E.values.size <= 20, O = l && (C || R && !b), M = Ot("linear")().domain([p, m]).nice().range([g.plotHeight, 0]).domain(), H = S ? [...y.values] : null, G = {
+  }), y = n.field(u), E = l ? n.field(l) : null, A = r.text("x", "independent") === "true", v = r.has("x", "independent") && !A, S = y.values.size <= 20, _ = A || S && !v, C = r.text("series", "independent") === "true", b = r.has("series", "independent") && !C, R = E && E.values.size <= 20, O = l && (C || R && !b), M = Ot("linear")().domain([p, m]).nice().range([g.plotHeight, 0]).domain(), H = _ ? [...y.values] : null, G = {
     mark: {
       type: "area",
       interpolate: e.interpolate,
@@ -145414,7 +145409,7 @@ function rst(t, e, n, r) {
           title: e.xChannel.fields.join(", ")
         },
         scale: {
-          domain: S ? [...y.values] : null
+          domain: _ ? [...y.values] : null
         },
         sort: H
       },