@malloydata/render 0.0.280 → 0.0.281

package/dist/module/index.mjs

@@ -5471,25 +5471,25 @@ var eJ = { exports: {} };
     var C = [];
     C[5] = C[63] = '"$"#,##0_);\\("$"#,##0\\)', C[6] = C[64] = '"$"#,##0_);[Red]\\("$"#,##0\\)', C[7] = C[65] = '"$"#,##0.00_);\\("$"#,##0.00\\)', C[8] = C[66] = '"$"#,##0.00_);[Red]\\("$"#,##0.00\\)', C[41] = '_(* #,##0_);_(* \\(#,##0\\);_(* "-"_);_(@_)', C[42] = '_("$"* #,##0_);_("$"* \\(#,##0\\);_("$"* "-"_);_(@_)', C[43] = '_(* #,##0.00_);_(* \\(#,##0.00\\);_(* "-"??_);_(@_)', C[44] = '_("$"* #,##0.00_);_("$"* \\(#,##0.00\\);_("$"* "-"??_);_(@_)';
     function b(w, P, U) {
-      for (var W = w < 0 ? -1 : 1, M = w * W, G = 0, H = 1, Z = 0, he = 1, ue = 0, ee = 0, le = Math.floor(M); ue < P && (le = Math.floor(M), Z = le * H + G, ee = le * ue + he, !(M - le < 5e-8)); )
-        M = 1 / (M - le), G = H, H = Z, he = ue, ue = ee;
-      if (ee > P && (ue > P ? (ee = he, Z = G) : (ee = ue, Z = H)), !U) return [0, W * Z, ee];
+      for (var W = w < 0 ? -1 : 1, M = w * W, z = 0, H = 1, Z = 0, he = 1, ue = 0, ee = 0, le = Math.floor(M); ue < P && (le = Math.floor(M), Z = le * H + z, ee = le * ue + he, !(M - le < 5e-8)); )
+        M = 1 / (M - le), z = H, H = Z, he = ue, ue = ee;
+      if (ee > P && (ue > P ? (ee = he, Z = z) : (ee = ue, Z = H)), !U) return [0, W * Z, ee];
       var Me = Math.floor(W * Z / ee);
       return [Me, W * Z - Me * ee, ee];
     }
     function S(w, P, U) {
       if (w > 2958465 || w < 0) return null;
-      var W = w | 0, M = Math.floor(86400 * (w - W)), G = 0, H = [], Z = { D: W, T: M, u: 86400 * (w - W) - M, y: 0, m: 0, d: 0, H: 0, M: 0, S: 0, q: 0 };
+      var W = w | 0, M = Math.floor(86400 * (w - W)), z = 0, H = [], Z = { D: W, T: M, u: 86400 * (w - W) - M, y: 0, m: 0, d: 0, H: 0, M: 0, S: 0, q: 0 };
       if (Math.abs(Z.u) < 1e-6 && (Z.u = 0), P && P.date1904 && (W += 1462), Z.u > 0.9999 && (Z.u = 0, ++M == 86400 && (Z.T = M = 0, ++W, ++Z.D)), W === 60)
-        H = U ? [1317, 10, 29] : [1900, 2, 29], G = 3;
+        H = U ? [1317, 10, 29] : [1900, 2, 29], z = 3;
       else if (W === 0)
-        H = U ? [1317, 8, 29] : [1900, 1, 0], G = 6;
+        H = U ? [1317, 8, 29] : [1900, 1, 0], z = 6;
       else {
         W > 60 && --W;
         var he = new Date(1900, 0, 1);
-        he.setDate(he.getDate() + W - 1), H = [he.getFullYear(), he.getMonth() + 1, he.getDate()], G = he.getDay(), W < 60 && (G = (G + 6) % 7), U && (G = Q(he, H));
+        he.setDate(he.getDate() + W - 1), H = [he.getFullYear(), he.getMonth() + 1, he.getDate()], z = he.getDay(), W < 60 && (z = (z + 6) % 7), U && (z = G(he, H));
       }
-      return Z.y = H[0], Z.m = H[1], Z.d = H[2], Z.S = M % 60, M = Math.floor(M / 60), Z.M = M % 60, M = Math.floor(M / 60), Z.H = M, Z.q = G, Z;
+      return Z.y = H[0], Z.m = H[1], Z.d = H[2], Z.S = M % 60, M = Math.floor(M / 60), Z.M = M % 60, M = Math.floor(M / 60), Z.H = M, Z.q = z, Z;
     }
     s.parse_date_code = S;
     var R = new Date(1899, 11, 31, 0, 0, 0), O = R.getTime(), I = new Date(1900, 2, 1, 0, 0, 0);
@@ -5507,7 +5507,7 @@ var eJ = { exports: {} };
         return ue.indexOf(".") == -1 ? ue : ue.replace(P, "$1");
       }
       var W = /(?:\.0*|(\.\d*[1-9])0+)[Ee]/, M = /(E[+-])(\d)$/;
-      function G(ue) {
+      function z(ue) {
         return ue.indexOf("E") == -1 ? ue : ue.replace(W, "$1E").replace(M, "$10$2");
       }
       function H(ue) {
@@ -5520,7 +5520,7 @@ var eJ = { exports: {} };
       }
       function he(ue) {
         var ee = Math.floor(Math.log(Math.abs(ue)) * Math.LOG10E), le;
-        return ee >= -4 && ee <= -1 ? le = ue.toPrecision(10 + ee) : Math.abs(ee) <= 9 ? le = H(ue) : ee === 10 ? le = ue.toFixed(10).substr(0, 12) : le = Z(ue), U(G(le.toUpperCase()));
+        return ee >= -4 && ee <= -1 ? le = ue.toPrecision(10 + ee) : Math.abs(ee) <= 9 ? le = H(ue) : ee === 10 ? le = ue.toFixed(10).substr(0, 12) : le = Z(ue), U(z(le.toUpperCase()));
       }
       return he;
     }();
@@ -5542,13 +5542,13 @@ var eJ = { exports: {} };
       throw new Error("unsupported value in General format: " + w);
     }
     s._general = Y;
-    function Q(w, P) {
+    function G(w, P) {
       P[0] -= 581;
       var U = w.getDay();
       return w < 60 && (U = (U + 6) % 7), U;
     }
     function X(w, P, U, W) {
-      var M = "", G = 0, H = 0, Z = U.y, he, ue = 0;
+      var M = "", z = 0, H = 0, Z = U.y, he, ue = 0;
       switch (w) {
         case 98:
           Z = U.y + 543;
@@ -5621,7 +5621,7 @@ var eJ = { exports: {} };
           break;
         case 115:
           if (P != "s" && P != "ss" && P != ".0" && P != ".00" && P != ".000") throw "bad second format: " + P;
-          return U.u === 0 && (P == "s" || P == "ss") ? a(U.S, P.length) : (W >= 2 ? H = W === 3 ? 1e3 : 100 : H = W === 1 ? 10 : 1, G = Math.round(H * (U.S + U.u)), G >= 60 * H && (G = 0), P === "s" ? G === 0 ? "0" : "" + G / H : (M = a(G, 2 + W), P === "ss" ? M.substr(0, 2) : "." + M.substr(2, P.length - 1)));
+          return U.u === 0 && (P == "s" || P == "ss") ? a(U.S, P.length) : (W >= 2 ? H = W === 3 ? 1e3 : 100 : H = W === 1 ? 10 : 1, z = Math.round(H * (U.S + U.u)), z >= 60 * H && (z = 0), P === "s" ? z === 0 ? "0" : "" + z / H : (M = a(z, 2 + W), P === "ss" ? M.substr(0, 2) : "." + M.substr(2, P.length - 1)));
         case 90:
           switch (P) {
             case "[h]":
@@ -5684,7 +5684,7 @@ var eJ = { exports: {} };
         } else K = B.toExponential(Re);
         return ye.match(/E\+00$/) && K.match(/e[+-]\d$/) && (K = K.substr(0, K.length - 1) + "0" + K.charAt(K.length - 1)), ye.match(/E\-/) && K.match(/e\+/) && (K = K.replace(/e\+/, "e")), K.replace("e", "E");
       }
-      var G = /# (\?+)( ?)\/( ?)(\d+)/;
+      var z = /# (\?+)( ?)\/( ?)(\d+)/;
       function H(ye, B, K) {
         var Re = parseInt(ye[4], 10), J = Math.round(B * Re), de = Math.floor(J / Re), Ne = J - de * Re, He = Re;
         return K + (de === 0 ? "" : "" + de) + " " + (Ne === 0 ? u(" ", ye[1].length + 1 + ye[4].length) : l(Ne, ye[1].length) + ye[2] + "/" + ye[3] + a(He, ye[4].length));
@@ -5735,7 +5735,7 @@ var eJ = { exports: {} };
         if (B.match(/^00+$/)) return vt + p(ot, B.length);
         if (B.match(/^[#?]+$/))
           return J = p(K, 0), J === "0" && (J = ""), J.length > B.length ? J : le(B.substr(0, B.length - J.length)) + J;
-        if (de = B.match(G)) return H(de, ot, vt);
+        if (de = B.match(z)) return H(de, ot, vt);
         if (B.match(/^#+0+$/)) return vt + p(ot, B.length - B.indexOf("0"));
         if (de = B.match(he))
           return J = Me(K, de[1].length).replace(/^([^\.]+)$/, "$1." + le(de[1])).replace(/\.$/, "." + le(de[1])).replace(/\.(\d*)$/, function(cs, I2) {
@@ -5823,7 +5823,7 @@ var eJ = { exports: {} };
         if (B.match(/^00+$/)) return vt + a(ot, B.length);
         if (B.match(/^[#?]+$/))
           return J = "" + K, K === 0 && (J = ""), J.length > B.length ? J : le(B.substr(0, B.length - J.length)) + J;
-        if (de = B.match(G)) return Z(de, ot, vt);
+        if (de = B.match(z)) return Z(de, ot, vt);
         if (B.match(/^#+0+$/)) return vt + a(ot, B.length - B.indexOf("0"));
         if (de = B.match(he))
           return J = ("" + K).replace(/^([^\.]+)$/, "$1." + le(de[1])).replace(/\.$/, "." + le(de[1])), J = J.replace(/\.(\d*)$/, function(cs, I2) {
@@ -5984,15 +5984,15 @@ var eJ = { exports: {} };
     }
     s.is_date = xe;
     function Se(w, P, U, W) {
-      for (var M = [], G = "", H = 0, Z = "", he = "t", ue, ee, le, Me = "H"; H < w.length; )
+      for (var M = [], z = "", H = 0, Z = "", he = "t", ue, ee, le, Me = "H"; H < w.length; )
         switch (Z = w.charAt(H)) {
           case "G":
             if (!m(w, H)) throw new Error("unrecognized character " + Z + " in " + w);
             M[M.length] = { t: "G", v: "General" }, H += 7;
             break;
           case '"':
-            for (G = ""; (le = w.charCodeAt(++H)) !== 34 && H < w.length; ) G += String.fromCharCode(le);
-            M[M.length] = { t: "t", v: G }, ++H;
+            for (z = ""; (le = w.charCodeAt(++H)) !== 34 && H < w.length; ) z += String.fromCharCode(le);
+            M[M.length] = { t: "t", v: z }, ++H;
             break;
           case "\\":
             var at = w.charAt(++H), _t = at === "(" || at === ")" ? at : "t";
@@ -6028,8 +6028,8 @@ var eJ = { exports: {} };
           case "g":
             if (P < 0 || ue == null && (ue = S(P, U), ue == null))
               return "";
-            for (G = Z; ++H < w.length && w.charAt(H).toLowerCase() === Z; ) G += Z;
-            Z === "m" && he.toLowerCase() === "h" && (Z = "M"), Z === "h" && (Z = Me), M[M.length] = { t: Z, v: G }, he = Z;
+            for (z = Z; ++H < w.length && w.charAt(H).toLowerCase() === Z; ) z += Z;
+            Z === "m" && he.toLowerCase() === "h" && (Z = "M"), Z === "h" && (Z = Me), M[M.length] = { t: Z, v: z }, he = Z;
             break;
           case "A":
           case "a":
@@ -6039,28 +6039,28 @@ var eJ = { exports: {} };
             M[M.length] = ie, he = Z;
             break;
           case "[":
-            for (G = Z; w.charAt(H++) !== "]" && H < w.length; ) G += w.charAt(H);
-            if (G.slice(-1) !== "]") throw 'unterminated "[" block: |' + G + "|";
-            if (G.match(oe)) {
+            for (z = Z; w.charAt(H++) !== "]" && H < w.length; ) z += w.charAt(H);
+            if (z.slice(-1) !== "]") throw 'unterminated "[" block: |' + z + "|";
+            if (z.match(oe)) {
               if (ue == null && (ue = S(P, U), ue == null))
                 return "";
-              M[M.length] = { t: "Z", v: G.toLowerCase() }, he = G.charAt(1);
-            } else G.indexOf("$") > -1 && (G = (G.match(/\$([^-\[\]]*)/) || [])[1] || "$", xe(w) || (M[M.length] = { t: "t", v: G }));
+              M[M.length] = { t: "Z", v: z.toLowerCase() }, he = z.charAt(1);
+            } else z.indexOf("$") > -1 && (z = (z.match(/\$([^-\[\]]*)/) || [])[1] || "$", xe(w) || (M[M.length] = { t: "t", v: z }));
             break;
           case ".":
             if (ue != null) {
-              for (G = Z; ++H < w.length && (Z = w.charAt(H)) === "0"; ) G += Z;
-              M[M.length] = { t: "s", v: G };
+              for (z = Z; ++H < w.length && (Z = w.charAt(H)) === "0"; ) z += Z;
+              M[M.length] = { t: "s", v: z };
               break;
             }
           case "0":
           case "#":
-            for (G = Z; ++H < w.length && "0#?.,E+-%".indexOf(Z = w.charAt(H)) > -1; ) G += Z;
-            M[M.length] = { t: "n", v: G };
+            for (z = Z; ++H < w.length && "0#?.,E+-%".indexOf(Z = w.charAt(H)) > -1; ) z += Z;
+            M[M.length] = { t: "n", v: z };
             break;
           case "?":
-            for (G = Z; w.charAt(++H) === Z; ) G += Z;
-            M[M.length] = { t: Z, v: G }, he = Z;
+            for (z = Z; w.charAt(++H) === Z; ) z += Z;
+            M[M.length] = { t: Z, v: z }, he = Z;
             break;
           case "*":
             ++H, (w.charAt(H) == " " || w.charAt(H) == "*") && ++H;
@@ -6078,8 +6078,8 @@ var eJ = { exports: {} };
           case "7":
           case "8":
           case "9":
-            for (G = Z; H < w.length && "0123456789".indexOf(w.charAt(++H)) > -1; ) G += w.charAt(H);
-            M[M.length] = { t: "D", v: G };
+            for (z = Z; H < w.length && "0123456789".indexOf(w.charAt(++H)) > -1; ) z += w.charAt(H);
+            M[M.length] = { t: "D", v: z };
             break;
           case " ":
             M[M.length] = { t: Z, v: Z }, ++H;
@@ -6233,13 +6233,13 @@ var eJ = { exports: {} };
           U = M > -1 ? [U[0], U[1], U[0], U[2]] : [U[0], U[1], U[2], "@"];
           break;
       }
-      var G = P > 0 ? U[0] : P < 0 ? U[1] : U[2];
-      if (U[0].indexOf("[") === -1 && U[1].indexOf("[") === -1) return [W, G];
+      var z = P > 0 ? U[0] : P < 0 ? U[1] : U[2];
+      if (U[0].indexOf("[") === -1 && U[1].indexOf("[") === -1) return [W, z];
       if (U[0].match($) != null || U[1].match($) != null) {
         var H = U[0].match(N), Z = U[1].match(N);
         return L(P, H) ? [W, U[0]] : L(P, Z) ? [W, U[1]] : [W, U[H != null && Z != null ? 2 : 1]];
       }
-      return [W, G];
+      return [W, z];
     }
     function V(w, P, U) {
       U == null && (U = {});
@@ -6261,7 +6261,7 @@ var eJ = { exports: {} };
       else if (P === "" || P == null) return "";
       return Se(M[1], P, U, M[0]);
     }
-    function z(w, P) {
+    function Q(w, P) {
       if (typeof P != "number") {
         P = +P || -1;
         for (var U = 0; U < 392; ++U) {
@@ -6278,11 +6278,11 @@ var eJ = { exports: {} };
       }
       return A[P] = w, P;
     }
-    s.load = z, s._table = A, s.get_table = function() {
+    s.load = Q, s._table = A, s.get_table = function() {
       return A;
     }, s.load_table = function(P) {
       for (var U = 0; U != 392; ++U)
-        P[U] !== void 0 && z(P[U], U);
+        P[U] !== void 0 && Q(P[U], U);
     }, s.init_table = E, s.format = V;
   };
   r(e), typeof DO_NOT_EXPORT_SSF > "u" && (t.exports = e);
@@ -58741,8 +58741,8 @@ var AJ = { exports: {} };
             }));
           }
         if (y)
-          for (var Q = Object.getOwnPropertyNames(C), I = 0; I < Q.length; I++) {
-            var X = Q[I], Y = Object.getOwnPropertyDescriptor(C, X);
+          for (var G = Object.getOwnPropertyNames(C), I = 0; I < G.length; I++) {
+            var X = G[I], Y = Object.getOwnPropertyDescriptor(C, X);
             Y && Y.enumerable || (S[X] = v(C[X], b - 1), Object.defineProperty(S, X, {
               enumerable: !1
             }));
@@ -60920,14 +60920,14 @@ function _X(t) {
     var b = g === "$" ? r : g === "#" && /[boxX]/.test(C) ? "0" + C.toLowerCase() : "", S = g === "$" ? i : /[%p]/.test(C) ? u : "", R = Bj[C], O = /[defgprs%]/.test(C);
     _ = _ === void 0 ? 6 : /[gprs]/.test(C) ? Math.max(1, Math.min(21, _)) : Math.max(0, Math.min(20, _));
     function I(D) {
-      var k = b, j = S, Y, Q, X;
+      var k = b, j = S, Y, G, X;
       if (C === "c")
         j = R(D) + j, D = "";
       else {
         D = +D;
         var ce = D < 0 || 1 / D < 0;
         if (D = isNaN(D) ? l : R(Math.abs(D), _), v && (D = Zye(D)), ce && +D == 0 && m !== "+" && (ce = !1), k = (ce ? m === "(" ? m : a : m === "-" || m === "(" ? "" : m) + k, j = (C === "s" ? Mj[8 + AX / 3] : "") + j + (ce && m === "(" ? ")" : ""), O) {
-          for (Y = -1, Q = D.length; ++Y < Q; )
+          for (Y = -1, G = D.length; ++Y < G; )
             if (X = D.charCodeAt(Y), 48 > X || X > 57) {
               j = (X === 46 ? s + D.slice(Y + 1) : D.slice(Y)) + j, D = D.slice(0, Y);
               break;
@@ -61438,7 +61438,7 @@ function BX(t) {
     m: bAe,
     M: TAe,
     p: V,
-    q: z,
+    q: Q,
     Q: Jj,
     s: Xj,
     S: RAe,
@@ -61480,7 +61480,7 @@ function BX(t) {
     V: zEe,
     w: qEe,
     W: GEe,
-    x: Q,
+    x: G,
     X,
     y: zj,
     Y: Qj,
@@ -61490,27 +61490,27 @@ function BX(t) {
   _.x = b(r, _), _.X = b(i, _), _.c = b(e, _), v.x = b(r, v), v.X = b(i, v), v.c = b(e, v);
   function b(w, P) {
     return function(U) {
-      var W = [], M = -1, G = 0, H = w.length, Z, he, ue;
+      var W = [], M = -1, z = 0, H = w.length, Z, he, ue;
       for (U instanceof Date || (U = /* @__PURE__ */ new Date(+U)); ++M < H; )
-        w.charCodeAt(M) === 37 && (W.push(w.slice(G, M)), (he = Hj[Z = w.charAt(++M)]) != null ? Z = w.charAt(++M) : he = Z === "e" ? " " : "0", (ue = P[Z]) && (Z = ue(U, he)), W.push(Z), G = M + 1);
-      return W.push(w.slice(G, M)), W.join("");
+        w.charCodeAt(M) === 37 && (W.push(w.slice(z, M)), (he = Hj[Z = w.charAt(++M)]) != null ? Z = w.charAt(++M) : he = Z === "e" ? " " : "0", (ue = P[Z]) && (Z = ue(U, he)), W.push(Z), z = M + 1);
+      return W.push(w.slice(z, M)), W.join("");
     };
   }
   function S(w, P) {
     return function(U) {
-      var W = H2(1900, void 0, 1), M = R(W, w, U += "", 0), G, H;
+      var W = H2(1900, void 0, 1), M = R(W, w, U += "", 0), z, H;
       if (M != U.length) return null;
       if ("Q" in W) return new Date(W.Q);
       if ("s" in W) return new Date(W.s * 1e3 + ("L" in W ? W.L : 0));
       if (P && !("Z" in W) && (W.Z = 0), "p" in W && (W.H = W.H % 12 + W.p * 12), W.m === void 0 && (W.m = "q" in W ? W.q : 0), "V" in W) {
         if (W.V < 1 || W.V > 53) return null;
-        "w" in W || (W.w = 1), "Z" in W ? (G = $D(H2(W.y, 0, 1)), H = G.getUTCDay(), G = H > 4 || H === 0 ? cv.ceil(G) : cv(G), G = A0.offset(G, (W.V - 1) * 7), W.y = G.getUTCFullYear(), W.m = G.getUTCMonth(), W.d = G.getUTCDate() + (W.w + 6) % 7) : (G = ID(H2(W.y, 0, 1)), H = G.getDay(), G = H > 4 || H === 0 ? lv.ceil(G) : lv(G), G = ul.offset(G, (W.V - 1) * 7), W.y = G.getFullYear(), W.m = G.getMonth(), W.d = G.getDate() + (W.w + 6) % 7);
+        "w" in W || (W.w = 1), "Z" in W ? (z = $D(H2(W.y, 0, 1)), H = z.getUTCDay(), z = H > 4 || H === 0 ? cv.ceil(z) : cv(z), z = A0.offset(z, (W.V - 1) * 7), W.y = z.getUTCFullYear(), W.m = z.getUTCMonth(), W.d = z.getUTCDate() + (W.w + 6) % 7) : (z = ID(H2(W.y, 0, 1)), H = z.getDay(), z = H > 4 || H === 0 ? lv.ceil(z) : lv(z), z = ul.offset(z, (W.V - 1) * 7), W.y = z.getFullYear(), W.m = z.getMonth(), W.d = z.getDate() + (W.w + 6) % 7);
       } else ("W" in W || "U" in W) && ("w" in W || (W.w = "u" in W ? W.u % 7 : "W" in W ? 1 : 0), H = "Z" in W ? $D(H2(W.y, 0, 1)).getUTCDay() : ID(H2(W.y, 0, 1)).getDay(), W.m = 0, W.d = "W" in W ? (W.w + 6) % 7 + W.W * 7 - (H + 5) % 7 : W.w + W.U * 7 - (H + 6) % 7);
       return "Z" in W ? (W.H += W.Z / 100 | 0, W.M += W.Z % 100, $D(W)) : ID(W);
     };
   }
   function R(w, P, U, W) {
-    for (var M = 0, G = P.length, H = U.length, Z, he; M < G; ) {
+    for (var M = 0, z = P.length, H = U.length, Z, he; M < z; ) {
       if (W >= H) return -1;
       if (Z = P.charCodeAt(M++), Z === 37) {
         if (Z = P.charAt(M++), he = C[Z in Hj ? P.charAt(M++) : Z], !he || (W = he(w, U, W)) < 0) return -1;
@@ -61542,7 +61542,7 @@ function BX(t) {
   function Y(w, P, U) {
     return R(w, e, P, U);
   }
-  function Q(w, P, U) {
+  function G(w, P, U) {
     return R(w, r, P, U);
   }
   function X(w, P, U) {
@@ -61581,7 +61581,7 @@ function BX(t) {
   function V(w) {
     return s[+(w.getUTCHours() >= 12)];
   }
-  function z(w) {
+  function Q(w) {
     return 1 + ~~(w.getUTCMonth() / 3);
   }
   return {
@@ -63652,8 +63652,8 @@ function xve(t, e, r, i) {
       let C = 0, b = 0, S = 0, R = 0, O = 0;
       const I = 1 / Math.abs(s[v] - E || 1);
       for (let j = A; j <= _; ++j) {
-        const Y = s[j], Q = o[j], X = dve(Math.abs(E - Y) * I) * h[j], ce = Y * X;
-        C += X, b += ce, S += Q * X, R += Q * ce, O += Y * ce;
+        const Y = s[j], G = o[j], X = dve(Math.abs(E - Y) * I) * h[j], ce = Y * X;
+        C += X, b += ce, S += G * X, R += G * ce, O += Y * ce;
       }
       const [D, k] = F3(b / C, S / C, R / C, O / C);
       f[y] = D + k * E, x[y] = Math.abs(o[y] - f[y]), hve(s, y + 1, m);
@@ -66022,8 +66022,8 @@ function hCe(t, e, r, i, s, o, u, a) {
     return h = (f * (e - o) - x * (t - s)) / h, [t + h * l, e + h * c];
 }
 function ZE(t, e, r, i, s, o, u) {
-  var a = t - r, l = e - i, c = (u ? o : -o) / df(a * a + l * l), f = c * l, x = -c * a, h = t + f, p = e + x, m = r + f, g = i + x, y = (h + m) / 2, E = (p + g) / 2, A = m - h, _ = g - p, v = A * A + _ * _, C = s - o, b = h * g - m * p, S = (_ < 0 ? -1 : 1) * df(sCe(0, C * C * v - b * b)), R = (b * _ - A * S) / v, O = (-b * A - _ * S) / v, I = (b * _ + A * S) / v, D = (-b * A + _ * S) / v, k = R - y, j = O - E, Y = I - y, Q = D - E;
-  return k * k + j * j > Y * Y + Q * Q && (R = I, O = D), {
+  var a = t - r, l = e - i, c = (u ? o : -o) / df(a * a + l * l), f = c * l, x = -c * a, h = t + f, p = e + x, m = r + f, g = i + x, y = (h + m) / 2, E = (p + g) / 2, A = m - h, _ = g - p, v = A * A + _ * _, C = s - o, b = h * g - m * p, S = (_ < 0 ? -1 : 1) * df(sCe(0, C * C * v - b * b)), R = (b * _ - A * S) / v, O = (-b * A - _ * S) / v, I = (b * _ + A * S) / v, D = (-b * A + _ * S) / v, k = R - y, j = O - E, Y = I - y, G = D - E;
+  return k * k + j * j > Y * Y + G * G && (R = I, O = D), {
     cx: R,
     cy: O,
     x01: -f,
@@ -66042,15 +66042,15 @@ function pCe() {
     else {
       var A = m, _ = g, v = m, C = g, b = y, S = y, R = u.apply(this, arguments) / 2, O = R > jr && (i ? +i.apply(this, arguments) : df(h * h + p * p)), I = jD(dU(p - h) / 2, +r.apply(this, arguments)), D = I, k = I, j, Y;
       if (O > jr) {
-        var Q = hU(O / h * gu(R)), X = hU(O / p * gu(R));
-        (b -= Q * 2) > jr ? (Q *= E ? 1 : -1, v += Q, C -= Q) : (b = 0, v = C = (m + g) / 2), (S -= X * 2) > jr ? (X *= E ? 1 : -1, A += X, _ -= X) : (S = 0, A = _ = (m + g) / 2);
+        var G = hU(O / h * gu(R)), X = hU(O / p * gu(R));
+        (b -= G * 2) > jr ? (G *= E ? 1 : -1, v += G, C -= G) : (b = 0, v = C = (m + g) / 2), (S -= X * 2) > jr ? (X *= E ? 1 : -1, A += X, _ -= X) : (S = 0, A = _ = (m + g) / 2);
       }
       var ce = p * Gc(A), fe = p * gu(A), te = h * Gc(C), oe = h * gu(C);
       if (I > jr) {
         var xe = p * Gc(_), Se = p * gu(_), $ = h * Gc(v), N = h * gu(v), L;
         if (y < _h)
           if (L = hCe(ce, fe, $, N, xe, Se, te, oe)) {
-            var q = ce - L[0], V = fe - L[1], z = xe - L[0], w = Se - L[1], P = 1 / gu(oCe((q * z + V * w) / (df(q * q + V * V) * df(z * z + w * w))) / 2), U = df(L[0] * L[0] + L[1] * L[1]);
+            var q = ce - L[0], V = fe - L[1], Q = xe - L[0], w = Se - L[1], P = 1 / gu(oCe((q * Q + V * w) / (df(q * q + V * V) * df(Q * Q + w * w))) / 2), U = df(L[0] * L[0] + L[1] * L[1]);
             D = jD(I, (h - U) / (P - 1)), k = jD(I, (p - U) / (P + 1));
           } else
             D = k = 0;
@@ -68717,11 +68717,11 @@ function I5e(t, e, r, i, s, o, u, a, l) {
   let I = Math.sqrt(O);
   o == s && (I = -I);
   const D = 0.5 * (v + b) - I * (S - C), k = 0.5 * (C + S) + I * (b - v), j = Math.atan2(C - k, v - D);
-  let Q = Math.atan2(S - k, b - D) - j;
-  Q < 0 && o === 1 ? Q += Ou : Q > 0 && o === 0 && (Q -= Ou);
-  const X = Math.ceil(Math.abs(Q / (of + 1e-3))), ce = [];
+  let G = Math.atan2(S - k, b - D) - j;
+  G < 0 && o === 1 ? G += Ou : G > 0 && o === 0 && (G -= Ou);
+  const X = Math.ceil(Math.abs(G / (of + 1e-3))), ce = [];
   for (let fe = 0; fe < X; ++fe) {
-    const te = j + fe * Q / X, oe = j + (fe + 1) * Q / X;
+    const te = j + fe * G / X, oe = j + (fe + 1) * G / X;
     ce[fe] = [D, k, te, oe, r, i, x, h];
   }
   return VD[c] = ce;
@@ -71525,7 +71525,7 @@ function vq(t) {
   return t < 0 ? Math.ceil(-t) : 0;
 }
 function One(t, e, r) {
-  var i = !r.nodirty, s = r.bounds === JL ? ITe : $Te, o = Ur.set(0, 0, 0, 0), u = mn(r.align, d0), a = mn(r.align, h0), l = mn(r.padding, d0), c = mn(r.padding, h0), f = r.columns || e.length, x = f <= 0 ? 1 : Math.ceil(e.length / f), h = e.length, p = Array(h), m = Array(f), g = 0, y = Array(h), E = Array(x), A = 0, _ = Array(h), v = Array(h), C = Array(h), b, S, R, O, I, D, k, j, Y, Q, X;
+  var i = !r.nodirty, s = r.bounds === JL ? ITe : $Te, o = Ur.set(0, 0, 0, 0), u = mn(r.align, d0), a = mn(r.align, h0), l = mn(r.padding, d0), c = mn(r.padding, h0), f = r.columns || e.length, x = f <= 0 ? 1 : Math.ceil(e.length / f), h = e.length, p = Array(h), m = Array(f), g = 0, y = Array(h), E = Array(x), A = 0, _ = Array(h), v = Array(h), C = Array(h), b, S, R, O, I, D, k, j, Y, G, X;
   for (S = 0; S < f; ++S) m[S] = 0;
   for (S = 0; S < x; ++S) E[S] = 0;
   for (S = 0; S < h; ++S)
@@ -71567,17 +71567,17 @@ function One(t, e, r) {
   for (Y = 0, S = 0; S < h; ++S)
     Y = p[S] + (S % f ? Y : 0), _[S] += Y - e[S].x;
   for (R = 0; R < f; ++R)
-    for (Q = 0, S = R; S < h; S += f)
-      Q += y[S], v[S] += Q - e[S].y;
+    for (G = 0, S = R; S < h; S += f)
+      G += y[S], v[S] += G - e[S].y;
   if (u && mn(r.center, d0) && x > 1)
     for (S = 0; S < h; ++S)
       I = u === iA ? g : m[S % f], Y = I - C[S].x2 - e[S].x - _[S], Y > 0 && (_[S] += Y / 2);
   if (a && mn(r.center, h0) && f !== 1)
     for (S = 0; S < h; ++S)
-      I = a === iA ? A : E[~~(S / f)], Q = I - C[S].y2 - e[S].y - v[S], Q > 0 && (v[S] += Q / 2);
+      I = a === iA ? A : E[~~(S / f)], G = I - C[S].y2 - e[S].y - v[S], G > 0 && (v[S] += G / 2);
   for (S = 0; S < h; ++S)
     o.union(C[S].translate(_[S], v[S]));
-  switch (Y = mn(r.anchor, ETe), Q = mn(r.anchor, ATe), mn(r.anchor, d0)) {
+  switch (Y = mn(r.anchor, ETe), G = mn(r.anchor, ATe), mn(r.anchor, d0)) {
     case ai:
       Y -= o.width();
       break;
@@ -71586,15 +71586,15 @@ function One(t, e, r) {
   }
   switch (mn(r.anchor, h0)) {
     case ai:
-      Q -= o.height();
+      G -= o.height();
       break;
     case hw:
-      Q -= o.height() / 2;
+      G -= o.height() / 2;
   }
-  for (Y = Math.round(Y), Q = Math.round(Q), o.clear(), S = 0; S < h; ++S)
+  for (Y = Math.round(Y), G = Math.round(G), o.clear(), S = 0; S < h; ++S)
     e[S].mark.bounds.clear();
   for (S = 0; S < h; ++S)
-    D = e[S], D.x += _[S] += Y, D.y += v[S] += Q, o.union(D.mark.bounds.union(D.bounds.translate(_[S], v[S]))), i && t.dirty(D);
+    D = e[S], D.x += _[S] += Y, D.y += v[S] += G, o.union(D.mark.bounds.union(D.bounds.translate(_[S], v[S]))), i && t.dirty(D);
   return o;
 }
 function BTe(t, e, r) {
@@ -72690,8 +72690,8 @@ function zRe(t, e) {
           qv(j);
           var Y = Oh(o, j);
           qv(Y);
-          var Q = (D ^ R >= 0 ? -1 : 1) * ns(Y[2]);
-          (i > Q || i === Q && (j[0] || j[1])) && (a += D ^ R >= 0 ? 1 : -1);
+          var G = (D ^ R >= 0 ? -1 : 1) * ns(Y[2]);
+          (i > G || i === G && (j[0] || j[1])) && (a += D ^ R >= 0 ? 1 : -1);
         }
       }
   return (u < -it || u < it && l < -$v) ^ a & 1;
@@ -72838,10 +72838,10 @@ function JRe(t) {
     if (!(k < 0)) {
       var j = Di(k), Y = cA(O, (-I - j) / D);
       if (r6(Y, S), Y = Uv(Y), !h) return Y;
-      var Q = f[0], X = x[0], ce = f[1], fe = x[1], te;
-      X < Q && (te = Q, Q = X, X = te);
-      var oe = X - Q, xe = St(oe - At) < it, Se = xe || oe < it;
-      if (!xe && fe < ce && (te = ce, ce = fe, fe = te), Se ? xe ? ce + fe > 0 ^ Y[1] < (St(Y[0] - Q) < it ? ce : fe) : ce <= Y[1] && Y[1] <= fe : oe > At ^ (Q <= Y[0] && Y[0] <= X)) {
+      var G = f[0], X = x[0], ce = f[1], fe = x[1], te;
+      X < G && (te = G, G = X, X = te);
+      var oe = X - G, xe = St(oe - At) < it, Se = xe || oe < it;
+      if (!xe && fe < ce && (te = ce, ce = fe, fe = te), Se ? xe ? ce + fe > 0 ^ Y[1] < (St(Y[0] - G) < it ? ce : fe) : ce <= Y[1] && Y[1] <= fe : oe > At ^ (G <= Y[0] && Y[0] <= X)) {
         var $ = cA(O, (-I + j) / D);
         return r6($, S), [Y, Uv($)];
       }
@@ -72925,21 +72925,21 @@ function ure(t, e, r, i) {
       polygonStart: I,
       polygonEnd: D
     };
-    function R(Q, X) {
-      s(Q, X) && f.point(Q, X);
+    function R(G, X) {
+      s(G, X) && f.point(G, X);
     }
     function O() {
-      for (var Q = 0, X = 0, ce = p.length; X < ce; ++X)
+      for (var G = 0, X = 0, ce = p.length; X < ce; ++X)
         for (var fe = p[X], te = 1, oe = fe.length, xe = fe[0], Se, $, N = xe[0], L = xe[1]; te < oe; ++te)
-          Se = N, $ = L, xe = fe[te], N = xe[0], L = xe[1], $ <= i ? L > i && (N - Se) * (i - $) > (L - $) * (t - Se) && ++Q : L <= i && (N - Se) * (i - $) < (L - $) * (t - Se) && --Q;
-      return Q;
+          Se = N, $ = L, xe = fe[te], N = xe[0], L = xe[1], $ <= i ? L > i && (N - Se) * (i - $) > (L - $) * (t - Se) && ++G : L <= i && (N - Se) * (i - $) < (L - $) * (t - Se) && --G;
+      return G;
     }
     function I() {
       f = x, h = [], p = [], b = !0;
     }
     function D() {
-      var Q = O(), X = b && Q, ce = (h = yX(h)).length;
-      (X || ce) && (c.polygonStart(), X && (c.lineStart(), o(null, null, 1, c), c.lineEnd()), ce && sre(h, a, Q, o, c), c.polygonEnd()), f = c, h = p = m = null;
+      var G = O(), X = b && G, ce = (h = yX(h)).length;
+      (X || ce) && (c.polygonStart(), X && (c.lineStart(), o(null, null, 1, c), c.lineEnd()), ce && sre(h, a, G, o, c), c.polygonEnd()), f = c, h = p = m = null;
     }
     function k() {
       S.point = Y, p && p.push(m = []), C = !0, v = !1, A = _ = NaN;
@@ -72947,16 +72947,16 @@ function ure(t, e, r, i) {
     function j() {
       h && (Y(g, y), E && v && x.rejoin(), h.push(x.result())), S.point = R, v && f.lineEnd();
     }
-    function Y(Q, X) {
-      var ce = s(Q, X);
-      if (p && m.push([Q, X]), C)
-        g = Q, y = X, E = ce, C = !1, ce && (f.lineStart(), f.point(Q, X));
-      else if (ce && v) f.point(Q, X);
+    function Y(G, X) {
+      var ce = s(G, X);
+      if (p && m.push([G, X]), C)
+        g = G, y = X, E = ce, C = !1, ce && (f.lineStart(), f.point(G, X));
+      else if (ce && v) f.point(G, X);
       else {
-        var fe = [A = Math.max(xA, Math.min(Sm, A)), _ = Math.max(xA, Math.min(Sm, _))], te = [Q = Math.max(xA, Math.min(Sm, Q)), X = Math.max(xA, Math.min(Sm, X))];
-        XRe(fe, te, t, e, r, i) ? (v || (f.lineStart(), f.point(fe[0], fe[1])), f.point(te[0], te[1]), ce || f.lineEnd(), b = !1) : ce && (f.lineStart(), f.point(Q, X), b = !1);
+        var fe = [A = Math.max(xA, Math.min(Sm, A)), _ = Math.max(xA, Math.min(Sm, _))], te = [G = Math.max(xA, Math.min(Sm, G)), X = Math.max(xA, Math.min(Sm, X))];
+        XRe(fe, te, t, e, r, i) ? (v || (f.lineStart(), f.point(fe[0], fe[1])), f.point(te[0], te[1]), ce || f.lineEnd(), b = !1) : ce && (f.lineStart(), f.point(G, X), b = !1);
       }
-      A = Q, _ = X, v = ce;
+      A = G, _ = X, v = ce;
     }
     return S;
   };
@@ -73335,8 +73335,8 @@ function dDe(t, e) {
   function r(i, s, o, u, a, l, c, f, x, h, p, m, g, y) {
     var E = c - i, A = f - s, _ = E * E + A * A;
     if (_ > 4 * e && g--) {
-      var v = u + h, C = a + p, b = l + m, S = Di(v * v + C * C + b * b), R = ns(b /= S), O = St(St(b) - 1) < it || St(o - x) < it ? (o + x) / 2 : lo(C, v), I = t(O, R), D = I[0], k = I[1], j = D - i, Y = k - s, Q = A * j - E * Y;
-      (Q * Q / _ > e || St((E * j + A * Y) / _ - 0.5) > 0.3 || u * h + a * p + l * m < fDe) && (r(i, s, o, u, a, l, D, k, O, v /= S, C /= S, b, g, y), y.point(D, k), r(D, k, O, v, C, b, c, f, x, h, p, m, g, y));
+      var v = u + h, C = a + p, b = l + m, S = Di(v * v + C * C + b * b), R = ns(b /= S), O = St(St(b) - 1) < it || St(o - x) < it ? (o + x) / 2 : lo(C, v), I = t(O, R), D = I[0], k = I[1], j = D - i, Y = k - s, G = A * j - E * Y;
+      (G * G / _ > e || St((E * j + A * Y) / _ - 0.5) > 0.3 || u * h + a * p + l * m < fDe) && (r(i, s, o, u, a, l, D, k, O, v /= S, C /= S, b, g, y), y.point(D, k), r(D, k, O, v, C, b, c, f, x, h, p, m, g, y));
     }
   }
   return function(i) {
@@ -73414,49 +73414,49 @@ function fa(t) {
 }
 function Are(t) {
   var e, r = 150, i = 480, s = 250, o = 0, u = 0, a = 0, l = 0, c = 0, f, x = 0, h = 1, p = 1, m = null, g = jq, y = null, E, A, _, v = Og, C = 0.5, b, S, R, O, I;
-  function D(Q) {
-    return R(Q[0] * Et, Q[1] * Et);
-  }
-  function k(Q) {
-    return Q = R.invert(Q[0], Q[1]), Q && [Q[0] * In, Q[1] * In];
-  }
-  D.stream = function(Q) {
-    return O && I === Q ? O : O = hDe(pDe(f)(g(b(v(I = Q)))));
-  }, D.preclip = function(Q) {
-    return arguments.length ? (g = Q, m = void 0, Y()) : g;
-  }, D.postclip = function(Q) {
-    return arguments.length ? (v = Q, y = E = A = _ = null, Y()) : v;
-  }, D.clipAngle = function(Q) {
-    return arguments.length ? (g = +Q ? JRe(m = Q * Et) : (m = null, jq), Y()) : m * In;
-  }, D.clipExtent = function(Q) {
-    return arguments.length ? (v = Q == null ? (y = E = A = _ = null, Og) : ure(y = +Q[0][0], E = +Q[0][1], A = +Q[1][0], _ = +Q[1][1]), Y()) : y == null ? null : [[y, E], [A, _]];
-  }, D.scale = function(Q) {
-    return arguments.length ? (r = +Q, j()) : r;
-  }, D.translate = function(Q) {
-    return arguments.length ? (i = +Q[0], s = +Q[1], j()) : [i, s];
-  }, D.center = function(Q) {
-    return arguments.length ? (o = Q[0] % 360 * Et, u = Q[1] % 360 * Et, j()) : [o * In, u * In];
-  }, D.rotate = function(Q) {
-    return arguments.length ? (a = Q[0] % 360 * Et, l = Q[1] % 360 * Et, c = Q.length > 2 ? Q[2] % 360 * Et : 0, j()) : [a * In, l * In, c * In];
-  }, D.angle = function(Q) {
-    return arguments.length ? (x = Q % 360 * Et, j()) : x * In;
-  }, D.reflectX = function(Q) {
-    return arguments.length ? (h = Q ? -1 : 1, j()) : h < 0;
-  }, D.reflectY = function(Q) {
-    return arguments.length ? (p = Q ? -1 : 1, j()) : p < 0;
-  }, D.precision = function(Q) {
-    return arguments.length ? (b = Kq(S, C = Q * Q), Y()) : Di(C);
-  }, D.fitExtent = function(Q, X) {
-    return X5(D, Q, X);
-  }, D.fitSize = function(Q, X) {
-    return sI(D, Q, X);
-  }, D.fitWidth = function(Q, X) {
-    return oI(D, Q, X);
-  }, D.fitHeight = function(Q, X) {
-    return uI(D, Q, X);
+  function D(G) {
+    return R(G[0] * Et, G[1] * Et);
+  }
+  function k(G) {
+    return G = R.invert(G[0], G[1]), G && [G[0] * In, G[1] * In];
+  }
+  D.stream = function(G) {
+    return O && I === G ? O : O = hDe(pDe(f)(g(b(v(I = G)))));
+  }, D.preclip = function(G) {
+    return arguments.length ? (g = G, m = void 0, Y()) : g;
+  }, D.postclip = function(G) {
+    return arguments.length ? (v = G, y = E = A = _ = null, Y()) : v;
+  }, D.clipAngle = function(G) {
+    return arguments.length ? (g = +G ? JRe(m = G * Et) : (m = null, jq), Y()) : m * In;
+  }, D.clipExtent = function(G) {
+    return arguments.length ? (v = G == null ? (y = E = A = _ = null, Og) : ure(y = +G[0][0], E = +G[0][1], A = +G[1][0], _ = +G[1][1]), Y()) : y == null ? null : [[y, E], [A, _]];
+  }, D.scale = function(G) {
+    return arguments.length ? (r = +G, j()) : r;
+  }, D.translate = function(G) {
+    return arguments.length ? (i = +G[0], s = +G[1], j()) : [i, s];
+  }, D.center = function(G) {
+    return arguments.length ? (o = G[0] % 360 * Et, u = G[1] % 360 * Et, j()) : [o * In, u * In];
+  }, D.rotate = function(G) {
+    return arguments.length ? (a = G[0] % 360 * Et, l = G[1] % 360 * Et, c = G.length > 2 ? G[2] % 360 * Et : 0, j()) : [a * In, l * In, c * In];
+  }, D.angle = function(G) {
+    return arguments.length ? (x = G % 360 * Et, j()) : x * In;
+  }, D.reflectX = function(G) {
+    return arguments.length ? (h = G ? -1 : 1, j()) : h < 0;
+  }, D.reflectY = function(G) {
+    return arguments.length ? (p = G ? -1 : 1, j()) : p < 0;
+  }, D.precision = function(G) {
+    return arguments.length ? (b = Kq(S, C = G * G), Y()) : Di(C);
+  }, D.fitExtent = function(G, X) {
+    return X5(D, G, X);
+  }, D.fitSize = function(G, X) {
+    return sI(D, G, X);
+  }, D.fitWidth = function(G, X) {
+    return oI(D, G, X);
+  }, D.fitHeight = function(G, X) {
+    return uI(D, G, X);
   };
   function j() {
-    var Q = Jq(r, 0, 0, h, p, x).apply(null, e(o, u)), X = Jq(r, i - Q[0], s - Q[1], h, p, x);
+    var G = Jq(r, 0, 0, h, p, x).apply(null, e(o, u)), X = Jq(r, i - G[0], s - G[1], h, p, x);
     return f = rre(a, l, c), S = Tw(e, X), R = Tw(f, S), b = Kq(S, C), Y();
   }
   function Y() {
@@ -76588,13 +76588,13 @@ function A7e(t, e, r, i) {
   }
   return function(c) {
     const f = c.datum.datum.items[i].items, x = f.length, h = c.datum.fontSize, p = Zs.width(c.datum, c.datum.text);
-    let m = r ? h : 0, g = !1, y = !1, E = 0, A, _, v, C, b, S, R, O, I, D, k, j, Y, Q, X, ce, fe;
+    let m = r ? h : 0, g = !1, y = !1, E = 0, A, _, v, C, b, S, R, O, I, D, k, j, Y, G, X, ce, fe;
     for (let te = 0; te < x; ++te) {
-      for (A = f[te].x, v = f[te].y, _ = f[te].x2 === void 0 ? A : f[te].x2, C = f[te].y2 === void 0 ? v : f[te].y2, A > _ && (fe = A, A = _, _ = fe), v > C && (fe = v, v = C, C = fe), I = t(A), k = t(_), D = ~~((I + k) / 2), j = t(v), Q = t(C), Y = ~~((j + Q) / 2), R = D; R >= I; --R)
+      for (A = f[te].x, v = f[te].y, _ = f[te].x2 === void 0 ? A : f[te].x2, C = f[te].y2 === void 0 ? v : f[te].y2, A > _ && (fe = A, A = _, _ = fe), v > C && (fe = v, v = C, C = fe), I = t(A), k = t(_), D = ~~((I + k) / 2), j = t(v), G = t(C), Y = ~~((j + G) / 2), R = D; R >= I; --R)
         for (O = Y; O >= j; --O)
           ce = l(R, O, m, p, h), ce && ([c.x, c.y, m, g] = ce);
       for (R = D; R <= k; ++R)
-        for (O = Y; O <= Q; ++O)
+        for (O = Y; O <= G; ++O)
           ce = l(R, O, m, p, h), ce && ([c.x, c.y, m, g] = ce);
       !g && !r && (X = Math.abs(_ - A + C - v), b = (A + _) / 2, S = (v + C) / 2, X >= E && !cC(b, S, p, h, s, o) && !m0(t, b, S, h, p, h, u, null) && (E = X, c.x = b, c.y = S, y = !0));
     }
@@ -76607,8 +76607,8 @@ function C7e(t, e, r, i) {
   return function(c) {
     const f = c.datum.datum.items[i].items, x = f.length, h = c.datum.fontSize, p = Zs.width(c.datum, c.datum.text), m = [];
     let g = r ? h : 0, y = !1, E = !1, A = 0, _, v, C, b, S, R, O, I, D, k, j, Y;
-    for (let Q = 0; Q < x; ++Q) {
-      for (_ = f[Q].x, C = f[Q].y, v = f[Q].x2 === void 0 ? _ : f[Q].x2, b = f[Q].y2 === void 0 ? C : f[Q].y2, m.push([t((_ + v) / 2), t((C + b) / 2)]); m.length; )
+    for (let G = 0; G < x; ++G) {
+      for (_ = f[G].x, C = f[G].y, v = f[G].x2 === void 0 ? _ : f[G].x2, b = f[G].y2 === void 0 ? C : f[G].y2, m.push([t((_ + v) / 2), t((C + b) / 2)]); m.length; )
         if ([O, I] = m.pop(), !(u.get(O, I) || a.get(O, I) || l.get(O, I))) {
           l.set(O, I);
           for (let X = 0; X < 4; ++X)
@@ -76980,9 +76980,9 @@ function q7e(t, e, r, i, s, o, u) {
   let j = P7e(4, Ad), Y = j7e * u;
   if (j >= Y || -j >= Y || (x = t - O, a = t - (O + x) + (x - s), x = r - I, c = r - (I + x) + (x - s), x = e - D, l = e - (D + x) + (x - o), x = i - k, f = i - (k + x) + (x - o), a === 0 && l === 0 && c === 0 && f === 0) || (Y = U7e * u + k7e * Math.abs(j), j += O * f + k * a - (D * c + I * l), j >= Y || -j >= Y)) return j;
   v = a * k, h = Ir * a, p = h - (h - a), m = a - p, h = Ir * k, g = h - (h - k), y = k - g, C = m * y - (v - p * g - m * g - p * y), b = l * I, h = Ir * l, p = h - (h - l), m = l - p, h = Ir * I, g = h - (h - I), y = I - g, S = m * y - (b - p * g - m * g - p * y), E = C - S, x = C - E, si[0] = C - (E + x) + (x - S), A = v + E, x = A - v, _ = v - (A - x) + (E - x), E = _ - b, x = _ - E, si[1] = _ - (E + x) + (x - b), R = A + E, x = R - A, si[2] = A - (R - x) + (E - x), si[3] = R;
-  const Q = _6(4, Ad, 4, si, AH);
+  const G = _6(4, Ad, 4, si, AH);
   v = O * f, h = Ir * O, p = h - (h - O), m = O - p, h = Ir * f, g = h - (h - f), y = f - g, C = m * y - (v - p * g - m * g - p * y), b = D * c, h = Ir * D, p = h - (h - D), m = D - p, h = Ir * c, g = h - (h - c), y = c - g, S = m * y - (b - p * g - m * g - p * y), E = C - S, x = C - E, si[0] = C - (E + x) + (x - S), A = v + E, x = A - v, _ = v - (A - x) + (E - x), E = _ - b, x = _ - E, si[1] = _ - (E + x) + (x - b), R = A + E, x = R - A, si[2] = A - (R - x) + (E - x), si[3] = R;
-  const X = _6(Q, AH, 4, si, _H);
+  const X = _6(G, AH, 4, si, _H);
   v = a * f, h = Ir * a, p = h - (h - a), m = a - p, h = Ir * f, g = h - (h - f), y = f - g, C = m * y - (v - p * g - m * g - p * y), b = l * c, h = Ir * l, p = h - (h - l), m = l - p, h = Ir * c, g = h - (h - c), y = c - g, S = m * y - (b - p * g - m * g - p * y), E = C - S, x = C - E, si[0] = C - (E + x) + (x - S), A = v + E, x = A - v, _ = v - (A - x) + (E - x), E = _ - b, x = _ - E, si[1] = _ - (E + x) + (x - b), R = A + E, x = R - A, si[2] = A - (R - x) + (E - x), si[3] = R;
   const ce = _6(X, _H, 4, si, vH);
   return vH[ce - 1];
@@ -77061,13 +77061,13 @@ class fC {
     for (let O = 0, I, D; O < this._ids.length; O++) {
       const k = this._ids[O], j = e[2 * k], Y = e[2 * k + 1];
       if (O > 0 && Math.abs(j - I) <= CH && Math.abs(Y - D) <= CH || (I = j, D = Y, k === p || k === m || k === g)) continue;
-      let Q = 0;
-      for (let oe = 0, xe = this._hashKey(j, Y); oe < this._hashSize && (Q = o[(xe + oe) % this._hashSize], !(Q !== -1 && Q !== i[Q])); oe++)
+      let G = 0;
+      for (let oe = 0, xe = this._hashKey(j, Y); oe < this._hashSize && (G = o[(xe + oe) % this._hashSize], !(G !== -1 && G !== i[G])); oe++)
         ;
-      Q = r[Q];
-      let X = Q, ce;
+      G = r[G];
+      let X = G, ce;
       for (; ce = i[X], mA(j, Y, e[2 * X], e[2 * X + 1], e[2 * ce], e[2 * ce + 1]) >= 0; )
-        if (X = ce, X === Q) {
+        if (X = ce, X === G) {
           X = -1;
           break;
         }
@@ -77077,7 +77077,7 @@ class fC {
       let te = i[X];
       for (; ce = i[te], mA(j, Y, e[2 * te], e[2 * te + 1], e[2 * ce], e[2 * ce + 1]) < 0; )
         fe = this._addTriangle(te, k, ce, s[k], -1, s[te]), s[k] = this._legalize(fe + 2), i[te] = te, R--, te = ce;
-      if (X === Q)
+      if (X === G)
         for (; ce = r[X], mA(j, Y, e[2 * ce], e[2 * ce + 1], e[2 * X], e[2 * X + 1]) < 0; )
           fe = this._addTriangle(ce, k, X, -1, s[X], s[ce]), this._legalize(fe + 2), s[ce] = fe, i[X] = X, R--, X = ce;
       this._hullStart = r[k] = X, i[X] = r[te] = k, i[k] = te, o[this._hashKey(j, Y)] = k, o[this._hashKey(e[2 * X], e[2 * X + 1])] = X;
@@ -77256,18 +77256,18 @@ let Y7e = class {
     let o, u;
     const a = this.circumcenters = this._circumcenters.subarray(0, i.length / 3 * 2);
     for (let g = 0, y = 0, E = i.length, A, _; g < E; g += 3, y += 2) {
-      const v = i[g] * 2, C = i[g + 1] * 2, b = i[g + 2] * 2, S = e[v], R = e[v + 1], O = e[C], I = e[C + 1], D = e[b], k = e[b + 1], j = O - S, Y = I - R, Q = D - S, X = k - R, ce = (j * X - Y * Q) * 2;
+      const v = i[g] * 2, C = i[g + 1] * 2, b = i[g + 2] * 2, S = e[v], R = e[v + 1], O = e[C], I = e[C + 1], D = e[b], k = e[b + 1], j = O - S, Y = I - R, G = D - S, X = k - R, ce = (j * X - Y * G) * 2;
       if (Math.abs(ce) < 1e-9) {
         if (o === void 0) {
           o = u = 0;
           for (const te of r) o += e[te * 2], u += e[te * 2 + 1];
           o /= r.length, u /= r.length;
         }
-        const fe = 1e9 * Math.sign((o - S) * X - (u - R) * Q);
-        A = (S + D) / 2 - fe * X, _ = (R + k) / 2 + fe * Q;
+        const fe = 1e9 * Math.sign((o - S) * X - (u - R) * G);
+        A = (S + D) / 2 - fe * X, _ = (R + k) / 2 + fe * G;
       } else {
-        const fe = 1 / ce, te = j * j + Y * Y, oe = Q * Q + X * X;
-        A = S + (X * te - Y * oe) * fe, _ = R + (j * oe - Q * te) * fe;
+        const fe = 1 / ce, te = j * j + Y * Y, oe = G * G + X * X;
+        A = S + (X * te - Y * oe) * fe, _ = R + (j * oe - G * te) * fe;
       }
       a[y] = A, a[y + 1] = _;
     }
@@ -77735,10 +77735,10 @@ function uwe() {
   function p(m, g, y) {
     for (var E = g.x, A = g.y, _ = Math.hypot(t[0], t[1]), v = l(t), C = f() < 0.5 ? 1 : -1, b = -C, S, R, O; (S = v(b += C)) && (R = ~~S[0], O = ~~S[1], !(Math.min(Math.abs(R), Math.abs(O)) >= _)); )
       if (g.x = E + R, g.y = A + O, !(g.x + g.x0 < 0 || g.y + g.y0 < 0 || g.x + g.x1 > t[0] || g.y + g.y1 > t[1]) && (!y || !lwe(g, m, t[0])) && (!y || fwe(g, y))) {
-        for (var I = g.sprite, D = g.width >> 5, k = t[0] >> 5, j = g.x - (D << 4), Y = j & 127, Q = 32 - Y, X = g.y1 - g.y0, ce = (g.y + g.y0) * k + (j >> 5), fe, te = 0; te < X; te++) {
+        for (var I = g.sprite, D = g.width >> 5, k = t[0] >> 5, j = g.x - (D << 4), Y = j & 127, G = 32 - Y, X = g.y1 - g.y0, ce = (g.y + g.y0) * k + (j >> 5), fe, te = 0; te < X; te++) {
           fe = 0;
           for (var oe = 0; oe <= D; oe++)
-            m[ce + oe] |= fe << Q | (oe < D ? (fe = I[te * D + oe]) >>> Y : 0);
+            m[ce + oe] |= fe << G | (oe < D ? (fe = I[te * D + oe]) >>> Y : 0);
           ce += k;
         }
         return g.sprite = null, !0;
@@ -84797,13 +84797,13 @@ function xoe(t, { config: e }) {
     c,
     // TODO: https://github.com/vega/vega-lite/issues/6245
     e
-  ), h = foe(f), { bins: p, timeUnits: m, transform: g, continuousAxisChannelDef: y, continuousAxis: E, groupby: A, aggregate: _, encodingWithoutContinuousAxis: v, ticksOrient: C, boxOrient: b, customTooltipWithoutAggregatedField: S } = lke(t, f, e), { color: R, size: O } = v, I = N_(v, ["color", "size"]), D = (Z) => L$(c, E, y, Z, e.boxplot), k = D(I), j = D(v), Y = D(Object.assign(Object.assign({}, I), O ? { size: O } : {})), Q = y8([
+  ), h = foe(f), { bins: p, timeUnits: m, transform: g, continuousAxisChannelDef: y, continuousAxis: E, groupby: A, aggregate: _, encodingWithoutContinuousAxis: v, ticksOrient: C, boxOrient: b, customTooltipWithoutAggregatedField: S } = lke(t, f, e), { color: R, size: O } = v, I = N_(v, ["color", "size"]), D = (Z) => L$(c, E, y, Z, e.boxplot), k = D(I), j = D(v), Y = D(Object.assign(Object.assign({}, I), O ? { size: O } : {})), G = y8([
     { fieldPrefix: h === "min-max" ? "upper_whisker_" : "max_", titlePrefix: "Max" },
     { fieldPrefix: "upper_box_", titlePrefix: "Q3" },
     { fieldPrefix: "mid_box_", titlePrefix: "Median" },
     { fieldPrefix: "lower_box_", titlePrefix: "Q1" },
     { fieldPrefix: h === "min-max" ? "lower_whisker_" : "min_", titlePrefix: "Min" }
-  ], y, v), X = { type: "tick", color: "black", opacity: 1, orient: C, invalid: null, aria: !1 }, ce = h === "min-max" ? Q : (
+  ], y, v), X = { type: "tick", color: "black", opacity: 1, orient: C, invalid: null, aria: !1 }, ce = h === "min-max" ? G : (
     // for tukey / k-IQR, just show upper/lower-whisker
     y8([
       { fieldPrefix: "upper_whisker_", titlePrefix: "Upper Whisker" },
@@ -84843,13 +84843,13 @@ function xoe(t, { config: e }) {
       mark: Object.assign(Object.assign({ type: "bar" }, x ? { size: x } : {}), { orient: b, invalid: null, ariaRoleDescription: "box" }),
       positionPrefix: "lower_box",
       endPositionPrefix: "upper_box",
-      extraEncoding: Q
+      extraEncoding: G
     }),
     ...Y({
       partName: "median",
       mark: Object.assign(Object.assign(Object.assign({ type: "tick", invalid: null }, Ge(e.boxplot.median) && e.boxplot.median.color ? { color: e.boxplot.median.color } : {}), x ? { size: x } : {}), { orient: C, aria: !1 }),
       positionPrefix: "mid_box",
-      extraEncoding: Q
+      extraEncoding: G
     })
   ];
   if (h === "min-max")
@@ -84891,18 +84891,18 @@ function xoe(t, { config: e }) {
       }
     ],
     layer: fe
-  }, z = N_(I, ["tooltip"]), { scale: w, axis: P } = y, U = N$(y), W = Xs(P, ["title"]), M = aoe(c, "outliers", e.boxplot, {
+  }, Q = N_(I, ["tooltip"]), { scale: w, axis: P } = y, U = N$(y), W = Xs(P, ["title"]), M = aoe(c, "outliers", e.boxplot, {
     transform: [{ filter: `(${L} < ${$}) || (${L} > ${N})` }],
     mark: "point",
-    encoding: Object.assign(Object.assign(Object.assign({ [E]: Object.assign(Object.assign(Object.assign({ field: y.field, type: y.type }, U !== void 0 ? { title: U } : {}), w !== void 0 ? { scale: w } : {}), en(W) ? {} : { axis: W }) }, z), R ? { color: R } : {}), S ? { tooltip: S } : {})
+    encoding: Object.assign(Object.assign(Object.assign({ [E]: Object.assign(Object.assign(Object.assign({ field: y.field, type: y.type }, U !== void 0 ? { title: U } : {}), w !== void 0 ? { scale: w } : {}), en(W) ? {} : { axis: W }) }, Q), R ? { color: R } : {}), S ? { tooltip: S } : {})
   })[0];
-  let G;
+  let z;
   const H = [...p, ...m, q];
-  return M ? G = {
+  return M ? z = {
     transform: H,
     layer: [M, V]
-  } : (G = V, G.transform.unshift(...H)), Object.assign(Object.assign({}, l), { layer: [
-    G,
+  } : (z = V, z.transform.unshift(...H)), Object.assign(Object.assign({}, l), { layer: [
+    z,
     {
       // boxplot
       transform: g,
@@ -85082,7 +85082,7 @@ function poe(t, e, r) {
   C[R];
   const O = y === "x" ? "xError2" : "yError2";
   C[O];
-  const I = bQ(C, [typeof b == "symbol" ? b : b + "", typeof S == "symbol" ? S : S + "", typeof R == "symbol" ? R : R + "", typeof O == "symbol" ? O : O + ""]), { bins: D, timeUnits: k, aggregate: j, groupby: Y, encoding: Q } = soe(I, r), X = [...j, ...E], ce = x !== "raw" ? [] : Y, fe = y8(_, h, Q, v);
+  const I = bQ(C, [typeof b == "symbol" ? b : b + "", typeof S == "symbol" ? S : S + "", typeof R == "symbol" ? R : R + "", typeof O == "symbol" ? O : O + ""]), { bins: D, timeUnits: k, aggregate: j, groupby: Y, encoding: G } = soe(I, r), X = [...j, ...E], ce = x !== "raw" ? [] : Y, fe = y8(_, h, G, v);
   return {
     transform: [
       ...(i = l.transform) !== null && i !== void 0 ? i : [],
@@ -85094,7 +85094,7 @@ function poe(t, e, r) {
     groupby: ce,
     continuousAxisChannelDef: h,
     continuousAxis: y,
-    encodingWithoutContinuousAxis: Q,
+    encodingWithoutContinuousAxis: G,
     ticksOrient: f === "vertical" ? "horizontal" : "vertical",
     markDef: c,
     outerSpec: l,
@@ -96915,10 +96915,10 @@ var Uze = function(e) {
     return l(ee) === "[object Set]";
   }
   Y.working = typeof Set < "u" && Y(/* @__PURE__ */ new Set());
-  function Q(ee) {
+  function G(ee) {
     return typeof Set > "u" ? !1 : Y.working ? Y(ee) : ee instanceof Set;
   }
-  t.isSet = Q;
+  t.isSet = G;
   function X(ee) {
     return l(ee) === "[object WeakMap]";
   }
@@ -96963,10 +96963,10 @@ var Uze = function(e) {
     return l(ee) === "[object AsyncFunction]";
   }
   t.isAsyncFunction = V;
-  function z(ee) {
+  function Q(ee) {
     return l(ee) === "[object Map Iterator]";
   }
-  t.isMapIterator = z;
+  t.isMapIterator = Q;
   function w(ee) {
     return l(ee) === "[object Set Iterator]";
   }
@@ -96987,10 +96987,10 @@ var Uze = function(e) {
     return m(ee, f);
   }
   t.isStringObject = M;
-  function G(ee) {
+  function z(ee) {
     return m(ee, x);
   }
-  t.isBooleanObject = G;
+  t.isBooleanObject = z;
   function H(ee) {
     return u && m(ee, h);
   }
@@ -97000,7 +97000,7 @@ var Uze = function(e) {
   }
   t.isSymbolObject = Z;
   function he(ee) {
-    return W(ee) || M(ee) || G(ee) || H(ee) || Z(ee);
+    return W(ee) || M(ee) || z(ee) || H(ee) || Z(ee);
   }
   t.isBoxedPrimitive = he;
   function ue(ee) {
@@ -97048,7 +97048,7 @@ var Gze = xF.exports;
         N.push(a(arguments[L]));
       return N.join(" ");
     }
-    for (var L = 1, q = arguments, V = q.length, z = String($).replace(i, function(P) {
+    for (var L = 1, q = arguments, V = q.length, Q = String($).replace(i, function(P) {
       if (P === "%%") return "%";
       if (L >= V) return P;
       switch (P) {
@@ -97066,8 +97066,8 @@ var Gze = xF.exports;
           return P;
       }
     }), w = q[L]; L < V; w = q[++L])
-      _(w) || !I(w) ? z += " " + w : z += " " + a(w);
-    return z;
+      _(w) || !I(w) ? Q += " " + w : Q += " " + a(w);
+    return Q;
   }, t.deprecate = function($, N) {
     if (typeof process < "u" && process.noDeprecation === !0)
       return $;
@@ -97159,10 +97159,10 @@ var Gze = xF.exports;
     var V = h($, N);
     if (V)
       return V;
-    var z = Object.keys(N), w = f(z);
-    if ($.showHidden && (z = Object.getOwnPropertyNames(N)), k(N) && (z.indexOf("message") >= 0 || z.indexOf("description") >= 0))
+    var Q = Object.keys(N), w = f(Q);
+    if ($.showHidden && (Q = Object.getOwnPropertyNames(N)), k(N) && (Q.indexOf("message") >= 0 || Q.indexOf("description") >= 0))
       return p(N);
-    if (z.length === 0) {
+    if (Q.length === 0) {
       if (j(N)) {
         var P = N.name ? ": " + N.name : "";
         return $.stylize("[Function" + P + "]", "special");
@@ -97176,16 +97176,16 @@ var Gze = xF.exports;
     }
     var U = "", W = !1, M = ["{", "}"];
     if (E(N) && (W = !0, M = ["[", "]"]), j(N)) {
-      var G = N.name ? ": " + N.name : "";
-      U = " [Function" + G + "]";
+      var z = N.name ? ": " + N.name : "";
+      U = " [Function" + z + "]";
     }
-    if (O(N) && (U = " " + RegExp.prototype.toString.call(N)), D(N) && (U = " " + Date.prototype.toUTCString.call(N)), k(N) && (U = " " + p(N)), z.length === 0 && (!W || N.length == 0))
+    if (O(N) && (U = " " + RegExp.prototype.toString.call(N)), D(N) && (U = " " + Date.prototype.toUTCString.call(N)), k(N) && (U = " " + p(N)), Q.length === 0 && (!W || N.length == 0))
       return M[0] + U + M[1];
     if (L < 0)
       return O(N) ? $.stylize(RegExp.prototype.toString.call(N), "regexp") : $.stylize("[Object]", "special");
     $.seen.push(N);
     var H;
-    return W ? H = m($, N, L, w, z) : H = z.map(function(Z) {
+    return W ? H = m($, N, L, w, Q) : H = Q.map(function(Z) {
       return g($, N, L, w, Z, W);
     }), $.seen.pop(), y(H, U, M);
   }
@@ -97207,17 +97207,17 @@ var Gze = xF.exports;
     return "[" + Error.prototype.toString.call($) + "]";
   }
   function m($, N, L, q, V) {
-    for (var z = [], w = 0, P = N.length; w < P; ++w)
-      te(N, String(w)) ? z.push(g(
+    for (var Q = [], w = 0, P = N.length; w < P; ++w)
+      te(N, String(w)) ? Q.push(g(
         $,
         N,
         L,
         q,
         String(w),
         !0
-      )) : z.push("");
+      )) : Q.push("");
     return V.forEach(function(U) {
-      U.match(/^\d+$/) || z.push(g(
+      U.match(/^\d+$/) || Q.push(g(
         $,
         N,
         L,
@@ -97225,12 +97225,12 @@ var Gze = xF.exports;
         U,
         !0
       ));
-    }), z;
+    }), Q;
   }
-  function g($, N, L, q, V, z) {
+  function g($, N, L, q, V, Q) {
     var w, P, U;
     if (U = Object.getOwnPropertyDescriptor(N, V) || { value: N[V] }, U.get ? U.set ? P = $.stylize("[Getter/Setter]", "special") : P = $.stylize("[Getter]", "special") : U.set && (P = $.stylize("[Setter]", "special")), te(q, V) || (w = "[" + V + "]"), P || ($.seen.indexOf(U.value) < 0 ? (_(L) ? P = x($, U.value, null) : P = x($, U.value, L - 1), P.indexOf(`
-`) > -1 && (z ? P = P.split(`
+`) > -1 && (Q ? P = P.split(`
 `).map(function(W) {
       return "  " + W;
     }).join(`
@@ -97240,16 +97240,16 @@ var Gze = xF.exports;
       return "   " + W;
     }).join(`
 `))) : P = $.stylize("[Circular]", "special")), R(w)) {
-      if (z && V.match(/^\d+$/))
+      if (Q && V.match(/^\d+$/))
         return P;
       w = JSON.stringify("" + V), w.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/) ? (w = w.slice(1, -1), w = $.stylize(w, "name")) : (w = w.replace(/'/g, "\\'").replace(/\\"/g, '"').replace(/(^"|"$)/g, "'"), w = $.stylize(w, "string"));
     }
     return w + ": " + P;
   }
   function y($, N, L) {
-    var q = $.reduce(function(V, z) {
-      return z.indexOf(`
-`) >= 0, V + z.replace(/\u001b\[\d\d?m/g, "").length + 1;
+    var q = $.reduce(function(V, Q) {
+      return Q.indexOf(`
+`) >= 0, V + Q.replace(/\u001b\[\d\d?m/g, "").length + 1;
     }, 0);
     return q > 60 ? L[0] + (N === "" ? "" : N + `
  `) + " " + $.join(`,
@@ -97289,7 +97289,7 @@ var Gze = xF.exports;
   }
   t.isUndefined = R;
   function O($) {
-    return I($) && Q($) === "[object RegExp]";
+    return I($) && G($) === "[object RegExp]";
   }
   t.isRegExp = O, t.types.isRegExp = O;
   function I($) {
@@ -97297,11 +97297,11 @@ var Gze = xF.exports;
   }
   t.isObject = I;
   function D($) {
-    return I($) && Q($) === "[object Date]";
+    return I($) && G($) === "[object Date]";
   }
   t.isDate = D, t.types.isDate = D;
   function k($) {
-    return I($) && (Q($) === "[object Error]" || $ instanceof Error);
+    return I($) && (G($) === "[object Error]" || $ instanceof Error);
   }
   t.isError = k, t.types.isNativeError = k;
   function j($) {
@@ -97313,7 +97313,7 @@ var Gze = xF.exports;
     typeof $ > "u";
   }
   t.isPrimitive = Y, t.isBuffer = zze;
-  function Q($) {
+  function G($) {
     return Object.prototype.toString.call($);
   }
   function X($) {
@@ -97368,7 +97368,7 @@ var Gze = xF.exports;
       }), L;
     }
     function L() {
-      for (var q, V, z = new Promise(function(U, W) {
+      for (var q, V, Q = new Promise(function(U, W) {
         q = U, V = W;
       }), w = [], P = 0; P < arguments.length; P++)
         w.push(arguments[P]);
@@ -97380,7 +97380,7 @@ var Gze = xF.exports;
       } catch (U) {
         V(U);
       }
-      return z;
+      return Q;
     }
     return Object.setPrototypeOf(L, Object.getPrototypeOf(N)), oe && Object.defineProperty(L, oe, {
       value: L,
@@ -97408,8 +97408,8 @@ var Gze = xF.exports;
       var V = L.pop();
       if (typeof V != "function")
         throw new TypeError("The last argument must be of type Function");
-      var z = this, w = function() {
-        return V.apply(z, arguments);
+      var Q = this, w = function() {
+        return V.apply(Q, arguments);
       };
       $.apply(this, L).then(
         function(P) {
@@ -97675,8 +97675,8 @@ function Wze() {
     return m() ? p = Reflect.construct.bind() : p = function($, N, L) {
       var q = [null];
       q.push.apply(q, N);
-      var V = Function.bind.apply($, q), z = new V();
-      return L && y(z, L.prototype), z;
+      var V = Function.bind.apply($, q), Q = new V();
+      return L && y(Q, L.prototype), Q;
     }, p.apply(null, arguments);
   }
   function m() {
@@ -97734,7 +97734,7 @@ function Wze() {
     notEqual: 'Expected "actual" to be loosely unequal to:',
     notIdentical: "Values identical but not reference-equal:"
   }, Y = 10;
-  function Q(te) {
+  function G(te) {
     var oe = Object.keys(te), xe = Object.create(Object.getPrototypeOf(te));
     return oe.forEach(function(Se) {
       xe[Se] = te[Se];
@@ -97764,31 +97764,31 @@ function Wze() {
     });
   }
   function ce(te, oe, xe) {
-    var Se = "", $ = "", N = 0, L = "", q = !1, V = X(te), z = V.split(`
+    var Se = "", $ = "", N = 0, L = "", q = !1, V = X(te), Q = V.split(`
 `), w = X(oe).split(`
 `), P = 0, U = "";
-    if (xe === "strictEqual" && A(te) === "object" && A(oe) === "object" && te !== null && oe !== null && (xe = "strictEqualObject"), z.length === 1 && w.length === 1 && z[0] !== w[0]) {
-      var W = z[0].length + w[0].length;
+    if (xe === "strictEqual" && A(te) === "object" && A(oe) === "object" && te !== null && oe !== null && (xe = "strictEqualObject"), Q.length === 1 && w.length === 1 && Q[0] !== w[0]) {
+      var W = Q[0].length + w[0].length;
       if (W <= Y) {
         if ((A(te) !== "object" || te === null) && (A(oe) !== "object" || oe === null) && (te !== 0 || oe !== 0))
           return "".concat(j[xe], `
 
-`) + "".concat(z[0], " !== ").concat(w[0], `
+`) + "".concat(Q[0], " !== ").concat(w[0], `
 `);
       } else if (xe !== "strictEqualObject") {
         var M = process.stderr && process.stderr.isTTY ? process.stderr.columns : 80;
         if (W < M) {
-          for (; z[0][P] === w[0][P]; )
+          for (; Q[0][P] === w[0][P]; )
             P++;
           P > 2 && (U = `
   `.concat(R(" ", P), "^"), P = 0);
         }
       }
     }
-    for (var G = z[z.length - 1], H = w[w.length - 1]; G === H && (P++ < 2 ? L = `
-  `.concat(G).concat(L) : Se = G, z.pop(), w.pop(), !(z.length === 0 || w.length === 0)); )
-      G = z[z.length - 1], H = w[w.length - 1];
-    var Z = Math.max(z.length, w.length);
+    for (var z = Q[Q.length - 1], H = w[w.length - 1]; z === H && (P++ < 2 ? L = `
+  `.concat(z).concat(L) : Se = z, Q.pop(), w.pop(), !(Q.length === 0 || w.length === 0)); )
+      z = Q[Q.length - 1], H = w[w.length - 1];
+    var Z = Math.max(Q.length, w.length);
     if (Z === 0) {
       var he = V.split(`
 `);
@@ -97808,7 +97808,7 @@ function Wze() {
 `.concat(I, "+ actual").concat(k, " ").concat(D, "- expected").concat(k), le = " ".concat(O, "...").concat(k, " Lines skipped");
     for (P = 0; P < Z; P++) {
       var Me = P - N;
-      if (z.length < P + 1)
+      if (Q.length < P + 1)
         Me > 1 && P > 2 && (Me > 4 ? ($ += `
 `.concat(O, "...").concat(k), q = !0) : Me > 3 && ($ += `
   `.concat(w[P - 2]), ue++), $ += `
@@ -97817,15 +97817,15 @@ function Wze() {
       else if (w.length < P + 1)
         Me > 1 && P > 2 && (Me > 4 ? ($ += `
 `.concat(O, "...").concat(k), q = !0) : Me > 3 && ($ += `
-  `.concat(z[P - 2]), ue++), $ += `
-  `.concat(z[P - 1]), ue++), N = P, $ += `
-`.concat(I, "+").concat(k, " ").concat(z[P]), ue++;
+  `.concat(Q[P - 2]), ue++), $ += `
+  `.concat(Q[P - 1]), ue++), N = P, $ += `
+`.concat(I, "+").concat(k, " ").concat(Q[P]), ue++;
       else {
-        var at = w[P], _t = z[P], ie = _t !== at && (!S(_t, ",") || _t.slice(0, -1) !== at);
+        var at = w[P], _t = Q[P], ie = _t !== at && (!S(_t, ",") || _t.slice(0, -1) !== at);
         ie && S(at, ",") && at.slice(0, -1) === _t && (ie = !1, _t += ","), ie ? (Me > 1 && P > 2 && (Me > 4 ? ($ += `
 `.concat(O, "...").concat(k), q = !0) : Me > 3 && ($ += `
-  `.concat(z[P - 2]), ue++), $ += `
-  `.concat(z[P - 1]), ue++), N = P, $ += `
+  `.concat(Q[P - 2]), ue++), $ += `
+  `.concat(Q[P - 1]), ue++), N = P, $ += `
 `.concat(I, "+").concat(k, " ").concat(_t), Se += `
 `.concat(D, "-").concat(k, " ").concat(at), ue += 2) : ($ += Se, Se = "", (Me === 1 || P === 0) && ($ += `
   `.concat(_t), ue++));
@@ -97846,15 +97846,15 @@ function Wze() {
       var N;
       if (i(this, Se), A($) !== "object" || $ === null)
         throw new b("options", "Object", $);
-      var L = $.message, q = $.operator, V = $.stackStartFn, z = $.actual, w = $.expected, P = Error.stackTraceLimit;
+      var L = $.message, q = $.operator, V = $.stackStartFn, Q = $.actual, w = $.expected, P = Error.stackTraceLimit;
       if (Error.stackTraceLimit = 0, L != null)
         N = xe.call(this, String(L));
-      else if (process.stderr && process.stderr.isTTY && (process.stderr && process.stderr.getColorDepth && process.stderr.getColorDepth() !== 1 ? (O = "\x1B[34m", I = "\x1B[32m", k = "\x1B[39m", D = "\x1B[31m") : (O = "", I = "", k = "", D = "")), A(z) === "object" && z !== null && A(w) === "object" && w !== null && "stack" in z && z instanceof Error && "stack" in w && w instanceof Error && (z = Q(z), w = Q(w)), q === "deepStrictEqual" || q === "strictEqual")
-        N = xe.call(this, ce(z, w, q));
+      else if (process.stderr && process.stderr.isTTY && (process.stderr && process.stderr.getColorDepth && process.stderr.getColorDepth() !== 1 ? (O = "\x1B[34m", I = "\x1B[32m", k = "\x1B[39m", D = "\x1B[31m") : (O = "", I = "", k = "", D = "")), A(Q) === "object" && Q !== null && A(w) === "object" && w !== null && "stack" in Q && Q instanceof Error && "stack" in w && w instanceof Error && (Q = G(Q), w = G(w)), q === "deepStrictEqual" || q === "strictEqual")
+        N = xe.call(this, ce(Q, w, q));
       else if (q === "notDeepStrictEqual" || q === "notStrictEqual") {
-        var U = j[q], W = X(z).split(`
+        var U = j[q], W = X(Q).split(`
 `);
-        if (q === "notStrictEqual" && A(z) === "object" && z !== null && (U = j.notStrictEqualObject), W.length > 30)
+        if (q === "notStrictEqual" && A(Q) === "object" && Q !== null && (U = j.notStrictEqualObject), W.length > 30)
           for (W[26] = "".concat(O, "...").concat(k); W.length > 27; )
             W.pop();
         W.length === 1 ? N = xe.call(this, "".concat(U, " ").concat(W[0])) : N = xe.call(this, "".concat(U, `
@@ -97863,23 +97863,23 @@ function Wze() {
 `), `
 `));
       } else {
-        var M = X(z), G = "", H = j[q];
+        var M = X(Q), z = "", H = j[q];
         q === "notDeepEqual" || q === "notEqual" ? (M = "".concat(j[q], `
 
-`).concat(M), M.length > 1024 && (M = "".concat(M.slice(0, 1021), "..."))) : (G = "".concat(X(w)), M.length > 512 && (M = "".concat(M.slice(0, 509), "...")), G.length > 512 && (G = "".concat(G.slice(0, 509), "...")), q === "deepEqual" || q === "equal" ? M = "".concat(H, `
+`).concat(M), M.length > 1024 && (M = "".concat(M.slice(0, 1021), "..."))) : (z = "".concat(X(w)), M.length > 512 && (M = "".concat(M.slice(0, 509), "...")), z.length > 512 && (z = "".concat(z.slice(0, 509), "...")), q === "deepEqual" || q === "equal" ? M = "".concat(H, `
 
 `).concat(M, `
 
 should equal
 
-`) : G = " ".concat(q, " ").concat(G)), N = xe.call(this, "".concat(M).concat(G));
+`) : z = " ".concat(q, " ").concat(z)), N = xe.call(this, "".concat(M).concat(z));
       }
       return Error.stackTraceLimit = P, N.generatedMessage = !L, Object.defineProperty(x(N), "name", {
         value: "AssertionError [ERR_ASSERTION]",
         enumerable: !1,
         writable: !0,
         configurable: !0
-      }), N.code = "ERR_ASSERTION", N.actual = z, N.expected = w, N.operator = q, Error.captureStackTrace && Error.captureStackTrace(x(N), V), N.stack, N.name = "AssertionError", f(N);
+      }), N.code = "ERR_ASSERTION", N.actual = Q, N.expected = w, N.operator = q, Error.captureStackTrace && Error.captureStackTrace(x(N), V), N.stack, N.name = "AssertionError", f(N);
     }
     return o(Se, [{
       key: "toString",
@@ -98211,7 +98211,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
   function p(ie) {
     return ie.call.bind(ie);
   }
-  var m = p(Object.prototype.hasOwnProperty), g = p(Object.prototype.propertyIsEnumerable), y = p(Object.prototype.toString), E = W0.types, A = E.isAnyArrayBuffer, _ = E.isArrayBufferView, v = E.isDate, C = E.isMap, b = E.isRegExp, S = E.isSet, R = E.isNativeError, O = E.isBoxedPrimitive, I = E.isNumberObject, D = E.isStringObject, k = E.isBooleanObject, j = E.isBigIntObject, Y = E.isSymbolObject, Q = E.isFloat32Array, X = E.isFloat64Array;
+  var m = p(Object.prototype.hasOwnProperty), g = p(Object.prototype.propertyIsEnumerable), y = p(Object.prototype.toString), E = W0.types, A = E.isAnyArrayBuffer, _ = E.isArrayBufferView, v = E.isDate, C = E.isMap, b = E.isRegExp, S = E.isSet, R = E.isNativeError, O = E.isBoxedPrimitive, I = E.isNumberObject, D = E.isStringObject, k = E.isBooleanObject, j = E.isBigIntObject, Y = E.isSymbolObject, G = E.isFloat32Array, X = E.isFloat64Array;
   function ce(ie) {
     if (ie.length === 0 || ie.length > 10) return !0;
     for (var ae = 0; ae < ie.length; ae++) {
@@ -98251,7 +98251,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
         return !1;
     return !0;
   }
-  function z(ie, ae) {
+  function Q(ie, ae) {
     return ie.byteLength !== ae.byteLength ? !1 : te(new Uint8Array(ie.buffer, ie.byteOffset, ie.byteLength), new Uint8Array(ae.buffer, ae.byteOffset, ae.byteLength)) === 0;
   }
   function w(ie, ae) {
@@ -98295,10 +98295,10 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       if (ie.message !== ae.message || ie.name !== ae.name)
         return !1;
     } else if (_(ie)) {
-      if (!we && (Q(ie) || X(ie))) {
+      if (!we && (G(ie) || X(ie))) {
         if (!V(ie, ae))
           return !1;
-      } else if (!z(ie, ae))
+      } else if (!Q(ie, ae))
         return !1;
       var K = fe(ie), Re = fe(ae);
       return K.length !== Re.length ? !1 : M(ie, ae, we, Qe, Se, K);
@@ -98373,7 +98373,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     var vt = Me(ie, ae, we, Le, Qe, qe);
     return Qe.val1.delete(ie), Qe.val2.delete(ae), vt;
   }
-  function G(ie, ae, we, Qe) {
+  function z(ie, ae, we, Qe) {
     for (var qe = l(ie), Le = 0; Le < qe.length; Le++) {
       var ye = qe[Le];
       if (U(ae, ye, we, Qe))
@@ -98423,8 +98423,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       for (var K = l(ae), Re = 0; Re < K.length; Re++) {
         var J = K[Re];
         if (u(J) === "object" && J !== null) {
-          if (!G(qe, J, we, Qe)) return !1;
-        } else if (!we && !ie.has(J) && !G(qe, J, we, Qe))
+          if (!z(qe, J, we, Qe)) return !1;
+        } else if (!we && !ie.has(J) && !z(qe, J, we, Qe))
           return !1;
       }
       return qe.size === 0;
@@ -98533,7 +98533,7 @@ function Oi() {
   function O(N) {
     throw N.message instanceof Error ? N.message : new f(N);
   }
-  function I(N, L, q, V, z) {
+  function I(N, L, q, V, Q) {
     var w = arguments.length, P;
     if (w === 0)
       P = "Failed";
@@ -98552,7 +98552,7 @@ function Oi() {
       actual: N,
       expected: L,
       operator: V === void 0 ? "fail" : V,
-      stackStartFn: z || I
+      stackStartFn: Q || I
     };
     q !== void 0 && (W.message = q);
     var M = new f(W);
@@ -98561,9 +98561,9 @@ function Oi() {
   S.fail = I, S.AssertionError = f;
   function D(N, L, q, V) {
     if (!q) {
-      var z = !1;
+      var Q = !1;
       if (L === 0)
-        z = !0, V = "No value argument passed to `assert.ok()`";
+        Q = !0, V = "No value argument passed to `assert.ok()`";
       else if (V instanceof Error)
         throw V;
       var w = new f({
@@ -98573,7 +98573,7 @@ function Oi() {
         operator: "==",
         stackStartFn: N
       });
-      throw w.generatedMessage = z, w;
+      throw w.generatedMessage = Q, w;
     }
   }
   function k() {
@@ -98665,15 +98665,15 @@ function Oi() {
     });
   };
   var Y = /* @__PURE__ */ e(function N(L, q, V) {
-    var z = this;
+    var Q = this;
     r(this, N), q.forEach(function(w) {
-      w in L && (V !== void 0 && typeof V[w] == "string" && g(L[w]) && A(L[w], V[w]) ? z[w] = V[w] : z[w] = L[w]);
+      w in L && (V !== void 0 && typeof V[w] == "string" && g(L[w]) && A(L[w], V[w]) ? Q[w] = V[w] : Q[w] = L[w]);
     });
   });
-  function Q(N, L, q, V, z, w) {
+  function G(N, L, q, V, Q, w) {
     if (!(q in N) || !v(N[q], L[q])) {
       if (!V) {
-        var P = new Y(N, z), U = new Y(L, z, N), W = new f({
+        var P = new Y(N, Q), U = new Y(L, Q, N), W = new f({
           actual: P,
           expected: U,
           operator: "deepStrictEqual",
@@ -98696,14 +98696,14 @@ function Oi() {
       if (arguments.length === 2)
         throw new u("expected", ["Function", "RegExp"], L);
       if (t(N) !== "object" || N === null) {
-        var z = new f({
+        var Q = new f({
           actual: N,
           expected: L,
           message: q,
           operator: "deepStrictEqual",
           stackStartFn: V
         });
-        throw z.operator = V.name, z;
+        throw Q.operator = V.name, Q;
       }
       var w = Object.keys(L);
       if (L instanceof Error)
@@ -98711,7 +98711,7 @@ function Oi() {
       else if (w.length === 0)
         throw new a("error", L, "may not be an empty object");
       return _ === void 0 && C(), w.forEach(function(P) {
-        typeof N[P] == "string" && g(L[P]) && A(L[P], N[P]) || Q(N, L, P, q, w, V);
+        typeof N[P] == "string" && g(L[P]) && A(L[P], N[P]) || G(N, L, P, q, w, V);
       }), !0;
     }
     return L.prototype !== void 0 && N instanceof L ? !0 : Error.isPrototypeOf(L) ? !1 : L.call({}, N) === !0;
@@ -98761,14 +98761,14 @@ function Oi() {
     } else if (q != null && t(q) !== "object" && typeof q != "function")
       throw new u("error", ["Object", "Error", "Function", "RegExp"], q);
     if (L === R) {
-      var z = "";
-      q && q.name && (z += " (".concat(q.name, ")")), z += V ? ": ".concat(V) : ".";
+      var Q = "";
+      q && q.name && (Q += " (".concat(q.name, ")")), Q += V ? ": ".concat(V) : ".";
       var w = N.name === "rejects" ? "rejection" : "exception";
       O({
         actual: void 0,
         expected: q,
         operator: N.name,
-        message: "Missing expected ".concat(w).concat(z),
+        message: "Missing expected ".concat(w).concat(Q),
         stackStartFn: N
       });
     }
@@ -98778,12 +98778,12 @@ function Oi() {
   function xe(N, L, q, V) {
     if (L !== R) {
       if (typeof q == "string" && (V = q, q = void 0), !q || X(L, q)) {
-        var z = V ? ": ".concat(V) : ".", w = N.name === "doesNotReject" ? "rejection" : "exception";
+        var Q = V ? ": ".concat(V) : ".", w = N.name === "doesNotReject" ? "rejection" : "exception";
         O({
           actual: L,
           expected: q,
           operator: N.name,
-          message: "Got unwanted ".concat(w).concat(z, `
+          message: "Got unwanted ".concat(w).concat(Q, `
 `) + 'Actual message: "'.concat(L && L.message, '"'),
           stackStartFn: N
         });
@@ -98792,22 +98792,22 @@ function Oi() {
     }
   }
   S.throws = function N(L) {
-    for (var q = arguments.length, V = new Array(q > 1 ? q - 1 : 0), z = 1; z < q; z++)
-      V[z - 1] = arguments[z];
+    for (var q = arguments.length, V = new Array(q > 1 ? q - 1 : 0), Q = 1; Q < q; Q++)
+      V[Q - 1] = arguments[Q];
     oe.apply(void 0, [N, ce(L)].concat(V));
   }, S.rejects = function N(L) {
-    for (var q = arguments.length, V = new Array(q > 1 ? q - 1 : 0), z = 1; z < q; z++)
-      V[z - 1] = arguments[z];
+    for (var q = arguments.length, V = new Array(q > 1 ? q - 1 : 0), Q = 1; Q < q; Q++)
+      V[Q - 1] = arguments[Q];
     return te(L).then(function(w) {
       return oe.apply(void 0, [N, w].concat(V));
     });
   }, S.doesNotThrow = function N(L) {
-    for (var q = arguments.length, V = new Array(q > 1 ? q - 1 : 0), z = 1; z < q; z++)
-      V[z - 1] = arguments[z];
+    for (var q = arguments.length, V = new Array(q > 1 ? q - 1 : 0), Q = 1; Q < q; Q++)
+      V[Q - 1] = arguments[Q];
     xe.apply(void 0, [N, ce(L)].concat(V));
   }, S.doesNotReject = function N(L) {
-    for (var q = arguments.length, V = new Array(q > 1 ? q - 1 : 0), z = 1; z < q; z++)
-      V[z - 1] = arguments[z];
+    for (var q = arguments.length, V = new Array(q > 1 ? q - 1 : 0), Q = 1; Q < q; Q++)
+      V[Q - 1] = arguments[Q];
     return te(L).then(function(w) {
       return xe.apply(void 0, [N, w].concat(V));
     });
@@ -98821,9 +98821,9 @@ function Oi() {
         operator: "ifError",
         message: q,
         stackStartFn: N
-      }), z = L.stack;
-      if (typeof z == "string") {
-        var w = z.split(`
+      }), Q = L.stack;
+      if (typeof Q == "string") {
+        var w = Q.split(`
 `);
         w.shift();
         for (var P = V.stack.split(`
@@ -98842,10 +98842,10 @@ function Oi() {
       throw V;
     }
   };
-  function Se(N, L, q, V, z) {
+  function Se(N, L, q, V, Q) {
     if (!g(L))
       throw new u("regexp", "RegExp", L);
-    var w = z === "match";
+    var w = Q === "match";
     if (typeof N != "string" || A(L, N) !== w) {
       if (q instanceof Error)
         throw q;
@@ -98858,7 +98858,7 @@ function Oi() {
         actual: N,
         expected: L,
         message: q,
-        operator: z,
+        operator: Q,
         stackStartFn: V
       });
       throw U.generatedMessage = P, U;
@@ -103187,7 +103187,7 @@ function vy() {
           ds.debug && console.log(`testing ${this.getTokenName(O)} at ${D.toString(this.recog, !0)}`);
           let j = D.state.numberOfOptimizedTransitions;
           for (let Y = 0; Y < j; Y++) {
-            let Q = D.state.getOptimizedTransition(Y), X = this.getReachableTarget(Q, O);
+            let G = D.state.getOptimizedTransition(Y), X = this.getReachableTarget(G, O);
             if (X != null) {
               let ce = D.lexerActionExecutor, fe;
               ce != null ? (ce = ce.fixOffsetBeforeMatch(b.index - this.startIndex), fe = D.transform(X, !0, ce)) : (_(D.lexerActionExecutor == null), fe = D.transform(X, !0));
@@ -103233,10 +103233,10 @@ function vy() {
             return R.add(S), !0;
           j.hasEmpty && (R.add(S.transform(S.state, !0, y.PredictionContext.EMPTY_FULL)), O = !0);
           for (let Y = 0; Y < j.size; Y++) {
-            let Q = j.getReturnState(Y);
-            if (Q === y.PredictionContext.EMPTY_FULL_STATE_KEY)
+            let G = j.getReturnState(Y);
+            if (G === y.PredictionContext.EMPTY_FULL_STATE_KEY)
               continue;
-            let X = j.getParent(Y), ce = this.atn.states[Q], fe = S.transform(ce, !1, X);
+            let X = j.getParent(Y), ce = this.atn.states[G], fe = S.transform(ce, !1, X);
             O = this.closure(b, fe, R, O, I, D);
           }
           return O;
@@ -103244,8 +103244,8 @@ function vy() {
         S.state.onlyHasEpsilonTransitions || (!O || !S.hasPassedThroughNonGreedyDecision) && R.add(S);
         let k = S.state;
         for (let j = 0; j < k.numberOfOptimizedTransitions; j++) {
-          let Y = k.getOptimizedTransition(j), Q = this.getEpsilonTarget(b, S, Y, R, I, D);
-          Q != null && (O = this.closure(b, Q, R, O, I, D));
+          let Y = k.getOptimizedTransition(j), G = this.getEpsilonTarget(b, S, Y, R, I, D);
+          G != null && (O = this.closure(b, G, R, O, I, D));
         }
         return O;
       }
@@ -103258,8 +103258,8 @@ function vy() {
             if (this.optimize_tail_calls && j.optimizedTailCall && !S.context.hasEmpty)
               k = S.transform(R.target, !0);
             else {
-              let Q = S.context.getChild(j.followState.stateNumber);
-              k = S.transform(R.target, !0, Q);
+              let G = S.context.getChild(j.followState.stateNumber);
+              k = S.transform(R.target, !0, G);
             }
             break;
           case 10:
@@ -103270,8 +103270,8 @@ function vy() {
             break;
           case 6:
             if (S.context.hasEmpty) {
-              let Q = h.LexerActionExecutor.append(S.lexerActionExecutor, this.atn.lexerActions[R.actionIndex]);
-              k = S.transform(R.target, !0, Q);
+              let G = h.LexerActionExecutor.append(S.lexerActionExecutor, this.atn.lexerActions[R.actionIndex]);
+              k = S.transform(R.target, !0, G);
               break;
             } else {
               k = S.transform(R.target, !0);
@@ -106147,9 +106147,9 @@ function e2() {
    * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
    */
   var t = T && T.__decorate || function(Se, $, N, L) {
-    var q = arguments.length, V = q < 3 ? $ : L === null ? L = Object.getOwnPropertyDescriptor($, N) : L, z;
+    var q = arguments.length, V = q < 3 ? $ : L === null ? L = Object.getOwnPropertyDescriptor($, N) : L, Q;
     if (typeof Reflect == "object" && typeof Reflect.decorate == "function") V = Reflect.decorate(Se, $, N, L);
-    else for (var w = Se.length - 1; w >= 0; w--) (z = Se[w]) && (V = (q < 3 ? z(V) : q > 3 ? z($, N, V) : z($, N)) || V);
+    else for (var w = Se.length - 1; w >= 0; w--) (Q = Se[w]) && (V = (q < 3 ? Q(V) : q > 3 ? Q($, N, V) : Q($, N)) || V);
     return q > 3 && V && Object.defineProperty($, N, V), V;
   }, e = T && T.__param || function(Se, $) {
     return function(N, L) {
@@ -106157,7 +106157,7 @@ function e2() {
     };
   };
   Object.defineProperty(_1, "__esModule", { value: !0 }), _1.ParserATNSimulator = void 0;
-  const r = _y, i = Dy, s = lu, o = ub, u = du(), a = qx, l = yy(), c = lb(), f = Er, x = Fy, h = fu, p = bb, m = Aa, g = ab(), y = Wp, E = yr, A = Pl, _ = Ae, v = IB(), C = ky(), b = Ns, S = po(), R = cu(), O = DB(), I = ale, D = Tc, k = Yp, j = Hx, Y = LB(), Q = lle(), X = nn, ce = Ls, fe = Oi(), te = 65535, oe = -(1 << 31 >>> 0);
+  const r = _y, i = Dy, s = lu, o = ub, u = du(), a = qx, l = yy(), c = lb(), f = Er, x = Fy, h = fu, p = bb, m = Aa, g = ab(), y = Wp, E = yr, A = Pl, _ = Ae, v = IB(), C = ky(), b = Ns, S = po(), R = cu(), O = DB(), I = ale, D = Tc, k = Yp, j = Hx, Y = LB(), G = lle(), X = nn, ce = Ls, fe = Oi(), te = 65535, oe = -(1 << 31 >>> 0);
   let xe = class dt extends c.ATNSimulator {
     constructor($, N) {
       super($), this.predictionMode = I.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 = N;
@@ -106182,11 +106182,11 @@ function e2() {
         }
       }
       this.dfa = V, this.force_global_context ? q = !0 : this.always_try_local_context || (q = q || V.isContextSensitive), this.userWantsCtxSensitive = q || this.predictionMode !== I.PredictionMode.SLL && L != null && !this.atn.decisionToState[N].sll, L == null && (L = S.ParserRuleContext.emptyContext());
-      let z;
-      V.isEmpty || (z = this.getStartState(V, $, L, q)), z == null && (L == null && (L = S.ParserRuleContext.emptyContext()), dt.debug && console.log("ATN decision " + V.decision + " exec LA(1)==" + this.getLookaheadName($) + ", outerContext=" + L.toString(this._parser)), z = this.computeStartState(V, L, q));
+      let Q;
+      V.isEmpty || (Q = this.getStartState(V, $, L, q)), Q == null && (L == null && (L = S.ParserRuleContext.emptyContext()), dt.debug && console.log("ATN decision " + V.decision + " exec LA(1)==" + this.getLookaheadName($) + ", outerContext=" + L.toString(this._parser)), Q = this.computeStartState(V, L, q));
       let w = $.mark(), P = $.index;
       try {
-        let U = this.execDFA(V, $, P, z);
+        let U = this.execDFA(V, $, P, Q);
         return dt.debug && console.log("DFA after predictATN: " + V.toString(this._parser.vocabulary, this._parser.ruleNames)), U;
       } finally {
         this.dfa = void 0, $.seek(P), $.release(w);
@@ -106196,85 +106196,85 @@ function e2() {
       if (!q)
         if ($.isPrecedenceDfa) {
           let w = $.getPrecedenceStartState(this._parser.precedence, !1);
-          return w == null ? void 0 : new Q.SimulatorState(L, w, !1, L);
+          return w == null ? void 0 : new G.SimulatorState(L, w, !1, L);
         } else
-          return $.s0 == null ? void 0 : new Q.SimulatorState(L, $.s0, !1, L);
+          return $.s0 == null ? void 0 : new G.SimulatorState(L, $.s0, !1, L);
       if (!this.enable_global_context_dfa)
         return;
       let V = L;
       fe(L != null);
-      let z;
-      for ($.isPrecedenceDfa ? z = $.getPrecedenceStartState(this._parser.precedence, !0) : z = $.s0full; V != null && z != null && z.isContextSensitive; )
-        V = this.skipTailCalls(V), z = z.getContextTarget(this.getReturnState(V)), V.isEmpty ? fe(z == null || !z.isContextSensitive) : V = V.parent;
-      if (z != null)
-        return new Q.SimulatorState(L, z, q, V);
+      let Q;
+      for ($.isPrecedenceDfa ? Q = $.getPrecedenceStartState(this._parser.precedence, !0) : Q = $.s0full; V != null && Q != null && Q.isContextSensitive; )
+        V = this.skipTailCalls(V), Q = Q.getContextTarget(this.getReturnState(V)), V.isEmpty ? fe(Q == null || !Q.isContextSensitive) : V = V.parent;
+      if (Q != null)
+        return new G.SimulatorState(L, Q, q, V);
     }
     execDFA($, N, L, q) {
       let V = q.outerContext;
       dt.dfa_debug && console.log("DFA decision " + $.decision + " exec LA(1)==" + this.getLookaheadName(N) + ", outerContext=" + V.toString(this._parser)), dt.dfa_debug && console.log($.toString(this._parser.vocabulary, this._parser.ruleNames));
-      let z = q.s0, w = N.LA(1), P = q.remainingOuterContext;
+      let Q = q.s0, w = N.LA(1), P = q.remainingOuterContext;
       for (; ; ) {
-        if (dt.dfa_debug && console.log("DFA state " + z.stateNumber + " LA(1)==" + this.getLookaheadName(N)), q.useContext)
-          for (; z.isContextSymbol(w); ) {
+        if (dt.dfa_debug && console.log("DFA state " + Q.stateNumber + " LA(1)==" + this.getLookaheadName(N)), q.useContext)
+          for (; Q.isContextSymbol(w); ) {
             let M;
-            if (P != null && (P = this.skipTailCalls(P), M = z.getContextTarget(this.getReturnState(P))), M == null) {
-              let G = new Q.SimulatorState(q.outerContext, z, q.useContext, P);
-              return this.execATN($, N, L, G);
+            if (P != null && (P = this.skipTailCalls(P), M = Q.getContextTarget(this.getReturnState(P))), M == null) {
+              let z = new G.SimulatorState(q.outerContext, Q, q.useContext, P);
+              return this.execATN($, N, L, z);
             }
-            fe(P != null), P = P.parent, z = M;
+            fe(P != null), P = P.parent, Q = M;
           }
-        if (this.isAcceptState(z, q.useContext)) {
-          z.predicates != null ? dt.dfa_debug && console.log("accept " + z) : dt.dfa_debug && console.log("accept; predict " + z.prediction + " in state " + z.stateNumber);
+        if (this.isAcceptState(Q, q.useContext)) {
+          Q.predicates != null ? dt.dfa_debug && console.log("accept " + Q) : dt.dfa_debug && console.log("accept; predict " + Q.prediction + " in state " + Q.stateNumber);
           break;
         }
-        fe(!this.isAcceptState(z, q.useContext));
-        let W = this.getExistingTargetState(z, w);
+        fe(!this.isAcceptState(Q, q.useContext));
+        let W = this.getExistingTargetState(Q, w);
         if (W == null) {
           dt.dfa_debug && w >= 0 && console.log("no edge for " + this._parser.vocabulary.getDisplayName(w));
           let M;
           if (dt.dfa_debug) {
             let H = E.Interval.of(L, this._parser.inputStream.index);
-            console.log("ATN exec upon " + this._parser.inputStream.getText(H) + " at DFA state " + z.stateNumber);
+            console.log("ATN exec upon " + this._parser.inputStream.getText(H) + " at DFA state " + Q.stateNumber);
           }
-          let G = new Q.SimulatorState(V, z, q.useContext, P);
-          return M = this.execATN($, N, L, G), dt.dfa_debug && console.log("back from DFA update, alt=" + M + `, dfa=
+          let z = new G.SimulatorState(V, Q, q.useContext, P);
+          return M = this.execATN($, N, L, z), dt.dfa_debug && console.log("back from DFA update, alt=" + M + `, dfa=
 ` + $.toString(this._parser.vocabulary, this._parser.ruleNames)), dt.dfa_debug && console.log("DFA decision " + $.decision + " predicts " + M), M;
         } else if (W === c.ATNSimulator.ERROR) {
-          let M = new Q.SimulatorState(V, z, q.useContext, P);
+          let M = new G.SimulatorState(V, Q, q.useContext, P);
           return this.handleNoViableAlt(N, L, M);
         }
-        z = W, !this.isAcceptState(z, q.useContext) && w !== A.IntStream.EOF && (N.consume(), w = N.LA(1));
+        Q = W, !this.isAcceptState(Q, q.useContext) && w !== A.IntStream.EOF && (N.consume(), w = N.LA(1));
       }
-      if (!q.useContext && z.configs.conflictInfo != null && $.atnStartState instanceof m.DecisionState && !(!this.userWantsCtxSensitive || !z.configs.dipsIntoOuterContext && z.configs.isExactConflict || this.treat_sllk1_conflict_as_ambiguity && N.index === L)) {
+      if (!q.useContext && Q.configs.conflictInfo != null && $.atnStartState instanceof m.DecisionState && !(!this.userWantsCtxSensitive || !Q.configs.dipsIntoOuterContext && Q.configs.isExactConflict || this.treat_sllk1_conflict_as_ambiguity && N.index === L)) {
         fe(!q.useContext);
-        let W, M = z.predicates;
+        let W, M = Q.predicates;
         if (M != null) {
-          let G = N.index;
-          if (G !== L && N.seek(L), W = this.evalSemanticContext(M, V, !0), W.cardinality() === 1)
+          let z = N.index;
+          if (z !== L && N.seek(L), W = this.evalSemanticContext(M, V, !0), W.cardinality() === 1)
             return W.nextSetBit(0);
-          G !== L && N.seek(G);
+          z !== L && N.seek(z);
         }
         if (this.reportAmbiguities) {
-          let G = new Q.SimulatorState(V, z, q.useContext, P);
-          this.reportAttemptingFullContext($, W, G, L, N.index);
+          let z = new G.SimulatorState(V, Q, q.useContext, P);
+          this.reportAttemptingFullContext($, W, z, L, N.index);
         }
         return N.seek(L), this.adaptivePredict(N, $.decision, V, !0);
       }
-      let U = z.predicates;
+      let U = Q.predicates;
       if (U != null) {
         let W = N.index;
         L !== W && N.seek(L);
         let M = this.evalSemanticContext(U, V, this.reportAmbiguities && this.predictionMode === I.PredictionMode.LL_EXACT_AMBIG_DETECTION);
         switch (M.cardinality()) {
           case 0:
-            throw this.noViableAlt(N, V, z.configs, L);
+            throw this.noViableAlt(N, V, Q.configs, L);
           case 1:
             return M.nextSetBit(0);
           default:
-            return L !== W && N.seek(W), this.reportAmbiguity($, z, L, W, z.configs.isExactConflict, M, z.configs), M.nextSetBit(0);
+            return L !== W && N.seek(W), this.reportAmbiguity($, Q, L, W, Q.configs.isExactConflict, M, Q.configs), M.nextSetBit(0);
         }
       }
-      return dt.dfa_debug && console.log("DFA decision " + $.decision + " predicts " + z.prediction), z.prediction;
+      return dt.dfa_debug && console.log("DFA decision " + $.decision + " predicts " + Q.prediction), Q.prediction;
     }
     /**
      * Determines if a particular DFA state should be treated as an accept state
@@ -106346,42 +106346,42 @@ function e2() {
      */
     execATN($, N, L, q) {
       dt.debug && console.log("execATN decision " + $.decision + " exec LA(1)==" + this.getLookaheadName(N));
-      let V = q.outerContext, z = q.useContext, w = N.LA(1), P = q, U = new O.PredictionContextCache();
+      let V = q.outerContext, Q = q.useContext, w = N.LA(1), P = q, U = new O.PredictionContextCache();
       for (; ; ) {
         let W = this.computeReachSet($, P, w, U);
         if (W == null)
           return this.setDFAEdge(P.s0, N.LA(1), c.ATNSimulator.ERROR), this.handleNoViableAlt(N, L, P);
         let M = W.s0;
-        if (fe(M.isAcceptState || M.prediction === u.ATN.INVALID_ALT_NUMBER), fe(M.isAcceptState || M.configs.conflictInfo == null), this.isAcceptState(M, z)) {
-          let G = M.configs.conflictingAlts, H = G == null ? M.prediction : u.ATN.INVALID_ALT_NUMBER;
+        if (fe(M.isAcceptState || M.prediction === u.ATN.INVALID_ALT_NUMBER), fe(M.isAcceptState || M.configs.conflictInfo == null), this.isAcceptState(M, Q)) {
+          let z = M.configs.conflictingAlts, H = z == null ? M.prediction : u.ATN.INVALID_ALT_NUMBER;
           if (H !== u.ATN.INVALID_ALT_NUMBER) {
             if (this.optimize_ll1 && N.index === L && !$.isPrecedenceDfa && W.outerContext === W.remainingOuterContext && $.decision >= 0 && !M.configs.hasSemanticContext && w >= 0 && w <= te) {
               let he = ($.decision << 16 >>> 0) + w;
               this.atn.LL1Table.set(he, H);
             }
-            z && this.always_try_local_context && this.reportContextSensitivity($, H, W, L, N.index);
+            Q && this.always_try_local_context && this.reportContextSensitivity($, H, W, L, N.index);
           }
           H = M.prediction;
-          let Z = G != null && this.userWantsCtxSensitive;
-          if (Z && (Z = !z && (M.configs.dipsIntoOuterContext || !M.configs.isExactConflict) && (!this.treat_sllk1_conflict_as_ambiguity || N.index !== L)), M.configs.hasSemanticContext) {
+          let Z = z != null && this.userWantsCtxSensitive;
+          if (Z && (Z = !Q && (M.configs.dipsIntoOuterContext || !M.configs.isExactConflict) && (!this.treat_sllk1_conflict_as_ambiguity || N.index !== L)), M.configs.hasSemanticContext) {
             let he = M.predicates;
             if (he != null) {
               let ue = N.index;
-              switch (ue !== L && N.seek(L), G = this.evalSemanticContext(he, V, Z || this.reportAmbiguities), G.cardinality()) {
+              switch (ue !== L && N.seek(L), z = this.evalSemanticContext(he, V, Z || this.reportAmbiguities), z.cardinality()) {
                 case 0:
                   throw this.noViableAlt(N, V, M.configs, L);
                 case 1:
-                  return G.nextSetBit(0);
+                  return z.nextSetBit(0);
               }
               ue !== L && N.seek(ue);
             }
           }
           if (Z) {
-            fe(!z), fe(this.isAcceptState(M, !1)), dt.debug && console.log("RETRY with outerContext=" + V);
+            fe(!Q), fe(this.isAcceptState(M, !1)), dt.debug && console.log("RETRY with outerContext=" + V);
             let he = this.computeStartState($, V, !0);
-            return this.reportAmbiguities && this.reportAttemptingFullContext($, G, W, L, N.index), N.seek(L), this.execATN($, N, L, he);
+            return this.reportAmbiguities && this.reportAttemptingFullContext($, z, W, L, N.index), N.seek(L), this.execATN($, N, L, he);
           } else
-            return G != null && (this.reportAmbiguities && G.cardinality() > 1 && this.reportAmbiguity($, M, L, N.index, M.configs.isExactConflict, G, M.configs), H = G.nextSetBit(0)), H;
+            return z != null && (this.reportAmbiguities && z.cardinality() > 1 && this.reportAmbiguity($, M, L, N.index, M.configs.isExactConflict, z, M.configs), H = z.nextSetBit(0)), H;
         }
         P = W, w !== A.IntStream.EOF && (N.consume(), w = N.LA(1));
       }
@@ -106440,8 +106440,8 @@ function e2() {
     handleNoViableAlt($, N, L) {
       if (L.s0 != null) {
         let q = new h.BitSet(), V = 0;
-        for (let z of L.s0.configs)
-          (z.reachesIntoOuterContext || z.state instanceof D.RuleStopState) && (q.set(z.alt), V = Math.max(V, z.alt));
+        for (let Q of L.s0.configs)
+          (Q.reachesIntoOuterContext || Q.state instanceof D.RuleStopState) && (q.set(Q.alt), V = Math.max(V, Q.alt));
         switch (q.cardinality()) {
           case 0:
             break;
@@ -106450,10 +106450,10 @@ function e2() {
           default:
             if (!L.s0.configs.hasSemanticContext)
               return q.nextSetBit(0);
-            let z = new l.ATNConfigSet();
+            let Q = new l.ATNConfigSet();
             for (let P of L.s0.configs)
-              (P.reachesIntoOuterContext || P.state instanceof D.RuleStopState) && z.add(P);
-            let w = this.getPredsForAmbigAlts(q, z, V);
+              (P.reachesIntoOuterContext || P.state instanceof D.RuleStopState) && Q.add(P);
+            let w = this.getPredsForAmbigAlts(q, Q, V);
             if (w != null) {
               let P = this.getPredicatePredictions(q, w);
               if (P != null) {
@@ -106474,23 +106474,23 @@ function e2() {
       throw this.noViableAlt($, L.outerContext, L.s0.configs, N);
     }
     computeReachSet($, N, L, q) {
-      let V = N.useContext, z = N.remainingOuterContext, w = N.s0;
+      let V = N.useContext, Q = N.remainingOuterContext, w = N.s0;
       if (V)
         for (; w.isContextSymbol(L); ) {
           let W;
-          if (z != null && (z = this.skipTailCalls(z), W = w.getContextTarget(this.getReturnState(z))), W == null)
+          if (Q != null && (Q = this.skipTailCalls(Q), W = w.getContextTarget(this.getReturnState(Q))), W == null)
             break;
-          fe(z != null), z = z.parent, w = W;
+          fe(Q != null), Q = Q.parent, w = W;
         }
       if (fe(!this.isAcceptState(w, V)), this.isAcceptState(w, V))
-        return new Q.SimulatorState(N.outerContext, w, V, z);
+        return new G.SimulatorState(N.outerContext, w, V, Q);
       let P = w, U = this.getExistingTargetState(P, L);
       if (U == null) {
-        let W = this.computeTargetState($, P, z, L, V, q);
-        U = W[0], z = W[1];
+        let W = this.computeTargetState($, P, Q, L, V, q);
+        U = W[0], Q = W[1];
       }
       if (U !== c.ATNSimulator.ERROR)
-        return fe(!V || !U.configs.dipsIntoOuterContext), new Q.SimulatorState(N.outerContext, U, V, z);
+        return fe(!V || !U.configs.dipsIntoOuterContext), new G.SimulatorState(N.outerContext, U, V, Q);
     }
     /**
      * Get an existing target state for an edge in the DFA. If the target state
@@ -106521,11 +106521,11 @@ function e2() {
      * `t`. If `t` does not lead to a valid DFA state, this method
      * returns {@link #ERROR}.
      */
-    computeTargetState($, N, L, q, V, z) {
+    computeTargetState($, N, L, q, V, Q) {
       let w = N.configs.toArray(), P, U = new l.ATNConfigSet(), W;
       do {
-        let G = !V || L != null;
-        G || (U.isOutermostConfigSet = !0);
+        let z = !V || L != null;
+        z || (U.isOutermostConfigSet = !0);
         let H = new l.ATNConfigSet(), Z;
         for (let ee of w) {
           if (dt.debug && console.log("testing " + this.getTokenName(q) + " at " + ee.toString()), ee.state instanceof D.RuleStopState) {
@@ -106535,7 +106535,7 @@ function e2() {
           let le = ee.state.numberOfOptimizedTransitions;
           for (let Me = 0; Me < le; Me++) {
             let at = ee.state.getOptimizedTransition(Me), _t = this.getReachableTarget(ee, at, q);
-            _t != null && H.add(ee.transform(_t, !1), z);
+            _t != null && H.add(ee.transform(_t, !1), Q);
           }
         }
         if (this.optimize_unique_closure && Z == null && q !== X.Token.EOF && H.uniqueAlt !== u.ATN.INVALID_ALT_NUMBER) {
@@ -106543,20 +106543,20 @@ function e2() {
           break;
         }
         let he = !1, ue = q === X.Token.EOF;
-        if (this.closure(H, U, he, G, z, ue), W = U.dipsIntoOuterContext, q === A.IntStream.EOF && (U = this.removeAllConfigsNotInRuleStopState(U, z)), Z != null && (!V || !I.PredictionMode.hasConfigInRuleStopState(U))) {
+        if (this.closure(H, U, he, z, Q, ue), W = U.dipsIntoOuterContext, q === A.IntStream.EOF && (U = this.removeAllConfigsNotInRuleStopState(U, Q)), Z != null && (!V || !I.PredictionMode.hasConfigInRuleStopState(U))) {
           fe(Z.length > 0);
           for (let ee of Z)
-            U.add(ee, z);
+            U.add(ee, Q);
         }
         if (V && W) {
           U.clear(), L = L, L = this.skipTailCalls(L);
           let ee = this.getReturnState(L);
           if (P == null && (P = new y.IntegerList()), L.isEmpty ? L = void 0 : L = L.parent, P.add(ee), ee !== R.PredictionContext.EMPTY_FULL_STATE_KEY)
             for (let le = 0; le < w.length; le++)
-              w[le] = w[le].appendContext(ee, z);
+              w[le] = w[le].appendContext(ee, Q);
         }
       } while (V && W);
-      return U.isEmpty ? (this.setDFAEdge(N, q, c.ATNSimulator.ERROR), [c.ATNSimulator.ERROR, L]) : [this.addDFAEdge($, N, q, P, U, z), L];
+      return U.isEmpty ? (this.setDFAEdge(N, q, c.ATNSimulator.ERROR), [c.ATNSimulator.ERROR, L]) : [this.addDFAEdge($, N, q, P, U, Q), L];
     }
     /**
      * Return a configuration set containing only the configurations from
@@ -106583,28 +106583,28 @@ function e2() {
       let q = $.isPrecedenceDfa ? $.getPrecedenceStartState(this._parser.precedence, L) : L ? $.s0full : $.s0;
       if (q != null) {
         if (!L)
-          return new Q.SimulatorState(N, q, L, N);
+          return new G.SimulatorState(N, q, L, N);
         q.setContextSensitive(this.atn);
       }
       $.decision;
-      let V = $.atnStartState, z = 0, w = N, P = L ? R.PredictionContext.EMPTY_FULL : R.PredictionContext.EMPTY_LOCAL, U = new O.PredictionContextCache();
+      let V = $.atnStartState, Q = 0, w = N, P = L ? R.PredictionContext.EMPTY_FULL : R.PredictionContext.EMPTY_LOCAL, U = new O.PredictionContextCache();
       if (L) {
         if (!this.enable_global_context_dfa)
           for (; w != null; )
-            w.isEmpty ? (z = R.PredictionContext.EMPTY_FULL_STATE_KEY, w = void 0) : (z = this.getReturnState(w), P = P.appendSingleContext(z, U), w = w.parent);
+            w.isEmpty ? (Q = R.PredictionContext.EMPTY_FULL_STATE_KEY, w = void 0) : (Q = this.getReturnState(w), P = P.appendSingleContext(Q, U), w = w.parent);
         for (; q != null && q.isContextSensitive && w != null; ) {
           let M;
-          if (w = this.skipTailCalls(w), w.isEmpty ? (M = q.getContextTarget(R.PredictionContext.EMPTY_FULL_STATE_KEY), z = R.PredictionContext.EMPTY_FULL_STATE_KEY, w = void 0) : (z = this.getReturnState(w), M = q.getContextTarget(z), P = P.appendSingleContext(z, U), w = w.parent), M == null)
+          if (w = this.skipTailCalls(w), w.isEmpty ? (M = q.getContextTarget(R.PredictionContext.EMPTY_FULL_STATE_KEY), Q = R.PredictionContext.EMPTY_FULL_STATE_KEY, w = void 0) : (Q = this.getReturnState(w), M = q.getContextTarget(Q), P = P.appendSingleContext(Q, U), w = w.parent), M == null)
             break;
           q = M;
         }
       }
       if (q != null && !q.isContextSensitive)
-        return new Q.SimulatorState(N, q, L, w);
+        return new G.SimulatorState(N, q, L, w);
       let W = new l.ATNConfigSet();
       for (; ; ) {
-        let M = new l.ATNConfigSet(), G = V.numberOfTransitions;
-        for (let le = 0; le < G; le++) {
+        let M = new l.ATNConfigSet(), z = V.numberOfTransitions;
+        for (let le = 0; le < z; le++) {
           let Me = V.transition(le).target;
           M.add(a.ATNConfig.create(Me, le + 1, P));
         }
@@ -106614,14 +106614,14 @@ function e2() {
         if (L && !this.enable_global_context_dfa) {
           q = this.addDFAState($, W, U);
           break;
-        } else q == null ? $.isPrecedenceDfa ? (W = this.applyPrecedenceFilter(W, N, U), ue = this.addDFAState($, W, U), $.setPrecedenceStartState(this._parser.precedence, L, ue)) : (ue = this.addDFAState($, W, U), L ? $.s0full ? ue = $.s0full : $.s0full = ue : $.s0 ? ue = $.s0 : $.s0 = ue) : ($.isPrecedenceDfa && (W = this.applyPrecedenceFilter(W, N, U)), ue = this.addDFAState($, W, U), q.setContextTarget(z, ue));
+        } else q == null ? $.isPrecedenceDfa ? (W = this.applyPrecedenceFilter(W, N, U), ue = this.addDFAState($, W, U), $.setPrecedenceStartState(this._parser.precedence, L, ue)) : (ue = this.addDFAState($, W, U), L ? $.s0full ? ue = $.s0full : $.s0full = ue : $.s0 ? ue = $.s0 : $.s0 = ue) : ($.isPrecedenceDfa && (W = this.applyPrecedenceFilter(W, N, U)), ue = this.addDFAState($, W, U), q.setContextTarget(Q, ue));
         if (q = ue, !L || !he)
           break;
         ue.setContextSensitive(this.atn), w = w, W.clear(), w = this.skipTailCalls(w);
         let ee = this.getReturnState(w);
-        w.isEmpty ? w = void 0 : w = w.parent, ee !== R.PredictionContext.EMPTY_FULL_STATE_KEY && (P = P.appendSingleContext(ee, U)), z = ee;
+        w.isEmpty ? w = void 0 : w = w.parent, ee !== R.PredictionContext.EMPTY_FULL_STATE_KEY && (P = P.appendSingleContext(ee, U)), Q = ee;
       }
-      return new Q.SimulatorState(N, q, L, w);
+      return new G.SimulatorState(N, q, L, w);
     }
     /**
      * This method transforms the start state computed by
@@ -106677,20 +106677,20 @@ function e2() {
      */
     applyPrecedenceFilter($, N, L) {
       let q = /* @__PURE__ */ new Map(), V = new l.ATNConfigSet();
-      for (let z of $) {
-        if (z.alt !== 1)
+      for (let Q of $) {
+        if (Q.alt !== 1)
           continue;
-        let w = z.semanticContext.evalPrecedence(this._parser, N);
-        w != null && (q.set(z.state.stateNumber, z.context), w !== z.semanticContext ? V.add(z.transform(z.state, !1, w), L) : V.add(z, L));
-      }
-      for (let z of $)
-        if (z.alt !== 1) {
-          if (!z.isPrecedenceFilterSuppressed) {
-            let w = q.get(z.state.stateNumber);
-            if (w != null && w.equals(z.context))
+        let w = Q.semanticContext.evalPrecedence(this._parser, N);
+        w != null && (q.set(Q.state.stateNumber, Q.context), w !== Q.semanticContext ? V.add(Q.transform(Q.state, !1, w), L) : V.add(Q, L));
+      }
+      for (let Q of $)
+        if (Q.alt !== 1) {
+          if (!Q.isPrecedenceFilterSuppressed) {
+            let w = q.get(Q.state.stateNumber);
+            if (w != null && w.equals(Q.context))
               continue;
           }
-          V.add(z, L);
+          V.add(Q, L);
         }
       return V;
     }
@@ -106704,24 +106704,24 @@ function e2() {
       if (!q)
         throw new Error("This unhandled scenario is intended to be unreachable, but I'm currently not sure of why we know that's the case.");
       dt.debug && console.log("predicateDFAState " + $);
-      let V = this.getPredsForAmbigAlts(q, N, L), z;
-      return V != null && (z = this.getPredicatePredictions(q, V), $.predicates = z), z;
+      let V = this.getPredsForAmbigAlts(q, N, L), Q;
+      return V != null && (Q = this.getPredicatePredictions(q, V), $.predicates = Q), Q;
     }
     getPredsForAmbigAlts($, N, L) {
       let q = new Array(L + 1), V = q.length;
       for (let P of N)
         $.get(P.alt) && (q[P.alt] = j.SemanticContext.or(q[P.alt], P.semanticContext));
-      let z = 0;
+      let Q = 0;
       for (let P = 0; P < V; P++)
-        q[P] == null ? q[P] = j.SemanticContext.NONE : q[P] !== j.SemanticContext.NONE && z++;
+        q[P] == null ? q[P] = j.SemanticContext.NONE : q[P] !== j.SemanticContext.NONE && Q++;
       let w = q;
-      return z === 0 && (w = void 0), dt.debug && console.log("getPredsForAmbigAlts result " + (w ? o.Arrays.toString(w) : "undefined")), w;
+      return Q === 0 && (w = void 0), dt.debug && console.log("getPredsForAmbigAlts result " + (w ? o.Arrays.toString(w) : "undefined")), w;
     }
     getPredicatePredictions($, N) {
       let L = [], q = !1;
       for (let V = 1; V < N.length; V++) {
-        let z = N[V];
-        fe(z != null), $ != null && $.get(V) && z === j.SemanticContext.NONE ? L.push(new g.DFAState.PredPrediction(z, V)) : z !== j.SemanticContext.NONE && (q = !0, L.push(new g.DFAState.PredPrediction(z, V)));
+        let Q = N[V];
+        fe(Q != null), $ != null && $.get(V) && Q === j.SemanticContext.NONE ? L.push(new g.DFAState.PredPrediction(Q, V)) : Q !== j.SemanticContext.NONE && (q = !0, L.push(new g.DFAState.PredPrediction(Q, V)));
       }
       if (q)
         return L;
@@ -106738,8 +106738,8 @@ function e2() {
             break;
           continue;
         }
-        let z = this.evalSemanticContextImpl(V.pred, N, V.alt);
-        if ((dt.debug || dt.dfa_debug) && console.log("eval pred " + V + "=" + z), z && ((dt.debug || dt.dfa_debug) && console.log("PREDICT " + V.alt), q.set(V.alt), !L))
+        let Q = this.evalSemanticContextImpl(V.pred, N, V.alt);
+        if ((dt.debug || dt.dfa_debug) && console.log("eval pred " + V + "=" + Q), Q && ((dt.debug || dt.dfa_debug) && console.log("PREDICT " + V.alt), q.set(V.alt), !L))
           break;
       }
       return q;
@@ -106777,32 +106777,32 @@ function e2() {
          waste to pursue the closure. Might have to advance when we do
          ambig detection thought :(
           */
-    closure($, N, L, q, V, z) {
+    closure($, N, L, q, V, Q) {
       V == null && (V = O.PredictionContextCache.UNCACHED);
       let w = $, P = new s.Array2DHashSet(b.ObjectEqualityComparator.INSTANCE);
       for (; w.size > 0; ) {
         let U = new l.ATNConfigSet();
         for (let W of w)
-          this.closureImpl(W, N, U, P, L, q, V, 0, z);
+          this.closureImpl(W, N, U, P, L, q, V, 0, Q);
         w = U;
       }
     }
-    closureImpl($, N, L, q, V, z, w, P, U) {
+    closureImpl($, N, L, q, V, Q, w, P, U) {
       if (dt.debug && console.log("closure(" + $.toString(this._parser, !0) + ")"), $.state instanceof D.RuleStopState)
         if ($.context.isEmpty)
-          if (z)
+          if (Q)
             dt.debug && console.log("FALLING off rule " + this.getRuleName($.state.ruleIndex)), $.context === R.PredictionContext.EMPTY_FULL ? $ = $.transform($.state, !1, R.PredictionContext.EMPTY_LOCAL) : !$.reachesIntoOuterContext && R.PredictionContext.isEmptyLocal($.context) && N.add($, w);
           else {
             N.add($, w);
             return;
           }
         else {
-          let M = $.context.hasEmpty, G = $.context.size - (M ? 1 : 0);
-          for (let H = 0; H < G; H++) {
+          let M = $.context.hasEmpty, z = $.context.size - (M ? 1 : 0);
+          for (let H = 0; H < z; H++) {
             let Z = $.context.getParent(H), he = this.atn.states[$.context.getReturnState(H)], ue = a.ATNConfig.create(he, $.alt, Z, $.semanticContext);
-            ue.outerContextDepth = $.outerContextDepth, ue.isPrecedenceFilterSuppressed = $.isPrecedenceFilterSuppressed, fe(P > oe), this.closureImpl(ue, N, L, q, V, z, w, P - 1, U);
+            ue.outerContextDepth = $.outerContextDepth, ue.isPrecedenceFilterSuppressed = $.isPrecedenceFilterSuppressed, fe(P > oe), this.closureImpl(ue, N, L, q, V, Q, w, P - 1, U);
           }
-          if (!M || !z)
+          if (!M || !Q)
             return;
           $ = $.transform($.state, !1, R.PredictionContext.EMPTY_LOCAL);
         }
@@ -106819,29 +106819,29 @@ function e2() {
           if (ue)
             continue;
         }
-        let G = W.getOptimizedTransition(M), H = !(G instanceof i.ActionTransition) && V, Z = this.getEpsilonTarget($, G, H, P === 0, w, U);
+        let z = W.getOptimizedTransition(M), H = !(z instanceof i.ActionTransition) && V, Z = this.getEpsilonTarget($, z, H, P === 0, w, U);
         if (Z != null) {
-          if (G instanceof k.RuleTransition && L != null && !V) {
+          if (z instanceof k.RuleTransition && L != null && !V) {
             L.add(Z, w);
             continue;
           }
           let he = P;
           if ($.state instanceof D.RuleStopState) {
-            if (this.dfa != null && this.dfa.isPrecedenceDfa && G.outermostPrecedenceReturn === this.dfa.atnStartState.ruleIndex && (Z.isPrecedenceFilterSuppressed = !0), Z.outerContextDepth = Z.outerContextDepth + 1, !q.add(Z))
+            if (this.dfa != null && this.dfa.isPrecedenceDfa && z.outermostPrecedenceReturn === this.dfa.atnStartState.ruleIndex && (Z.isPrecedenceFilterSuppressed = !0), Z.outerContextDepth = Z.outerContextDepth + 1, !q.add(Z))
               continue;
             fe(he > oe), he--, dt.debug && console.log("dips into outer ctx: " + Z);
-          } else if (G instanceof k.RuleTransition)
-            this.optimize_tail_calls && G.optimizedTailCall && (!this.tail_call_preserves_sll || !R.PredictionContext.isEmptyLocal($.context)) ? (fe(Z.context === $.context), he === 0 && (he--, !this.tail_call_preserves_sll && R.PredictionContext.isEmptyLocal($.context) && (Z.outerContextDepth = Z.outerContextDepth + 1))) : he >= 0 && he++;
-          else if (!G.isEpsilon && !q.add(Z))
+          } else if (z instanceof k.RuleTransition)
+            this.optimize_tail_calls && z.optimizedTailCall && (!this.tail_call_preserves_sll || !R.PredictionContext.isEmptyLocal($.context)) ? (fe(Z.context === $.context), he === 0 && (he--, !this.tail_call_preserves_sll && R.PredictionContext.isEmptyLocal($.context) && (Z.outerContextDepth = Z.outerContextDepth + 1))) : he >= 0 && he++;
+          else if (!z.isEpsilon && !q.add(Z))
             continue;
-          this.closureImpl(Z, N, L, q, H, z, w, he, U);
+          this.closureImpl(Z, N, L, q, H, Q, w, he, U);
         }
       }
     }
     getRuleName($) {
       return this._parser != null && $ >= 0 ? this._parser.ruleNames[$] : "<rule " + $ + ">";
     }
-    getEpsilonTarget($, N, L, q, V, z) {
+    getEpsilonTarget($, N, L, q, V, Q) {
       switch (N.serializationType) {
         case 3:
           return this.ruleTransition($, N, V);
@@ -106856,7 +106856,7 @@ function e2() {
         case 5:
         case 2:
         case 7:
-          return z && N.matches(X.Token.EOF, 0, 1) ? $.transform(N.target, !1) : void 0;
+          return Q && N.matches(X.Token.EOF, 0, 1) ? $.transform(N.target, !1) : void 0;
         default:
           return;
       }
@@ -106868,8 +106868,8 @@ function e2() {
       dt.debug && (console.log("PRED (collectPredicates=" + L + ") " + N.precedence + ">=_p, ctx dependent=true"), this._parser != null && console.log("context surrounding pred is " + this._parser.getRuleInvocationStack()));
       let V;
       if (L && q) {
-        let z = j.SemanticContext.and($.semanticContext, N.predicate);
-        V = $.transform(N.target, !1, z);
+        let Q = j.SemanticContext.and($.semanticContext, N.predicate);
+        V = $.transform(N.target, !1, Q);
       } else
         V = $.transform(N.target, !1);
       return dt.debug && console.log("config from pred transition=" + V), V;
@@ -106878,8 +106878,8 @@ function e2() {
       dt.debug && (console.log("PRED (collectPredicates=" + L + ") " + N.ruleIndex + ":" + N.predIndex + ", ctx dependent=" + N.isCtxDependent), this._parser != null && console.log("context surrounding pred is " + this._parser.getRuleInvocationStack()));
       let V;
       if (L && (!N.isCtxDependent || N.isCtxDependent && q)) {
-        let z = j.SemanticContext.and($.semanticContext, N.predicate);
-        V = $.transform(N.target, !1, z);
+        let Q = j.SemanticContext.and($.semanticContext, N.predicate);
+        V = $.transform(N.target, !1, Q);
       } else
         V = $.transform(N.target, !1);
       return dt.debug && console.log("config from pred transition=" + V), V;
@@ -106894,13 +106894,13 @@ function e2() {
         return;
       let L = $.toArray();
       L.sort(dt.STATE_ALT_SORT_COMPARATOR);
-      let q = !$.dipsIntoOuterContext, V = new h.BitSet(), z = L[0].alt;
-      V.set(z);
+      let q = !$.dipsIntoOuterContext, V = new h.BitSet(), Q = L[0].alt;
+      V.set(Q);
       let w = L[0].state.nonStopStateNumber;
-      for (let G of L) {
-        let H = G.state.nonStopStateNumber;
+      for (let z of L) {
+        let H = z.state.nonStopStateNumber;
         if (H !== w) {
-          if (G.alt !== z)
+          if (z.alt !== Q)
             return;
           w = H;
         }
@@ -106908,23 +106908,23 @@ function e2() {
       let P;
       if (q) {
         w = L[0].state.nonStopStateNumber, P = new h.BitSet();
-        let G = z;
+        let z = Q;
         for (let Z of L) {
           if (Z.state.nonStopStateNumber !== w)
             break;
           let he = Z.alt;
-          P.set(he), G = he;
+          P.set(he), z = he;
         }
         w = L[0].state.nonStopStateNumber;
-        let H = z;
+        let H = Q;
         for (let Z of L) {
           let he = Z.state.nonStopStateNumber, ue = Z.alt;
           if (he !== w) {
-            if (H !== G) {
+            if (H !== z) {
               q = !1;
               break;
             }
-            w = he, H = z;
+            w = he, H = Q;
           } else if (ue !== H) {
             if (ue !== P.nextSetBit(H + 1)) {
               q = !1;
@@ -106936,33 +106936,33 @@ function e2() {
       }
       w = L[0].state.nonStopStateNumber;
       let U = 0, W = 0, M = L[0].context;
-      for (let G = 1; G < L.length; G++) {
-        let H = L[G];
-        if (H.alt !== z || H.state.nonStopStateNumber !== w)
+      for (let z = 1; z < L.length; z++) {
+        let H = L[z];
+        if (H.alt !== Q || H.state.nonStopStateNumber !== w)
           break;
-        W = G, M = N.join(M, L[G].context);
+        W = z, M = N.join(M, L[z].context);
       }
-      for (let G = W + 1; G < L.length; G++) {
-        let H = L[G], Z = H.state;
+      for (let z = W + 1; z < L.length; z++) {
+        let H = L[z], Z = H.state;
         if (V.set(H.alt), Z.nonStopStateNumber !== w) {
-          w = Z.nonStopStateNumber, U = G, W = G, M = H.context;
+          w = Z.nonStopStateNumber, U = z, W = z, M = H.context;
           for (let Me = U + 1; Me < L.length; Me++) {
             let at = L[Me];
-            if (at.alt !== z || at.state.nonStopStateNumber !== w)
+            if (at.alt !== Q || at.state.nonStopStateNumber !== w)
               break;
             W = Me, M = N.join(M, at.context);
           }
-          G = W;
+          z = W;
           continue;
         }
-        let he = H.context, ue = H.alt, ee = G;
+        let he = H.context, ue = H.alt, ee = z;
         for (let Me = ee + 1; Me < L.length; Me++) {
           let at = L[Me];
           if (at.alt !== ue || at.state.nonStopStateNumber !== w)
             break;
           ee = Me, he = N.join(he, at.context);
         }
-        G = ee;
+        z = ee;
         let le = N.join(M, he);
         if (!M.equals(le))
           return;
@@ -107014,9 +107014,9 @@ function e2() {
           return !0;
       return !1;
     }
-    addDFAEdge($, N, L, q, V, z) {
+    addDFAEdge($, N, L, q, V, Q) {
       fe(q == null || q.isEmpty || $.isContextSensitive);
-      let w = N, P = this.addDFAState($, V, z);
+      let w = N, P = this.addDFAState($, V, Q);
       if (q != null)
         for (let U of q.toArray()) {
           if (U === R.PredictionContext.EMPTY_FULL_STATE_KEY && w.configs.isOutermostConfigSet)
@@ -107027,7 +107027,7 @@ function e2() {
             w = W;
             continue;
           }
-          W = this.addDFAContextState($, w.configs, U, z), fe(U !== R.PredictionContext.EMPTY_FULL_STATE_KEY || W.configs.isOutermostConfigSet), w.setContextTarget(U, W), w = W;
+          W = this.addDFAContextState($, w.configs, U, Q), fe(U !== R.PredictionContext.EMPTY_FULL_STATE_KEY || W.configs.isOutermostConfigSet), w.setContextTarget(U, W), w = W;
         }
       return dt.debug && console.log("EDGE " + w + " -> " + P + " upon " + this.getTokenName(L)), this.setDFAEdge(w, L, P), dt.debug && console.log(`DFA=
 ` + $.toString(this._parser != null ? this._parser.vocabulary : ce.VocabularyImpl.EMPTY_VOCABULARY, this._parser != null ? this._parser.ruleNames : void 0)), P;
@@ -107039,8 +107039,8 @@ function e2() {
     addDFAContextState($, N, L, q) {
       if (L !== R.PredictionContext.EMPTY_FULL_STATE_KEY) {
         let V = new l.ATNConfigSet();
-        for (let z of N)
-          V.add(z.appendContext(L, q));
+        for (let Q of N)
+          V.add(Q.appendContext(L, q));
         return this.addDFAState($, V, q);
       } else
         return fe(!N.isOutermostConfigSet, "Shouldn't be adding a duplicate edge."), N = N.clone(!0), N.isOutermostConfigSet = !0, this.addDFAState($, N, q);
@@ -107055,14 +107055,14 @@ function e2() {
           return W;
       }
       N.isReadOnly || N.conflictInfo == null && (N.conflictInfo = this.isConflicted(N, L));
-      let V = this.createDFAState($, N.clone(!0)), z = this.atn.getDecisionState($.decision), w = this.getUniqueAlt(N);
+      let V = this.createDFAState($, N.clone(!0)), Q = this.atn.getDecisionState($.decision), w = this.getUniqueAlt(N);
       if (w !== u.ATN.INVALID_ALT_NUMBER)
         V.acceptStateInfo = new r.AcceptStateInfo(w);
       else if (N.conflictingAlts != null) {
         let U = N.conflictingAlts;
         U && (V.acceptStateInfo = new r.AcceptStateInfo(U.nextSetBit(0)));
       }
-      if (V.isAcceptState && N.hasSemanticContext && this.predicateDFAState(V, N, z.numberOfTransitions), !q)
+      if (V.isAcceptState && N.hasSemanticContext && this.predicateDFAState(V, N, Q.numberOfTransitions), !q)
         return V;
       let P = $.addState(V);
       return dt.debug && P === V && console.log("adding new DFA state: " + V), P;
@@ -107072,33 +107072,33 @@ function e2() {
     }
     reportAttemptingFullContext($, N, L, q, V) {
       if (dt.debug || dt.retry_debug) {
-        let z = E.Interval.of(q, V);
-        console.log("reportAttemptingFullContext decision=" + $.decision + ":" + L.s0.configs + ", input=" + this._parser.inputStream.getText(z));
+        let Q = E.Interval.of(q, V);
+        console.log("reportAttemptingFullContext decision=" + $.decision + ":" + L.s0.configs + ", input=" + this._parser.inputStream.getText(Q));
       }
       if (this._parser != null) {
-        let z = this._parser.getErrorListenerDispatch();
-        z.reportAttemptingFullContext && z.reportAttemptingFullContext(this._parser, $, q, V, N, L);
+        let Q = this._parser.getErrorListenerDispatch();
+        Q.reportAttemptingFullContext && Q.reportAttemptingFullContext(this._parser, $, q, V, N, L);
       }
     }
     reportContextSensitivity($, N, L, q, V) {
       if (dt.debug || dt.retry_debug) {
-        let z = E.Interval.of(q, V);
-        console.log("reportContextSensitivity decision=" + $.decision + ":" + L.s0.configs + ", input=" + this._parser.inputStream.getText(z));
+        let Q = E.Interval.of(q, V);
+        console.log("reportContextSensitivity decision=" + $.decision + ":" + L.s0.configs + ", input=" + this._parser.inputStream.getText(Q));
       }
       if (this._parser != null) {
-        let z = this._parser.getErrorListenerDispatch();
-        z.reportContextSensitivity && z.reportContextSensitivity(this._parser, $, q, V, N, L);
+        let Q = this._parser.getErrorListenerDispatch();
+        Q.reportContextSensitivity && Q.reportContextSensitivity(this._parser, $, q, V, N, L);
       }
     }
     /** If context sensitive parsing, we know it's ambiguity not conflict */
-    reportAmbiguity($, N, L, q, V, z, w) {
+    reportAmbiguity($, N, L, q, V, Q, w) {
       if (dt.debug || dt.retry_debug) {
         let P = E.Interval.of(L, q);
-        console.log("reportAmbiguity " + z + ":" + w + ", input=" + this._parser.inputStream.getText(P));
+        console.log("reportAmbiguity " + Q + ":" + w + ", input=" + this._parser.inputStream.getText(P));
       }
       if (this._parser != null) {
         let P = this._parser.getErrorListenerDispatch();
-        P.reportAmbiguity && P.reportAmbiguity(this._parser, $, L, q, V, z, w);
+        P.reportAmbiguity && P.reportAmbiguity(this._parser, $, L, q, V, Q, w);
       }
     }
     getReturnState($) {
@@ -107600,18 +107600,18 @@ function t2() {
    * 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 = T && T.__decorate || function(W, M, G, H) {
-    var Z = arguments.length, he = Z < 3 ? M : H === null ? H = Object.getOwnPropertyDescriptor(M, G) : H, ue;
-    if (typeof Reflect == "object" && typeof Reflect.decorate == "function") he = Reflect.decorate(W, M, G, H);
-    else for (var ee = W.length - 1; ee >= 0; ee--) (ue = W[ee]) && (he = (Z < 3 ? ue(he) : Z > 3 ? ue(M, G, he) : ue(M, G)) || he);
-    return Z > 3 && he && Object.defineProperty(M, G, he), he;
+  var t = T && T.__decorate || function(W, M, z, H) {
+    var Z = arguments.length, he = Z < 3 ? M : H === null ? H = Object.getOwnPropertyDescriptor(M, z) : H, ue;
+    if (typeof Reflect == "object" && typeof Reflect.decorate == "function") he = Reflect.decorate(W, M, z, H);
+    else for (var ee = W.length - 1; ee >= 0; ee--) (ue = W[ee]) && (he = (Z < 3 ? ue(he) : Z > 3 ? ue(M, z, he) : ue(M, z)) || he);
+    return Z > 3 && he && Object.defineProperty(M, z, he), he;
   }, e = T && T.__param || function(W, M) {
-    return function(G, H) {
-      M(G, H, W);
+    return function(z, H) {
+      M(z, H, W);
     };
   };
   Object.defineProperty(E1, "__esModule", { value: !0 }), E1.ATNDeserializer = void 0;
-  const r = Dy, i = lu, s = du(), o = Ry, u = Er, a = Fy, l = gb, c = Sy, f = fu, x = yb, h = Yx, p = Aa, m = qae(), g = Eb, y = Vx(), E = Cy, A = Ab, _ = _b, v = vb, C = ele, b = tle, S = Cb, R = nle, O = Sb, I = $y, D = Ae, k = IB(), j = e2(), Y = Tb, Q = Rb, X = Db, ce = jy, fe = Ob, te = wb, oe = Tc, xe = Yp, Se = LB(), $ = Fb, N = Nb, L = Gp, q = nn, V = Lb, z = Ib, w = Ty;
+  const r = Dy, i = lu, s = du(), o = Ry, u = Er, a = Fy, l = gb, c = Sy, f = fu, x = yb, h = Yx, p = Aa, m = qae(), g = Eb, y = Vx(), E = Cy, A = Ab, _ = _b, v = vb, C = ele, b = tle, S = Cb, R = nle, O = Sb, I = $y, D = Ae, k = IB(), j = e2(), Y = Tb, G = Rb, X = Db, ce = jy, fe = Ob, te = wb, oe = Tc, xe = Yp, Se = LB(), $ = Fb, N = Nb, L = Gp, q = nn, V = Lb, Q = Ib, w = Ty;
   var P;
   (function(W) {
     W[W.UNICODE_BMP = 0] = "UNICODE_BMP", W[W.UNICODE_SMP = 1] = "UNICODE_SMP";
@@ -107636,16 +107636,16 @@ function t2() {
      * serialized ATN at or after the feature identified by `feature` was
      * introduced; otherwise, `false`.
      */
-    static isFeatureSupported(M, G) {
+    static isFeatureSupported(M, z) {
       let H = We.SUPPORTED_UUIDS.findIndex((Z) => Z.equals(M));
-      return H < 0 ? !1 : We.SUPPORTED_UUIDS.findIndex((Z) => Z.equals(G)) >= H;
+      return H < 0 ? !1 : We.SUPPORTED_UUIDS.findIndex((Z) => Z.equals(z)) >= H;
     }
     static getUnicodeDeserializer(M) {
       return M === 0 ? {
-        readUnicode: (G, H) => We.toInt(G[H]),
+        readUnicode: (z, H) => We.toInt(z[H]),
         size: 1
       } : {
-        readUnicode: (G, H) => We.toInt32(G, H),
+        readUnicode: (z, H) => We.toInt32(z, H),
         size: 2
       };
     }
@@ -107653,31 +107653,31 @@ function t2() {
       M = M.slice(0);
       for (let J = 1; J < M.length; J++)
         M[J] = M[J] - 2 & 65535;
-      let G = 0, H = We.toInt(M[G++]);
+      let z = 0, H = We.toInt(M[z++]);
       if (H !== We.SERIALIZED_VERSION) {
         let J = `Could not deserialize ATN with version ${H} (expected ${We.SERIALIZED_VERSION}).`;
         throw new Error(J);
       }
-      let Z = We.toUUID(M, G);
-      if (G += 8, We.SUPPORTED_UUIDS.findIndex((J) => J.equals(Z)) < 0) {
+      let Z = We.toUUID(M, z);
+      if (z += 8, We.SUPPORTED_UUIDS.findIndex((J) => J.equals(Z)) < 0) {
         let J = `Could not deserialize ATN with UUID ${Z} (expected ${We.SERIALIZED_UUID} or a legacy UUID).`;
         throw new Error(J);
       }
-      let he = We.isFeatureSupported(We.ADDED_LEXER_ACTIONS, Z), ue = We.toInt(M[G++]), ee = We.toInt(M[G++]), le = new s.ATN(ue, ee), Me = [], at = [], _t = We.toInt(M[G++]);
+      let he = We.isFeatureSupported(We.ADDED_LEXER_ACTIONS, Z), ue = We.toInt(M[z++]), ee = We.toInt(M[z++]), le = new s.ATN(ue, ee), Me = [], at = [], _t = We.toInt(M[z++]);
       for (let J = 0; J < _t; J++) {
-        let de = We.toInt(M[G++]);
+        let de = We.toInt(M[z++]);
         if (de === u.ATNStateType.INVALID_TYPE) {
           le.addState(new E.InvalidState());
           continue;
         }
-        let Ne = We.toInt(M[G++]);
+        let Ne = We.toInt(M[z++]);
         Ne === 65535 && (Ne = -1);
         let He = this.stateFactory(de, Ne);
         if (de === u.ATNStateType.LOOP_END) {
-          let ot = We.toInt(M[G++]);
+          let ot = We.toInt(M[z++]);
           Me.push([He, ot]);
         } else if (He instanceof h.BlockStartState) {
-          let ot = We.toInt(M[G++]);
+          let ot = We.toInt(M[z++]);
           at.push([He, ot]);
         }
         le.addState(He);
@@ -107686,53 +107686,53 @@ function t2() {
         J[0].loopBackState = le.states[J[1]];
       for (let J of at)
         J[0].endState = le.states[J[1]];
-      let ie = We.toInt(M[G++]);
+      let ie = We.toInt(M[z++]);
       for (let J = 0; J < ie; J++) {
-        let de = We.toInt(M[G++]);
+        let de = We.toInt(M[z++]);
         le.states[de].nonGreedy = !0;
       }
-      let ae = We.toInt(M[G++]);
+      let ae = We.toInt(M[z++]);
       for (let J = 0; J < ae; J++) {
-        let de = We.toInt(M[G++]);
+        let de = We.toInt(M[z++]);
         le.states[de].sll = !0;
       }
-      let we = We.toInt(M[G++]);
+      let we = We.toInt(M[z++]);
       for (let J = 0; J < we; J++) {
-        let de = We.toInt(M[G++]);
+        let de = We.toInt(M[z++]);
         le.states[de].isPrecedenceRule = !0;
       }
-      let Qe = We.toInt(M[G++]);
+      let Qe = We.toInt(M[z++]);
       le.grammarType === 0 && (le.ruleToTokenType = new Int32Array(Qe)), le.ruleToStartState = new Array(Qe);
       for (let J = 0; J < Qe; J++) {
-        let de = We.toInt(M[G++]), Ne = le.states[de];
-        if (Ne.leftFactored = We.toInt(M[G++]) !== 0, le.ruleToStartState[J] = Ne, le.grammarType === 0) {
-          let He = We.toInt(M[G++]);
-          He === 65535 && (He = q.Token.EOF), le.ruleToTokenType[J] = He, We.isFeatureSupported(We.ADDED_LEXER_ACTIONS, Z) || We.toInt(M[G++]);
+        let de = We.toInt(M[z++]), Ne = le.states[de];
+        if (Ne.leftFactored = We.toInt(M[z++]) !== 0, le.ruleToStartState[J] = Ne, le.grammarType === 0) {
+          let He = We.toInt(M[z++]);
+          He === 65535 && (He = q.Token.EOF), le.ruleToTokenType[J] = He, We.isFeatureSupported(We.ADDED_LEXER_ACTIONS, Z) || We.toInt(M[z++]);
         }
       }
       le.ruleToStopState = new Array(Qe);
       for (let J of le.states)
         J instanceof oe.RuleStopState && (le.ruleToStopState[J.ruleIndex] = J, le.ruleToStartState[J.ruleIndex].stopState = J);
-      let qe = We.toInt(M[G++]);
+      let qe = We.toInt(M[z++]);
       for (let J = 0; J < qe; J++) {
-        let de = We.toInt(M[G++]);
+        let de = We.toInt(M[z++]);
         le.modeToStartState.push(le.states[de]);
       }
       le.modeToDFA = new Array(qe);
       for (let J = 0; J < qe; J++)
         le.modeToDFA[J] = new m.DFA(le.modeToStartState[J]);
       let Le = [];
-      G = this.deserializeSets(M, G, Le, We.getUnicodeDeserializer(
+      z = this.deserializeSets(M, z, Le, We.getUnicodeDeserializer(
         0
         /* UNICODE_BMP */
-      )), We.isFeatureSupported(We.ADDED_UNICODE_SMP, Z) && (G = this.deserializeSets(M, G, Le, We.getUnicodeDeserializer(
+      )), We.isFeatureSupported(We.ADDED_UNICODE_SMP, Z) && (z = this.deserializeSets(M, z, Le, We.getUnicodeDeserializer(
         1
         /* UNICODE_SMP */
       )));
-      let ye = We.toInt(M[G++]);
+      let ye = We.toInt(M[z++]);
       for (let J = 0; J < ye; J++) {
-        let de = We.toInt(M[G]), Ne = We.toInt(M[G + 1]), He = We.toInt(M[G + 2]), ot = We.toInt(M[G + 3]), vt = We.toInt(M[G + 4]), ut = We.toInt(M[G + 5]), Zn = this.edgeFactory(le, He, de, Ne, ot, vt, ut, Le);
-        le.states[de].addTransition(Zn), G += 6;
+        let de = We.toInt(M[z]), Ne = We.toInt(M[z + 1]), He = We.toInt(M[z + 2]), ot = We.toInt(M[z + 3]), vt = We.toInt(M[z + 4]), ut = We.toInt(M[z + 5]), Zn = this.edgeFactory(le, He, de, Ne, ot, vt, ut, Le);
+        le.states[de].addTransition(Zn), z += 6;
       }
       let B = new i.Array2DHashSet({
         hashCode: (J) => J.stopState ^ J.returnState ^ J.outermostPrecedenceReturn,
@@ -107765,7 +107765,7 @@ function t2() {
             throw new Error("IllegalStateException");
           J.endState.startState = J;
         }
-        if (J instanceof Q.PlusLoopbackState) {
+        if (J instanceof G.PlusLoopbackState) {
           let de = J;
           for (let Ne = 0; Ne < de.numberOfTransitions; Ne++) {
             let He = de.transition(Ne).target;
@@ -107779,18 +107779,18 @@ function t2() {
           }
         }
       }
-      let Re = We.toInt(M[G++]);
+      let Re = We.toInt(M[z++]);
       for (let J = 1; J <= Re; J++) {
-        let de = We.toInt(M[G++]), Ne = le.states[de];
+        let de = We.toInt(M[z++]), Ne = le.states[de];
         le.decisionToState.push(Ne), Ne.decision = J - 1;
       }
       if (le.grammarType === 0)
         if (he) {
-          le.lexerActions = new Array(We.toInt(M[G++]));
+          le.lexerActions = new Array(We.toInt(M[z++]));
           for (let J = 0; J < le.lexerActions.length; J++) {
-            let de = We.toInt(M[G++]), Ne = We.toInt(M[G++]);
+            let de = We.toInt(M[z++]), Ne = We.toInt(M[z++]);
             Ne === 65535 && (Ne = -1);
-            let He = We.toInt(M[G++]);
+            let He = We.toInt(M[z++]);
             He === 65535 && (He = -1);
             let ot = this.lexerActionFactory(de, Ne, He);
             le.lexerActions[J] = ot;
@@ -107863,21 +107863,21 @@ function t2() {
       }
       return We.identifyTailCalls(le), le;
     }
-    deserializeSets(M, G, H, Z) {
-      let he = We.toInt(M[G++]);
+    deserializeSets(M, z, H, Z) {
+      let he = We.toInt(M[z++]);
       for (let ue = 0; ue < he; ue++) {
-        let ee = We.toInt(M[G]);
-        G++;
+        let ee = We.toInt(M[z]);
+        z++;
         let le = new y.IntervalSet();
-        H.push(le), We.toInt(M[G++]) !== 0 && le.add(-1);
+        H.push(le), We.toInt(M[z++]) !== 0 && le.add(-1);
         for (let at = 0; at < ee; at++) {
-          let _t = Z.readUnicode(M, G);
-          G += Z.size;
-          let ie = Z.readUnicode(M, G);
-          G += Z.size, le.add(_t, ie);
+          let _t = Z.readUnicode(M, z);
+          z += Z.size;
+          let ie = Z.readUnicode(M, z);
+          z += Z.size, le.add(_t, ie);
         }
       }
-      return G;
+      return z;
     }
     /**
      * Analyze the {@link StarLoopEntryState} states in the specified ATN to set
@@ -107887,21 +107887,21 @@ function t2() {
      * @param atn The ATN.
      */
     markPrecedenceDecisions(M) {
-      let G = /* @__PURE__ */ new Map();
+      let z = /* @__PURE__ */ new Map();
       for (let H of M.states)
         if (H instanceof L.StarLoopEntryState && M.ruleToStartState[H.ruleIndex].isPrecedenceRule) {
           let Z = H.transition(H.numberOfTransitions - 1).target;
-          Z instanceof I.LoopEndState && Z.epsilonOnlyTransitions && Z.transition(0).target instanceof oe.RuleStopState && (G.set(H.ruleIndex, H), H.precedenceRuleDecision = !0, H.precedenceLoopbackStates = new f.BitSet(M.states.length));
+          Z instanceof I.LoopEndState && Z.epsilonOnlyTransitions && Z.transition(0).target instanceof oe.RuleStopState && (z.set(H.ruleIndex, H), H.precedenceRuleDecision = !0, H.precedenceLoopbackStates = new f.BitSet(M.states.length));
         }
-      for (let H of G)
+      for (let H of z)
         for (let Z of M.ruleToStopState[H[0]].getTransitions())
           Z.serializationType !== 1 || Z.outermostPrecedenceReturn !== -1 || H[1].precedenceLoopbackStates.set(Z.target.stateNumber);
     }
     verifyATN(M) {
-      for (let G of M.states)
-        if (this.checkCondition(G !== void 0, "ATN states should not be undefined."), G.stateType !== u.ATNStateType.INVALID_TYPE) {
-          if (this.checkCondition(G.onlyHasEpsilonTransitions || G.numberOfTransitions <= 1), G instanceof Y.PlusBlockStartState && this.checkCondition(G.loopBackState !== void 0), G instanceof L.StarLoopEntryState) {
-            let H = G;
+      for (let z of M.states)
+        if (this.checkCondition(z !== void 0, "ATN states should not be undefined."), z.stateType !== u.ATNStateType.INVALID_TYPE) {
+          if (this.checkCondition(z.onlyHasEpsilonTransitions || z.numberOfTransitions <= 1), z instanceof Y.PlusBlockStartState && this.checkCondition(z.loopBackState !== void 0), z instanceof L.StarLoopEntryState) {
+            let H = z;
             if (this.checkCondition(H.loopBackState !== void 0), this.checkCondition(H.numberOfTransitions === 2), H.transition(0).target instanceof $.StarBlockStartState)
               this.checkCondition(H.transition(1).target instanceof I.LoopEndState), this.checkCondition(!H.nonGreedy);
             else if (H.transition(0).target instanceof I.LoopEndState)
@@ -107909,19 +107909,19 @@ function t2() {
             else
               throw new Error("IllegalStateException");
           }
-          if (G instanceof N.StarLoopbackState && (this.checkCondition(G.numberOfTransitions === 1), this.checkCondition(G.transition(0).target instanceof L.StarLoopEntryState)), G instanceof I.LoopEndState && this.checkCondition(G.loopBackState !== void 0), G instanceof te.RuleStartState && this.checkCondition(G.stopState !== void 0), G instanceof h.BlockStartState && this.checkCondition(G.endState !== void 0), G instanceof x.BlockEndState && this.checkCondition(G.startState !== void 0), G instanceof p.DecisionState) {
-            let H = G;
+          if (z instanceof N.StarLoopbackState && (this.checkCondition(z.numberOfTransitions === 1), this.checkCondition(z.transition(0).target instanceof L.StarLoopEntryState)), z instanceof I.LoopEndState && this.checkCondition(z.loopBackState !== void 0), z instanceof te.RuleStartState && this.checkCondition(z.stopState !== void 0), z instanceof h.BlockStartState && this.checkCondition(z.endState !== void 0), z instanceof x.BlockEndState && this.checkCondition(z.startState !== void 0), z instanceof p.DecisionState) {
+            let H = z;
             this.checkCondition(H.numberOfTransitions <= 1 || H.decision >= 0);
           } else
-            this.checkCondition(G.numberOfTransitions <= 1 || G instanceof oe.RuleStopState);
+            this.checkCondition(z.numberOfTransitions <= 1 || z instanceof oe.RuleStopState);
         }
     }
-    checkCondition(M, G) {
+    checkCondition(M, z) {
       if (!M)
-        throw new Error("IllegalStateException: " + G);
+        throw new Error("IllegalStateException: " + z);
     }
     static inlineSetRules(M) {
-      let G = 0, H = new Array(M.ruleToStartState.length);
+      let z = 0, H = new Array(M.ruleToStartState.length);
       for (let Z = 0; Z < M.ruleToStartState.length; Z++) {
         let ue = M.ruleToStartState[Z];
         for (; ue.onlyHasEpsilonTransitions && ue.numberOfOptimizedTransitions === 1 && ue.getOptimizedTransition(0).serializationType === 1; )
@@ -107963,7 +107963,7 @@ function t2() {
             for (let ie = 0; ie < ue; ie++)
               he.push(Z.getOptimizedTransition(ue));
           }
-          G++;
+          z++;
           let at = le.followState, _t = new c.BasicState();
           switch (_t.setRuleIndex(at.ruleIndex), M.addState(_t), he.push(new g.EpsilonTransition(_t)), Me.serializationType) {
             case 5:
@@ -107987,10 +107987,10 @@ function t2() {
             Z.addOptimizedTransition(ue);
         }
       }
-      return j.ParserATNSimulator.debug && console.log("ATN runtime optimizer removed " + G + " rule invocations by inlining sets."), G;
+      return j.ParserATNSimulator.debug && console.log("ATN runtime optimizer removed " + z + " rule invocations by inlining sets."), z;
     }
     static combineChainedEpsilons(M) {
-      let G = 0;
+      let z = 0;
       for (let H of M.states) {
         if (!H.onlyHasEpsilonTransitions || H instanceof oe.RuleStopState)
           continue;
@@ -108006,7 +108006,7 @@ function t2() {
               Z !== void 0 && Z.push(ue);
               continue e;
             }
-          if (G++, Z === void 0) {
+          if (z++, Z === void 0) {
             Z = [];
             for (let le = 0; le < he; le++)
               Z.push(H.getOptimizedTransition(le));
@@ -108024,10 +108024,10 @@ function t2() {
             H.addOptimizedTransition(he);
         }
       }
-      return j.ParserATNSimulator.debug && console.log("ATN runtime optimizer removed " + G + " transitions by combining chained epsilon transitions."), G;
+      return j.ParserATNSimulator.debug && console.log("ATN runtime optimizer removed " + z + " transitions by combining chained epsilon transitions."), z;
     }
-    static optimizeSets(M, G) {
-      if (G)
+    static optimizeSets(M, z) {
+      if (z)
         return 0;
       let H = 0, Z = M.decisionToState;
       for (let he of Z) {
@@ -108072,23 +108072,23 @@ function t2() {
       return j.ParserATNSimulator.debug && console.log("ATN runtime optimizer removed " + H + " paths by collapsing sets."), H;
     }
     static identifyTailCalls(M) {
-      for (let G of M.states) {
-        for (let H = 0; H < G.numberOfTransitions; H++) {
-          let Z = G.transition(H);
+      for (let z of M.states) {
+        for (let H = 0; H < z.numberOfTransitions; H++) {
+          let Z = z.transition(H);
           Z instanceof xe.RuleTransition && (Z.tailCall = this.testTailCall(M, Z, !1), Z.optimizedTailCall = this.testTailCall(M, Z, !0));
         }
-        if (G.isOptimized)
-          for (let H = 0; H < G.numberOfOptimizedTransitions; H++) {
-            let Z = G.getOptimizedTransition(H);
+        if (z.isOptimized)
+          for (let H = 0; H < z.numberOfOptimizedTransitions; H++) {
+            let Z = z.getOptimizedTransition(H);
             Z instanceof xe.RuleTransition && (Z.tailCall = this.testTailCall(M, Z, !1), Z.optimizedTailCall = this.testTailCall(M, Z, !0));
           }
       }
     }
-    static testTailCall(M, G, H) {
-      if (!H && G.tailCall || H && G.optimizedTailCall)
+    static testTailCall(M, z, H) {
+      if (!H && z.tailCall || H && z.optimizedTailCall)
         return !0;
       let Z = new f.BitSet(M.states.length), he = [];
-      for (he.push(G.followState); ; ) {
+      for (he.push(z.followState); ; ) {
         let ue = he.pop();
         if (!ue)
           break;
@@ -108109,16 +108109,16 @@ function t2() {
     static toInt(M) {
       return M;
     }
-    static toInt32(M, G) {
-      return (M[G] | M[G + 1] << 16) >>> 0;
+    static toInt32(M, z) {
+      return (M[z] | M[z + 1] << 16) >>> 0;
     }
-    static toUUID(M, G) {
-      let H = We.toInt32(M, G), Z = We.toInt32(M, G + 2), he = We.toInt32(M, G + 4), ue = We.toInt32(M, G + 6);
-      return new z.UUID(ue, he, Z, H);
+    static toUUID(M, z) {
+      let H = We.toInt32(M, z), Z = We.toInt32(M, z + 2), he = We.toInt32(M, z + 4), ue = We.toInt32(M, z + 6);
+      return new Q.UUID(ue, he, Z, H);
     }
-    edgeFactory(M, G, H, Z, he, ue, ee, le) {
+    edgeFactory(M, z, H, Z, he, ue, ee, le) {
       let Me = M.states[Z];
-      switch (G) {
+      switch (z) {
         case 1:
           return new g.EpsilonTransition(Me);
         case 2:
@@ -108142,7 +108142,7 @@ function t2() {
       }
       throw new Error("The specified transition type is not valid.");
     }
-    stateFactory(M, G) {
+    stateFactory(M, z) {
       let H;
       switch (M) {
         case u.ATNStateType.INVALID_TYPE:
@@ -108178,7 +108178,7 @@ function t2() {
           H = new L.StarLoopEntryState();
           break;
         case u.ATNStateType.PLUS_LOOP_BACK:
-          H = new Q.PlusLoopbackState();
+          H = new G.PlusLoopbackState();
           break;
         case u.ATNStateType.LOOP_END:
           H = new I.LoopEndState();
@@ -108187,33 +108187,33 @@ function t2() {
           let Z = `The specified state type ${M} is not valid.`;
           throw new Error(Z);
       }
-      return H.ruleIndex = G, H;
+      return H.ruleIndex = z, H;
     }
-    lexerActionFactory(M, G, H) {
+    lexerActionFactory(M, z, H) {
       switch (M) {
         case 0:
-          return new A.LexerChannelAction(G);
+          return new A.LexerChannelAction(z);
         case 1:
-          return new _.LexerCustomAction(G, H);
+          return new _.LexerCustomAction(z, H);
         case 2:
-          return new v.LexerModeAction(G);
+          return new v.LexerModeAction(z);
         case 3:
           return C.LexerMoreAction.INSTANCE;
         case 4:
           return b.LexerPopModeAction.INSTANCE;
         case 5:
-          return new S.LexerPushModeAction(G);
+          return new S.LexerPushModeAction(z);
         case 6:
           return R.LexerSkipAction.INSTANCE;
         case 7:
-          return new O.LexerTypeAction(G);
+          return new O.LexerTypeAction(z);
         default:
           let Z = `The specified lexer action type ${M} is not valid.`;
           throw new Error(Z);
       }
     }
   };
-  return U.BASE_SERIALIZED_UUID = z.UUID.fromString("E4178468-DF95-44D0-AD87-F22A5D5FB6D3"), U.ADDED_LEXER_ACTIONS = z.UUID.fromString("AB35191A-1603-487E-B75A-479B831EAF6D"), U.ADDED_UNICODE_SMP = z.UUID.fromString("C23FEA89-0605-4f51-AFB8-058BCAB8C91B"), U.SUPPORTED_UUIDS = [
+  return U.BASE_SERIALIZED_UUID = Q.UUID.fromString("E4178468-DF95-44D0-AD87-F22A5D5FB6D3"), U.ADDED_LEXER_ACTIONS = Q.UUID.fromString("AB35191A-1603-487E-B75A-479B831EAF6D"), U.ADDED_UNICODE_SMP = Q.UUID.fromString("C23FEA89-0605-4f51-AFB8-058BCAB8C91B"), U.SUPPORTED_UUIDS = [
     U.BASE_SERIALIZED_UUID,
     U.ADDED_LEXER_ACTIONS,
     U.ADDED_UNICODE_SMP
@@ -111498,15 +111498,15 @@ function oYe() {
       compile(R, O) {
         let I = this.tokenize(R), D = new u.ListTokenSource(I), k = new o.CommonTokenStream(D);
         const j = this._parser;
-        let Y = new f.ParserInterpreter(j.grammarFileName, j.vocabulary, j.ruleNames, j.getATNWithBypassAlts(), k), Q;
+        let Y = new f.ParserInterpreter(j.grammarFileName, j.vocabulary, j.ruleNames, j.getATNWithBypassAlts(), k), G;
         try {
-          Y.errorHandler = new i.BailErrorStrategy(), Q = Y.parse(O);
+          Y.errorHandler = new i.BailErrorStrategy(), G = Y.parse(O);
         } catch (X) {
           throw X instanceof c.ParseCancellationException ? X.getCause() : X instanceof m.RecognitionException ? X : X instanceof Error ? new b.CannotInvokeStartRule(X) : X;
         }
         if (k.LA(1) !== v.Token.EOF)
           throw new b.StartRuleDoesNotConsumeFullPattern();
-        return new p.ParseTreePattern(this, R, O, Q);
+        return new p.ParseTreePattern(this, R, O, G);
       }
       /**
        * Used to convert the tree pattern string into a series of tokens. The
@@ -111565,9 +111565,9 @@ function oYe() {
             return D || (D = R), D;
           let j = R.childCount;
           for (let Y = 0; Y < j; Y++) {
-            let Q = this.matchImpl(R.getChild(Y), O.getChild(Y), I);
-            if (Q)
-              return Q;
+            let G = this.matchImpl(R.getChild(Y), O.getChild(Y), I);
+            if (G)
+              return G;
           }
           return D;
         }
@@ -111591,14 +111591,14 @@ function oYe() {
               let Y = this._parser.getTokenType(k.tag);
               if (Y === v.Token.INVALID_TYPE)
                 throw new Error("Unknown token " + k.tag + " in pattern: " + R);
-              let Q = new C.TokenTagToken(k.tag, Y, k.label);
-              I.push(Q);
+              let G = new C.TokenTagToken(k.tag, Y, k.label);
+              I.push(G);
             } else if (j === j.toLowerCase()) {
               let Y = this._parser.getRuleIndex(k.tag);
               if (Y === -1)
                 throw new Error("Unknown rule " + k.tag + " in pattern: " + R);
-              let Q = this._parser.getATNWithBypassAlts().ruleToTokenType[Y];
-              I.push(new y.RuleTagToken(k.tag, Q, k.label));
+              let G = this._parser.getATNWithBypassAlts().ruleToTokenType[Y];
+              I.push(new y.RuleTagToken(k.tag, G, k.label));
             } else
               throw new Error("invalid tag: " + k.tag + " in pattern: " + R);
           } else {
@@ -111620,36 +111620,36 @@ function oYe() {
         if (k.length < j.length)
           throw new Error("missing start tag in pattern: " + R);
         let Y = k.length;
-        for (let Q = 0; Q < Y; Q++)
-          if (k[Q] >= j[Q])
+        for (let G = 0; G < Y; G++)
+          if (k[G] >= j[G])
             throw new Error("tag delimiters out of order in pattern: " + R);
         if (Y === 0) {
-          let Q = R.substring(0, I);
-          D.push(new _.TextChunk(Q));
+          let G = R.substring(0, I);
+          D.push(new _.TextChunk(G));
         }
         if (Y > 0 && k[0] > 0) {
-          let Q = R.substring(0, k[0]);
-          D.push(new _.TextChunk(Q));
+          let G = R.substring(0, k[0]);
+          D.push(new _.TextChunk(G));
         }
-        for (let Q = 0; Q < Y; Q++) {
-          let X = R.substring(k[Q] + this.start.length, j[Q]), ce = X, fe, te = X.indexOf(":");
-          if (te >= 0 && (fe = X.substring(0, te), ce = X.substring(te + 1, X.length)), D.push(new E.TagChunk(ce, fe)), Q + 1 < Y) {
-            let oe = R.substring(j[Q] + this.stop.length, k[Q + 1]);
+        for (let G = 0; G < Y; G++) {
+          let X = R.substring(k[G] + this.start.length, j[G]), ce = X, fe, te = X.indexOf(":");
+          if (te >= 0 && (fe = X.substring(0, te), ce = X.substring(te + 1, X.length)), D.push(new E.TagChunk(ce, fe)), G + 1 < Y) {
+            let oe = R.substring(j[G] + this.stop.length, k[G + 1]);
             D.push(new _.TextChunk(oe));
           }
         }
         if (Y > 0) {
-          let Q = j[Y - 1] + this.stop.length;
-          if (Q < I) {
-            let X = R.substring(Q, I);
+          let G = j[Y - 1] + this.stop.length;
+          if (G < I) {
+            let X = R.substring(G, I);
             D.push(new _.TextChunk(X));
           }
         }
-        for (let Q = 0; Q < D.length; Q++) {
-          let X = D[Q];
+        for (let G = 0; G < D.length; G++) {
+          let X = D[G];
           if (X instanceof _.TextChunk) {
             let ce = X.text.replace(this.escapeRE, "");
-            ce.length < X.text.length && (D[Q] = new _.TextChunk(ce));
+            ce.length < X.text.length && (D[G] = new _.TextChunk(ce));
           }
         }
         return D;
@@ -116050,7 +116050,7 @@ class _Ke extends Kle {
 }
 var wF = {}, a2 = {}, kt = {}, Ke = {};
 (function(t) {
-  Object.defineProperty(t, "__esModule", { value: !0 }), t.TD = t.ValueType = void 0, t.exprHasKids = e, t.exprHasE = r, t.exprIsLeaf = i, t.isAsymmetricExpr = s, t.mkTemporal = u, t.isRawCast = a, t.isFilterExprType = l, t.isParameterType = c, t.paramHasValue = f, t.expressionIsScalar = x, t.expressionIsAggregate = h, t.expressionIsUngroupedAggregate = p, t.expressionInvolvesAggregate = m, t.expressionIsCalculation = g, t.expressionIsAnalytic = y, t.isExpressionTypeLEQ = A, t.maxExpressionType = _, t.maxOfExpressionTypes = v, t.hasExpression = C, t.isTemporalType = b, t.isAtomicFieldType = S, t.canOrderBy = R, t.isCastType = O, t.fieldIsIntrinsic = I, t.mkFieldDef = D, t.mkArrayDef = k, t.isRepeatedRecordFunctionParam = j, t.isRepeatedRecord = Y, t.isBasicArray = Q, t.isMatrixOperation = X, t.isJoinable = ce, t.isJoined = fe, t.isJoinedSource = te, t.isDateUnit = oe, t.isTimestampUnit = xe, t.isExtractUnit = Se, t.refIsStructDef = N, t.segmentHasErrors = L, t.structHasErrors = q, t.isReduceSegment = V, t.isPartialSegment = z, t.isProjectSegment = w, t.isQuerySegment = P, t.isSamplingRows = U, t.isSamplingPercent = W, t.isSamplingEnable = M, t.isRawSegment = G, t.isIndexSegment = H, t.isSegmentSQL = Z, t.sourceBase = he, t.isSourceDef = ue, t.isBaseTable = ee, t.isLiteral = le, t.mergeEvalSpaces = Me, t.isBasicAtomic = at, t.getIdentifier = _t, t.isTurtle = ie, t.isAtomic = ae, t.isValueString = we, t.isValueNumber = Qe, t.isValueBoolean = qe, t.isValueTimestamp = Le, t.isValueDate = ye;
+  Object.defineProperty(t, "__esModule", { value: !0 }), t.TD = t.ValueType = void 0, t.exprHasKids = e, t.exprHasE = r, t.exprIsLeaf = i, t.isAsymmetricExpr = s, t.mkTemporal = u, t.isRawCast = a, t.isFilterExprType = l, t.isParameterType = c, t.paramHasValue = f, t.expressionIsScalar = x, t.expressionIsAggregate = h, t.expressionIsUngroupedAggregate = p, t.expressionInvolvesAggregate = m, t.expressionIsCalculation = g, t.expressionIsAnalytic = y, t.isExpressionTypeLEQ = A, t.maxExpressionType = _, t.maxOfExpressionTypes = v, t.hasExpression = C, t.isTemporalType = b, t.isAtomicFieldType = S, t.canOrderBy = R, t.isCastType = O, t.fieldIsIntrinsic = I, t.mkFieldDef = D, t.mkArrayDef = k, t.isRepeatedRecordFunctionParam = j, t.isRepeatedRecord = Y, t.isBasicArray = G, t.isMatrixOperation = X, t.isJoinable = ce, t.isJoined = fe, t.isJoinedSource = te, t.isDateUnit = oe, t.isTimestampUnit = xe, t.isExtractUnit = Se, t.refIsStructDef = N, t.segmentHasErrors = L, t.structHasErrors = q, t.isReduceSegment = V, t.isPartialSegment = Q, t.isProjectSegment = w, t.isQuerySegment = P, t.isSamplingRows = U, t.isSamplingPercent = W, t.isSamplingEnable = M, t.isRawSegment = z, t.isIndexSegment = H, t.isSegmentSQL = Z, t.sourceBase = he, t.isSourceDef = ue, t.isBaseTable = ee, t.isLiteral = le, t.mergeEvalSpaces = Me, t.isBasicAtomic = at, t.getIdentifier = _t, t.isTurtle = ie, t.isAtomic = ae, t.isValueString = we, t.isValueNumber = Qe, t.isValueBoolean = qe, t.isValueTimestamp = Le, t.isValueDate = ye;
   function e(B) {
     return "kids" in B;
   }
@@ -116161,7 +116161,7 @@ var wF = {}, a2 = {}, kt = {}, Ke = {};
     return S(B.type) && !C(B);
   }
   function D(B, K) {
-    if (Q(B))
+    if (G(B))
       return k(B.elementTypeDef, K);
     if (Y(B)) {
       const { type: Re, fields: J, elementTypeDef: de } = B;
@@ -116200,7 +116200,7 @@ var wF = {}, a2 = {}, kt = {}, Ke = {};
   function Y(B) {
     return B.type === "array" && B.elementTypeDef.type === "record_element";
   }
-  function Q(B) {
+  function G(B) {
     return B.type === "array" && B.elementTypeDef.type !== "record_element";
   }
   function X(B) {
@@ -116247,7 +116247,7 @@ var wF = {}, a2 = {}, kt = {}, Ke = {};
   function V(B) {
     return B.type === "reduce";
   }
-  function z(B) {
+  function Q(B) {
     return B.type === "partial";
   }
   function w(B) {
@@ -116265,7 +116265,7 @@ var wF = {}, a2 = {}, kt = {}, Ke = {};
   function M(B) {
     return B.enable !== void 0;
   }
-  function G(B) {
+  function z(B) {
     return B.type === "raw";
   }
   function H(B) {
@@ -117290,7 +117290,7 @@ var Fc = {}, c0e = {};
     takes: { base: "number", exponent: "number" },
     returns: "number",
     impl: { function: "POW" }
-  }, Q = {
+  }, G = {
     takes: {},
     returns: "number",
     impl: { function: "RAND" }
@@ -117382,7 +117382,7 @@ var Fc = {}, c0e = {};
     takes: { value: "number" },
     returns: "number",
     impl: { function: "TAN" }
-  }, z = {
+  }, Q = {
     whitespace: {
       ...D.whitespace,
       impl: { function: "TRIM" }
@@ -117444,7 +117444,7 @@ var Fc = {}, c0e = {};
         between: { preceding: "preceding", following: "following" }
       }
     }
-  }, G = {
+  }, z = {
     generic: { T: ["string", "number", "timestamp", "date", "json"] },
     takes: { value: { measure: { generic: "T" } } },
     returns: { calculation: { generic: "T" } },
@@ -117628,7 +117628,7 @@ var Fc = {}, c0e = {};
     nullif: k,
     pi: j,
     pow: Y,
-    rand: Q,
+    rand: G,
     regexp_extract: X,
     replace: fe,
     round: te,
@@ -117641,7 +117641,7 @@ var Fc = {}, c0e = {};
     strpos: L,
     substr: q,
     tan: V,
-    trim: z,
+    trim: Q,
     trunc: w,
     unicode: P,
     upper: U,
@@ -117652,7 +117652,7 @@ var Fc = {}, c0e = {};
     // Analytic functions
     avg_moving: M,
     dense_rank: ie,
-    first_value: G,
+    first_value: z,
     lag: Z,
     last_value: he,
     lead: ue,
@@ -121293,9 +121293,9 @@ var tk = A0e.exports, nk = {}, _0e = { exports: {} };
     }
     function h(D, k) {
       for (var j = D.length, Y = 0; ; ) {
-        var Q = D.lastIndexOf(`
+        var G = D.lastIndexOf(`
 `, j - 1);
-        if (Q === -1 || (Y++, j = Q, Y === k) || j === 0)
+        if (G === -1 || (Y++, j = G, Y === k) || j === 0)
           break;
       }
       var X = Y < k ? 0 : j + 1;
@@ -121304,16 +121304,16 @@ var tk = A0e.exports, nk = {}, _0e = { exports: {} };
     }
     function p(D) {
       for (var k = Object.getOwnPropertyNames(D), j = [], Y = 0; Y < k.length; Y++) {
-        var Q = k[Y], X = D[Q], ce = [].concat(X);
-        if (Q === "include") {
+        var G = k[Y], X = D[G], ce = [].concat(X);
+        if (G === "include") {
           for (var fe = 0; fe < ce.length; fe++)
             j.push({ include: ce[fe] });
           continue;
         }
         var te = [];
         ce.forEach(function(oe) {
-          o(oe) ? (te.length && j.push(g(Q, te)), j.push(g(Q, oe)), te = []) : te.push(oe);
-        }), te.length && j.push(g(Q, te));
+          o(oe) ? (te.length && j.push(g(G, te)), j.push(g(G, oe)), te = []) : te.push(oe);
+        }), te.length && j.push(g(G, te));
       }
       return j;
     }
@@ -121321,8 +121321,8 @@ var tk = A0e.exports, nk = {}, _0e = { exports: {} };
       for (var k = [], j = 0; j < D.length; j++) {
         var Y = D[j];
         if (Y.include) {
-          for (var Q = [].concat(Y.include), X = 0; X < Q.length; X++)
-            k.push({ include: Q[X] });
+          for (var G = [].concat(Y.include), X = 0; X < G.length; X++)
+            k.push({ include: G[X] });
           continue;
         }
         if (!Y.type)
@@ -121350,8 +121350,8 @@ var tk = A0e.exports, nk = {}, _0e = { exports: {} };
         e.call(k, Y) && (j[Y] = k[Y]);
       if (typeof j.type == "string" && D !== j.type)
         throw new Error("Type transform cannot be a string (type '" + j.type + "' for token '" + D + "')");
-      var Q = j.match;
-      return j.match = Array.isArray(Q) ? Q : Q ? [Q] : [], j.match.sort(function(X, ce) {
+      var G = j.match;
+      return j.match = Array.isArray(G) ? G : G ? [G] : [], j.match.sort(function(X, ce) {
         return s(X) && s(ce) ? 0 : s(ce) ? -1 : s(X) ? 1 : ce.length - X.length;
       }), j;
     }
@@ -121360,8 +121360,8 @@ var tk = A0e.exports, nk = {}, _0e = { exports: {} };
     }
     var E = g("error", { lineBreaks: !0, shouldThrow: !0 });
     function A(D, k) {
-      for (var j = null, Y = /* @__PURE__ */ Object.create(null), Q = !0, X = null, ce = [], fe = [], te = 0; te < D.length; te++)
-        D[te].fallback && (Q = !1);
+      for (var j = null, Y = /* @__PURE__ */ Object.create(null), G = !0, X = null, ce = [], fe = [], te = 0; te < D.length; te++)
+        D[te].fallback && (G = !1);
       for (var te = 0; te < D.length; te++) {
         var oe = D[te];
         if (oe.include)
@@ -121372,7 +121372,7 @@ var tk = A0e.exports, nk = {}, _0e = { exports: {} };
           j = oe;
         }
         var xe = oe.match.slice();
-        if (Q)
+        if (G)
           for (; xe.length && typeof xe[0] == "string" && xe[0].length === 1; ) {
             var Se = xe.shift();
             Y[Se.charCodeAt(0)] = oe;
@@ -121384,7 +121384,7 @@ var tk = A0e.exports, nk = {}, _0e = { exports: {} };
             throw new Error("State-switching options are not allowed on fallback tokens (for token '" + oe.defaultType + "')");
         }
         if (xe.length !== 0) {
-          Q = !1, ce.push(oe);
+          G = !1, ce.push(oe);
           for (var $ = 0; $ < xe.length; $++) {
             var N = xe[$];
             if (s(N)) {
@@ -121407,7 +121407,7 @@ Use (?: … ) instead`);
           fe.push(l(L));
         }
       }
-      var z = j && j.fallback, w = i && !z ? "ym" : "gm", P = i || z ? "" : "|";
+      var Q = j && j.fallback, w = i && !Q ? "ym" : "gm", P = i || Q ? "" : "|";
       X === !0 && (w += "u");
       var U = new RegExp(c(fe) + P, w);
       return { regexp: U, groups: ce, fast: Y, error: j || E };
@@ -121428,18 +121428,18 @@ Use (?: … ) instead`);
       delete D.$all;
       var Y = Object.getOwnPropertyNames(D);
       k || (k = Y[0]);
-      for (var Q = /* @__PURE__ */ Object.create(null), X = 0; X < Y.length; X++) {
+      for (var G = /* @__PURE__ */ Object.create(null), X = 0; X < Y.length; X++) {
         var ce = Y[X];
-        Q[ce] = y(D[ce]).concat(j);
+        G[ce] = y(D[ce]).concat(j);
       }
       for (var X = 0; X < Y.length; X++)
-        for (var ce = Y[X], fe = Q[ce], te = /* @__PURE__ */ Object.create(null), oe = 0; oe < fe.length; oe++) {
+        for (var ce = Y[X], fe = G[ce], te = /* @__PURE__ */ Object.create(null), oe = 0; oe < fe.length; oe++) {
           var xe = fe[oe];
           if (xe.include) {
             var Se = [oe, 1];
             if (xe.include !== ce && !te[xe.include]) {
               te[xe.include] = !0;
-              var $ = Q[xe.include];
+              var $ = G[xe.include];
               if (!$)
                 throw new Error("Cannot include nonexistent state '" + xe.include + "' (in state '" + ce + "')");
               for (var N = 0; N < $.length; N++) {
@@ -121452,19 +121452,19 @@ Use (?: … ) instead`);
         }
       for (var q = /* @__PURE__ */ Object.create(null), X = 0; X < Y.length; X++) {
         var ce = Y[X];
-        q[ce] = A(Q[ce], !0);
+        q[ce] = A(G[ce], !0);
       }
       for (var X = 0; X < Y.length; X++) {
-        for (var V = Y[X], z = q[V], w = z.groups, oe = 0; oe < w.length; oe++)
+        for (var V = Y[X], Q = q[V], w = Q.groups, oe = 0; oe < w.length; oe++)
           v(w[oe], V, q);
-        for (var P = Object.getOwnPropertyNames(z.fast), oe = 0; oe < P.length; oe++)
-          v(z.fast[P[oe]], V, q);
+        for (var P = Object.getOwnPropertyNames(Q.fast), oe = 0; oe < P.length; oe++)
+          v(Q.fast[P[oe]], V, q);
       }
       return new S(q, k);
     }
     function b(D) {
-      for (var k = typeof Map < "u", j = k ? /* @__PURE__ */ new Map() : /* @__PURE__ */ Object.create(null), Y = Object.getOwnPropertyNames(D), Q = 0; Q < Y.length; Q++) {
-        var X = Y[Q], ce = D[X], fe = Array.isArray(ce) ? ce : [ce];
+      for (var k = typeof Map < "u", j = k ? /* @__PURE__ */ new Map() : /* @__PURE__ */ Object.create(null), Y = Object.getOwnPropertyNames(D), G = 0; G < Y.length; G++) {
+        var X = Y[G], ce = D[X], fe = Array.isArray(ce) ? ce : [ce];
         fe.forEach(function(te) {
           if (typeof te != "string")
             throw new Error("keyword must be string (in keyword '" + X + "')");
@@ -121529,22 +121529,22 @@ Use (?: … ) instead`);
           return this._token(ce, j.charAt(D), D);
         var Y = this.re;
         Y.lastIndex = D;
-        var Q = R(Y, j), X = this.error;
-        if (Q == null)
+        var G = R(Y, j), X = this.error;
+        if (G == null)
           return this._token(X, j.slice(D, j.length), D);
-        var ce = this._getGroup(Q), fe = Q[0];
-        return X.fallback && Q.index !== D ? (this.queuedGroup = ce, this.queuedText = fe, this._token(X, j.slice(D, Q.index), D)) : this._token(ce, fe, D);
+        var ce = this._getGroup(G), fe = G[0];
+        return X.fallback && G.index !== D ? (this.queuedGroup = ce, this.queuedText = fe, this._token(X, j.slice(D, G.index), D)) : this._token(ce, fe, D);
       }
     }, S.prototype._token = function(D, k, j) {
       var Y = 0;
       if (D.lineBreaks) {
-        var Q = /\n/g, X = 1;
+        var G = /\n/g, X = 1;
         if (k === `
 `)
           Y = 1;
         else
-          for (; Q.exec(k); )
-            Y++, X = Q.lastIndex;
+          for (; G.exec(k); )
+            Y++, X = G.lastIndex;
       }
       var ce = {
         type: typeof D.type == "function" && D.type(k) || D.defaultType,
@@ -121584,13 +121584,13 @@ Use (?: … ) instead`);
           line: this.line,
           col: this.col
         };
-      var Y = 2, Q = Math.max(D.line - Y, 1), X = D.line + Y, ce = String(X).length, fe = h(
+      var Y = 2, G = Math.max(D.line - Y, 1), X = D.line + Y, ce = String(X).length, fe = h(
         this.buffer,
         this.line - D.line + Y + 1
       ).slice(0, 5), te = [];
       te.push(k + " at line " + D.line + " col " + D.col + ":"), te.push("");
       for (var oe = 0; oe < fe.length; oe++) {
-        var xe = fe[oe], Se = Q + oe;
+        var xe = fe[oe], Se = G + oe;
         te.push(x(String(Se), ce) + "  " + xe), Se === D.line && te.push(x("", ce + D.col + 1) + "^");
       }
       return te.join(`
@@ -125302,10 +125302,10 @@ function ck(t, e, r, i, s, o) {
       if (x = !0, i !== void 0) {
         const j = YC(r, t, c.fields, !1), Y = I0e(i, j);
         if (Y.length > 0)
-          for (const Q of Y)
+          for (const G of Y)
             v({
               type: "missing-required-group-by",
-              requiredGroupBy: Q
+              requiredGroupBy: G
             });
       }
       if (A) {
@@ -130912,32 +130912,28 @@ class mut extends dut.ExpressionDef {
       if (I.node !== "stringLiteral")
         this.logError("invalid-sql-function-argument", `Invalid string literal for \`${c.name}\``);
       else {
-        const D = I.literal, k = yut(D), j = k.filter((Q) => Q.type === "interpolation" && Q.name.includes(".")).map((Q) => Q.type === "interpolation" ? `\${${Q.name}}` : `\${${Q.value}}`);
-        if (j.length > 0) {
-          const Q = j.length === 1 ? `'.' paths are not yet supported in sql interpolations, found ${j.at(0)}` : `'.' paths are not yet supported in sql interpolations, found (${j.join(", ")})`;
-          return this.loggedErrorExpr("unsupported-sql-function-interpolation", Q);
-        }
-        const Y = [];
-        for (const Q of k)
-          if (Q.type === "string")
-            Y.push(Q.value);
-          else if (Q.name === "TABLE")
-            Y.push({ node: "source-reference" });
+        const D = I.literal, k = yut(D), j = [];
+        for (const Y of k)
+          if (Y.type === "string")
+            j.push(Y.value);
+          else if (Y.path.length === 1 && Y.path[0] === "TABLE")
+            j.push({ node: "source-reference" });
           else {
-            const X = new hut.FieldName(Q.name);
-            this.has({ name: X });
-            const ce = e.lookup([X]);
-            if (ce.found === void 0)
-              return this.loggedErrorExpr("sql-function-interpolation-not-found", `Invalid interpolation: ${ce.error.message}`);
-            if (ce.found.typeDesc().type === "filter expression")
+            const G = Y.path.map((ce) => new hut.FieldName(ce));
+            this.has({ names: G });
+            const X = e.lookup(G);
+            if (X.found === void 0)
+              return this.loggedErrorExpr("sql-function-interpolation-not-found", `Invalid interpolation: ${X.error.message}`);
+            if (X.found.typeDesc().type === "filter expression")
               return this.loggedErrorExpr("filter-expression-error", "Filter expressions cannot be used in sql_ functions");
-            ce.found.refType === "parameter" ? Y.push({ node: "parameter", path: [Q.name] }) : Y.push({
+            X.found.refType === "parameter" ? j.push({ node: "parameter", path: Y.path }) : j.push({
               node: "field",
-              path: [Q.name],
+              // TODO when we have namespaces, this will need to be replaced with the resolved path
+              path: Y.path,
               at: this.args[0].location
             });
           }
-        S = (0, LV.composeSQLExpr)(Y);
+        S = (0, LV.composeSQLExpr)(j);
       }
     }
     const R = (0, nr.mergeEvalSpaces)(...p.map((I) => I.evalSpace)), O = R === "constant" ? "constant" : (0, nr.expressionIsScalar)(C) ? R : "output";
@@ -131023,7 +131019,7 @@ function yut(t) {
       }
       i > 0 && e.push({ type: "string", value: r.slice(0, i) }), e.push({
         type: "interpolation",
-        name: r.slice(i + 2, s + i)
+        path: r.slice(i + 2, s + i).split(".")
       }), r = r.slice(s + i + 1);
     }
   }
@@ -150589,7 +150585,7 @@ function Odt(t) {
 var Fe = {}, uD = {};
 Object.defineProperty(uD, "__esModule", { value: !0 });
 uD.MALLOY_VERSION = void 0;
-uD.MALLOY_VERSION = "0.0.280";
+uD.MALLOY_VERSION = "0.0.281";
 Object.defineProperty(Fe, "__esModule", { value: !0 });
 Fe.InMemoryModelCache = Fe.CacheManager = Fe.CSVWriter = Fe.JSONWriter = Fe.DataWriter = Fe.DataRecord = Fe.DataArray = Fe.Result = Fe.ExploreMaterializer = Fe.PreparedResultMaterializer = Fe.QueryMaterializer = Fe.ModelMaterializer = Fe.SingleConnectionRuntime = Fe.ConnectionRuntime = Fe.Runtime = Fe.ExploreField = Fe.JoinRelationship = Fe.QueryField = Fe.Query = Fe.StringField = Fe.UnsupportedField = Fe.JSONField = Fe.BooleanField = Fe.NumberField = Fe.TimestampField = Fe.DateField = Fe.TimestampTimeframe = Fe.DateTimeframe = Fe.AtomicField = Fe.AtomicFieldType = Fe.Explore = Fe.SourceRelationship = Fe.FixedConnectionMap = Fe.InMemoryURLReader = Fe.EmptyURLReader = Fe.PreparedResult = Fe.DocumentCompletion = Fe.DocumentSymbol = Fe.DocumentPosition = Fe.DocumentRange = Fe.DocumentTablePath = Fe.Parse = Fe.PreparedQuery = Fe.Model = Fe.MalloyError = Fe.Malloy = void 0;
 const AY = vT, Qr = Bi, _Y = Zy, x7 = a2, wdt = uD, Fdt = l2, On = $s, Ndt = ud, Ldt = as, Idt = DE, vY = "internal://internal.malloy";