@malloydata/render 0.0.144-dev240426181908 → 0.0.144-dev240503230218

package/dist/webcomponent/malloy-render.mjs

@@ -413,7 +413,7 @@ function Wle(t, e, n = {}) {
     return a[Ple], Go(() => {
       let x = a.length, h, p, m, g, y, E, A, S, v;
       if (x === 0)
-        o !== 0 && (xP(s), s = [], r = [], i = [], o = 0, u && (u = [])), n.fallback && (r = [Gle], i[0] = GA((C) => (s[0] = C, n.fallback())), o = 1);
+        o !== 0 && (xP(s), s = [], r = [], i = [], o = 0, u && (u = [])), n.fallback && (r = [Gle], i[0] = GA((_) => (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] = GA(f);
@@ -1619,8 +1619,8 @@ function zce(t) {
     for (var p = 16; p < 80; ++p)
       x[p] = iD(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], S = 0; S < 80; ++S) {
-      var v = Math.floor(S / 20), C = iD(m, 5) + Hce(v, g, y, E) + A + e[v] + x[S] >>> 0;
-      A = E, E = y, y = iD(g, 30) >>> 0, g = m, m = C;
+      var v = Math.floor(S / 20), _ = iD(m, 5) + Hce(v, g, y, E) + A + e[v] + x[S] >>> 0;
+      A = E, E = y, y = iD(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;
   }
@@ -2632,8 +2632,8 @@ function _xe() {
 AC.fnSumMoving = _xe;
 (function(t) {
   Object.defineProperty(t, "__esModule", { value: !0 }), t.FUNCTIONS = void 0;
-  const e = Q_, n = G_, r = W_, i = V_, s = Y_, o = D0, u = K_, a = X_, l = J_, c = Z_, f = bh, x = eC, h = tC, p = nC, m = rC, g = iC, y = sC, E = Th, A = Yi, S = Rh, v = oC, C = uC, _ = aC, b = lC, R = cC, O = fC, L = xC, M = Oh, q = F0, W = dC, B = hC, G = pC, te = gC, X = Lt, de = mC, be = yC, ee = EC, U = Nh, T = no, w = AC;
-  t.FUNCTIONS = new be.FunctionMap(), t.FUNCTIONS.add("concat", e.fnConcat), t.FUNCTIONS.add("round", i.fnRound), t.FUNCTIONS.add("trunc", n.fnTrunc), t.FUNCTIONS.add("floor", X.fnFloor), t.FUNCTIONS.add("ceil", X.fnCeil), t.FUNCTIONS.add("cos", X.fnCos), t.FUNCTIONS.add("acos", X.fnAcos), t.FUNCTIONS.add("sin", X.fnSin), t.FUNCTIONS.add("asin", X.fnAsin), t.FUNCTIONS.add("tan", X.fnTan), t.FUNCTIONS.add("atan", X.fnAtan), t.FUNCTIONS.add("atan2", _.fnAtan2), t.FUNCTIONS.add("lower", s.fnLower), t.FUNCTIONS.add("upper", u.fnUpper), t.FUNCTIONS.add("sqrt", X.fnSqrt), t.FUNCTIONS.add("pow", b.fnPow), t.FUNCTIONS.add("abs", X.fnAbs), t.FUNCTIONS.add("sign", X.fnSign), t.FUNCTIONS.add("is_inf", v.fnIsInf), t.FUNCTIONS.add("is_nan", C.fnIsNan), t.FUNCTIONS.add("greatest", M.fnGreatest), t.FUNCTIONS.add("least", M.fnLeast), t.FUNCTIONS.add("div", L.fnDiv), t.FUNCTIONS.add("strpos", O.fnStrpos), t.FUNCTIONS.add("starts_with", S.fnStartsWith), t.FUNCTIONS.add("ends_with", S.fnEndsWith), t.FUNCTIONS.add("trim", q.fnTrim), t.FUNCTIONS.add("ltrim", q.fnLtrim), t.FUNCTIONS.add("rtrim", q.fnRtrim), t.FUNCTIONS.add("rand", W.fnRand), t.FUNCTIONS.add("pi", B.fnPi), t.FUNCTIONS.add("substr", a.fnSubstr), t.FUNCTIONS.add("regexp_extract", l.fnRegexpExtract), t.FUNCTIONS.add("replace", c.fnReplace), t.FUNCTIONS.add("length", f.fnLength), t.FUNCTIONS.add("byte_length", f.fnByteLength), t.FUNCTIONS.add("ifnull", x.fnIfnull), t.FUNCTIONS.add("coalesce", ee.fnCoalesce), t.FUNCTIONS.add("nullif", h.fnNullif), t.FUNCTIONS.add("chr", o.fnChr), t.FUNCTIONS.add("ascii", o.fnAscii), t.FUNCTIONS.add("unicode", o.fnUnicode), t.FUNCTIONS.add("repeat", G.fnRepeat), t.FUNCTIONS.add("reverse", te.fnReverse), t.FUNCTIONS.add("log", R.fnLog), t.FUNCTIONS.add("ln", X.fnLn), t.FUNCTIONS.add("exp", X.fnExp), t.FUNCTIONS.add("stddev", r.fnStddev), t.FUNCTIONS.add("string_agg", U.fnStringAgg), t.FUNCTIONS.add("string_agg_distinct", U.fnStringAggDistinct), t.FUNCTIONS.add("row_number", p.fnRowNumber), t.FUNCTIONS.add("lag", m.fnLag), t.FUNCTIONS.add("lead", g.fnLead), t.FUNCTIONS.add("rank", y.fnRank), t.FUNCTIONS.add("first_value", E.fnFirstValueWindow), t.FUNCTIONS.add("last_value", E.fnLastValueWindow), t.FUNCTIONS.add("min_cumulative", A.fnMinCumulative), t.FUNCTIONS.add("max_cumulative", A.fnMaxCumulative), t.FUNCTIONS.add("sum_cumulative", A.fnSumCumulative), t.FUNCTIONS.add("min_window", A.fnMinWindow), t.FUNCTIONS.add("max_window", A.fnMaxWindow), t.FUNCTIONS.add("sum_window", A.fnSumWindow), t.FUNCTIONS.add("avg_moving", de.fnAvgRolling), t.FUNCTIONS.add("sum_moving", w.fnSumMoving), t.FUNCTIONS.add("sql_number", T.fnSqlNumber), t.FUNCTIONS.add("sql_string", T.fnSqlString), t.FUNCTIONS.add("sql_date", T.fnSqlDate), t.FUNCTIONS.add("sql_timestamp", T.fnSqlTimestamp), t.FUNCTIONS.add("sql_boolean", T.fnSqlBoolean), t.FUNCTIONS.seal();
+  const e = Q_, n = G_, r = W_, i = V_, s = Y_, o = D0, u = K_, a = X_, l = J_, c = Z_, f = bh, x = eC, h = tC, p = nC, m = rC, g = iC, y = sC, E = Th, A = Yi, S = Rh, v = oC, _ = uC, C = aC, b = lC, R = cC, O = fC, L = xC, M = Oh, q = F0, W = dC, B = hC, G = pC, te = gC, X = Lt, de = mC, be = yC, ee = EC, U = Nh, T = no, w = AC;
+  t.FUNCTIONS = new be.FunctionMap(), t.FUNCTIONS.add("concat", e.fnConcat), t.FUNCTIONS.add("round", i.fnRound), t.FUNCTIONS.add("trunc", n.fnTrunc), t.FUNCTIONS.add("floor", X.fnFloor), t.FUNCTIONS.add("ceil", X.fnCeil), t.FUNCTIONS.add("cos", X.fnCos), t.FUNCTIONS.add("acos", X.fnAcos), t.FUNCTIONS.add("sin", X.fnSin), t.FUNCTIONS.add("asin", X.fnAsin), t.FUNCTIONS.add("tan", X.fnTan), t.FUNCTIONS.add("atan", X.fnAtan), t.FUNCTIONS.add("atan2", C.fnAtan2), t.FUNCTIONS.add("lower", s.fnLower), t.FUNCTIONS.add("upper", u.fnUpper), t.FUNCTIONS.add("sqrt", X.fnSqrt), t.FUNCTIONS.add("pow", b.fnPow), t.FUNCTIONS.add("abs", X.fnAbs), t.FUNCTIONS.add("sign", X.fnSign), t.FUNCTIONS.add("is_inf", v.fnIsInf), t.FUNCTIONS.add("is_nan", _.fnIsNan), t.FUNCTIONS.add("greatest", M.fnGreatest), t.FUNCTIONS.add("least", M.fnLeast), t.FUNCTIONS.add("div", L.fnDiv), t.FUNCTIONS.add("strpos", O.fnStrpos), t.FUNCTIONS.add("starts_with", S.fnStartsWith), t.FUNCTIONS.add("ends_with", S.fnEndsWith), t.FUNCTIONS.add("trim", q.fnTrim), t.FUNCTIONS.add("ltrim", q.fnLtrim), t.FUNCTIONS.add("rtrim", q.fnRtrim), t.FUNCTIONS.add("rand", W.fnRand), t.FUNCTIONS.add("pi", B.fnPi), t.FUNCTIONS.add("substr", a.fnSubstr), t.FUNCTIONS.add("regexp_extract", l.fnRegexpExtract), t.FUNCTIONS.add("replace", c.fnReplace), t.FUNCTIONS.add("length", f.fnLength), t.FUNCTIONS.add("byte_length", f.fnByteLength), t.FUNCTIONS.add("ifnull", x.fnIfnull), t.FUNCTIONS.add("coalesce", ee.fnCoalesce), t.FUNCTIONS.add("nullif", h.fnNullif), t.FUNCTIONS.add("chr", o.fnChr), t.FUNCTIONS.add("ascii", o.fnAscii), t.FUNCTIONS.add("unicode", o.fnUnicode), t.FUNCTIONS.add("repeat", G.fnRepeat), t.FUNCTIONS.add("reverse", te.fnReverse), t.FUNCTIONS.add("log", R.fnLog), t.FUNCTIONS.add("ln", X.fnLn), t.FUNCTIONS.add("exp", X.fnExp), t.FUNCTIONS.add("stddev", r.fnStddev), t.FUNCTIONS.add("string_agg", U.fnStringAgg), t.FUNCTIONS.add("string_agg_distinct", U.fnStringAggDistinct), t.FUNCTIONS.add("row_number", p.fnRowNumber), t.FUNCTIONS.add("lag", m.fnLag), t.FUNCTIONS.add("lead", g.fnLead), t.FUNCTIONS.add("rank", y.fnRank), t.FUNCTIONS.add("first_value", E.fnFirstValueWindow), t.FUNCTIONS.add("last_value", E.fnLastValueWindow), t.FUNCTIONS.add("min_cumulative", A.fnMinCumulative), t.FUNCTIONS.add("max_cumulative", A.fnMaxCumulative), t.FUNCTIONS.add("sum_cumulative", A.fnSumCumulative), t.FUNCTIONS.add("min_window", A.fnMinWindow), t.FUNCTIONS.add("max_window", A.fnMaxWindow), t.FUNCTIONS.add("sum_window", A.fnSumWindow), t.FUNCTIONS.add("avg_moving", de.fnAvgRolling), t.FUNCTIONS.add("sum_moving", w.fnSumMoving), t.FUNCTIONS.add("sql_number", T.fnSqlNumber), t.FUNCTIONS.add("sql_string", T.fnSqlString), t.FUNCTIONS.add("sql_date", T.fnSqlDate), t.FUNCTIONS.add("sql_timestamp", T.fnSqlTimestamp), t.FUNCTIONS.add("sql_boolean", T.fnSqlBoolean), t.FUNCTIONS.seal();
 })(OG);
 (function(t) {
   Object.defineProperty(t, "__esModule", { value: !0 }), t.FUNCTIONS = void 0;
@@ -3304,7 +3304,7 @@ kC.fnUnicode = Zxe;
 })(FG);
 Object.defineProperty(_C, "__esModule", { value: !0 });
 _C.PostgresDialect = void 0;
-const ede = Yt, Mt = ne, EP = FG, X2 = zx, tde = {
+const ede = Yt, Pt = ne, EP = FG, X2 = zx, tde = {
   day_of_week: "dow",
   day_of_year: "doy"
 }, nde = {
@@ -3472,55 +3472,55 @@ $$ LANGUAGE SQL;
     throw new Error("Not implemented Yet");
   }
   sqlNow() {
-    return (0, Mt.mkExpr)`LOCALTIMESTAMP`;
+    return (0, Pt.mkExpr)`LOCALTIMESTAMP`;
   }
   sqlTrunc(e, n, r) {
-    const i = r === "week", s = i ? (0, Mt.mkExpr)`${n.value} + INTERVAL '1' DAY` : n.value;
+    const i = r === "week", s = i ? (0, Pt.mkExpr)`${n.value} + INTERVAL '1' DAY` : n.value;
     if (n.valueType === "timestamp") {
       const u = (0, X2.qtz)(e);
       if (u) {
-        const a = (0, Mt.mkExpr)`(${s}::TIMESTAMPTZ AT TIME ZONE '${u}')`;
-        let l = (0, Mt.mkExpr)`DATE_TRUNC('${r}', ${a})`;
-        l = (0, Mt.mkExpr)`${l}::TIMESTAMP`;
-        const c = (0, Mt.mkExpr)`${l} AT TIME ZONE '${u}'`;
-        return (0, Mt.mkExpr)`(${c})::TIMESTAMP`;
+        const a = (0, Pt.mkExpr)`(${s}::TIMESTAMPTZ AT TIME ZONE '${u}')`;
+        let l = (0, Pt.mkExpr)`DATE_TRUNC('${r}', ${a})`;
+        l = (0, Pt.mkExpr)`${l}::TIMESTAMP`;
+        const c = (0, Pt.mkExpr)`${l} AT TIME ZONE '${u}'`;
+        return (0, Pt.mkExpr)`(${c})::TIMESTAMP`;
       }
     }
-    let o = (0, Mt.mkExpr)`DATE_TRUNC('${r}', ${s})`;
-    return i && (o = (0, Mt.mkExpr)`(${o} - INTERVAL '1' DAY)`), o;
+    let o = (0, Pt.mkExpr)`DATE_TRUNC('${r}', ${s})`;
+    return i && (o = (0, Pt.mkExpr)`(${o} - INTERVAL '1' DAY)`), o;
   }
   sqlExtract(e, n, r) {
     const i = tde[r] || r;
     let s = n.value;
     if (n.valueType === "timestamp") {
       const u = (0, X2.qtz)(e);
-      u && (s = (0, Mt.mkExpr)`(${s}::TIMESTAMPTZ AT TIME ZONE '${u}')`);
+      u && (s = (0, Pt.mkExpr)`(${s}::TIMESTAMPTZ AT TIME ZONE '${u}')`);
     }
-    const o = (0, Mt.mkExpr)`EXTRACT(${i} FROM ${s})`;
-    return r === "day_of_week" ? (0, Mt.mkExpr)`(${o}+1)` : o;
+    const o = (0, Pt.mkExpr)`EXTRACT(${i} FROM ${s})`;
+    return r === "day_of_week" ? (0, Pt.mkExpr)`(${o}+1)` : o;
   }
   sqlAlterTime(e, n, r, i) {
-    i === "quarter" && (i = "month", r = (0, Mt.mkExpr)`${r}*3`);
-    const s = (0, Mt.mkExpr)`make_interval(${nde[i]}=>${r})`;
-    return (0, Mt.mkExpr)`((${n.value})${e}${s})`;
+    i === "quarter" && (i = "month", r = (0, Pt.mkExpr)`${r}*3`);
+    const s = (0, Pt.mkExpr)`make_interval(${nde[i]}=>${r})`;
+    return (0, Pt.mkExpr)`((${n.value})${e}${s})`;
   }
   sqlCast(e, n) {
     const r = `${n.srcType}::${n.dstType}`, i = (0, X2.qtz)(e);
     if (r === "timestamp::date" && i) {
-      const s = (0, Mt.mkExpr)`${n.expr}::TIMESTAMPTZ`;
-      return (0, Mt.mkExpr)`CAST((${s}) AT TIME ZONE '${i}' AS DATE)`;
+      const s = (0, Pt.mkExpr)`${n.expr}::TIMESTAMPTZ`;
+      return (0, Pt.mkExpr)`CAST((${s}) AT TIME ZONE '${i}' AS DATE)`;
     } else if (r === "date::timestamp" && i)
-      return (0, Mt.mkExpr)`CAST((${n.expr})::TIMESTAMP AT TIME ZONE '${i}' AS TIMESTAMP)`;
+      return (0, Pt.mkExpr)`CAST((${n.expr})::TIMESTAMP AT TIME ZONE '${i}' AS TIMESTAMP)`;
     if (n.srcType !== n.dstType) {
       const s = typeof n.dstType == "string" ? this.malloyTypeToSQLType({ type: n.dstType }) : n.dstType.raw;
       if (n.safe)
         throw new Error("Postgres dialect doesn't support Safe Cast");
-      return (0, Mt.mkExpr)`${"CAST"}(${n.expr} AS ${s})`;
+      return (0, Pt.mkExpr)`${"CAST"}(${n.expr} AS ${s})`;
     }
     return n.expr;
   }
   sqlRegexpMatch(e, n) {
-    return (0, Mt.mkExpr)`(${e} ~ ${n})`;
+    return (0, Pt.mkExpr)`(${e} ~ ${n})`;
   }
   sqlLiteralTime(e, n, r, i) {
     if (r === "date")
@@ -3531,9 +3531,9 @@ $$ LANGUAGE SQL;
   sqlMeasureTime(e, n, r) {
     let i = e.value, s = n.value;
     if (AP[r]) {
-      i = (0, Mt.mkExpr)`EXTRACT(EPOCH FROM ${i})`, s = (0, Mt.mkExpr)`EXTRACT(EPOCH FROM ${s})`;
-      const o = (0, Mt.mkExpr)`${s}-${i}`;
-      return r === "second" ? (0, Mt.mkExpr)`FLOOR(${o})` : (0, Mt.mkExpr)`FLOOR((${o})/${AP[r].toString()}.0)`;
+      i = (0, Pt.mkExpr)`EXTRACT(EPOCH FROM ${i})`, s = (0, Pt.mkExpr)`EXTRACT(EPOCH FROM ${s})`;
+      const o = (0, Pt.mkExpr)`${s}-${i}`;
+      return r === "second" ? (0, Pt.mkExpr)`FLOOR(${o})` : (0, Pt.mkExpr)`FLOOR((${o})/${AP[r].toString()}.0)`;
     }
     throw new Error(`Unknown or unhandled postgres time unit: ${r}`);
   }
@@ -3558,9 +3558,9 @@ $$ LANGUAGE SQL;
   }
   sqlSampleTable(e, n) {
     if (n !== void 0) {
-      if ((0, Mt.isSamplingEnable)(n) && n.enable && (n = this.defaultSampling), (0, Mt.isSamplingRows)(n))
+      if ((0, Pt.isSamplingEnable)(n) && n.enable && (n = this.defaultSampling), (0, Pt.isSamplingRows)(n))
         return `(SELECT * FROM ${e} TABLESAMPLE SYSTEM_ROWS(${n.rows}))`;
-      if ((0, Mt.isSamplingPercent)(n))
+      if ((0, Pt.isSamplingPercent)(n))
         return `(SELECT * FROM ${e} TABLESAMPLE SYSTEM (${n.percent}))`;
     }
     return e;
@@ -3785,7 +3785,7 @@ VC.fnUnicode = mde;
 })(IG);
 Object.defineProperty(PC, "__esModule", { value: !0 });
 PC.DuckDBDialect = void 0;
-const qt = ne, yde = Yt, Ede = IG, qd = zx, SP = "-- hack: split on this", Ade = {
+const Ut = ne, yde = Yt, Ede = IG, qd = zx, SP = "-- hack: split on this", Ade = {
   day_of_week: "dow",
   day_of_year: "doy"
 }, Sde = {
@@ -3916,56 +3916,56 @@ ${SP}
   }
   sqlMeasureTime(e, n, r) {
     let i = e.value, s = n.value;
-    return (0, qd.inDays)(r) || (e.valueType === "date" && (i = (0, qt.mkExpr)`(${i})::TIMESTAMP`), n.valueType === "date" && (s = (0, qt.mkExpr)`(${s})::TIMESTAMP`)), (0, qt.mkExpr)`DATE_SUB('${r}',${i},${s})`;
+    return (0, qd.inDays)(r) || (e.valueType === "date" && (i = (0, Ut.mkExpr)`(${i})::TIMESTAMP`), n.valueType === "date" && (s = (0, Ut.mkExpr)`(${s})::TIMESTAMP`)), (0, Ut.mkExpr)`DATE_SUB('${r}',${i},${s})`;
   }
   sqlNow() {
-    return (0, qt.mkExpr)`LOCALTIMESTAMP`;
+    return (0, Ut.mkExpr)`LOCALTIMESTAMP`;
   }
   sqlTrunc(e, n, r) {
-    const i = r === "week", s = i ? (0, qt.mkExpr)`${n.value} + INTERVAL 1 DAY` : n.value;
+    const i = r === "week", s = i ? (0, Ut.mkExpr)`${n.value} + INTERVAL 1 DAY` : n.value;
     if (n.valueType === "timestamp") {
       const u = (0, qd.qtz)(e);
       if (u) {
-        const a = (0, qt.mkExpr)`(${s}::TIMESTAMPTZ AT TIME ZONE '${u}')`;
-        let l = (0, qt.mkExpr)`DATE_TRUNC('${r}', ${a})`;
-        l = (0, qt.mkExpr)`${l}::TIMESTAMP`;
-        const c = (0, qt.mkExpr)`${l} AT TIME ZONE '${u}'`;
-        return (0, qt.mkExpr)`(${c})::TIMESTAMP`;
+        const a = (0, Ut.mkExpr)`(${s}::TIMESTAMPTZ AT TIME ZONE '${u}')`;
+        let l = (0, Ut.mkExpr)`DATE_TRUNC('${r}', ${a})`;
+        l = (0, Ut.mkExpr)`${l}::TIMESTAMP`;
+        const c = (0, Ut.mkExpr)`${l} AT TIME ZONE '${u}'`;
+        return (0, Ut.mkExpr)`(${c})::TIMESTAMP`;
       }
     }
-    let o = (0, qt.mkExpr)`DATE_TRUNC('${r}', ${s})`;
-    return i && (o = (0, qt.mkExpr)`(${o} - INTERVAL 1 DAY)`), o;
+    let o = (0, Ut.mkExpr)`DATE_TRUNC('${r}', ${s})`;
+    return i && (o = (0, Ut.mkExpr)`(${o} - INTERVAL 1 DAY)`), o;
   }
   sqlExtract(e, n, r) {
     const i = Ade[r] || r;
     let s = n.value;
     if (n.valueType === "timestamp") {
       const u = (0, qd.qtz)(e);
-      u && (s = (0, qt.mkExpr)`(${s}::TIMESTAMPTZ AT TIME ZONE '${u}')`);
+      u && (s = (0, Ut.mkExpr)`(${s}::TIMESTAMPTZ AT TIME ZONE '${u}')`);
     }
-    const o = (0, qt.mkExpr)`EXTRACT(${i} FROM ${s})`;
-    return r === "day_of_week" ? (0, qt.mkExpr)`(${o}+1)` : o;
+    const o = (0, Ut.mkExpr)`EXTRACT(${i} FROM ${s})`;
+    return r === "day_of_week" ? (0, Ut.mkExpr)`(${o}+1)` : o;
   }
   sqlAlterTime(e, n, r, i) {
-    i === "quarter" && (i = "month", r = (0, qt.mkExpr)`${r}*3`), i === "week" && (i = "day", r = (0, qt.mkExpr)`${r}*7`);
-    const s = (0, qt.mkExpr)`INTERVAL (${r}) ${i}`;
-    return (0, qt.mkExpr)`${n.value} ${e} ${s}`;
+    i === "quarter" && (i = "month", r = (0, Ut.mkExpr)`${r}*3`), i === "week" && (i = "day", r = (0, Ut.mkExpr)`${r}*7`);
+    const s = (0, Ut.mkExpr)`INTERVAL (${r}) ${i}`;
+    return (0, Ut.mkExpr)`${n.value} ${e} ${s}`;
   }
   sqlCast(e, n) {
     const r = `${n.srcType}::${n.dstType}`, i = (0, qd.qtz)(e);
     if (r === "timestamp::date" && i) {
-      const s = (0, qt.mkExpr)`${n.expr}::TIMESTAMPTZ`;
-      return (0, qt.mkExpr)`CAST((${s}) AT TIME ZONE '${i}' AS DATE)`;
+      const s = (0, Ut.mkExpr)`${n.expr}::TIMESTAMPTZ`;
+      return (0, Ut.mkExpr)`CAST((${s}) AT TIME ZONE '${i}' AS DATE)`;
     } else if (r === "date::timestamp" && i)
-      return (0, qt.mkExpr)`CAST((${n.expr})::TIMESTAMP AT TIME ZONE '${i}' AS TIMESTAMP)`;
+      return (0, Ut.mkExpr)`CAST((${n.expr})::TIMESTAMP AT TIME ZONE '${i}' AS TIMESTAMP)`;
     if (n.srcType !== n.dstType) {
       const s = typeof n.dstType == "string" ? this.malloyTypeToSQLType({ type: n.dstType }) : n.dstType.raw, o = n.safe ? "TRY_CAST" : "CAST";
-      return (0, qt.mkExpr)`${o}(${n.expr} AS ${s})`;
+      return (0, Ut.mkExpr)`${o}(${n.expr} AS ${s})`;
     }
     return n.expr;
   }
   sqlRegexpMatch(e, n) {
-    return (0, qt.mkExpr)`REGEXP_MATCHES(${e}, ${n})`;
+    return (0, Ut.mkExpr)`REGEXP_MATCHES(${e}, ${n})`;
   }
   sqlLiteralTime(e, n, r, i) {
     if (r === "date")
@@ -4000,9 +4000,9 @@ ${SP}
   // default duckdb to sampling 50K rows.
   sqlSampleTable(e, n) {
     if (n !== void 0) {
-      if ((0, qt.isSamplingEnable)(n) && n.enable && (n = this.defaultSampling), (0, qt.isSamplingRows)(n))
+      if ((0, Ut.isSamplingEnable)(n) && n.enable && (n = this.defaultSampling), (0, Ut.isSamplingRows)(n))
         return `(SELECT * FROM ${e} USING SAMPLE ${n.rows})`;
-      if ((0, qt.isSamplingPercent)(n))
+      if ((0, Ut.isSamplingPercent)(n))
         return `(SELECT * FROM ${e} USING SAMPLE ${n.percent} PERCENT (bernoulli))`;
     }
     return e;
@@ -4708,7 +4708,7 @@ hb.fnReverse = ihe;
 })(MG);
 Object.defineProperty(sb, "__esModule", { value: !0 });
 sb.TrinoDialect = void 0;
-const _P = Yt, kt = ne, she = MG, CP = zx;
+const _P = Yt, qt = ne, she = MG, CP = zx;
 function ohe(t) {
   return [
     "microsecond",
@@ -4840,7 +4840,7 @@ class lhe extends CP.Dialect {
   dialectExpr(e, n) {
     switch (n.function) {
       case "div":
-        return (0, kt.mkExpr)`CAST(${n.numerator} AS DOUBLE)/${n.denominator}`;
+        return (0, qt.mkExpr)`CAST(${n.numerator} AS DOUBLE)/${n.denominator}`;
     }
     return super.dialectExpr(e, n);
   }
@@ -4932,57 +4932,54 @@ ${(0, _P.indent)(n)}
     return '"' + e + '"';
   }
   sqlNow() {
-    return (0, kt.mkExpr)`LOCALTIMESTAMP`;
+    return (0, qt.mkExpr)`LOCALTIMESTAMP`;
   }
   sqlTrunc(e, n, r) {
-    const i = r === "week", s = i ? (0, kt.mkExpr)`DATE_ADD('day', 1, ${n.value})` : n.value;
+    const i = r === "week", s = i ? (0, qt.mkExpr)`DATE_ADD('day', 1, ${n.value})` : n.value;
     if (n.valueType === "timestamp") {
       const u = $3(e);
       if (u) {
-        const a = (0, kt.mkExpr)`CAST(${s} AS TIMESTAMPTZ AT TIME ZONE '${u}')`;
-        let l = (0, kt.mkExpr)`DATE_TRUNC('${r}', ${a})`;
-        l = (0, kt.mkExpr)`CAST(${l}, TIMESTAMP)`;
-        const c = (0, kt.mkExpr)`${l} AT TIME ZONE '${u}'`;
-        return (0, kt.mkExpr)`CAST((${c}),TIMESTAMP)`;
+        const a = (0, qt.mkExpr)`AT_TIMEZONE(${s},'${u}')`, l = (0, qt.mkExpr)`DATE_TRUNC('${r}', ${a})`;
+        return (0, qt.mkExpr)`AT_TIMEZONE(${l},'${u}')`;
       }
     }
-    let o = (0, kt.mkExpr)`DATE_TRUNC('${r}', ${s})`;
-    return i && (o = (0, kt.mkExpr)`DATE_ADD('day',-1, ${o})`), o;
+    let o = (0, qt.mkExpr)`DATE_TRUNC('${r}', ${s})`;
+    return i && (o = (0, qt.mkExpr)`DATE_ADD('day',-1, ${o})`), o;
   }
   sqlExtract(e, n, r) {
     const i = uhe[r] || r;
     let s = n.value;
     if (n.valueType === "timestamp") {
       const u = $3(e);
-      u && (s = (0, kt.mkExpr)`CAST(${s}, TIMESTAMPTZ AT TIME ZONE '${u}')`);
+      u && (s = (0, qt.mkExpr)`at_timezone(${s},'${u}')`);
     }
-    const o = (0, kt.mkExpr)`EXTRACT(${i} FROM ${s})`;
-    return r === "day_of_week" ? (0, kt.mkExpr)`mod(${o}+1,7)` : o;
+    const o = (0, qt.mkExpr)`EXTRACT(${i} FROM ${s})`;
+    return r === "day_of_week" ? (0, qt.mkExpr)`mod(${o}+1,7)` : o;
   }
   sqlAlterTime(e, n, r, i) {
-    return i === "quarter" && (i = "month", r = (0, kt.mkExpr)`${r}*3`), i === "week" && (i = "day", r = (0, kt.mkExpr)`${r}*7`), e === "-" && (r = (0, kt.mkExpr)`(${r})*-1`), (0, kt.mkExpr)`DATE_ADD('${i}', ${r}, ${n.value})`;
+    return i === "quarter" && (i = "month", r = (0, qt.mkExpr)`${r}*3`), i === "week" && (i = "day", r = (0, qt.mkExpr)`${r}*7`), e === "-" && (r = (0, qt.mkExpr)`(${r})*-1`), (0, qt.mkExpr)`DATE_ADD('${i}', ${r}, ${n.value})`;
   }
   sqlCast(e, n) {
-    const r = `${n.srcType}::${n.dstType}`, i = $3(e);
-    if (r === "timestamp::date" && i) {
-      const s = (0, kt.mkExpr)`CAST(${n.expr} as TIMESTAMPTZ)`;
-      return (0, kt.mkExpr)`CAST((${s}) AT TIME ZONE '${i}' AS DATE)`;
-    } else if (r === "date::timestamp" && i)
-      return (0, kt.mkExpr)`CAST(CAST(${n.expr}), TIMESTAMP AT TIME ZONE '${i}') AS TIMESTAMP)`;
+    const r = `${n.srcType}=>${n.dstType}`, i = $3(e);
+    if (r === "timestamp=>date" && i) {
+      const s = (0, qt.mkExpr)`CAST(${n.expr} as TIMESTAMP)`;
+      return (0, qt.mkExpr)`CAST((${s}) AT TIME ZONE '${i}' AS DATE)`;
+    } else if (r === "date=>timestamp" && i)
+      return (0, qt.mkExpr)`CAST(CONCAT(CAST(CAST(${n.expr} AS TIMESTAMP) AS VARCHAR), ' ${i}') AS TIMESTAMP WITH TIME ZONE)`;
     if (n.srcType !== n.dstType) {
       const s = typeof n.dstType == "string" ? this.malloyTypeToSQLType({ type: n.dstType }) : n.dstType.raw, o = n.safe ? "TRY_CAST" : "CAST";
-      return (0, kt.mkExpr)`${o}(${n.expr} AS ${s})`;
+      return (0, qt.mkExpr)`${o}(${n.expr} AS ${s})`;
     }
     return n.expr;
   }
   sqlRegexpMatch(e, n) {
-    return (0, kt.mkExpr)`REGEXP_LIKE(${e}, ${n})`;
+    return (0, qt.mkExpr)`REGEXP_LIKE(${e}, ${n})`;
   }
   sqlLiteralTime(e, n, r, i) {
     if (r === "date")
       return `DATE '${n}'`;
     const s = i || $3(e);
-    return s ? `TIMESTAMPTZ '${n} ${s}'::TIMESTAMP` : `TIMESTAMP '${n}'`;
+    return s ? `TIMESTAMP '${n} ${s}'` : `TIMESTAMP '${n}'`;
   }
   sqlMeasureTime(e, n, r) {
     const i = {
@@ -5001,17 +4998,17 @@ ${(0, _P.indent)(n)}
         throw new Error(`Measure in '${u} not implemented`);
       if (e.valueType !== n.valueType)
         throw new Error("Can't measure difference between different types");
-      e.valueType === "date" && (s = (0, kt.mkExpr)`CAST(${s} AS TIMESTAMP)`, o = (0, kt.mkExpr)`CAST(${o} AS TIMESTAMP)`);
-      let l = (0, kt.mkExpr)`DATE_DIFF('${u}',${s},${o})`;
-      return a !== 1 && (l = (0, kt.mkExpr)`FLOOR(CAST(${l} AS DOUBLE)/${a.toString()}.0)`), l;
+      e.valueType === "date" && (s = (0, qt.mkExpr)`CAST(${s} AS TIMESTAMP)`, o = (0, qt.mkExpr)`CAST(${o} AS TIMESTAMP)`);
+      let l = (0, qt.mkExpr)`DATE_DIFF('${u}',${s},${o})`;
+      return a !== 1 && (l = (0, qt.mkExpr)`FLOOR(CAST(${l} AS DOUBLE)/${a.toString()}.0)`), l;
     }
     throw new Error(`Measure '${r} not implemented`);
   }
   sqlSampleTable(e, n) {
     if (n !== void 0) {
-      if ((0, kt.isSamplingEnable)(n) && n.enable && (n = this.defaultSampling), (0, kt.isSamplingRows)(n))
+      if ((0, qt.isSamplingEnable)(n) && n.enable && (n = this.defaultSampling), (0, qt.isSamplingRows)(n))
         throw new Error("Trino doesn't support sampling by rows only percent");
-      if ((0, kt.isSamplingPercent)(n))
+      if ((0, qt.isSamplingPercent)(n))
         return `(SELECT * FROM ${e}  TABLESAMPLE SYSTEM (${n.percent}))`;
     }
     return e;
@@ -5425,7 +5422,7 @@ let IS = class extends HG {
         return this.generateDimFragment(e, n, S, i);
       });
       return n.dialect.sqlAggDistinct(f, [...h, ...m], (g) => {
-        const y = g.map((C, _) => _ < l.length && this.getParamForArgIndex(a.params, _).allowedTypes.every((R) => (0, Ue.isLiteral)(R.evalSpace)) ? l[_] : [C]), E = y.slice(0, h.length), A = y.slice(h.length).map((C, _) => ({ e: C, dir: p[_].dir })), S = this.getFunctionOrderBy(e, n, i, A, E, a), v = this.expandFunctionCall(n.dialect.name, a, E, S, x);
+        const y = g.map((_, C) => C < l.length && this.getParamForArgIndex(a.params, C).allowedTypes.every((R) => (0, Ue.isLiteral)(R.evalSpace)) ? l[C] : [_]), E = y.slice(0, h.length), A = y.slice(h.length).map((_, C) => ({ e: _, dir: p[C].dir })), S = this.getFunctionOrderBy(e, n, i, A, E, a), v = this.expandFunctionCall(n.dialect.name, a, E, S, x);
         return this.generateExpressionFromExpr(e, n, v, i);
       });
     } else {
@@ -5526,42 +5523,43 @@ let IS = class extends HG {
     ], x = f.length > 0 ? `PARTITION BY ${f.join(", ")}` : "";
     let h = a ?? "";
     if (!a && i.needsWindowOrderBy) {
-      const g = [];
-      let y;
-      const E = e.firstSegment.orderBy || e.calculateDefaultOrderBy();
-      for (const A of E) {
-        typeof A.field == "string" ? y = {
-          name: A.field,
-          fif: e.getField(A.field)
-        } : y = e.getFieldByNumber(A.field);
-        const S = y.fif.f.fieldDef.expressionType;
-        if (!(0, Ue.expressionIsAnalytic)(S))
+      const y = [];
+      let E;
+      const A = e.firstSegment.orderBy || e.calculateDefaultOrderBy();
+      for (const S of A) {
+        typeof S.field == "string" ? E = {
+          name: S.field,
+          fif: e.getField(S.field)
+        } : E = e.getFieldByNumber(S.field);
+        const v = E.fif.f.fieldDef.expressionType;
+        if (!(0, Ue.expressionIsAnalytic)(v))
           if (e.firstSegment.type === "reduce") {
-            const v = y.fif.getAnalyticalSQL(!1);
-            g.push(` ${v} ${A.dir || "ASC"}`);
+            const _ = E.fif.getAnalyticalSQL(!1);
+            y.push(` ${_} ${S.dir || "ASC"}`);
           } else
-            e.firstSegment.type === "project" && g.push(` ${y.fif.f.generateExpression(e)} ${A.dir || "ASC"}`);
+            e.firstSegment.type === "project" && y.push(` ${E.fif.f.generateExpression(e)} ${S.dir || "ASC"}`);
       }
-      g.length > 0 && (h = " " + this.parent.dialect.sqlOrderBy(g));
+      y.length > 0 && (h = " " + this.parent.dialect.sqlOrderBy(y));
     }
     let p = "";
     if (i.between) {
-      const [g, y] = [
+      const [y, E] = [
         i.between.preceding,
         i.between.following
-      ].map((E) => {
-        if (E === -1)
+      ].map((A) => {
+        if (A === -1)
           return "UNBOUNDED";
-        if (typeof E == "number")
-          return E;
-        const A = i.params.findIndex((v) => v.name === E), S = o[A];
-        if (S.length !== 1 || typeof S[0] == "string" || S[0].type !== "dialect" || S[0].function !== "numberLiteral")
+        if (typeof A == "number")
+          return A;
+        const S = i.params.findIndex((_) => _.name === A), v = o[S];
+        if (v.length !== 1 || typeof v[0] == "string" || v[0].type !== "dialect" || v[0].function !== "numberLiteral")
           throw new Error("Invalid number of rows for window spec");
-        return S[0].literal;
+        return v[0].literal;
       });
-      p = `ROWS BETWEEN ${g} PRECEDING AND ${y} FOLLOWING`;
+      p = `ROWS BETWEEN ${y} PRECEDING AND ${E} FOLLOWING`;
     }
-    return `${this.generateExpressionFromExpr(e, n, r, s)} OVER(${x} ${h} ${p})`;
+    let g = `${this.generateExpressionFromExpr(e, n, r, s)} OVER(${x} ${h} ${p})`;
+    return l && (g = `CASE WHEN group_set=${e.groupSet} THEN ${g} END`), g;
   }
   generateExpressionFromExpr(e, n, r, i = new n1()) {
     let s = "";
@@ -7654,8 +7652,8 @@ function Sy() {
     "%URIErrorPrototype%": ["URIError", "prototype"],
     "%WeakMapPrototype%": ["WeakMap", "prototype"],
     "%WeakSetPrototype%": ["WeakSet", "prototype"]
-  }, y = vI(), E = Uhe(), A = y.call(Function.call, Array.prototype.concat), S = y.call(Function.apply, Array.prototype.splice), v = y.call(Function.call, String.prototype.replace), C = y.call(Function.call, String.prototype.slice), _ = y.call(Function.call, RegExp.prototype.exec), b = /[^%.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|%$))/g, R = /\\(\\)?/g, O = function(q) {
-    var W = C(q, 0, 1), B = C(q, -1);
+  }, y = vI(), E = Uhe(), A = y.call(Function.call, Array.prototype.concat), S = y.call(Function.apply, Array.prototype.splice), v = y.call(Function.call, String.prototype.replace), _ = y.call(Function.call, String.prototype.slice), C = y.call(Function.call, RegExp.prototype.exec), b = /[^%.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|%$))/g, R = /\\(\\)?/g, O = function(q) {
+    var W = _(q, 0, 1), B = _(q, -1);
     if (W === "%" && B !== "%")
       throw new e("invalid intrinsic syntax, expected closing `%`");
     if (B === "%" && W !== "%")
@@ -7683,12 +7681,12 @@ function Sy() {
       throw new r("intrinsic name must be a non-empty string");
     if (arguments.length > 1 && typeof W != "boolean")
       throw new r('"allowMissing" argument must be a boolean');
-    if (_(/^%?[^%]*%?$/, q) === null)
+    if (C(/^%?[^%]*%?$/, q) === null)
       throw new e("`%` may not be present anywhere but at the beginning and end of the intrinsic name");
     var B = O(q), G = B.length > 0 ? B[0] : "", te = L("%" + G + "%", W), X = te.name, de = te.value, be = !1, ee = te.alias;
     ee && (G = ee[0], S(B, A([0, 1], ee)));
     for (var U = 1, T = !0; U < B.length; U += 1) {
-      var w = B[U], k = C(w, 0, 1), z = C(w, -1);
+      var w = B[U], k = _(w, 0, 1), z = _(w, -1);
       if ((k === '"' || k === "'" || k === "`" || z === '"' || z === "'" || z === "`") && k !== z)
         throw new e("property names with quotes must have matching quotes");
       if ((w === "constructor" || !T) && (be = !0), G += "." + w, X = "%" + G + "%", E(h, X))
@@ -7961,14 +7959,14 @@ var ype = function(e) {
     return r(Z) === "Int8Array";
   }
   t.isInt8Array = v;
-  function C(Z) {
+  function _(Z) {
     return r(Z) === "Int16Array";
   }
-  t.isInt16Array = C;
-  function _(Z) {
+  t.isInt16Array = _;
+  function C(Z) {
     return r(Z) === "Int32Array";
   }
-  t.isInt32Array = _;
+  t.isInt32Array = C;
   function b(Z) {
     return r(Z) === "Float32Array";
   }
@@ -8193,7 +8191,7 @@ var _pe = dL.exports;
       seen: [],
       stylize: a
     };
-    return arguments.length >= 3 && (w.depth = arguments[2]), arguments.length >= 4 && (w.colors = arguments[3]), y(T) ? w.showHidden = T : T && t._extend(w, T), _(w.showHidden) && (w.showHidden = !1), _(w.depth) && (w.depth = 2), _(w.colors) && (w.colors = !1), _(w.customInspect) && (w.customInspect = !0), w.colors && (w.stylize = u), c(w, U, w.depth);
+    return arguments.length >= 3 && (w.depth = arguments[2]), arguments.length >= 4 && (w.colors = arguments[3]), y(T) ? w.showHidden = T : T && t._extend(w, T), C(w.showHidden) && (w.showHidden = !1), C(w.depth) && (w.depth = 2), C(w.colors) && (w.colors = !1), C(w.customInspect) && (w.customInspect = !0), w.colors && (w.stylize = u), c(w, U, w.depth);
   }
   t.inspect = o, o.colors = {
     bold: [1, 22],
@@ -8274,7 +8272,7 @@ var _pe = dL.exports;
     }), U.seen.pop(), m(H, $, Q);
   }
   function f(U, T) {
-    if (_(T))
+    if (C(T))
       return U.stylize("undefined", "undefined");
     if (v(T)) {
       var w = "'" + JSON.stringify(T).replace(/^"|"$/g, "").replace(/'/g, "\\'").replace(/\\"/g, '"') + "'";
@@ -8323,7 +8321,7 @@ var _pe = dL.exports;
 `).map(function(j) {
       return "   " + j;
     }).join(`
-`))) : D = U.stylize("[Circular]", "special")), _(V)) {
+`))) : D = U.stylize("[Circular]", "special")), C(V)) {
       if (Y && z.match(/^\d+$/))
         return D;
       V = JSON.stringify("" + z), V.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/) ? (V = V.substr(1, V.length - 2), V = U.stylize(V, "name")) : (V = V.replace(/'/g, "\\'").replace(/\\"/g, '"').replace(/(^"|"$)/g, "'"), V = U.stylize(V, "string"));
@@ -8364,14 +8362,14 @@ var _pe = dL.exports;
     return typeof U == "string";
   }
   t.isString = v;
-  function C(U) {
+  function _(U) {
     return typeof U == "symbol";
   }
-  t.isSymbol = C;
-  function _(U) {
+  t.isSymbol = _;
+  function C(U) {
     return U === void 0;
   }
-  t.isUndefined = _;
+  t.isUndefined = C;
   function b(U) {
     return R(U) && W(U) === "[object RegExp]";
   }
@@ -8554,14 +8552,14 @@ function uW() {
   var u = {}, a, l;
   function c(m, g, y) {
     y || (y = Error);
-    function E(S, v, C) {
-      return typeof g == "string" ? g : g(S, v, C);
+    function E(S, v, _) {
+      return typeof g == "string" ? g : g(S, v, _);
     }
     var A = /* @__PURE__ */ function(S) {
       s(v, S);
-      function v(C, _, b) {
+      function v(_, C, b) {
         var R;
-        return e(this, v), R = n(this, i(v).call(this, E(C, _, b))), R.code = m, R;
+        return e(this, v), R = n(this, i(v).call(this, E(_, C, b))), R.code = m, R;
       }
       return v;
     }(y);
@@ -8741,7 +8739,7 @@ function Cpe() {
       B += B, G--;
     return B += B.substring(0, te - B.length), B;
   }
-  var v = "", C = "", _ = "", b = "", R = {
+  var v = "", _ = "", C = "", b = "", R = {
     deepStrictEqual: "Expected values to be strictly deep-equal:",
     strictEqual: "Expected values to be strictly equal:",
     strictEqualObject: 'Expected "actual" to be reference-equal to "expected":',
@@ -8825,7 +8823,7 @@ function Cpe() {
 `.concat(v, "...").concat(b).concat(ee), U = !0), X !== "" && (ee = `
   `.concat(X).concat(ee), X = "");
     var H = 0, P = R[te] + `
-`.concat(C, "+ actual").concat(b, " ").concat(_, "- expected").concat(b), J = " ".concat(v, "...").concat(b, " Lines skipped");
+`.concat(_, "+ actual").concat(b, " ").concat(C, "- expected").concat(b), J = " ".concat(v, "...").concat(b, " Lines skipped");
     for (z = 0; z < Q; z++) {
       var ce = z - be;
       if (w.length < z + 1)
@@ -8833,21 +8831,21 @@ function Cpe() {
 `.concat(v, "...").concat(b), U = !0) : ce > 3 && (de += `
   `.concat(k[z - 2]), H++), de += `
   `.concat(k[z - 1]), H++), be = z, X += `
-`.concat(_, "-").concat(b, " ").concat(k[z]), H++;
+`.concat(C, "-").concat(b, " ").concat(k[z]), H++;
       else if (k.length < z + 1)
         ce > 1 && z > 2 && (ce > 4 ? (de += `
 `.concat(v, "...").concat(b), U = !0) : ce > 3 && (de += `
   `.concat(w[z - 2]), H++), de += `
   `.concat(w[z - 1]), H++), be = z, de += `
-`.concat(C, "+").concat(b, " ").concat(w[z]), H++;
+`.concat(_, "+").concat(b, " ").concat(w[z]), H++;
       else {
         var ue = k[z], Z = w[z], ae = Z !== ue && (!A(Z, ",") || Z.slice(0, -1) !== ue);
         ae && A(ue, ",") && ue.slice(0, -1) === Z && (ae = !1, Z += ","), ae ? (ce > 1 && z > 2 && (ce > 4 ? (de += `
 `.concat(v, "...").concat(b), U = !0) : ce > 3 && (de += `
   `.concat(w[z - 2]), H++), de += `
   `.concat(w[z - 1]), H++), be = z, de += `
-`.concat(C, "+").concat(b, " ").concat(Z), X += `
-`.concat(_, "-").concat(b, " ").concat(ue), H += 2) : (de += X, X = "", (ce === 1 || z === 0) && (de += `
+`.concat(_, "+").concat(b, " ").concat(Z), X += `
+`.concat(C, "-").concat(b, " ").concat(ue), H += 2) : (de += X, X = "", (ce === 1 || z === 0) && (de += `
   `.concat(Z), H++));
       }
       if (H > 20 && z < Q - 2)
@@ -8868,7 +8866,7 @@ function Cpe() {
       var de = te.message, be = te.operator, ee = te.stackStartFn, U = te.actual, T = te.expected, w = Error.stackTraceLimit;
       if (Error.stackTraceLimit = 0, de != null)
         X = s(this, h(G).call(this, String(de)));
-      else if (process.stderr && process.stderr.isTTY && (process.stderr && process.stderr.getColorDepth && process.stderr.getColorDepth() !== 1 ? (v = "\x1B[34m", C = "\x1B[32m", b = "\x1B[39m", _ = "\x1B[31m") : (v = "", C = "", b = "", _ = "")), p(U) === "object" && U !== null && p(T) === "object" && T !== null && "stack" in U && U instanceof Error && "stack" in T && T instanceof Error && (U = L(U), T = L(T)), be === "deepStrictEqual" || be === "strictEqual")
+      else if (process.stderr && process.stderr.isTTY && (process.stderr && process.stderr.getColorDepth && process.stderr.getColorDepth() !== 1 ? (v = "\x1B[34m", _ = "\x1B[32m", b = "\x1B[39m", C = "\x1B[31m") : (v = "", _ = "", b = "", C = "")), p(U) === "object" && U !== null && p(T) === "object" && T !== null && "stack" in U && U instanceof Error && "stack" in T && T instanceof Error && (U = L(U), T = L(T)), be === "deepStrictEqual" || be === "strictEqual")
         X = s(this, h(G).call(this, q(U, T, be)));
       else if (be === "notDeepStrictEqual" || be === "notStrictEqual") {
         var k = R[be], z = M(U).split(`
@@ -9038,11 +9036,11 @@ function Tpe() {
         for (var v = 0; v < h.length; ++v)
           E.push(String(v));
       else
-        for (var C in h)
-          !(A && C === "prototype") && e.call(h, C) && E.push(String(C));
+        for (var _ in h)
+          !(A && _ === "prototype") && e.call(h, _) && E.push(String(_));
       if (s)
-        for (var _ = f(h), b = 0; b < u.length; ++b)
-          !(_ && u[b] === "constructor") && e.call(h, u[b]) && E.push(u[b]);
+        for (var C = f(h), b = 0; b < u.length; ++b)
+          !(C && u[b] === "constructor") && e.call(h, u[b]) && E.push(u[b]);
       return E;
     };
   }
@@ -9305,7 +9303,7 @@ function wpe() {
   function f(se) {
     return se.call.bind(se);
   }
-  var x = f(Object.prototype.hasOwnProperty), h = f(Object.prototype.propertyIsEnumerable), p = f(Object.prototype.toString), m = H0.types, g = m.isAnyArrayBuffer, y = m.isArrayBufferView, E = m.isDate, A = m.isMap, S = m.isRegExp, v = m.isSet, C = m.isNativeError, _ = m.isBoxedPrimitive, b = m.isNumberObject, R = m.isStringObject, O = m.isBooleanObject, L = m.isBigIntObject, M = m.isSymbolObject, q = m.isFloat32Array, W = m.isFloat64Array;
+  var x = f(Object.prototype.hasOwnProperty), h = f(Object.prototype.propertyIsEnumerable), p = f(Object.prototype.toString), m = H0.types, g = m.isAnyArrayBuffer, y = m.isArrayBufferView, E = m.isDate, A = m.isMap, S = m.isRegExp, v = m.isSet, _ = m.isNativeError, C = m.isBoxedPrimitive, b = m.isNumberObject, R = m.isStringObject, O = m.isBooleanObject, L = m.isBigIntObject, M = m.isSymbolObject, q = m.isFloat32Array, W = m.isFloat64Array;
   function B(se) {
     if (se.length === 0 || se.length > 10)
       return !0;
@@ -9387,7 +9385,7 @@ function wpe() {
     } else if (S(se)) {
       if (!S(xe) || !w(se, xe))
         return !1;
-    } else if (C(se) || se instanceof Error) {
+    } else if (_(se) || se instanceof Error) {
       if (se.message !== xe.message || se.name !== xe.name)
         return !1;
     } else if (y(se)) {
@@ -9406,7 +9404,7 @@ function wpe() {
       if (g(se)) {
         if (!Y(se, xe))
           return !1;
-      } else if (_(se) && !V(se, xe))
+      } else if (C(se) && !V(se, xe))
         return !1;
     }
     return j(se, xe, Ce, Oe, be);
@@ -9625,8 +9623,8 @@ function Di() {
     var ee = wpe();
     y = ee.isDeepEqual, E = ee.isDeepStrictEqual;
   }
-  var S = !1, v = hD.exports = O, C = {};
-  function _(ee) {
+  var S = !1, v = hD.exports = O, _ = {};
+  function C(ee) {
     throw ee.message instanceof Error ? ee.message : new l(ee);
   }
   function b(ee, U, T, w, k) {
@@ -9681,7 +9679,7 @@ function Di() {
   v.ok = O, v.equal = function ee(U, T, w) {
     if (arguments.length < 2)
       throw new a("actual", "expected");
-    U != T && _({
+    U != T && C({
       actual: U,
       expected: T,
       message: w,
@@ -9691,7 +9689,7 @@ function Di() {
   }, v.notEqual = function ee(U, T, w) {
     if (arguments.length < 2)
       throw new a("actual", "expected");
-    U == T && _({
+    U == T && C({
       actual: U,
       expected: T,
       message: w,
@@ -9701,7 +9699,7 @@ function Di() {
   }, v.deepEqual = function ee(U, T, w) {
     if (arguments.length < 2)
       throw new a("actual", "expected");
-    y === void 0 && A(), y(U, T) || _({
+    y === void 0 && A(), y(U, T) || C({
       actual: U,
       expected: T,
       message: w,
@@ -9711,7 +9709,7 @@ function Di() {
   }, v.notDeepEqual = function ee(U, T, w) {
     if (arguments.length < 2)
       throw new a("actual", "expected");
-    y === void 0 && A(), y(U, T) && _({
+    y === void 0 && A(), y(U, T) && C({
       actual: U,
       expected: T,
       message: w,
@@ -9721,7 +9719,7 @@ function Di() {
   }, v.deepStrictEqual = function ee(U, T, w) {
     if (arguments.length < 2)
       throw new a("actual", "expected");
-    y === void 0 && A(), E(U, T) || _({
+    y === void 0 && A(), E(U, T) || C({
       actual: U,
       expected: T,
       message: w,
@@ -9732,7 +9730,7 @@ function Di() {
   function L(ee, U, T) {
     if (arguments.length < 2)
       throw new a("actual", "expected");
-    y === void 0 && A(), E(ee, U) && _({
+    y === void 0 && A(), E(ee, U) && C({
       actual: ee,
       expected: U,
       message: T,
@@ -9743,7 +9741,7 @@ function Di() {
   v.strictEqual = function ee(U, T, w) {
     if (arguments.length < 2)
       throw new a("actual", "expected");
-    g(U, T) || _({
+    g(U, T) || C({
       actual: U,
       expected: T,
       message: w,
@@ -9753,7 +9751,7 @@ function Di() {
   }, v.notStrictEqual = function ee(U, T, w) {
     if (arguments.length < 2)
       throw new a("actual", "expected");
-    g(U, T) && _({
+    g(U, T) && C({
       actual: U,
       expected: T,
       message: w,
@@ -9778,7 +9776,7 @@ function Di() {
         });
         throw D.actual = ee, D.expected = U, D.operator = z.name, D;
       }
-      _({
+      C({
         actual: ee,
         expected: U,
         message: w,
@@ -9822,7 +9820,7 @@ function Di() {
     } catch (U) {
       return U;
     }
-    return C;
+    return _;
   }
   function G(ee) {
     return h(ee) || ee !== null && t(ee) === "object" && typeof ee.then == "function" && typeof ee.catch == "function";
@@ -9840,7 +9838,7 @@ function Di() {
       return Promise.resolve().then(function() {
         return U;
       }).then(function() {
-        return C;
+        return _;
       }).catch(function(T) {
         return T;
       });
@@ -9858,11 +9856,11 @@ function Di() {
       w = T, T = void 0;
     } else if (T != null && t(T) !== "object" && typeof T != "function")
       throw new s("error", ["Object", "Error", "Function", "RegExp"], T);
-    if (U === C) {
+    if (U === _) {
       var k = "";
       T && T.name && (k += " (".concat(T.name, ")")), k += w ? ": ".concat(w) : ".";
       var z = ee.name === "rejects" ? "rejection" : "exception";
-      _({
+      C({
         actual: void 0,
         expected: T,
         operator: ee.name,
@@ -9874,10 +9872,10 @@ function Di() {
       throw U;
   }
   function de(ee, U, T, w) {
-    if (U !== C) {
+    if (U !== _) {
       if (typeof T == "string" && (w = T, T = void 0), !T || W(U, T)) {
         var k = w ? ": ".concat(w) : ".", z = ee.name === "doesNotReject" ? "rejection" : "exception";
-        _({
+        C({
           actual: U,
           expected: T,
           operator: ee.name,
@@ -10945,27 +10943,27 @@ hn.toCharArray = Jpe;
   }
   t.SemanticContext = f, function(x) {
     function m(v) {
-      let C = [];
-      for (let _ = 0; _ < v.length; _++) {
-        let b = v[_];
-        b instanceof x.PrecedencePredicate && (C.push(b), v.splice(_, 1), _--);
+      let _ = [];
+      for (let C = 0; C < v.length; C++) {
+        let b = v[C];
+        b instanceof x.PrecedencePredicate && (_.push(b), v.splice(C, 1), C--);
       }
-      return C;
+      return _;
     }
     class g extends x {
-      constructor(C = -1, _ = -1, b = !1) {
-        super(), this.ruleIndex = C, this.predIndex = _, this.isCtxDependent = b;
+      constructor(_ = -1, C = -1, b = !1) {
+        super(), this.ruleIndex = _, this.predIndex = C, this.isCtxDependent = b;
       }
-      eval(C, _) {
-        let b = this.isCtxDependent ? _ : void 0;
-        return C.sempred(b, this.ruleIndex, this.predIndex);
+      eval(_, C) {
+        let b = this.isCtxDependent ? C : void 0;
+        return _.sempred(b, this.ruleIndex, this.predIndex);
       }
       hashCode() {
-        let C = s.MurmurHash.initialize();
-        return C = s.MurmurHash.update(C, this.ruleIndex), C = s.MurmurHash.update(C, this.predIndex), C = s.MurmurHash.update(C, this.isCtxDependent ? 1 : 0), C = s.MurmurHash.finish(C, 3), C;
+        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(C) {
-        return C instanceof g ? this === C ? !0 : this.ruleIndex === C.ruleIndex && this.predIndex === C.predIndex && this.isCtxDependent === C.isCtxDependent : !1;
+      equals(_) {
+        return _ instanceof g ? this === _ ? !0 : this.ruleIndex === _.ruleIndex && this.predIndex === _.predIndex && this.isCtxDependent === _.isCtxDependent : !1;
       }
       toString() {
         return "{" + this.ruleIndex + ":" + this.predIndex + "}?";
@@ -10981,25 +10979,25 @@ hn.toCharArray = Jpe;
       o.Override
     ], g.prototype, "toString", null), x.Predicate = g;
     class y extends x {
-      constructor(C) {
-        super(), this.precedence = C;
+      constructor(_) {
+        super(), this.precedence = _;
       }
-      eval(C, _) {
-        return C.precpred(_, this.precedence);
+      eval(_, C) {
+        return _.precpred(C, this.precedence);
       }
-      evalPrecedence(C, _) {
-        if (C.precpred(_, this.precedence))
+      evalPrecedence(_, C) {
+        if (_.precpred(C, this.precedence))
           return x.NONE;
       }
-      compareTo(C) {
-        return this.precedence - C.precedence;
+      compareTo(_) {
+        return this.precedence - _.precedence;
       }
       hashCode() {
-        let C = 1;
-        return C = 31 * C + this.precedence, C;
+        let _ = 1;
+        return _ = 31 * _ + this.precedence, _;
       }
-      equals(C) {
-        return C instanceof y ? this === C ? !0 : this.precedence === C.precedence : !1;
+      equals(_) {
+        return _ instanceof y ? this === _ ? !0 : this.precedence === _.precedence : !1;
       }
       toString() {
         return "{" + this.precedence + ">=prec}?";
@@ -11022,18 +11020,18 @@ hn.toCharArray = Jpe;
     }
     x.Operator = E;
     let A = class KA extends E {
-      constructor(C, _) {
+      constructor(_, C) {
         super();
         let b = new r.Array2DHashSet(u.ObjectEqualityComparator.INSTANCE);
-        C instanceof KA ? b.addAll(C.opnds) : b.add(C), _ instanceof KA ? b.addAll(_.opnds) : b.add(_), this.opnds = b.toArray();
+        _ instanceof KA ? b.addAll(_.opnds) : b.add(_), C instanceof KA ? 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(C) {
-        return this === C ? !0 : C instanceof KA ? i.ArrayEqualityComparator.INSTANCE.equals(this.opnds, C.opnds) : !1;
+      equals(_) {
+        return this === _ ? !0 : _ instanceof KA ? i.ArrayEqualityComparator.INSTANCE.equals(this.opnds, _.opnds) : !1;
       }
       hashCode() {
         return s.MurmurHash.hashCode(this.opnds, 40363613);
@@ -11044,16 +11042,16 @@ hn.toCharArray = Jpe;
        * The evaluation of predicates by this context is short-circuiting, but
        * unordered.
        */
-      eval(C, _) {
+      eval(_, C) {
         for (let b of this.opnds)
-          if (!b.eval(C, _))
+          if (!b.eval(_, C))
             return !1;
         return !0;
       }
-      evalPrecedence(C, _) {
+      evalPrecedence(_, C) {
         let b = !1, R = [];
         for (let L of this.opnds) {
-          let M = L.evalPrecedence(C, _);
+          let M = L.evalPrecedence(_, C);
           if (b = b || M !== L, M == null)
             return;
           M !== x.NONE && R.push(M);
@@ -11088,18 +11086,18 @@ hn.toCharArray = Jpe;
       n(1, o.NotNull)
     ], A), x.AND = A;
     let S = class XA extends E {
-      constructor(C, _) {
+      constructor(_, C) {
         super();
         let b = new r.Array2DHashSet(u.ObjectEqualityComparator.INSTANCE);
-        C instanceof XA ? b.addAll(C.opnds) : b.add(C), _ instanceof XA ? b.addAll(_.opnds) : b.add(_), this.opnds = b.toArray();
+        _ instanceof XA ? b.addAll(_.opnds) : b.add(_), C instanceof XA ? 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(C) {
-        return this === C ? !0 : C instanceof XA ? i.ArrayEqualityComparator.INSTANCE.equals(this.opnds, C.opnds) : !1;
+      equals(_) {
+        return this === _ ? !0 : _ instanceof XA ? i.ArrayEqualityComparator.INSTANCE.equals(this.opnds, _.opnds) : !1;
       }
       hashCode() {
         return s.MurmurHash.hashCode(this.opnds, 486279973);
@@ -11110,16 +11108,16 @@ hn.toCharArray = Jpe;
        * The evaluation of predicates by this context is short-circuiting, but
        * unordered.
        */
-      eval(C, _) {
+      eval(_, C) {
         for (let b of this.opnds)
-          if (b.eval(C, _))
+          if (b.eval(_, C))
             return !0;
         return !1;
       }
-      evalPrecedence(C, _) {
+      evalPrecedence(_, C) {
         let b = !1, R = [];
         for (let L of this.opnds) {
-          let M = L.evalPrecedence(C, _);
+          let M = L.evalPrecedence(_, C);
           if (b = b || M !== L, M === x.NONE)
             return x.NONE;
           M && R.push(M);
@@ -12088,8 +12086,8 @@ function ru() {
       if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
         S = Reflect.decorate(m, g, y, E);
       else
-        for (var C = m.length - 1; C >= 0; C--)
-          (v = m[C]) && (S = (A < 3 ? v(S) : A > 3 ? v(g, y, S) : v(g, y)) || S);
+        for (var _ = m.length - 1; _ >= 0; _--)
+          (v = m[_]) && (S = (A < 3 ? v(S) : A > 3 ? v(g, y, S) : v(g, y)) || S);
       return A > 3 && S && Object.defineProperty(g, y, S), S;
     }, n = N && N.__param || function(m, g) {
       return function(y, E) {
@@ -12144,14 +12142,14 @@ function ru() {
           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 v = 0, C = new Array(A + S), _ = new Array(C.length), b = 0, R = 0, O = !0, L = !0;
+        let v = 0, _ = new Array(A + S), C = new Array(_.length), b = 0, R = 0, O = !0, L = !0;
         for (; b < A && R < S; )
-          g.getReturnState(b) === y.getReturnState(R) ? (C[v] = E.join(g.getParent(b), y.getParent(R)), _[v] = g.getReturnState(b), O = O && C[v] === g.getParent(b), L = L && C[v] === y.getParent(R), b++, R++) : g.getReturnState(b) < y.getReturnState(R) ? (C[v] = g.getParent(b), _[v] = g.getReturnState(b), L = !1, b++) : (l(y.getReturnState(R) < g.getReturnState(b)), C[v] = y.getParent(R), _[v] = y.getReturnState(R), O = !1, R++), v++;
+          g.getReturnState(b) === y.getReturnState(R) ? (_[v] = E.join(g.getParent(b), y.getParent(R)), C[v] = g.getReturnState(b), O = O && _[v] === g.getParent(b), L = L && _[v] === y.getParent(R), b++, R++) : g.getReturnState(b) < y.getReturnState(R) ? (_[v] = g.getParent(b), C[v] = g.getReturnState(b), L = !1, b++) : (l(y.getReturnState(R) < g.getReturnState(b)), _[v] = y.getParent(R), C[v] = y.getReturnState(R), O = !1, R++), v++;
         for (; b < A; )
-          C[v] = g.getParent(b), _[v] = g.getReturnState(b), b++, L = !1, v++;
+          _[v] = g.getParent(b), C[v] = g.getReturnState(b), b++, L = !1, v++;
         for (; R < S; )
-          C[v] = y.getParent(R), _[v] = y.getReturnState(R), R++, O = !1, v++;
-        return O ? g : L ? y : (v < C.length && (C = C.slice(0, v), _ = _.slice(0, v)), C.length === 0 ? f.EMPTY_FULL : C.length === 1 ? new p(C[0], _[0]) : new h(C, _));
+          _[v] = y.getParent(R), C[v] = y.getReturnState(R), R++, O = !1, v++;
+        return O ? g : L ? y : (v < _.length && (_ = _.slice(0, v), C = C.slice(0, v)), _.length === 0 ? f.EMPTY_FULL : _.length === 1 ? new p(_[0], C[0]) : new h(_, C));
       }
       static isEmptyLocal(g) {
         return g === f.EMPTY_LOCAL;
@@ -12165,30 +12163,30 @@ function ru() {
         if (A = y.get(g), A)
           return E.put(g, A), A;
         let S = !1, v = new Array(g.size);
-        for (let _ = 0; _ < v.length; _++) {
-          let b = f.getCachedContext(g.getParent(_), y, E);
-          if (S || b !== g.getParent(_)) {
+        for (let C = 0; C < v.length; C++) {
+          let b = f.getCachedContext(g.getParent(C), y, E);
+          if (S || b !== g.getParent(C)) {
             if (!S) {
               v = new Array(g.size);
               for (let R = 0; R < g.size; R++)
                 v[R] = g.getParent(R);
               S = !0;
             }
-            v[_] = b;
+            v[C] = b;
           }
         }
         if (!S)
           return A = y.putIfAbsent(g, g), E.put(g, A ?? g), g;
-        let C;
+        let _;
         if (v.length === 1)
-          C = new p(v[0], g.getReturnState(0));
+          _ = new p(v[0], g.getReturnState(0));
         else {
-          let _ = new Array(g.size);
+          let C = new Array(g.size);
           for (let b = 0; b < g.size; b++)
-            _[b] = g.getReturnState(b);
-          C = new h(v, _, g.hashCode());
+            C[b] = g.getReturnState(b);
+          _ = new h(v, C, g.hashCode());
         }
-        return A = y.putIfAbsent(C, C), E.put(C, A || C), E.put(g, A || C), C;
+        return A = y.putIfAbsent(_, _), E.put(_, A || _), E.put(g, A || _), _;
       }
       appendSingleContext(g, y) {
         return this.appendContext(f.EMPTY_FULL.getChild(g), y);
@@ -12203,15 +12201,15 @@ function ru() {
         let A = [];
         e:
           for (let S = 0; ; S++) {
-            let v = 0, C = !0, _ = this, b = y, R = "";
-            for (R += "["; !_.isEmpty && _ !== E; ) {
+            let v = 0, _ = !0, C = this, b = y, R = "";
+            for (R += "["; !C.isEmpty && C !== E; ) {
               let O = 0;
-              if (_.size > 0) {
+              if (C.size > 0) {
                 let L = 1;
-                for (; 1 << L >>> 0 < _.size; )
+                for (; 1 << L >>> 0 < C.size; )
                   L++;
                 let M = (1 << L >>> 0) - 1;
-                if (O = S >> v & M, C = C && O >= _.size - 1, O >= _.size)
+                if (O = S >> v & M, _ = _ && O >= C.size - 1, O >= C.size)
                   continue e;
                 v += L;
               }
@@ -12220,10 +12218,10 @@ function ru() {
                 let M = g.atn.states[b], q = g.ruleNames[M.ruleIndex];
                 R += q;
               } else
-                _.getReturnState(O) !== f.EMPTY_FULL_STATE_KEY && (_.isEmpty || (R.length > 1 && (R += " "), R += _.getReturnState(O)));
-              b = _.getReturnState(O), _ = _.getParent(O);
+                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), C)
+            if (R += "]", A.push(R), _)
               break;
           }
         return A;
@@ -12368,12 +12366,12 @@ function ru() {
           else {
             let S = g.size;
             g.hasEmpty && S--;
-            let v = new Array(S), C = new Array(S);
-            for (let _ = 0; _ < S; _++)
-              C[_] = g.getReturnState(_);
-            for (let _ = 0; _ < S; _++)
-              v[_] = Tf.appendContextImpl(g.getParent(_), y, E);
-            v.length === 1 ? A = new p(v[0], C[0]) : (l(v.length > 1), A = new Tf(v, C)), g.hasEmpty && (A = f.join(A, y));
+            let v = new Array(S), _ = new Array(S);
+            for (let C = 0; C < S; C++)
+              _[C] = g.getReturnState(C);
+            for (let C = 0; C < S; C++)
+              v[C] = Tf.appendContextImpl(g.getParent(C), y, E);
+            v.length === 1 ? A = new p(v[0], _[0]) : (l(v.length > 1), A = new Tf(v, _)), g.hasEmpty && (A = f.join(A, y));
           }
           E.put(g, A);
         }
@@ -12393,22 +12391,22 @@ function ru() {
           let S = E.pop(), v = A.pop();
           if (!S || !v)
             break;
-          let C = new a.PredictionContextCache.IdentityCommutativePredictionContextOperands(S, v);
-          if (!y.add(C))
+          let _ = new a.PredictionContextCache.IdentityCommutativePredictionContextOperands(S, v);
+          if (!y.add(_))
             continue;
-          let _ = C.x.size;
-          if (_ === 0) {
-            if (!C.x.equals(C.y))
+          let C = _.x.size;
+          if (C === 0) {
+            if (!_.x.equals(_.y))
               return !1;
             continue;
           }
-          let b = C.y.size;
-          if (_ !== b)
+          let b = _.y.size;
+          if (C !== b)
             return !1;
-          for (let R = 0; R < _; R++) {
-            if (C.x.getReturnState(R) !== C.y.getReturnState(R))
+          for (let R = 0; R < C; R++) {
+            if (_.x.getReturnState(R) !== _.y.getReturnState(R))
               return !1;
-            let O = C.x.getParent(R), L = C.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));
@@ -13285,13 +13283,13 @@ function Ty() {
    * 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, S) {
-    var v = arguments.length, C = v < 3 ? E : S === null ? S = Object.getOwnPropertyDescriptor(E, A) : S, _;
+    var v = arguments.length, _ = v < 3 ? E : S === null ? S = Object.getOwnPropertyDescriptor(E, A) : S, C;
     if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
-      C = Reflect.decorate(y, E, A, S);
+      _ = Reflect.decorate(y, E, A, S);
     else
       for (var b = y.length - 1; b >= 0; b--)
-        (_ = y[b]) && (C = (v < 3 ? _(C) : v > 3 ? _(E, A, C) : _(E, A)) || C);
-    return v > 3 && C && Object.defineProperty(E, A, C), C;
+        (C = y[b]) && (_ = (v < 3 ? C(_) : v > 3 ? C(E, A, _) : C(E, A)) || _);
+    return v > 3 && _ && Object.defineProperty(E, A, _), _;
   };
   Object.defineProperty(ag, "__esModule", { value: !0 }), ag.ATNConfigSet = void 0;
   const e = Bl, n = nu, r = Wx, i = su(), s = Yx, o = iu, u = ye, a = Ms, l = ru(), c = RI(), f = Gx, x = Di(), h = hn;
@@ -13362,8 +13360,8 @@ function Ty() {
         let A = E, S = this.getKey(A), v = this.mergedConfigs.get(S);
         if (v != null && this.canMerge(A, S, v))
           return v.contains(A);
-        for (let C of this.unmerged)
-          if (C.contains(E))
+        for (let _ of this.unmerged)
+          if (_.contains(E))
             return !0;
       } else
         for (let A of this.configs)
@@ -13381,18 +13379,18 @@ function Ty() {
       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 S, v = this.getKey(E), C = this.mergedConfigs.get(v);
-      if (S = C == null, C != null && this.canMerge(E, v, C)) {
-        C.outerContextDepth = Math.max(C.outerContextDepth, E.outerContextDepth), E.isPrecedenceFilterSuppressed && (C.isPrecedenceFilterSuppressed = !0);
-        let _ = l.PredictionContext.join(C.context, E.context, A);
-        return this.updatePropertiesForMergedConfig(E), C.context === _ ? !1 : (C.context = _, !0);
-      }
-      for (let _ = 0; _ < this.unmerged.length; _++) {
-        let b = this.unmerged[_];
+      let S, v = this.getKey(E), _ = this.mergedConfigs.get(v);
+      if (S = _ == null, _ != null && this.canMerge(E, v, _)) {
+        _.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, v, 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, S && (this.mergedConfigs.put(v, b), this.unmerged.splice(_, 1)), !0);
+          return this.updatePropertiesForMergedConfig(E), b.context === R ? !1 : (b.context = R, S && (this.mergedConfigs.put(v, b), this.unmerged.splice(C, 1)), !0);
         }
       }
       return this.configs.push(E), S ? this.mergedConfigs.put(v, E) : this.unmerged.push(E), this.updatePropertiesForAddedConfig(E), !0;
@@ -13439,7 +13437,7 @@ function Ty() {
     toString(E) {
       E == null && (E = !1);
       let A = "", S = this.configs.slice(0);
-      S.sort((v, C) => v.alt !== C.alt ? v.alt - C.alt : v.state.stateNumber !== C.state.stateNumber ? v.state.stateNumber - C.state.stateNumber : v.semanticContext.toString().localeCompare(C.semanticContext.toString())), A += "[";
+      S.sort((v, _) => v.alt !== _.alt ? v.alt - _.alt : v.state.stateNumber !== _.state.stateNumber ? v.state.stateNumber - _.state.stateNumber : v.semanticContext.toString().localeCompare(_.semanticContext.toString())), A += "[";
       for (let v = 0; v < S.length; v++)
         v > 0 && (A += ", "), A += S[v].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();
@@ -14614,12 +14612,12 @@ function V2e() {
    * 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 S = arguments.length, v = S < 3 ? y : A === null ? A = Object.getOwnPropertyDescriptor(y, E) : A, C;
+    var S = arguments.length, v = S < 3 ? y : A === null ? A = Object.getOwnPropertyDescriptor(y, E) : A, _;
     if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
       v = Reflect.decorate(g, y, E, A);
     else
-      for (var _ = g.length - 1; _ >= 0; _--)
-        (C = g[_]) && (v = (S < 3 ? C(v) : S > 3 ? C(y, E, v) : C(y, E)) || v);
+      for (var C = g.length - 1; C >= 0; C--)
+        (_ = g[C]) && (v = (S < 3 ? _(v) : S > 3 ? _(y, E, v) : _(y, E)) || v);
     return S > 3 && v && Object.defineProperty(y, E, v), v;
   }, e = N && N.__param || function(g, y) {
     return function(E, A) {
@@ -14695,7 +14693,7 @@ function V2e() {
      * outermost context is reached. This parameter has no effect if `ctx`
      * is {@link PredictionContext#EMPTY_LOCAL}.
      */
-    _LOOK(y, E, A, S, v, C, _, b) {
+    _LOOK(y, E, A, S, v, _, C, b) {
       let R = i.ATNConfig.create(y, 0, A);
       if (!v.add(R))
         return;
@@ -14713,35 +14711,35 @@ function V2e() {
           b && S.add(h.Token.EOF);
           return;
         }
-        let L = C.get(y.ruleIndex);
+        let L = _.get(y.ruleIndex);
         try {
-          C.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 q = this.atn.states[A.getReturnState(M)];
-            this._LOOK(q, E, A.getParent(M), S, v, C, _, b);
+            this._LOOK(q, E, A.getParent(M), S, v, _, C, b);
           }
         } finally {
-          L && C.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 (C.get(M.ruleIndex))
+          if (_.get(M.ruleIndex))
             continue;
           let q = A.getChild(M.followState.stateNumber);
           try {
-            C.set(M.ruleIndex), this._LOOK(M.target, E, q, S, v, C, _, b);
+            _.set(M.ruleIndex), this._LOOK(M.target, E, q, S, v, _, C, b);
           } finally {
-            C.clear(M.ruleIndex);
+            _.clear(M.ruleIndex);
           }
         } else if (M instanceof n.AbstractPredicateTransition)
-          _ ? this._LOOK(M.target, E, A, S, v, C, _, b) : S.add(EL.HIT_PRED);
+          C ? this._LOOK(M.target, E, A, S, v, _, C, b) : S.add(EL.HIT_PRED);
         else if (M.isEpsilon)
-          this._LOOK(M.target, E, A, S, v, C, _, b);
+          this._LOOK(M.target, E, A, S, v, _, C, b);
         else if (M instanceof p.WildcardTransition)
           S.addAll(o.IntervalSet.of(h.Token.MIN_USER_TOKEN_TYPE, this.atn.maxTokenType));
         else {
@@ -14879,8 +14877,8 @@ function su() {
           return A;
         let S = new s.IntervalSet();
         for (S.addAll(A), S.remove(f.Token.EPSILON); y != null && y.invokingState >= 0 && A.contains(f.Token.EPSILON); ) {
-          let C = this.states[y.invokingState].transition(0);
-          A = this.nextTokens(C.followState), S.addAll(A), S.remove(f.Token.EPSILON), y = y._parent;
+          let _ = this.states[y.invokingState].transition(0);
+          A = this.nextTokens(_.followState), S.addAll(A), S.remove(f.Token.EPSILON), y = y._parent;
         }
         return A.contains(f.Token.EPSILON) && S.add(f.Token.EOF), S;
       }
@@ -15285,66 +15283,66 @@ function wy() {
      * 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(v, C, _, b) {
-      var R = arguments.length, O = R < 3 ? C : b === null ? b = Object.getOwnPropertyDescriptor(C, _) : b, L;
+    var e = N && N.__decorate || function(v, _, 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(v, C, _, b);
+        O = Reflect.decorate(v, _, C, b);
       else
         for (var M = v.length - 1; M >= 0; M--)
-          (L = v[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(v, C) {
-      return function(_, b) {
-        C(_, b, v);
+          (L = v[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(v, _) {
+      return function(C, b) {
+        _(C, b, v);
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.LexerATNSimulator = void 0;
     const r = by, i = su(), s = Yx, o = Ty(), u = Tb(), a = bb(), l = Ar, c = $l, f = kl(), x = Nb, h = Zx, p = ye, m = tge(), g = ru(), y = Sc, E = Gt, A = Di();
     let S = class Es extends u.ATNSimulator {
-      constructor(C, _) {
-        super(C), this.optimize_tail_calls = !0, this.startIndex = -1, this._line = 1, this._charPositionInLine = 0, this.mode = f.Lexer.DEFAULT_MODE, this.prevAccept = new Es.SimState(), this.recog = _;
+      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 Es.SimState(), this.recog = C;
       }
-      copyState(C) {
-        this._charPositionInLine = C.charPositionInLine, this._line = C._line, this.mode = C.mode, this.startIndex = C.startIndex;
+      copyState(_) {
+        this._charPositionInLine = _.charPositionInLine, this._line = _._line, this.mode = _.mode, this.startIndex = _.startIndex;
       }
-      match(C, _) {
-        this.mode = _;
-        let b = C.mark();
+      match(_, C) {
+        this.mode = C;
+        let b = _.mark();
         try {
-          this.startIndex = C.index, this.prevAccept.reset();
-          let R = this.atn.modeToDFA[_].s0;
-          return R == null ? this.matchATN(C) : this.execATN(C, R);
+          this.startIndex = _.index, this.prevAccept.reset();
+          let R = this.atn.modeToDFA[C].s0;
+          return R == null ? this.matchATN(_) : this.execATN(_, R);
         } finally {
-          C.release(b);
+          _.release(b);
         }
       }
       reset() {
         this.prevAccept.reset(), this.startIndex = -1, this._line = 1, this._charPositionInLine = 0, this.mode = f.Lexer.DEFAULT_MODE;
       }
-      matchATN(C) {
-        let _ = this.atn.modeToStartState[this.mode];
-        Es.debug && console.log(`matchATN mode ${this.mode} start: ${_}`);
-        let b = this.mode, R = this.computeStartState(C, _), O = R.hasSemanticContext;
+      matchATN(_) {
+        let C = this.atn.modeToStartState[this.mode];
+        Es.debug && console.log(`matchATN mode ${this.mode} start: ${C}`);
+        let b = this.mode, R = this.computeStartState(_, C), O = R.hasSemanticContext;
         O && (R.hasSemanticContext = !1);
         let L = this.addDFAState(R);
         if (!O) {
           let q = this.atn.modeToDFA[this.mode];
           q.s0 ? L = q.s0 : q.s0 = L;
         }
-        let M = this.execATN(C, L);
+        let M = this.execATN(_, L);
         return Es.debug && console.log(`DFA after matchATN: ${this.atn.modeToDFA[b].toLexerString()}`), M;
       }
-      execATN(C, _) {
-        Es.debug && console.log(`start state closure=${_.configs}`), _.isAcceptState && this.captureSimState(this.prevAccept, C, _);
-        let b = C.LA(1), R = _;
+      execATN(_, C) {
+        Es.debug && console.log(`start state closure=${C.configs}`), C.isAcceptState && this.captureSimState(this.prevAccept, _, C);
+        let b = _.LA(1), R = C;
         for (; ; ) {
           Es.debug && console.log(`execATN loop starting closure: ${R.configs}`);
           let O = this.getExistingTargetState(R, b);
-          if (O == null && (O = this.computeTargetState(C, R, b)), O === u.ATNSimulator.ERROR || (b !== c.IntStream.EOF && this.consume(C), O.isAcceptState && (this.captureSimState(this.prevAccept, C, 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 = C.LA(1), R = O;
+          b = _.LA(1), R = O;
         }
-        return this.failOrAccept(this.prevAccept, C, 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
@@ -15357,9 +15355,9 @@ function wy() {
        * `t`, or `undefined` if the target state for this edge is not
        * already cached
        */
-      getExistingTargetState(C, _) {
-        let b = C.getTarget(_);
-        return Es.debug && b != null && console.log("reuse state " + C.stateNumber + " edge to " + b.stateNumber), b;
+      getExistingTargetState(_, C) {
+        let b = _.getTarget(C);
+        return Es.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
@@ -15373,27 +15371,27 @@ function wy() {
        * `t`. If `t` does not lead to a valid DFA state, this method
        * returns {@link #ERROR}.
        */
-      computeTargetState(C, _, b) {
+      computeTargetState(_, C, b) {
         let R = new m.OrderedATNConfigSet();
-        return this.getReachableConfigSet(C, _.configs, R, b), R.isEmpty ? (R.hasSemanticContext || this.addDFAEdge(_, b, u.ATNSimulator.ERROR), u.ATNSimulator.ERROR) : this.addDFAEdge(_, 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(C, _, b, R) {
-        if (C.dfaState != null) {
-          let O = C.dfaState.lexerActionExecutor;
-          return this.accept(_, O, this.startIndex, C.index, C.line, C.charPos), C.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 && _.index === this.startIndex)
+          if (R === c.IntStream.EOF && C.index === this.startIndex)
             return E.Token.EOF;
-          throw new h.LexerNoViableAltException(this.recog, _, this.startIndex, b);
+          throw new h.LexerNoViableAltException(this.recog, C, this.startIndex, b);
         }
       }
       /** Given a starting configuration set, figure out all ATN configurations
        *  we can reach upon input `t`. Parameter `reach` is a return
        *  parameter.
        */
-      getReachableConfigSet(C, _, b, R) {
+      getReachableConfigSet(_, C, b, R) {
         let O = i.ATN.INVALID_ALT_NUMBER;
-        for (let L of _) {
+        for (let L of C) {
           let M = L.alt === O;
           if (M && L.hasPassedThroughNonGreedyDecision)
             continue;
@@ -15403,9 +15401,9 @@ function wy() {
             let B = L.state.getOptimizedTransition(W), G = this.getReachableTarget(B, R);
             if (G != null) {
               let te = L.lexerActionExecutor, X;
-              te != null ? (te = te.fixOffsetBeforeMatch(C.index - this.startIndex), X = L.transform(G, !0, te)) : (A(L.lexerActionExecutor == null), X = L.transform(G, !0));
+              te != null ? (te = te.fixOffsetBeforeMatch(_.index - this.startIndex), X = L.transform(G, !0, te)) : (A(L.lexerActionExecutor == null), X = L.transform(G, !0));
               let de = R === c.IntStream.EOF;
-              if (this.closure(C, X, b, M, !0, de)) {
+              if (this.closure(_, X, b, M, !0, de)) {
                 O = L.alt;
                 break;
               }
@@ -15413,18 +15411,18 @@ function wy() {
           }
         }
       }
-      accept(C, _, b, R, O, L) {
-        Es.debug && console.log(`ACTION ${_}`), C.seek(R), this._line = O, this._charPositionInLine = L, _ != null && this.recog != null && _.execute(this.recog, C, b);
+      accept(_, C, b, R, O, L) {
+        Es.debug && console.log(`ACTION ${C}`), _.seek(R), this._line = O, this._charPositionInLine = L, C != null && this.recog != null && C.execute(this.recog, _, b);
       }
-      getReachableTarget(C, _) {
-        if (C.matches(_, f.Lexer.MIN_CHAR_VALUE, f.Lexer.MAX_CHAR_VALUE))
-          return C.target;
+      getReachableTarget(_, C) {
+        if (_.matches(C, f.Lexer.MIN_CHAR_VALUE, f.Lexer.MAX_CHAR_VALUE))
+          return _.target;
       }
-      computeStartState(C, _) {
+      computeStartState(_, C) {
         let b = g.PredictionContext.EMPTY_FULL, R = new m.OrderedATNConfigSet();
-        for (let O = 0; O < _.numberOfTransitions; O++) {
-          let L = _.transition(O).target, M = s.ATNConfig.create(L, O + 1, b);
-          this.closure(C, M, R, !1, !1, !1);
+        for (let O = 0; O < C.numberOfTransitions; O++) {
+          let L = C.transition(O).target, M = s.ATNConfig.create(L, O + 1, b);
+          this.closure(_, M, R, !1, !1, !1);
         }
         return R;
       }
@@ -15438,66 +15436,66 @@ function wy() {
        * @returns `true` if an accept state is reached, otherwise
        * `false`.
        */
-      closure(C, _, b, R, O, L) {
-        if (Es.debug && console.log("closure(" + _.toString(this.recog, !0) + ")"), _.state instanceof y.RuleStopState) {
-          Es.debug && (this.recog != null ? console.log(`closure at ${this.recog.ruleNames[_.state.ruleIndex]} rule stop ${_}`) : console.log(`closure at rule stop ${_}`));
-          let q = _.context;
+      closure(_, C, b, R, O, L) {
+        if (Es.debug && console.log("closure(" + C.toString(this.recog, !0) + ")"), C.state instanceof y.RuleStopState) {
+          Es.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 q = C.context;
           if (q.isEmpty)
-            return b.add(_), !0;
-          q.hasEmpty && (b.add(_.transform(_.state, !0, g.PredictionContext.EMPTY_FULL)), R = !0);
+            return b.add(C), !0;
+          q.hasEmpty && (b.add(C.transform(C.state, !0, g.PredictionContext.EMPTY_FULL)), R = !0);
           for (let W = 0; W < q.size; W++) {
             let B = q.getReturnState(W);
             if (B === g.PredictionContext.EMPTY_FULL_STATE_KEY)
               continue;
-            let G = q.getParent(W), te = this.atn.states[B], X = _.transform(te, !1, G);
-            R = this.closure(C, X, b, R, O, L);
+            let G = q.getParent(W), te = this.atn.states[B], X = C.transform(te, !1, G);
+            R = this.closure(_, X, b, R, O, L);
           }
           return R;
         }
-        _.state.onlyHasEpsilonTransitions || (!R || !_.hasPassedThroughNonGreedyDecision) && b.add(_);
-        let M = _.state;
+        C.state.onlyHasEpsilonTransitions || (!R || !C.hasPassedThroughNonGreedyDecision) && b.add(C);
+        let M = C.state;
         for (let q = 0; q < M.numberOfOptimizedTransitions; q++) {
-          let W = M.getOptimizedTransition(q), B = this.getEpsilonTarget(C, _, W, b, O, L);
-          B != null && (R = this.closure(C, B, b, R, O, L));
+          let W = M.getOptimizedTransition(q), B = this.getEpsilonTarget(_, C, W, b, O, L);
+          B != null && (R = this.closure(_, B, b, R, O, L));
         }
         return R;
       }
       // side-effect: can alter configs.hasSemanticContext
-      getEpsilonTarget(C, _, b, R, O, L) {
+      getEpsilonTarget(_, C, b, R, O, L) {
         let M;
         switch (b.serializationType) {
           case 3:
             let q = b;
-            if (this.optimize_tail_calls && q.optimizedTailCall && !_.context.hasEmpty)
-              M = _.transform(b.target, !0);
+            if (this.optimize_tail_calls && q.optimizedTailCall && !C.context.hasEmpty)
+              M = C.transform(b.target, !0);
             else {
-              let B = _.context.getChild(q.followState.stateNumber);
-              M = _.transform(b.target, !0, B);
+              let B = C.context.getChild(q.followState.stateNumber);
+              M = C.transform(b.target, !0, B);
             }
             break;
           case 10:
             throw new Error("Precedence predicates are not supported in lexers.");
           case 4:
             let W = b;
-            Es.debug && console.log("EVAL rule " + W.ruleIndex + ":" + W.predIndex), R.hasSemanticContext = !0, this.evaluatePredicate(C, W.ruleIndex, W.predIndex, O) ? M = _.transform(b.target, !0) : M = void 0;
+            Es.debug && console.log("EVAL rule " + W.ruleIndex + ":" + W.predIndex), R.hasSemanticContext = !0, this.evaluatePredicate(_, W.ruleIndex, W.predIndex, O) ? M = C.transform(b.target, !0) : M = void 0;
             break;
           case 6:
-            if (_.context.hasEmpty) {
-              let B = x.LexerActionExecutor.append(_.lexerActionExecutor, this.atn.lexerActions[b.actionIndex]);
-              M = _.transform(b.target, !0, B);
+            if (C.context.hasEmpty) {
+              let B = x.LexerActionExecutor.append(C.lexerActionExecutor, this.atn.lexerActions[b.actionIndex]);
+              M = C.transform(b.target, !0, B);
               break;
             } else {
-              M = _.transform(b.target, !0);
+              M = C.transform(b.target, !0);
               break;
             }
           case 1:
-            M = _.transform(b.target, !0);
+            M = C.transform(b.target, !0);
             break;
           case 5:
           case 2:
           case 7:
             if (L && b.matches(c.IntStream.EOF, f.Lexer.MIN_CHAR_VALUE, f.Lexer.MAX_CHAR_VALUE)) {
-              M = _.transform(b.target, !1);
+              M = C.transform(b.target, !1);
               break;
             }
             M = void 0;
@@ -15529,43 +15527,43 @@ function wy() {
        * @returns `true` if the specified predicate evaluates to
        * `true`.
        */
-      evaluatePredicate(C, _, b, R) {
+      evaluatePredicate(_, C, b, R) {
         if (this.recog == null)
           return !0;
         if (!R)
-          return this.recog.sempred(void 0, _, b);
-        let O = this._charPositionInLine, L = this._line, M = C.index, q = C.mark();
+          return this.recog.sempred(void 0, C, b);
+        let O = this._charPositionInLine, L = this._line, M = _.index, q = _.mark();
         try {
-          return this.consume(C), this.recog.sempred(void 0, _, b);
+          return this.consume(_), this.recog.sempred(void 0, C, b);
         } finally {
-          this._charPositionInLine = O, this._line = L, C.seek(M), C.release(q);
+          this._charPositionInLine = O, this._line = L, _.seek(M), _.release(q);
         }
       }
-      captureSimState(C, _, b) {
-        C.index = _.index, C.line = this._line, C.charPos = this._charPositionInLine, C.dfaState = b;
+      captureSimState(_, C, b) {
+        _.index = C.index, _.line = this._line, _.charPos = this._charPositionInLine, _.dfaState = b;
       }
-      addDFAEdge(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(C, _, O), O;
+          return R || this.addDFAEdge(_, C, O), O;
         } else
-          Es.debug && console.log("EDGE " + C + " -> " + b + " upon " + String.fromCharCode(_)), C != null && C.setTarget(_, b);
+          Es.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(C) {
-        A(!C.hasSemanticContext);
-        let _ = new a.DFAState(C), b = this.atn.modeToDFA[this.mode].states.get(_);
+      addDFAState(_) {
+        A(!_.hasSemanticContext);
+        let C = new a.DFAState(_), b = this.atn.modeToDFA[this.mode].states.get(C);
         if (b != null)
           return b;
-        C.optimizeConfigs(this);
-        let R = new a.DFAState(C.clone(!0)), O;
-        for (let L of C)
+        _.optimizeConfigs(this);
+        let R = new a.DFAState(_.clone(!0)), O;
+        for (let L of _)
           if (L.state instanceof y.RuleStopState) {
             O = L;
             break;
@@ -15576,31 +15574,31 @@ function wy() {
         }
         return this.atn.modeToDFA[this.mode].addState(R);
       }
-      getDFA(C) {
-        return this.atn.modeToDFA[C];
+      getDFA(_) {
+        return this.atn.modeToDFA[_];
       }
       /** Get the text matched so far for the current token.
        */
-      getText(C) {
-        return C.getText(l.Interval.of(this.startIndex, C.index - 1));
+      getText(_) {
+        return _.getText(l.Interval.of(this.startIndex, _.index - 1));
       }
       get line() {
         return this._line;
       }
-      set line(C) {
-        this._line = C;
+      set line(_) {
+        this._line = _;
       }
       get charPositionInLine() {
         return this._charPositionInLine;
       }
-      set charPositionInLine(C) {
-        this._charPositionInLine = C;
+      set charPositionInLine(_) {
+        this._charPositionInLine = _;
       }
-      consume(C) {
-        C.LA(1) === 10 ? (this._line++, this._charPositionInLine = 0) : this._charPositionInLine++, C.consume();
+      consume(_) {
+        _.LA(1) === 10 ? (this._line++, this._charPositionInLine = 0) : this._charPositionInLine++, _.consume();
       }
-      getTokenName(C) {
-        return C === -1 ? "EOF" : "'" + String.fromCharCode(C) + "'";
+      getTokenName(_) {
+        return _ === -1 ? "EOF" : "'" + String.fromCharCode(_) + "'";
       }
     };
     e([
@@ -15663,7 +15661,7 @@ function wy() {
       n(0, p.NotNull)
     ], S), t.LexerATNSimulator = S, function(v) {
       v.debug = !1, v.dfa_debug = !1;
-      class C {
+      class _ {
         constructor() {
           this.index = -1, this.line = 0, this.charPos = -1;
         }
@@ -15671,7 +15669,7 @@ function wy() {
           this.index = -1, this.line = 0, this.charPos = -1, this.dfaState = void 0;
         }
       }
-      v.SimState = C;
+      v.SimState = _;
     }(S = t.LexerATNSimulator || (t.LexerATNSimulator = {})), t.LexerATNSimulator = S;
   }(VD)), VD;
 }
@@ -17614,8 +17612,8 @@ function bc() {
       for (let A = 0; A < E; A++) {
         let S = p.getChild(A), v = S.sourceInterval;
         if (S instanceof u.ParserRuleContext && (v.b < g || v.a > y) && f0.isAncestorOf(S, m)) {
-          let C = new r.CommonToken(c.Token.INVALID_TYPE, "...");
-          p.children[A] = new l.TerminalNode(C);
+          let _ = new r.CommonToken(c.Token.INVALID_TYPE, "...");
+          p.children[A] = new l.TerminalNode(_);
         }
       }
     }
@@ -18099,7 +18097,7 @@ function Qp() {
     };
   };
   Object.defineProperty(Ag, "__esModule", { value: !0 }), Ag.ParserATNSimulator = void 0;
-  const n = by, r = Iy, i = nu, s = Sb, o = su(), u = Yx, a = Ty(), l = Tb(), c = Er, f = ky, x = iu, h = Mb, p = xa, m = bb(), g = kp, y = Ar, E = $l, A = ye, S = NI(), v = Jy(), C = Ms, _ = Co(), b = ru(), R = RI(), O = KW, L = Sc, M = jp, q = Gx, W = OI(), B = XW(), G = Gt, te = js, X = Di(), de = 65535, be = -(1 << 31 >>> 0);
+  const n = by, r = Iy, i = nu, s = Sb, o = su(), u = Yx, a = Ty(), l = Tb(), c = Er, f = ky, x = iu, h = Mb, p = xa, m = bb(), g = kp, y = Ar, E = $l, A = ye, S = NI(), v = Jy(), _ = Ms, C = Co(), b = ru(), R = RI(), O = KW, L = Sc, M = jp, q = Gx, W = OI(), B = XW(), G = Gt, te = js, X = Di(), de = 65535, be = -(1 << 31 >>> 0);
   let ee = class ut extends l.ATNSimulator {
     constructor(T, w) {
       super(T), 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 = w;
@@ -18123,9 +18121,9 @@ function Qp() {
             return I;
         }
       }
-      this.dfa = Y, this.force_global_context ? z = !0 : this.always_try_local_context || (z = z || Y.isContextSensitive), this.userWantsCtxSensitive = z || this.predictionMode !== O.PredictionMode.SLL && k != null && !this.atn.decisionToState[w].sll, k == null && (k = _.ParserRuleContext.emptyContext());
+      this.dfa = Y, this.force_global_context ? z = !0 : this.always_try_local_context || (z = z || Y.isContextSensitive), this.userWantsCtxSensitive = z || this.predictionMode !== O.PredictionMode.SLL && k != null && !this.atn.decisionToState[w].sll, k == null && (k = C.ParserRuleContext.emptyContext());
       let V;
-      Y.isEmpty || (V = this.getStartState(Y, T, k, z)), V == null && (k == null && (k = _.ParserRuleContext.emptyContext()), ut.debug && console.log("ATN decision " + Y.decision + " exec LA(1)==" + this.getLookaheadName(T) + ", outerContext=" + k.toString(this._parser)), V = this.computeStartState(Y, k, z));
+      Y.isEmpty || (V = this.getStartState(Y, T, k, z)), V == null && (k == null && (k = C.ParserRuleContext.emptyContext()), ut.debug && console.log("ATN decision " + Y.decision + " exec LA(1)==" + this.getLookaheadName(T) + ", outerContext=" + k.toString(this._parser)), V = this.computeStartState(Y, k, z));
       let D = T.mark(), $ = T.index;
       try {
         let j = this.execDFA(Y, T, $, V);
@@ -18722,7 +18720,7 @@ function Qp() {
           */
     closure(T, w, k, z, Y, V) {
       Y == null && (Y = R.PredictionContextCache.UNCACHED);
-      let D = T, $ = new i.Array2DHashSet(C.ObjectEqualityComparator.INSTANCE);
+      let D = T, $ = new i.Array2DHashSet(_.ObjectEqualityComparator.INSTANCE);
       for (; D.size > 0; ) {
         let j = new a.ATNConfigSet();
         for (let Q of D)
@@ -19527,7 +19525,7 @@ function Gp() {
     };
   };
   Object.defineProperty(yg, "__esModule", { value: !0 }), yg.ATNDeserializer = void 0;
-  const n = Iy, r = nu, i = su(), s = Ly, o = Er, u = ky, a = Fb, l = Ny, c = iu, f = wb, x = td, h = xa, p = wW(), m = Lb, g = ed(), y = Oy, E = Ib, A = $b, S = Bb, v = UW, C = qW, _ = kb, b = HW, R = Pb, O = Uy, L = ye, M = NI(), q = Qp(), W = jb, B = Ub, G = qb, te = vy, X = Hb, de = zb, be = Sc, ee = jp, U = OI(), T = Qb, w = Gb, k = Mp, z = Gt, Y = Wb, V = Vb, D = Fy;
+  const n = Iy, r = nu, i = su(), s = Ly, o = Er, u = ky, a = Fb, l = Ny, c = iu, f = wb, x = td, h = xa, p = wW(), m = Lb, g = ed(), y = Oy, E = Ib, A = $b, S = Bb, v = UW, _ = qW, C = kb, b = HW, R = Pb, O = Uy, L = ye, M = NI(), q = Qp(), W = jb, B = Ub, G = qb, te = vy, X = Hb, de = zb, be = Sc, ee = jp, U = OI(), T = Qb, w = Gb, k = Mp, z = Gt, Y = Wb, V = Vb, D = Fy;
   var $;
   (function(Q) {
     Q[Q.UNICODE_BMP = 0] = "UNICODE_BMP", Q[Q.UNICODE_SMP = 1] = "UNICODE_SMP";
@@ -20117,9 +20115,9 @@ function Gp() {
         case 3:
           return v.LexerMoreAction.INSTANCE;
         case 4:
-          return C.LexerPopModeAction.INSTANCE;
+          return _.LexerPopModeAction.INSTANCE;
         case 5:
-          return new _.LexerPushModeAction(H);
+          return new C.LexerPushModeAction(H);
         case 6:
           return b.LexerSkipAction.INSTANCE;
         case 7:
@@ -21253,13 +21251,13 @@ function oV() {
    * 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, S) {
-    var v = arguments.length, C = v < 3 ? E : S === null ? S = Object.getOwnPropertyDescriptor(E, A) : S, _;
+    var v = arguments.length, _ = v < 3 ? E : S === null ? S = Object.getOwnPropertyDescriptor(E, A) : S, C;
     if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
-      C = Reflect.decorate(y, E, A, S);
+      _ = Reflect.decorate(y, E, A, S);
     else
       for (var b = y.length - 1; b >= 0; b--)
-        (_ = y[b]) && (C = (v < 3 ? _(C) : v > 3 ? _(E, A, C) : _(E, A)) || C);
-    return v > 3 && C && Object.defineProperty(E, A, C), C;
+        (C = y[b]) && (_ = (v < 3 ? C(_) : v > 3 ? C(E, A, _) : C(E, A)) || _);
+    return v > 3 && _ && Object.defineProperty(E, A, _), _;
   }, e = N && N.__param || function(y, E) {
     return function(A, S) {
       E(A, S, y);
@@ -21268,14 +21266,14 @@ function oV() {
   Object.defineProperty(Tg, "__esModule", { value: !0 }), Tg.ParserInterpreter = void 0;
   const n = fa, r = Er, i = iu, s = mc, o = Vx, u = sV(), a = Uy, l = ye, c = ye, f = Yp(), x = Qp(), h = _o, p = Mp, m = Gt;
   let g = class SL extends f.Parser {
-    constructor(E, A, S, v, C) {
-      if (super(E instanceof SL ? E.inputStream : C), this._parentContextStack = [], this.overrideDecision = -1, this.overrideDecisionInputIndex = -1, this.overrideDecisionAlt = -1, this.overrideDecisionReached = !1, this._overrideDecisionRoot = void 0, E instanceof SL) {
-        let _ = E;
-        this._grammarFileName = _._grammarFileName, this._atn = _._atn, this.pushRecursionContextStates = _.pushRecursionContextStates, this._ruleNames = _._ruleNames, this._vocabulary = _._vocabulary, this.interpreter = new x.ParserATNSimulator(this._atn, this);
+    constructor(E, A, S, v, _) {
+      if (super(E instanceof SL ? E.inputStream : _), this._parentContextStack = [], this.overrideDecision = -1, this.overrideDecisionInputIndex = -1, this.overrideDecisionAlt = -1, this.overrideDecisionReached = !1, this._overrideDecisionRoot = void 0, E instanceof SL) {
+        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, S = S, v = v, this._grammarFileName = E, this._atn = v, this._ruleNames = S.slice(0), this._vocabulary = A, this.pushRecursionContextStates = new i.BitSet(v.states.length);
-        for (let _ of v.states)
-          _ instanceof p.StarLoopEntryState && _.precedenceRuleDecision && this.pushRecursionContextStates.set(_.stateNumber);
+        for (let C of v.states)
+          C instanceof p.StarLoopEntryState && C.precedenceRuleDecision && this.pushRecursionContextStates.set(C.stateNumber);
         this.interpreter = new x.ParserATNSimulator(v, this);
       }
     }
@@ -21303,8 +21301,8 @@ function oV() {
           case r.ATNStateType.RULE_STOP:
             if (this._ctx.isEmpty)
               if (A.isPrecedenceRule) {
-                let v = this._ctx, C = this._parentContextStack.pop();
-                return this.unrollRecursionContexts(C[0]), v;
+                let v = this._ctx, _ = this._parentContextStack.pop();
+                return this.unrollRecursionContexts(_[0]), v;
               } else
                 return this.exitRule(), this._rootContext;
             this.visitRuleStopState(S);
@@ -21351,8 +21349,8 @@ function oV() {
           this.matchWildcard();
           break;
         case 3:
-          let v = S.target, C = v.ruleIndex, _ = this.createInterpreterRuleContext(this._ctx, E.stateNumber, C);
-          v.isPrecedenceRule ? this.enterRecursionRule(_, v.stateNumber, C, S.precedence) : this.enterRule(_, S.target.stateNumber, C);
+          let v = S.target, _ = v.ruleIndex, C = this.createInterpreterRuleContext(this._ctx, E.stateNumber, _);
+          v.isPrecedenceRule ? this.enterRecursionRule(C, v.stateNumber, _, S.precedence) : this.enterRule(C, S.target.stateNumber, _);
           break;
         case 4:
           let b = S;
@@ -21455,7 +21453,7 @@ function oV() {
         let S = E.getOffendingToken();
         if (!S)
           throw new Error("Expected exception to have an offending token");
-        let v = S.tokenSource, C = v !== void 0 ? v.inputStream : void 0, _ = { source: v, stream: C };
+        let v = S.tokenSource, _ = v !== void 0 ? v.inputStream : void 0, C = { source: v, stream: _ };
         if (E instanceof o.InputMismatchException) {
           let b = E.expectedTokens;
           if (b === void 0)
@@ -21463,7 +21461,7 @@ function oV() {
           let R = m.Token.INVALID_TYPE;
           b.isNil || (R = b.minElement);
           let O = this.tokenFactory.create(
-            _,
+            C,
             R,
             S.text,
             m.Token.DEFAULT_CHANNEL,
@@ -21477,7 +21475,7 @@ function oV() {
         } else {
           S.tokenSource;
           let b = this.tokenFactory.create(
-            _,
+            C,
             m.Token.INVALID_TYPE,
             S.text,
             m.Token.DEFAULT_CHANNEL,
@@ -22075,42 +22073,42 @@ function MI() {
     // TODO: check for invalid token/rule names, bad syntax
     split(m) {
       let g = new s.XPathLexer(t.CharStreams.fromString(m));
-      g.recover = (C) => {
-        throw C;
+      g.recover = (_) => {
+        throw _;
       }, g.removeErrorListeners(), g.addErrorListener(new o.XPathLexerErrorListener());
       let y = new e.CommonTokenStream(g);
       try {
         y.fill();
-      } catch (C) {
-        if (C instanceof n.LexerNoViableAltException) {
-          let b = "Invalid tokens or characters at index " + g.charPositionInLine + " in path '" + m + "' -- " + C.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 C;
+        throw _;
       }
       let E = y.getTokens(), A = [], S = E.length, v = 0;
       e:
         for (; v < S; ) {
-          let C = E[v], _;
-          switch (C.type) {
+          let _ = E[v], C;
+          switch (_.type) {
             case s.XPathLexer.ROOT:
             case s.XPathLexer.ANYWHERE:
-              let b = C.type === s.XPathLexer.ANYWHERE;
-              v++, _ = E[v];
-              let R = _.type === s.XPathLexer.BANG;
-              R && (v++, _ = E[v]);
-              let O = this.getXPathElement(_, b);
+              let b = _.type === s.XPathLexer.ANYWHERE;
+              v++, C = E[v];
+              let R = C.type === s.XPathLexer.BANG;
+              R && (v++, C = E[v]);
+              let O = this.getXPathElement(C, b);
               O.invert = R, A.push(O), v++;
               break;
             case s.XPathLexer.TOKEN_REF:
             case s.XPathLexer.RULE_REF:
             case s.XPathLexer.WILDCARD:
-              A.push(this.getXPathElement(C, !1)), v++;
+              A.push(this.getXPathElement(_, !1)), v++;
               break;
             case i.Token.EOF:
               break e;
             default:
-              throw new Error("Unknowth path element " + C);
+              throw new Error("Unknowth path element " + _);
           }
         }
       return A;
@@ -22722,22 +22720,22 @@ function jme() {
      * 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(_, b, R, O) {
+    var e = N && N.__decorate || function(C, b, R, O) {
       var L = arguments.length, M = L < 3 ? b : O === null ? O = Object.getOwnPropertyDescriptor(b, R) : O, q;
       if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
-        M = Reflect.decorate(_, b, R, O);
+        M = Reflect.decorate(C, b, R, O);
       else
-        for (var W = _.length - 1; W >= 0; W--)
-          (q = _[W]) && (M = (L < 3 ? q(M) : L > 3 ? q(b, R, M) : q(b, R)) || M);
+        for (var W = C.length - 1; W >= 0; W--)
+          (q = C[W]) && (M = (L < 3 ? q(M) : L > 3 ? q(b, R, M) : q(b, R)) || M);
       return L > 3 && M && Object.defineProperty(b, R, M), M;
-    }, n = N && N.__param || function(_, b) {
+    }, n = N && N.__param || function(C, b) {
       return function(R, O) {
-        b(R, O, _);
+        b(R, O, C);
       };
     };
     Object.defineProperty(t, "__esModule", { value: !0 }), t.ParseTreePatternMatcher = void 0;
     const r = lV(), i = Xb, s = Wp, o = Yy, u = Cme(), a = ye, l = Ky, c = oV(), f = Co(), x = Tme(), h = $me(), p = _o, m = Cc, g = Bme(), y = kme(), E = ou, A = Pme(), S = Gt, v = Mme();
-    class C {
+    class _ {
       /**
        * Constructs a {@link ParseTreePatternMatcher} or from a {@link Lexer} and
        * {@link Parser} object. The lexer input stream is altered for tokenizing
@@ -22795,10 +22793,10 @@ function jme() {
         try {
           W.errorHandler = new r.BailErrorStrategy(), B = W.parse(R);
         } catch (G) {
-          throw G instanceof l.ParseCancellationException ? G.getCause() : G instanceof p.RecognitionException ? G : G instanceof Error ? new C.CannotInvokeStartRule(G) : G;
+          throw G instanceof l.ParseCancellationException ? G.getCause() : G instanceof p.RecognitionException ? G : G instanceof Error ? new _.CannotInvokeStartRule(G) : G;
         }
         if (M.LA(1) !== S.Token.EOF)
-          throw new C.StartRuleDoesNotConsumeFullPattern();
+          throw new _.StartRuleDoesNotConsumeFullPattern();
         return new h.ParseTreePattern(this, b, R, B);
       }
       /**
@@ -22952,28 +22950,28 @@ function jme() {
     e([
       a.NotNull,
       n(1, a.NotNull)
-    ], C.prototype, "match", null), e([
+    ], _.prototype, "match", null), e([
       a.NotNull
-    ], C.prototype, "lexer", null), e([
+    ], _.prototype, "lexer", null), e([
       a.NotNull
-    ], C.prototype, "parser", null), e([
+    ], _.prototype, "parser", null), e([
       n(0, a.NotNull),
       n(1, a.NotNull),
       n(2, a.NotNull)
-    ], C.prototype, "matchImpl", null), t.ParseTreePatternMatcher = C, function(_) {
+    ], _.prototype, "matchImpl", null), t.ParseTreePatternMatcher = _, function(C) {
       class b extends Error {
         constructor(L) {
           super(`CannotInvokeStartRule: ${L}`), this.error = L;
         }
       }
-      _.CannotInvokeStartRule = b;
+      C.CannotInvokeStartRule = b;
       class R extends Error {
         constructor() {
           super("StartRuleDoesNotConsumeFullPattern");
         }
       }
-      _.StartRuleDoesNotConsumeFullPattern = R;
-    }(C = t.ParseTreePatternMatcher || (t.ParseTreePatternMatcher = {}));
+      C.StartRuleDoesNotConsumeFullPattern = R;
+    }(_ = t.ParseTreePatternMatcher || (t.ParseTreePatternMatcher = {}));
   }(iF)), iF;
 }
 var Qg = {}, Gg = {}, Wg = {}, i9;
@@ -23318,8 +23316,8 @@ function x9() {
     if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
       S = Reflect.decorate(m, g, y, E);
     else
-      for (var C = m.length - 1; C >= 0; C--)
-        (v = m[C]) && (S = (A < 3 ? v(S) : A > 3 ? v(g, y, S) : v(g, y)) || S);
+      for (var _ = m.length - 1; _ >= 0; _--)
+        (v = m[_]) && (S = (A < 3 ? v(S) : A > 3 ? v(g, y, S) : v(g, y)) || S);
     return A > 3 && S && Object.defineProperty(g, y, S), S;
   }, e = N && N.__param || function(m, g) {
     return function(y, E) {
@@ -23339,8 +23337,8 @@ function x9() {
         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 S = process.hrtime(), v = super.adaptivePredict(g, y, E), C = process.hrtime(), _ = (C[0] - S[0]) * 1e9;
-        _ === 0 ? _ = C[1] - S[1] : _ += 1e9 - S[1] + C[1], this.decisions[y].timeInPrediction += _, this.decisions[y].invocations++;
+        let S = process.hrtime(), v = super.adaptivePredict(g, y, E), _ = process.hrtime(), C = (_[0] - S[0]) * 1e9;
+        C === 0 ? C = _[1] - S[1] : C += 1e9 - S[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, v, g, this._startIndex, this._sllStopIndex, !1)), this._llStopIndex >= 0) {
           let R = this._llStopIndex - this._startIndex + 1;
@@ -23377,8 +23375,8 @@ function x9() {
       return E;
     }
     computeTargetState(g, y, E, A, S, v) {
-      let C = super.computeTargetState(g, y, E, A, S, v);
-      return S ? this.decisions[this.currentDecision].LL_ATNTransitions++ : this.decisions[this.currentDecision].SLL_ATNTransitions++, C;
+      let _ = super.computeTargetState(g, y, E, A, S, v);
+      return S ? 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)
@@ -23398,11 +23396,11 @@ function x9() {
     reportAttemptingFullContext(g, y, E, A, S) {
       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, S);
     }
-    reportAmbiguity(g, y, E, A, S, v, C) {
+    reportAmbiguity(g, y, E, A, S, v, _) {
       if (this.currentState === void 0 || this._input === void 0)
         throw new Error("Invalid state");
-      let _;
-      v != null ? _ = v.nextSetBit(0) : _ = C.getRepresentedAlternatives().nextSetBit(0), this.conflictingAltResolvedBySLL !== r.ATN.INVALID_ALT_NUMBER && _ !== 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, v, this._input, E, A)), super.reportAmbiguity(g, y, E, A, S, v, C);
+      let C;
+      v != null ? C = v.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, v, this._input, E, A)), super.reportAmbiguity(g, y, E, A, S, v, _);
     }
     // ---------------------------------------------------------------------
     getDecisionInfo() {
@@ -23447,20 +23445,20 @@ function Yp() {
    * 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, S, v, C) {
-    var _ = arguments.length, b = _ < 3 ? S : C === null ? C = Object.getOwnPropertyDescriptor(S, v) : C, R;
+  var t = N && N.__decorate || function(A, S, v, _) {
+    var C = arguments.length, b = C < 3 ? S : _ === null ? _ = Object.getOwnPropertyDescriptor(S, v) : _, R;
     if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
-      b = Reflect.decorate(A, S, v, C);
+      b = Reflect.decorate(A, S, v, _);
     else
       for (var O = A.length - 1; O >= 0; O--)
-        (R = A[O]) && (b = (_ < 3 ? R(b) : _ > 3 ? R(S, v, b) : R(S, v)) || b);
-    return _ > 3 && b && Object.defineProperty(S, v, b), b;
+        (R = A[O]) && (b = (C < 3 ? R(b) : C > 3 ? R(S, v, b) : R(S, v)) || b);
+    return C > 3 && b && Object.defineProperty(S, v, b), b;
   }, e = N && N.__param || function(A, S) {
-    return function(v, C) {
-      S(v, C, A);
+    return function(v, _) {
+      S(v, _, A);
     };
-  }, n = N && N.__awaiter || function(A, S, v, C) {
-    function _(b) {
+  }, n = N && N.__awaiter || function(A, S, v, _) {
+    function C(b) {
       return b instanceof v ? b : new v(function(R) {
         R(b);
       });
@@ -23468,22 +23466,22 @@ function Yp() {
     return new (v || (v = Promise))(function(b, R) {
       function O(q) {
         try {
-          M(C.next(q));
+          M(_.next(q));
         } catch (W) {
           R(W);
         }
       }
       function L(q) {
         try {
-          M(C.throw(q));
+          M(_.throw(q));
         } catch (W) {
           R(W);
         }
       }
       function M(q) {
-        q.done ? b(q.value) : _(q.value).then(O, L);
+        q.done ? b(q.value) : C(q.value).then(O, L);
       }
-      M((C = C.apply(A, S || [])).next());
+      M((_ = _.apply(A, S || [])).next());
     });
   };
   Object.defineProperty(mg, "__esModule", { value: !0 }), mg.Parser = void 0;
@@ -23501,8 +23499,8 @@ function Yp() {
     visitErrorNode(S) {
     }
     visitTerminal(S) {
-      let v = S.parent.ruleContext, C = S.symbol;
-      console.log("consume " + C + " rule " + this.ruleNames[v.ruleIndex]);
+      let v = S.parent.ruleContext, _ = S.symbol;
+      console.log("consume " + _ + " rule " + this.ruleNames[v.ruleIndex]);
     }
   }
   t([
@@ -23642,7 +23640,7 @@ function Yp() {
      * @param listener the listener to remove
      */
     removeParseListener(S) {
-      let v = this._parseListeners.findIndex((C) => C === S);
+      let v = this._parseListeners.findIndex((_) => _ === S);
       v !== -1 && this._parseListeners.splice(v, 1);
     }
     /**
@@ -23698,23 +23696,23 @@ function Yp() {
         throw new Error("The current parser does not support an ATN with bypass alternatives.");
       let v = JA.bypassAltsAtnCache.get(S);
       if (v == null) {
-        let C = new i.ATNDeserializationOptions();
-        C.isGenerateRuleBypassTransitions = !0, v = new s.ATNDeserializer(C).deserialize(r.toCharArray(S)), JA.bypassAltsAtnCache.set(S, v);
+        let _ = new i.ATNDeserializationOptions();
+        _.isGenerateRuleBypassTransitions = !0, v = new s.ATNDeserializer(_).deserialize(r.toCharArray(S)), JA.bypassAltsAtnCache.set(S, v);
       }
       return v;
     }
-    compileParseTreePattern(S, v, C) {
+    compileParseTreePattern(S, v, _) {
       return n(this, void 0, void 0, function* () {
-        if (!C) {
+        if (!_) {
           if (this.inputStream) {
             let O = this.inputStream.tokenSource;
-            O instanceof l.Lexer && (C = O);
+            O instanceof l.Lexer && (_ = O);
           }
-          if (!C)
+          if (!_)
             throw new Error("Parser can't discover a lexer to use");
         }
-        let _ = C, b = yield Promise.resolve().then(() => jme());
-        return new b.ParseTreePatternMatcher(_, this).compile(S, v);
+        let C = _, b = yield Promise.resolve().then(() => jme());
+        return new b.ParseTreePatternMatcher(C, this).compile(S, v);
       });
     }
     get errorHandler() {
@@ -23736,12 +23734,12 @@ function Yp() {
     get currentToken() {
       return this._input.LT(1);
     }
-    notifyErrorListeners(S, v, C) {
+    notifyErrorListeners(S, v, _) {
       v === void 0 ? v = this.currentToken : v === null && (v = void 0), this._syntaxErrors++;
-      let _ = -1, b = -1;
-      v != null && (_ = v.line, b = v.charPositionInLine);
+      let C = -1, b = -1;
+      v != null && (C = v.line, b = v.charPositionInLine);
       let R = this.getErrorListenerDispatch();
-      R.syntaxError && R.syntaxError(this, v, _, b, S, C);
+      R.syntaxError && R.syntaxError(this, v, C, b, S, _);
     }
     /**
      * Consume and return the [current symbol](`currentToken`).
@@ -23770,15 +23768,15 @@ function Yp() {
       let v = this._parseListeners.length !== 0;
       if (this._buildParseTrees || v)
         if (this._errHandler.inErrorRecoveryMode(this)) {
-          let C = this._ctx.addErrorNode(this.createErrorNode(this._ctx, S));
+          let _ = this._ctx.addErrorNode(this.createErrorNode(this._ctx, S));
           if (v)
-            for (let _ of this._parseListeners)
-              _.visitErrorNode && _.visitErrorNode(C);
+            for (let C of this._parseListeners)
+              C.visitErrorNode && C.visitErrorNode(_);
         } else {
-          let C = this.createTerminalNode(this._ctx, S);
-          if (this._ctx.addChild(C), v)
-            for (let _ of this._parseListeners)
-              _.visitTerminal && _.visitTerminal(C);
+          let _ = this.createTerminalNode(this._ctx, S);
+          if (this._ctx.addChild(_), v)
+            for (let C of this._parseListeners)
+              C.visitTerminal && C.visitTerminal(_);
         }
       return S;
     }
@@ -23808,13 +23806,13 @@ function Yp() {
      * Always called by generated parsers upon entry to a rule. Access field
      * {@link #_ctx} get the current context.
      */
-    enterRule(S, v, C) {
+    enterRule(S, v, _) {
       this.state = v, this._ctx = S, this._ctx._start = this._input.LT(1), this._buildParseTrees && this.addContextToParseTree(), this.triggerEnterRuleEvent();
     }
-    enterLeftFactoredRule(S, v, C) {
+    enterLeftFactoredRule(S, v, _) {
       if (this.state = v, this._buildParseTrees) {
-        let _ = this._ctx.getChild(this._ctx.childCount - 1);
-        this._ctx.removeLastChild(), _._parent = S, S.addChild(_);
+        let C = this._ctx.getChild(this._ctx.childCount - 1);
+        this._ctx.removeLastChild(), C._parent = S, S.addChild(C);
       }
       this._ctx = S, this._ctx._start = this._input.LT(1), this._buildParseTrees && this.addContextToParseTree(), this.triggerEnterRuleEvent();
     }
@@ -23823,8 +23821,8 @@ function Yp() {
     }
     enterOuterAlt(S, v) {
       if (S.altNumber = v, this._buildParseTrees && this._ctx !== S) {
-        let C = this._ctx._parent;
-        C != null && (C.removeLastChild(), C.addChild(S));
+        let _ = this._ctx._parent;
+        _ != null && (_.removeLastChild(), _.addChild(S));
       }
       this._ctx = S;
     }
@@ -23837,15 +23835,15 @@ function Yp() {
     get precedence() {
       return this._precedenceStack.isEmpty ? -1 : this._precedenceStack.peek();
     }
-    enterRecursionRule(S, v, C, _) {
-      this.state = v, this._precedenceStack.push(_), this._ctx = S, this._ctx._start = this._input.LT(1), this.triggerEnterRuleEvent();
+    enterRecursionRule(S, v, _, C) {
+      this.state = v, this._precedenceStack.push(C), this._ctx = S, 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(S, v, C) {
-      let _ = this._ctx;
-      _._parent = S, _.invokingState = v, _._stop = this._input.tryLT(-1), this._ctx = S, this._ctx._start = _._start, this._buildParseTrees && this._ctx.addChild(_), this.triggerEnterRuleEvent();
+    pushNewRecursionContext(S, v, _) {
+      let C = this._ctx;
+      C._parent = S, C.invokingState = v, C._stop = this._input.tryLT(-1), this._ctx = S, this._ctx._start = C._start, this._buildParseTrees && this._ctx.addChild(C), this.triggerEnterRuleEvent();
     }
     unrollRecursionContexts(S) {
       this._precedenceStack.pop(), this._ctx._stop = this._input.tryLT(-1);
@@ -23893,16 +23891,16 @@ function Yp() {
      * the ATN, otherwise `false`.
      */
     isExpectedToken(S) {
-      let v = this.interpreter.atn, C = this._ctx, _ = v.states[this.state], b = v.nextTokens(_);
+      let v = this.interpreter.atn, _ = this._ctx, C = v.states[this.state], b = v.nextTokens(C);
       if (b.contains(S))
         return !0;
       if (!b.contains(g.Token.EPSILON))
         return !1;
-      for (; C != null && C.invokingState >= 0 && b.contains(g.Token.EPSILON); ) {
-        let O = v.states[C.invokingState].transition(0);
+      for (; _ != null && _.invokingState >= 0 && b.contains(g.Token.EPSILON); ) {
+        let O = v.states[_.invokingState].transition(0);
         if (b = v.nextTokens(O.followState), b.contains(S))
           return !0;
-        C = C._parent;
+        _ = _._parent;
       }
       return !!(b.contains(g.Token.EPSILON) && S === g.Token.EOF);
     }
@@ -23939,12 +23937,12 @@ function Yp() {
      *  This is very useful for error messages.
      */
     getRuleInvocationStack(S = this._ctx) {
-      let v = S, C = this.ruleNames, _ = [];
+      let v = S, _ = this.ruleNames, C = [];
       for (; v != null; ) {
         let b = v.ruleIndex;
-        b < 0 ? _.push("n/a") : _.push(C[b]), v = v._parent;
+        b < 0 ? C.push("n/a") : C.push(_[b]), v = v._parent;
       }
-      return _;
+      return C;
     }
     /** For debugging and other purposes. */
     getDFAStrings() {
@@ -23974,8 +23972,8 @@ function Yp() {
      */
     setProfile(S) {
       return n(this, void 0, void 0, function* () {
-        let v = yield Promise.resolve().then(() => x9()), C = this.interpreter;
-        S ? C instanceof v.ProfilingATNSimulator || (this.interpreter = new v.ProfilingATNSimulator(this)) : C instanceof v.ProfilingATNSimulator && (this.interpreter = new x.ParserATNSimulator(this.atn, this)), this.interpreter.setPredictionMode(C.getPredictionMode());
+        let v = yield Promise.resolve().then(() => x9()), _ = this.interpreter;
+        S ? _ instanceof v.ProfilingATNSimulator || (this.interpreter = new v.ProfilingATNSimulator(this)) : _ instanceof v.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
@@ -41234,19 +41232,19 @@ class Ive extends Lve.ExpressionDef {
       structPath: f
     };
     let v = [S];
-    const C = (u = e.dialectObj()) === null || u === void 0 ? void 0 : u.name, _ = C ? p.dialect[C] : void 0;
-    if (_ === void 0)
-      this.log(`Function ${this.name} is not defined in dialect ${C}`);
+    const _ = (u = e.dialectObj()) === null || u === void 0 ? void 0 : u.name, C = _ ? p.dialect[_] : void 0;
+    if (C === void 0)
+      this.log(`Function ${this.name} is not defined in dialect ${_}`);
     else {
       if (n != null && n.orderBys && n.orderBys.length > 0) {
         const O = (0, Js.expressionIsAnalytic)(p.returnType.expressionType);
-        if (O || this.inExperiment("aggregate_order_by", !0) || n.orderBys[0].log("Enable experiment `aggregate_order_by` to use `order_by` with an aggregate function"), _.supportsOrderBy || O) {
-          const L = _.supportsOrderBy !== "only_default", M = n.orderBys.flatMap((q) => O ? q.getAnalyticOrderBy(e) : q.getAggregateOrderBy(e, L));
+        if (O || this.inExperiment("aggregate_order_by", !0) || n.orderBys[0].log("Enable experiment `aggregate_order_by` to use `order_by` with an aggregate function"), C.supportsOrderBy || O) {
+          const L = C.supportsOrderBy !== "only_default", M = n.orderBys.flatMap((q) => O ? q.getAnalyticOrderBy(e) : q.getAggregateOrderBy(e, L));
           S.orderBy = M;
         } else
           n.orderBys[0].log(`Function \`${this.name}\` does not support \`order_by\``);
       }
-      (n == null ? void 0 : n.limit) !== void 0 && (_.supportsLimit ? S.limit = n.limit.limit : this.log(`Function ${this.name} does not support limit`));
+      (n == null ? void 0 : n.limit) !== void 0 && (C.supportsLimit ? S.limit = n.limit.limit : this.log(`Function ${this.name} does not support limit`));
     }
     if (n != null && n.partitionBys && n.partitionBys.length > 0) {
       const O = [];
@@ -45772,13 +45770,13 @@ class at {
     const E = h ? Ube(o) : u ? qbe(o) : $X(o), A = E || BX(o);
     if (A)
       return at.invalid(A);
-    const S = h ? mj(o) : u ? yj(o) : o, [v, C] = nS(S, s, r), _ = new at({
+    const S = h ? mj(o) : u ? yj(o) : o, [v, _] = nS(S, s, r), C = new at({
       ts: v,
       zone: r,
-      o: C,
+      o: _,
       loc: x
     });
-    return o.weekday && c && e.weekday !== _.weekday ? at.invalid("mismatched weekday", `you can't specify both a weekday of ${o.weekday} and a date of ${_.toISO()}`) : _;
+    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;
   }
   /**
    * Create a DateTime from an ISO 8601 string
@@ -53586,22 +53584,22 @@ function WDe(t) {
         return MF;
       if (A)
         return A = !1, Jj;
-      var C, _ = m, b;
-      if (f.charCodeAt(_) === jF) {
+      var _, C = m, b;
+      if (f.charCodeAt(C) === jF) {
         for (; m++ < p && f.charCodeAt(m) !== jF || f.charCodeAt(++m) === jF; )
           ;
-        return (C = m) >= p ? E = !0 : (b = f.charCodeAt(m++)) === sm ? A = !0 : b === UF && (A = !0, f.charCodeAt(m) === sm && ++m), f.slice(_ + 1, C - 1).replace(/""/g, '"');
+        return (_ = m) >= p ? E = !0 : (b = f.charCodeAt(m++)) === sm ? A = !0 : b === UF && (A = !0, f.charCodeAt(m) === sm && ++m), f.slice(C + 1, _ - 1).replace(/""/g, '"');
       }
       for (; m < p; ) {
-        if ((b = f.charCodeAt(C = m++)) === sm)
+        if ((b = f.charCodeAt(_ = m++)) === sm)
           A = !0;
         else if (b === UF)
           A = !0, f.charCodeAt(m) === sm && ++m;
         else if (b !== n)
           continue;
-        return f.slice(_, C);
+        return f.slice(C, _);
       }
-      return E = !0, f.slice(_, p);
+      return E = !0, f.slice(C, p);
     }
     for (; (y = S()) !== MF; ) {
       for (var v = []; y !== Jj && y !== MF; )
@@ -54240,10 +54238,10 @@ function iZ(t) {
     f = _x(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, S = f.trim, v = f.type;
     v === "n" ? (E = !0, v = "g") : rU[v] || (A === void 0 && (A = 12), S = !0, v = "g"), (g || x === "0" && h === "=") && (g = !0, x = "0", h = "=");
-    var C = m === "$" ? n : m === "#" && /[boxX]/.test(v) ? "0" + v.toLowerCase() : "", _ = m === "$" ? r : /[%p]/.test(v) ? o : "", b = rU[v], R = /[defgprs%]/.test(v);
+    var _ = m === "$" ? n : m === "#" && /[boxX]/.test(v) ? "0" + v.toLowerCase() : "", C = m === "$" ? r : /[%p]/.test(v) ? o : "", b = rU[v], R = /[defgprs%]/.test(v);
     A = A === void 0 ? 6 : /[gprs]/.test(v) ? Math.max(1, Math.min(21, A)) : Math.max(0, Math.min(20, A));
     function O(L) {
-      var M = C, q = _, W, B, G;
+      var M = _, q = C, W, B, G;
       if (v === "c")
         q = b(L) + q, L = "";
       else {
@@ -54817,8 +54815,8 @@ function EZ(t) {
     Z: dwe,
     "%": Swe
   };
-  A.x = C(n, A), A.X = C(r, A), A.c = C(e, A), S.x = C(n, S), S.X = C(r, S), S.c = C(e, S);
-  function C(D, $) {
+  A.x = _(n, A), A.X = _(r, A), A.c = _(e, A), S.x = _(n, S), S.X = _(r, S), S.c = _(e, S);
+  function _(D, $) {
     return function(j) {
       var Q = [], I = -1, H = 0, P = D.length, J, ce, ue;
       for (j instanceof Date || (j = /* @__PURE__ */ new Date(+j)); ++I < P; )
@@ -54826,7 +54824,7 @@ function EZ(t) {
       return Q.push(D.slice(H, I)), Q.join("");
     };
   }
-  function _(D, $) {
+  function C(D, $) {
     return function(j) {
       var Q = am(1900, void 0, 1), I = b(Q, D, j += "", 0), H, P;
       if (I != j.length)
@@ -54923,25 +54921,25 @@ function EZ(t) {
   }
   return {
     format: function(D) {
-      var $ = C(D += "", A);
+      var $ = _(D += "", A);
       return $.toString = function() {
         return D;
       }, $;
     },
     parse: function(D) {
-      var $ = _(D += "", !1);
+      var $ = C(D += "", !1);
       return $.toString = function() {
         return D;
       }, $;
     },
     utcFormat: function(D) {
-      var $ = C(D += "", S);
+      var $ = _(D += "", S);
       return $.toString = function() {
         return D;
       }, $;
     },
     utcParse: function(D) {
-      var $ = _(D += "", !0);
+      var $ = C(D += "", !0);
       return $.toString = function() {
         return D;
       }, $;
@@ -56931,11 +56929,11 @@ function iee(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, S = (f * y - x * l) / E, v = -A * a, C = (_) => (_ = _ - s, A * _ * _ + S * _ + v + o);
+  const y = c - a * a, E = a * y - l * l, A = (x * a - f * l) / E, S = (f * y - x * l) / E, v = -A * a, _ = (C) => (C = C - s, A * C * C + S * C + v + o);
   return {
     coef: [v - S * s + A * s * s + o, S - 2 * A * s, A],
-    predict: C,
-    rSquared: b2(t, e, n, o, C)
+    predict: _,
+    rSquared: b2(t, e, n, o, _)
   };
 }
 function O4e(t, e, n, r) {
@@ -57005,13 +57003,13 @@ function F4e(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], S = y - i[E] > i[A] - y ? E : A;
-      let v = 0, C = 0, _ = 0, b = 0, R = 0;
+      let v = 0, _ = 0, C = 0, b = 0, R = 0;
       const O = 1 / Math.abs(i[S] - y || 1);
       for (let q = E; q <= A; ++q) {
         const W = i[q], B = s[q], G = w4e(Math.abs(y - W) * O) * x[q], te = W * G;
-        v += G, C += te, _ += B * G, b += B * te, R += W * te;
+        v += G, _ += te, C += B * G, b += B * te, R += W * te;
       }
-      const [L, M] = VE(C / v, _ / v, b / v, R / v);
+      const [L, M] = VE(_ / v, C / v, b / v, R / v);
       c[g] = L + M * y, f[g] = Math.abs(s[g] - c[g]), L4e(i, g + 1, p);
     }
     if (h === DU)
@@ -59383,7 +59381,7 @@ function L5e(t, e, n, r, i, s, o, u) {
     return x = (c * (e - s) - f * (t - i)) / x, [t + x * a, e + x * l];
 }
 function dA(t, e, n, r, i, s, o) {
-  var u = t - n, a = e - r, l = (o ? s : -s) / Uf(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, S = E * E + A * A, v = i - s, C = x * m - p * h, _ = (A < 0 ? -1 : 1) * Uf(C5e(0, v * v * S - C * C)), b = (C * A - E * _) / S, R = (-C * E - A * _) / S, O = (C * A + E * _) / S, L = (-C * E + A * _) / S, M = b - g, q = R - y, W = O - g, B = L - y;
+  var u = t - n, a = e - r, l = (o ? s : -s) / Uf(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, S = E * E + A * A, v = i - s, _ = x * m - p * h, C = (A < 0 ? -1 : 1) * Uf(C5e(0, v * v * S - _ * _)), b = (_ * A - E * C) / S, R = (-_ * E - A * C) / S, O = (_ * A + E * C) / S, L = (-_ * E + A * C) / S, M = b - g, q = R - y, W = O - g, B = L - y;
   return M * M + q * q > W * W + B * B && (b = O, R = L), {
     cx: b,
     cy: R,
@@ -59402,10 +59400,10 @@ function I5e() {
     else if (g > wee - Ur)
       u.moveTo(h * _f(p), h * Cu(p)), u.arc(0, 0, h, p, m, !y), x > Ur && (u.moveTo(x * _f(m), x * Cu(m)), u.arc(0, 0, x, m, p, y));
     else {
-      var E = p, A = m, S = p, v = m, C = g, _ = g, b = o.apply(this, arguments) / 2, R = b > Ur && (r ? +r.apply(this, arguments) : Uf(x * x + h * h)), O = JF(IU(h - x) / 2, +n.apply(this, arguments)), L = O, M = O, q, W;
+      var E = p, A = m, S = p, v = m, _ = g, C = g, b = o.apply(this, arguments) / 2, R = b > Ur && (r ? +r.apply(this, arguments) : Uf(x * x + h * h)), O = JF(IU(h - x) / 2, +n.apply(this, arguments)), L = O, M = O, q, W;
       if (R > Ur) {
         var B = $U(R / x * Cu(b)), G = $U(R / h * Cu(b));
-        (C -= B * 2) > Ur ? (B *= y ? 1 : -1, S += B, v -= B) : (C = 0, S = v = (p + m) / 2), (_ -= G * 2) > Ur ? (G *= y ? 1 : -1, E += G, A -= G) : (_ = 0, E = A = (p + m) / 2);
+        (_ -= B * 2) > Ur ? (B *= y ? 1 : -1, S += B, v -= B) : (_ = 0, S = v = (p + m) / 2), (C -= G * 2) > Ur ? (G *= y ? 1 : -1, E += G, A -= G) : (C = 0, E = A = (p + m) / 2);
       }
       var te = h * _f(E), X = h * Cu(E), de = x * _f(v), be = x * Cu(v);
       if (O > Ur) {
@@ -59417,7 +59415,7 @@ function I5e() {
           } else
             L = M = 0;
       }
-      _ > Ur ? M > Ur ? (q = dA(T, w, te, X, h, M, y), W = dA(ee, U, de, be, h, M, y), u.moveTo(q.cx + q.x01, q.cy + q.y01), M < O ? u.arc(q.cx, q.cy, M, Mr(q.y01, q.x01), Mr(W.y01, W.x01), !y) : (u.arc(q.cx, q.cy, M, Mr(q.y01, q.x01), Mr(q.y11, q.x11), !y), u.arc(0, 0, h, Mr(q.cy + q.y11, q.cx + q.x11), Mr(W.cy + W.y11, W.cx + W.x11), !y), u.arc(W.cx, W.cy, M, Mr(W.y11, W.x11), Mr(W.y01, W.x01), !y))) : (u.moveTo(te, X), u.arc(0, 0, h, E, A, !y)) : u.moveTo(te, X), !(x > Ur) || !(C > Ur) ? u.lineTo(de, be) : L > Ur ? (q = dA(de, be, ee, U, x, -L, y), W = dA(te, X, T, w, x, -L, y), u.lineTo(q.cx + q.x01, q.cy + q.y01), L < O ? u.arc(q.cx, q.cy, L, Mr(q.y01, q.x01), Mr(W.y01, W.x01), !y) : (u.arc(q.cx, q.cy, L, Mr(q.y01, q.x01), Mr(q.y11, q.x11), !y), u.arc(0, 0, x, Mr(q.cy + q.y11, q.cx + q.x11), Mr(W.cy + W.y11, W.cx + W.x11), y), u.arc(W.cx, W.cy, L, Mr(W.y11, W.x11), Mr(W.y01, W.x01), !y))) : u.arc(0, 0, x, v, S, y);
+      C > Ur ? M > Ur ? (q = dA(T, w, te, X, h, M, y), W = dA(ee, U, de, be, h, M, y), u.moveTo(q.cx + q.x01, q.cy + q.y01), M < O ? u.arc(q.cx, q.cy, M, Mr(q.y01, q.x01), Mr(W.y01, W.x01), !y) : (u.arc(q.cx, q.cy, M, Mr(q.y01, q.x01), Mr(q.y11, q.x11), !y), u.arc(0, 0, h, Mr(q.cy + q.y11, q.cx + q.x11), Mr(W.cy + W.y11, W.cx + W.x11), !y), u.arc(W.cx, W.cy, M, Mr(W.y11, W.x11), Mr(W.y01, W.x01), !y))) : (u.moveTo(te, X), u.arc(0, 0, h, E, A, !y)) : u.moveTo(te, X), !(x > Ur) || !(_ > Ur) ? u.lineTo(de, be) : L > Ur ? (q = dA(de, be, ee, U, x, -L, y), W = dA(te, X, T, w, x, -L, y), u.lineTo(q.cx + q.x01, q.cy + q.y01), L < O ? u.arc(q.cx, q.cy, L, Mr(q.y01, q.x01), Mr(W.y01, W.x01), !y) : (u.arc(q.cx, q.cy, L, Mr(q.y01, q.x01), Mr(q.y11, q.x11), !y), u.arc(0, 0, x, Mr(q.cy + q.y11, q.cx + q.x11), Mr(W.cy + W.y11, W.cx + W.x11), y), u.arc(W.cx, W.cy, L, Mr(W.y11, W.x11), Mr(W.y01, W.x01), !y))) : u.arc(0, 0, x, v, S, y);
     }
     if (u.closePath(), c)
       return u = null, c + "" || null;
@@ -60969,17 +60967,17 @@ const DIe = function t(e, n, r) {
   function i(s, o) {
     var u = s[0], a = s[1], l = s[2], c = o[0], f = o[1], x = o[2], h = c - u, p = f - a, m = h * h + p * p, g, y;
     if (m < RIe)
-      y = Math.log(x / l) / e, g = function(_) {
+      y = Math.log(x / l) / e, g = function(C) {
         return [
-          u + _ * h,
-          a + _ * p,
-          l * Math.exp(e * _ * y)
+          u + C * h,
+          a + C * p,
+          l * Math.exp(e * C * y)
         ];
       };
     else {
-      var E = Math.sqrt(m), A = (x * x - l * l + r * m) / (2 * l * n * E), S = (x * x - l * l - r * m) / (2 * x * n * E), v = Math.log(Math.sqrt(A * A + 1) - A), C = Math.log(Math.sqrt(S * S + 1) - S);
-      y = (C - v) / e, g = function(_) {
-        var b = _ * y, R = JU(v), O = l / (n * E) * (R * NIe(e * b + v) - OIe(v));
+      var E = Math.sqrt(m), A = (x * x - l * l + r * m) / (2 * l * n * E), S = (x * x - l * l - r * m) / (2 * x * n * E), v = Math.log(Math.sqrt(A * A + 1) - A), _ = Math.log(Math.sqrt(S * S + 1) - S);
+      y = (_ - v) / e, g = function(C) {
+        var b = C * y, R = JU(v), O = l / (n * E) * (R * NIe(e * b + v) - OIe(v));
         return [
           u + O * h,
           a + O * p,
@@ -61438,21 +61436,21 @@ function ZIe(t) {
 }
 function w6(t, e, n, r, i, s, o, u, a, l) {
   var c = vte(), 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"), S = l("%Y");
-  function v(C) {
-    return (a(C) < C ? h : u(C) < C ? p : o(C) < C ? m : s(C) < C ? g : r(C) < C ? i(C) < C ? y : E : n(C) < C ? A : S)(C);
-  }
-  return c.invert = function(C) {
-    return new Date(f(C));
-  }, c.domain = function(C) {
-    return arguments.length ? x(Array.from(C, ZIe)) : x().map(JIe);
-  }, c.ticks = function(C) {
-    var _ = x();
-    return t(_[0], _[_.length - 1], C ?? 10);
-  }, c.tickFormat = function(C, _) {
-    return _ == null ? v : l(_);
-  }, c.nice = function(C) {
-    var _ = x();
-    return (!C || typeof C.range != "function") && (C = e(_[0], _[_.length - 1], C ?? 10)), C ? x(Tte(_, C)) : c;
+  function v(_) {
+    return (a(_) < _ ? h : u(_) < _ ? p : o(_) < _ ? m : s(_) < _ ? g : r(_) < _ ? i(_) < _ ? y : E : n(_) < _ ? A : S)(_);
+  }
+  return c.invert = function(_) {
+    return new Date(f(_));
+  }, c.domain = function(_) {
+    return arguments.length ? x(Array.from(_, ZIe)) : x().map(JIe);
+  }, c.ticks = function(_) {
+    var C = x();
+    return t(C[0], C[C.length - 1], _ ?? 10);
+  }, c.tickFormat = function(_, C) {
+    return C == null ? v : l(C);
+  }, c.nice = function(_) {
+    var C = x();
+    return (!_ || typeof _.range != "function") && (_ = e(C[0], C[C.length - 1], _ ?? 10)), _ ? x(Tte(C, _)) : c;
   }, c.copy = function() {
     return ZE(c, w6(t, e, n, r, i, s, o, u, a, l));
   }, c;
@@ -62109,13 +62107,13 @@ function H$e(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, S = g * u + y * a, v = E * u + A * a, C = g * t + y * e, _ = E * t + A * e;
-  let R = 1 / ((C - S) * (C - S) + (_ - v) * (_ - v)) - 0.25;
+  const g = x / n, y = f / n, E = -f / r, A = x / r, S = g * u + y * a, v = E * u + A * a, _ = g * t + y * e, C = E * t + A * e;
+  let R = 1 / ((_ - S) * (_ - S) + (C - v) * (C - v)) - 0.25;
   R < 0 && (R = 0);
   let O = Math.sqrt(R);
   s == i && (O = -O);
-  const L = 0.5 * (S + C) - O * (_ - v), M = 0.5 * (v + _) + O * (C - S), q = Math.atan2(v - M, S - L);
-  let B = Math.atan2(_ - M, C - L) - q;
+  const L = 0.5 * (S + _) - O * (C - v), M = 0.5 * (v + C) + O * (_ - S), q = Math.atan2(v - M, S - L);
+  let B = Math.atan2(C - M, _ - L) - q;
   B < 0 && s === 1 ? B += Lu : B > 0 && s === 0 && (B -= Lu);
   const G = Math.ceil(Math.abs(B / (Bf + 1e-3))), te = [];
   for (let X = 0; X < G; ++X) {
@@ -62129,8 +62127,8 @@ function z$e(t) {
   if (uw[e])
     return uw[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), S = 8 / 3 * A * A / Math.sin(E), v = n + p - S * m, C = r + m + S * p, _ = n + g, b = r + y, R = _ + S * y, O = b - S * g;
-  return uw[e] = [c * v + f * C, x * v + h * C, c * R + f * O, x * R + h * O, c * _ + f * b, x * _ + 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), S = 8 / 3 * A * A / Math.sin(E), v = n + p - S * m, _ = r + m + S * p, C = n + g, b = r + y, R = C + S * y, O = b - S * g;
+  return uw[e] = [c * v + f * _, x * v + h * _, c * R + f * O, x * R + h * O, c * C + f * b, x * C + h * b];
 }
 const Vs = ["l", 0, 0, 0, 0, 0, 0, 0];
 function Q$e(t, e, n) {
@@ -62359,12 +62357,12 @@ function mA(t, e, n) {
 function J$e() {
   var t = V$e, e = Y$e, n = K$e, r = X$e, i = Qa(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 = mA(+i.call(this, c), 0, E), S = mA(+s.call(this, c), 0, E), v = mA(+o.call(this, c), 0, E), C = mA(+u.call(this, c), 0, E);
-    if (a || (a = h = g6()), A <= 0 && S <= 0 && v <= 0 && C <= 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 = mA(+i.call(this, c), 0, E), S = mA(+s.call(this, c), 0, E), v = mA(+o.call(this, c), 0, E), _ = mA(+u.call(this, c), 0, E);
+    if (a || (a = h = g6()), A <= 0 && S <= 0 && v <= 0 && _ <= 0)
       a.rect(p, m, g, y);
     else {
-      var _ = p + g, b = m + y;
-      a.moveTo(p + A, m), a.lineTo(_ - S, m), a.bezierCurveTo(_ - a0 * S, m, _, m + a0 * S, _, m + S), a.lineTo(_, b - C), a.bezierCurveTo(_, b - a0 * C, _ - a0 * C, b, _ - C, b), a.lineTo(p + v, b), a.bezierCurveTo(p + a0 * v, b, p, b - a0 * v, p, b - v), a.lineTo(p, m + A), a.bezierCurveTo(p, m + a0 * A, p + a0 * A, m, p + A, m), a.closePath();
+      var C = p + g, b = m + y;
+      a.moveTo(p + A, m), a.lineTo(C - S, m), a.bezierCurveTo(C - a0 * S, m, C, m + a0 * S, C, m + S), a.lineTo(C, b - _), a.bezierCurveTo(C, b - a0 * _, C - a0 * _, b, C - _, b), a.lineTo(p + v, b), a.bezierCurveTo(p + a0 * v, b, p, b - a0 * v, p, b - v), a.lineTo(p, m + A), a.bezierCurveTo(p, m + a0 * A, p + a0 * A, m, p + A, m), a.closePath();
     }
     if (h)
       return a = null, h + "" || null;
@@ -64854,60 +64852,60 @@ function Uq(t) {
   return t < 0 ? Math.ceil(-t) : 0;
 }
 function dre(t, e, n) {
-  var r = !n.nodirty, i = n.bounds === Ak ? Pke : Mke, s = qr.set(0, 0, 0, 0), o = un(n.align, T0), u = un(n.align, R0), a = un(n.padding, T0), l = un(n.padding, R0), 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), S = Array(x), v = Array(x), C, _, b, R, O, L, M, q, W, B, G;
-  for (_ = 0; _ < c; ++_)
-    p[_] = 0;
-  for (_ = 0; _ < f; ++_)
-    y[_] = 0;
-  for (_ = 0; _ < x; ++_)
-    L = e[_], O = v[_] = i(L), L.x = L.x || 0, A[_] = 0, L.y = L.y || 0, S[_] = 0, b = _ % c, R = ~~(_ / c), m = Math.max(m, M = Math.ceil(O.x2)), E = Math.max(E, q = Math.ceil(O.y2)), p[b] = Math.max(p[b], M), y[R] = Math.max(y[R], q), h[_] = a + Uq(O.x1), g[_] = l + Uq(O.y1), r && t.dirty(e[_]);
-  for (_ = 0; _ < x; ++_)
-    _ % c === 0 && (h[_] = 0), _ < c && (g[_] = 0);
+  var r = !n.nodirty, i = n.bounds === Ak ? Pke : Mke, s = qr.set(0, 0, 0, 0), o = un(n.align, T0), u = un(n.align, R0), a = un(n.padding, T0), l = un(n.padding, R0), 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), S = Array(x), v = Array(x), _, C, b, R, O, L, M, q, W, B, G;
+  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 = v[C] = i(L), L.x = L.x || 0, A[C] = 0, L.y = L.y || 0, S[C] = 0, b = C % c, R = ~~(C / c), m = Math.max(m, M = Math.ceil(O.x2)), E = Math.max(E, q = Math.ceil(O.y2)), p[b] = Math.max(p[b], M), y[R] = Math.max(y[R], q), h[C] = a + Uq(O.x1), g[C] = l + Uq(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 === L4)
     for (b = 1; b < c; ++b) {
-      for (G = 0, _ = b; _ < x; _ += c)
-        G < h[_] && (G = h[_]);
-      for (_ = b; _ < x; _ += c)
-        h[_] = G + p[b - 1];
+      for (G = 0, C = b; C < x; C += c)
+        G < h[C] && (G = h[C]);
+      for (C = b; C < x; C += c)
+        h[C] = G + p[b - 1];
     }
   else if (o === yA) {
-    for (G = 0, _ = 0; _ < x; ++_)
-      _ % c && G < h[_] && (G = h[_]);
-    for (_ = 0; _ < x; ++_)
-      _ % c && (h[_] = G + m);
+    for (G = 0, C = 0; C < x; ++C)
+      C % c && G < h[C] && (G = h[C]);
+    for (C = 0; C < x; ++C)
+      C % c && (h[C] = G + m);
   } else
     for (o = !1, b = 1; b < c; ++b)
-      for (_ = b; _ < x; _ += c)
-        h[_] += p[b - 1];
+      for (C = b; C < x; C += c)
+        h[C] += p[b - 1];
   if (u === L4)
     for (R = 1; R < f; ++R) {
-      for (G = 0, _ = R * c, C = _ + c; _ < C; ++_)
-        G < g[_] && (G = g[_]);
-      for (_ = R * c; _ < C; ++_)
-        g[_] = G + y[R - 1];
+      for (G = 0, C = R * c, _ = C + c; C < _; ++C)
+        G < g[C] && (G = g[C]);
+      for (C = R * c; C < _; ++C)
+        g[C] = G + y[R - 1];
     }
   else if (u === yA) {
-    for (G = 0, _ = c; _ < x; ++_)
-      G < g[_] && (G = g[_]);
-    for (_ = c; _ < x; ++_)
-      g[_] = G + E;
+    for (G = 0, C = c; C < x; ++C)
+      G < g[C] && (G = g[C]);
+    for (C = c; C < x; ++C)
+      g[C] = G + E;
   } else
     for (u = !1, R = 1; R < f; ++R)
-      for (_ = R * c, C = _ + c; _ < C; ++_)
-        g[_] += y[R - 1];
-  for (W = 0, _ = 0; _ < x; ++_)
-    W = h[_] + (_ % c ? W : 0), A[_] += W - e[_].x;
+      for (C = R * c, _ = C + c; C < _; ++C)
+        g[C] += y[R - 1];
+  for (W = 0, C = 0; C < x; ++C)
+    W = h[C] + (C % c ? W : 0), A[C] += W - e[C].x;
   for (b = 0; b < c; ++b)
-    for (B = 0, _ = b; _ < x; _ += c)
-      B += g[_], S[_] += B - e[_].y;
+    for (B = 0, C = b; C < x; C += c)
+      B += g[C], S[C] += B - e[C].y;
   if (o && un(n.center, T0) && f > 1)
-    for (_ = 0; _ < x; ++_)
-      O = o === yA ? m : p[_ % c], W = O - v[_].x2 - e[_].x - A[_], W > 0 && (A[_] += W / 2);
+    for (C = 0; C < x; ++C)
+      O = o === yA ? m : p[C % c], W = O - v[C].x2 - e[C].x - A[C], W > 0 && (A[C] += W / 2);
   if (u && un(n.center, R0) && c !== 1)
-    for (_ = 0; _ < x; ++_)
-      O = u === yA ? E : y[~~(_ / c)], B = O - v[_].y2 - e[_].y - S[_], B > 0 && (S[_] += B / 2);
-  for (_ = 0; _ < x; ++_)
-    s.union(v[_].translate(A[_], S[_]));
+    for (C = 0; C < x; ++C)
+      O = u === yA ? E : y[~~(C / c)], B = O - v[C].y2 - e[C].y - S[C], B > 0 && (S[C] += B / 2);
+  for (C = 0; C < x; ++C)
+    s.union(v[C].translate(A[C], S[C]));
   switch (W = un(n.anchor, _ke), B = un(n.anchor, Cke), un(n.anchor, T0)) {
     case pi:
       W -= s.width();
@@ -64922,10 +64920,10 @@ function dre(t, e, n) {
     case w4:
       B -= s.height() / 2;
   }
-  for (W = Math.round(W), B = Math.round(B), s.clear(), _ = 0; _ < x; ++_)
-    e[_].mark.bounds.clear();
-  for (_ = 0; _ < x; ++_)
-    L = e[_], L.x += A[_] += W, L.y += S[_] += B, s.union(L.mark.bounds.union(L.bounds.translate(A[_], S[_]))), r && t.dirty(L);
+  for (W = Math.round(W), B = Math.round(B), s.clear(), C = 0; C < x; ++C)
+    e[C].mark.bounds.clear();
+  for (C = 0; C < x; ++C)
+    L = e[C], L.x += A[C] += W, L.y += S[C] += B, s.union(L.mark.bounds.union(L.bounds.translate(A[C], S[C]))), r && t.dirty(L);
   return s;
 }
 function jke(t, e, n) {
@@ -64940,7 +64938,7 @@ function qke(t, e) {
   return t.bounds[e];
 }
 function SA(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, S, v, C, _, b, R;
+  var p = n.length, m = 0, g = 0, y, E, A, S, v, _, C, b, R;
   if (!p)
     return m;
   for (y = c; y < p; y += f)
@@ -64950,9 +64948,9 @@ function SA(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, S = e.length; E < S; ++E)
     t.dirty(e[E]), e[E].mark.bounds.clear();
   for (y = c, E = 0, S = e.length; E < S; ++E, y += f) {
-    for (C = e[E], v = C.mark.bounds, A = y; A >= 0 && (_ = n[A]) == null; A -= x)
+    for (_ = e[E], v = _.mark.bounds, A = y; A >= 0 && (C = n[A]) == null; A -= x)
       ;
-    u ? (b = h == null ? _.x : Math.round(_.bounds.x1 + h * _.bounds.width()), R = m) : (b = m, R = h == null ? _.y : Math.round(_.bounds.y1 + h * _.bounds.height())), v.union(C.bounds.translate(b - (C.x || 0), R - (C.y || 0))), C.x = b, C.y = R, t.dirty(C), g = o(g, v[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())), v.union(_.bounds.translate(b - (_.x || 0), R - (_.y || 0))), _.x = b, _.y = R, t.dirty(_), g = o(g, v[l]);
   }
   return g;
 }
@@ -66034,9 +66032,9 @@ function Y8e(t, e) {
   i === 1 ? r = Rn + tt : i === -1 && (r = -Rn - tt);
   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 = pw(h), m = h[1] / 2 + jv, g = Xe(m), y = nt(m), E = 0; E < x; ++E, p = S, g = C, y = _, h = A) {
-        var A = f[E], S = pw(A), v = A[1] / 2 + jv, C = Xe(v), _ = nt(v), b = S - p, R = b >= 0 ? 1 : -1, O = R * b, L = O > ht, M = g * C;
-        if (a.add(Ao(M * R * Xe(O), y * _ + M * nt(O))), o += L ? b + R * Ii : b, L ^ p >= n ^ S >= n) {
+      for (var f, x, h = f[x - 1], p = pw(h), m = h[1] / 2 + jv, g = Xe(m), y = nt(m), E = 0; E < x; ++E, p = S, g = _, y = C, h = A) {
+        var A = f[E], S = pw(A), v = A[1] / 2 + jv, _ = Xe(v), C = nt(v), b = S - p, R = b >= 0 ? 1 : -1, O = R * b, L = O > ht, M = g * _;
+        if (a.add(Ao(M * R * Xe(O), y * C + M * nt(O))), o += L ? b + R * Ii : b, L ^ p >= n ^ S >= n) {
           var q = mp(Nx(h), Nx(A));
           Gv(q);
           var W = mp(s, q);
@@ -66085,17 +66083,17 @@ function zre(t, e, n, r) {
     }
     function A() {
       y(f[0][0], f[0][1]), u.lineEnd();
-      var S = u.clean(), v = o.result(), C, _ = v.length, b, R, O;
-      if (f.pop(), l.push(f), f = null, !!_) {
+      var S = u.clean(), v = o.result(), _, C = v.length, b, R, O;
+      if (f.pop(), l.push(f), f = null, !!C) {
         if (S & 1) {
           if (R = v[0], (b = R.length - 1) > 0) {
-            for (a || (i.polygonStart(), a = !0), i.lineStart(), C = 0; C < b; ++C)
-              i.point((O = R[C])[0], O[1]);
+            for (a || (i.polygonStart(), a = !0), i.lineStart(), _ = 0; _ < b; ++_)
+              i.point((O = R[_])[0], O[1]);
             i.lineEnd();
           }
           return;
         }
-        _ > 1 && S & 2 && v.push(v.pop().concat(v.shift())), c.push(v.filter(K8e));
+        C > 1 && S & 2 && v.push(v.pop().concat(v.shift())), c.push(v.filter(K8e));
       }
     }
     return x;
@@ -66166,8 +66164,8 @@ function t7e(t) {
         if (!f && (p = h = S) && c.lineStart(), S !== h && (A = a(f, E), (!A || dS(f, A) || dS(E, A)) && (E[2] = 1)), S !== h)
           m = 0, S ? (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 ^ S) {
-          var C;
-          !(v & x) && (C = a(E, f, !0)) && (m = 0, r ? (c.lineStart(), c.point(C[0][0], C[0][1]), c.point(C[1][0], C[1][1]), c.lineEnd()) : (c.point(C[1][0], C[1][1]), c.lineEnd(), c.lineStart(), c.point(C[0][0], C[0][1], 3)));
+          var _;
+          !(v & 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)));
         }
         S && (!f || !dS(f, E)) && c.point(E[0], E[1]), f = E, h = S, x = v;
       },
@@ -66185,19 +66183,19 @@ function t7e(t) {
     var h = Nx(c), p = Nx(f), m = [1, 0, 0], g = mp(h, p), y = _A(g, g), E = g[0], A = y - E * E;
     if (!A)
       return !x && c;
-    var S = e * y / A, v = -e * E / A, C = mp(m, g), _ = CA(m, S), b = CA(g, v);
-    hw(_, b);
-    var R = C, O = _A(_, R), L = _A(R, R), M = O * O - L * (_A(_, _) - 1);
+    var S = e * y / A, v = -e * E / A, _ = mp(m, g), C = CA(m, S), b = CA(g, v);
+    hw(C, b);
+    var R = _, O = _A(C, R), L = _A(R, R), M = O * O - L * (_A(C, C) - 1);
     if (!(M < 0)) {
       var q = $i(M), W = CA(R, (-O - q) / L);
-      if (hw(W, _), W = Qv(W), !x)
+      if (hw(W, C), W = Qv(W), !x)
         return W;
       var B = c[0], G = f[0], te = c[1], X = f[1], de;
       G < B && (de = B, B = G, G = de);
       var be = G - B, ee = yt(be - ht) < tt, U = ee || be < tt;
       if (!ee && X < te && (de = te, te = X, X = de), U ? ee ? te + X > 0 ^ W[1] < (yt(W[0] - B) < tt ? te : X) : te <= W[1] && W[1] <= X : be > ht ^ (B <= W[0] && W[0] <= G)) {
         var T = CA(R, (-O + q) / L);
-        return hw(T, _), [W, Qv(T)];
+        return hw(T, C), [W, Qv(T)];
       }
     }
   }
@@ -66280,7 +66278,7 @@ function Qre(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 = qre(), x, h, p, m, g, y, E, A, S, v, C, _ = {
+    var c = l, f = qre(), x, h, p, m, g, y, E, A, S, v, _, C = {
       point: b,
       lineStart: M,
       lineEnd: q,
@@ -66297,17 +66295,17 @@ function Qre(t, e, n, r) {
       return B;
     }
     function O() {
-      c = f, x = [], h = [], C = !0;
+      c = f, x = [], h = [], _ = !0;
     }
     function L() {
-      var B = R(), G = C && B, te = (x = tZ(x)).length;
+      var B = R(), G = _ && B, te = (x = tZ(x)).length;
       (G || te) && (l.polygonStart(), G && (l.lineStart(), s(null, null, 1, l), l.lineEnd()), te && Hre(x, u, B, s, l), l.polygonEnd()), c = l, x = h = p = null;
     }
     function M() {
-      _.point = W, h && h.push(p = []), v = !0, S = !1, E = A = NaN;
+      C.point = W, h && h.push(p = []), v = !0, S = !1, E = A = NaN;
     }
     function q() {
-      x && (W(m, g), y && S && f.rejoin(), x.push(f.result())), _.point = b, S && c.lineEnd();
+      x && (W(m, g), y && S && f.rejoin(), x.push(f.result())), C.point = b, S && c.lineEnd();
     }
     function W(B, G) {
       var te = i(B, G);
@@ -66317,11 +66315,11 @@ function Qre(t, e, n, r) {
         c.point(B, G);
       else {
         var X = [E = Math.max(TA, Math.min(qm, E)), A = Math.max(TA, Math.min(qm, A))], de = [B = Math.max(TA, Math.min(qm, B)), G = Math.max(TA, Math.min(qm, G))];
-        n7e(X, de, t, e, n, r) ? (S || (c.lineStart(), c.point(X[0], X[1])), c.point(de[0], de[1]), te || c.lineEnd(), C = !1) : te && (c.lineStart(), c.point(B, G), C = !1);
+        n7e(X, de, t, e, n, r) ? (S || (c.lineStart(), c.point(X[0], X[1])), c.point(de[0], de[1]), te || c.lineEnd(), _ = !1) : te && (c.lineStart(), c.point(B, G), _ = !1);
       }
       E = B, A = G, S = te;
     }
-    return _;
+    return C;
   };
 }
 function oH(t, e, n) {
@@ -66704,8 +66702,8 @@ function m7e(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 S = o + x, v = u + h, C = a + p, _ = $i(S * S + v * v + C * C), b = os(C /= _), R = yt(yt(C) - 1) < tt || yt(s - f) < tt ? (s + f) / 2 : Ao(v, S), O = t(R, b), L = O[0], M = O[1], q = L - r, W = M - i, B = E * q - y * W;
-      (B * B / A > e || yt((y * q + E * W) / A - 0.5) > 0.3 || o * x + u * h + a * p < p7e) && (n(r, i, s, o, u, a, L, M, R, S /= _, v /= _, C, m, g), g.point(L, M), n(L, M, R, S, v, C, l, c, f, x, h, p, m, g));
+      var S = o + x, v = u + h, _ = a + p, C = $i(S * S + v * v + _ * _), b = os(_ /= C), R = yt(yt(_) - 1) < tt || yt(s - f) < tt ? (s + f) / 2 : Ao(v, S), O = t(R, b), L = O[0], M = O[1], q = L - r, W = M - i, B = E * q - y * W;
+      (B * B / A > e || yt((y * q + E * W) / A - 0.5) > 0.3 || o * x + u * h + a * p < p7e) && (n(r, i, s, o, u, a, L, M, R, S /= C, v /= C, _, m, g), g.point(L, M), n(L, M, R, S, v, _, l, c, f, x, h, p, m, g));
     }
   }
   return function(r) {
@@ -66734,12 +66732,12 @@ function m7e(t, e) {
       g.point = y, r.lineEnd();
     }
     function v() {
-      E(), g.point = C, g.lineEnd = _;
+      E(), g.point = _, g.lineEnd = C;
     }
-    function C(b, R) {
+    function _(b, R) {
       A(i = b, R), s = f, o = x, u = h, a = p, l = m, g.point = A;
     }
-    function _() {
+    function C() {
       n(f, x, c, h, p, m, s, o, i, u, a, l, hH, r), g.lineEnd = S, S();
     }
     return g;
@@ -66783,7 +66781,7 @@ function ba(t) {
   })();
 }
 function iie(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 = sH, g = null, y, E, A, S = K1, v = 0.5, 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 = sH, g = null, y, E, A, S = K1, v = 0.5, _, C, b, R, O;
   function L(B) {
     return b(B[0] * dt, B[1] * dt);
   }
@@ -66791,7 +66789,7 @@ function iie(t) {
     return B = b.invert(B[0], B[1]), B && [B[0] * Fn, B[1] * Fn];
   }
   L.stream = function(B) {
-    return R && O === B ? R : R = y7e(E7e(c)(m(C(S(O = B)))));
+    return R && O === B ? R : R = y7e(E7e(c)(m(_(S(O = B)))));
   }, L.preclip = function(B) {
     return arguments.length ? (m = B, p = void 0, W()) : m;
   }, L.postclip = function(B) {
@@ -66815,7 +66813,7 @@ function iie(t) {
   }, L.reflectY = function(B) {
     return arguments.length ? (h = B ? -1 : 1, q()) : h < 0;
   }, L.precision = function(B) {
-    return arguments.length ? (C = pH(_, v = B * B), W()) : $i(v);
+    return arguments.length ? (_ = pH(C, v = B * B), W()) : $i(v);
   }, L.fitExtent = function(B, G) {
     return QO(L, B, G);
   }, L.fitSize = function(B, G) {
@@ -66827,7 +66825,7 @@ function iie(t) {
   };
   function q() {
     var B = gH(n, 0, 0, x, h, f).apply(null, e(s, o)), G = gH(n, r - B[0], i - B[1], x, h, f);
-    return c = Ure(u, a, l), _ = z4(e, G), b = z4(c, _), C = pH(_, v), W();
+    return c = Ure(u, a, l), C = z4(e, G), b = z4(c, C), _ = pH(C, v), W();
   }
   function W() {
     return R = O = null, L;
@@ -67071,28 +67069,28 @@ function $7e() {
 function B7e() {
   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 = zO({
     point: function(S, v) {
-      var C = A([S, v]);
-      this.stream.point(C[0], C[1]);
+      var _ = A([S, v]);
+      this.stream.point(_[0], _[1]);
     }
   }), m = K1, g, y;
   function E() {
     return x = t * r, h = t * i, g = y = null, A;
   }
   function A(S) {
-    var v = S[0] * x, C = S[1] * h;
+    var v = S[0] * x, _ = S[1] * h;
     if (s) {
-      var _ = C * o - v * u;
-      v = v * o + C * u, C = _;
+      var C = _ * o - v * u;
+      v = v * o + _ * u, _ = C;
     }
-    return [v + e, C + n];
+    return [v + e, _ + n];
   }
   return A.invert = function(S) {
-    var v = S[0] - e, C = S[1] - n;
+    var v = S[0] - e, _ = S[1] - n;
     if (s) {
-      var _ = C * o + v * u;
-      v = v * o - C * u, C = _;
+      var C = _ * o + v * u;
+      v = v * o - _ * u, _ = C;
     }
-    return [v / x, C / h];
+    return [v / x, _ / h];
   }, A.stream = function(S) {
     return g && y === S ? g : g = p(m(y = S));
   }, A.postclip = function(S) {
@@ -67298,19 +67296,19 @@ function Eie() {
       E = y, y = a[p * t + h + 1] >= l, Ga[y << 2 | E << 3].forEach(A);
     Ga[y << 3].forEach(A);
     function A(S) {
-      var v = [S[0][0] + h, S[0][1] + p], C = [S[1][0] + h, S[1][1] + p], _ = o(v), b = o(C), R, O;
-      (R = x[_]) ? (O = f[b]) ? (delete x[R.end], delete f[O.start], R === O ? (R.ring.push(C), c(R.ring)) : f[R.start] = x[O.end] = {
+      var v = [S[0][0] + h, S[0][1] + p], _ = [S[1][0] + h, S[1][1] + p], C = o(v), 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(C), x[R.end = b] = R) : (R = f[b]) ? (O = x[_]) ? (delete f[R.start], delete x[O.end], R === O ? (R.ring.push(C), 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(v), f[R.start = _] = R) : f[_] = x[b] = {
-        start: _,
+      }) : (delete f[R.start], R.ring.unshift(v), f[R.start = C] = R) : f[C] = x[b] = {
+        start: C,
         end: b,
-        ring: [v, C]
+        ring: [v, _]
       };
     }
   }
@@ -67473,8 +67471,8 @@ function vie() {
     const c = EH(r[0], a, t) >> o, f = EH(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((S) => {
-      const v = x + (+t(S) >> o), C = h + (+e(S) >> o);
-      v >= 0 && v < p && C >= 0 && C < m && (g[v + C * p] += +n(S));
+      const v = x + (+t(S) >> o), _ = h + (+e(S) >> o);
+      v >= 0 && v < p && _ >= 0 && _ < m && (g[v + _ * p] += +n(S));
     }), c > 0 && f > 0 ? (Xd(p, m, g, y, c), Jd(p, m, y, g, f), Xd(p, m, g, y, c), Jd(p, m, y, g, f), Xd(p, m, g, y, c), Jd(p, m, y, g, f)) : c > 0 ? (Xd(p, m, g, y, c), Xd(p, m, y, g, c), Xd(p, m, g, y, c), E = y) : f > 0 && (Jd(p, m, g, y, f), Jd(p, m, y, g, f), Jd(p, m, g, y, f), E = y);
     const A = l ? Math.pow(2, -2 * o) : 1 / nZ(E);
     for (let S = 0, v = p * m; S < v; ++S)
@@ -68232,7 +68230,7 @@ function kPe(t) {
     for (var l, c = e.length, f, x, h, p, m, g, y = 0; y < s; ++y)
       for (f = qk(e, $Pe, BPe).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, S, v, C, _) {
+    function E(A, S, v, _, C) {
       var b = A.data, R = A.r, O = m + R;
       if (b) {
         if (b.index > x.index) {
@@ -68241,7 +68239,7 @@ function kPe(t) {
         }
         return;
       }
-      return S > h + O || C < h - O || v > p + O || _ < p - O;
+      return S > h + O || _ < h - O || v > p + O || C < p - O;
     }
   }
   function u(l) {
@@ -68284,12 +68282,12 @@ function MPe(t) {
   }
   function x(g) {
     for (var y = 0, E = t.length; y < c; ++y)
-      for (var A = 0, S, v, C, _, b, R, O; A < E; ++A)
-        S = t[A], v = S.source, C = S.target, _ = C.x + C.vx - v.x - v.vx || O0(l), b = C.y + C.vy - v.y - v.vy || O0(l), R = Math.sqrt(_ * _ + b * b), R = (R - s[A]) / R * g * r[A], _ *= R, b *= R, C.vx -= _ * (O = a[A]), C.vy -= b * O, v.vx += _ * (O = 1 - O), v.vy += b * O;
+      for (var A = 0, S, v, _, C, b, R, O; A < E; ++A)
+        S = t[A], v = S.source, _ = S.target, C = _.x + _.vx - v.x - v.vx || O0(l), b = _.y + _.vy - v.y - v.vy || O0(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, v.vx += C * (O = 1 - O), v.vy += b * O;
   }
   function h() {
     if (o) {
-      var g, y = o.length, E = t.length, A = new Map(o.map((v, C) => [e(v, C, o), v])), S;
+      var g, y = o.length, E = t.length, A = new Map(o.map((v, _) => [e(v, _, o), v])), S;
       for (g = 0, u = new Array(y); g < E; ++g)
         S = t[g], S.index = g, typeof S.source != "object" && (S.source = vH(A, S.source)), typeof S.target != "object" && (S.target = vH(A, S.target)), u[S.source.index] = (u[S.source.index] || 0) + 1, u[S.target.index] = (u[S.target.index] || 0) + 1;
       for (g = 0, a = new Array(E); g < E; ++g)
@@ -68535,9 +68533,9 @@ function tMe(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, S, v, C, _, b;
+      var E = 0, A = t.length, S, v, _, C, b;
       for (y == null ? y = 1 / 0 : y *= y, E = 0; E < A; ++E)
-        _ = t[E], S = m - _.x, v = g - _.y, C = S * S + v * v, C < y && (b = _, y = C);
+        C = t[E], S = m - C.x, v = g - C.y, _ = S * S + v * v, _ < y && (b = C, y = _);
       return b;
     },
     on: function(m, g) {
@@ -69139,9 +69137,9 @@ function Km(t, e) {
   };
 }
 function Bie(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, S = E - l * l - c * c + f * f, v = h * p - x * m, C = (p * S - m * A) / (v * 2) - r, _ = (m * g - p * y) / v, b = (h * A - x * S) / (v * 2) - i, R = (x * y - h * g) / v, O = _ * _ + R * R - 1, L = 2 * (s + C * _ + b * R), M = C * C + b * b - s * s, q = -(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, S = E - l * l - c * c + f * f, v = h * p - x * m, _ = (p * S - m * A) / (v * 2) - r, C = (m * g - p * y) / v, b = (h * A - x * S) / (v * 2) - i, R = (x * y - h * g) / v, O = C * C + R * R - 1, L = 2 * (s + _ * C + b * R), M = _ * _ + b * b - s * s, q = -(Math.abs(O) > 1e-6 ? (L + Math.sqrt(L * L - 4 * O * M)) / (2 * O) : M / L);
   return {
-    x: r + C + _ * q,
+    x: r + _ + C * q,
     y: i + b + R * q,
     r: q
   };
@@ -69433,13 +69431,13 @@ function VO(t, e, n, r, i) {
 }
 var Pie = (1 + Math.sqrt(5)) / 2;
 function Mie(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, S, v, C; 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, S, v, _; c < x; ) {
     h = i - n, p = s - r;
     do
       g = u[f++].value;
     while (!g && f < x);
-    for (y = E = g, v = Math.max(p / h, h / p) / (m * t), C = g * g * v, S = Math.max(E / C, C / y); f < x; ++f) {
-      if (g += l = u[f].value, l < y && (y = l), l > E && (E = l), C = g * g * v, A = Math.max(E / C, C / y), A > S) {
+    for (y = E = g, v = Math.max(p / h, h / p) / (m * t), _ = g * g * v, S = Math.max(E / _, _ / y); f < x; ++f) {
+      if (g += l = u[f].value, l < y && (y = l), l > E && (E = l), _ = g * g * v, A = Math.max(E / _, _ / y), A > S) {
         g -= l;
         break;
       }
@@ -69499,9 +69497,9 @@ function l9e(t, e, n, r, i) {
       E.x0 = p, E.y0 = m, E.x1 = g, E.y1 = y;
       return;
     }
-    for (var A = l[f], S = h / 2 + A, v = f + 1, C = x - 1; v < C; ) {
-      var _ = v + C >>> 1;
-      l[_] < S ? v = _ + 1 : C = _;
+    for (var A = l[f], S = h / 2 + A, v = f + 1, _ = x - 1; v < _; ) {
+      var C = v + _ >>> 1;
+      l[C] < S ? v = C + 1 : _ = C;
     }
     S - l[v - 1] < l[v] - S && f + 1 < v && --v;
     var b = l[v] - A, R = h - b;
@@ -69934,10 +69932,10 @@ function E9e(t, e, n, r, i) {
   const s = t.width, o = t.height, u = r || i, a = P0(s, o).getContext("2d"), l = P0(s, o).getContext("2d"), c = u && P0(s, o).getContext("2d");
   n.forEach((b) => mS(a, b, !1)), mS(l, e, !1), u && mS(c, e, !0);
   const f = bw(a, s, o), x = bw(l, s, o), h = u && bw(c, s, o), p = t.bitmap(), m = u && t.bitmap();
-  let g, y, E, A, S, v, C, _;
+  let g, y, E, A, S, v, _, C;
   for (y = 0; y < o; ++y)
     for (g = 0; g < s; ++g)
-      S = y * s + g, v = f[S] & Cw, _ = x[S] & Cw, C = u && h[S] & Cw, (v || C || _) && (E = t(g), A = t(y), !i && (v || _) && p.set(E, A), u && (v || C) && m.set(E, A));
+      S = y * s + g, v = f[S] & Cw, C = x[S] & Cw, _ = u && h[S] & Cw, (v || _ || C) && (E = t(g), A = t(y), !i && (v || C) && p.set(E, A), u && (v || _) && m.set(E, A));
   return [p, m];
 }
 function bw(t, e, n) {
@@ -70061,7 +70059,7 @@ function C9e(t, e, n, r) {
   }
   return function(l) {
     const c = l.datum.datum.items[r].items, f = c.length, x = l.datum.fontSize, h = Qu.width(l.datum, l.datum.text);
-    let p = n ? x : 0, m = !1, g = !1, y = 0, E, A, S, v, C, _, b, R, O, L, M, q, W, B, G, te, X;
+    let p = n ? x : 0, m = !1, g = !1, y = 0, E, A, S, v, _, C, b, R, O, L, M, q, W, B, G, te, X;
     for (let de = 0; de < f; ++de) {
       for (E = c[de].x, S = c[de].y, A = c[de].x2 === void 0 ? E : c[de].x2, v = c[de].y2 === void 0 ? S : c[de].y2, E > A && (X = E, E = A, A = X), S > v && (X = S, S = v, v = X), O = t(E), M = t(A), L = ~~((O + M) / 2), q = t(S), B = t(v), W = ~~((q + B) / 2), b = L; b >= O; --b)
         for (R = W; R >= q; --R)
@@ -70069,9 +70067,9 @@ function C9e(t, e, n, r) {
       for (b = L; b <= M; ++b)
         for (R = W; R <= B; ++R)
           te = a(b, R, p, h, x), te && ([l.x, l.y, p, m] = te);
-      !m && !n && (G = Math.abs(A - E + v - S), C = (E + A) / 2, _ = (S + v) / 2, G >= y && !h_(C, _, h, x, i, s) && !N0(t, C, _, x, h, x, o, null) && (y = G, l.x = C, l.y = _, g = !0));
+      !m && !n && (G = Math.abs(A - E + v - S), _ = (E + A) / 2, C = (S + v) / 2, G >= y && !h_(_, C, h, x, i, s) && !N0(t, _, C, x, h, x, o, null) && (y = G, l.x = _, l.y = C, g = !0));
     }
-    return m || g ? (C = h / 2, _ = x / 2, o.setRange(t(l.x - C), t(l.y - _), t(l.x + C), t(l.y + _)), 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 b9e = [-1, -1, 1, 1], T9e = [-1, 1, -1, 1];
@@ -70079,22 +70077,22 @@ function R9e(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 = Qu.width(l.datum, l.datum.text), p = [];
-    let m = n ? x : 0, g = !1, y = !1, E = 0, A, S, v, C, _, b, R, O, L, M, q, W;
+    let m = n ? x : 0, g = !1, y = !1, E = 0, A, S, v, _, C, b, R, O, L, M, q, W;
     for (let B = 0; B < f; ++B) {
-      for (A = c[B].x, v = c[B].y, S = c[B].x2 === void 0 ? A : c[B].x2, C = c[B].y2 === void 0 ? v : c[B].y2, p.push([t((A + S) / 2), t((v + C) / 2)]); p.length; )
+      for (A = c[B].x, v = c[B].y, S = c[B].x2 === void 0 ? A : c[B].x2, _ = c[B].y2 === void 0 ? v : c[B].y2, p.push([t((A + S) / 2), t((v + _) / 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 G = 0; G < 4; ++G)
-            _ = R + b9e[G], b = O + T9e[G], a.outOfBounds(_, b, _, b) || p.push([_, b]);
-          if (_ = t.invert(R), b = t.invert(O), L = m, M = s, !h_(_, b, h, x, i, s) && !N0(t, _, b, x, h, L, o, u) && !N0(t, _, b, x, h, x, o, null)) {
+            C = R + b9e[G], b = O + T9e[G], a.outOfBounds(C, b, C, b) || p.push([C, b]);
+          if (C = t.invert(R), b = t.invert(O), L = m, M = s, !h_(C, b, h, x, i, s) && !N0(t, C, b, x, h, L, o, u) && !N0(t, C, b, x, h, x, o, null)) {
             for (; M - L >= 1; )
-              q = (L + M) / 2, N0(t, _, b, x, h, q, o, u) ? M = q : L = q;
-            L > m && (l.x = _, l.y = b, m = L, g = !0);
+              q = (L + M) / 2, N0(t, C, b, x, h, q, o, u) ? M = q : L = q;
+            L > m && (l.x = C, l.y = b, m = L, g = !0);
           }
         }
-      !g && !n && (W = Math.abs(S - A + C - v), _ = (A + S) / 2, b = (v + C) / 2, W >= E && !h_(_, b, h, x, i, s) && !N0(t, _, b, x, h, x, o, null) && (E = W, l.x = _, l.y = b, y = !0));
+      !g && !n && (W = Math.abs(S - A + _ - v), C = (A + S) / 2, b = (v + _) / 2, W >= E && !h_(C, b, h, x, i, s) && !N0(t, C, b, x, h, x, o, null) && (E = W, l.x = C, l.y = b, y = !0));
     }
-    return g || y ? (_ = h / 2, b = x / 2, o.setRange(t(l.x - _), t(l.y - b), t(l.x + _), t(l.y + b)), l.align = "center", l.baseline = "middle", !0) : !1;
+    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;
   };
 }
 const O9e = ["right", "center", "left"], N9e = ["bottom", "middle", "top"];
@@ -70104,15 +70102,15 @@ function D9e(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, S, v, C, _, b, R, O, L;
+    let x = l.textWidth ?? 0, h, p, m, g, y, E, A, S, v, _, 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[4 + p] + y * f * p / 2 + r[M] * p * g, S = _ - f / 2, v = _ + f / 2, b = t(E), O = t(S), L = t(v), !x)
+      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, S = C - f / 2, v = C + f / 2, b = t(E), O = t(S), L = t(v), !x)
         if (PH(b, b, O, L, o, u, E, E, S, v, c, m))
           x = Qu.width(l.datum, l.datum.text);
         else
           continue;
-      if (C = E + y * x * h / 2, E = C - x / 2, A = C + x / 2, b = t(E), R = t(A), PH(b, R, O, L, o, u, E, A, S, v, c, m))
-        return l.x = h ? h * y < 0 ? A : E : C, l.y = p ? p * y < 0 ? v : S : _, l.align = O9e[h * y + 1], l.baseline = N9e[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), PH(b, R, O, L, o, u, E, A, S, v, c, m))
+        return l.x = h ? h * y < 0 ? A : E : _, l.y = p ? p * y < 0 ? v : S : C, l.align = O9e[h * y + 1], l.baseline = N9e[p * y + 1], o.setRange(b, O, R, L), !0;
     }
     return !1;
   };
@@ -70140,7 +70138,7 @@ function L9e(t, e, n, r, i, s, o, u, a, l, c) {
     return t;
   const f = Math.max(r.length, i.length), x = I9e(r, f), h = $9e(i, f), p = B9e(t[0].datum), m = p === "group" && t[0].datum.items[a].marktype, g = m === "area", y = k9e(p, m, u, a), E = l === null || l === 1 / 0, A = g && c === "naive";
   let S = -1, v = -1;
-  const C = t.map((O) => {
+  const _ = t.map((O) => {
     const L = E ? Qu.width(O, O.text) : void 0;
     return S = Math.max(S, L), v = Math.max(v, O.fontSize), {
       datum: O,
@@ -70154,18 +70152,18 @@ function L9e(t, e, n, r, i, s, o, u, a, l, c) {
     };
   });
   l = l === null || l === 1 / 0 ? Math.max(S, v) + Math.max(...r) : l;
-  const _ = v9e(e[0], e[1], l);
+  const C = v9e(e[0], e[1], l);
   let b;
   if (!A) {
-    n && C.sort((M, q) => n(M.datum, q.datum));
+    n && _.sort((M, q) => n(M.datum, q.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 ? E9e(_, L || [], s, O, g) : y9e(_, o && C);
+    b = s.length || L ? E9e(C, L || [], s, O, g) : y9e(C, o && _);
   }
-  const R = g ? w9e[c](_, b, o, a) : D9e(_, b, h, x);
-  return C.forEach((O) => O.opacity = +R(O)), C;
+  const R = g ? w9e[c](C, b, o, a) : D9e(C, b, h, x);
+  return _.forEach((O) => O.opacity = +R(O)), _;
 }
 function I9e(t, e) {
   const n = new Float64Array(e), r = t.length;
@@ -70453,17 +70451,17 @@ function x3(t) {
 }
 const H9e = (3 + 16 * yl) * yl, z9e = (2 + 12 * yl) * yl, Q9e = (9 + 64 * yl) * yl * yl, Zd = x3(4), MH = x3(8), jH = x3(12), UH = x3(16), ci = x3(4);
 function G9e(t, e, n, r, i, s, o) {
-  let u, a, l, c, f, x, h, p, m, g, y, E, A, S, v, C, _, b;
+  let u, a, l, c, f, x, h, p, m, g, y, E, A, S, v, _, C, b;
   const R = t - i, O = n - i, L = e - s, M = r - s;
-  S = R * M, x = jr * R, h = x - (x - R), p = R - h, x = jr * M, m = x - (x - M), g = M - m, v = p * g - (S - h * m - p * m - h * g), C = L * O, x = jr * L, h = x - (x - L), p = L - h, x = jr * O, m = x - (x - O), g = O - m, _ = p * g - (C - h * m - p * m - h * g), y = v - _, f = v - y, Zd[0] = v - (y + f) + (f - _), E = S + y, f = E - S, A = S - (E - f) + (y - f), y = A - C, f = A - y, Zd[1] = A - (y + f) + (f - C), b = E + y, f = b - E, Zd[2] = E - (b - f) + (y - f), Zd[3] = b;
+  S = R * M, x = jr * R, h = x - (x - R), p = R - h, x = jr * M, m = x - (x - M), g = M - m, v = p * g - (S - h * m - p * m - h * g), _ = L * O, x = jr * L, h = x - (x - L), p = L - h, x = jr * O, m = x - (x - O), g = O - m, C = p * g - (_ - h * m - p * m - h * g), y = v - C, f = v - y, Zd[0] = v - (y + f) + (f - C), E = S + y, f = E - S, A = S - (E - f) + (y - f), y = A - _, f = A - y, Zd[1] = A - (y + f) + (f - _), b = E + y, f = b - E, Zd[2] = E - (b - f) + (y - f), Zd[3] = b;
   let q = q9e(4, Zd), W = z9e * o;
   if (q >= W || -q >= W || (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) || (W = Q9e * o + U9e * Math.abs(q), q += R * c + M * u - (L * l + O * a), q >= W || -q >= W))
     return q;
-  S = u * M, x = jr * u, h = x - (x - u), p = u - h, x = jr * M, m = x - (x - M), g = M - m, v = p * g - (S - h * m - p * m - h * g), C = a * O, x = jr * a, h = x - (x - a), p = a - h, x = jr * O, m = x - (x - O), g = O - m, _ = p * g - (C - h * m - p * m - h * g), y = v - _, f = v - y, ci[0] = v - (y + f) + (f - _), E = S + y, f = E - S, A = S - (E - f) + (y - f), y = A - C, f = A - y, ci[1] = A - (y + f) + (f - C), b = E + y, f = b - E, ci[2] = E - (b - f) + (y - f), ci[3] = b;
+  S = u * M, x = jr * u, h = x - (x - u), p = u - h, x = jr * M, m = x - (x - M), g = M - m, v = p * g - (S - h * m - p * m - h * g), _ = a * O, x = jr * a, h = x - (x - a), p = a - h, x = jr * O, m = x - (x - O), g = O - m, C = p * g - (_ - h * m - p * m - h * g), y = v - C, f = v - y, ci[0] = v - (y + f) + (f - C), E = S + y, f = E - S, A = S - (E - f) + (y - f), y = A - _, f = A - y, ci[1] = A - (y + f) + (f - _), b = E + y, f = b - E, ci[2] = E - (b - f) + (y - f), ci[3] = b;
   const B = ww(4, Zd, 4, ci, MH);
-  S = R * c, x = jr * R, h = x - (x - R), p = R - h, x = jr * c, m = x - (x - c), g = c - m, v = p * g - (S - h * m - p * m - h * g), C = L * l, x = jr * L, h = x - (x - L), p = L - h, x = jr * l, m = x - (x - l), g = l - m, _ = p * g - (C - h * m - p * m - h * g), y = v - _, f = v - y, ci[0] = v - (y + f) + (f - _), E = S + y, f = E - S, A = S - (E - f) + (y - f), y = A - C, f = A - y, ci[1] = A - (y + f) + (f - C), b = E + y, f = b - E, ci[2] = E - (b - f) + (y - f), ci[3] = b;
+  S = R * c, x = jr * R, h = x - (x - R), p = R - h, x = jr * c, m = x - (x - c), g = c - m, v = p * g - (S - h * m - p * m - h * g), _ = L * l, x = jr * L, h = x - (x - L), p = L - h, x = jr * l, m = x - (x - l), g = l - m, C = p * g - (_ - h * m - p * m - h * g), y = v - C, f = v - y, ci[0] = v - (y + f) + (f - C), E = S + y, f = E - S, A = S - (E - f) + (y - f), y = A - _, f = A - y, ci[1] = A - (y + f) + (f - _), b = E + y, f = b - E, ci[2] = E - (b - f) + (y - f), ci[3] = b;
   const G = ww(B, MH, 4, ci, jH);
-  S = u * c, x = jr * u, h = x - (x - u), p = u - h, x = jr * c, m = x - (x - c), g = c - m, v = p * g - (S - h * m - p * m - h * g), C = a * l, x = jr * a, h = x - (x - a), p = a - h, x = jr * l, m = x - (x - l), g = l - m, _ = p * g - (C - h * m - p * m - h * g), y = v - _, f = v - y, ci[0] = v - (y + f) + (f - _), E = S + y, f = E - S, A = S - (E - f) + (y - f), y = A - C, f = A - y, ci[1] = A - (y + f) + (f - C), b = E + y, f = b - E, ci[2] = E - (b - f) + (y - f), ci[3] = b;
+  S = u * c, x = jr * u, h = x - (x - u), p = u - h, x = jr * c, m = x - (x - c), g = c - m, v = p * g - (S - h * m - p * m - h * g), _ = a * l, x = jr * a, h = x - (x - a), p = a - h, x = jr * l, m = x - (x - l), g = l - m, C = p * g - (_ - h * m - p * m - h * g), y = v - C, f = v - y, ci[0] = v - (y + f) + (f - C), E = S + y, f = E - S, A = S - (E - f) + (y - f), y = A - _, f = A - y, ci[1] = A - (y + f) + (f - _), b = E + y, f = b - E, ci[2] = E - (b - f) + (y - f), ci[3] = b;
   const te = ww(G, jH, 4, ci, UH);
   return UH[te - 1];
 }
@@ -70520,7 +70518,7 @@ class p_ {
       const L = Y9e(y, E, A, S, e[2 * O], e[2 * O + 1]);
       L < v && (g = O, v = L);
     }
-    let C = e[2 * g], _ = e[2 * g + 1];
+    let _ = e[2 * g], C = e[2 * g + 1];
     if (v === 1 / 0) {
       for (let M = 0; M < o; M++)
         this._dists[M] = e[2 * M] - e[0] || e[2 * M + 1] - e[1];
@@ -70534,17 +70532,17 @@ class p_ {
       this.hull = O.subarray(0, L), this.triangles = new Uint32Array(0), this.halfedges = new Uint32Array(0);
       return;
     }
-    if (DA(y, E, A, S, C, _) < 0) {
+    if (DA(y, E, A, S, _, C) < 0) {
       const O = m, L = A, M = S;
-      m = g, A = C, S = _, g = O, C = L, _ = M;
+      m = g, A = _, S = C, g = O, _ = L, C = M;
     }
-    const b = K9e(y, E, A, S, C, _);
+    const b = K9e(y, E, A, S, _, C);
     this._cx = b.x, this._cy = b.y;
     for (let O = 0; O < o; O++)
       this._dists[O] = Lw(e[2 * O], e[2 * O + 1], b.x, b.y);
     xh(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, S)] = m, s[this._hashKey(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, S)] = 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 q = this._ids[O], W = e[2 * q], B = e[2 * q + 1];
       if (O > 0 && Math.abs(W - L) <= qH && Math.abs(B - M) <= qH || (L = W, M = B, q === p || q === m || q === g))
@@ -70751,7 +70749,7 @@ let Z9e = 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 S = r[m] * 2, v = r[m + 1] * 2, C = r[m + 2] * 2, _ = e[S], b = e[S + 1], R = e[v], O = e[v + 1], L = e[C], M = e[C + 1], q = R - _, W = O - b, B = L - _, G = M - b, te = (q * G - W * B) * 2;
+      const S = r[m] * 2, v = r[m + 1] * 2, _ = r[m + 2] * 2, C = e[S], b = e[S + 1], R = e[v], O = e[v + 1], L = e[_], M = e[_ + 1], q = R - C, W = O - b, B = L - C, G = M - b, te = (q * G - W * B) * 2;
       if (Math.abs(te) < 1e-9) {
         if (s === void 0) {
           s = o = 0;
@@ -70759,11 +70757,11 @@ let Z9e = class {
             s += e[de * 2], o += e[de * 2 + 1];
           s /= n.length, o /= n.length;
         }
-        const X = 1e9 * Math.sign((s - _) * G - (o - b) * B);
-        E = (_ + L) / 2 - X * G, A = (b + M) / 2 + X * B;
+        const X = 1e9 * Math.sign((s - C) * G - (o - b) * B);
+        E = (C + L) / 2 - X * G, A = (b + M) / 2 + X * B;
       } else {
         const X = 1 / te, de = q * q + W * W, be = B * B + G * G;
-        E = _ + (G * de - W * be) * X, A = b + (q * be - B * de) * X;
+        E = C + (G * de - W * be) * X, A = b + (q * be - B * de) * X;
       }
       u[g] = E, u[g + 1] = A;
     }
@@ -71214,14 +71212,14 @@ var Iw = Math.PI / 180, Xm = 64, yS = 2048;
 function cje() {
   var t = [256, 256], e, n, r, i, s, o, u, a = Hie, l = [], c = Math.random, f = {};
   f.layout = function() {
-    for (var p = x(P0()), m = gje((t[0] >> 5) * t[1]), g = null, y = l.length, E = -1, A = [], S = l.map((C) => ({
-      text: e(C),
-      font: n(C),
-      style: i(C),
-      weight: s(C),
-      rotate: o(C),
-      size: ~~(r(C) + 1e-14),
-      padding: u(C),
+    for (var p = x(P0()), m = gje((t[0] >> 5) * t[1]), g = null, y = l.length, E = -1, A = [], S = l.map((_) => ({
+      text: e(_),
+      font: n(_),
+      style: i(_),
+      weight: s(_),
+      rotate: o(_),
+      size: ~~(r(_) + 1e-14),
+      padding: u(_),
       xoff: 0,
       yoff: 0,
       x1: 0,
@@ -71230,8 +71228,8 @@ function cje() {
       y0: 0,
       hasText: !1,
       sprite: null,
-      datum: C
-    })).sort((C, _) => _.size - C.size); ++E < y; ) {
+      datum: _
+    })).sort((_, C) => C.size - _.size); ++E < y; ) {
       var v = S[E];
       v.x = t[0] * (c() + 0.5) >> 1, v.y = t[1] * (c() + 0.5) >> 1, fje(p, v, S, E), v.hasText && h(m, v, g) && (A.push(v), g ? dje(g, v) : g = [{
         x: v.x + v.x0,
@@ -71254,7 +71252,7 @@ function cje() {
     };
   }
   function h(p, m, g) {
-    for (var y = m.x, E = m.y, A = Math.sqrt(t[0] * t[0] + t[1] * t[1]), S = a(t), v = c() < 0.5 ? 1 : -1, C = -v, _, b, R; (_ = S(C += v)) && (b = ~~_[0], R = ~~_[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]), S = a(t), v = c() < 0.5 ? 1 : -1, _ = -v, C, b, R; (C = S(_ += v)) && (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 || !xje(m, p, t[0])) && (!g || hje(m, g))) {
         for (var O = m.sprite, L = m.width >> 5, M = t[0] >> 5, q = m.x - (L << 4), W = q & 127, B = 32 - W, G = m.y1 - m.y0, te = (m.y + m.y0) * M + (q >> 5), X, de = 0; de < G; de++) {
           X = 0;
@@ -71305,22 +71303,22 @@ function fje(t, e, n, r) {
         break;
       i.translate((o + (c >> 1)) / s, (u + (x >> 1)) / s), e.rotate && i.rotate(e.rotate * Iw), 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 v = i.getImageData(0, 0, (Xm << 5) / s, yS / s).data, C = []; --r >= 0; )
+    for (var v = i.getImageData(0, 0, (Xm << 5) / s, yS / 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++)
-          C[h] = 0;
+          _[h] = 0;
         if (o = e.xoff, o == null)
           return;
         u = e.yoff;
-        var _ = 0, b = -1;
+        var C = 0, b = -1;
         for (p = 0; p < x; p++) {
           for (h = 0; h < c; h++) {
             var R = f * p + (h >> 5), O = v[(u + p) * (Xm << 5) + (o + h) << 2] ? 1 << 31 - h % 32 : 0;
-            C[R] |= O, _ |= O;
+            _[R] |= O, C |= O;
           }
-          _ ? b = p : (e.y0++, x--, p--, u++);
+          C ? b = p : (e.y0++, x--, p--, u++);
         }
-        e.y1 = e.y0 + b, e.sprite = C.slice(0, (e.y1 - e.y0) * f);
+        e.y1 = e.y0 + b, e.sprite = _.slice(0, (e.y1 - e.y0) * f);
       }
   }
 }
@@ -71640,13 +71638,13 @@ Fe(o8, 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, S, v, C, _;
+    let m, g, y, E, A, S, v, _, 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 (S = {}, E = e.mod, v = 0, C = E.length; v < C; ++v)
+      for (S = {}, E = e.mod, v = 0, _ = E.length; v < _; ++v)
         S[E[v]._index] = 1;
     for (v = 0; v < h; ++v)
-      _ = r[v], (!o[v] || t.modified("fields", v) || e.modified(_.fields)) && (y = _.fname, (m = p[y]) || (s[y] = g = QH(), p[y] = m = g.insert(_, e.source, 0)), o[v] = zH(g, v, i[v]).onAdd(m, a));
-    for (v = 0, C = u.data().length; v < C; ++v)
+      C = r[v], (!o[v] || t.modified("fields", v) || e.modified(C.fields)) && (y = C.fname, (m = p[y]) || (s[y] = g = QH(), p[y] = m = g.insert(C, e.source, 0)), o[v] = zH(g, v, i[v]).onAdd(m, a));
+    for (v = 0, _ = u.data().length; v < _; ++v)
       A[v] || (l[v] !== a[v] ? f.push(v) : S[v] && a[v] !== c && x.push(v));
     return u.mask = (1 << h) - 1, n;
   },
@@ -71811,7 +71809,7 @@ function kje(t) {
       return [];
   }
 }
-var Ta, We, Ae, Xr, Pt, YO = 1, d3 = 2, Lx = 3, jc = 4, KO = 5, Sd = 6, Vi = 7, h3 = 8, Pje = 9;
+var Ta, We, Ae, Xr, kt, YO = 1, d3 = 2, Lx = 3, jc = 4, KO = 5, Sd = 6, Vi = 7, h3 = 8, Pje = 9;
 Ta = {};
 Ta[YO] = "Boolean";
 Ta[d3] = "<end>";
@@ -72184,7 +72182,7 @@ function dUe() {
 }
 function hUe() {
   var t, e, n, r;
-  return Pt = null, Vie(), t = Ae, e = xUe(), n = dUe(), r = fUe(e.value, n.value), {
+  return kt = null, Vie(), t = Ae, e = xUe(), n = dUe(), r = fUe(e.value, n.value), {
     literal: e.literal + n.literal,
     value: r,
     regex: {
@@ -72209,12 +72207,12 @@ function Kie() {
   return p3(t) ? uUe() : t === 40 || t === 41 || t === 59 ? Bw() : t === 39 || t === 34 ? cUe() : t === 46 ? Ja(We.charCodeAt(Ae + 1)) ? GH() : Bw() : Ja(t) ? GH() : Bw();
 }
 function Ji() {
-  const t = Pt;
-  return Ae = t.end, Pt = Kie(), Ae = t.end, t;
+  const t = kt;
+  return Ae = t.end, kt = Kie(), Ae = t.end, t;
 }
 function Xie() {
   const t = Ae;
-  Pt = Kie(), Ae = t;
+  kt = Kie(), Ae = t;
 }
 function gUe(t) {
   const e = new lu(Mje);
@@ -72268,25 +72266,25 @@ function Jr(t) {
   (e.type !== Vi || e.value !== t) && JO(e);
 }
 function en(t) {
-  return Pt.type === Vi && Pt.value === t;
+  return kt.type === Vi && kt.value === t;
 }
 function kw(t) {
-  return Pt.type === jc && Pt.value === t;
+  return kt.type === jc && kt.value === t;
 }
 function SUe() {
   const t = [];
-  for (Ae = Pt.start, Jr("["); !en("]"); )
+  for (Ae = kt.start, Jr("["); !en("]"); )
     en(",") ? (Ji(), t.push(null)) : (t.push(Ix()), en("]") || Jr(","));
   return Ji(), gUe(t);
 }
 function KH() {
-  Ae = Pt.start;
+  Ae = kt.start;
   const t = Ji();
   return t.type === h3 || t.type === Sd ? (t.octal && Ot(t, Wie), Jm(t)) : l8(t.value);
 }
 function vUe() {
   var t, e, n, r;
-  if (Ae = Pt.start, t = Pt, t.type === Lx)
+  if (Ae = kt.start, t = kt, t.type === Lx)
     return n = KH(), Jr(":"), r = Ix(), YH("init", n, r);
   if (t.type === d3 || t.type === Vi)
     JO(t);
@@ -72295,7 +72293,7 @@ function vUe() {
 }
 function _Ue() {
   var t = [], e, n, r, i = {}, s = String;
-  for (Ae = Pt.start, Jr("{"); !en("}"); )
+  for (Ae = kt.start, Jr("{"); !en("}"); )
     e = vUe(), e.key.type === Gie ? n = e.key.name : n = s(e.key.value), r = "$" + n, Object.prototype.hasOwnProperty.call(i, r) ? Ot({}, eUe) : i[r] = !0, t.push(e), en("}") || Jr(",");
   return Jr("}"), EUe(t);
 }
@@ -72315,10 +72313,10 @@ function TUe() {
     return SUe();
   if (en("{"))
     return _Ue();
-  if (t = Pt.type, Ae = Pt.start, t === Lx || bUe[Pt.value])
+  if (t = kt.type, Ae = kt.start, t === Lx || bUe[kt.value])
     n = l8(Ji().value);
   else if (t === h3 || t === Sd)
-    Pt.octal && Ot(Pt, Wie), n = Jm(Ji());
+    kt.octal && Ot(kt, Wie), n = Jm(Ji());
   else {
     if (t === jc)
       throw new Error(ty);
@@ -72334,7 +72332,7 @@ function RUe() {
   return Jr(")"), t;
 }
 function OUe() {
-  Ae = Pt.start;
+  Ae = kt.start;
   const t = Ji();
   return pUe(t) || JO(t), l8(t.value);
 }
@@ -72361,13 +72359,13 @@ function FUe() {
 }
 function XH() {
   const t = FUe();
-  if (Pt.type === Vi && (en("++") || en("--")))
+  if (kt.type === Vi && (en("++") || en("--")))
     throw new Error(ty);
   return t;
 }
 function ES() {
   var t, e;
-  if (Pt.type !== Vi && Pt.type !== jc)
+  if (kt.type !== Vi && kt.type !== jc)
     e = XH();
   else {
     if (en("++") || en("--"))
@@ -72435,12 +72433,12 @@ function JH(t) {
 }
 function wUe() {
   var t, e, n, r, i, s, o, u, a, l;
-  if (t = Pt, a = ES(), r = Pt, i = JH(r), i === 0)
+  if (t = kt, a = ES(), r = kt, i = JH(r), i === 0)
     return a;
-  for (r.prec = i, Ji(), e = [t, Pt], o = ES(), s = [a, r, o]; (i = JH(Pt)) > 0; ) {
+  for (r.prec = i, Ji(), e = [t, kt], o = ES(), s = [a, r, o]; (i = JH(kt)) > 0; ) {
     for (; s.length > 2 && i <= s[s.length - 2].prec; )
       o = s.pop(), u = s.pop().value, a = s.pop(), e.pop(), n = WH(u, a, o), s.push(n);
-    r = Ji(), r.prec = i, s.push(r), e.push(Pt), n = ES(), s.push(n);
+    r = Ji(), r.prec = i, s.push(r), e.push(kt), n = ES(), s.push(n);
   }
   for (l = s.length - 1, n = s[l], e.pop(); l > 1; )
     e.pop(), n = WH(s[l - 1].value, s[l - 2], n), l -= 2;
@@ -72457,9 +72455,9 @@ function c8() {
   return t;
 }
 function Jie(t) {
-  We = t, Ae = 0, Xr = We.length, Pt = null, Xie();
+  We = t, Ae = 0, Xr = We.length, kt = null, Xie();
   const e = c8();
-  if (Pt.type !== d3)
+  if (kt.type !== d3)
     throw new Error("Unexpect token after expression.");
   return e;
 }
@@ -72722,20 +72720,20 @@ function ZUe(t, e) {
   }, e));
 }
 function eqe(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, S = 0, v, C; S < A; ++S)
+  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, S = 0, v, _; S < A; ++S)
     if (l = s[S], x = l.unit, c = l.fields, f = l.values, c && f) {
-      for (v = 0, C = c.length; v < C; ++v)
+      for (v = 0, _ = c.length; v < _; ++v)
         h = c[v], m = o[h.field] || (o[h.field] = {}), g = m[x] || (m[x] = []), a[h.field] = y = h.type.charAt(0), E = Mw[`${y}_union`], m[x] = E(g, ke(f[v]));
-      n && (g = u[x] || (u[x] = []), g.push(ke(f).reduce((_, b, R) => (_[c[R].field] = b, _), {})));
+      n && (g = u[x] || (u[x] = []), g.push(ke(f).reduce((C, b, R) => (C[c[R].field] = b, C), {})));
     } else
       h = wu, p = ry(l), m = o[h] || (o[h] = {}), g = m[x] || (m[x] = []), g.push(p), n && (g = u[x] || (u[x] = []), g.push({
         [wu]: p
       }));
-  if (e = e || ZH, o[wu] ? o[wu] = Mw[`${wu}_${e}`](...Object.values(o[wu])) : Object.keys(o).forEach((_) => {
-    o[_] = Object.keys(o[_]).map((b) => o[_][b]).reduce((b, R) => b === void 0 ? R : Mw[`${a[_]}_${e}`](b, R));
+  if (e = e || ZH, o[wu] ? o[wu] = Mw[`${wu}_${e}`](...Object.values(o[wu])) : Object.keys(o).forEach((C) => {
+    o[C] = Object.keys(o[C]).map((b) => o[C][b]).reduce((b, R) => b === void 0 ? R : Mw[`${a[C]}_${e}`](b, R));
   }), s = Object.keys(u), n && s.length) {
-    const _ = r ? qUe : UUe;
-    o[_] = e === ZH ? {
+    const C = r ? qUe : UUe;
+    o[C] = e === ZH ? {
       [ez]: s.reduce((b, R) => (b.push(...u[R]), b), [])
     } : {
       [HUe]: s.map((b) => ({
@@ -74644,7 +74642,7 @@ function CQe(t, e) {
   let r = t.update;
   t.init && (r ? ve("Signals can not include both init and update expressions.") : (r = t.init, n.initonly = !0)), r && (r = ia(r, e), n.update = r.$expr, n.params = r.$params), t.on && t.on.forEach((i) => SQe(i, e, n.id));
 }
-const jt = (t) => (e, n, r) => rN(t, n, e || void 0, r), Mse = jt("aggregate"), bQe = jt("axisticks"), jse = jt("bound"), cu = jt("collect"), Sz = jt("compare"), TQe = jt("datajoin"), Use = jt("encode"), RQe = jt("expression"), OQe = jt("facet"), NQe = jt("field"), DQe = jt("key"), FQe = jt("legendentries"), wQe = jt("load"), LQe = jt("mark"), IQe = jt("multiextent"), $Qe = jt("multivalues"), BQe = jt("overlap"), kQe = jt("params"), qse = jt("prefacet"), PQe = jt("projection"), MQe = jt("proxy"), jQe = jt("relay"), Hse = jt("render"), UQe = jt("scale"), _d = jt("sieve"), qQe = jt("sortitems"), zse = jt("viewlayout"), HQe = jt("values");
+const Mt = (t) => (e, n, r) => rN(t, n, e || void 0, r), Mse = Mt("aggregate"), bQe = Mt("axisticks"), jse = Mt("bound"), cu = Mt("collect"), Sz = Mt("compare"), TQe = Mt("datajoin"), Use = Mt("encode"), RQe = Mt("expression"), OQe = Mt("facet"), NQe = Mt("field"), DQe = Mt("key"), FQe = Mt("legendentries"), wQe = Mt("load"), LQe = Mt("mark"), IQe = Mt("multiextent"), $Qe = Mt("multivalues"), BQe = Mt("overlap"), kQe = Mt("params"), qse = Mt("prefacet"), PQe = Mt("projection"), MQe = Mt("proxy"), jQe = Mt("relay"), Hse = Mt("render"), UQe = Mt("scale"), _d = Mt("sieve"), qQe = Mt("sortitems"), zse = Mt("viewlayout"), HQe = Mt("values");
 let zQe = 0;
 const Qse = {
   min: "min",
@@ -75014,12 +75012,12 @@ function bGe(t, e, n, r, i) {
       opacity: vt
     }
   };
-  let v = null, C = null;
-  t.fill || (v = e.symbolBaseFillColor, C = e.symbolBaseStrokeColor), wr(g, {
+  let v = null, _ = null;
+  t.fill || (v = e.symbolBaseFillColor, _ = e.symbolBaseStrokeColor), wr(g, {
     fill: s("symbolFillColor", v),
     shape: s("symbolType"),
     size: s("symbolSize"),
-    stroke: s("symbolStrokeColor", C),
+    stroke: s("symbolStrokeColor", _),
     strokeDash: s("symbolDash"),
     strokeDashOffset: s("symbolDashOffset"),
     strokeWidth: s("symbolStrokeWidth")
@@ -75032,7 +75030,7 @@ function bGe(t, e, n, r, i) {
       field: xo
     });
   });
-  const _ = ks({
+  const C = ks({
     type: yGe,
     role: Yze,
     key: xo,
@@ -75115,7 +75113,7 @@ function bGe(t, e, n, r, i) {
     role: b8,
     from: r,
     encode: D2(g, o, y3),
-    marks: [_, R],
+    marks: [C, R],
     name: a,
     interactive: u,
     sort: S
@@ -75426,9 +75424,9 @@ function lN(t, e) {
   a = c = e.add(Use(kse(t.encode, t.type, n, t.style, e, {
     mod: !1,
     pulse: y
-  }))), a.params.parent = e.encode(), t.transform && t.transform.forEach((C) => {
-    const _ = $8(C, e), b = _.metadata;
-    (b.generates || b.changes) && ve("Mark transforms should not generate new data."), b.nomod || (c.params.mod = !0), _.params.pulse = Ke(a), e.add(a = _);
+  }))), a.params.parent = e.encode(), t.transform && t.transform.forEach((_) => {
+    const C = $8(_, e), b = C.metadata;
+    (b.generates || b.changes) && ve("Mark transforms should not generate new data."), b.nomod || (c.params.mod = !0), C.params.pulse = Ke(a), e.add(a = C);
   }), t.sort && (a = e.add(qQe({
     sort: e.compareRef(t.sort),
     pulse: Ke(a)
@@ -75450,8 +75448,8 @@ function lN(t, e) {
   })), v = e.add(_d({
     pulse: Ke(S)
   }, void 0, e.parent()));
-  t.name != null && (f = t.name, e.addData(f, new $x(e, l, S, v)), t.on && t.on.forEach((C) => {
-    (C.insert || C.remove || C.toggle) && ve("Marks only support modify triggers."), noe(C, e, f);
+  t.name != null && (f = t.name, e.addData(f, new $x(e, l, S, v)), t.on && t.on.forEach((_) => {
+    (_.insert || _.remove || _.toggle) && ve("Marks only support modify triggers."), noe(_, e, f);
   }));
 }
 function WGe(t, e, n) {
@@ -75994,7 +75992,7 @@ function SWe(t, e, n, r, i, s) {
     opacity: vt,
     x: pr(u, y, g),
     y: Ho(u, y, g)
-  }, C = {
+  }, _ = {
     enter: v,
     update: m = {
       opacity: ho,
@@ -76012,10 +76010,10 @@ function SWe(t, e, n, r, i, s) {
       y: v.y
     }
   };
-  wr(C, {
+  wr(_, {
     dx: !x && p ? pr(u, S) : null,
     dy: !h && p ? Ho(u, S) : null
-  }), wr(C, {
+  }), wr(_, {
     angle: o("labelAngle"),
     fill: o("labelColor"),
     fillOpacity: o("labelOpacity"),
@@ -76029,16 +76027,16 @@ function SWe(t, e, n, r, i, s) {
     align: x,
     baseline: h
   });
-  const _ = o("labelBound");
+  const C = o("labelBound");
   let b = o("labelOverlap");
-  return b = b || _ ? {
+  return b = b || C ? {
     separation: o("labelSeparation"),
     method: b,
     order: "datum.index",
-    bound: _ ? {
+    bound: C ? {
       scale: a,
       orient: u,
-      tolerance: _
+      tolerance: C
     } : null
   } : void 0, m.align !== E && (m.align = Eh(m.align, E)), m.baseline !== A && (m.baseline = Eh(m.baseline, A)), ks({
     type: Cd,
@@ -76046,7 +76044,7 @@ function SWe(t, e, n, r, i, s) {
     style: m3,
     key: xo,
     from: r,
-    encode: C,
+    encode: _,
     overlap: b
   }, n);
 }
@@ -76692,7 +76690,7 @@ function IWe(t, e) {
   let c = 0, f = 0, x = -90, h = "right", p = "middle", m = 0, g = 0;
   const y = l !== "spark", E = l !== "spark", A = e.fields[Vf(t)];
   let S = l !== "spark" ? kA - 1 : 0, v;
-  const C = Vf(r), _ = e.fields[C].max, b = Dt("linear")().domain([0, _]).nice().range([o, 0]), R = b.domain();
+  const _ = Vf(r), C = e.fields[_].max, b = Dt("linear")().domain([0, C]).nice().range([o, 0]), R = b.domain();
   if (E) {
     const q = b.domain().at(1), B = DZ().format(",")(q);
     f = s1(B, "Inter, sans-serif 12px") + 5 + 31;
@@ -77003,69 +77001,69 @@ var xoe = { 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 S(v, C) {
+      function S(v, _) {
         if (v === null)
           return null;
-        if (C === 0)
+        if (_ === 0)
           return v;
-        var _, b;
+        var C, b;
         if (typeof v != "object")
           return v;
         if (n(v, r))
-          _ = new r();
+          C = new r();
         else if (n(v, i))
-          _ = new i();
+          C = new i();
         else if (n(v, s))
-          _ = new s(function(te, X) {
+          C = new s(function(te, X) {
             v.then(function(de) {
-              te(S(de, C - 1));
+              te(S(de, _ - 1));
             }, function(de) {
-              X(S(de, C - 1));
+              X(S(de, _ - 1));
             });
           });
         else if (o.__isArray(v))
-          _ = [];
+          C = [];
         else if (o.__isRegExp(v))
-          _ = new RegExp(v.source, f(v)), v.lastIndex && (_.lastIndex = v.lastIndex);
+          C = new RegExp(v.source, f(v)), v.lastIndex && (C.lastIndex = v.lastIndex);
         else if (o.__isDate(v))
-          _ = new Date(v.getTime());
+          C = new Date(v.getTime());
         else {
           if (A && Buffer.isBuffer(v))
-            return Buffer.allocUnsafe ? _ = Buffer.allocUnsafe(v.length) : _ = new Buffer(v.length), v.copy(_), _;
-          n(v, Error) ? _ = Object.create(v) : typeof m > "u" ? (b = Object.getPrototypeOf(v), _ = Object.create(b)) : (_ = Object.create(m), b = m);
+            return Buffer.allocUnsafe ? C = Buffer.allocUnsafe(v.length) : C = new Buffer(v.length), v.copy(C), C;
+          n(v, Error) ? C = Object.create(v) : typeof m > "u" ? (b = Object.getPrototypeOf(v), C = Object.create(b)) : (C = Object.create(m), b = m);
         }
         if (h) {
           var R = y.indexOf(v);
           if (R != -1)
             return E[R];
-          y.push(v), E.push(_);
+          y.push(v), E.push(C);
         }
         n(v, r) && v.forEach(function(te, X) {
-          var de = S(X, C - 1), be = S(te, C - 1);
-          _.set(de, be);
+          var de = S(X, _ - 1), be = S(te, _ - 1);
+          C.set(de, be);
         }), n(v, i) && v.forEach(function(te) {
-          var X = S(te, C - 1);
-          _.add(X);
+          var X = S(te, _ - 1);
+          C.add(X);
         });
         for (var O in v) {
           var L;
-          b && (L = Object.getOwnPropertyDescriptor(b, O)), !(L && L.set == null) && (_[O] = S(v[O], C - 1));
+          b && (L = Object.getOwnPropertyDescriptor(b, O)), !(L && L.set == null) && (C[O] = S(v[O], _ - 1));
         }
         if (Object.getOwnPropertySymbols)
           for (var M = Object.getOwnPropertySymbols(v), O = 0; O < M.length; O++) {
             var q = M[O], W = Object.getOwnPropertyDescriptor(v, q);
-            W && !W.enumerable && !g || (_[q] = S(v[q], C - 1), W.enumerable || Object.defineProperty(_, q, {
+            W && !W.enumerable && !g || (C[q] = S(v[q], _ - 1), W.enumerable || Object.defineProperty(C, q, {
               enumerable: !1
             }));
           }
         if (g)
           for (var B = Object.getOwnPropertyNames(v), O = 0; O < B.length; O++) {
             var G = B[O], W = Object.getOwnPropertyDescriptor(v, G);
-            W && W.enumerable || (_[G] = S(v[G], C - 1), Object.defineProperty(_, G, {
+            W && W.enumerable || (C[G] = S(v[G], _ - 1), Object.defineProperty(C, G, {
               enumerable: !1
             }));
           }
-        return _;
+        return C;
       }
       return S(x, p);
     }
@@ -80295,7 +80293,7 @@ function Uue(t, { config: e }) {
     l,
     // TODO: https://github.com/vega/vega-lite/issues/6245
     e
-  ), x = jue(c), { bins: h, timeUnits: p, transform: m, continuousAxisChannelDef: g, continuousAxis: y, groupby: E, aggregate: A, encodingWithoutContinuousAxis: S, ticksOrient: v, boxOrient: C, customTooltipWithoutAggregatedField: _ } = xXe(t, c, e), { color: b, size: R } = S, O = RS(S, ["color", "size"]), L = (J) => D7(l, y, g, J, e.boxplot), M = L(O), q = L(S), W = L(Object.assign(Object.assign({}, O), R ? { size: R } : {})), B = M5([
+  ), x = jue(c), { bins: h, timeUnits: p, transform: m, continuousAxisChannelDef: g, continuousAxis: y, groupby: E, aggregate: A, encodingWithoutContinuousAxis: S, ticksOrient: v, boxOrient: _, customTooltipWithoutAggregatedField: C } = xXe(t, c, e), { color: b, size: R } = S, O = RS(S, ["color", "size"]), L = (J) => D7(l, y, g, J, e.boxplot), M = L(O), q = L(S), W = L(Object.assign(Object.assign({}, O), R ? { size: R } : {})), B = M5([
     { fieldPrefix: x === "min-max" ? "upper_whisker_" : "max_", titlePrefix: "Max" },
     { fieldPrefix: "upper_box_", titlePrefix: "Q3" },
     { fieldPrefix: "mid_box_", titlePrefix: "Median" },
@@ -80338,7 +80336,7 @@ function Uue(t, { config: e }) {
     ...x !== "tukey" ? X : [],
     ...q({
       partName: "box",
-      mark: Object.assign(Object.assign({ type: "bar" }, f ? { size: f } : {}), { orient: C, 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: B
@@ -80392,7 +80390,7 @@ function Uue(t, { config: e }) {
   }, V = RS(O, ["tooltip"]), { scale: D, axis: $ } = g, j = N7(g), Q = po($, ["title"]), I = kue(l, "outliers", e.boxplot, {
     transform: [{ filter: `(${k} < ${T}) || (${k} > ${w})` }],
     mark: "point",
-    encoding: Object.assign(Object.assign(Object.assign({ [y]: Object.assign(Object.assign(Object.assign({ field: g.field, type: g.type }, j !== void 0 ? { title: j } : {}), D !== void 0 ? { scale: D } : {}), Ht(Q) ? {} : { axis: Q }) }, V), b ? { color: b } : {}), _ ? { tooltip: _ } : {})
+    encoding: Object.assign(Object.assign(Object.assign({ [y]: Object.assign(Object.assign(Object.assign({ field: g.field, type: g.type }, j !== void 0 ? { title: j } : {}), D !== void 0 ? { scale: D } : {}), Ht(Q) ? {} : { axis: Q }) }, V), b ? { color: b } : {}), C ? { tooltip: C } : {})
   })[0];
   let H;
   const P = [...h, ...p, z];
@@ -80456,7 +80454,7 @@ function xXe(t, e, n) {
     }
   ], c = t.encoding, f = s;
   c[f];
-  const x = RS(c, [typeof f == "symbol" ? f : f + ""]), { customTooltipWithoutAggregatedField: h, filteredEncoding: p } = lXe(x), { bins: m, timeUnits: g, aggregate: y, groupby: E, encoding: A } = Iue(p, n), S = r === "vertical" ? "horizontal" : "vertical", v = r, C = [
+  const x = RS(c, [typeof f == "symbol" ? f : f + ""]), { customTooltipWithoutAggregatedField: h, filteredEncoding: p } = lXe(x), { bins: m, timeUnits: g, aggregate: y, groupby: E, encoding: A } = Iue(p, n), S = r === "vertical" ? "horizontal" : "vertical", v = r, _ = [
     ...m,
     ...g,
     {
@@ -80468,7 +80466,7 @@ function xXe(t, e, n) {
   return {
     bins: m,
     timeUnits: g,
-    transform: C,
+    transform: _,
     groupby: E,
     aggregate: y,
     continuousAxisChannelDef: i,
@@ -80573,15 +80571,15 @@ function zue(t, e, n) {
   var r;
   const { mark: i, encoding: s, params: o, projection: u } = t, a = iQ(t, ["mark", "encoding", "params", "projection"]), l = sa(i) ? i : { type: i };
   o && Te(Moe(e));
-  const { orient: c, inputType: f } = pXe(t, e), { continuousAxisChannelDef: x, continuousAxisChannelDef2: h, continuousAxisChannelDefError: p, continuousAxisChannelDefError2: m, continuousAxis: g } = Pue(t, c, e), { errorBarSpecificAggregate: y, postAggregateCalculates: E, tooltipSummary: A, tooltipTitleWithFieldName: S } = EXe(l, x, h, p, m, f, e, n), v = s, C = g;
-  v[C];
-  const _ = g === "x" ? "x2" : "y2";
+  const { orient: c, inputType: f } = pXe(t, e), { continuousAxisChannelDef: x, continuousAxisChannelDef2: h, continuousAxisChannelDefError: p, continuousAxisChannelDefError2: m, continuousAxis: g } = Pue(t, c, e), { errorBarSpecificAggregate: y, postAggregateCalculates: E, tooltipSummary: A, tooltipTitleWithFieldName: S } = EXe(l, x, h, p, m, f, e, n), v = s, _ = g;
   v[_];
+  const C = g === "x" ? "x2" : "y2";
+  v[C];
   const b = g === "x" ? "xError" : "yError";
   v[b];
   const R = g === "x" ? "xError2" : "yError2";
   v[R];
-  const O = iQ(v, [typeof C == "symbol" ? C : C + "", typeof _ == "symbol" ? _ : _ + "", typeof b == "symbol" ? b : b + "", typeof R == "symbol" ? R : R + ""]), { bins: L, timeUnits: M, aggregate: q, groupby: W, encoding: B } = Iue(O, n), G = [...q, ...y], te = f !== "raw" ? [] : W, X = M5(A, x, B, S);
+  const O = iQ(v, [typeof _ == "symbol" ? _ : _ + "", typeof C == "symbol" ? C : C + "", typeof b == "symbol" ? b : b + "", typeof R == "symbol" ? R : R + ""]), { bins: L, timeUnits: M, aggregate: q, groupby: W, encoding: B } = Iue(O, n), G = [...q, ...y], te = f !== "raw" ? [] : W, X = M5(A, x, B, S);
   return {
     transform: [
       ...(r = a.transform) !== null && r !== void 0 ? r : [],
@@ -82160,7 +82158,7 @@ function GJe(t, e, n, r) {
 function U7(t) {
   return t.map((e) => (e.on && !e.on.length && delete e.on, e));
 }
-class Ut {
+class jt {
   constructor(e, n) {
     this.debugName = n, this._children = [], this._parent = null, e && (this.parent = e);
   }
@@ -82218,7 +82216,7 @@ class Ut {
     this._children = [], e.removeChild(this), e.parent.removeChild(e), this.parent = n, e.parent = this;
   }
 }
-class Ni extends Ut {
+class Ni extends jt {
   /**
    * @param source The name of the source. Will change in assemble.
    * @param type The type of the output node.
@@ -82268,7 +82266,7 @@ var EQ = function(t, e) {
       e.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[i]) && (n[r[i]] = t[r[i]]);
   return n;
 };
-class Wu extends Ut {
+class Wu extends jt {
   constructor(e, n) {
     super(e), this.formula = n;
   }
@@ -83030,7 +83028,7 @@ function cZe(t, e, n) {
   m = m || {
     [c]: lZe(c, h || a, l, s, g)
   };
-  const y = (l == null ? void 0 : l.get("type")) !== "band" || !("band" in m[c]) ? "middle" : "top", E = Aae(e, r, s, y), A = E === "xc" || E === "yc", { offset: S, offsetType: v } = dy({ channel: e, markDef: r, encoding: i, model: n, bandPosition: A ? 0.5 : 0 }), C = g7({
+  const y = (l == null ? void 0 : l.get("type")) !== "band" || !("band" in m[c]) ? "middle" : "top", E = Aae(e, r, s, y), A = E === "xc" || E === "yc", { offset: S, offsetType: v } = dy({ channel: e, markDef: r, encoding: i, model: n, bandPosition: A ? 0.5 : 0 }), _ = g7({
     channel: e,
     channelDef: t,
     markDef: r,
@@ -83043,13 +83041,13 @@ function cZe(t, e, n) {
     bandPosition: A ? v === "encoding" ? 0 : 0.5 : Ye(g) ? { signal: `(1-${g})/2` } : B2(g) ? (1 - g.band) / 2 : 0
   });
   if (c)
-    return Object.assign({ [E]: C }, m);
+    return Object.assign({ [E]: _ }, m);
   {
-    const _ = cc(f), b = m[c], R = S ? Object.assign(Object.assign({}, b), { offset: S }) : b;
+    const C = cc(f), b = m[c], R = S ? Object.assign(Object.assign({}, b), { offset: S }) : b;
     return {
-      [E]: C,
+      [E]: _,
       // posRef might be an array that wraps position invalid test
-      [_]: _e(C) ? [C[0], Object.assign(Object.assign({}, C[1]), { offset: R })] : Object.assign(Object.assign({}, C), { offset: R })
+      [C]: _e(_) ? [_[0], Object.assign(Object.assign({}, _[1]), { offset: R })] : Object.assign(Object.assign({}, _), { offset: R })
     };
   }
 }
@@ -83067,32 +83065,32 @@ function Cm(t, e, n, r, i) {
 }
 function fZe({ 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 = Sue({ 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 = Lr(n) && (o = Bt("binSpacing", a, u)) !== null && o !== void 0 ? o : 0, E = t0(n), A = cc(n), S = cc(E), { offset: v } = dy({ channel: n, markDef: a, encoding: l, model: r, bandPosition: 0 }), C = Ye(p) ? { signal: `(1-${p.signal})/2` } : B2(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 = Sue({ 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 = Lr(n) && (o = Bt("binSpacing", a, u)) !== null && o !== void 0 ? o : 0, E = t0(n), A = cc(n), S = cc(E), { offset: v } = dy({ channel: n, markDef: a, encoding: l, model: r, bandPosition: 0 }), _ = Ye(p) ? { signal: `(1-${p.signal})/2` } : B2(p) ? (1 - p.band) / 2 : 0.5;
   if (Xt(t.bin) || t.timeUnit)
     return {
       [S]: SQ({
         fieldDef: t,
         scaleName: f,
-        bandPosition: C,
+        bandPosition: _,
         offset: Cm(E, y, h, g, v)
       }),
       [A]: SQ({
         fieldDef: t,
         scaleName: f,
-        bandPosition: Ye(C) ? { signal: `1-${C.signal}` } : 1 - C,
+        bandPosition: Ye(_) ? { signal: `1-${_.signal}` } : 1 - _,
         offset: Cm(n, y, h, g, v)
       })
     };
   if (Ei(t.bin)) {
-    const _ = nx(t, f, {}, { offset: Cm(E, y, h, g, v) });
+    const C = nx(t, f, {}, { offset: Cm(E, y, h, g, v) });
     if (Ie(e))
       return {
-        [S]: _,
+        [S]: C,
         [A]: nx(e, f, {}, { offset: Cm(n, y, h, g, v) })
       };
     if (Rd(t.bin) && t.bin.step)
       return {
-        [S]: _,
+        [S]: C,
         [A]: {
           signal: `scale("${f}", ${$e(t, { expr: "datum" })} + ${t.bin.step})`,
           offset: Cm(n, y, h, g, v)
@@ -83356,10 +83354,10 @@ const Tae = "_translate_anchor", Rae = "_translate_delta", yZe = {
 };
 function CQ(t, e, n, r, i) {
   var s, o;
-  const u = e.name, a = u + Tae, l = u + Rae, c = n.channel, f = xc.defined(e), x = i.filter((_) => _.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})`}`, S = f ? m === "log" ? "panLog" : m === "symlog" ? "panSymlog" : m === "pow" ? "panPow" : "panLinear" : "panLinear", v = 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}` : "" : "", C = `${S}(${E}, ${A}${v})`;
+  const u = e.name, a = u + Tae, l = u + Rae, c = n.channel, f = xc.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})`}`, S = f ? m === "log" ? "panLog" : m === "symlog" ? "panSymlog" : m === "pow" ? "panPow" : "panLinear" : "panLinear", v = 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}(${E}, ${A}${v})`;
   x.on.push({
     events: { signal: l },
-    update: f ? C : `clampRange(${C}, 0, ${h})`
+    update: f ? _ : `clampRange(${_}, 0, ${h})`
   });
 }
 const Oae = "_zoom_anchor", Nae = "_zoom_delta", EZe = {
@@ -83445,7 +83443,7 @@ function Lae(t) {
     r.type === "MemberExpression" && wae(r) && n.add(W5(r).slice(1).join("."));
   }), n;
 }
-class P2 extends Ut {
+class P2 extends jt {
   constructor(e, n, r) {
     super(e), this.model = n, this.filter = r, this.expr = k_(this.model, this.filter, this), this._dependentFields = Lae(this.expr);
   }
@@ -83558,19 +83556,19 @@ function Zm(t, e, n, r = { header: !1 }) {
       else if (O3(g)) {
         const { condition: y } = g, E = qA(g, ["condition"]), A = ke(y), S = nQ[p];
         if (S) {
-          const { vgProp: v, part: C } = S, _ = [
+          const { vgProp: v, part: _ } = S, C = [
             ...A.map((b) => {
               const { test: R } = b, O = qA(b, ["test"]);
               return Object.assign({ test: k_(null, R) }, O);
             }),
             E
           ];
-          Jw(h, C, v, _), delete h[p];
+          Jw(h, _, v, C), delete h[p];
         } else if (S === null) {
           const v = {
-            signal: A.map((C) => {
-              const { test: _ } = C, b = qA(C, ["test"]);
-              return `${k_(null, _)} ? ${Uz(b)} : `;
+            signal: A.map((_) => {
+              const { test: C } = _, b = qA(_, ["test"]);
+              return `${k_(null, C)} ? ${Uz(b)} : `;
             }).join("") + Uz(E)
           };
           h[p] = v;
@@ -83876,7 +83874,7 @@ function $Ze(t, e) {
 function BZe(t, e) {
   return t === "rect" && N_(e) ? 1 : 0;
 }
-class Fp extends Ut {
+class Fp extends jt {
   constructor(e, n) {
     super(e), this.transform = n, this._dependentFields = Lae(this.transform.calculate);
   }
@@ -84157,12 +84155,12 @@ function GZe(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({}, FVe({}, n, CKe)), Eae(n, { filled: E }));
-  const S = (o = i.get("symbolOpacity")) !== null && o !== void 0 ? o : g.legend.symbolOpacity, v = (u = i.get("symbolFillColor")) !== null && u !== void 0 ? u : g.legend.symbolFillColor, C = (a = i.get("symbolStrokeColor")) !== null && a !== void 0 ? a : g.legend.symbolStrokeColor, _ = S === void 0 ? (l = Vae(m.opacity)) !== null && l !== void 0 ? l : p.opacity : void 0;
+  const S = (o = i.get("symbolOpacity")) !== null && o !== void 0 ? o : g.legend.symbolOpacity, v = (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 = S === void 0 ? (l = Vae(m.opacity)) !== null && l !== void 0 ? l : p.opacity : void 0;
   if (A.fill) {
     if (r === "fill" || E && r === us)
       delete A.fill;
     else if (A.fill.field)
-      v ? delete A.fill : (A.fill = tn((c = g.legend.symbolBaseFillColor) !== null && c !== void 0 ? c : "black"), A.fillOpacity = tn(_ ?? 1));
+      v ? delete A.fill : (A.fill = tn((c = g.legend.symbolBaseFillColor) !== null && c !== void 0 ? c : "black"), A.fillOpacity = tn(C ?? 1));
     else if (_e(A.fill)) {
       const b = (h = (x = X5((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 = tn(b));
@@ -84171,7 +84169,7 @@ function GZe(t, { fieldOrDatumDef: e, model: n, channel: r, legendCmpt: i, legen
   if (A.stroke) {
     if (r === "stroke" || !E && r === us)
       delete A.stroke;
-    else if (A.stroke.field || C)
+    else if (A.stroke.field || _)
       delete A.stroke;
     else if (_e(A.stroke)) {
       const b = er(X5(m.stroke || m.color), p.stroke, E ? p.color : void 0);
@@ -84181,9 +84179,9 @@ function GZe(t, { fieldOrDatumDef: e, model: n, channel: r, legendCmpt: i, legen
   if (r !== e0) {
     const b = Ie(e) && Kae(n, i, e);
     b ? A.opacity = [
-      Object.assign({ test: b }, tn(_ ?? 1)),
+      Object.assign({ test: b }, tn(C ?? 1)),
       tn(g.legend.unselectedOpacity)
-    ] : _ && (A.opacity = tn(_));
+    ] : C && (A.opacity = tn(C));
   }
   return A = Object.assign(Object.assign({}, A), t), Ht(A) ? void 0 : A;
 }
@@ -84397,19 +84395,19 @@ function uet(t, e) {
     legendType: g,
     direction: y
   };
-  for (const _ of Wae) {
-    if (g === "gradient" && _.startsWith("symbol") || g === "symbol" && _.startsWith("gradient"))
+  for (const C of Wae) {
+    if (g === "gradient" && C.startsWith("symbol") || g === "symbol" && C.startsWith("gradient"))
       continue;
-    const b = _ in DQ ? DQ[_](E) : s[_];
+    const b = C in DQ ? DQ[C](E) : s[C];
     if (b !== void 0) {
-      const R = oet(b, _, s, t.fieldDef(e));
-      (R || a.legend[_] === void 0) && c.set(_, b, R);
+      const R = oet(b, C, s, t.fieldDef(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 : {}, S = c.get("selections"), v = {}, C = { fieldOrDatumDef: h, model: t, channel: e, legendCmpt: c, legendType: g };
-  for (const _ of ["labels", "legend", "title", "symbols", "gradient", "entries"]) {
-    const b = Qae((i = A[_]) !== null && i !== void 0 ? i : {}, t), R = _ in NQ ? NQ[_](b, C) : b;
-    R !== void 0 && !Ht(R) && (v[_] = Object.assign(Object.assign(Object.assign({}, S != null && S.length && Ie(h) ? { name: `${pn(h.field)}_legend_${_}` } : {}), S != null && S.length ? { interactive: !!S } : {}), { update: R }));
+  const A = (r = s == null ? void 0 : s.encoding) !== null && r !== void 0 ? r : {}, S = c.get("selections"), v = {}, _ = { fieldOrDatumDef: h, model: t, channel: e, legendCmpt: c, legendType: g };
+  for (const C of ["labels", "legend", "title", "symbols", "gradient", "entries"]) {
+    const b = Qae((i = A[C]) !== null && i !== void 0 ? i : {}, t), R = C in NQ ? NQ[C](b, _) : b;
+    R !== void 0 && !Ht(R) && (v[C] = Object.assign(Object.assign(Object.assign({}, S != null && S.length && Ie(h) ? { name: `${pn(h.field)}_legend_${C}` } : {}), S != null && S.length ? { interactive: !!S } : {}), { update: R }));
   }
   return Ht(v) || c.set("encode", v, !!(s != null && s.encoding)), c;
 }
@@ -84680,7 +84678,7 @@ function wQ(t, e, n) {
   const l = Object.assign(Object.assign(Object.assign({ bin: s, field: t.field, as: [r] }, u ? { signal: u } : {}), a ? { extentSignal: a } : {}), i ? { span: i } : {});
   return { key: o, binComponent: l };
 }
-class Vu extends Ut {
+class Vu extends jt {
   constructor(e, n) {
     super(e), this.bins = n;
   }
@@ -84770,7 +84768,7 @@ function Ret(t, e) {
       r in t ? t[r][s] = /* @__PURE__ */ new Set([...(n = t[r][s]) !== null && n !== void 0 ? n : [], ...i[s]]) : t[r] = { [s]: i[s] };
   }
 }
-class zo extends Ut {
+class zo extends jt {
   /**
    * @param dimensions string set for dimensions
    * @param measures dictionary mapping field name => dict of aggregation functions and names to use
@@ -84855,7 +84853,7 @@ class zo extends Ut {
     };
   }
 }
-class M2 extends Ut {
+class M2 extends jt {
   /**
    * @param model The facet model.
    * @param name The name that this facet source will have.
@@ -85061,7 +85059,7 @@ function Fet(t) {
     }
   return e;
 }
-class Wr extends Ut {
+class Wr extends jt {
   constructor(e, n) {
     super(e), this._parse = n;
   }
@@ -85137,7 +85135,7 @@ class Wr extends Ut {
     }).filter((n) => n !== null);
   }
 }
-class pc extends Ut {
+class pc extends jt {
   clone() {
     return new pc(null);
   }
@@ -85157,7 +85155,7 @@ class pc extends Ut {
     return { type: "identifier", as: fy };
   }
 }
-class D3 extends Ut {
+class D3 extends jt {
   constructor(e, n) {
     super(e), this.params = n;
   }
@@ -85176,7 +85174,7 @@ class D3 extends Ut {
     return Object.assign({ type: "graticule" }, this.params === !0 ? {} : this.params);
   }
 }
-class F3 extends Ut {
+class F3 extends jt {
   constructor(e, n) {
     super(e), this.params = n;
   }
@@ -85197,7 +85195,7 @@ class F3 extends Ut {
     return Object.assign({ type: "sequence" }, this.params);
   }
 }
-class qx extends Ut {
+class qx extends jt {
   constructor(e) {
     super(null), e ?? (e = { name: "source" });
     let n;
@@ -85466,7 +85464,7 @@ class Het extends Dd {
     }
   }
 }
-class Fd extends Ut {
+class Fd extends jt {
   constructor(e, n) {
     super(e), this.transform = n;
   }
@@ -85512,7 +85510,7 @@ function zet(t) {
 function Qet(t) {
   return _e(t) && t.every((e) => je(e)) && t.length > 1;
 }
-class vl extends Ut {
+class vl extends jt {
   constructor(e, n) {
     super(e), this._stack = n;
   }
@@ -85618,7 +85616,7 @@ class vl extends Ut {
     }), e;
   }
 }
-class j2 extends Ut {
+class j2 extends jt {
   constructor(e, n) {
     super(e), this.transform = n;
   }
@@ -86880,7 +86878,7 @@ var Ntt = function(t, e) {
       e.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[i]) && (n[r[i]] = t[r[i]]);
   return n;
 };
-class qN extends Ut {
+class qN extends jt {
   constructor(e, n) {
     var r, i, s;
     super(e), this.transform = n, this.transform = lt(n);
@@ -86905,7 +86903,7 @@ class qN extends Ut {
     return Object.assign({ type: "kde", field: n }, r);
   }
 }
-class hy extends Ut {
+class hy extends jt {
   constructor(e, n) {
     super(e), this.filter = n;
   }
@@ -86949,7 +86947,7 @@ class hy extends Ut {
     } : null;
   }
 }
-class HN extends Ut {
+class HN extends jt {
   constructor(e, n) {
     super(e), this.transform = n, this.transform = lt(n);
     const { flatten: r, as: i = [] } = this.transform;
@@ -86979,7 +86977,7 @@ class HN extends Ut {
     };
   }
 }
-class zN extends Ut {
+class zN extends jt {
   constructor(e, n) {
     var r, i, s;
     super(e), this.transform = n, this.transform = lt(n);
@@ -87007,7 +87005,7 @@ class zN extends Ut {
     };
   }
 }
-class Ch extends Ut {
+class Ch extends jt {
   constructor(e, n, r, i) {
     super(e), this.fields = n, this.geojson = r, this.signal = i;
   }
@@ -87057,7 +87055,7 @@ class Ch extends Ut {
     ];
   }
 }
-class py extends Ut {
+class py extends jt {
   constructor(e, n, r, i) {
     super(e), this.projection = n, this.fields = r, this.as = i;
   }
@@ -87100,7 +87098,7 @@ class py extends Ut {
     };
   }
 }
-class ix extends Ut {
+class ix extends jt {
   constructor(e, n) {
     super(e), this.transform = n;
   }
@@ -87157,7 +87155,7 @@ var Dtt = function(t, e) {
       e.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[i]) && (n[r[i]] = t[r[i]]);
   return n;
 };
-class QN extends Ut {
+class QN extends jt {
   constructor(e, n) {
     var r, i, s;
     super(e), this.transform = n, this.transform = lt(n);
@@ -87182,7 +87180,7 @@ class QN extends Ut {
     return Object.assign({ type: "loess", x: r, y: n }, i);
   }
 }
-class gy extends Ut {
+class gy extends jt {
   constructor(e, n, r) {
     super(e), this.transform = n, this.secondary = r;
   }
@@ -87242,7 +87240,7 @@ var Ftt = function(t, e) {
       e.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[i]) && (n[r[i]] = t[r[i]]);
   return n;
 };
-class GN extends Ut {
+class GN extends jt {
   constructor(e, n) {
     var r, i, s;
     super(e), this.transform = n, this.transform = lt(n);
@@ -87276,7 +87274,7 @@ var wtt = function(t, e) {
       e.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[i]) && (n[r[i]] = t[r[i]]);
   return n;
 };
-class WN extends Ut {
+class WN extends jt {
   constructor(e, n) {
     var r, i, s;
     super(e), this.transform = n, this.transform = lt(n);
@@ -87301,7 +87299,7 @@ class WN extends Ut {
     return Object.assign({ type: "regression", x: r, y: n }, i);
   }
 }
-class VN extends Ut {
+class VN extends jt {
   constructor(e, n) {
     super(e), this.transform = n;
   }
@@ -87326,7 +87324,7 @@ class VN extends Ut {
     return Object.assign(Object.assign(Object.assign({ type: "pivot", field: e, value: n }, i !== void 0 ? { limit: i } : {}), s !== void 0 ? { op: s } : {}), r !== void 0 ? { groupby: r } : {});
   }
 }
-class YN extends Ut {
+class YN extends jt {
   constructor(e, n) {
     super(e), this.transform = n;
   }
@@ -87869,18 +87867,18 @@ function KN(t) {
     R && (f = R, Q7(t) && (f = new pc(f))), f = (u = ix.makeFromEncoding(f, t)) !== null && u !== void 0 ? u : f, f = (a = vl.makeFromEncoding(f, t)) !== null && a !== void 0 ? a : f;
   }
   Hn(t) && (f = (l = hy.make(f, t)) !== null && l !== void 0 ? l : f);
-  const C = t.getDataName(Vt.Main), _ = new Ni(f, C, Vt.Main, h);
-  x[C] = _, f = _, Hn(t) && _Ze(t, _);
+  const _ = t.getDataName(Vt.Main), C = new Ni(f, _, Vt.Main, h);
+  x[_] = C, f = C, Hn(t) && _Ze(t, C);
   let b = null;
   if (Qo(t)) {
     const R = t.getName("facet");
-    f = (c = qtt(f, t.facet)) !== null && c !== void 0 ? c : f, b = new M2(f, t, R, _.getSource()), x[R] = b;
+    f = (c = qtt(f, t.facet)) !== null && c !== void 0 ? c : f, b = new M2(f, t, R, C.getSource()), x[R] = b;
   }
   return Object.assign(Object.assign({}, t.component.data), {
     outputNodes: x,
     outputNodeRefCounts: h,
     raw: v,
-    main: _,
+    main: C,
     facetRoot: b,
     ancestorParse: g
   });
@@ -88118,13 +88116,13 @@ function nnt(t, e) {
     if (S && v)
       o.set(E, A, v);
     else {
-      const { configValue: C = void 0, configFrom: _ = void 0 } = rQ(E) && E !== "values" ? V5(E, l.style, s.style, x) : {}, b = C !== void 0;
+      const { configValue: _ = void 0, configFrom: C = void 0 } = rQ(E) && E !== "values" ? V5(E, l.style, s.style, x) : {}, b = _ !== void 0;
       S && !b ? o.set(E, A, v) : (
         // Cases need implicit values
         // 1. Axis config that aren't available in Vega
-        (_ !== "vgAxisConfig" || // 2. Certain properties are always included (see `propsToAlwaysIncludeConfig`'s declaration for more details)
+        (C !== "vgAxisConfig" || // 2. Certain properties are always included (see `propsToAlwaysIncludeConfig`'s declaration for more details)
         tnt.has(E) && b || // 3. Conditional axis values and signals
-        O3(C) || Ye(C)) && o.set(E, C, !1)
+        O3(_) || Ye(_)) && o.set(E, _, !1)
       );
     }
   }
@@ -88132,8 +88130,8 @@ function nnt(t, e) {
     var S;
     if (!o.hasAxisPart(A))
       return E;
-    const v = Qae((S = g[A]) !== null && S !== void 0 ? S : {}, e), C = A === "labels" ? Vtt(e, t, v) : v;
-    return C !== void 0 && !Ht(C) && (E[A] = { update: C }), E;
+    const v = Qae((S = g[A]) !== null && S !== void 0 ? S : {}, e), _ = A === "labels" ? Vtt(e, t, v) : v;
+    return _ !== void 0 && !Ht(_) && (E[A] = { update: _ }), E;
   }, {});
   return Ht(y) || o.set("encode", y, !!s.encoding || s.labelAngle !== void 0), o;
 }
@@ -89015,7 +89013,7 @@ var OS = /* @__PURE__ */ ((t) => (t.Dollars = "usd", t.Euros = "euro", t.Pounds
       A[S] = S - 34;
     var v = [];
     v[5] = v[63] = '"$"#,##0_);\\("$"#,##0\\)', v[6] = v[64] = '"$"#,##0_);[Red]\\("$"#,##0\\)', v[7] = v[65] = '"$"#,##0.00_);\\("$"#,##0.00\\)', v[8] = v[66] = '"$"#,##0.00_);[Red]\\("$"#,##0.00\\)', v[41] = '_(* #,##0_);_(* \\(#,##0\\);_(* "-"_);_(@_)', v[42] = '_("$"* #,##0_);_("$"* \\(#,##0\\);_("$"* "-"_);_(@_)', v[43] = '_(* #,##0.00_);_(* \\(#,##0.00\\);_(* "-"??_);_(@_)', v[44] = '_("$"* #,##0.00_);_("$"* \\(#,##0.00\\);_("$"* "-"??_);_(@_)';
-    function C(D, $, j) {
+    function _(D, $, j) {
       for (var Q = D < 0 ? -1 : 1, I = D * Q, H = 0, P = 1, J = 0, ce = 1, ue = 0, Z = 0, ae = Math.floor(I); ue < $ && (ae = Math.floor(I), J = ae * P + H, Z = ae * ue + ce, !(I - ae < 5e-8)); )
         I = 1 / (I - ae), H = P, P = J, ce = ue, ue = Z;
       if (Z > $ && (ue > $ ? (Z = ce, J = H) : (Z = ue, J = P)), !j)
@@ -89023,7 +89021,7 @@ var OS = /* @__PURE__ */ ((t) => (t.Dollars = "usd", t.Euros = "euro", t.Pounds
       var qe = Math.floor(Q * J / Z);
       return [qe, Q * J - qe * Z, Z];
     }
-    function _(D, $, j) {
+    function C(D, $, j) {
       if (D > 2958465 || D < 0)
         return null;
       var Q = D | 0, I = Math.floor(86400 * (D - Q)), H = 0, P = [], J = { D: Q, T: I, u: 86400 * (D - Q) - I, y: 0, m: 0, d: 0, H: 0, M: 0, S: 0, q: 0 };
@@ -89038,7 +89036,7 @@ var OS = /* @__PURE__ */ ((t) => (t.Dollars = "usd", t.Euros = "euro", t.Pounds
       }
       return J.y = P[0], J.m = P[1], J.d = P[2], J.S = I % 60, I = Math.floor(I / 60), J.M = I % 60, I = Math.floor(I / 60), J.H = I, J.q = H, J;
     }
-    i.parse_date_code = _;
+    i.parse_date_code = C;
     var b = new Date(1899, 11, 31, 0, 0, 0), R = b.getTime(), O = new Date(1900, 2, 1, 0, 0, 0);
     function L(D, $) {
       var j = D.getTime();
@@ -89321,9 +89319,9 @@ var OS = /* @__PURE__ */ ((t) => (t.Dollars = "usd", t.Euros = "euro", t.Pounds
           return K = Oe(Se, "##########", le), "(" + K.substr(0, 3) + ") " + K.substr(3, 3) + "-" + K.substr(6);
         var rt = "";
         if (fe = re.match(/^([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return Le = Math.min(fe[4].length, 7), Ge = C(ot, Math.pow(10, Le) - 1, !1), K = "" + wt, rt = X("n", fe[1], Ge[1]), rt.charAt(rt.length - 1) == " " && (rt = rt.substr(0, rt.length - 1) + "0"), K += rt + fe[2] + "/" + fe[3], rt = l(Ge[2], Le), rt.length < fe[4].length && (rt = ae(fe[4].substr(fe[4].length - rt.length)) + rt), K += rt, K;
+          return Le = Math.min(fe[4].length, 7), Ge = _(ot, Math.pow(10, Le) - 1, !1), K = "" + wt, rt = X("n", fe[1], Ge[1]), rt.charAt(rt.length - 1) == " " && (rt = rt.substr(0, rt.length - 1) + "0"), K += rt + fe[2] + "/" + fe[3], rt = l(Ge[2], Le), rt.length < fe[4].length && (rt = ae(fe[4].substr(fe[4].length - rt.length)) + rt), K += rt, K;
         if (fe = re.match(/^# ([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return Le = Math.min(Math.max(fe[1].length, fe[4].length), 7), Ge = C(ot, Math.pow(10, Le) - 1, !0), wt + (Ge[0] || (Ge[1] ? "" : "0")) + " " + (Ge[1] ? a(Ge[1], Le) + fe[2] + "/" + fe[3] + l(Ge[2], Le) : o(" ", 2 * Le + 1 + fe[2].length + fe[3].length));
+          return Le = Math.min(Math.max(fe[1].length, fe[4].length), 7), Ge = _(ot, Math.pow(10, Le) - 1, !0), wt + (Ge[0] || (Ge[1] ? "" : "0")) + " " + (Ge[1] ? a(Ge[1], Le) + fe[2] + "/" + fe[3] + l(Ge[2], Le) : o(" ", 2 * Le + 1 + fe[2].length + fe[3].length));
         if (fe = re.match(/^[#0?]+$/))
           return K = h(le, 0), re.length <= K.length ? K : ae(re.substr(0, re.length - K.length)) + K;
         if (fe = re.match(/^([#0?]+)\.([#0]+)$/)) {
@@ -89422,9 +89420,9 @@ var OS = /* @__PURE__ */ ((t) => (t.Dollars = "usd", t.Euros = "euro", t.Pounds
           return K = Be(Se, "##########", le), "(" + K.substr(0, 3) + ") " + K.substr(3, 3) + "-" + K.substr(6);
         var rt = "";
         if (fe = re.match(/^([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return Le = Math.min(fe[4].length, 7), Ge = C(ot, Math.pow(10, Le) - 1, !1), K = "" + wt, rt = X("n", fe[1], Ge[1]), rt.charAt(rt.length - 1) == " " && (rt = rt.substr(0, rt.length - 1) + "0"), K += rt + fe[2] + "/" + fe[3], rt = l(Ge[2], Le), rt.length < fe[4].length && (rt = ae(fe[4].substr(fe[4].length - rt.length)) + rt), K += rt, K;
+          return Le = Math.min(fe[4].length, 7), Ge = _(ot, Math.pow(10, Le) - 1, !1), K = "" + wt, rt = X("n", fe[1], Ge[1]), rt.charAt(rt.length - 1) == " " && (rt = rt.substr(0, rt.length - 1) + "0"), K += rt + fe[2] + "/" + fe[3], rt = l(Ge[2], Le), rt.length < fe[4].length && (rt = ae(fe[4].substr(fe[4].length - rt.length)) + rt), K += rt, K;
         if (fe = re.match(/^# ([#0?]+)( ?)\/( ?)([#0?]+)/))
-          return Le = Math.min(Math.max(fe[1].length, fe[4].length), 7), Ge = C(ot, Math.pow(10, Le) - 1, !0), wt + (Ge[0] || (Ge[1] ? "" : "0")) + " " + (Ge[1] ? a(Ge[1], Le) + fe[2] + "/" + fe[3] + l(Ge[2], Le) : o(" ", 2 * Le + 1 + fe[2].length + fe[3].length));
+          return Le = Math.min(Math.max(fe[1].length, fe[4].length), 7), Ge = _(ot, Math.pow(10, Le) - 1, !0), wt + (Ge[0] || (Ge[1] ? "" : "0")) + " " + (Ge[1] ? a(Ge[1], Le) + fe[2] + "/" + fe[3] + l(Ge[2], Le) : o(" ", 2 * Le + 1 + fe[2].length + fe[3].length));
         if (fe = re.match(/^[#0?]+$/))
           return K = "" + le, re.length <= K.length ? K : ae(re.substr(0, re.length - K.length)) + K;
         if (fe = re.match(/^([#0]+)\.([#0]+)$/)) {
@@ -89595,7 +89593,7 @@ var OS = /* @__PURE__ */ ((t) => (t.Dollars = "usd", t.Euros = "euro", t.Pounds
           case "B":
           case "b":
             if (D.charAt(P + 1) === "1" || D.charAt(P + 1) === "2") {
-              if (ue == null && (ue = _($, j, D.charAt(P + 1) === "2"), ue == null))
+              if (ue == null && (ue = C($, j, D.charAt(P + 1) === "2"), ue == null))
                 return "";
               I[I.length] = { t: "X", v: D.substr(P, 2) }, ce = J, P += 2;
               break;
@@ -89614,7 +89612,7 @@ var OS = /* @__PURE__ */ ((t) => (t.Dollars = "usd", t.Euros = "euro", t.Pounds
           case "s":
           case "e":
           case "g":
-            if ($ < 0 || ue == null && (ue = _($, j), ue == null))
+            if ($ < 0 || ue == null && (ue = C($, j), ue == null))
               return "";
             for (H = J; ++P < D.length && D.charAt(P).toLowerCase() === J; )
               H += J;
@@ -89624,7 +89622,7 @@ var OS = /* @__PURE__ */ ((t) => (t.Dollars = "usd", t.Euros = "euro", t.Pounds
           case "a":
           case "上":
             var Ce = { t: J, v: J };
-            if (ue == null && (ue = _($, j)), D.substr(P, 3).toUpperCase() === "A/P" ? (ue != null && (Ce.v = ue.H >= 12 ? "P" : "A"), Ce.t = "T", qe = "h", P += 3) : D.substr(P, 5).toUpperCase() === "AM/PM" ? (ue != null && (Ce.v = ue.H >= 12 ? "PM" : "AM"), Ce.t = "T", P += 5, qe = "h") : D.substr(P, 5).toUpperCase() === "上午/下午" ? (ue != null && (Ce.v = ue.H >= 12 ? "下午" : "上午"), Ce.t = "T", P += 5, qe = "h") : (Ce.t = "t", ++P), ue == null && Ce.t === "T")
+            if (ue == null && (ue = C($, j)), D.substr(P, 3).toUpperCase() === "A/P" ? (ue != null && (Ce.v = ue.H >= 12 ? "P" : "A"), Ce.t = "T", qe = "h", P += 3) : D.substr(P, 5).toUpperCase() === "AM/PM" ? (ue != null && (Ce.v = ue.H >= 12 ? "PM" : "AM"), Ce.t = "T", P += 5, qe = "h") : D.substr(P, 5).toUpperCase() === "上午/下午" ? (ue != null && (Ce.v = ue.H >= 12 ? "下午" : "上午"), Ce.t = "T", P += 5, qe = "h") : (Ce.t = "t", ++P), ue == null && Ce.t === "T")
               return "";
             I[I.length] = Ce, ce = J;
             break;
@@ -89634,7 +89632,7 @@ var OS = /* @__PURE__ */ ((t) => (t.Dollars = "usd", t.Euros = "euro", t.Pounds
             if (H.slice(-1) !== "]")
               throw 'unterminated "[" block: |' + H + "|";
             if (H.match(be)) {
-              if (ue == null && (ue = _($, j), ue == null))
+              if (ue == null && (ue = C($, j), ue == null))
                 return "";
               I[I.length] = { t: "Z", v: H.toLowerCase() }, ce = H.charAt(1);
             } else