drizzle-cube 0.3.6 → 0.3.7

package/dist/adapters/{compiler-C_liaz7j.js → compiler-B5KtMyYK.js}

@@ -1,17 +1,17 @@
-const $ = /* @__PURE__ */ Symbol.for("drizzle:entityKind");
+const w = /* @__PURE__ */ Symbol.for("drizzle:entityKind");
 function b(T, e) {
   if (!T || typeof T != "object")
     return !1;
   if (T instanceof e)
     return !0;
-  if (!Object.prototype.hasOwnProperty.call(e, $))
+  if (!Object.prototype.hasOwnProperty.call(e, w))
     throw new Error(
       `Class "${e.name ?? "<unknown>"}" doesn't look like a Drizzle entity. If this is incorrect and the class is provided by Drizzle, please report this as a bug.`
     );
   let E = Object.getPrototypeOf(T).constructor;
   if (E)
     for (; E; ) {
-      if ($ in E && E[$] === e[$])
+      if (w in E && E[w] === e[w])
         return !0;
       E = Object.getPrototypeOf(E);
     }
@@ -21,7 +21,7 @@ class Se {
   constructor(e, E) {
     this.table = e, this.config = E, this.name = E.name, this.keyAsName = E.keyAsName, this.notNull = E.notNull, this.default = E.default, this.defaultFn = E.defaultFn, this.onUpdateFn = E.onUpdateFn, this.hasDefault = E.hasDefault, this.primary = E.primaryKey, this.isUnique = E.isUnique, this.uniqueName = E.uniqueName, this.uniqueType = E.uniqueType, this.dataType = E.dataType, this.columnType = E.columnType, this.generated = E.generated, this.generatedIdentity = E.generatedIdentity;
   }
-  static [$] = "Column";
+  static [w] = "Column";
   name;
   keyAsName;
   primary;
@@ -55,7 +55,7 @@ function yt(T) {
   return !!T && typeof T == "function" && uE in T && T[uE] === !0;
 }
 class It {
-  static [$] = "Subquery";
+  static [w] = "Subquery";
   constructor(e, E, t, s = !1, n = []) {
     this._ = {
       brand: "Subquery",
@@ -75,8 +75,8 @@ const Vt = {
     return e();
   }
 }, re = /* @__PURE__ */ Symbol.for("drizzle:ViewBaseConfig"), Be = /* @__PURE__ */ Symbol.for("drizzle:Schema"), DE = /* @__PURE__ */ Symbol.for("drizzle:Columns"), cE = /* @__PURE__ */ Symbol.for("drizzle:ExtraConfigColumns"), Fe = /* @__PURE__ */ Symbol.for("drizzle:OriginalName"), He = /* @__PURE__ */ Symbol.for("drizzle:BaseName"), ce = /* @__PURE__ */ Symbol.for("drizzle:IsAlias"), PE = /* @__PURE__ */ Symbol.for("drizzle:ExtraConfigBuilder"), Wt = /* @__PURE__ */ Symbol.for("drizzle:IsDrizzleTable");
-class w {
-  static [$] = "Table";
+class K {
+  static [w] = "Table";
   /** @internal */
   static Symbol = {
     Name: Ge,
@@ -129,27 +129,27 @@ function $t(T) {
   return e;
 }
 class V {
-  static [$] = "StringChunk";
+  static [w] = "StringChunk";
   value;
   constructor(e) {
     this.value = Array.isArray(e) ? e : [e];
   }
   getSQL() {
-    return new B([this]);
+    return new F([this]);
   }
 }
-class B {
+class F {
   constructor(e) {
     this.queryChunks = e;
     for (const E of e)
-      if (b(E, w)) {
-        const t = E[w.Symbol.Schema];
+      if (b(E, K)) {
+        const t = E[K.Symbol.Schema];
         this.usedTables.push(
-          t === void 0 ? E[w.Symbol.Name] : t + "." + E[w.Symbol.Name]
+          t === void 0 ? E[K.Symbol.Name] : t + "." + E[K.Symbol.Name]
         );
       }
   }
-  static [$] = "SQL";
+  static [w] = "SQL";
   /** @internal */
   decoder = ot;
   shouldInlineParams = !1;
@@ -192,13 +192,13 @@ class B {
           O.push(a), I < N.length - 1 && O.push(new V(", "));
         return O.push(new V(")")), this.buildQueryFromSourceParams(O, t);
       }
-      if (b(N, B))
+      if (b(N, F))
         return this.buildQueryFromSourceParams(N.queryChunks, {
           ...t,
           inlineParams: i || N.shouldInlineParams
         });
-      if (b(N, w)) {
-        const O = N[w.Symbol.Schema], I = N[w.Symbol.Name];
+      if (b(N, K)) {
+        const O = N[K.Symbol.Schema], I = N[K.Symbol.Name];
         return {
           sql: O === void 0 || N[ce] ? n(I) : n(O) + "." + n(I),
           params: []
@@ -208,9 +208,9 @@ class B {
         const O = s.getColumnCasing(N);
         if (E.invokeSource === "indexes")
           return { sql: n(O), params: [] };
-        const I = N.table[w.Symbol.Schema];
+        const I = N.table[K.Symbol.Schema];
         return {
-          sql: N.table[ce] || I === void 0 ? n(N.table[w.Symbol.Name]) + "." + n(O) : n(I) + "." + n(N.table[w.Symbol.Name]) + "." + n(O),
+          sql: N.table[ce] || I === void 0 ? n(N.table[K.Symbol.Name]) + "." + n(O) : n(I) + "." + n(N.table[K.Symbol.Name]) + "." + n(O),
           params: []
         };
       }
@@ -225,14 +225,14 @@ class B {
         if (b(N.value, de))
           return { sql: R(S.value++, N), params: [N], typings: ["none"] };
         const O = N.value === null ? null : N.encoder.mapToDriverValue(N.value);
-        if (b(O, B))
+        if (b(O, F))
           return this.buildQueryFromSourceParams([O], t);
         if (i)
           return { sql: this.mapInlineParam(O, t), params: [] };
         let I = ["none"];
         return A && (I = [A(N.encoder)]), { sql: R(S.value++, O), params: [O], typings: I };
       }
-      return b(N, de) ? { sql: R(S.value++, N), params: [N], typings: ["none"] } : b(N, B.Aliased) && N.fieldAlias !== void 0 ? { sql: n(N.fieldAlias), params: [] } : b(N, It) ? N._.isWith ? { sql: n(N._.alias), params: [] } : this.buildQueryFromSourceParams([
+      return b(N, de) ? { sql: R(S.value++, N), params: [N], typings: ["none"] } : b(N, F.Aliased) && N.fieldAlias !== void 0 ? { sql: n(N.fieldAlias), params: [] } : b(N, It) ? N._.isWith ? { sql: n(N._.alias), params: [] } : this.buildQueryFromSourceParams([
         new V("("),
         N._.sql,
         new V(") "),
@@ -261,7 +261,7 @@ class B {
     return this;
   }
   as(e) {
-    return e === void 0 ? this : new B.Aliased(this, e);
+    return e === void 0 ? this : new F.Aliased(this, e);
   }
   mapWith(e) {
     return this.decoder = typeof e == "function" ? { mapFromDriverValue: e } : e, this;
@@ -283,10 +283,10 @@ class AE {
   constructor(e) {
     this.value = e;
   }
-  static [$] = "Name";
+  static [w] = "Name";
   brand;
   getSQL() {
-    return new B([this]);
+    return new F([this]);
   }
 }
 function wt(T) {
@@ -309,10 +309,10 @@ class Pe {
   constructor(e, E = Ct) {
     this.value = e, this.encoder = E;
   }
-  static [$] = "Param";
+  static [w] = "Param";
   brand;
   getSQL() {
-    return new B([this]);
+    return new F([this]);
   }
 }
 function r(T, ...e) {
@@ -320,26 +320,26 @@ function r(T, ...e) {
   (e.length > 0 || T.length > 0 && T[0] !== "") && E.push(new V(T[0]));
   for (const [t, s] of e.entries())
     E.push(s, new V(T[t + 1]));
-  return new B(E);
+  return new F(E);
 }
 ((T) => {
   function e() {
-    return new B([]);
+    return new F([]);
   }
   T.empty = e;
   function E(i) {
-    return new B(i);
+    return new F(i);
   }
   T.fromList = E;
   function t(i) {
-    return new B([new V(i)]);
+    return new F([new V(i)]);
   }
   T.raw = t;
   function s(i, S) {
     const N = [];
     for (const [O, I] of i.entries())
       O > 0 && S !== void 0 && N.push(S), N.push(I);
-    return new B(N);
+    return new F(N);
   }
   T.join = s;
   function n(i) {
@@ -360,7 +360,7 @@ function r(T, ...e) {
     constructor(t, s) {
       this.sql = t, this.fieldAlias = s;
     }
-    static [$] = "SQL.Aliased";
+    static [w] = "SQL.Aliased";
     /** @internal */
     isSelectionField = !1;
     getSQL() {
@@ -372,19 +372,19 @@ function r(T, ...e) {
     }
   }
   T.Aliased = e;
-})(B || (B = {}));
+})(F || (F = {}));
 class de {
   constructor(e) {
     this.name = e;
   }
-  static [$] = "Placeholder";
+  static [w] = "Placeholder";
   getSQL() {
-    return new B([this]);
+    return new F([this]);
   }
 }
 const Xt = /* @__PURE__ */ Symbol.for("drizzle:IsDrizzleView");
 class _t {
-  static [$] = "View";
+  static [w] = "View";
   /** @internal */
   [re];
   /** @internal */
@@ -401,28 +401,28 @@ class _t {
     };
   }
   getSQL() {
-    return new B([this]);
+    return new F([this]);
   }
 }
 Se.prototype.getSQL = function() {
-  return new B([this]);
+  return new F([this]);
 };
-w.prototype.getSQL = function() {
-  return new B([this]);
+K.prototype.getSQL = function() {
+  return new F([this]);
 };
 It.prototype.getSQL = function() {
-  return new B([this]);
+  return new F([this]);
 };
-function W(T, e) {
-  return wt(e) && !at(T) && !b(T, Pe) && !b(T, de) && !b(T, Se) && !b(T, w) && !b(T, _t) ? new Pe(T, e) : T;
+function $(T, e) {
+  return wt(e) && !at(T) && !b(T, Pe) && !b(T, de) && !b(T, Se) && !b(T, K) && !b(T, _t) ? new Pe(T, e) : T;
 }
-const Q = (T, e) => r`${T} = ${W(e, T)}`, dE = (T, e) => r`${T} <> ${W(e, T)}`;
+const Q = (T, e) => r`${T} = ${$(e, T)}`, dE = (T, e) => r`${T} <> ${$(e, T)}`;
 function h(...T) {
   const e = T.filter(
     (E) => E !== void 0
   );
   if (e.length !== 0)
-    return e.length === 1 ? new B(e) : new B([
+    return e.length === 1 ? new F(e) : new F([
       new V("("),
       r.join(e, new V(" and ")),
       new V(")")
@@ -433,18 +433,18 @@ function ae(...T) {
     (E) => E !== void 0
   );
   if (e.length !== 0)
-    return e.length === 1 ? new B(e) : new B([
+    return e.length === 1 ? new F(e) : new F([
       new V("("),
       r.join(e, new V(" or ")),
       new V(")")
     ]);
 }
-const be = (T, e) => r`${T} > ${W(e, T)}`, Te = (T, e) => r`${T} >= ${W(e, T)}`, Ye = (T, e) => r`${T} < ${W(e, T)}`, se = (T, e) => r`${T} <= ${W(e, T)}`;
+const be = (T, e) => r`${T} > ${$(e, T)}`, Te = (T, e) => r`${T} >= ${$(e, T)}`, Ye = (T, e) => r`${T} < ${$(e, T)}`, se = (T, e) => r`${T} <= ${$(e, T)}`;
 function ge(T, e) {
-  return Array.isArray(e) ? e.length === 0 ? r`false` : r`${T} in ${e.map((E) => W(E, T))}` : r`${T} in ${W(e, T)}`;
+  return Array.isArray(e) ? e.length === 0 ? r`false` : r`${T} in ${e.map((E) => $(E, T))}` : r`${T} in ${$(e, T)}`;
 }
 function ME(T, e) {
-  return Array.isArray(e) ? e.length === 0 ? r`true` : r`${T} not in ${e.map((E) => W(E, T))}` : r`${T} not in ${W(e, T)}`;
+  return Array.isArray(e) ? e.length === 0 ? r`true` : r`${T} not in ${e.map((E) => $(E, T))}` : r`${T} not in ${$(e, T)}`;
 }
 function UE(T) {
   return r`${T} is null`;
@@ -456,28 +456,28 @@ function Kt(T, e) {
   if (Array.isArray(e)) {
     if (e.length === 0)
       throw new Error("arrayContains requires at least one value");
-    const E = r`${W(e, T)}`;
+    const E = r`${$(e, T)}`;
     return r`${T} @> ${E}`;
   }
-  return r`${T} @> ${W(e, T)}`;
+  return r`${T} @> ${$(e, T)}`;
 }
 function vt(T, e) {
   if (Array.isArray(e)) {
     if (e.length === 0)
       throw new Error("arrayContained requires at least one value");
-    const E = r`${W(e, T)}`;
+    const E = r`${$(e, T)}`;
     return r`${T} <@ ${E}`;
   }
-  return r`${T} <@ ${W(e, T)}`;
+  return r`${T} <@ ${$(e, T)}`;
 }
 function xt(T, e) {
   if (Array.isArray(e)) {
     if (e.length === 0)
       throw new Error("arrayOverlaps requires at least one value");
-    const E = r`${W(e, T)}`;
+    const E = r`${$(e, T)}`;
     return r`${T} && ${E}`;
   }
-  return r`${T} && ${W(e, T)}`;
+  return r`${T} && ${$(e, T)}`;
 }
 function pE(T) {
   return r`${T} asc`;
@@ -491,7 +491,7 @@ function rE(T) {
 function Qt(T) {
   return r`count(distinct ${T})`.mapWith(Number);
 }
-function v(T) {
+function x(T) {
   return r`sum(${T})`.mapWith(String);
 }
 function oe(T) {
@@ -763,8 +763,8 @@ class jt extends IE {
     ), r`, `)}` : r``;
     let i = r``;
     if (n?.frame) {
-      const { type: I, start: a, end: o } = n.frame, L = I.toUpperCase(), u = a === "unbounded" ? "UNBOUNDED PRECEDING" : typeof a == "number" ? `${a} PRECEDING` : "CURRENT ROW", C = o === "unbounded" ? "UNBOUNDED FOLLOWING" : o === "current" ? "CURRENT ROW" : typeof o == "number" ? `${o} FOLLOWING` : "CURRENT ROW";
-      i = r`${r.raw(L)} BETWEEN ${r.raw(u)} AND ${r.raw(C)}`;
+      const { type: I, start: a, end: o } = n.frame, L = I.toUpperCase(), l = a === "unbounded" ? "UNBOUNDED PRECEDING" : typeof a == "number" ? `${a} PRECEDING` : "CURRENT ROW", C = o === "unbounded" ? "UNBOUNDED FOLLOWING" : o === "current" ? "CURRENT ROW" : typeof o == "number" ? `${o} FOLLOWING` : "CURRENT ROW";
+      i = r`${r.raw(L)} BETWEEN ${r.raw(l)} AND ${r.raw(C)}`;
     }
     const S = [];
     t && t.length > 0 && S.push(R), s && s.length > 0 && S.push(A), n?.frame && S.push(i);
@@ -1017,8 +1017,8 @@ class Lt extends IE {
     ), r`, `)}` : r``;
     let i = r``;
     if (n?.frame) {
-      const { type: I, start: a, end: o } = n.frame, L = I.toUpperCase(), u = a === "unbounded" ? "UNBOUNDED PRECEDING" : typeof a == "number" ? `${a} PRECEDING` : "CURRENT ROW", C = o === "unbounded" ? "UNBOUNDED FOLLOWING" : o === "current" ? "CURRENT ROW" : typeof o == "number" ? `${o} FOLLOWING` : "CURRENT ROW";
-      i = r`${r.raw(L)} BETWEEN ${r.raw(u)} AND ${r.raw(C)}`;
+      const { type: I, start: a, end: o } = n.frame, L = I.toUpperCase(), l = a === "unbounded" ? "UNBOUNDED PRECEDING" : typeof a == "number" ? `${a} PRECEDING` : "CURRENT ROW", C = o === "unbounded" ? "UNBOUNDED FOLLOWING" : o === "current" ? "CURRENT ROW" : typeof o == "number" ? `${o} FOLLOWING` : "CURRENT ROW";
+      i = r`${r.raw(L)} BETWEEN ${r.raw(l)} AND ${r.raw(C)}`;
     }
     const S = [];
     t && t.length > 0 && S.push(R), s && s.length > 0 && S.push(A), n?.frame && S.push(i);
@@ -1301,8 +1301,8 @@ class kt extends IE {
     ), r`, `)}` : r``;
     let i = r``;
     if (n?.frame) {
-      const { type: I, start: a, end: o } = n.frame, L = I.toUpperCase(), u = a === "unbounded" ? "UNBOUNDED PRECEDING" : typeof a == "number" ? `${a} PRECEDING` : "CURRENT ROW", C = o === "unbounded" ? "UNBOUNDED FOLLOWING" : o === "current" ? "CURRENT ROW" : typeof o == "number" ? `${o} FOLLOWING` : "CURRENT ROW";
-      i = r`${r.raw(L)} BETWEEN ${r.raw(u)} AND ${r.raw(C)}`;
+      const { type: I, start: a, end: o } = n.frame, L = I.toUpperCase(), l = a === "unbounded" ? "UNBOUNDED PRECEDING" : typeof a == "number" ? `${a} PRECEDING` : "CURRENT ROW", C = o === "unbounded" ? "UNBOUNDED FOLLOWING" : o === "current" ? "CURRENT ROW" : typeof o == "number" ? `${o} FOLLOWING` : "CURRENT ROW";
+      i = r`${r.raw(L)} BETWEEN ${r.raw(l)} AND ${r.raw(C)}`;
     }
     const S = [];
     t && t.length > 0 && S.push(R), s && s.length > 0 && S.push(A), n?.frame && S.push(i);
@@ -1964,7 +1964,7 @@ function iE(T, e) {
 function SE(T) {
   return T && typeof T == "object" ? r`${r`${T}`}` : T;
 }
-function G(T, e) {
+function B(T, e) {
   const E = typeof T == "function" ? T(e) : T;
   return SE(E);
 }
@@ -2187,8 +2187,8 @@ class pe {
    * Build time dimension expression with granularity using database adapter
    */
   buildTimeDimensionExpression(e, E, t) {
-    const s = G(e, t);
-    return E ? this.databaseAdapter.buildTimeDimension(E, s) : s instanceof B ? s : r`${s}`;
+    const s = B(e, t);
+    return E ? this.databaseAdapter.buildTimeDimension(E, s) : s instanceof F ? s : r`${s}`;
   }
   /**
    * Build date range condition for time dimensions
@@ -2292,8 +2292,8 @@ class pe {
       return { start: I, end: a };
     }
     if (t === "last quarter") {
-      const I = Math.floor(n / 3), a = I === 0 ? 3 : I - 1, o = I === 0 ? s - 1 : s, L = new Date(Date.UTC(o, a * 3, 1, 0, 0, 0, 0)), u = new Date(Date.UTC(o, a * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: L, end: u };
+      const I = Math.floor(n / 3), a = I === 0 ? 3 : I - 1, o = I === 0 ? s - 1 : s, L = new Date(Date.UTC(o, a * 3, 1, 0, 0, 0, 0)), l = new Date(Date.UTC(o, a * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: L, end: l };
     }
     if (t === "last year") {
       const I = new Date(Date.UTC(s - 1, 0, 1, 0, 0, 0, 0)), a = new Date(Date.UTC(s - 1, 11, 31, 23, 59, 59, 999));
@@ -2497,7 +2497,7 @@ class oE {
     if (!A) return null;
     const i = A.dimensions?.[R];
     if (!i) return null;
-    const S = G(i.sql, t);
+    const S = B(i.sql, t);
     return this.buildFilterCondition(
       S,
       s.operator,
@@ -2735,13 +2735,13 @@ function CT(T, e) {
       throw new Error(
         `Cannot substitute {${I}}: cube '${L}' not found`
       );
-    const C = `${L}.${o}`, l = s.get(C);
-    if (!l)
+    const C = `${L}.${o}`, c = s.get(C);
+    if (!c)
       throw new Error(
         `Cannot substitute {${I}}: measure '${C}' not resolved yet. Ensure measures are resolved in dependency order.`
       );
-    const P = l(), d = r`${P}`;
-    R.set(I, d);
+    const M = c(), P = r`${M}`;
+    R.set(I, P);
   }
   const A = [], i = [];
   let S = 0;
@@ -2813,7 +2813,7 @@ function ye(T, e) {
   }
   return Array.from(t);
 }
-class F {
+class H {
   constructor(e) {
     this.databaseAdapter = e;
   }
@@ -2836,16 +2836,16 @@ class F {
       const [O, I] = N.split("."), a = E.get(O);
       if (a && a.measures && a.measures[I]) {
         const o = a.measures[I];
-        if (F.isPostAggregationWindow(o)) {
-          const L = F.getWindowBaseMeasure(o, O);
+        if (H.isPostAggregationWindow(o)) {
+          const L = H.getWindowBaseMeasure(o, O);
           L && i.add(L);
           continue;
         }
         k.isCalculatedMeasure(o) ? (A.push(N), ye(o.calculatedSql, O).forEach((C) => i.add(C)), S.getAllDependencies(N).forEach((C) => {
-          const [l, P] = C.split("."), d = E.get(l);
-          if (d && d.measures[P]) {
-            const M = d.measures[P];
-            k.isCalculatedMeasure(M) && ye(M.calculatedSql, l).forEach((f) => i.add(f));
+          const [c, M] = C.split("."), P = E.get(c);
+          if (P && P.measures[M]) {
+            const d = P.measures[M];
+            k.isCalculatedMeasure(d) && ye(d.calculatedSql, c).forEach((f) => i.add(f));
           }
         })) : R.push(N);
       }
@@ -2854,7 +2854,7 @@ class F {
       const [O, I] = N.split("."), a = E.get(O);
       if (a && a.measures && a.measures[I]) {
         const o = a.measures[I];
-        if (F.isPostAggregationWindow(o))
+        if (H.isPostAggregationWindow(o))
           continue;
         k.isCalculatedMeasure(o) ? A.includes(N) || A.push(N) : R.includes(N) || R.push(N);
       }
@@ -2929,7 +2929,7 @@ class F {
             case "count":
             case "countDistinct":
             case "sum":
-              o = v(a);
+              o = x(a);
               break;
             case "avg":
               o = this.databaseAdapter.buildAvg(a);
@@ -2941,10 +2941,10 @@ class F {
               o = oe(a);
               break;
             case "number":
-              o = v(a);
+              o = x(a);
               break;
             default:
-              o = v(a);
+              o = x(a);
           }
           R.set(i, () => o);
         }
@@ -2986,7 +2986,7 @@ class F {
             case "count":
             case "countDistinct":
             case "sum":
-              return v(A);
+              return x(A);
             case "avg":
               return this.databaseAdapter.buildAvg(A);
             case "min":
@@ -2994,9 +2994,9 @@ class F {
             case "max":
               return oe(A);
             case "number":
-              return v(A);
+              return x(A);
             default:
-              return v(A);
+              return x(A);
           }
         }
     }
@@ -3015,7 +3015,7 @@ class F {
       throw new Error(
         `Cannot build calculated measure '${e.name}' directly. Use buildCalculatedMeasure instead.`
       );
-    if (F.isPostAggregationWindow(e))
+    if (H.isPostAggregationWindow(e))
       throw new Error(
         `Post-aggregation window measure '${e.name}' should be built via buildPostAggregationWindowExpression, not buildMeasureExpression.`
       );
@@ -3023,7 +3023,7 @@ class F {
       throw new Error(
         `Measure '${e.name}' of type '${e.type}' is missing required 'sql' property. Only calculated measures and post-aggregation window functions can omit 'sql'.`
       );
-    let s = G(e.sql, E);
+    let s = B(e.sql, E);
     if (e.filters && e.filters.length > 0) {
       const n = e.filters.map((R) => {
         const A = R(E);
@@ -3042,7 +3042,7 @@ class F {
       case "countDistinct":
         return Qt(s);
       case "sum":
-        return v(s);
+        return x(s);
       case "avg":
         return this.databaseAdapter.buildAvg(s);
       case "min":
@@ -3099,7 +3099,7 @@ class F {
         if (n.partitionBy && n.partitionBy.length > 0 && t) {
           const S = n.partitionBy.map((N) => {
             const O = N.includes(".") ? N.split(".")[1] : N, I = t.dimensions?.[O];
-            return I ? G(I.sql, E) : (console.warn(`[drizzle-cube] Window function partition dimension '${N}' not found in cube '${t.name}'`), null);
+            return I ? B(I.sql, E) : (console.warn(`[drizzle-cube] Window function partition dimension '${N}' not found in cube '${t.name}'`), null);
           }).filter((N) => N !== null);
           S.length > 0 && (R = S);
         }
@@ -3109,12 +3109,12 @@ class F {
             const O = N.field.includes(".") ? N.field.split(".")[1] : N.field, I = t.dimensions?.[O];
             if (I)
               return {
-                field: G(I.sql, E),
+                field: B(I.sql, E),
                 direction: N.direction
               };
             const a = t.measures?.[O];
             return a && a.sql ? {
-              field: G(a.sql, E),
+              field: B(a.sql, E),
               direction: N.direction
             } : (console.warn(`[drizzle-cube] Window function order field '${N.field}' not found in cube '${t.name}'`), null);
           }).filter((N) => N !== null);
@@ -3163,7 +3163,7 @@ class F {
    * @returns true if this is a window function type
    */
   static isWindowFunction(e) {
-    return F.WINDOW_FUNCTION_TYPES.includes(e);
+    return H.WINDOW_FUNCTION_TYPES.includes(e);
   }
   /**
    * Categorize measures into window functions and regular aggregates
@@ -3179,7 +3179,7 @@ class F {
       const [R, A] = n.split("."), i = E.get(R);
       if (i?.measures?.[A]) {
         const S = i.measures[A];
-        F.isWindowFunction(S.type) ? t.push(n) : s.push(n);
+        H.isWindowFunction(S.type) ? t.push(n) : s.push(n);
       }
     }
     return { windowMeasures: t, aggregateMeasures: s };
@@ -3191,7 +3191,7 @@ class F {
    * @returns true if any measure is a window function
    */
   static hasWindowFunctions(e, E) {
-    const { windowMeasures: t } = F.categorizeMeasures(e, E);
+    const { windowMeasures: t } = H.categorizeMeasures(e, E);
     return t.length > 0;
   }
   // ============================================================================
@@ -3206,7 +3206,7 @@ class F {
    * @returns true if this is a post-aggregation window function
    */
   static isPostAggregationWindow(e) {
-    return F.isWindowFunction(e.type) && e.windowConfig?.measure !== void 0;
+    return H.isWindowFunction(e.type) && e.windowConfig?.measure !== void 0;
   }
   /**
    * Get the base measure reference for a post-aggregation window function.
@@ -3257,11 +3257,11 @@ class F {
       const [A, i] = R.split("."), S = E.get(A);
       if (S?.measures?.[i]) {
         const N = S.measures[i];
-        if (F.isPostAggregationWindow(N)) {
+        if (H.isPostAggregationWindow(N)) {
           s.push(R);
-          const O = F.getWindowBaseMeasure(N, A);
+          const O = H.getWindowBaseMeasure(N, A);
           O && n.add(O);
-        } else F.isWindowFunction(N.type) || t.push(R);
+        } else H.isWindowFunction(N.type) || t.push(R);
       }
     }
     return { aggregateMeasures: t, postAggWindowMeasures: s, requiredBaseMeasures: n };
@@ -3274,7 +3274,7 @@ class F {
    * @returns true if any measure is a post-aggregation window function
    */
   static hasPostAggregationWindows(e, E) {
-    const { postAggWindowMeasures: t } = F.categorizeForPostAggregation(
+    const { postAggWindowMeasures: t } = H.categorizeForPostAggregation(
       e,
       E
     );
@@ -3346,11 +3346,11 @@ class LT {
           N = !0;
           break;
         }
-        if (F.isPostAggregationWindow(L)) {
-          const u = F.getWindowBaseMeasure(L, I);
-          if (u) {
-            const [C, l] = u.split("."), d = R.get(C)?.measures?.[l];
-            if (d && this.isAggregateFunctionType(d.type)) {
+        if (H.isPostAggregationWindow(L)) {
+          const l = H.getWindowBaseMeasure(L, I);
+          if (l) {
+            const [C, c] = l.split("."), P = R.get(C)?.measures?.[c];
+            if (P && this.isAggregateFunctionType(P.type)) {
               N = !0;
               break;
             }
@@ -3364,16 +3364,16 @@ class LT {
       for (const O of E.dimensions) {
         const [I, a] = O.split("."), o = R.get(I);
         if (o && o.dimensions && o.dimensions[a])
-          if (s?.preAggregationCTEs?.some((u) => u.cube.name === I)) {
-            const u = s.preAggregationCTEs.find((l) => l.cube.name === I), C = u.joinKeys.find((l) => l.targetColumn === a);
+          if (s?.preAggregationCTEs?.some((l) => l.cube.name === I)) {
+            const l = s.preAggregationCTEs.find((c) => c.cube.name === I), C = l.joinKeys.find((c) => c.targetColumn === a);
             if (C && C.sourceColumnObj)
               n.push(C.sourceColumnObj);
             else {
-              const l = r`${r.identifier(u.cteAlias)}.${r.identifier(a)}`;
-              n.push(l);
+              const c = r`${r.identifier(l.cteAlias)}.${r.identifier(a)}`;
+              n.push(c);
             }
           } else {
-            const u = o.dimensions[a], C = G(u.sql, t);
+            const l = o.dimensions[a], C = B(l.sql, t);
             n.push(C);
           }
       }
@@ -3381,22 +3381,22 @@ class LT {
       for (const O of E.timeDimensions) {
         const [I, a] = O.dimension.split("."), o = R.get(I);
         if (o && o.dimensions && o.dimensions[a])
-          if (s?.preAggregationCTEs?.some((u) => u.cube.name === I)) {
-            const u = s.preAggregationCTEs.find((l) => l.cube.name === I), C = u.joinKeys.find((l) => l.targetColumn === a);
+          if (s?.preAggregationCTEs?.some((l) => l.cube.name === I)) {
+            const l = s.preAggregationCTEs.find((c) => c.cube.name === I), C = l.joinKeys.find((c) => c.targetColumn === a);
             if (C && C.sourceColumnObj) {
-              const l = this.dateTimeBuilder.buildTimeDimensionExpression(
+              const c = this.dateTimeBuilder.buildTimeDimensionExpression(
                 C.sourceColumnObj,
                 O.granularity,
                 t
               );
-              n.push(l);
+              n.push(c);
             } else {
-              const l = r`${r.identifier(u.cteAlias)}.${r.identifier(a)}`;
-              n.push(l);
+              const c = r`${r.identifier(l.cteAlias)}.${r.identifier(a)}`;
+              n.push(c);
             }
           } else {
-            const u = o.dimensions[a], C = this.dateTimeBuilder.buildTimeDimensionExpression(
-              u.sql,
+            const l = o.dimensions[a], C = this.dateTimeBuilder.buildTimeDimensionExpression(
+              l.sql,
               O.granularity,
               t
             );
@@ -3412,7 +3412,7 @@ class lT {
   groupByBuilder;
   measureBuilder;
   constructor(e) {
-    this.dateTimeBuilder = new pe(e), this.filterBuilder = new oE(e, this.dateTimeBuilder), this.groupByBuilder = new LT(this.dateTimeBuilder), this.measureBuilder = new F(e);
+    this.dateTimeBuilder = new pe(e), this.filterBuilder = new oE(e, this.dateTimeBuilder), this.groupByBuilder = new LT(this.dateTimeBuilder), this.measureBuilder = new H(e);
   }
   /**
    * Build resolvedMeasures map for a set of measures
@@ -3432,7 +3432,7 @@ class lT {
       for (const R of E.dimensions) {
         const [A, i] = R.split("."), S = n.get(A);
         if (S && S.dimensions && S.dimensions[i]) {
-          const N = S.dimensions[i], O = G(N.sql, t);
+          const N = S.dimensions[i], O = B(N.sql, t);
           s[R] = r`${O}`.as(R);
         }
       }
@@ -3527,13 +3527,13 @@ class lT {
           if (s?.preAggregationCTEs && s.preAggregationCTEs.some((C) => C.cube.name === N))
             continue;
           if (t.filterCache) {
-            const u = ut(S.dimension, S.dateRange), C = t.filterCache.get(u);
+            const l = ut(S.dimension, S.dateRange), C = t.filterCache.get(l);
             if (C) {
               R.push(C);
               continue;
             }
           }
-          const a = I.dimensions[O], o = G(a.sql, t), L = this.buildDateRangeCondition(o, S.dateRange);
+          const a = I.dimensions[O], o = B(a.sql, t), L = this.buildDateRangeCondition(o, S.dateRange);
           L && R.push(L);
         }
       }
@@ -3573,15 +3573,15 @@ class lT {
     const N = S.dimensions[i], O = S.measures[i], I = N || O;
     if (!I) return null;
     if (s === "where" && N) {
-      if (n?.preAggregationCTEs && n.preAggregationCTEs.some((u) => u.cube.name === A))
+      if (n?.preAggregationCTEs && n.preAggregationCTEs.some((l) => l.cube.name === A))
         return null;
       const a = ["arrayContains", "arrayOverlaps", "arrayContained"].includes(R.operator);
       if (!a && t.filterCache) {
-        const L = Me(e), u = t.filterCache.get(L);
-        if (u)
-          return u;
+        const L = Me(e), l = t.filterCache.get(L);
+        if (l)
+          return l;
       }
-      const o = a ? typeof N.sql == "function" ? N.sql(t) : N.sql : G(N.sql, t);
+      const o = a ? typeof N.sql == "function" ? N.sql(t) : N.sql : B(N.sql, t);
       return this.buildFilterCondition(
         o,
         R.operator,
@@ -3779,12 +3779,14 @@ class _e {
       return this.findPath(e, E, s);
     const R = n.map((A) => {
       let i = 0;
-      return A.some(
-        (N) => N.joinDef.preferredFor?.includes(E)
-      ) && (i += 10), i += A.filter((N) => t.has(N.toCube)).length, {
+      A.some(
+        (O, I) => O.joinDef.preferredFor?.includes(E) && I === 0
+      ) && (i += 10);
+      const N = A.filter((O) => t.has(O.toCube)).length;
+      return i += N, i -= A.length - 1, {
         path: A,
         score: i,
-        usesProcessed: A.some((N) => s.has(N.toCube))
+        usesProcessed: A.some((O) => s.has(O.toCube))
       };
     });
     return R.sort((A, i) => i.score !== A.score ? i.score - A.score : A.usesProcessed !== i.usesProcessed ? A.usesProcessed ? -1 : 1 : A.path.length - i.path.length), R[0].path;
@@ -4054,24 +4056,24 @@ class Dt {
         if (!L)
           throw new Error(`Cube '${a}' not found`);
         if (o.relationship === "belongsToMany" && o.through) {
-          const u = ST(o, s.securityContext);
+          const l = ST(o, s.securityContext);
           A.push({
             cube: L,
             alias: `${a.toLowerCase()}_cube`,
-            joinType: u.junctionJoins[1].joinType,
+            joinType: l.junctionJoins[1].joinType,
             // Use the target join type
-            joinCondition: u.junctionJoins[1].condition,
+            joinCondition: l.junctionJoins[1].condition,
             // Target join condition
             junctionTable: {
               table: o.through.table,
               alias: `junction_${a.toLowerCase()}`,
-              joinType: u.junctionJoins[0].joinType,
-              joinCondition: u.junctionJoins[0].condition,
+              joinType: l.junctionJoins[0].joinType,
+              joinCondition: l.junctionJoins[0].condition,
               securitySql: o.through.securitySql
             }
           });
         } else {
-          const u = R.buildJoinCondition(
+          const l = R.buildJoinCondition(
             o,
             null,
             // No source alias needed - use the actual column
@@ -4082,7 +4084,7 @@ class Dt {
             cube: L,
             alias: `${a.toLowerCase()}_cube`,
             joinType: C,
-            joinCondition: u
+            joinCondition: l
           });
         }
         i.add(a);
@@ -4113,18 +4115,18 @@ class Dt {
         targetColumn: C.target.name,
         sourceColumnObj: C.source,
         targetColumnObj: C.target
-      })), I = this.findPropagatingFilters(s, R.cube, e), a = /* @__PURE__ */ new Map([[R.cube.name, R.cube]]), { aggregateMeasures: o, requiredBaseMeasures: L } = F.categorizeForPostAggregation(
+      })), I = this.findPropagatingFilters(s, R.cube, e), a = /* @__PURE__ */ new Map([[R.cube.name, R.cube]]), { aggregateMeasures: o, requiredBaseMeasures: L } = H.categorizeForPostAggregation(
         N,
         a
-      ), u = [.../* @__PURE__ */ new Set([
+      ), l = [.../* @__PURE__ */ new Set([
         ...o,
         ...Array.from(L).filter((C) => C.startsWith(R.cube.name + "."))
       ])];
-      if (u.length > 0) {
+      if (l.length > 0) {
         const C = this.expandCalculatedMeasureDependencies(
           R.cube,
-          u
-        ), l = this.findDownstreamJoinKeys(
+          l
+        ), c = this.findDownstreamJoinKeys(
           R.cube,
           s,
           e
@@ -4136,7 +4138,7 @@ class Dt {
           joinKeys: O,
           measures: C,
           propagatingFilters: I.length > 0 ? I : void 0,
-          downstreamJoinKeys: l.length > 0 ? l : void 0,
+          downstreamJoinKeys: c.length > 0 ? c : void 0,
           cteType: "aggregate"
         });
       }
@@ -4419,10 +4421,10 @@ class Dt {
       i.querySummary.joinCount = O.length, i.querySummary.cteCount = i.preAggregations.length, i.querySummary.hasPreAggregation = i.preAggregations.length > 0;
       const a = /* @__PURE__ */ new Map();
       for (const L of n) {
-        const u = e.get(L);
-        u && a.set(L, u);
+        const l = e.get(L);
+        l && a.set(L, l);
       }
-      const o = F.hasPostAggregationWindows(
+      const o = H.hasPostAggregationWindows(
         E.measures || [],
         a
       );
@@ -4554,26 +4556,26 @@ class Dt {
       if (!i)
         continue;
       const S = s.measures.filter(
-        (l) => l.startsWith(R + ".")
+        (c) => c.startsWith(R + ".")
       ), N = this.extractMeasuresFromFilters(s, i), O = [.../* @__PURE__ */ new Set([...S, ...N])];
       if (O.length === 0)
         continue;
-      const I = A.on.map((l) => ({
-        sourceColumn: l.source.name,
-        targetColumn: l.target.name
-      })), a = /* @__PURE__ */ new Map([[R, i]]), { aggregateMeasures: o, postAggWindowMeasures: L, requiredBaseMeasures: u } = F.categorizeForPostAggregation(
+      const I = A.on.map((c) => ({
+        sourceColumn: c.source.name,
+        targetColumn: c.target.name
+      })), a = /* @__PURE__ */ new Map([[R, i]]), { aggregateMeasures: o, postAggWindowMeasures: L, requiredBaseMeasures: l } = H.categorizeForPostAggregation(
         O,
         a
       ), C = [.../* @__PURE__ */ new Set([
         ...o,
-        ...Array.from(u).filter((l) => l.startsWith(R + "."))
+        ...Array.from(l).filter((c) => c.startsWith(R + "."))
       ])];
       if (C.length > 0) {
-        const l = L.length > 0;
+        const c = L.length > 0;
         n.push({
           cubeName: R,
           cteAlias: `${R.toLowerCase()}_agg`,
-          reason: l ? `hasMany relationship from ${E.name} - requires pre-aggregation; includes base measures for post-aggregation window functions` : `hasMany relationship from ${E.name} - requires pre-aggregation to prevent row duplication (fan-out)`,
+          reason: c ? `hasMany relationship from ${E.name} - requires pre-aggregation; includes base measures for post-aggregation window functions` : `hasMany relationship from ${E.name} - requires pre-aggregation to prevent row duplication (fan-out)`,
           measures: C,
           joinKeys: I,
           cteType: "aggregate"
@@ -4598,42 +4600,42 @@ class uT {
    */
   buildPreAggregationCTE(e, E, t, s, n) {
     const R = e.cube, A = R.sql(t), i = {};
-    for (const l of e.joinKeys)
-      if (l.targetColumnObj) {
-        i[l.targetColumn] = l.targetColumnObj;
-        for (const [P, d] of Object.entries(R.dimensions || {}))
-          d.sql === l.targetColumnObj && P !== l.targetColumn && (i[P] = r`${l.targetColumnObj}`.as(P));
+    for (const P of e.joinKeys)
+      if (P.targetColumnObj) {
+        i[P.targetColumn] = P.targetColumnObj;
+        for (const [d, m] of Object.entries(R.dimensions || {}))
+          m.sql === P.targetColumnObj && d !== P.targetColumn && (i[d] = r`${P.targetColumnObj}`.as(d));
       }
     if (e.downstreamJoinKeys)
-      for (const l of e.downstreamJoinKeys)
-        for (const P of l.joinKeys)
-          P.sourceColumnObj && (i[P.sourceColumn] = P.sourceColumnObj);
+      for (const P of e.downstreamJoinKeys)
+        for (const d of P.joinKeys)
+          d.sourceColumnObj && (i[d.sourceColumn] = d.sourceColumnObj);
     const S = R.name, N = /* @__PURE__ */ new Map([[S, R]]), O = this.queryBuilder.buildResolvedMeasures(
       e.measures,
       N,
       t
     );
-    for (const l of e.measures) {
-      const [, P] = l.split("."), d = O.get(l);
-      if (d) {
-        const M = d();
-        i[P] = r`${M}`.as(P);
+    for (const P of e.measures) {
+      const [, d] = P.split("."), m = O.get(P);
+      if (m) {
+        const f = m();
+        i[d] = r`${f}`.as(d);
       }
     }
     if (E.dimensions)
-      for (const l of E.dimensions) {
-        const [P, d] = l.split(".");
-        if (P === S && R.dimensions && R.dimensions[d]) {
-          const M = R.dimensions[d], p = this.queryBuilder.buildMeasureExpression({ sql: M.sql, type: "number" }, t);
-          i[d] = r`${p}`.as(d);
+      for (const P of E.dimensions) {
+        const [d, m] = P.split(".");
+        if (d === S && R.dimensions && R.dimensions[m]) {
+          const f = R.dimensions[m], G = this.queryBuilder.buildMeasureExpression({ sql: f.sql, type: "number" }, t);
+          i[m] = r`${G}`.as(m);
         }
       }
     if (E.timeDimensions)
-      for (const l of E.timeDimensions) {
-        const [P, d] = l.dimension.split(".");
-        if (P === S && R.dimensions && R.dimensions[d]) {
-          const M = R.dimensions[d], p = this.queryBuilder.buildTimeDimensionExpression(M.sql, l.granularity, t);
-          i[d] = r`${p}`.as(d);
+      for (const P of E.timeDimensions) {
+        const [d, m] = P.dimension.split(".");
+        if (d === S && R.dimensions && R.dimensions[m]) {
+          const f = R.dimensions[m], G = this.queryBuilder.buildTimeDimensionExpression(f.sql, P.granularity, t);
+          i[m] = r`${G}`.as(m);
         }
       }
     if (Object.keys(i).length === 0)
@@ -4641,63 +4643,66 @@ class uT {
     let I = t.db.select(i).from(A.from);
     const a = s ? {
       ...s,
-      preAggregationCTEs: s.preAggregationCTEs?.filter((l) => l.cube.name !== R.name)
+      preAggregationCTEs: s.preAggregationCTEs?.filter((P) => P.cube.name !== R.name)
     } : void 0, o = this.queryBuilder.buildWhereConditions(R, E, t, a, n), L = [];
     if (E.timeDimensions)
-      for (const l of E.timeDimensions) {
-        const [P, d] = l.dimension.split(".");
-        if (P === S && R.dimensions && R.dimensions[d] && l.dateRange) {
-          const M = R.dimensions[d], p = this.queryBuilder.buildMeasureExpression({ sql: M.sql, type: "number" }, t), f = this.queryBuilder.buildDateRangeCondition(p, l.dateRange);
-          f && L.push(f);
+      for (const P of E.timeDimensions) {
+        const [d, m] = P.dimension.split(".");
+        if (d === S && R.dimensions && R.dimensions[m] && P.dateRange) {
+          const f = R.dimensions[m], G = this.queryBuilder.buildMeasureExpression({ sql: f.sql, type: "number" }, t), W = this.queryBuilder.buildDateRangeCondition(G, P.dateRange);
+          W && L.push(W);
         }
       }
     if (E.filters) {
-      for (const l of E.filters)
-        if (!("and" in l) && !("or" in l) && "member" in l && "operator" in l) {
-          const P = l, [d, M] = P.member.split(".");
-          if (d === S && R.dimensions && R.dimensions[M]) {
-            const p = R.dimensions[M];
-            if (P.operator === "inDateRange") {
-              const f = this.queryBuilder.buildMeasureExpression({ sql: p.sql, type: "number" }, t), H = this.queryBuilder.buildDateRangeCondition(f, P.values);
-              H && L.push(H);
+      for (const P of E.filters)
+        if (!("and" in P) && !("or" in P) && "member" in P && "operator" in P) {
+          const d = P, [m, f] = d.member.split(".");
+          if (m === S && R.dimensions && R.dimensions[f]) {
+            const G = R.dimensions[f];
+            if (d.operator === "inDateRange") {
+              const W = this.queryBuilder.buildMeasureExpression({ sql: G.sql, type: "number" }, t), X = this.queryBuilder.buildDateRangeCondition(W, d.values);
+              X && L.push(X);
             }
           }
         }
     }
     if (e.propagatingFilters && e.propagatingFilters.length > 0)
-      for (const l of e.propagatingFilters) {
-        const P = this.buildPropagatingFilterSubquery(
-          l,
+      for (const P of e.propagatingFilters) {
+        const d = this.buildPropagatingFilterSubquery(
+          P,
           t
         );
-        P && L.push(P);
+        d && L.push(d);
       }
-    const u = [];
-    if (A.where && u.push(A.where), u.push(...o, ...L), u.length > 0) {
-      const l = u.length === 1 ? u[0] : h(...u);
-      I = I.where(l);
+    const l = [];
+    if (A.where && l.push(A.where), l.push(...o, ...L), l.length > 0) {
+      const P = l.length === 1 ? l[0] : h(...l);
+      I = I.where(P);
     }
-    const C = [];
-    for (const l of e.joinKeys)
-      l.targetColumnObj && C.push(l.targetColumnObj);
+    const C = [], c = /* @__PURE__ */ new Set(), M = (P) => {
+      const d = P?.name || (typeof P == "string" ? P : null);
+      d && !c.has(d) ? (c.add(d), C.push(P)) : d || C.push(P);
+    };
+    for (const P of e.joinKeys)
+      P.targetColumnObj && M(P.targetColumnObj);
     if (e.downstreamJoinKeys)
-      for (const l of e.downstreamJoinKeys)
-        for (const P of l.joinKeys)
-          P.sourceColumnObj && C.push(P.sourceColumnObj);
+      for (const P of e.downstreamJoinKeys)
+        for (const d of P.joinKeys)
+          d.sourceColumnObj && M(d.sourceColumnObj);
     if (E.dimensions)
-      for (const l of E.dimensions) {
-        const [P, d] = l.split(".");
-        if (P === S && R.dimensions && R.dimensions[d]) {
-          const M = R.dimensions[d], p = G(M.sql, t);
-          C.push(p);
+      for (const P of E.dimensions) {
+        const [d, m] = P.split(".");
+        if (d === S && R.dimensions && R.dimensions[m]) {
+          const f = R.dimensions[m], G = B(f.sql, t);
+          C.push(G);
         }
       }
     if (E.timeDimensions)
-      for (const l of E.timeDimensions) {
-        const [P, d] = l.dimension.split(".");
-        if (P === S && R.dimensions && R.dimensions[d]) {
-          const M = R.dimensions[d], p = this.queryBuilder.buildTimeDimensionExpression(M.sql, l.granularity, t);
-          C.push(p);
+      for (const P of E.timeDimensions) {
+        const [d, m] = P.dimension.split(".");
+        if (d === S && R.dimensions && R.dimensions[m]) {
+          const f = R.dimensions[m], G = this.queryBuilder.buildTimeDimensionExpression(f.sql, P.granularity, t);
+          C.push(G);
         }
       }
     return C.length > 0 && (I = I.groupBy(...C)), t.db.$with(e.cteAlias).as(I);
@@ -4858,18 +4863,18 @@ function MT(T, e) {
   for (const [O, I] of S) {
     const a = I.size > 0 ? I.values().next().value : null;
     for (const o of i) {
-      const L = o.toISOString(), u = I.get(L);
-      if (u)
-        N.push(u);
+      const L = o.toISOString(), l = I.get(L);
+      if (l)
+        N.push(l);
       else {
         const C = {
           [E]: L
         };
         if (a)
-          for (const l of A)
-            C[l] = a[l];
-        for (const l of R)
-          C[l] = n;
+          for (const c of A)
+            C[c] = a[c];
+        for (const c of R)
+          C[c] = n;
         N.push(C);
       }
     }
@@ -5285,7 +5290,7 @@ class pT {
       const [, A] = e.bindingKey.split("."), i = E.dimensions?.[A];
       if (!i)
         throw new Error(`Binding key dimension not found: ${e.bindingKey}`);
-      return G(i.sql, t);
+      return B(i.sql, t);
     }
     const s = e.bindingKey.find((A) => A.cube === E.name);
     if (!s)
@@ -5293,7 +5298,7 @@ class pT {
     const [, n] = s.dimension.split("."), R = E.dimensions?.[n];
     if (!R)
       throw new Error(`Binding key dimension not found: ${s.dimension}`);
-    return G(R.sql, t);
+    return B(R.sql, t);
   }
   /**
    * Resolve time dimension expression for a cube
@@ -5303,7 +5308,7 @@ class pT {
       const [, A] = e.timeDimension.split("."), i = E.dimensions?.[A];
       if (!i)
         throw new Error(`Time dimension not found: ${e.timeDimension}`);
-      return G(i.sql, t);
+      return B(i.sql, t);
     }
     const s = e.timeDimension.find((A) => A.cube === E.name);
     if (!s)
@@ -5311,7 +5316,7 @@ class pT {
     const [, n] = s.dimension.split("."), R = E.dimensions?.[n];
     if (!R)
       throw new Error(`Time dimension not found: ${s.dimension}`);
-    return G(R.sql, t);
+    return B(R.sql, t);
   }
   /**
    * Build filter conditions for a step
@@ -5341,24 +5346,24 @@ class pT {
     const n = "and" in e || "or" in e, R = "type" in e && "filters" in e && (e.type === "and" || e.type === "or");
     if (n || R) {
       const L = [];
-      let u;
+      let l;
       if (R) {
         const C = e;
-        u = C.type === "and";
-        for (const l of C.filters || []) {
-          const P = this.buildFilterCondition(l, E, t, s);
-          P && L.push(P);
+        l = C.type === "and";
+        for (const c of C.filters || []) {
+          const M = this.buildFilterCondition(c, E, t, s);
+          M && L.push(M);
         }
       } else {
         const C = e;
-        u = "and" in C && !!C.and;
-        const l = C.and || C.or || [];
-        for (const P of l) {
-          const d = this.buildFilterCondition(P, E, t, s);
-          d && L.push(d);
+        l = "and" in C && !!C.and;
+        const c = C.and || C.or || [];
+        for (const M of c) {
+          const P = this.buildFilterCondition(M, E, t, s);
+          P && L.push(P);
         }
       }
-      return L.length === 0 ? null : L.length === 1 ? L[0] : u ? h(...L) : r`(${r.join(L, r` OR `)})`;
+      return L.length === 0 ? null : L.length === 1 ? L[0] : l ? h(...L) : r`(${r.join(L, r` OR `)})`;
     }
     const A = e, [i, S] = A.member.split("."), N = A.dateRange !== void 0;
     if (A.operator !== "set" && A.operator !== "notSet" && !N && (!A.values || A.values.length === 0 || A.values[0] === void 0 || A.values[0] === ""))
@@ -5367,15 +5372,15 @@ class pT {
     if (!I)
       return null;
     if (i !== E.name) {
-      const u = new _e(t).findPath(E.name, i);
-      if (!u || u.length === 0)
+      const l = new _e(t).findPath(E.name, i);
+      if (!l || l.length === 0)
         return console.warn(
           `Funnel filter: Cannot filter by '${i}.${S}' in step using '${E.name}'. No join path found. Filter will be skipped.`
         ), null;
     }
     const a = I.dimensions?.[S];
     if (!a) return null;
-    const o = G(a.sql, s);
+    const o = B(a.sql, s);
     return this.filterBuilder.buildFilterCondition(
       o,
       A.operator,
@@ -5641,8 +5646,8 @@ class fT {
     N.push(o);
     const L = this.buildLinksAggregationCTE(i, t);
     N.push(L);
-    const u = this.buildFinalResultCTE(t);
-    return N.push(u), t.db.with(...N).select().from(u);
+    const l = this.buildFinalResultCTE(t);
+    return N.push(l), t.db.with(...N).select().from(l);
   }
   /**
    * Transform raw SQL result to FlowResultRow
@@ -5708,7 +5713,7 @@ class fT {
       const [, A] = e.bindingKey.split("."), i = E.dimensions?.[A];
       if (!i)
         throw new Error(`Binding key dimension not found: ${e.bindingKey}`);
-      return G(i.sql, t);
+      return B(i.sql, t);
     }
     const s = e.bindingKey.find((A) => A.cube === E.name);
     if (!s)
@@ -5716,7 +5721,7 @@ class fT {
     const [, n] = s.dimension.split("."), R = E.dimensions?.[n];
     if (!R)
       throw new Error(`Binding key dimension not found: ${s.dimension}`);
-    return G(R.sql, t);
+    return B(R.sql, t);
   }
   /**
    * Resolve time dimension expression
@@ -5726,7 +5731,7 @@ class fT {
       const [, A] = e.timeDimension.split("."), i = E.dimensions?.[A];
       if (!i)
         throw new Error(`Time dimension not found: ${e.timeDimension}`);
-      return G(i.sql, t);
+      return B(i.sql, t);
     }
     const s = e.timeDimension.find((A) => A.cube === E.name);
     if (!s)
@@ -5734,7 +5739,7 @@ class fT {
     const [, n] = s.dimension.split("."), R = E.dimensions?.[n];
     if (!R)
       throw new Error(`Time dimension not found: ${s.dimension}`);
-    return G(R.sql, t);
+    return B(R.sql, t);
   }
   /**
    * Resolve event dimension expression
@@ -5743,7 +5748,7 @@ class fT {
     const [, s] = e.eventDimension.split("."), n = E.dimensions?.[s];
     if (!n)
       throw new Error(`Event dimension not found: ${e.eventDimension}`);
-    return G(n.sql, t);
+    return B(n.sql, t);
   }
   /**
    * Build filter conditions for the starting step
@@ -5780,7 +5785,7 @@ class fT {
     }
     const s = e, [, n] = s.member.split("."), R = E.dimensions?.[n];
     if (!R) return null;
-    const A = G(R.sql, t);
+    const A = B(R.sql, t);
     return this.filterBuilder.buildFilterCondition(
       A,
       s.operator,
@@ -5825,12 +5830,12 @@ class fT {
         r`${n} = ${r.identifier(O)}.binding_key`,
         r`${R} < ${r.identifier(O)}.${r.identifier(I)}`
       );
-      const L = o.length === 1 ? o[0] : h(...o), u = S ? r`${A} || ${"→"} || ${r.identifier(O)}.event_path` : r`${A}`, C = t.db.select({
+      const L = o.length === 1 ? o[0] : h(...o), l = S ? r`${A} || ${"→"} || ${r.identifier(O)}.event_path` : r`${A}`, C = t.db.select({
         binding_key: r`${n}`.as("binding_key"),
         step_time: r`${R}`.as("step_time"),
         event_type: r`${A}`.as("event_type"),
-        event_path: u.as("event_path")
-      }).from(s.from).where(L).orderBy(r`${R} DESC`).limit(1), l = t.db.$with(a).as(
+        event_path: l.as("event_path")
+      }).from(s.from).where(L).orderBy(r`${R} DESC`).limit(1), c = t.db.$with(a).as(
         t.db.select({
           binding_key: r`e.binding_key`.as("binding_key"),
           step_time: r`e.step_time`.as("step_time"),
@@ -5838,7 +5843,7 @@ class fT {
           event_path: r`e.event_path`.as("event_path")
         }).from(r`${r.identifier(O)}`).crossJoinLateral(C.as("e"))
       );
-      i.push(l);
+      i.push(c);
     }
     return i;
   }
@@ -5854,12 +5859,12 @@ class fT {
         r`${n} = ${r.identifier(O)}.binding_key`,
         r`${R} > ${r.identifier(O)}.${r.identifier(I)}`
       );
-      const L = o.length === 1 ? o[0] : h(...o), u = S ? r`${r.identifier(O)}.event_path || ${"→"} || ${A}` : r`${A}`, C = t.db.select({
+      const L = o.length === 1 ? o[0] : h(...o), l = S ? r`${r.identifier(O)}.event_path || ${"→"} || ${A}` : r`${A}`, C = t.db.select({
         binding_key: r`${n}`.as("binding_key"),
         step_time: r`${R}`.as("step_time"),
         event_type: r`${A}`.as("event_type"),
-        event_path: u.as("event_path")
-      }).from(s.from).where(L).orderBy(r`${R} ASC`).limit(1), l = t.db.$with(a).as(
+        event_path: l.as("event_path")
+      }).from(s.from).where(L).orderBy(r`${R} ASC`).limit(1), c = t.db.$with(a).as(
         t.db.select({
           binding_key: r`e.binding_key`.as("binding_key"),
           step_time: r`e.step_time`.as("step_time"),
@@ -5867,7 +5872,7 @@ class fT {
           event_path: r`e.event_path`.as("event_path")
         }).from(r`${r.identifier(O)}`).crossJoinLateral(C.as("e"))
       );
-      i.push(l);
+      i.push(c);
     }
     return i;
   }
@@ -5885,22 +5890,22 @@ class fT {
       s.where && o.push(s.where), o.push(
         r`${R} < ${r.identifier(O)}.${r.identifier(I)}`
       );
-      const L = o.length === 1 ? o[0] : h(...o), u = S ? r`${A} || ${"→"} || ${r.identifier(O)}.event_path` : r`${A}`, C = t.db.select({
+      const L = o.length === 1 ? o[0] : h(...o), l = S ? r`${A} || ${"→"} || ${r.identifier(O)}.event_path` : r`${A}`, C = t.db.select({
         binding_key: r`${n}`.as("binding_key"),
         step_time: r`${R}`.as("step_time"),
         event_type: r`${A}`.as("event_type"),
-        event_path: u.as("event_path"),
+        event_path: l.as("event_path"),
         rn: r`ROW_NUMBER() OVER (PARTITION BY ${n} ORDER BY ${R} DESC)`.as("rn")
       }).from(s.from).innerJoin(
         r`${r.identifier(O)}`,
         r`${n} = ${r.identifier(O)}.binding_key`
-      ).where(L), l = t.db.select({
+      ).where(L), c = t.db.select({
         binding_key: r`binding_key`.as("binding_key"),
         step_time: r`step_time`.as("step_time"),
         event_type: r`event_type`.as("event_type"),
         event_path: r`event_path`.as("event_path")
       }).from(C.as("ranked")).where(r`rn = 1`);
-      i.push(t.db.$with(a).as(l));
+      i.push(t.db.$with(a).as(c));
     }
     return i;
   }
@@ -5918,22 +5923,22 @@ class fT {
       s.where && o.push(s.where), o.push(
         r`${R} > ${r.identifier(O)}.${r.identifier(I)}`
       );
-      const L = o.length === 1 ? o[0] : h(...o), u = S ? r`${r.identifier(O)}.event_path || ${"→"} || ${A}` : r`${A}`, C = t.db.select({
+      const L = o.length === 1 ? o[0] : h(...o), l = S ? r`${r.identifier(O)}.event_path || ${"→"} || ${A}` : r`${A}`, C = t.db.select({
         binding_key: r`${n}`.as("binding_key"),
         step_time: r`${R}`.as("step_time"),
         event_type: r`${A}`.as("event_type"),
-        event_path: u.as("event_path"),
+        event_path: l.as("event_path"),
         rn: r`ROW_NUMBER() OVER (PARTITION BY ${n} ORDER BY ${R} ASC)`.as("rn")
       }).from(s.from).innerJoin(
         r`${r.identifier(O)}`,
         r`${n} = ${r.identifier(O)}.binding_key`
-      ).where(L), l = t.db.select({
+      ).where(L), c = t.db.select({
         binding_key: r`binding_key`.as("binding_key"),
         step_time: r`step_time`.as("step_time"),
         event_type: r`event_type`.as("event_type"),
         event_path: r`event_path`.as("event_path")
       }).from(C.as("ranked")).where(r`rn = 1`);
-      i.push(t.db.$with(a).as(l));
+      i.push(t.db.$with(a).as(c));
     }
     return i;
   }
@@ -6154,28 +6159,28 @@ class ee {
   async execute(e, E, t) {
     try {
       if (this.funnelQueryBuilder.hasFunnel(E)) {
-        const u = this.funnelQueryBuilder.validateConfig(E.funnel, e);
-        if (!u.isValid)
-          throw new Error(`Funnel validation failed: ${u.errors.join(", ")}`);
+        const l = this.funnelQueryBuilder.validateConfig(E.funnel, e);
+        if (!l.isValid)
+          throw new Error(`Funnel validation failed: ${l.errors.join(", ")}`);
       } else if (this.flowQueryBuilder.hasFlow(E)) {
-        const u = this.flowQueryBuilder.validateConfig(E.flow, e);
-        if (!u.isValid)
-          throw new Error(`Flow validation failed: ${u.errors.join(", ")}`);
+        const l = this.flowQueryBuilder.validateConfig(E.flow, e);
+        if (!l.isValid)
+          throw new Error(`Flow validation failed: ${l.errors.join(", ")}`);
       } else {
-        const u = Yt(e, E);
-        if (!u.isValid)
-          throw new Error(`Query validation failed: ${u.errors.join(", ")}`);
+        const l = Yt(e, E);
+        if (!l.isValid)
+          throw new Error(`Query validation failed: ${l.errors.join(", ")}`);
       }
       let s;
       if (this.cacheConfig?.enabled !== !1 && this.cacheConfig?.provider) {
         s = NT(E, t, this.cacheConfig);
         try {
-          const u = Date.now(), C = await this.cacheConfig.provider.get(s);
+          const l = Date.now(), C = await this.cacheConfig.provider.get(s);
           if (C)
             return this.cacheConfig.onCacheEvent?.({
               type: "hit",
               key: s,
-              durationMs: Date.now() - u
+              durationMs: Date.now() - l
             }), {
               ...C.value,
               cache: C.metadata ? {
@@ -6193,10 +6198,10 @@ class ee {
           this.cacheConfig.onCacheEvent?.({
             type: "miss",
             key: s,
-            durationMs: Date.now() - u
+            durationMs: Date.now() - l
           });
-        } catch (u) {
-          this.cacheConfig.onError?.(u, "get");
+        } catch (l) {
+          this.cacheConfig.onError?.(l, "get");
         }
       }
       if (this.comparisonQueryBuilder.hasComparison(E))
@@ -6214,17 +6219,17 @@ class ee {
       this.preloadFilterCache(E, n, e, R);
       const A = this.queryPlanner.createQueryPlan(e, E, R);
       this.validateSecurityContext(A, R);
-      const i = this.buildUnifiedQuery(A, E, R), S = this.queryBuilder.collectNumericFields(e, E), N = await this.dbExecutor.execute(i, S), O = Array.isArray(N) ? N.map((u) => {
-        const C = { ...u };
+      const i = this.buildUnifiedQuery(A, E, R), S = this.queryBuilder.collectNumericFields(e, E), N = await this.dbExecutor.execute(i, S), O = Array.isArray(N) ? N.map((l) => {
+        const C = { ...l };
         if (E.timeDimensions) {
-          for (const l of E.timeDimensions)
-            if (l.dimension in C) {
-              let P = C[l.dimension];
-              if (typeof P == "string" && P.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-                const d = P.replace(" ", "T"), M = !d.endsWith("Z") && !d.includes("+") ? d + "Z" : d;
-                P = new Date(M);
+          for (const c of E.timeDimensions)
+            if (c.dimension in C) {
+              let M = C[c.dimension];
+              if (typeof M == "string" && M.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
+                const P = M.replace(" ", "T"), d = !P.endsWith("Z") && !P.includes("+") ? P + "Z" : P;
+                M = new Date(d);
               }
-              P = this.databaseAdapter.convertTimeDimensionResult(P), C[l.dimension] = P;
+              M = this.databaseAdapter.convertTimeDimensionResult(M), C[c.dimension] = M;
             }
         }
         return C;
@@ -6234,7 +6239,7 @@ class ee {
       };
       if (s && this.cacheConfig?.provider)
         try {
-          const u = Date.now();
+          const l = Date.now();
           await this.cacheConfig.provider.set(
             s,
             L,
@@ -6242,10 +6247,10 @@ class ee {
           ), this.cacheConfig.onCacheEvent?.({
             type: "set",
             key: s,
-            durationMs: Date.now() - u
+            durationMs: Date.now() - l
           });
-        } catch (u) {
-          this.cacheConfig.onError?.(u, "set");
+        } catch (l) {
+          this.cacheConfig.onError?.(l, "set");
         }
       return L;
     } catch (s) {
@@ -6444,14 +6449,14 @@ class ee {
     const R = this.queryPlanner.createQueryPlan(e, E, n), A = this.buildUnifiedQuery(R, E, n), i = this.queryBuilder.collectNumericFields(e, E), S = await this.dbExecutor.execute(A, i), N = Array.isArray(S) ? S.map((o) => {
       const L = { ...o };
       if (E.timeDimensions) {
-        for (const u of E.timeDimensions)
-          if (u.dimension in L) {
-            let C = L[u.dimension];
+        for (const l of E.timeDimensions)
+          if (l.dimension in L) {
+            let C = L[l.dimension];
             if (typeof C == "string" && C.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-              const l = C.replace(" ", "T"), P = !l.endsWith("Z") && !l.includes("+") ? l + "Z" : l;
-              C = new Date(P);
+              const c = C.replace(" ", "T"), M = !c.endsWith("Z") && !c.includes("+") ? c + "Z" : c;
+              C = new Date(M);
             }
-            C = this.databaseAdapter.convertTimeDimensionResult(C), L[u.dimension] = C;
+            C = this.databaseAdapter.convertTimeDimensionResult(C), L[l.dimension] = C;
           }
       }
       return L;
@@ -6497,31 +6502,31 @@ class ee {
     if (e.preAggregationCTEs && e.preAggregationCTEs.length > 0) {
       for (const C of e.preAggregationCTEs)
         if (C.propagatingFilters && C.propagatingFilters.length > 0)
-          for (const l of C.propagatingFilters) {
-            const P = l.sourceCube.name;
-            if (!s.has(P)) {
-              const M = {
-                filters: l.filters
-              }, p = /* @__PURE__ */ new Map([[P, l.sourceCube]]), f = this.queryBuilder.buildWhereConditions(
-                p,
-                M,
+          for (const c of C.propagatingFilters) {
+            const M = c.sourceCube.name;
+            if (!s.has(M)) {
+              const d = {
+                filters: c.filters
+              }, m = /* @__PURE__ */ new Map([[M, c.sourceCube]]), f = this.queryBuilder.buildWhereConditions(
+                m,
+                d,
                 t
               );
-              s.set(P, f);
+              s.set(M, f);
             }
-            const d = s.get(P);
-            d && d.length > 0 && (l.preBuiltFilterSQL = d.length === 1 ? d[0] : h(...d));
+            const P = s.get(M);
+            P && P.length > 0 && (c.preBuiltFilterSQL = P.length === 1 ? P[0] : h(...P));
           }
     }
     const n = [], R = /* @__PURE__ */ new Map(), A = /* @__PURE__ */ new Map();
     if (e.preAggregationCTEs && e.preAggregationCTEs.length > 0)
       for (const C of e.preAggregationCTEs) {
-        const l = this.cteBuilder.buildPreAggregationCTE(C, E, t, e, s);
-        if (l && (n.push(l), R.set(C.cube.name, C.cteAlias), C.downstreamJoinKeys))
-          for (const P of C.downstreamJoinKeys)
-            A.set(P.targetCubeName, {
+        const c = this.cteBuilder.buildPreAggregationCTE(C, E, t, e, s);
+        if (c && (n.push(c), R.set(C.cube.name, C.cteAlias), C.downstreamJoinKeys))
+          for (const M of C.downstreamJoinKeys)
+            A.set(M.targetCubeName, {
               cteAlias: C.cteAlias,
-              joinKeys: P.joinKeys
+              joinKeys: M.joinKeys
             });
       }
     const i = e.primaryCube.sql(t), N = { ...this.queryBuilder.buildSelections(
@@ -6532,92 +6537,92 @@ class ee {
     ) };
     if (e.preAggregationCTEs)
       for (const C of e.preAggregationCTEs) {
-        const l = C.cube.name;
-        for (const P of C.measures)
-          if (N[P]) {
-            const [, d] = P.split("."), M = this.getCubesFromPlan(e).get(l);
-            if (M && M.measures && M.measures[d]) {
-              const p = M.measures[d], f = r`${r.identifier(C.cteAlias)}.${r.identifier(d)}`;
-              let H;
-              if (p.type === "calculated" && p.calculatedSql) {
-                const X = this.getCubesFromPlan(e);
-                H = this.queryBuilder.buildCTECalculatedMeasure(
-                  p,
-                  M,
+        const c = C.cube.name;
+        for (const M of C.measures)
+          if (N[M]) {
+            const [, P] = M.split("."), d = this.getCubesFromPlan(e).get(c);
+            if (d && d.measures && d.measures[P]) {
+              const m = d.measures[P], f = r`${r.identifier(C.cteAlias)}.${r.identifier(P)}`;
+              let G;
+              if (m.type === "calculated" && m.calculatedSql) {
+                const W = this.getCubesFromPlan(e);
+                G = this.queryBuilder.buildCTECalculatedMeasure(
+                  m,
+                  d,
                   C,
-                  X,
+                  W,
                   t
                 );
               } else
-                switch (p.type) {
+                switch (m.type) {
                   case "count":
                   case "countDistinct":
                   case "sum":
-                    H = v(f);
+                    G = x(f);
                     break;
                   case "avg":
-                    H = this.databaseAdapter.buildAvg(f);
+                    G = this.databaseAdapter.buildAvg(f);
                     break;
                   case "min":
-                    H = Ce(f);
+                    G = Ce(f);
                     break;
                   case "max":
-                    H = oe(f);
+                    G = oe(f);
                     break;
                   case "number":
-                    H = v(f);
+                    G = x(f);
                     break;
                   default:
-                    H = v(f);
+                    G = x(f);
                 }
-              N[P] = r`${H}`.as(P);
+              N[M] = r`${G}`.as(M);
             }
           }
-        for (const P in N) {
-          const [d, M] = P.split(".");
-          if (d === l) {
-            const p = this.getCubesFromPlan(e).get(l), f = p && p.dimensions?.[M], H = P.startsWith(l + ".");
-            if (f || H) {
-              let X = C.joinKeys.find((x) => x.targetColumn === M);
-              if (!X && p?.dimensions?.[M]) {
-                const x = p.dimensions[M].sql;
-                X = C.joinKeys.find((he) => he.targetColumnObj === x);
+        for (const M in N) {
+          const [P, d] = M.split(".");
+          if (P === c) {
+            const m = this.getCubesFromPlan(e).get(c), f = m && m.dimensions?.[d], G = M.startsWith(c + ".");
+            if (f || G) {
+              let W = C.joinKeys.find((X) => X.targetColumn === d);
+              if (!W && m?.dimensions?.[d]) {
+                const X = m.dimensions[d].sql;
+                W = C.joinKeys.find((he) => he.targetColumnObj === X);
               }
-              X ? N[P] = r`${r.identifier(C.cteAlias)}.${r.identifier(M)}`.as(P) : H && p?.dimensions?.[M] && (N[P] = r`${r.identifier(C.cteAlias)}.${r.identifier(M)}`.as(P));
+              W ? N[M] = r`${r.identifier(C.cteAlias)}.${r.identifier(d)}`.as(M) : G && m?.dimensions?.[d] && (N[M] = r`${r.identifier(C.cteAlias)}.${r.identifier(d)}`.as(M));
             }
           }
         }
       }
     if (E.measures) {
       const C = this.getCubesFromPlan(e);
-      for (const l of E.measures) {
-        const [P, d] = l.split("."), M = C.get(P);
-        if (M?.measures?.[d]) {
-          const p = M.measures[d];
-          if (F.isPostAggregationWindow(p)) {
-            const f = F.getWindowBaseMeasure(p, P);
+      for (const c of E.measures) {
+        const [M, P] = c.split("."), d = C.get(M);
+        if (d?.measures?.[P]) {
+          const m = d.measures[P];
+          if (H.isPostAggregationWindow(m)) {
+            const f = H.getWindowBaseMeasure(m, M);
             if (f) {
-              const [H, X] = f.split("."), x = C.get(H);
-              if (x?.measures?.[X]) {
-                const he = x.measures[X], LE = e.preAggregationCTEs?.find(
-                  (Oe) => Oe.cube?.name === H && Oe.measures?.includes(f)
+              const [G, W] = f.split("."), X = C.get(G);
+              if (X?.measures?.[W]) {
+                const he = X.measures[W], LE = e.preAggregationCTEs?.find(
+                  (Oe) => Oe.cube?.name === G && Oe.measures?.includes(f)
                 );
                 let Ne;
                 if (LE) {
-                  const Oe = r`${r.identifier(LE.cteAlias)}.${r.identifier(X)}`;
+                  const Oe = r`${r.identifier(LE.cteAlias)}.${r.identifier(W)}`;
                   Ne = r`sum(${Oe})`;
                 } else
-                  Ne = this.queryBuilder.buildMeasureExpression(he, t, x);
+                  Ne = this.queryBuilder.buildMeasureExpression(he, t, X);
                 N[f] || (N[f] = r`${Ne}`.as(f));
                 const lE = this.buildPostAggregationWindowExpression(
-                  p,
+                  m,
                   Ne,
                   E,
                   t,
-                  M,
+                  d,
                   e
                 );
-                lE && (N[l] = r`${lE}`.as(l));
+                lE && (N[c] = r`${lE}`.as(c));
               }
             }
           }
@@ -6644,60 +6649,60 @@ class ee {
         }
     if (e.joinCubes && e.joinCubes.length > 0)
       for (const C of e.joinCubes) {
-        const l = R.get(C.cube.name);
+        const c = R.get(C.cube.name);
         if (C.junctionTable) {
-          const M = C.junctionTable, p = [];
-          if (M.securitySql) {
-            const f = M.securitySql(t.securityContext);
-            Array.isArray(f) ? p.push(...f) : p.push(f);
+          const d = C.junctionTable, m = [];
+          if (d.securitySql) {
+            const f = d.securitySql(t.securityContext);
+            Array.isArray(f) ? m.push(...f) : m.push(f);
           }
           try {
-            switch (M.joinType || "left") {
+            switch (d.joinType || "left") {
               case "left":
-                I = I.leftJoin(M.table, M.joinCondition);
+                I = I.leftJoin(d.table, d.joinCondition);
                 break;
               case "inner":
-                I = I.innerJoin(M.table, M.joinCondition);
+                I = I.innerJoin(d.table, d.joinCondition);
                 break;
               case "right":
-                I = I.rightJoin(M.table, M.joinCondition);
+                I = I.rightJoin(d.table, d.joinCondition);
                 break;
               case "full":
-                I = I.fullJoin(M.table, M.joinCondition);
+                I = I.fullJoin(d.table, d.joinCondition);
                 break;
             }
-            p.length > 0 && O.push(...p);
+            m.length > 0 && O.push(...m);
           } catch {
           }
         }
-        let P, d;
-        if (l)
-          P = r`${r.identifier(l)}`, d = this.cteBuilder.buildCTEJoinCondition(C, l, e);
+        let M, P;
+        if (c)
+          M = r`${r.identifier(c)}`, P = this.cteBuilder.buildCTEJoinCondition(C, c, e);
         else {
-          const M = A.get(C.cube.name);
-          if (P = C.cube.sql(t).from, M) {
+          const d = A.get(C.cube.name);
+          if (M = C.cube.sql(t).from, d) {
             const f = [];
-            for (const H of M.joinKeys) {
-              const X = r`${r.identifier(M.cteAlias)}.${r.identifier(H.sourceColumn)}`, x = H.targetColumnObj || r.identifier(H.targetColumn);
-              f.push(Q(X, x));
+            for (const G of d.joinKeys) {
+              const W = r`${r.identifier(d.cteAlias)}.${r.identifier(G.sourceColumn)}`, X = G.targetColumnObj || r.identifier(G.targetColumn);
+              f.push(Q(W, X));
             }
-            d = f.length === 1 ? f[0] : h(...f);
+            P = f.length === 1 ? f[0] : h(...f);
           } else
-            d = C.joinCondition;
+            P = C.joinCondition;
         }
         try {
           switch (C.joinType || "left") {
             case "left":
-              I = I.leftJoin(P, d);
+              I = I.leftJoin(M, P);
               break;
             case "inner":
-              I = I.innerJoin(P, d);
+              I = I.innerJoin(M, P);
               break;
             case "right":
-              I = I.rightJoin(P, d);
+              I = I.rightJoin(M, P);
               break;
             case "full":
-              I = I.fullJoin(P, d);
+              I = I.fullJoin(M, P);
               break;
           }
         } catch {
@@ -6707,8 +6712,8 @@ class ee {
       for (const C of e.joinCubes) {
         if (R.get(C.cube.name))
           continue;
-        const P = C.cube.sql(t);
-        P.where && O.push(P.where);
+        const M = C.cube.sql(t);
+        M.where && O.push(M.where);
       }
     const a = this.queryBuilder.buildWhereConditions(
       e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : e.primaryCube,
@@ -6745,8 +6750,8 @@ class ee {
       const C = L.length === 1 ? L[0] : h(...L);
       I = I.having(C);
     }
-    const u = this.queryBuilder.buildOrderBy(E);
-    return u.length > 0 && (I = I.orderBy(...u)), I = this.queryBuilder.applyLimitAndOffset(I, E), I;
+    const l = this.queryBuilder.buildOrderBy(E);
+    return l.length > 0 && (I = I.orderBy(...l)), I = this.queryBuilder.applyLimitAndOffset(I, E), I;
   }
   /**
    * Convert query plan to cube map for QueryBuilder methods
@@ -6903,7 +6908,7 @@ class ee {
         const O = N.dimensions?.[S];
         if (!O || ["arrayContains", "arrayOverlaps", "arrayContained"].includes(R.operator))
           continue;
-        const a = G(O.sql, s), o = this.queryBuilder.buildFilterConditionPublic(
+        const a = B(O.sql, s), o = this.queryBuilder.buildFilterConditionPublic(
           a,
           R.operator,
           R.values,
@@ -6922,7 +6927,7 @@ class ee {
           if (!S) continue;
           const N = S.dimensions?.[i];
           if (!N) continue;
-          const O = G(N.sql, s), I = this.queryBuilder.buildDateRangeCondition(O, n.dateRange);
+          const O = B(N.sql, s), I = this.queryBuilder.buildDateRangeCondition(O, n.dateRange);
           I && E.set(R, I);
         }
     }
@@ -6945,7 +6950,7 @@ class ee {
   buildPostAggregationWindowExpression(e, E, t, s, n, R) {
     const A = e.windowConfig || {}, i = (a, o) => {
       if (!R?.preAggregationCTEs) return null;
-      const L = R.preAggregationCTEs.find((u) => u.cube?.name === a);
+      const L = R.preAggregationCTEs.find((l) => l.cube?.name === a);
       return L && L.cteAlias ? r`${r.identifier(L.cteAlias)}.${r.identifier(o)}` : null;
     };
     let S;
@@ -6954,19 +6959,19 @@ class ee {
         const o = a.field.includes(".") ? a.field.split(".")[1] : a.field;
         if (t.timeDimensions)
           for (const C of t.timeDimensions) {
-            const [l, P] = C.dimension.split(".");
-            if (P === o) {
-              const d = i(l, o);
-              if (d)
+            const [c, M] = C.dimension.split(".");
+            if (M === o) {
+              const P = i(c, o);
+              if (P)
                 return {
-                  field: d,
+                  field: P,
                   direction: a.direction
                 };
-              const M = n.dimensions?.[P];
-              if (M)
+              const d = n.dimensions?.[M];
+              if (d)
                 return {
                   field: this.queryBuilder.buildTimeDimensionExpression(
-                    M.sql,
+                    d.sql,
                     C.granularity,
                     s
                   ),
@@ -6977,29 +6982,29 @@ class ee {
         const L = n.dimensions?.[o];
         if (L)
           return {
-            field: G(L.sql, s),
+            field: B(L.sql, s),
             direction: a.direction
           };
-        const u = A.measure?.includes(".") ? A.measure.split(".")[1] : A.measure;
-        return o === u || a.field === A.measure ? {
+        const l = A.measure?.includes(".") ? A.measure.split(".")[1] : A.measure;
+        return o === l || a.field === A.measure ? {
           field: E,
           direction: a.direction
         } : null;
       }).filter((a) => a !== null);
     else if (t.timeDimensions && t.timeDimensions.length > 0) {
-      const a = t.timeDimensions[0], [o, L] = a.dimension.split("."), u = i(o, L);
-      if (u)
+      const a = t.timeDimensions[0], [o, L] = a.dimension.split("."), l = i(o, L);
+      if (l)
         S = [{
-          field: u,
+          field: l,
           direction: "asc"
         }];
       else {
         const C = n.name === o ? n : void 0;
         if (C?.dimensions?.[L]) {
-          const l = C.dimensions[L];
+          const c = C.dimensions[L];
           S = [{
             field: this.queryBuilder.buildTimeDimensionExpression(
-              l.sql,
+              c.sql,
               a.granularity,
               s
             ),
@@ -7011,7 +7016,7 @@ class ee {
     let N;
     A.partitionBy && A.partitionBy.length > 0 && (N = A.partitionBy.map((a) => {
       const o = a.includes(".") ? a.split(".")[1] : a, L = n.dimensions?.[o];
-      return L ? G(L.sql, s) : null;
+      return L ? B(L.sql, s) : null;
     }).filter((a) => a !== null));
     const O = this.databaseAdapter.buildWindowFunction(
       e.type,
@@ -7027,7 +7032,7 @@ class ee {
     );
     if (!O)
       return null;
-    switch (A.operation || F.getDefaultWindowOperation(e.type)) {
+    switch (A.operation || H.getDefaultWindowOperation(e.type)) {
       case "difference":
         return r`${E} - ${O}`;
       case "ratio":
@@ -7104,23 +7109,23 @@ const _ = (T) => T.flatMap(hT), hT = (T) => Le(BT(T)).map(GT), GT = (T) => T.rep
       E.push(t + s);
   return E;
 };
-var c;
+var D;
 (function(T) {
   T.QUOTED_IDENTIFIER = "QUOTED_IDENTIFIER", T.IDENTIFIER = "IDENTIFIER", T.STRING = "STRING", T.VARIABLE = "VARIABLE", T.RESERVED_DATA_TYPE = "RESERVED_DATA_TYPE", T.RESERVED_PARAMETERIZED_DATA_TYPE = "RESERVED_PARAMETERIZED_DATA_TYPE", T.RESERVED_KEYWORD = "RESERVED_KEYWORD", T.RESERVED_FUNCTION_NAME = "RESERVED_FUNCTION_NAME", T.RESERVED_KEYWORD_PHRASE = "RESERVED_KEYWORD_PHRASE", T.RESERVED_DATA_TYPE_PHRASE = "RESERVED_DATA_TYPE_PHRASE", T.RESERVED_SET_OPERATION = "RESERVED_SET_OPERATION", T.RESERVED_CLAUSE = "RESERVED_CLAUSE", T.RESERVED_SELECT = "RESERVED_SELECT", T.RESERVED_JOIN = "RESERVED_JOIN", T.ARRAY_IDENTIFIER = "ARRAY_IDENTIFIER", T.ARRAY_KEYWORD = "ARRAY_KEYWORD", T.CASE = "CASE", T.END = "END", T.WHEN = "WHEN", T.ELSE = "ELSE", T.THEN = "THEN", T.LIMIT = "LIMIT", T.BETWEEN = "BETWEEN", T.AND = "AND", T.OR = "OR", T.XOR = "XOR", T.OPERATOR = "OPERATOR", T.COMMA = "COMMA", T.ASTERISK = "ASTERISK", T.PROPERTY_ACCESS_OPERATOR = "PROPERTY_ACCESS_OPERATOR", T.OPEN_PAREN = "OPEN_PAREN", T.CLOSE_PAREN = "CLOSE_PAREN", T.LINE_COMMENT = "LINE_COMMENT", T.BLOCK_COMMENT = "BLOCK_COMMENT", T.DISABLE_COMMENT = "DISABLE_COMMENT", T.NUMBER = "NUMBER", T.NAMED_PARAMETER = "NAMED_PARAMETER", T.QUOTED_PARAMETER = "QUOTED_PARAMETER", T.NUMBERED_PARAMETER = "NUMBERED_PARAMETER", T.POSITIONAL_PARAMETER = "POSITIONAL_PARAMETER", T.CUSTOM_PARAMETER = "CUSTOM_PARAMETER", T.DELIMITER = "DELIMITER", T.EOF = "EOF";
-})(c = c || (c = {}));
+})(D = D || (D = {}));
 const ct = (T) => ({
-  type: c.EOF,
+  type: D.EOF,
   raw: "«EOF»",
   text: "«EOF»",
   start: T
 }), Re = ct(1 / 0), Ee = (T) => (e) => e.type === T.type && e.text === T.text, q = {
-  ARRAY: Ee({ text: "ARRAY", type: c.RESERVED_DATA_TYPE }),
-  BY: Ee({ text: "BY", type: c.RESERVED_KEYWORD }),
-  SET: Ee({ text: "SET", type: c.RESERVED_CLAUSE }),
-  STRUCT: Ee({ text: "STRUCT", type: c.RESERVED_DATA_TYPE }),
-  WINDOW: Ee({ text: "WINDOW", type: c.RESERVED_CLAUSE }),
-  VALUES: Ee({ text: "VALUES", type: c.RESERVED_CLAUSE })
-}, Pt = (T) => T === c.RESERVED_DATA_TYPE || T === c.RESERVED_KEYWORD || T === c.RESERVED_FUNCTION_NAME || T === c.RESERVED_KEYWORD_PHRASE || T === c.RESERVED_DATA_TYPE_PHRASE || T === c.RESERVED_CLAUSE || T === c.RESERVED_SELECT || T === c.RESERVED_SET_OPERATION || T === c.RESERVED_JOIN || T === c.ARRAY_KEYWORD || T === c.CASE || T === c.END || T === c.WHEN || T === c.ELSE || T === c.THEN || T === c.LIMIT || T === c.BETWEEN || T === c.AND || T === c.OR || T === c.XOR, yT = (T) => T === c.AND || T === c.OR || T === c.XOR, VT = [
+  ARRAY: Ee({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
+  BY: Ee({ text: "BY", type: D.RESERVED_KEYWORD }),
+  SET: Ee({ text: "SET", type: D.RESERVED_CLAUSE }),
+  STRUCT: Ee({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
+  WINDOW: Ee({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
+  VALUES: Ee({ text: "VALUES", type: D.RESERVED_CLAUSE })
+}, Pt = (T) => T === D.RESERVED_DATA_TYPE || T === D.RESERVED_KEYWORD || T === D.RESERVED_FUNCTION_NAME || T === D.RESERVED_KEYWORD_PHRASE || T === D.RESERVED_DATA_TYPE_PHRASE || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.ARRAY_KEYWORD || T === D.CASE || T === D.END || T === D.WHEN || T === D.ELSE || T === D.THEN || T === D.LIMIT || T === D.BETWEEN || T === D.AND || T === D.OR || T === D.XOR, yT = (T) => T === D.AND || T === D.OR || T === D.XOR, VT = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -7976,7 +7981,7 @@ function jT(T) {
 }
 function kT(T) {
   let e = Re;
-  return T.map((E) => E.text === "OFFSET" && e.text === "[" ? (e = E, Object.assign(Object.assign({}, E), { type: c.RESERVED_FUNCTION_NAME })) : (e = E, E));
+  return T.map((E) => E.text === "OFFSET" && e.text === "[" ? (e = E, Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME })) : (e = E, E));
 }
 function ZT(T) {
   var e;
@@ -7986,7 +7991,7 @@ function ZT(T) {
     if ((q.ARRAY(s) || q.STRUCT(s)) && ((e = T[t + 1]) === null || e === void 0 ? void 0 : e.text) === "<") {
       const n = qT(T, t + 1), R = T.slice(t, n + 1);
       E.push({
-        type: c.IDENTIFIER,
+        type: D.IDENTIFIER,
         raw: R.map(gE("raw")).join(""),
         text: R.map(gE("text")).join(""),
         start: s.start
@@ -7996,7 +8001,7 @@ function ZT(T) {
   }
   return E;
 }
-const gE = (T) => (e) => e.type === c.IDENTIFIER || e.type === c.COMMA ? e[T] + " " : e[T];
+const gE = (T) => (e) => e.type === D.IDENTIFIER || e.type === D.COMMA ? e[T] + " " : e[T];
 function qT(T, e) {
   let E = 0;
   for (let t = e; t < T.length; t++) {
@@ -11747,9 +11752,9 @@ function fe(T) {
   return T.map((e, E) => {
     const t = T[E + 1] || Re;
     if (q.SET(e) && t.text === "(")
-      return Object.assign(Object.assign({}, e), { type: c.RESERVED_FUNCTION_NAME });
+      return Object.assign(Object.assign({}, e), { type: D.RESERVED_FUNCTION_NAME });
     const s = T[E - 1] || Re;
-    return q.VALUES(e) && s.text === "=" ? Object.assign(Object.assign({}, e), { type: c.RESERVED_FUNCTION_NAME }) : e;
+    return q.VALUES(e) && s.text === "=" ? Object.assign(Object.assign({}, e), { type: D.RESERVED_FUNCTION_NAME }) : e;
   });
 }
 const Vs = [
@@ -15556,7 +15561,7 @@ const Vs = [
 };
 function Yn(T) {
   let e = Re;
-  return T.map((E) => q.SET(E) && q.BY(e) ? Object.assign(Object.assign({}, E), { type: c.RESERVED_KEYWORD }) : (Pt(E.type) && (e = E), E));
+  return T.map((E) => q.SET(E) && q.BY(e) ? Object.assign(Object.assign({}, E), { type: D.RESERVED_KEYWORD }) : (Pt(E.type) && (e = E), E));
 }
 const gn = [
   // https://www.postgresql.org/docs/14/functions.html
@@ -18243,7 +18248,7 @@ const gn = [
 function aR(T) {
   return T.map((e, E) => {
     const t = T[E - 1] || Re, s = T[E + 1] || Re;
-    return q.WINDOW(e) && s.type === c.OPEN_PAREN ? Object.assign(Object.assign({}, e), { type: c.RESERVED_FUNCTION_NAME }) : e.text === "ITEMS" && e.type === c.RESERVED_KEYWORD && !(t.text === "COLLECTION" && s.text === "TERMINATED") ? Object.assign(Object.assign({}, e), { type: c.IDENTIFIER, text: e.raw }) : e;
+    return q.WINDOW(e) && s.type === D.OPEN_PAREN ? Object.assign(Object.assign({}, e), { type: D.RESERVED_FUNCTION_NAME }) : e.text === "ITEMS" && e.type === D.RESERVED_KEYWORD && !(t.text === "COLLECTION" && s.text === "TERMINATED") ? Object.assign(Object.assign({}, e), { type: D.IDENTIFIER, text: e.raw }) : e;
   });
 }
 const oR = [
@@ -22559,20 +22564,20 @@ const oR = [
   tidb: on,
   transactsql: eA,
   trino: KR
-}, Symbol.toStringTag, { value: "Module" })), ie = (T) => T[T.length - 1], dt = (T) => T.sort((e, E) => E.length - e.length || e.localeCompare(E)), le = (T) => T.replace(/\s+/gu, " "), TE = (T) => /\n/.test(T), K = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), tt = /\s+/uy, z = (T) => new RegExp(`(?:${T})`, "uy"), cA = (T) => T.split("").map((e) => / /gu.test(e) ? "\\s+" : `[${e.toUpperCase()}${e.toLowerCase()}]`).join(""), PA = (T) => T + "(?:-" + T + ")*", dA = ({ prefixes: T, requirePrefix: e }) => `(?:${T.map(cA).join("|")}${e ? "" : "|"})`, MA = (T) => new RegExp(`(?:${T.map(K).join("|")}).*?(?=\r
+}, Symbol.toStringTag, { value: "Module" })), ie = (T) => T[T.length - 1], dt = (T) => T.sort((e, E) => E.length - e.length || e.localeCompare(E)), le = (T) => T.replace(/\s+/gu, " "), TE = (T) => /\n/.test(T), v = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), tt = /\s+/uy, z = (T) => new RegExp(`(?:${T})`, "uy"), cA = (T) => T.split("").map((e) => / /gu.test(e) ? "\\s+" : `[${e.toUpperCase()}${e.toLowerCase()}]`).join(""), PA = (T) => T + "(?:-" + T + ")*", dA = ({ prefixes: T, requirePrefix: e }) => `(?:${T.map(cA).join("|")}${e ? "" : "|"})`, MA = (T) => new RegExp(`(?:${T.map(v).join("|")}).*?(?=\r
 |\r|
 |$)`, "uy"), Tt = (T, e = []) => {
   const E = T === "open" ? 0 : 1, t = ["()", ...e].map((s) => s[E]);
-  return z(t.map(K).join("|"));
-}, st = (T) => z(`${dt(T).map(K).join("|")}`), UA = ({ rest: T, dashes: e }) => T || e ? `(?![${T || ""}${e ? "-" : ""}])` : "", J = (T, e = {}) => {
+  return z(t.map(v).join("|"));
+}, st = (T) => z(`${dt(T).map(v).join("|")}`), UA = ({ rest: T, dashes: e }) => T || e ? `(?![${T || ""}${e ? "-" : ""}])` : "", J = (T, e = {}) => {
   if (T.length === 0)
     return /^\b$/u;
-  const E = UA(e), t = dt(T).map(K).join("|").replace(/ /gu, "\\s+");
+  const E = UA(e), t = dt(T).map(v).join("|").replace(/ /gu, "\\s+");
   return new RegExp(`(?:${t})${E}\\b`, "iuy");
 }, sE = (T, e) => {
   if (!T.length)
     return;
-  const E = T.map(K).join("|");
+  const E = T.map(v).join("|");
   return z(`(?:${E})(?:${e})`);
 }, mA = () => {
   const T = {
@@ -22580,7 +22585,7 @@ const oR = [
     "[": "]",
     "(": ")",
     "{": "}"
-  }, e = "{left}(?:(?!{right}').)*?{right}", E = Object.entries(T).map(([R, A]) => e.replace(/{left}/g, K(R)).replace(/{right}/g, K(A))), t = K(Object.keys(T).join(""));
+  }, e = "{left}(?:(?!{right}').)*?{right}", E = Object.entries(T).map(([R, A]) => e.replace(/{left}/g, v(R)).replace(/{right}/g, v(A))), t = v(Object.keys(T).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${t}])(?:(?!\k<tag>').)*?\k<tag>`}|${E.join("|")})'`;
 }, nt = {
   // - backtick quoted (using `` to escape)
@@ -22608,7 +22613,7 @@ const oR = [
   // Oracle q'' strings: q'<text>' q'|text|' ...
   "q''": mA()
 }, Mt = (T) => typeof T == "string" ? nt[T] : "regex" in T ? T.regex : dA(T) + nt[T.quote], pA = (T) => z(T.map((e) => "regex" in e ? e.regex : Mt(e)).join("|")), Ut = (T) => T.map(Mt).join("|"), Rt = (T) => z(Ut(T)), fA = (T = {}) => z(mt(T)), mt = ({ first: T, rest: e, dashes: E, allowFirstCharNumber: t } = {}) => {
-  const s = "\\p{Alphabetic}\\p{Mark}_", n = "\\p{Decimal_Number}", R = K(T ?? ""), A = K(e ?? ""), i = t ? `[${s}${n}${R}][${s}${n}${A}]*` : `[${s}${R}][${s}${n}${A}]*`;
+  const s = "\\p{Alphabetic}\\p{Mark}_", n = "\\p{Decimal_Number}", R = v(T ?? ""), A = v(e ?? ""), i = t ? `[${s}${n}${R}][${s}${n}${A}]*` : `[${s}${R}][${s}${n}${A}]*`;
   return E ? PA(i) : i;
 };
 function pt(T, e) {
@@ -22723,125 +22728,125 @@ class HA {
     var E, t, s;
     return this.validRules([
       {
-        type: c.DISABLE_COMMENT,
+        type: D.DISABLE_COMMENT,
         regex: /(\/\* *sql-formatter-disable *\*\/[\s\S]*?(?:\/\* *sql-formatter-enable *\*\/|$))/uy
       },
       {
-        type: c.BLOCK_COMMENT,
+        type: D.BLOCK_COMMENT,
         regex: e.nestedBlockComments ? new FA() : /(\/\*[^]*?\*\/)/uy
       },
       {
-        type: c.LINE_COMMENT,
+        type: D.LINE_COMMENT,
         regex: MA((E = e.lineCommentTypes) !== null && E !== void 0 ? E : ["--"])
       },
       {
-        type: c.QUOTED_IDENTIFIER,
+        type: D.QUOTED_IDENTIFIER,
         regex: Rt(e.identTypes)
       },
       {
-        type: c.NUMBER,
+        type: D.NUMBER,
         regex: e.underscoresInNumbers ? /(?:0x[0-9a-fA-F_]+|0b[01_]+|(?:-\s*)?(?:[0-9_]*\.[0-9_]+|[0-9_]+(?:\.[0-9_]*)?)(?:[eE][-+]?[0-9_]+(?:\.[0-9_]+)?)?)(?![\w\p{Alphabetic}])/uy : /(?:0x[0-9a-fA-F]+|0b[01]+|(?:-\s*)?(?:[0-9]*\.[0-9]+|[0-9]+(?:\.[0-9]*)?)(?:[eE][-+]?[0-9]+(?:\.[0-9]+)?)?)(?![\w\p{Alphabetic}])/uy
       },
       // RESERVED_KEYWORD_PHRASE and RESERVED_DATA_TYPE_PHRASE  is matched before all other keyword tokens
       // to e.g. prioritize matching "TIMESTAMP WITH TIME ZONE" phrase over "WITH" clause.
       {
-        type: c.RESERVED_KEYWORD_PHRASE,
+        type: D.RESERVED_KEYWORD_PHRASE,
         regex: J((t = e.reservedKeywordPhrases) !== null && t !== void 0 ? t : [], e.identChars),
         text: Y
       },
       {
-        type: c.RESERVED_DATA_TYPE_PHRASE,
+        type: D.RESERVED_DATA_TYPE_PHRASE,
         regex: J((s = e.reservedDataTypePhrases) !== null && s !== void 0 ? s : [], e.identChars),
         text: Y
       },
       {
-        type: c.CASE,
+        type: D.CASE,
         regex: /CASE\b/iuy,
         text: Y
       },
       {
-        type: c.END,
+        type: D.END,
         regex: /END\b/iuy,
         text: Y
       },
       {
-        type: c.BETWEEN,
+        type: D.BETWEEN,
         regex: /BETWEEN\b/iuy,
         text: Y
       },
       {
-        type: c.LIMIT,
+        type: D.LIMIT,
         regex: e.reservedClauses.includes("LIMIT") ? /LIMIT\b/iuy : void 0,
         text: Y
       },
       {
-        type: c.RESERVED_CLAUSE,
+        type: D.RESERVED_CLAUSE,
         regex: J(e.reservedClauses, e.identChars),
         text: Y
       },
       {
-        type: c.RESERVED_SELECT,
+        type: D.RESERVED_SELECT,
         regex: J(e.reservedSelect, e.identChars),
         text: Y
       },
       {
-        type: c.RESERVED_SET_OPERATION,
+        type: D.RESERVED_SET_OPERATION,
         regex: J(e.reservedSetOperations, e.identChars),
         text: Y
       },
       {
-        type: c.WHEN,
+        type: D.WHEN,
         regex: /WHEN\b/iuy,
         text: Y
       },
       {
-        type: c.ELSE,
+        type: D.ELSE,
         regex: /ELSE\b/iuy,
         text: Y
       },
       {
-        type: c.THEN,
+        type: D.THEN,
         regex: /THEN\b/iuy,
         text: Y
       },
       {
-        type: c.RESERVED_JOIN,
+        type: D.RESERVED_JOIN,
         regex: J(e.reservedJoins, e.identChars),
         text: Y
       },
       {
-        type: c.AND,
+        type: D.AND,
         regex: /AND\b/iuy,
         text: Y
       },
       {
-        type: c.OR,
+        type: D.OR,
         regex: /OR\b/iuy,
         text: Y
       },
       {
-        type: c.XOR,
+        type: D.XOR,
         regex: e.supportsXor ? /XOR\b/iuy : void 0,
         text: Y
       },
       ...e.operatorKeyword ? [
         {
-          type: c.OPERATOR,
+          type: D.OPERATOR,
           regex: /OPERATOR *\([^)]+\)/iuy
         }
       ] : [],
       {
-        type: c.RESERVED_FUNCTION_NAME,
+        type: D.RESERVED_FUNCTION_NAME,
         regex: J(e.reservedFunctionNames, e.identChars),
         text: Y
       },
       {
-        type: c.RESERVED_DATA_TYPE,
+        type: D.RESERVED_DATA_TYPE,
         regex: J(e.reservedDataTypes, e.identChars),
         text: Y
       },
       {
-        type: c.RESERVED_KEYWORD,
+        type: D.RESERVED_KEYWORD,
         regex: J(e.reservedKeywords, e.identChars),
         text: Y
       }
@@ -22853,26 +22858,26 @@ class HA {
     var E, t;
     return this.validRules([
       {
-        type: c.VARIABLE,
+        type: D.VARIABLE,
         regex: e.variableTypes ? pA(e.variableTypes) : void 0
       },
-      { type: c.STRING, regex: Rt(e.stringTypes) },
+      { type: D.STRING, regex: Rt(e.stringTypes) },
       {
-        type: c.IDENTIFIER,
+        type: D.IDENTIFIER,
         regex: fA(e.identChars)
       },
-      { type: c.DELIMITER, regex: /[;]/uy },
-      { type: c.COMMA, regex: /[,]/y },
+      { type: D.DELIMITER, regex: /[;]/uy },
+      { type: D.COMMA, regex: /[,]/y },
       {
-        type: c.OPEN_PAREN,
+        type: D.OPEN_PAREN,
         regex: Tt("open", e.extraParens)
       },
       {
-        type: c.CLOSE_PAREN,
+        type: D.CLOSE_PAREN,
         regex: Tt("close", e.extraParens)
       },
       {
-        type: c.OPERATOR,
+        type: D.OPERATOR,
         regex: st([
           // standard operators
           "+",
@@ -22888,9 +22893,9 @@ class HA {
           ...(E = e.operators) !== null && E !== void 0 ? E : []
         ])
       },
-      { type: c.ASTERISK, regex: /[*]/uy },
+      { type: D.ASTERISK, regex: /[*]/uy },
       {
-        type: c.PROPERTY_ACCESS_OPERATOR,
+        type: D.PROPERTY_ACCESS_OPERATOR,
         regex: st([".", ...(t = e.propertyAccessOperators) !== null && t !== void 0 ? t : []])
       }
     ]);
@@ -22908,31 +22913,31 @@ class HA {
     };
     return this.validRules([
       {
-        type: c.NAMED_PARAMETER,
+        type: D.NAMED_PARAMETER,
         regex: sE(i.named, mt(e.paramChars || e.identChars)),
         key: (S) => S.slice(1)
       },
       {
-        type: c.QUOTED_PARAMETER,
+        type: D.QUOTED_PARAMETER,
         regex: sE(i.quoted, Ut(e.identTypes)),
-        key: (S) => (({ tokenKey: N, quoteChar: O }) => N.replace(new RegExp(K("\\" + O), "gu"), O))({
+        key: (S) => (({ tokenKey: N, quoteChar: O }) => N.replace(new RegExp(v("\\" + O), "gu"), O))({
           tokenKey: S.slice(2, -1),
           quoteChar: S.slice(-1)
         })
       },
       {
-        type: c.NUMBERED_PARAMETER,
+        type: D.NUMBERED_PARAMETER,
         regex: sE(i.numbered, "[0-9]+"),
         key: (S) => S.slice(1)
       },
       {
-        type: c.POSITIONAL_PARAMETER,
+        type: D.POSITIONAL_PARAMETER,
         regex: i.positional ? /[?]/y : void 0
       },
       ...i.custom.map((S) => {
         var N;
         return {
-          type: c.CUSTOM_PARAMETER,
+          type: D.CUSTOM_PARAMETER,
           regex: z(S.regex),
           key: (N = S.key) !== null && N !== void 0 ? N : ((O) => O)
         };
@@ -23028,29 +23033,29 @@ function wA() {
           var o = N[a];
           if (o.isComplete) {
             if (o.finish(), o.data !== R.fail) {
-              for (var L = o.wantedBy, u = L.length; u--; ) {
-                var C = L[u];
+              for (var L = o.wantedBy, l = L.length; l--; ) {
+                var C = L[l];
                 this.complete(C, o);
               }
               if (o.reference === this.index) {
-                var l = o.rule.name;
-                (this.completed[l] = this.completed[l] || []).push(o);
+                var c = o.rule.name;
+                (this.completed[c] = this.completed[c] || []).push(o);
               }
             }
           } else {
-            var l = o.rule.symbols[o.dot];
-            if (typeof l != "string") {
+            var c = o.rule.symbols[o.dot];
+            if (typeof c != "string") {
               this.scannable.push(o);
               continue;
             }
-            if (O[l]) {
-              if (O[l].push(o), I.hasOwnProperty(l))
-                for (var P = I[l], u = 0; u < P.length; u++) {
-                  var d = P[u];
-                  this.complete(o, d);
+            if (O[c]) {
+              if (O[c].push(o), I.hasOwnProperty(c))
+                for (var M = I[c], l = 0; l < M.length; l++) {
+                  var P = M[l];
+                  this.complete(o, P);
                 }
             } else
-              O[l] = [o], this.predict(l);
+              O[c] = [o], this.predict(c);
           }
         }
       }, t.prototype.predict = function(S) {
@@ -23106,17 +23111,17 @@ function wA() {
           var o = this.index - this.lastLineBreak, L = String(this.line).length;
           return N += " at line " + this.line + " col " + o + `:
 
-`, N += I.map(function(C, l) {
-            return u(this.line - I.length + l + 1, L) + " " + C;
+`, N += I.map(function(C, c) {
+            return l(this.line - I.length + c + 1, L) + " " + C;
           }, this).join(`
 `), N += `
-` + u("", L + o) + `^
+` + l("", L + o) + `^
 `, N;
         } else
           return N + " at index " + (this.index - 1);
-        function u(C, l) {
-          var P = String(C);
-          return Array(l - P.length + 1).join(" ") + P;
+        function l(C, c) {
+          var M = String(C);
+          return Array(c - M.length + 1).join(" ") + M;
         }
       };
       function R(S, N, O) {
@@ -23151,11 +23156,11 @@ function wA() {
           this.options.keepHistory || delete this.table[this.current - 1];
           var o = this.current + 1, L = new t(this.grammar, o);
           this.table.push(L);
-          for (var u = O.text !== void 0 ? O.text : O.value, C = N.constructor === n ? O.value : O, l = a.scannable, P = l.length; P--; ) {
-            var d = l[P], M = d.rule.symbols[d.dot];
-            if (M.test ? M.test(C) : M.type ? M.type === O.type : M.literal === u) {
-              var p = d.nextState({ data: C, token: O, isToken: !0, reference: o - 1 });
-              L.states.push(p);
+          for (var l = O.text !== void 0 ? O.text : O.value, C = N.constructor === n ? O.value : O, c = a.scannable, M = c.length; M--; ) {
+            var P = c[M], d = P.rule.symbols[P.dot];
+            if (d.test ? d.test(C) : d.type ? d.type === O.type : d.literal === l) {
+              var m = P.nextState({ data: C, token: O, isToken: !0, reference: o - 1 });
+              L.states.push(m);
             }
           }
           if (L.process(), L.states.length === 0) {
@@ -23174,8 +23179,8 @@ function wA() {
       }, R.prototype.reportErrorCommon = function(S, N) {
         var O = [];
         O.push(S);
-        var I = this.table.length - 2, a = this.table[I], o = a.states.filter(function(u) {
-          var C = u.rule.symbols[u.dot];
+        var I = this.table.length - 2, a = this.table[I], o = a.states.filter(function(l) {
+          var C = l.rule.symbols[l.dot];
           return C && typeof C != "string";
         });
         if (o.length === 0)
@@ -23184,12 +23189,12 @@ function wA() {
         else {
           O.push("Unexpected " + N + `. Instead, I was expecting to see one of the following:
 `);
-          var L = o.map(function(u) {
-            return this.buildFirstStateStack(u, []) || [u];
+          var L = o.map(function(l) {
+            return this.buildFirstStateStack(l, []) || [l];
           }, this);
-          L.forEach(function(u) {
-            var C = u[0], l = C.rule.symbols[C.dot], P = this.getSymbolDisplay(l);
-            O.push("A " + P + " based on:"), this.displayStateStack(u, O);
+          L.forEach(function(l) {
+            var C = l[0], c = C.rule.symbols[C.dot], M = this.getSymbolDisplay(c);
+            O.push("A " + M + " based on:"), this.displayStateStack(l, O);
           }, this);
         }
         return O.push(""), O.join(`
@@ -23274,39 +23279,39 @@ function vA(T) {
 const xA = (T, e, E) => {
   if (Pt(T.type)) {
     const t = ZA(E, e);
-    if (t && t.type === c.PROPERTY_ACCESS_OPERATOR)
-      return Object.assign(Object.assign({}, T), { type: c.IDENTIFIER, text: T.raw });
+    if (t && t.type === D.PROPERTY_ACCESS_OPERATOR)
+      return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
     const s = Ae(E, e);
-    if (s && s.type === c.PROPERTY_ACCESS_OPERATOR)
-      return Object.assign(Object.assign({}, T), { type: c.IDENTIFIER, text: T.raw });
+    if (s && s.type === D.PROPERTY_ACCESS_OPERATOR)
+      return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
 }, JA = (T, e, E) => {
-  if (T.type === c.RESERVED_FUNCTION_NAME) {
+  if (T.type === D.RESERVED_FUNCTION_NAME) {
     const t = Ae(E, e);
     if (!t || !ft(t))
-      return Object.assign(Object.assign({}, T), { type: c.IDENTIFIER, text: T.raw });
+      return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
 }, QA = (T, e, E) => {
-  if (T.type === c.RESERVED_DATA_TYPE) {
+  if (T.type === D.RESERVED_DATA_TYPE) {
     const t = Ae(E, e);
     if (t && ft(t))
-      return Object.assign(Object.assign({}, T), { type: c.RESERVED_PARAMETERIZED_DATA_TYPE });
+      return Object.assign(Object.assign({}, T), { type: D.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return T;
 }, jA = (T, e, E) => {
-  if (T.type === c.IDENTIFIER) {
+  if (T.type === D.IDENTIFIER) {
     const t = Ae(E, e);
     if (t && ht(t))
-      return Object.assign(Object.assign({}, T), { type: c.ARRAY_IDENTIFIER });
+      return Object.assign(Object.assign({}, T), { type: D.ARRAY_IDENTIFIER });
   }
   return T;
 }, kA = (T, e, E) => {
-  if (T.type === c.RESERVED_DATA_TYPE) {
+  if (T.type === D.RESERVED_DATA_TYPE) {
     const t = Ae(E, e);
     if (t && ht(t))
-      return Object.assign(Object.assign({}, T), { type: c.ARRAY_KEYWORD });
+      return Object.assign(Object.assign({}, T), { type: D.ARRAY_KEYWORD });
   }
   return T;
 }, ZA = (T, e) => Ae(T, e, -1), Ae = (T, e, E = 1) => {
@@ -23314,7 +23319,7 @@ const xA = (T, e, E) => {
   for (; T[e + t * E] && qA(T[e + t * E]); )
     t++;
   return T[e + t * E];
-}, ft = (T) => T.type === c.OPEN_PAREN && T.text === "(", ht = (T) => T.type === c.OPEN_PAREN && T.text === "[", qA = (T) => T.type === c.BLOCK_COMMENT || T.type === c.LINE_COMMENT;
+}, ft = (T) => T.type === D.OPEN_PAREN && T.text === "(", ht = (T) => T.type === D.OPEN_PAREN && T.text === "[", qA = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
 class Gt {
   constructor(e) {
     this.tokenize = e, this.index = 0, this.tokens = [], this.input = "";
@@ -23332,7 +23337,7 @@ class Gt {
     return `Parse error at token: ${e.text} at line ${E} column ${t}`;
   }
   has(e) {
-    return e in c;
+    return e in D;
   }
 }
 var U;
@@ -23342,7 +23347,7 @@ var U;
 function nE(T) {
   return T[0];
 }
-const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
+const p = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
   type: U.keyword,
   tokenType: T.type,
   text: T.text,
@@ -23362,7 +23367,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
   }
   return T;
 }, er = {
-  Lexer: m,
+  Lexer: p,
   ParserRules: [
     { name: "main$ebnf$1", symbols: [] },
     { name: "main$ebnf$1", symbols: ["main$ebnf$1", "statement"], postprocess: (T) => T[0].concat([T[1]]) },
@@ -23374,15 +23379,15 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
         return e && !e.hasSemicolon ? e.children.length > 0 ? T : T.slice(0, -1) : T;
       }
     },
-    { name: "statement$subexpression$1", symbols: [m.has("DELIMITER") ? { type: "DELIMITER" } : DELIMITER] },
-    { name: "statement$subexpression$1", symbols: [m.has("EOF") ? { type: "EOF" } : EOF] },
+    { name: "statement$subexpression$1", symbols: [p.has("DELIMITER") ? { type: "DELIMITER" } : DELIMITER] },
+    { name: "statement$subexpression$1", symbols: [p.has("EOF") ? { type: "EOF" } : EOF] },
     {
       name: "statement",
       symbols: ["expressions_or_clauses", "statement$subexpression$1"],
       postprocess: ([T, [e]]) => ({
         type: U.statement,
         children: T,
-        hasSemicolon: e.type === c.DELIMITER
+        hasSemicolon: e.type === D.DELIMITER
       })
     },
     { name: "expressions_or_clauses$ebnf$1", symbols: [] },
@@ -23401,12 +23406,12 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     { name: "clause", symbols: ["clause$subexpression$1"], postprocess: j },
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["free_form_sql"] },
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1$ebnf$1", "free_form_sql"], postprocess: (T) => T[0].concat([T[1]]) },
-    { name: "limit_clause$ebnf$1$subexpression$1", symbols: [m.has("COMMA") ? { type: "COMMA" } : COMMA, "limit_clause$ebnf$1$subexpression$1$ebnf$1"] },
+    { name: "limit_clause$ebnf$1$subexpression$1", symbols: [p.has("COMMA") ? { type: "COMMA" } : COMMA, "limit_clause$ebnf$1$subexpression$1$ebnf$1"] },
     { name: "limit_clause$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1"], postprocess: nE },
     { name: "limit_clause$ebnf$1", symbols: [], postprocess: () => null },
     {
       name: "limit_clause",
-      symbols: [m.has("LIMIT") ? { type: "LIMIT" } : LIMIT, "_", "expression_chain_", "limit_clause$ebnf$1"],
+      symbols: [p.has("LIMIT") ? { type: "LIMIT" } : LIMIT, "_", "expression_chain_", "limit_clause$ebnf$1"],
       postprocess: ([T, e, E, t]) => {
         if (t) {
           const [s, n] = t;
@@ -23432,7 +23437,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     { name: "select_clause$subexpression$1", symbols: ["asteriskless_free_form_sql", "select_clause$subexpression$1$ebnf$2"] },
     {
       name: "select_clause",
-      symbols: [m.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT, "select_clause$subexpression$1"],
+      symbols: [p.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT, "select_clause$subexpression$1"],
       postprocess: ([T, [e, E]]) => ({
         type: U.clause,
         nameKw: g(T),
@@ -23441,7 +23446,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     },
     {
       name: "select_clause",
-      symbols: [m.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT],
+      symbols: [p.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT],
       postprocess: ([T]) => ({
         type: U.clause,
         nameKw: g(T),
@@ -23450,14 +23455,14 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     },
     {
       name: "all_columns_asterisk",
-      symbols: [m.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK],
+      symbols: [p.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK],
       postprocess: () => ({ type: U.all_columns_asterisk })
     },
     { name: "other_clause$ebnf$1", symbols: [] },
     { name: "other_clause$ebnf$1", symbols: ["other_clause$ebnf$1", "free_form_sql"], postprocess: (T) => T[0].concat([T[1]]) },
     {
       name: "other_clause",
-      symbols: [m.has("RESERVED_CLAUSE") ? { type: "RESERVED_CLAUSE" } : RESERVED_CLAUSE, "other_clause$ebnf$1"],
+      symbols: [p.has("RESERVED_CLAUSE") ? { type: "RESERVED_CLAUSE" } : RESERVED_CLAUSE, "other_clause$ebnf$1"],
       postprocess: ([T, e]) => ({
         type: U.clause,
         nameKw: g(T),
@@ -23468,7 +23473,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     { name: "set_operation$ebnf$1", symbols: ["set_operation$ebnf$1", "free_form_sql"], postprocess: (T) => T[0].concat([T[1]]) },
     {
       name: "set_operation",
-      symbols: [m.has("RESERVED_SET_OPERATION") ? { type: "RESERVED_SET_OPERATION" } : RESERVED_SET_OPERATION, "set_operation$ebnf$1"],
+      symbols: [p.has("RESERVED_SET_OPERATION") ? { type: "RESERVED_SET_OPERATION" } : RESERVED_SET_OPERATION, "set_operation$ebnf$1"],
       postprocess: ([T, e]) => ({
         type: U.set_operation,
         nameKw: g(T),
@@ -23541,7 +23546,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     { name: "atomic_expression", symbols: ["atomic_expression$subexpression$1"], postprocess: j },
     {
       name: "array_subscript",
-      symbols: [m.has("ARRAY_IDENTIFIER") ? { type: "ARRAY_IDENTIFIER" } : ARRAY_IDENTIFIER, "_", "square_brackets"],
+      symbols: [p.has("ARRAY_IDENTIFIER") ? { type: "ARRAY_IDENTIFIER" } : ARRAY_IDENTIFIER, "_", "square_brackets"],
       postprocess: ([T, e, E]) => ({
         type: U.array_subscript,
         array: y({ type: U.identifier, quoted: !1, text: T.text }, { trailing: e }),
@@ -23550,7 +23555,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     },
     {
       name: "array_subscript",
-      symbols: [m.has("ARRAY_KEYWORD") ? { type: "ARRAY_KEYWORD" } : ARRAY_KEYWORD, "_", "square_brackets"],
+      symbols: [p.has("ARRAY_KEYWORD") ? { type: "ARRAY_KEYWORD" } : ARRAY_KEYWORD, "_", "square_brackets"],
       postprocess: ([T, e, E]) => ({
         type: U.array_subscript,
         array: y(g(T), { trailing: e }),
@@ -23559,7 +23564,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     },
     {
       name: "function_call",
-      symbols: [m.has("RESERVED_FUNCTION_NAME") ? { type: "RESERVED_FUNCTION_NAME" } : RESERVED_FUNCTION_NAME, "_", "parenthesis"],
+      symbols: [p.has("RESERVED_FUNCTION_NAME") ? { type: "RESERVED_FUNCTION_NAME" } : RESERVED_FUNCTION_NAME, "_", "parenthesis"],
       postprocess: ([T, e, E]) => ({
         type: U.function_call,
         nameKw: y(g(T), { trailing: e }),
@@ -23606,7 +23611,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     { name: "property_access$subexpression$1", symbols: ["parameter"] },
     {
       name: "property_access",
-      symbols: ["atomic_expression", "_", m.has("PROPERTY_ACCESS_OPERATOR") ? { type: "PROPERTY_ACCESS_OPERATOR" } : PROPERTY_ACCESS_OPERATOR, "_", "property_access$subexpression$1"],
+      symbols: ["atomic_expression", "_", p.has("PROPERTY_ACCESS_OPERATOR") ? { type: "PROPERTY_ACCESS_OPERATOR" } : PROPERTY_ACCESS_OPERATOR, "_", "property_access$subexpression$1"],
       postprocess: (
         // Allowing property to be <array_subscript> is currently a hack.
         // A better way would be to allow <property_access> on the left side of array_subscript,
@@ -23622,7 +23627,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     },
     {
       name: "between_predicate",
-      symbols: [m.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", m.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
+      symbols: [p.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", p.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
       postprocess: ([T, e, E, t, s, n, R]) => ({
         type: U.between_predicate,
         betweenKw: g(T),
@@ -23637,7 +23642,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     { name: "case_expression$ebnf$2", symbols: ["case_expression$ebnf$2", "case_clause"], postprocess: (T) => T[0].concat([T[1]]) },
     {
       name: "case_expression",
-      symbols: [m.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", m.has("END") ? { type: "END" } : END],
+      symbols: [p.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", p.has("END") ? { type: "END" } : END],
       postprocess: ([T, e, E, t, s]) => ({
         type: U.case_expression,
         caseKw: y(g(T), { trailing: e }),
@@ -23648,7 +23653,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     },
     {
       name: "case_clause",
-      symbols: [m.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", m.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
+      symbols: [p.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", p.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
       postprocess: ([T, e, E, t, s, n]) => ({
         type: U.case_when,
         whenKw: y(g(T), { trailing: e }),
@@ -23659,42 +23664,42 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     },
     {
       name: "case_clause",
-      symbols: [m.has("ELSE") ? { type: "ELSE" } : ELSE, "_", "expression_chain_"],
+      symbols: [p.has("ELSE") ? { type: "ELSE" } : ELSE, "_", "expression_chain_"],
       postprocess: ([T, e, E]) => ({
         type: U.case_else,
         elseKw: y(g(T), { trailing: e }),
         result: E
       })
     },
-    { name: "comma$subexpression$1", symbols: [m.has("COMMA") ? { type: "COMMA" } : COMMA] },
+    { name: "comma$subexpression$1", symbols: [p.has("COMMA") ? { type: "COMMA" } : COMMA] },
     { name: "comma", symbols: ["comma$subexpression$1"], postprocess: ([[T]]) => ({ type: U.comma }) },
-    { name: "asterisk$subexpression$1", symbols: [m.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK] },
+    { name: "asterisk$subexpression$1", symbols: [p.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK] },
     { name: "asterisk", symbols: ["asterisk$subexpression$1"], postprocess: ([[T]]) => ({ type: U.operator, text: T.text }) },
-    { name: "operator$subexpression$1", symbols: [m.has("OPERATOR") ? { type: "OPERATOR" } : OPERATOR] },
+    { name: "operator$subexpression$1", symbols: [p.has("OPERATOR") ? { type: "OPERATOR" } : OPERATOR] },
     { name: "operator", symbols: ["operator$subexpression$1"], postprocess: ([[T]]) => ({ type: U.operator, text: T.text }) },
-    { name: "identifier$subexpression$1", symbols: [m.has("IDENTIFIER") ? { type: "IDENTIFIER" } : IDENTIFIER] },
-    { name: "identifier$subexpression$1", symbols: [m.has("QUOTED_IDENTIFIER") ? { type: "QUOTED_IDENTIFIER" } : QUOTED_IDENTIFIER] },
-    { name: "identifier$subexpression$1", symbols: [m.has("VARIABLE") ? { type: "VARIABLE" } : VARIABLE] },
+    { name: "identifier$subexpression$1", symbols: [p.has("IDENTIFIER") ? { type: "IDENTIFIER" } : IDENTIFIER] },
+    { name: "identifier$subexpression$1", symbols: [p.has("QUOTED_IDENTIFIER") ? { type: "QUOTED_IDENTIFIER" } : QUOTED_IDENTIFIER] },
+    { name: "identifier$subexpression$1", symbols: [p.has("VARIABLE") ? { type: "VARIABLE" } : VARIABLE] },
     { name: "identifier", symbols: ["identifier$subexpression$1"], postprocess: ([[T]]) => ({ type: U.identifier, quoted: T.type !== "IDENTIFIER", text: T.text }) },
-    { name: "parameter$subexpression$1", symbols: [m.has("NAMED_PARAMETER") ? { type: "NAMED_PARAMETER" } : NAMED_PARAMETER] },
-    { name: "parameter$subexpression$1", symbols: [m.has("QUOTED_PARAMETER") ? { type: "QUOTED_PARAMETER" } : QUOTED_PARAMETER] },
-    { name: "parameter$subexpression$1", symbols: [m.has("NUMBERED_PARAMETER") ? { type: "NUMBERED_PARAMETER" } : NUMBERED_PARAMETER] },
-    { name: "parameter$subexpression$1", symbols: [m.has("POSITIONAL_PARAMETER") ? { type: "POSITIONAL_PARAMETER" } : POSITIONAL_PARAMETER] },
-    { name: "parameter$subexpression$1", symbols: [m.has("CUSTOM_PARAMETER") ? { type: "CUSTOM_PARAMETER" } : CUSTOM_PARAMETER] },
+    { name: "parameter$subexpression$1", symbols: [p.has("NAMED_PARAMETER") ? { type: "NAMED_PARAMETER" } : NAMED_PARAMETER] },
+    { name: "parameter$subexpression$1", symbols: [p.has("QUOTED_PARAMETER") ? { type: "QUOTED_PARAMETER" } : QUOTED_PARAMETER] },
+    { name: "parameter$subexpression$1", symbols: [p.has("NUMBERED_PARAMETER") ? { type: "NUMBERED_PARAMETER" } : NUMBERED_PARAMETER] },
+    { name: "parameter$subexpression$1", symbols: [p.has("POSITIONAL_PARAMETER") ? { type: "POSITIONAL_PARAMETER" } : POSITIONAL_PARAMETER] },
+    { name: "parameter$subexpression$1", symbols: [p.has("CUSTOM_PARAMETER") ? { type: "CUSTOM_PARAMETER" } : CUSTOM_PARAMETER] },
     { name: "parameter", symbols: ["parameter$subexpression$1"], postprocess: ([[T]]) => ({ type: U.parameter, key: T.key, text: T.text }) },
-    { name: "literal$subexpression$1", symbols: [m.has("NUMBER") ? { type: "NUMBER" } : NUMBER] },
-    { name: "literal$subexpression$1", symbols: [m.has("STRING") ? { type: "STRING" } : STRING] },
+    { name: "literal$subexpression$1", symbols: [p.has("NUMBER") ? { type: "NUMBER" } : NUMBER] },
+    { name: "literal$subexpression$1", symbols: [p.has("STRING") ? { type: "STRING" } : STRING] },
     { name: "literal", symbols: ["literal$subexpression$1"], postprocess: ([[T]]) => ({ type: U.literal, text: T.text }) },
-    { name: "keyword$subexpression$1", symbols: [m.has("RESERVED_KEYWORD") ? { type: "RESERVED_KEYWORD" } : RESERVED_KEYWORD] },
-    { name: "keyword$subexpression$1", symbols: [m.has("RESERVED_KEYWORD_PHRASE") ? { type: "RESERVED_KEYWORD_PHRASE" } : RESERVED_KEYWORD_PHRASE] },
-    { name: "keyword$subexpression$1", symbols: [m.has("RESERVED_JOIN") ? { type: "RESERVED_JOIN" } : RESERVED_JOIN] },
+    { name: "keyword$subexpression$1", symbols: [p.has("RESERVED_KEYWORD") ? { type: "RESERVED_KEYWORD" } : RESERVED_KEYWORD] },
+    { name: "keyword$subexpression$1", symbols: [p.has("RESERVED_KEYWORD_PHRASE") ? { type: "RESERVED_KEYWORD_PHRASE" } : RESERVED_KEYWORD_PHRASE] },
+    { name: "keyword$subexpression$1", symbols: [p.has("RESERVED_JOIN") ? { type: "RESERVED_JOIN" } : RESERVED_JOIN] },
     {
       name: "keyword",
       symbols: ["keyword$subexpression$1"],
       postprocess: ([[T]]) => g(T)
     },
-    { name: "data_type$subexpression$1", symbols: [m.has("RESERVED_DATA_TYPE") ? { type: "RESERVED_DATA_TYPE" } : RESERVED_DATA_TYPE] },
-    { name: "data_type$subexpression$1", symbols: [m.has("RESERVED_DATA_TYPE_PHRASE") ? { type: "RESERVED_DATA_TYPE_PHRASE" } : RESERVED_DATA_TYPE_PHRASE] },
+    { name: "data_type$subexpression$1", symbols: [p.has("RESERVED_DATA_TYPE") ? { type: "RESERVED_DATA_TYPE" } : RESERVED_DATA_TYPE] },
+    { name: "data_type$subexpression$1", symbols: [p.has("RESERVED_DATA_TYPE_PHRASE") ? { type: "RESERVED_DATA_TYPE_PHRASE" } : RESERVED_DATA_TYPE_PHRASE] },
     {
       name: "data_type",
       symbols: ["data_type$subexpression$1"],
@@ -23702,25 +23707,25 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     },
     {
       name: "data_type",
-      symbols: [m.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
+      symbols: [p.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
       postprocess: ([T, e, E]) => ({
         type: U.parameterized_data_type,
         dataType: y(St(T), { trailing: e }),
         parenthesis: E
       })
     },
-    { name: "logic_operator$subexpression$1", symbols: [m.has("AND") ? { type: "AND" } : AND] },
-    { name: "logic_operator$subexpression$1", symbols: [m.has("OR") ? { type: "OR" } : OR] },
-    { name: "logic_operator$subexpression$1", symbols: [m.has("XOR") ? { type: "XOR" } : XOR] },
+    { name: "logic_operator$subexpression$1", symbols: [p.has("AND") ? { type: "AND" } : AND] },
+    { name: "logic_operator$subexpression$1", symbols: [p.has("OR") ? { type: "OR" } : OR] },
+    { name: "logic_operator$subexpression$1", symbols: [p.has("XOR") ? { type: "XOR" } : XOR] },
     {
       name: "logic_operator",
       symbols: ["logic_operator$subexpression$1"],
       postprocess: ([[T]]) => g(T)
     },
-    { name: "other_keyword$subexpression$1", symbols: [m.has("WHEN") ? { type: "WHEN" } : WHEN] },
-    { name: "other_keyword$subexpression$1", symbols: [m.has("THEN") ? { type: "THEN" } : THEN] },
-    { name: "other_keyword$subexpression$1", symbols: [m.has("ELSE") ? { type: "ELSE" } : ELSE] },
-    { name: "other_keyword$subexpression$1", symbols: [m.has("END") ? { type: "END" } : END] },
+    { name: "other_keyword$subexpression$1", symbols: [p.has("WHEN") ? { type: "WHEN" } : WHEN] },
+    { name: "other_keyword$subexpression$1", symbols: [p.has("THEN") ? { type: "THEN" } : THEN] },
+    { name: "other_keyword$subexpression$1", symbols: [p.has("ELSE") ? { type: "ELSE" } : ELSE] },
+    { name: "other_keyword$subexpression$1", symbols: [p.has("END") ? { type: "END" } : END] },
     {
       name: "other_keyword",
       symbols: ["other_keyword$subexpression$1"],
@@ -23731,7 +23736,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     { name: "_", symbols: ["_$ebnf$1"], postprocess: ([T]) => T },
     {
       name: "comment",
-      symbols: [m.has("LINE_COMMENT") ? { type: "LINE_COMMENT" } : LINE_COMMENT],
+      symbols: [p.has("LINE_COMMENT") ? { type: "LINE_COMMENT" } : LINE_COMMENT],
       postprocess: ([T]) => ({
         type: U.line_comment,
         text: T.text,
@@ -23740,7 +23745,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     },
     {
       name: "comment",
-      symbols: [m.has("BLOCK_COMMENT") ? { type: "BLOCK_COMMENT" } : BLOCK_COMMENT],
+      symbols: [p.has("BLOCK_COMMENT") ? { type: "BLOCK_COMMENT" } : BLOCK_COMMENT],
       postprocess: ([T]) => ({
         type: U.block_comment,
         text: T.text,
@@ -23749,7 +23754,7 @@ const m = new Gt((T) => []), j = ([[T]]) => T, g = (T) => ({
     },
     {
       name: "comment",
-      symbols: [m.has("DISABLE_COMMENT") ? { type: "DISABLE_COMMENT" } : DISABLE_COMMENT],
+      symbols: [p.has("DISABLE_COMMENT") ? { type: "DISABLE_COMMENT" } : DISABLE_COMMENT],
       postprocess: ([T]) => ({
         type: U.disable_comment,
         text: T.text,
@@ -23776,10 +23781,10 @@ ${JSON.stringify(R, void 0, 2)}`);
     }
   };
 }
-var D;
+var u;
 (function(T) {
   T[T.SPACE = 0] = "SPACE", T[T.NO_SPACE = 1] = "NO_SPACE", T[T.NO_NEWLINE = 2] = "NO_NEWLINE", T[T.NEWLINE = 3] = "NEWLINE", T[T.MANDATORY_NEWLINE = 4] = "MANDATORY_NEWLINE", T[T.INDENT = 5] = "INDENT", T[T.SINGLE_INDENT = 6] = "SINGLE_INDENT";
-})(D = D || (D = {}));
+})(u = u || (u = {}));
 class Bt {
   constructor(e) {
     this.indentation = e, this.items = [];
@@ -23790,26 +23795,26 @@ class Bt {
   add(...e) {
     for (const E of e)
       switch (E) {
-        case D.SPACE:
-          this.items.push(D.SPACE);
+        case u.SPACE:
+          this.items.push(u.SPACE);
           break;
-        case D.NO_SPACE:
+        case u.NO_SPACE:
           this.trimHorizontalWhitespace();
           break;
-        case D.NO_NEWLINE:
+        case u.NO_NEWLINE:
           this.trimWhitespace();
           break;
-        case D.NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(D.NEWLINE);
+        case u.NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(u.NEWLINE);
           break;
-        case D.MANDATORY_NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(D.MANDATORY_NEWLINE);
+        case u.MANDATORY_NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(u.MANDATORY_NEWLINE);
           break;
-        case D.INDENT:
+        case u.INDENT:
           this.addIndentation();
           break;
-        case D.SINGLE_INDENT:
-          this.items.push(D.SINGLE_INDENT);
+        case u.SINGLE_INDENT:
+          this.items.push(u.SINGLE_INDENT);
           break;
         default:
           this.items.push(E);
@@ -23826,10 +23831,10 @@ class Bt {
   addNewline(e) {
     if (this.items.length > 0)
       switch (ie(this.items)) {
-        case D.NEWLINE:
+        case u.NEWLINE:
           this.items.pop(), this.items.push(e);
           break;
-        case D.MANDATORY_NEWLINE:
+        case u.MANDATORY_NEWLINE:
           break;
         default:
           this.items.push(e);
@@ -23838,7 +23843,7 @@ class Bt {
   }
   addIndentation() {
     for (let e = 0; e < this.indentation.getLevel(); e++)
-      this.items.push(D.SINGLE_INDENT);
+      this.items.push(u.SINGLE_INDENT);
   }
   /**
    * Returns the final SQL string.
@@ -23854,20 +23859,20 @@ class Bt {
   }
   itemToString(e) {
     switch (e) {
-      case D.SPACE:
+      case u.SPACE:
         return " ";
-      case D.NEWLINE:
-      case D.MANDATORY_NEWLINE:
+      case u.NEWLINE:
+      case u.MANDATORY_NEWLINE:
         return `
 `;
-      case D.SINGLE_INDENT:
+      case u.SINGLE_INDENT:
         return this.indentation.getSingleIndent();
       default:
         return e;
     }
   }
 }
-const sr = (T) => T === D.SPACE || T === D.SINGLE_INDENT, nr = (T) => T === D.SPACE || T === D.SINGLE_INDENT || T === D.NEWLINE;
+const sr = (T) => T === u.SPACE || T === u.SINGLE_INDENT, nr = (T) => T === u.SPACE || T === u.SINGLE_INDENT || T === u.NEWLINE;
 function Nt(T, e) {
   if (e === "standard")
     return T;
@@ -23875,7 +23880,7 @@ function Nt(T, e) {
   return T.length >= 10 && T.includes(" ") && ([T, ...E] = T.split(" ")), e === "tabularLeft" ? T = T.padEnd(9, " ") : T = T.padStart(9, " "), T + ["", ...E].join(" ");
 }
 function Ot(T) {
-  return yT(T) || T === c.RESERVED_CLAUSE || T === c.RESERVED_SELECT || T === c.RESERVED_SET_OPERATION || T === c.RESERVED_JOIN || T === c.LIMIT;
+  return yT(T) || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.LIMIT;
 }
 const RE = "top-level", Rr = "block-level";
 class Ft {
@@ -23939,9 +23944,9 @@ class Ar extends Bt {
     if (typeof e == "string")
       this.length += e.length, this.trailingSpace = !1;
     else {
-      if (e === D.MANDATORY_NEWLINE || e === D.NEWLINE)
+      if (e === u.MANDATORY_NEWLINE || e === u.NEWLINE)
         throw new OE();
-      e === D.INDENT || e === D.SINGLE_INDENT || e === D.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (e === D.NO_NEWLINE || e === D.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
+      e === u.INDENT || e === u.SINGLE_INDENT || e === u.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (e === u.NO_NEWLINE || e === u.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
     }
   }
 }
@@ -24037,23 +24042,23 @@ class me {
     }), this.formatNode(e.parenthesis);
   }
   formatPropertyAccess(e) {
-    this.formatNode(e.object), this.layout.add(D.NO_SPACE, e.operator), this.formatNode(e.property);
+    this.formatNode(e.object), this.layout.add(u.NO_SPACE, e.operator), this.formatNode(e.property);
   }
   formatParenthesis(e) {
     const E = this.formatInlineExpression(e.children);
-    E ? (this.layout.add(e.openParen), this.layout.add(...E.getLayoutItems()), this.layout.add(D.NO_SPACE, e.closeParen, D.SPACE)) : (this.layout.add(e.openParen, D.NEWLINE), te(this.cfg) ? (this.layout.add(D.INDENT), this.layout = this.formatSubExpression(e.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(D.INDENT), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(D.NEWLINE, D.INDENT, e.closeParen, D.SPACE));
+    E ? (this.layout.add(e.openParen), this.layout.add(...E.getLayoutItems()), this.layout.add(u.NO_SPACE, e.closeParen, u.SPACE)) : (this.layout.add(e.openParen, u.NEWLINE), te(this.cfg) ? (this.layout.add(u.INDENT), this.layout = this.formatSubExpression(e.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(u.INDENT), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(u.NEWLINE, u.INDENT, e.closeParen, u.SPACE));
   }
   formatBetweenPredicate(e) {
-    this.layout.add(this.showKw(e.betweenKw), D.SPACE), this.layout = this.formatSubExpression(e.expr1), this.layout.add(D.NO_SPACE, D.SPACE, this.showNonTabularKw(e.andKw), D.SPACE), this.layout = this.formatSubExpression(e.expr2), this.layout.add(D.SPACE);
+    this.layout.add(this.showKw(e.betweenKw), u.SPACE), this.layout = this.formatSubExpression(e.expr1), this.layout.add(u.NO_SPACE, u.SPACE, this.showNonTabularKw(e.andKw), u.SPACE), this.layout = this.formatSubExpression(e.expr2), this.layout.add(u.SPACE);
   }
   formatCaseExpression(e) {
-    this.formatNode(e.caseKw), this.layout.indentation.increaseBlockLevel(), this.layout = this.formatSubExpression(e.expr), this.layout = this.formatSubExpression(e.clauses), this.layout.indentation.decreaseBlockLevel(), this.layout.add(D.NEWLINE, D.INDENT), this.formatNode(e.endKw);
+    this.formatNode(e.caseKw), this.layout.indentation.increaseBlockLevel(), this.layout = this.formatSubExpression(e.expr), this.layout = this.formatSubExpression(e.clauses), this.layout.indentation.decreaseBlockLevel(), this.layout.add(u.NEWLINE, u.INDENT), this.formatNode(e.endKw);
   }
   formatCaseWhen(e) {
-    this.layout.add(D.NEWLINE, D.INDENT), this.formatNode(e.whenKw), this.layout = this.formatSubExpression(e.condition), this.formatNode(e.thenKw), this.layout = this.formatSubExpression(e.result);
+    this.layout.add(u.NEWLINE, u.INDENT), this.formatNode(e.whenKw), this.layout = this.formatSubExpression(e.condition), this.formatNode(e.thenKw), this.layout = this.formatSubExpression(e.result);
   }
   formatCaseElse(e) {
-    this.layout.add(D.NEWLINE, D.INDENT), this.formatNode(e.elseKw), this.layout = this.formatSubExpression(e.result);
+    this.layout.add(u.NEWLINE, u.INDENT), this.formatNode(e.elseKw), this.layout = this.formatSubExpression(e.result);
   }
   formatClause(e) {
     this.isOnelineClause(e) ? this.formatClauseInOnelineStyle(e) : te(this.cfg) ? this.formatClauseInTabularStyle(e) : this.formatClauseInIndentedStyle(e);
@@ -24062,39 +24067,39 @@ class me {
     return te(this.cfg) ? this.dialectCfg.tabularOnelineClauses[e.nameKw.text] : this.dialectCfg.onelineClauses[e.nameKw.text];
   }
   formatClauseInIndentedStyle(e) {
-    this.layout.add(D.NEWLINE, D.INDENT, this.showKw(e.nameKw), D.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(D.INDENT), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseTopLevel();
+    this.layout.add(u.NEWLINE, u.INDENT, this.showKw(e.nameKw), u.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(u.INDENT), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseTopLevel();
   }
   formatClauseInOnelineStyle(e) {
-    this.layout.add(D.NEWLINE, D.INDENT, this.showKw(e.nameKw), D.SPACE), this.layout = this.formatSubExpression(e.children);
+    this.layout.add(u.NEWLINE, u.INDENT, this.showKw(e.nameKw), u.SPACE), this.layout = this.formatSubExpression(e.children);
   }
   formatClauseInTabularStyle(e) {
-    this.layout.add(D.NEWLINE, D.INDENT, this.showKw(e.nameKw), D.SPACE), this.layout.indentation.increaseTopLevel(), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseTopLevel();
+    this.layout.add(u.NEWLINE, u.INDENT, this.showKw(e.nameKw), u.SPACE), this.layout.indentation.increaseTopLevel(), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseTopLevel();
   }
   formatSetOperation(e) {
-    this.layout.add(D.NEWLINE, D.INDENT, this.showKw(e.nameKw), D.NEWLINE), this.layout.add(D.INDENT), this.layout = this.formatSubExpression(e.children);
+    this.layout.add(u.NEWLINE, u.INDENT, this.showKw(e.nameKw), u.NEWLINE), this.layout.add(u.INDENT), this.layout = this.formatSubExpression(e.children);
   }
   formatLimitClause(e) {
     this.withComments(e.limitKw, () => {
-      this.layout.add(D.NEWLINE, D.INDENT, this.showKw(e.limitKw));
-    }), this.layout.indentation.increaseTopLevel(), te(this.cfg) ? this.layout.add(D.SPACE) : this.layout.add(D.NEWLINE, D.INDENT), e.offset ? (this.layout = this.formatSubExpression(e.offset), this.layout.add(D.NO_SPACE, ",", D.SPACE), this.layout = this.formatSubExpression(e.count)) : this.layout = this.formatSubExpression(e.count), this.layout.indentation.decreaseTopLevel();
+      this.layout.add(u.NEWLINE, u.INDENT, this.showKw(e.limitKw));
+    }), this.layout.indentation.increaseTopLevel(), te(this.cfg) ? this.layout.add(u.SPACE) : this.layout.add(u.NEWLINE, u.INDENT), e.offset ? (this.layout = this.formatSubExpression(e.offset), this.layout.add(u.NO_SPACE, ",", u.SPACE), this.layout = this.formatSubExpression(e.count)) : this.layout = this.formatSubExpression(e.count), this.layout.indentation.decreaseTopLevel();
   }
   formatAllColumnsAsterisk(e) {
-    this.layout.add("*", D.SPACE);
+    this.layout.add("*", u.SPACE);
   }
   formatLiteral(e) {
-    this.layout.add(e.text, D.SPACE);
+    this.layout.add(e.text, u.SPACE);
   }
   formatIdentifier(e) {
-    this.layout.add(this.showIdentifier(e), D.SPACE);
+    this.layout.add(this.showIdentifier(e), u.SPACE);
   }
   formatParameter(e) {
-    this.layout.add(this.params.get(e), D.SPACE);
+    this.layout.add(this.params.get(e), u.SPACE);
   }
   formatOperator({ text: e }) {
-    this.cfg.denseOperators || this.dialectCfg.alwaysDenseOperators.includes(e) ? this.layout.add(D.NO_SPACE, e) : e === ":" ? this.layout.add(D.NO_SPACE, e, D.SPACE) : this.layout.add(e, D.SPACE);
+    this.cfg.denseOperators || this.dialectCfg.alwaysDenseOperators.includes(e) ? this.layout.add(u.NO_SPACE, e) : e === ":" ? this.layout.add(u.NO_SPACE, e, u.SPACE) : this.layout.add(e, u.SPACE);
   }
   formatComma(e) {
-    this.inline ? this.layout.add(D.NO_SPACE, ",", D.SPACE) : this.layout.add(D.NO_SPACE, ",", D.NEWLINE, D.INDENT);
+    this.inline ? this.layout.add(u.NO_SPACE, ",", u.SPACE) : this.layout.add(u.NO_SPACE, ",", u.NEWLINE, u.INDENT);
   }
   withComments(e, E) {
     this.formatComments(e.leadingComments), E(), this.formatComments(e.trailingComments);
@@ -24105,12 +24110,12 @@ class me {
     });
   }
   formatLineComment(e) {
-    TE(e.precedingWhitespace || "") ? this.layout.add(D.NEWLINE, D.INDENT, e.text, D.MANDATORY_NEWLINE, D.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(D.NO_NEWLINE, D.SPACE, e.text, D.MANDATORY_NEWLINE, D.INDENT) : this.layout.add(e.text, D.MANDATORY_NEWLINE, D.INDENT);
+    TE(e.precedingWhitespace || "") ? this.layout.add(u.NEWLINE, u.INDENT, e.text, u.MANDATORY_NEWLINE, u.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(u.NO_NEWLINE, u.SPACE, e.text, u.MANDATORY_NEWLINE, u.INDENT) : this.layout.add(e.text, u.MANDATORY_NEWLINE, u.INDENT);
   }
   formatBlockComment(e) {
     e.type === U.block_comment && this.isMultilineBlockComment(e) ? (this.splitBlockComment(e.text).forEach((E) => {
-      this.layout.add(D.NEWLINE, D.INDENT, E);
-    }), this.layout.add(D.NEWLINE, D.INDENT)) : this.layout.add(e.text, D.SPACE);
+      this.layout.add(u.NEWLINE, u.INDENT, E);
+    }), this.layout.add(u.NEWLINE, u.INDENT)) : this.layout.add(e.text, u.SPACE);
   }
   isMultilineBlockComment(e) {
     return TE(e.text) || TE(e.precedingWhitespace || "");
@@ -24183,27 +24188,27 @@ class me {
   }
   formatKeywordNode(e) {
     switch (e.tokenType) {
-      case c.RESERVED_JOIN:
+      case D.RESERVED_JOIN:
         return this.formatJoin(e);
-      case c.AND:
-      case c.OR:
-      case c.XOR:
+      case D.AND:
+      case D.OR:
+      case D.XOR:
         return this.formatLogicalOperator(e);
       default:
         return this.formatKeyword(e);
     }
   }
   formatJoin(e) {
-    te(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(D.NEWLINE, D.INDENT, this.showKw(e), D.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(D.NEWLINE, D.INDENT, this.showKw(e), D.SPACE);
+    te(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(u.NEWLINE, u.INDENT, this.showKw(e), u.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(u.NEWLINE, u.INDENT, this.showKw(e), u.SPACE);
   }
   formatKeyword(e) {
-    this.layout.add(this.showKw(e), D.SPACE);
+    this.layout.add(this.showKw(e), u.SPACE);
   }
   formatLogicalOperator(e) {
-    this.cfg.logicalOperatorNewline === "before" ? te(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(D.NEWLINE, D.INDENT, this.showKw(e), D.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(D.NEWLINE, D.INDENT, this.showKw(e), D.SPACE) : this.layout.add(this.showKw(e), D.NEWLINE, D.INDENT);
+    this.cfg.logicalOperatorNewline === "before" ? te(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(u.NEWLINE, u.INDENT, this.showKw(e), u.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(u.NEWLINE, u.INDENT, this.showKw(e), u.SPACE) : this.layout.add(this.showKw(e), u.NEWLINE, u.INDENT);
   }
   formatDataType(e) {
-    this.layout.add(this.showDataType(e), D.SPACE);
+    this.layout.add(this.showDataType(e), u.SPACE);
   }
   showKw(e) {
     return Ot(e.tokenType) ? Nt(this.showNonTabularKw(e), this.cfg.indentStyle) : this.showNonTabularKw(e);
@@ -24283,7 +24288,7 @@ class rr {
       params: this.params,
       layout: new Bt(new Ft(yA(this.cfg)))
     }).format(e.children);
-    return e.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? E.add(D.NEWLINE, ";") : E.add(D.NO_NEWLINE, ";")), E.toString();
+    return e.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? E.add(u.NEWLINE, ";") : E.add(u.NO_NEWLINE, ";")), E.toString();
   }
 }
 class De extends Error {