drizzle-cube 0.1.41 → 0.1.43

package/dist/adapters/{compiler-CkjmApqo.js → compiler-B57cLx38.js}

@@ -174,74 +174,74 @@ class H {
     }), {
       casing: A,
       escapeName: S,
-      escapeParam: N,
+      escapeParam: I,
       prepareTyping: t,
-      inlineParams: C,
+      inlineParams: s,
       paramStartIndex: O
     } = R;
-    return De(E.map((I) => {
-      if (d(I, f))
-        return { sql: I.value.join(""), params: [] };
-      if (d(I, ZE))
-        return { sql: S(I.value), params: [] };
-      if (I === void 0)
+    return De(E.map((N) => {
+      if (d(N, f))
+        return { sql: N.value.join(""), params: [] };
+      if (d(N, ZE))
+        return { sql: S(N.value), params: [] };
+      if (N === void 0)
         return { sql: "", params: [] };
-      if (Array.isArray(I)) {
-        const s = [new f("(")];
-        for (const [r, _] of I.entries())
-          s.push(_), r < I.length - 1 && s.push(new f(", "));
-        return s.push(new f(")")), this.buildQueryFromSourceParams(s, R);
+      if (Array.isArray(N)) {
+        const C = [new f("(")];
+        for (const [L, n] of N.entries())
+          C.push(n), L < N.length - 1 && C.push(new f(", "));
+        return C.push(new f(")")), this.buildQueryFromSourceParams(C, R);
       }
-      if (d(I, H))
-        return this.buildQueryFromSourceParams(I.queryChunks, {
+      if (d(N, H))
+        return this.buildQueryFromSourceParams(N.queryChunks, {
           ...R,
-          inlineParams: C || I.shouldInlineParams
+          inlineParams: s || N.shouldInlineParams
         });
-      if (d(I, W)) {
-        const s = I[W.Symbol.Schema], r = I[W.Symbol.Name];
+      if (d(N, W)) {
+        const C = N[W.Symbol.Schema], L = N[W.Symbol.Name];
         return {
-          sql: s === void 0 || I[sE] ? S(r) : S(s) + "." + S(r),
+          sql: C === void 0 || N[sE] ? S(L) : S(C) + "." + S(L),
           params: []
         };
       }
-      if (d(I, RE)) {
-        const s = A.getColumnCasing(I);
+      if (d(N, RE)) {
+        const C = A.getColumnCasing(N);
         if (e.invokeSource === "indexes")
-          return { sql: S(s), params: [] };
-        const r = I.table[W.Symbol.Schema];
+          return { sql: S(C), params: [] };
+        const L = N.table[W.Symbol.Schema];
         return {
-          sql: I.table[sE] || r === void 0 ? S(I.table[W.Symbol.Name]) + "." + S(s) : S(r) + "." + S(I.table[W.Symbol.Name]) + "." + S(s),
+          sql: N.table[sE] || L === void 0 ? S(N.table[W.Symbol.Name]) + "." + S(C) : S(L) + "." + S(N.table[W.Symbol.Name]) + "." + S(C),
           params: []
         };
       }
-      if (d(I, qT)) {
-        const s = I[TE].schema, r = I[TE].name;
+      if (d(N, qT)) {
+        const C = N[TE].schema, L = N[TE].name;
         return {
-          sql: s === void 0 || I[TE].isAlias ? S(r) : S(s) + "." + S(r),
+          sql: C === void 0 || N[TE].isAlias ? S(L) : S(C) + "." + S(L),
           params: []
         };
       }
-      if (d(I, CE)) {
-        if (d(I.value, rE))
-          return { sql: N(O.value++, I), params: [I], typings: ["none"] };
-        const s = I.value === null ? null : I.encoder.mapToDriverValue(I.value);
-        if (d(s, H))
-          return this.buildQueryFromSourceParams([s], R);
-        if (C)
-          return { sql: this.mapInlineParam(s, R), params: [] };
-        let r = ["none"];
-        return t && (r = [t(I.encoder)]), { sql: N(O.value++, s), params: [s], typings: r };
+      if (d(N, CE)) {
+        if (d(N.value, rE))
+          return { sql: I(O.value++, N), params: [N], typings: ["none"] };
+        const C = N.value === null ? null : N.encoder.mapToDriverValue(N.value);
+        if (d(C, H))
+          return this.buildQueryFromSourceParams([C], R);
+        if (s)
+          return { sql: this.mapInlineParam(C, R), params: [] };
+        let L = ["none"];
+        return t && (L = [t(N.encoder)]), { sql: I(O.value++, C), params: [C], typings: L };
       }
-      return d(I, rE) ? { sql: N(O.value++, I), params: [I], typings: ["none"] } : d(I, H.Aliased) && I.fieldAlias !== void 0 ? { sql: S(I.fieldAlias), params: [] } : d(I, xT) ? I._.isWith ? { sql: S(I._.alias), params: [] } : this.buildQueryFromSourceParams([
+      return d(N, rE) ? { sql: I(O.value++, N), params: [N], typings: ["none"] } : d(N, H.Aliased) && N.fieldAlias !== void 0 ? { sql: S(N.fieldAlias), params: [] } : d(N, xT) ? N._.isWith ? { sql: S(N._.alias), params: [] } : this.buildQueryFromSourceParams([
         new f("("),
-        I._.sql,
+        N._.sql,
         new f(") "),
-        new ZE(I._.alias)
-      ], R) : ie(I) ? I.schema ? { sql: S(I.schema) + "." + S(I.enumName), params: [] } : { sql: S(I.enumName), params: [] } : vT(I) ? I.shouldOmitSQLParens?.() ? this.buildQueryFromSourceParams([I.getSQL()], R) : this.buildQueryFromSourceParams([
+        new ZE(N._.alias)
+      ], R) : ie(N) ? N.schema ? { sql: S(N.schema) + "." + S(N.enumName), params: [] } : { sql: S(N.enumName), params: [] } : vT(N) ? N.shouldOmitSQLParens?.() ? this.buildQueryFromSourceParams([N.getSQL()], R) : this.buildQueryFromSourceParams([
         new f("("),
-        I.getSQL(),
+        N.getSQL(),
         new f(")")
-      ], R) : C ? { sql: this.mapInlineParam(I, R), params: [] } : { sql: N(O.value++, I), params: [I], typings: ["none"] };
+      ], R) : s ? { sql: this.mapInlineParam(N, R), params: [] } : { sql: I(O.value++, N), params: [N], typings: ["none"] };
     }));
   }
   mapInlineParam(E, { escapeString: e }) {
@@ -315,7 +315,7 @@ class CE {
     return new H([this]);
   }
 }
-function L(T, ...E) {
+function r(T, ...E) {
   const e = [];
   (E.length > 0 || T.length > 0 && T[0] !== "") && e.push(new f(T[0]));
   for (const [R, A] of E.entries())
@@ -327,34 +327,34 @@ function L(T, ...E) {
     return new H([]);
   }
   T.empty = E;
-  function e(C) {
-    return new H(C);
+  function e(s) {
+    return new H(s);
   }
   T.fromList = e;
-  function R(C) {
-    return new H([new f(C)]);
+  function R(s) {
+    return new H([new f(s)]);
   }
   T.raw = R;
-  function A(C, O) {
-    const I = [];
-    for (const [s, r] of C.entries())
-      s > 0 && O !== void 0 && I.push(O), I.push(r);
-    return new H(I);
+  function A(s, O) {
+    const N = [];
+    for (const [C, L] of s.entries())
+      C > 0 && O !== void 0 && N.push(O), N.push(L);
+    return new H(N);
   }
   T.join = A;
-  function S(C) {
-    return new ZE(C);
+  function S(s) {
+    return new ZE(s);
   }
   T.identifier = S;
-  function N(C) {
-    return new rE(C);
+  function I(s) {
+    return new rE(s);
   }
-  T.placeholder = N;
-  function t(C, O) {
-    return new CE(C, O);
+  T.placeholder = I;
+  function t(s, O) {
+    return new CE(s, O);
   }
   T.param = t;
-})(L || (L = {}));
+})(r || (r = {}));
 ((T) => {
   class E {
     constructor(R, A) {
@@ -413,10 +413,10 @@ W.prototype.getSQL = function() {
 xT.prototype.getSQL = function() {
   return new H([this]);
 };
-function K(T, E) {
+function g(T, E) {
   return Pe(E) && !vT(T) && !d(T, CE) && !d(T, rE) && !d(T, RE) && !d(T, W) && !d(T, qT) ? new CE(T, E) : T;
 }
-const k = (T, E) => L`${T} = ${K(E, T)}`, ST = (T, E) => L`${T} <> ${K(E, T)}`;
+const k = (T, E) => r`${T} = ${g(E, T)}`, ST = (T, E) => r`${T} <> ${g(E, T)}`;
 function h(...T) {
   const E = T.filter(
     (e) => e !== void 0
@@ -424,7 +424,7 @@ function h(...T) {
   if (E.length !== 0)
     return E.length === 1 ? new H(E) : new H([
       new f("("),
-      L.join(E, new f(" and ")),
+      r.join(E, new f(" and ")),
       new f(")")
     ]);
 }
@@ -435,43 +435,43 @@ function PE(...T) {
   if (E.length !== 0)
     return E.length === 1 ? new H(E) : new H([
       new f("("),
-      L.join(E, new f(" or ")),
+      r.join(E, new f(" or ")),
       new f(")")
     ]);
 }
-const ME = (T, E) => L`${T} > ${K(E, T)}`, Q = (T, E) => L`${T} >= ${K(E, T)}`, UE = (T, E) => L`${T} < ${K(E, T)}`, Z = (T, E) => L`${T} <= ${K(E, T)}`;
+const ME = (T, E) => r`${T} > ${g(E, T)}`, Q = (T, E) => r`${T} >= ${g(E, T)}`, UE = (T, E) => r`${T} < ${g(E, T)}`, Z = (T, E) => r`${T} <= ${g(E, T)}`;
 function lE(T, E) {
-  return Array.isArray(E) ? E.length === 0 ? L`false` : L`${T} in ${E.map((e) => K(e, T))}` : L`${T} in ${K(E, T)}`;
+  return Array.isArray(E) ? E.length === 0 ? r`false` : r`${T} in ${E.map((e) => g(e, T))}` : r`${T} in ${g(E, T)}`;
 }
 function IT(T, E) {
-  return Array.isArray(E) ? E.length === 0 ? L`true` : L`${T} not in ${E.map((e) => K(e, T))}` : L`${T} not in ${K(E, T)}`;
+  return Array.isArray(E) ? E.length === 0 ? r`true` : r`${T} not in ${E.map((e) => g(e, T))}` : r`${T} not in ${g(E, T)}`;
 }
 function NT(T) {
-  return L`${T} is null`;
+  return r`${T} is null`;
 }
 function OT(T) {
-  return L`${T} is not null`;
+  return r`${T} is not null`;
 }
 function tT(T) {
-  return L`${T} asc`;
+  return r`${T} asc`;
 }
 function Ue(T) {
-  return L`${T} desc`;
+  return r`${T} desc`;
 }
 function cE(T) {
-  return L`count(${T || L.raw("*")})`.mapWith(Number);
+  return r`count(${T || r.raw("*")})`.mapWith(Number);
 }
 function le(T) {
-  return L`count(distinct ${T})`.mapWith(Number);
+  return r`count(distinct ${T})`.mapWith(Number);
 }
 function y(T) {
-  return L`sum(${T})`.mapWith(String);
+  return r`sum(${T})`.mapWith(String);
 }
 function AE(T) {
-  return L`max(${T})`.mapWith(d(T, RE) ? T : String);
+  return r`max(${T})`.mapWith(d(T, RE) ? T : String);
 }
 function SE(T) {
-  return L`min(${T})`.mapWith(d(T, RE) ? T : String);
+  return r`min(${T})`.mapWith(d(T, RE) ? T : String);
 }
 class jE {
   /**
@@ -510,21 +510,21 @@ class ce extends jE {
   buildTimeDimension(E, e) {
     switch (E) {
       case "year":
-        return L`DATE_TRUNC('year', ${e}::timestamp)`;
+        return r`DATE_TRUNC('year', ${e}::timestamp)`;
       case "quarter":
-        return L`DATE_TRUNC('quarter', ${e}::timestamp)`;
+        return r`DATE_TRUNC('quarter', ${e}::timestamp)`;
       case "month":
-        return L`DATE_TRUNC('month', ${e}::timestamp)`;
+        return r`DATE_TRUNC('month', ${e}::timestamp)`;
       case "week":
-        return L`DATE_TRUNC('week', ${e}::timestamp)`;
+        return r`DATE_TRUNC('week', ${e}::timestamp)`;
       case "day":
-        return L`DATE_TRUNC('day', ${e}::timestamp)::timestamp`;
+        return r`DATE_TRUNC('day', ${e}::timestamp)::timestamp`;
       case "hour":
-        return L`DATE_TRUNC('hour', ${e}::timestamp)`;
+        return r`DATE_TRUNC('hour', ${e}::timestamp)`;
       case "minute":
-        return L`DATE_TRUNC('minute', ${e}::timestamp)`;
+        return r`DATE_TRUNC('minute', ${e}::timestamp)`;
       case "second":
-        return L`DATE_TRUNC('second', ${e}::timestamp)`;
+        return r`DATE_TRUNC('second', ${e}::timestamp)`;
       default:
         return e;
     }
@@ -536,23 +536,23 @@ class ce extends jE {
   buildStringCondition(E, e, R) {
     switch (e) {
       case "contains":
-        return L`${E} ILIKE ${`%${R}%`}`;
+        return r`${E} ILIKE ${`%${R}%`}`;
       case "notContains":
-        return L`${E} NOT ILIKE ${`%${R}%`}`;
+        return r`${E} NOT ILIKE ${`%${R}%`}`;
       case "startsWith":
-        return L`${E} ILIKE ${`${R}%`}`;
+        return r`${E} ILIKE ${`${R}%`}`;
       case "endsWith":
-        return L`${E} ILIKE ${`%${R}`}`;
+        return r`${E} ILIKE ${`%${R}`}`;
       case "like":
-        return L`${E} LIKE ${R}`;
+        return r`${E} LIKE ${R}`;
       case "notLike":
-        return L`${E} NOT LIKE ${R}`;
+        return r`${E} NOT LIKE ${R}`;
       case "ilike":
-        return L`${E} ILIKE ${R}`;
+        return r`${E} ILIKE ${R}`;
       case "regex":
-        return L`${E} ~* ${R}`;
+        return r`${E} ~* ${R}`;
       case "notRegex":
-        return L`${E} !~* ${R}`;
+        return r`${E} !~* ${R}`;
       default:
         throw new Error(`Unsupported string operator: ${e}`);
     }
@@ -564,11 +564,11 @@ class ce extends jE {
   castToType(E, e) {
     switch (e) {
       case "timestamp":
-        return L`${E}::timestamp`;
+        return r`${E}::timestamp`;
       case "decimal":
-        return L`${E}::decimal`;
+        return r`${E}::decimal`;
       case "integer":
-        return L`${E}::integer`;
+        return r`${E}::integer`;
       default:
         throw new Error(`Unsupported cast type: ${e}`);
     }
@@ -579,21 +579,21 @@ class ce extends jE {
    * Extracted from multi-cube-builder.ts:284
    */
   buildAvg(E) {
-    return L`COALESCE(AVG(${E}), 0)`;
+    return r`COALESCE(AVG(${E}), 0)`;
   }
   /**
    * Build PostgreSQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, e) {
-    const R = E.map((A) => L`WHEN ${A.when} THEN ${A.then}`).reduce((A, S) => L`${A} ${S}`);
-    return e !== void 0 ? L`CASE ${R} ELSE ${e} END` : L`CASE ${R} END`;
+    const R = E.map((A) => r`WHEN ${A.when} THEN ${A.then}`).reduce((A, S) => r`${A} ${S}`);
+    return e !== void 0 ? r`CASE ${R} ELSE ${e} END` : r`CASE ${R} END`;
   }
   /**
    * Build PostgreSQL boolean literal
    * PostgreSQL uses TRUE/FALSE keywords
    */
   buildBooleanLiteral(E) {
-    return E ? L`TRUE` : L`FALSE`;
+    return E ? r`TRUE` : r`FALSE`;
   }
   /**
    * Convert filter values - PostgreSQL uses native types
@@ -646,12 +646,12 @@ class jT extends jE {
     };
     switch (E) {
       case "quarter":
-        return L`DATE_ADD(MAKEDATE(YEAR(${e}), 1), INTERVAL (QUARTER(${e}) - 1) * 3 MONTH)`;
+        return r`DATE_ADD(MAKEDATE(YEAR(${e}), 1), INTERVAL (QUARTER(${e}) - 1) * 3 MONTH)`;
       case "week":
-        return L`DATE_SUB(${e}, INTERVAL WEEKDAY(${e}) DAY)`;
+        return r`DATE_SUB(${e}, INTERVAL WEEKDAY(${e}) DAY)`;
       default:
         const A = R[E];
-        return A ? L`STR_TO_DATE(DATE_FORMAT(${e}, ${A}), '%Y-%m-%d %H:%i:%s')` : e;
+        return A ? r`STR_TO_DATE(DATE_FORMAT(${e}, ${A}), '%Y-%m-%d %H:%i:%s')` : e;
     }
   }
   /**
@@ -662,23 +662,23 @@ class jT extends jE {
   buildStringCondition(E, e, R) {
     switch (e) {
       case "contains":
-        return L`LOWER(${E}) LIKE ${`%${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) LIKE ${`%${R.toLowerCase()}%`}`;
       case "notContains":
-        return L`LOWER(${E}) NOT LIKE ${`%${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) NOT LIKE ${`%${R.toLowerCase()}%`}`;
       case "startsWith":
-        return L`LOWER(${E}) LIKE ${`${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) LIKE ${`${R.toLowerCase()}%`}`;
       case "endsWith":
-        return L`LOWER(${E}) LIKE ${`%${R.toLowerCase()}`}`;
+        return r`LOWER(${E}) LIKE ${`%${R.toLowerCase()}`}`;
       case "like":
-        return L`${E} LIKE ${R}`;
+        return r`${E} LIKE ${R}`;
       case "notLike":
-        return L`${E} NOT LIKE ${R}`;
+        return r`${E} NOT LIKE ${R}`;
       case "ilike":
-        return L`LOWER(${E}) LIKE ${R.toLowerCase()}`;
+        return r`LOWER(${E}) LIKE ${R.toLowerCase()}`;
       case "regex":
-        return L`${E} REGEXP ${R}`;
+        return r`${E} REGEXP ${R}`;
       case "notRegex":
-        return L`${E} NOT REGEXP ${R}`;
+        return r`${E} NOT REGEXP ${R}`;
       default:
         throw new Error(`Unsupported string operator: ${e}`);
     }
@@ -690,11 +690,11 @@ class jT extends jE {
   castToType(E, e) {
     switch (e) {
       case "timestamp":
-        return L`CAST(${E} AS DATETIME)`;
+        return r`CAST(${E} AS DATETIME)`;
       case "decimal":
-        return L`CAST(${E} AS DECIMAL(10,2))`;
+        return r`CAST(${E} AS DECIMAL(10,2))`;
       case "integer":
-        return L`CAST(${E} AS SIGNED INTEGER)`;
+        return r`CAST(${E} AS SIGNED INTEGER)`;
       default:
         throw new Error(`Unsupported cast type: ${e}`);
     }
@@ -704,21 +704,21 @@ class jT extends jE {
    * MySQL AVG returns NULL for empty sets, using IFNULL for consistency
    */
   buildAvg(E) {
-    return L`IFNULL(AVG(${E}), 0)`;
+    return r`IFNULL(AVG(${E}), 0)`;
   }
   /**
    * Build MySQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, e) {
-    const R = E.map((A) => L`WHEN ${A.when} THEN ${A.then}`).reduce((A, S) => L`${A} ${S}`);
-    return e !== void 0 ? L`CASE ${R} ELSE ${e} END` : L`CASE ${R} END`;
+    const R = E.map((A) => r`WHEN ${A.when} THEN ${A.then}`).reduce((A, S) => r`${A} ${S}`);
+    return e !== void 0 ? r`CASE ${R} ELSE ${e} END` : r`CASE ${R} END`;
   }
   /**
    * Build MySQL boolean literal
    * MySQL uses TRUE/FALSE keywords (equivalent to 1/0)
    */
   buildBooleanLiteral(E) {
-    return E ? L`TRUE` : L`FALSE`;
+    return E ? r`TRUE` : r`FALSE`;
   }
   /**
    * Convert filter values - MySQL uses native types
@@ -761,28 +761,28 @@ class ue extends jE {
   buildTimeDimension(E, e) {
     switch (E) {
       case "year":
-        return L`datetime(${e}, 'unixepoch', 'start of year')`;
+        return r`datetime(${e}, 'unixepoch', 'start of year')`;
       case "quarter":
-        const R = L`datetime(${e}, 'unixepoch')`;
-        return L`datetime(${R}, 'start of year',
+        const R = r`datetime(${e}, 'unixepoch')`;
+        return r`datetime(${R}, 'start of year',
           '+' || (((CAST(strftime('%m', ${R}) AS INTEGER) - 1) / 3) * 3) || ' months')`;
       case "month":
-        return L`datetime(${e}, 'unixepoch', 'start of month')`;
+        return r`datetime(${e}, 'unixepoch', 'start of month')`;
       case "week":
-        return L`date(datetime(${e}, 'unixepoch'), 'weekday 1', '-6 days')`;
+        return r`date(datetime(${e}, 'unixepoch'), 'weekday 1', '-6 days')`;
       case "day":
-        return L`datetime(${e}, 'unixepoch', 'start of day')`;
+        return r`datetime(${e}, 'unixepoch', 'start of day')`;
       case "hour":
-        const A = L`datetime(${e}, 'unixepoch')`;
-        return L`datetime(strftime('%Y-%m-%d %H:00:00', ${A}))`;
+        const A = r`datetime(${e}, 'unixepoch')`;
+        return r`datetime(strftime('%Y-%m-%d %H:00:00', ${A}))`;
       case "minute":
-        const S = L`datetime(${e}, 'unixepoch')`;
-        return L`datetime(strftime('%Y-%m-%d %H:%M:00', ${S}))`;
+        const S = r`datetime(${e}, 'unixepoch')`;
+        return r`datetime(strftime('%Y-%m-%d %H:%M:00', ${S}))`;
       case "second":
-        const N = L`datetime(${e}, 'unixepoch')`;
-        return L`datetime(strftime('%Y-%m-%d %H:%M:%S', ${N}))`;
+        const I = r`datetime(${e}, 'unixepoch')`;
+        return r`datetime(strftime('%Y-%m-%d %H:%M:%S', ${I}))`;
       default:
-        return L`datetime(${e}, 'unixepoch')`;
+        return r`datetime(${e}, 'unixepoch')`;
     }
   }
   /**
@@ -792,23 +792,23 @@ class ue extends jE {
   buildStringCondition(E, e, R) {
     switch (e) {
       case "contains":
-        return L`LOWER(${E}) LIKE ${`%${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) LIKE ${`%${R.toLowerCase()}%`}`;
       case "notContains":
-        return L`LOWER(${E}) NOT LIKE ${`%${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) NOT LIKE ${`%${R.toLowerCase()}%`}`;
       case "startsWith":
-        return L`LOWER(${E}) LIKE ${`${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) LIKE ${`${R.toLowerCase()}%`}`;
       case "endsWith":
-        return L`LOWER(${E}) LIKE ${`%${R.toLowerCase()}`}`;
+        return r`LOWER(${E}) LIKE ${`%${R.toLowerCase()}`}`;
       case "like":
-        return L`${E} LIKE ${R}`;
+        return r`${E} LIKE ${R}`;
       case "notLike":
-        return L`${E} NOT LIKE ${R}`;
+        return r`${E} NOT LIKE ${R}`;
       case "ilike":
-        return L`LOWER(${E}) LIKE ${R.toLowerCase()}`;
+        return r`LOWER(${E}) LIKE ${R.toLowerCase()}`;
       case "regex":
-        return L`${E} GLOB ${R}`;
+        return r`${E} GLOB ${R}`;
       case "notRegex":
-        return L`${E} NOT GLOB ${R}`;
+        return r`${E} NOT GLOB ${R}`;
       default:
         throw new Error(`Unsupported string operator: ${e}`);
     }
@@ -820,11 +820,11 @@ class ue extends jE {
   castToType(E, e) {
     switch (e) {
       case "timestamp":
-        return L`datetime(${E} / 1000, 'unixepoch')`;
+        return r`datetime(${E} / 1000, 'unixepoch')`;
       case "decimal":
-        return L`CAST(${E} AS REAL)`;
+        return r`CAST(${E} AS REAL)`;
       case "integer":
-        return L`CAST(${E} AS INTEGER)`;
+        return r`CAST(${E} AS INTEGER)`;
       default:
         throw new Error(`Unsupported cast type: ${e}`);
     }
@@ -834,21 +834,21 @@ class ue extends jE {
    * SQLite AVG returns NULL for empty sets, using IFNULL for consistency
    */
   buildAvg(E) {
-    return L`IFNULL(AVG(${E}), 0)`;
+    return r`IFNULL(AVG(${E}), 0)`;
   }
   /**
    * Build SQLite CASE WHEN conditional expression
    */
   buildCaseWhen(E, e) {
-    const R = E.map((A) => A.then && typeof A.then == "object" && (A.then.queryChunks || A.then._ || A.then.sql) ? L`WHEN ${A.when} THEN ${L.raw("(")}${A.then}${L.raw(")")}` : L`WHEN ${A.when} THEN ${A.then}`).reduce((A, S) => L`${A} ${S}`);
-    return e !== void 0 ? e && typeof e == "object" && (e.queryChunks || e._ || e.sql) ? L`CASE ${R} ELSE ${L.raw("(")}${e}${L.raw(")")} END` : L`CASE ${R} ELSE ${e} END` : L`CASE ${R} END`;
+    const R = E.map((A) => A.then && typeof A.then == "object" && (A.then.queryChunks || A.then._ || A.then.sql) ? r`WHEN ${A.when} THEN ${r.raw("(")}${A.then}${r.raw(")")}` : r`WHEN ${A.when} THEN ${A.then}`).reduce((A, S) => r`${A} ${S}`);
+    return e !== void 0 ? e && typeof e == "object" && (e.queryChunks || e._ || e.sql) ? r`CASE ${R} ELSE ${r.raw("(")}${e}${r.raw(")")} END` : r`CASE ${R} ELSE ${e} END` : r`CASE ${R} END`;
   }
   /**
    * Build SQLite boolean literal
    * SQLite uses 1/0 for true/false
    */
   buildBooleanLiteral(E) {
-    return E ? L`1` : L`0`;
+    return E ? r`1` : r`0`;
   }
   /**
    * Preprocess calculated measure templates for SQLite-specific handling
@@ -1131,7 +1131,7 @@ function zT(T, E) {
   }
 }
 function Ye(T) {
-  return T && typeof T == "object" ? L`${L`${T}`}` : T;
+  return T && typeof T == "object" ? r`${r`${T}`}` : T;
 }
 function w(T, E) {
   const e = typeof T == "function" ? T(E) : T;
@@ -1140,20 +1140,20 @@ function w(T, E) {
 function fe(T, E) {
   if (T.relationship !== "belongsToMany" || !T.through)
     throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
-  const { table: e, sourceKey: R, targetKey: A, securitySql: S } = T.through, N = [];
-  for (const I of R) {
-    const s = I.as || k;
-    N.push(s(I.source, I.target));
+  const { table: e, sourceKey: R, targetKey: A, securitySql: S } = T.through, I = [];
+  for (const N of R) {
+    const C = N.as || k;
+    I.push(C(N.source, N.target));
   }
   const t = [];
-  for (const I of A) {
-    const s = I.as || k;
-    t.push(s(I.source, I.target));
+  for (const N of A) {
+    const C = N.as || k;
+    t.push(C(N.source, N.target));
   }
-  let C;
+  let s;
   if (S) {
-    const I = S(E);
-    C = Array.isArray(I) ? I : [I];
+    const N = S(E);
+    s = Array.isArray(N) ? N : [N];
   }
   const O = zT("belongsToMany", T.sqlJoinType);
   return {
@@ -1161,7 +1161,7 @@ function fe(T, E) {
       {
         joinType: O,
         table: e,
-        condition: h(...N)
+        condition: h(...I)
       },
       {
         joinType: O,
@@ -1170,7 +1170,7 @@ function fe(T, E) {
         condition: h(...t)
       }
     ],
-    junctionSecurityConditions: C
+    junctionSecurityConditions: s
   };
 }
 class J {
@@ -1189,19 +1189,19 @@ class J {
   extractDependencies(E) {
     const e = /\{([^}]+)\}/g, R = E.matchAll(e), A = [];
     for (const S of R) {
-      const N = S[1].trim();
-      if (N.includes(".")) {
-        const [t, C] = N.split(".");
+      const I = S[1].trim();
+      if (I.includes(".")) {
+        const [t, s] = I.split(".");
         A.push({
-          measureName: N,
+          measureName: I,
           cubeName: t.trim(),
-          fieldName: C.trim()
+          fieldName: s.trim()
         });
       } else
         A.push({
-          measureName: N,
+          measureName: I,
           cubeName: null,
-          fieldName: N
+          fieldName: I
         });
     }
     return A;
@@ -1214,14 +1214,14 @@ class J {
   buildGraph(E) {
     for (const [e, R] of Object.entries(E.measures))
       if (R.type === "calculated" && R.calculatedSql) {
-        const A = `${E.name}.${e}`, S = this.extractDependencies(R.calculatedSql), N = /* @__PURE__ */ new Set();
+        const A = `${E.name}.${e}`, S = this.extractDependencies(R.calculatedSql), I = /* @__PURE__ */ new Set();
         for (const t of S) {
           const O = `${t.cubeName || E.name}.${t.fieldName}`;
-          N.add(O);
+          I.add(O);
         }
         this.dependencyGraph.set(A, {
           id: A,
-          dependencies: N,
+          dependencies: I,
           inDegree: 0
         });
       }
@@ -1259,27 +1259,27 @@ class J {
   topologicalSort(E) {
     const e = /* @__PURE__ */ new Map(), R = [], A = [];
     for (const S of E) {
-      const N = this.dependencyGraph.get(S);
-      N && e.set(S, {
-        id: N.id,
-        dependencies: new Set(N.dependencies),
+      const I = this.dependencyGraph.get(S);
+      I && e.set(S, {
+        id: I.id,
+        dependencies: new Set(I.dependencies),
         inDegree: 0
         // Will recalculate below
       });
     }
     for (const S of e.values()) {
-      let N = 0;
+      let I = 0;
       for (const t of S.dependencies)
-        e.has(t) && N++;
-      S.inDegree = N;
+        e.has(t) && I++;
+      S.inDegree = I;
     }
-    for (const [S, N] of e)
-      N.inDegree === 0 && R.push(S);
+    for (const [S, I] of e)
+      I.inDegree === 0 && R.push(S);
     for (; R.length > 0; ) {
       const S = R.shift();
       A.push(S);
-      for (const [N, t] of e)
-        t.dependencies.has(S) && (t.inDegree--, t.inDegree === 0 && R.push(N));
+      for (const [I, t] of e)
+        t.dependencies.has(S) && (t.inDegree--, t.inDegree === 0 && R.push(I));
     }
     if (A.length < e.size) {
       const S = this.detectCycle();
@@ -1313,14 +1313,14 @@ class J {
     const S = this.dependencyGraph.get(E);
     if (!S)
       return A.pop(), R.delete(E), null;
-    for (const N of S.dependencies)
-      if (e.has(N)) {
-        if (R.has(N)) {
-          const t = A.indexOf(N);
-          return [...A.slice(t), N];
+    for (const I of S.dependencies)
+      if (e.has(I)) {
+        if (R.has(I)) {
+          const t = A.indexOf(I);
+          return [...A.slice(t), I];
         }
       } else {
-        const t = this.dfs(N, e, R, A);
+        const t = this.dfs(I, e, R, A);
         if (t)
           return t;
       }
@@ -1336,9 +1336,9 @@ class J {
     const e = /* @__PURE__ */ new Set(), R = /* @__PURE__ */ new Set(), A = (S) => {
       if (R.has(S)) return;
       R.add(S);
-      const N = this.dependencyGraph.get(S);
-      if (N)
-        for (const t of N.dependencies)
+      const I = this.dependencyGraph.get(S);
+      if (I)
+        for (const t of I.dependencies)
           e.add(t), A(t);
     };
     return A(E), e;
@@ -1354,16 +1354,16 @@ class J {
       if (R.type === "calculated" && R.calculatedSql) {
         const A = this.extractDependencies(R.calculatedSql);
         for (const S of A) {
-          const N = S.cubeName || E.name, t = this.cubes.get(N);
+          const I = S.cubeName || E.name, t = this.cubes.get(I);
           if (!t)
             throw new Error(
-              `Calculated measure '${E.name}.${e}' references unknown cube '${N}'`
+              `Calculated measure '${E.name}.${e}' references unknown cube '${I}'`
             );
           if (!t.measures[S.fieldName])
             throw new Error(
               `Calculated measure '${E.name}.${e}' references unknown measure '${S.measureName}'`
             );
-          if (N === E.name && S.fieldName === e)
+          if (I === E.name && S.fieldName === e)
             throw new Error(
               `Calculated measure '${E.name}.${e}' cannot reference itself`
             );
@@ -1394,47 +1394,47 @@ class J {
   }
 }
 function he(T, E) {
-  const { cube: e, allCubes: R, resolvedMeasures: A } = E, S = zE(T), N = /* @__PURE__ */ new Map();
-  for (const s of S) {
-    const { originalRef: r, cubeName: _, fieldName: D } = s, o = _ || e.name;
+  const { cube: e, allCubes: R, resolvedMeasures: A } = E, S = zE(T), I = /* @__PURE__ */ new Map();
+  for (const C of S) {
+    const { originalRef: L, cubeName: n, fieldName: i } = C, o = n || e.name;
     if (!R.get(o))
       throw new Error(
-        `Cannot substitute {${r}}: cube '${o}' not found`
+        `Cannot substitute {${L}}: cube '${o}' not found`
       );
-    const P = `${o}.${D}`, l = A.get(P);
+    const P = `${o}.${i}`, l = A.get(P);
     if (!l)
       throw new Error(
-        `Cannot substitute {${r}}: measure '${P}' not resolved yet. Ensure measures are resolved in dependency order.`
+        `Cannot substitute {${L}}: measure '${P}' not resolved yet. Ensure measures are resolved in dependency order.`
       );
-    const M = l(), G = L`${M}`;
-    N.set(r, G);
+    const M = l(), G = r`${M}`;
+    I.set(L, G);
   }
-  const t = [], C = [];
+  const t = [], s = [];
   let O = 0;
-  for (const s of S) {
-    const r = `{${s.originalRef}}`, _ = T.indexOf(r, O);
-    if (_ >= 0) {
-      t.push(T.substring(O, _));
-      const D = N.get(s.originalRef);
-      D && C.push(D), O = _ + r.length;
+  for (const C of S) {
+    const L = `{${C.originalRef}}`, n = T.indexOf(L, O);
+    if (n >= 0) {
+      t.push(T.substring(O, n));
+      const i = I.get(C.originalRef);
+      i && s.push(i), O = n + L.length;
     }
   }
-  if (t.push(T.substring(O)), C.length === 0)
-    return L.raw(T);
-  const I = [];
-  for (let s = 0; s < t.length; s++)
-    t[s] && I.push(new f(t[s])), s < C.length && I.push(C[s]);
-  return L.join(I, L.raw(""));
+  if (t.push(T.substring(O)), s.length === 0)
+    return r.raw(T);
+  const N = [];
+  for (let C = 0; C < t.length; C++)
+    t[C] && N.push(new f(t[C])), C < s.length && N.push(s[C]);
+  return r.join(N, r.raw(""));
 }
 function zE(T) {
   const E = /\{([^}]+)\}/g, e = T.matchAll(E), R = [];
   for (const A of e) {
     const S = A[1].trim();
     if (S.includes(".")) {
-      const [N, t] = S.split(".").map((C) => C.trim());
+      const [I, t] = S.split(".").map((s) => s.trim());
       R.push({
         originalRef: S,
-        cubeName: N,
+        cubeName: I,
         fieldName: t
       });
     } else
@@ -1449,21 +1449,21 @@ function zE(T) {
 function Ve(T) {
   const E = [];
   let e = 0;
-  for (let N = 0; N < T.length; N++)
-    if (T[N] === "{")
+  for (let I = 0; I < T.length; I++)
+    if (T[I] === "{")
       e++;
-    else if (T[N] === "}" && (e--, e < 0)) {
-      E.push(`Unmatched closing brace at position ${N}`);
+    else if (T[I] === "}" && (e--, e < 0)) {
+      E.push(`Unmatched closing brace at position ${I}`);
       break;
     }
   e > 0 && E.push("Unmatched opening brace in template"), /\{\s*\}/.test(T) && E.push("Empty member reference {} found in template"), /\{[^}]*\{/.test(T) && E.push("Nested braces are not allowed in member references");
   const S = zE(T);
-  for (const N of S) {
-    const t = N.cubeName ? `${N.cubeName}.${N.fieldName}` : N.fieldName;
+  for (const I of S) {
+    const t = I.cubeName ? `${I.cubeName}.${I.fieldName}` : I.fieldName;
     /^[a-zA-Z_][a-zA-Z0-9_.]*$/.test(t) || E.push(
-      `Invalid member reference {${N.originalRef}}: must start with letter or underscore, and contain only letters, numbers, underscores, and dots`
+      `Invalid member reference {${I.originalRef}}: must start with letter or underscore, and contain only letters, numbers, underscores, and dots`
     ), t.split(".").length > 2 && E.push(
-      `Invalid member reference {${N.originalRef}}: only one dot allowed (Cube.measure format)`
+      `Invalid member reference {${I.originalRef}}: only one dot allowed (Cube.measure format)`
     );
   }
   return {
@@ -1474,8 +1474,8 @@ function Ve(T) {
 function uE(T, E) {
   const e = zE(T), R = /* @__PURE__ */ new Set();
   for (const A of e) {
-    const N = `${A.cubeName || E}.${A.fieldName}`;
-    R.add(N);
+    const I = `${A.cubeName || E}.${A.fieldName}`;
+    R.add(I);
   }
   return Array.from(R);
 }
@@ -1495,44 +1495,44 @@ class We {
    * @returns Map of measure names to SQL builder functions
    */
   buildResolvedMeasures(E, e, R, A) {
-    const S = /* @__PURE__ */ new Map(), N = [], t = [], C = new Set(E), O = new J(e);
-    for (const I of e.values())
-      O.buildGraph(I);
-    for (const I of E) {
-      const [s, r] = I.split("."), _ = e.get(s);
-      if (_ && _.measures && _.measures[r]) {
-        const D = _.measures[r];
-        J.isCalculatedMeasure(D) ? (t.push(I), uE(D.calculatedSql, s).forEach((P) => C.add(P)), O.getAllDependencies(I).forEach((P) => {
+    const S = /* @__PURE__ */ new Map(), I = [], t = [], s = new Set(E), O = new J(e);
+    for (const N of e.values())
+      O.buildGraph(N);
+    for (const N of E) {
+      const [C, L] = N.split("."), n = e.get(C);
+      if (n && n.measures && n.measures[L]) {
+        const i = n.measures[L];
+        J.isCalculatedMeasure(i) ? (t.push(N), uE(i.calculatedSql, C).forEach((P) => s.add(P)), O.getAllDependencies(N).forEach((P) => {
           const [l, M] = P.split("."), G = e.get(l);
           if (G && G.measures[M]) {
             const m = G.measures[M];
-            J.isCalculatedMeasure(m) && uE(m.calculatedSql, l).forEach((b) => C.add(b));
+            J.isCalculatedMeasure(m) && uE(m.calculatedSql, l).forEach((b) => s.add(b));
           }
-        })) : N.push(I);
+        })) : I.push(N);
       }
     }
-    for (const I of C) {
-      const [s, r] = I.split("."), _ = e.get(s);
-      if (_ && _.measures && _.measures[r]) {
-        const D = _.measures[r];
-        J.isCalculatedMeasure(D) ? t.includes(I) || t.push(I) : N.includes(I) || N.push(I);
+    for (const N of s) {
+      const [C, L] = N.split("."), n = e.get(C);
+      if (n && n.measures && n.measures[L]) {
+        const i = n.measures[L];
+        J.isCalculatedMeasure(i) ? t.includes(N) || t.push(N) : I.includes(N) || I.push(N);
       }
     }
-    for (const I of N) {
-      const [s, r] = I.split("."), _ = e.get(s), D = _.measures[r];
+    for (const N of I) {
+      const [C, L] = N.split("."), n = e.get(C), i = n.measures[L];
       if (A) {
-        const o = A(I, D, _);
-        S.set(I, () => o);
+        const o = A(N, i, n);
+        S.set(N, () => o);
       } else
-        S.set(I, () => this.buildMeasureExpression(D, R));
+        S.set(N, () => this.buildMeasureExpression(i, R));
     }
     if (t.length > 0) {
-      const I = O.topologicalSort(t);
-      for (const s of I) {
-        const [r, _] = s.split("."), D = e.get(r), o = D.measures[_];
-        S.set(s, () => this.buildCalculatedMeasure(
+      const N = O.topologicalSort(t);
+      for (const C of N) {
+        const [L, n] = C.split("."), i = e.get(L), o = i.measures[n];
+        S.set(C, () => this.buildCalculatedMeasure(
           o,
-          D,
+          i,
           e,
           S,
           R
@@ -1549,37 +1549,37 @@ class We {
   buildSelections(E, e, R) {
     const A = {}, S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (e.dimensions)
-      for (const N of e.dimensions) {
-        const [t, C] = N.split("."), O = S.get(t);
-        if (O && O.dimensions && O.dimensions[C]) {
-          const I = O.dimensions[C], s = w(I.sql, R);
-          A[N] = L`${s}`.as(N);
+      for (const I of e.dimensions) {
+        const [t, s] = I.split("."), O = S.get(t);
+        if (O && O.dimensions && O.dimensions[s]) {
+          const N = O.dimensions[s], C = w(N.sql, R);
+          A[I] = r`${C}`.as(I);
         }
       }
     if (e.measures) {
-      const N = this.buildResolvedMeasures(
+      const I = this.buildResolvedMeasures(
         e.measures,
         S,
         R
       );
       for (const t of e.measures) {
-        const C = N.get(t);
-        if (C) {
-          const O = C();
-          A[t] = L`${O}`.as(t);
+        const s = I.get(t);
+        if (s) {
+          const O = s();
+          A[t] = r`${O}`.as(t);
         }
       }
     }
     if (e.timeDimensions)
-      for (const N of e.timeDimensions) {
-        const [t, C] = N.dimension.split("."), O = S.get(t);
-        if (O && O.dimensions && O.dimensions[C]) {
-          const I = O.dimensions[C], s = this.buildTimeDimensionExpression(
-            I.sql,
-            N.granularity,
+      for (const I of e.timeDimensions) {
+        const [t, s] = I.dimension.split("."), O = S.get(t);
+        if (O && O.dimensions && O.dimensions[s]) {
+          const N = O.dimensions[s], C = this.buildTimeDimensionExpression(
+            N.sql,
+            I.granularity,
             R
           );
-          A[N.dimension] = L`${s}`.as(N.dimension);
+          A[I.dimension] = r`${C}`.as(I.dimension);
         }
       }
     return Object.keys(A).length === 0 && (A.count = cE()), A;
@@ -1593,8 +1593,8 @@ class We {
       throw new Error(
         `Calculated measure '${e.name}.${E.name}' missing calculatedSql property`
       );
-    const N = this.databaseAdapter.preprocessCalculatedTemplate(E.calculatedSql);
-    return he(N, {
+    const I = this.databaseAdapter.preprocessCalculatedTemplate(E.calculatedSql);
+    return he(I, {
       cube: e,
       allCubes: R,
       resolvedMeasures: A
@@ -1619,36 +1619,36 @@ class We {
       throw new Error(
         `Calculated measure '${e.name}.${E.name || "unknown"}' missing calculatedSql property`
       );
-    const N = /* @__PURE__ */ new Map(), t = uE(E.calculatedSql, e.name);
-    for (const C of t) {
-      const [O, I] = C.split("."), s = A.get(O);
-      if (s && s.measures[I]) {
-        const r = s.measures[I];
-        if (R.measures.includes(C)) {
-          const _ = L`${L.identifier(R.cteAlias)}.${L.identifier(I)}`;
-          let D;
-          switch (r.type) {
+    const I = /* @__PURE__ */ new Map(), t = uE(E.calculatedSql, e.name);
+    for (const s of t) {
+      const [O, N] = s.split("."), C = A.get(O);
+      if (C && C.measures[N]) {
+        const L = C.measures[N];
+        if (R.measures.includes(s)) {
+          const n = r`${r.identifier(R.cteAlias)}.${r.identifier(N)}`;
+          let i;
+          switch (L.type) {
             case "count":
             case "countDistinct":
             case "sum":
-              D = y(_);
+              i = y(n);
               break;
             case "avg":
-              D = this.databaseAdapter.buildAvg(_);
+              i = this.databaseAdapter.buildAvg(n);
               break;
             case "min":
-              D = SE(_);
+              i = SE(n);
               break;
             case "max":
-              D = AE(_);
+              i = AE(n);
               break;
             case "number":
-              D = y(_);
+              i = y(n);
               break;
             default:
-              D = y(_);
+              i = y(n);
           }
-          N.set(C, () => D);
+          I.set(s, () => i);
         }
       }
     }
@@ -1656,7 +1656,7 @@ class We {
       E,
       e,
       A,
-      N,
+      I,
       S
     );
   }
@@ -1665,25 +1665,25 @@ class We {
    */
   buildHavingMeasureExpression(E, e, R, A, S) {
     if (S && S.preAggregationCTEs) {
-      const N = S.preAggregationCTEs.find((t) => t.cube.name === E);
-      if (N && N.measures.includes(`${E}.${e}`))
+      const I = S.preAggregationCTEs.find((t) => t.cube.name === E);
+      if (I && I.measures.includes(`${E}.${e}`))
         if (R.type === "calculated" && R.calculatedSql) {
           const t = S.primaryCube.name === E ? S.primaryCube : S.joinCubes?.find((O) => O.cube.name === E)?.cube;
           if (!t)
             throw new Error(`Cube ${E} not found in query plan`);
-          const C = /* @__PURE__ */ new Map([[S.primaryCube.name, S.primaryCube]]);
+          const s = /* @__PURE__ */ new Map([[S.primaryCube.name, S.primaryCube]]);
           if (S.joinCubes)
             for (const O of S.joinCubes)
-              C.set(O.cube.name, O.cube);
+              s.set(O.cube.name, O.cube);
           return this.buildCTECalculatedMeasure(
             R,
             t,
-            N,
-            C,
+            I,
+            s,
             A
           );
         } else {
-          const t = L`${L.identifier(N.cteAlias)}.${L.identifier(e)}`;
+          const t = r`${r.identifier(I.cteAlias)}.${r.identifier(e)}`;
           switch (R.type) {
             case "count":
             case "countDistinct":
@@ -1720,8 +1720,8 @@ class We {
     let R = w(E.sql, e);
     if (E.filters && E.filters.length > 0) {
       const A = E.filters.map((S) => {
-        const N = S(e);
-        return N ? L`(${N})` : void 0;
+        const I = S(e);
+        return I ? r`(${I})` : void 0;
       }).filter(Boolean);
       if (A.length > 0) {
         const S = A.length === 1 ? A[0] : h(...A);
@@ -1754,27 +1754,27 @@ class We {
    */
   buildTimeDimensionExpression(E, e, R) {
     const A = w(E, R);
-    return e ? this.databaseAdapter.buildTimeDimension(e, A) : A instanceof H ? A : L`${A}`;
+    return e ? this.databaseAdapter.buildTimeDimension(e, A) : A instanceof H ? A : r`${A}`;
   }
   /**
    * Build WHERE conditions from semantic query filters (dimensions only)
    * Works for both single and multi-cube queries
    */
   buildWhereConditions(E, e, R, A) {
-    const S = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const S = [], I = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (e.filters && e.filters.length > 0)
       for (const t of e.filters) {
-        const C = this.processFilter(t, N, R, "where", A);
-        C && S.push(C);
+        const s = this.processFilter(t, I, R, "where", A);
+        s && S.push(s);
       }
     if (e.timeDimensions)
       for (const t of e.timeDimensions) {
-        const [C, O] = t.dimension.split("."), I = N.get(C);
-        if (I && I.dimensions[O] && t.dateRange) {
-          if (A?.preAggregationCTEs && A.preAggregationCTEs.some((o) => o.cube.name === C))
+        const [s, O] = t.dimension.split("."), N = I.get(s);
+        if (N && N.dimensions[O] && t.dateRange) {
+          if (A?.preAggregationCTEs && A.preAggregationCTEs.some((o) => o.cube.name === s))
             continue;
-          const s = I.dimensions[O], r = w(s.sql, R), _ = this.buildDateRangeCondition(r, t.dateRange);
-          _ && S.push(_);
+          const C = N.dimensions[O], L = w(C.sql, R), n = this.buildDateRangeCondition(L, t.dateRange);
+          n && S.push(n);
         }
       }
     return S;
@@ -1784,11 +1784,11 @@ class We {
    * Works for both single and multi-cube queries
    */
   buildHavingConditions(E, e, R, A) {
-    const S = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const S = [], I = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (e.filters && e.filters.length > 0)
       for (const t of e.filters) {
-        const C = this.processFilter(t, N, R, "having", A);
-        C && S.push(C);
+        const s = this.processFilter(t, I, R, "having", A);
+        s && S.push(s);
       }
     return S;
   }
@@ -1798,31 +1798,43 @@ class We {
    */
   processFilter(E, e, R, A, S) {
     if ("and" in E || "or" in E) {
-      const _ = E;
-      if (_.and) {
-        const D = _.and.map((o) => this.processFilter(o, e, R, A, S)).filter((o) => o !== null);
-        return D.length > 0 ? h(...D) : null;
+      const n = E;
+      if (n.and) {
+        const i = n.and.map((o) => this.processFilter(o, e, R, A, S)).filter((o) => o !== null);
+        return i.length > 0 ? h(...i) : null;
       }
-      if (_.or) {
-        const D = _.or.map((o) => this.processFilter(o, e, R, A, S)).filter((o) => o !== null);
-        return D.length > 0 ? PE(...D) : null;
+      if (n.or) {
+        const i = n.or.map((o) => this.processFilter(o, e, R, A, S)).filter((o) => o !== null);
+        return i.length > 0 ? PE(...i) : null;
       }
     }
-    const N = E, [t, C] = N.member.split("."), O = e.get(t);
+    const I = E, [t, s] = I.member.split("."), O = e.get(t);
     if (!O) return null;
-    const I = O.dimensions[C], s = O.measures[C], r = I || s;
-    if (!r) return null;
-    if (A === "where" && I) {
+    const N = O.dimensions[s], C = O.measures[s], L = N || C;
+    if (!L) return null;
+    if (A === "where" && N) {
       if (S?.preAggregationCTEs && S.preAggregationCTEs.some((o) => o.cube.name === t))
         return null;
-      const _ = w(I.sql, R);
-      return this.buildFilterCondition(_, N.operator, N.values, r);
+      const n = w(N.sql, R);
+      return this.buildFilterCondition(
+        n,
+        I.operator,
+        I.values,
+        L,
+        I.dateRange
+      );
     } else {
-      if (A === "where" && s)
+      if (A === "where" && C)
         return null;
-      if (A === "having" && s) {
-        const _ = this.buildHavingMeasureExpression(t, C, s, R, S);
-        return this.buildFilterCondition(_, N.operator, N.values, r);
+      if (A === "having" && C) {
+        const n = this.buildHavingMeasureExpression(t, s, C, R, S);
+        return this.buildFilterCondition(
+          n,
+          I.operator,
+          I.values,
+          L,
+          I.dateRange
+        );
       }
     }
     return null;
@@ -1830,97 +1842,108 @@ class We {
   /**
    * Build filter condition using Drizzle operators
    */
-  buildFilterCondition(E, e, R, A) {
+  buildFilterCondition(E, e, R, A, S) {
+    if (S !== void 0) {
+      if (e !== "inDateRange")
+        throw new Error(
+          `dateRange can only be used with 'inDateRange' operator, but got '${e}'. Use explicit date values in the 'values' array for other date operators.`
+        );
+      if (A && A.type !== "time")
+        throw new Error(
+          `dateRange can only be used on time dimensions, but field '${A.name || "unknown"}' has type '${A.type}'`
+        );
+      return this.buildDateRangeCondition(E, S);
+    }
     if (!R || R.length === 0)
       return e === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const S = R.filter((t) => !(t == null || t === "" || typeof t == "string" && t.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
-    if (S.length === 0 && !["set", "notSet"].includes(e))
+    const I = R.filter((s) => !(s == null || s === "" || typeof s == "string" && s.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
+    if (I.length === 0 && !["set", "notSet"].includes(e))
       return e === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const N = S[0];
+    const t = I[0];
     switch (e) {
       case "equals":
-        if (S.length > 1) {
+        if (I.length > 1) {
           if (A?.type === "time") {
-            const t = S.map((C) => this.normalizeDate(C) || C);
-            return lE(E, t);
+            const s = I.map((O) => this.normalizeDate(O) || O);
+            return lE(E, s);
           }
-          return lE(E, S);
-        } else if (S.length === 1) {
-          const t = A?.type === "time" && this.normalizeDate(N) || N;
-          return k(E, t);
+          return lE(E, I);
+        } else if (I.length === 1) {
+          const s = A?.type === "time" && this.normalizeDate(t) || t;
+          return k(E, s);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return S.length > 1 ? IT(E, S) : S.length === 1 ? ST(E, N) : null;
+        return I.length > 1 ? IT(E, I) : I.length === 1 ? ST(E, t) : null;
       case "contains":
-        return this.databaseAdapter.buildStringCondition(E, "contains", N);
+        return this.databaseAdapter.buildStringCondition(E, "contains", t);
       case "notContains":
-        return this.databaseAdapter.buildStringCondition(E, "notContains", N);
+        return this.databaseAdapter.buildStringCondition(E, "notContains", t);
       case "startsWith":
-        return this.databaseAdapter.buildStringCondition(E, "startsWith", N);
+        return this.databaseAdapter.buildStringCondition(E, "startsWith", t);
       case "endsWith":
-        return this.databaseAdapter.buildStringCondition(E, "endsWith", N);
+        return this.databaseAdapter.buildStringCondition(E, "endsWith", t);
       case "gt":
-        return ME(E, N);
+        return ME(E, t);
       case "gte":
-        return Q(E, N);
+        return Q(E, t);
       case "lt":
-        return UE(E, N);
+        return UE(E, t);
       case "lte":
-        return Z(E, N);
+        return Z(E, t);
       case "set":
         return OT(E);
       case "notSet":
         return NT(E);
       case "inDateRange":
-        if (S.length >= 2) {
-          const t = this.normalizeDate(S[0]);
-          let C = this.normalizeDate(S[1]);
-          if (t && C) {
-            const O = R[1];
-            if (typeof O == "string" && /^\d{4}-\d{2}-\d{2}$/.test(O.trim())) {
-              const I = typeof C == "number" ? new Date(C * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(C), s = new Date(I);
-              s.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? C = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(s.getTime() / 1e3) : s.getTime() : C = s.toISOString();
+        if (I.length >= 2) {
+          const s = this.normalizeDate(I[0]);
+          let O = this.normalizeDate(I[1]);
+          if (s && O) {
+            const N = R[1];
+            if (typeof N == "string" && /^\d{4}-\d{2}-\d{2}$/.test(N.trim())) {
+              const C = typeof O == "number" ? new Date(O * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(O), L = new Date(C);
+              L.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? O = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(L.getTime() / 1e3) : L.getTime() : O = L.toISOString();
             }
             return h(
-              Q(E, t),
-              Z(E, C)
+              Q(E, s),
+              Z(E, O)
             );
           }
         }
         return null;
       case "beforeDate": {
-        const t = this.normalizeDate(N);
-        return t ? UE(E, t) : null;
+        const s = this.normalizeDate(t);
+        return s ? UE(E, s) : null;
       }
       case "afterDate": {
-        const t = this.normalizeDate(N);
-        return t ? ME(E, t) : null;
+        const s = this.normalizeDate(t);
+        return s ? ME(E, s) : null;
       }
       case "between":
-        return S.length >= 2 ? h(
-          Q(E, S[0]),
-          Z(E, S[1])
+        return I.length >= 2 ? h(
+          Q(E, I[0]),
+          Z(E, I[1])
         ) : null;
       case "notBetween":
-        return S.length >= 2 ? PE(
-          UE(E, S[0]),
-          ME(E, S[1])
+        return I.length >= 2 ? PE(
+          UE(E, I[0]),
+          ME(E, I[1])
         ) : null;
       case "in":
-        return S.length > 0 ? lE(E, S) : null;
+        return I.length > 0 ? lE(E, I) : null;
       case "notIn":
-        return S.length > 0 ? IT(E, S) : null;
+        return I.length > 0 ? IT(E, I) : null;
       case "like":
-        return this.databaseAdapter.buildStringCondition(E, "like", N);
+        return this.databaseAdapter.buildStringCondition(E, "like", t);
       case "notLike":
-        return this.databaseAdapter.buildStringCondition(E, "notLike", N);
+        return this.databaseAdapter.buildStringCondition(E, "notLike", t);
       case "ilike":
-        return this.databaseAdapter.buildStringCondition(E, "ilike", N);
+        return this.databaseAdapter.buildStringCondition(E, "ilike", t);
       case "regex":
-        return this.databaseAdapter.buildStringCondition(E, "regex", N);
+        return this.databaseAdapter.buildStringCondition(E, "regex", t);
       case "notRegex":
-        return this.databaseAdapter.buildStringCondition(E, "notRegex", N);
+        return this.databaseAdapter.buildStringCondition(E, "notRegex", t);
       case "isEmpty":
         return PE(
           NT(E),
@@ -1945,8 +1968,8 @@ class We {
       let A = this.normalizeDate(e[1]);
       if (!R || !A) return null;
       if (typeof e[1] == "string" && /^\d{4}-\d{2}-\d{2}$/.test(e[1].trim())) {
-        const S = typeof A == "number" ? new Date(A * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(A), N = new Date(S);
-        N.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? A = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(N.getTime() / 1e3) : N.getTime() : A = N.toISOString();
+        const S = typeof A == "number" ? new Date(A * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(A), I = new Date(S);
+        I.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? A = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(I.getTime() / 1e3) : I.getTime() : A = I.toISOString();
       }
       return h(
         Q(E, R),
@@ -1956,21 +1979,21 @@ class We {
     if (typeof e == "string") {
       const R = this.parseRelativeDateRange(e);
       if (R) {
-        let I, s;
-        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (I = Math.floor(R.start.getTime() / 1e3), s = Math.floor(R.end.getTime() / 1e3)) : (I = R.start.getTime(), s = R.end.getTime()) : (I = R.start.toISOString(), s = R.end.toISOString()), h(
-          Q(E, I),
-          Z(E, s)
+        let N, C;
+        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (N = Math.floor(R.start.getTime() / 1e3), C = Math.floor(R.end.getTime() / 1e3)) : (N = R.start.getTime(), C = R.end.getTime()) : (N = R.start.toISOString(), C = R.end.toISOString()), h(
+          Q(E, N),
+          Z(E, C)
         );
       }
       const A = this.normalizeDate(e);
       if (!A) return null;
-      const S = typeof A == "number" ? new Date(A * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(A), N = new Date(S);
-      N.setUTCHours(0, 0, 0, 0);
+      const S = typeof A == "number" ? new Date(A * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(A), I = new Date(S);
+      I.setUTCHours(0, 0, 0, 0);
       const t = new Date(S);
       t.setUTCHours(23, 59, 59, 999);
-      let C, O;
-      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (C = Math.floor(N.getTime() / 1e3), O = Math.floor(t.getTime() / 1e3)) : (C = N.getTime(), O = t.getTime()) : (C = N.toISOString(), O = t.toISOString()), h(
-        Q(E, C),
+      let s, O;
+      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (s = Math.floor(I.getTime() / 1e3), O = Math.floor(t.getTime() / 1e3)) : (s = I.getTime(), O = t.getTime()) : (s = I.toISOString(), O = t.toISOString()), h(
+        Q(E, s),
         Z(E, O)
       );
     }
@@ -1981,75 +2004,82 @@ class We {
    * Handles all 14 DATE_RANGE_OPTIONS from the client
    */
   parseRelativeDateRange(E) {
-    const e = /* @__PURE__ */ new Date(), R = E.toLowerCase().trim(), A = e.getUTCFullYear(), S = e.getUTCMonth(), N = e.getUTCDate(), t = e.getUTCDay();
+    const e = /* @__PURE__ */ new Date(), R = E.toLowerCase().trim(), A = e.getUTCFullYear(), S = e.getUTCMonth(), I = e.getUTCDate(), t = e.getUTCDay();
     if (R === "today") {
-      const s = new Date(e);
-      s.setUTCHours(0, 0, 0, 0);
-      const r = new Date(e);
-      return r.setUTCHours(23, 59, 59, 999), { start: s, end: r };
+      const L = new Date(e);
+      L.setUTCHours(0, 0, 0, 0);
+      const n = new Date(e);
+      return n.setUTCHours(23, 59, 59, 999), { start: L, end: n };
     }
     if (R === "yesterday") {
-      const s = new Date(e);
-      s.setUTCDate(N - 1), s.setUTCHours(0, 0, 0, 0);
-      const r = new Date(e);
-      return r.setUTCDate(N - 1), r.setUTCHours(23, 59, 59, 999), { start: s, end: r };
+      const L = new Date(e);
+      L.setUTCDate(I - 1), L.setUTCHours(0, 0, 0, 0);
+      const n = new Date(e);
+      return n.setUTCDate(I - 1), n.setUTCHours(23, 59, 59, 999), { start: L, end: n };
     }
     if (R === "this week") {
-      const s = t === 0 ? -6 : 1 - t, r = new Date(e);
-      r.setUTCDate(N + s), r.setUTCHours(0, 0, 0, 0);
-      const _ = new Date(r);
-      return _.setUTCDate(r.getUTCDate() + 6), _.setUTCHours(23, 59, 59, 999), { start: r, end: _ };
+      const L = t === 0 ? -6 : 1 - t, n = new Date(e);
+      n.setUTCDate(I + L), n.setUTCHours(0, 0, 0, 0);
+      const i = new Date(n);
+      return i.setUTCDate(n.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: n, end: i };
     }
     if (R === "this month") {
-      const s = new Date(Date.UTC(A, S, 1, 0, 0, 0, 0)), r = new Date(Date.UTC(A, S + 1, 0, 23, 59, 59, 999));
-      return { start: s, end: r };
+      const L = new Date(Date.UTC(A, S, 1, 0, 0, 0, 0)), n = new Date(Date.UTC(A, S + 1, 0, 23, 59, 59, 999));
+      return { start: L, end: n };
     }
     if (R === "this quarter") {
-      const s = Math.floor(S / 3), r = new Date(Date.UTC(A, s * 3, 1, 0, 0, 0, 0)), _ = new Date(Date.UTC(A, s * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: r, end: _ };
+      const L = Math.floor(S / 3), n = new Date(Date.UTC(A, L * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(A, L * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: n, end: i };
     }
     if (R === "this year") {
-      const s = new Date(Date.UTC(A, 0, 1, 0, 0, 0, 0)), r = new Date(Date.UTC(A, 11, 31, 23, 59, 59, 999));
-      return { start: s, end: r };
+      const L = new Date(Date.UTC(A, 0, 1, 0, 0, 0, 0)), n = new Date(Date.UTC(A, 11, 31, 23, 59, 59, 999));
+      return { start: L, end: n };
     }
-    const C = R.match(/^last\s+(\d+)\s+days?$/);
-    if (C) {
-      const s = parseInt(C[1], 10), r = new Date(e);
-      r.setUTCDate(N - s + 1), r.setUTCHours(0, 0, 0, 0);
-      const _ = new Date(e);
-      return _.setUTCHours(23, 59, 59, 999), { start: r, end: _ };
+    const s = R.match(/^last\s+(\d+)\s+days?$/);
+    if (s) {
+      const L = parseInt(s[1], 10), n = new Date(e);
+      n.setUTCDate(I - L + 1), n.setUTCHours(0, 0, 0, 0);
+      const i = new Date(e);
+      return i.setUTCHours(23, 59, 59, 999), { start: n, end: i };
+    }
+    const O = R.match(/^last\s+(\d+)\s+weeks?$/);
+    if (O) {
+      const n = parseInt(O[1], 10) * 7, i = new Date(e);
+      i.setUTCDate(I - n + 1), i.setUTCHours(0, 0, 0, 0);
+      const o = new Date(e);
+      return o.setUTCHours(23, 59, 59, 999), { start: i, end: o };
     }
     if (R === "last week") {
-      const s = t === 0 ? -13 : -6 - t, r = new Date(e);
-      r.setUTCDate(N + s), r.setUTCHours(0, 0, 0, 0);
-      const _ = new Date(r);
-      return _.setUTCDate(r.getUTCDate() + 6), _.setUTCHours(23, 59, 59, 999), { start: r, end: _ };
+      const L = t === 0 ? -13 : -6 - t, n = new Date(e);
+      n.setUTCDate(I + L), n.setUTCHours(0, 0, 0, 0);
+      const i = new Date(n);
+      return i.setUTCDate(n.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: n, end: i };
     }
     if (R === "last month") {
-      const s = new Date(Date.UTC(A, S - 1, 1, 0, 0, 0, 0)), r = new Date(Date.UTC(A, S, 0, 23, 59, 59, 999));
-      return { start: s, end: r };
+      const L = new Date(Date.UTC(A, S - 1, 1, 0, 0, 0, 0)), n = new Date(Date.UTC(A, S, 0, 23, 59, 59, 999));
+      return { start: L, end: n };
     }
     if (R === "last quarter") {
-      const s = Math.floor(S / 3), r = s === 0 ? 3 : s - 1, _ = s === 0 ? A - 1 : A, D = new Date(Date.UTC(_, r * 3, 1, 0, 0, 0, 0)), o = new Date(Date.UTC(_, r * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: D, end: o };
+      const L = Math.floor(S / 3), n = L === 0 ? 3 : L - 1, i = L === 0 ? A - 1 : A, o = new Date(Date.UTC(i, n * 3, 1, 0, 0, 0, 0)), u = new Date(Date.UTC(i, n * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: o, end: u };
     }
     if (R === "last year") {
-      const s = new Date(Date.UTC(A - 1, 0, 1, 0, 0, 0, 0)), r = new Date(Date.UTC(A - 1, 11, 31, 23, 59, 59, 999));
-      return { start: s, end: r };
+      const L = new Date(Date.UTC(A - 1, 0, 1, 0, 0, 0, 0)), n = new Date(Date.UTC(A - 1, 11, 31, 23, 59, 59, 999));
+      return { start: L, end: n };
     }
     if (R === "last 12 months") {
-      const s = new Date(Date.UTC(A, S - 11, 1, 0, 0, 0, 0)), r = new Date(e);
-      return r.setUTCHours(23, 59, 59, 999), { start: s, end: r };
+      const L = new Date(Date.UTC(A, S - 11, 1, 0, 0, 0, 0)), n = new Date(e);
+      return n.setUTCHours(23, 59, 59, 999), { start: L, end: n };
     }
-    const O = R.match(/^last\s+(\d+)\s+months?$/);
-    if (O) {
-      const s = parseInt(O[1], 10), r = new Date(Date.UTC(A, S - s + 1, 1, 0, 0, 0, 0)), _ = new Date(e);
-      return _.setUTCHours(23, 59, 59, 999), { start: r, end: _ };
+    const N = R.match(/^last\s+(\d+)\s+months?$/);
+    if (N) {
+      const L = parseInt(N[1], 10), n = new Date(Date.UTC(A, S - L + 1, 1, 0, 0, 0, 0)), i = new Date(e);
+      return i.setUTCHours(23, 59, 59, 999), { start: n, end: i };
     }
-    const I = R.match(/^last\s+(\d+)\s+years?$/);
-    if (I) {
-      const s = parseInt(I[1], 10), r = new Date(Date.UTC(A - s, 0, 1, 0, 0, 0, 0)), _ = new Date(e);
-      return _.setUTCHours(23, 59, 59, 999), { start: r, end: _ };
+    const C = R.match(/^last\s+(\d+)\s+years?$/);
+    if (C) {
+      const L = parseInt(C[1], 10), n = new Date(Date.UTC(A - L, 0, 1, 0, 0, 0, 0)), i = new Date(e);
+      return i.setUTCHours(23, 59, 59, 999), { start: n, end: i };
     }
     return null;
   }
@@ -2087,46 +2117,46 @@ class We {
       return [];
     const t = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (e.dimensions)
-      for (const C of e.dimensions) {
-        const [O, I] = C.split("."), s = t.get(O);
-        if (s && s.dimensions && s.dimensions[I])
-          if (A?.preAggregationCTEs?.some((_) => _.cube.name === O)) {
-            const _ = A.preAggregationCTEs.find((o) => o.cube.name === O), D = _.joinKeys.find((o) => o.targetColumn === I);
-            if (D && D.sourceColumnObj)
-              S.push(D.sourceColumnObj);
+      for (const s of e.dimensions) {
+        const [O, N] = s.split("."), C = t.get(O);
+        if (C && C.dimensions && C.dimensions[N])
+          if (A?.preAggregationCTEs?.some((n) => n.cube.name === O)) {
+            const n = A.preAggregationCTEs.find((o) => o.cube.name === O), i = n.joinKeys.find((o) => o.targetColumn === N);
+            if (i && i.sourceColumnObj)
+              S.push(i.sourceColumnObj);
             else {
-              const o = L`${L.identifier(_.cteAlias)}.${L.identifier(I)}`;
+              const o = r`${r.identifier(n.cteAlias)}.${r.identifier(N)}`;
               S.push(o);
             }
           } else {
-            const _ = s.dimensions[I], D = w(_.sql, R);
-            S.push(D);
+            const n = C.dimensions[N], i = w(n.sql, R);
+            S.push(i);
           }
       }
     if (e.timeDimensions)
-      for (const C of e.timeDimensions) {
-        const [O, I] = C.dimension.split("."), s = t.get(O);
-        if (s && s.dimensions && s.dimensions[I])
-          if (A?.preAggregationCTEs?.some((_) => _.cube.name === O)) {
-            const _ = A.preAggregationCTEs.find((o) => o.cube.name === O), D = _.joinKeys.find((o) => o.targetColumn === I);
-            if (D && D.sourceColumnObj) {
+      for (const s of e.timeDimensions) {
+        const [O, N] = s.dimension.split("."), C = t.get(O);
+        if (C && C.dimensions && C.dimensions[N])
+          if (A?.preAggregationCTEs?.some((n) => n.cube.name === O)) {
+            const n = A.preAggregationCTEs.find((o) => o.cube.name === O), i = n.joinKeys.find((o) => o.targetColumn === N);
+            if (i && i.sourceColumnObj) {
               const o = this.buildTimeDimensionExpression(
-                D.sourceColumnObj,
-                C.granularity,
+                i.sourceColumnObj,
+                s.granularity,
                 R
               );
               S.push(o);
             } else {
-              const o = L`${L.identifier(_.cteAlias)}.${L.identifier(I)}`;
+              const o = r`${r.identifier(n.cteAlias)}.${r.identifier(N)}`;
               S.push(o);
             }
           } else {
-            const _ = s.dimensions[I], D = this.buildTimeDimensionExpression(
-              _.sql,
-              C.granularity,
+            const n = C.dimensions[N], i = this.buildTimeDimensionExpression(
+              n.sql,
+              s.granularity,
               R
             );
-            S.push(D);
+            S.push(i);
           }
       }
     return S;
@@ -2141,18 +2171,18 @@ class We {
       ...E.timeDimensions?.map((S) => S.dimension) || []
     ];
     if (E.order && Object.keys(E.order).length > 0)
-      for (const [S, N] of Object.entries(E.order)) {
+      for (const [S, I] of Object.entries(E.order)) {
         if (!A.includes(S))
           throw new Error(`Cannot order by '${S}': field is not selected in the query`);
-        const t = N === "desc" ? Ue(L.identifier(S)) : tT(L.identifier(S));
+        const t = I === "desc" ? Ue(r.identifier(S)) : tT(r.identifier(S));
         R.push(t);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
-      const S = new Set(Object.keys(E.order || {})), N = [...E.timeDimensions].sort(
-        (t, C) => t.dimension.localeCompare(C.dimension)
+      const S = new Set(Object.keys(E.order || {})), I = [...E.timeDimensions].sort(
+        (t, s) => t.dimension.localeCompare(s.dimension)
       );
-      for (const t of N)
-        S.has(t.dimension) || R.push(tT(L.identifier(t.dimension)));
+      for (const t of I)
+        S.has(t.dimension) || R.push(tT(r.identifier(t.dimension)));
     }
     return R;
   }
@@ -2164,9 +2194,9 @@ class We {
     const R = [], A = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (e.measures && R.push(...e.measures), e.dimensions)
       for (const S of e.dimensions) {
-        const [N, t] = S.split("."), C = A.get(N);
-        if (C) {
-          const O = C.dimensions[t];
+        const [I, t] = S.split("."), s = A.get(I);
+        if (s) {
+          const O = s.dimensions[t];
           O && O.type === "number" && R.push(S);
         }
       }
@@ -2267,9 +2297,9 @@ class be {
     const A = this.analyzeCubeUsage(e), S = Array.from(A);
     if (S.length === 0)
       throw new Error("No cubes found in query");
-    const N = this.choosePrimaryCube(S, e, E), t = E.get(N);
+    const I = this.choosePrimaryCube(S, e, E), t = E.get(I);
     if (!t)
-      throw new Error(`Primary cube '${N}' not found`);
+      throw new Error(`Primary cube '${I}' not found`);
     if (S.length === 1)
       return {
         primaryCube: t,
@@ -2282,10 +2312,10 @@ class be {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const C = this.buildJoinPlan(E, t, S, R), O = this.planPreAggregationCTEs(E, t, C, e);
+    const s = this.buildJoinPlan(E, t, S, R), O = this.planPreAggregationCTEs(E, t, s, e);
     return {
       primaryCube: t,
-      joinCubes: C,
+      joinCubes: s,
       selections: {},
       // Will be built by QueryBuilder
       whereConditions: [],
@@ -2301,21 +2331,21 @@ class be {
    */
   choosePrimaryCube(E, e, R) {
     if (e.dimensions && e.dimensions.length > 0 && R) {
-      const A = e.dimensions.map((N) => N.split(".")[0]), S = /* @__PURE__ */ new Map();
-      for (const N of A)
-        S.set(N, (S.get(N) || 0) + 1);
+      const A = e.dimensions.map((I) => I.split(".")[0]), S = /* @__PURE__ */ new Map();
+      for (const I of A)
+        S.set(I, (S.get(I) || 0) + 1);
       if (S.size > 0) {
-        const N = Math.max(...S.values()), t = [...S.entries()].filter(([, C]) => C === N).map(([C]) => C).sort();
-        for (const C of t)
-          if (this.canReachAllCubes(C, E, R))
-            return C;
+        const I = Math.max(...S.values()), t = [...S.entries()].filter(([, s]) => s === I).map(([s]) => s).sort();
+        for (const s of t)
+          if (this.canReachAllCubes(s, E, R))
+            return s;
       }
     }
     if (R) {
       const A = /* @__PURE__ */ new Map();
       for (const S of E)
         if (this.canReachAllCubes(S, E, R)) {
-          const N = R.get(S), t = N?.joins ? Object.keys(N.joins).length : 0;
+          const I = R.get(S), t = I?.joins ? Object.keys(I.joins).length : 0;
           A.set(S, t);
         }
       if (A.size > 0) {
@@ -2331,8 +2361,8 @@ class be {
   canReachAllCubes(E, e, R) {
     const A = e.filter((S) => S !== E);
     for (const S of A) {
-      const N = this.findJoinPath(R, E, S, /* @__PURE__ */ new Set());
-      if (!N || N.length === 0)
+      const I = this.findJoinPath(R, E, S, /* @__PURE__ */ new Set());
+      if (!I || I.length === 0)
         return !1;
     }
     return !0;
@@ -2342,52 +2372,52 @@ class be {
    * Supports both direct joins and transitive joins through intermediate cubes
    */
   buildJoinPlan(E, e, R, A) {
-    const S = [], N = /* @__PURE__ */ new Set([e.name]), t = R.filter((C) => C !== e.name);
-    for (const C of t) {
-      if (N.has(C))
+    const S = [], I = /* @__PURE__ */ new Set([e.name]), t = R.filter((s) => s !== e.name);
+    for (const s of t) {
+      if (I.has(s))
         continue;
-      const O = this.findJoinPath(E, e.name, C, N);
+      const O = this.findJoinPath(E, e.name, s, I);
       if (!O || O.length === 0)
-        throw new Error(`No join path found from '${e.name}' to '${C}'`);
-      for (const { toCube: I, joinDef: s } of O) {
-        if (N.has(I))
+        throw new Error(`No join path found from '${e.name}' to '${s}'`);
+      for (const { toCube: N, joinDef: C } of O) {
+        if (I.has(N))
           continue;
-        const r = E.get(I);
-        if (!r)
-          throw new Error(`Cube '${I}' not found`);
-        if (s.relationship === "belongsToMany" && s.through) {
-          const _ = fe(s, A.securityContext);
+        const L = E.get(N);
+        if (!L)
+          throw new Error(`Cube '${N}' not found`);
+        if (C.relationship === "belongsToMany" && C.through) {
+          const n = fe(C, A.securityContext);
           S.push({
-            cube: r,
-            alias: `${I.toLowerCase()}_cube`,
-            joinType: _.junctionJoins[1].joinType,
+            cube: L,
+            alias: `${N.toLowerCase()}_cube`,
+            joinType: n.junctionJoins[1].joinType,
             // Use the target join type
-            joinCondition: _.junctionJoins[1].condition,
+            joinCondition: n.junctionJoins[1].condition,
             // Target join condition
             junctionTable: {
-              table: s.through.table,
-              alias: `junction_${I.toLowerCase()}`,
-              joinType: _.junctionJoins[0].joinType,
-              joinCondition: _.junctionJoins[0].condition,
-              securitySql: s.through.securitySql
+              table: C.through.table,
+              alias: `junction_${N.toLowerCase()}`,
+              joinType: n.junctionJoins[0].joinType,
+              joinCondition: n.junctionJoins[0].condition,
+              securitySql: C.through.securitySql
             }
           });
         } else {
-          const _ = this.buildJoinCondition(
-            s,
+          const n = this.buildJoinCondition(
+            C,
             null,
             // No source alias needed - use the actual column
             null
             // No target alias needed - use the actual column
-          ), D = zT(s.relationship, s.sqlJoinType);
+          ), i = zT(C.relationship, C.sqlJoinType);
           S.push({
-            cube: r,
-            alias: `${I.toLowerCase()}_cube`,
-            joinType: D,
-            joinCondition: _
+            cube: L,
+            alias: `${N.toLowerCase()}_cube`,
+            joinType: i,
+            joinCondition: n
           });
         }
-        N.add(I);
+        I.add(N);
       }
     }
     return S;
@@ -2398,8 +2428,8 @@ class be {
   buildJoinCondition(E, e, R) {
     const A = [];
     for (const S of E.on) {
-      const N = e ? L`${L.identifier(e)}.${L.identifier(S.source.name)}` : S.source, t = R ? L`${L.identifier(R)}.${L.identifier(S.target.name)}` : S.target, C = S.as || k;
-      A.push(C(N, t));
+      const I = e ? r`${r.identifier(e)}.${r.identifier(S.source.name)}` : S.source, t = R ? r`${r.identifier(R)}.${r.identifier(S.target.name)}` : S.target, s = S.as || k;
+      A.push(s(I, t));
     }
     return h(...A);
   }
@@ -2412,22 +2442,22 @@ class be {
       return [];
     const S = [
       { cube: e, path: [] }
-    ], N = /* @__PURE__ */ new Set([e, ...A]);
+    ], I = /* @__PURE__ */ new Set([e, ...A]);
     for (; S.length > 0; ) {
-      const { cube: t, path: C } = S.shift(), O = E.get(t);
+      const { cube: t, path: s } = S.shift(), O = E.get(t);
       if (O?.joins)
-        for (const [, I] of Object.entries(O.joins)) {
-          const r = LT(I.targetCube).name;
-          if (N.has(r))
+        for (const [, N] of Object.entries(O.joins)) {
+          const L = LT(N.targetCube).name;
+          if (I.has(L))
             continue;
-          const _ = [...C, {
+          const n = [...s, {
             fromCube: t,
-            toCube: r,
-            joinDef: I
+            toCube: L,
+            joinDef: N
           }];
-          if (r === R)
-            return _;
-          N.add(r), S.push({ cube: r, path: _ });
+          if (L === R)
+            return n;
+          I.add(L), S.push({ cube: L, path: n });
         }
     }
     return null;
@@ -2441,30 +2471,30 @@ class be {
     const S = [];
     if (!A.measures || A.measures.length === 0)
       return S;
-    for (const N of R) {
-      const t = this.findHasManyJoinDef(e, N.cube.name);
+    for (const I of R) {
+      const t = this.findHasManyJoinDef(e, I.cube.name);
       if (!t)
         continue;
-      const C = A.measures ? A.measures.filter(
-        (_) => _.startsWith(N.cube.name + ".")
-      ) : [], O = this.extractMeasuresFromFilters(A, N.cube.name), I = [.../* @__PURE__ */ new Set([...C, ...O])];
-      if (I.length === 0)
+      const s = A.measures ? A.measures.filter(
+        (n) => n.startsWith(I.cube.name + ".")
+      ) : [], O = this.extractMeasuresFromFilters(A, I.cube.name), N = [.../* @__PURE__ */ new Set([...s, ...O])];
+      if (N.length === 0)
         continue;
-      const s = this.expandCalculatedMeasureDependencies(
-        N.cube,
-        I
-      ), r = t.on.map((_) => ({
-        sourceColumn: _.source.name,
-        targetColumn: _.target.name,
-        sourceColumnObj: _.source,
-        targetColumnObj: _.target
+      const C = this.expandCalculatedMeasureDependencies(
+        I.cube,
+        N
+      ), L = t.on.map((n) => ({
+        sourceColumn: n.source.name,
+        targetColumn: n.target.name,
+        sourceColumnObj: n.source,
+        targetColumnObj: n.target
       }));
       S.push({
-        cube: N.cube,
-        alias: N.alias,
-        cteAlias: `${N.cube.name.toLowerCase()}_agg`,
-        joinKeys: r,
-        measures: s
+        cube: I.cube,
+        alias: I.alias,
+        cteAlias: `${I.cube.name.toLowerCase()}_agg`,
+        joinKeys: L,
+        measures: C
       });
     }
     return S;
@@ -2479,13 +2509,13 @@ class be {
       if (R.has(S))
         continue;
       R.add(S);
-      const [, N] = S.split(".");
-      if (!E.measures || !E.measures[N])
+      const [, I] = S.split(".");
+      if (!E.measures || !E.measures[I])
         continue;
-      const t = E.measures[N];
+      const t = E.measures[I];
       if (t.type === "calculated" && t.calculatedSql) {
-        const C = this.extractDependenciesFromTemplate(t.calculatedSql, E.name);
-        for (const O of C)
+        const s = this.extractDependenciesFromTemplate(t.calculatedSql, E.name);
+        for (const O of s)
           R.has(O) || A.push(O);
       }
     }
@@ -2496,8 +2526,8 @@ class be {
    */
   extractDependenciesFromTemplate(E, e) {
     const R = /\{([^}]+)\}/g, A = E.matchAll(R), S = [];
-    for (const N of A) {
-      const t = N[1].trim();
+    for (const I of A) {
+      const t = I[1].trim();
       t.includes(".") ? S.push(t) : S.push(`${e}.${t}`);
     }
     return S;
@@ -2535,24 +2565,24 @@ class GE {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: R
-      }, N = this.queryPlanner.createQueryPlan(E, e, S), t = this.buildUnifiedQuery(N, e, S), C = this.queryBuilder.collectNumericFields(E, e), O = await this.dbExecutor.execute(t, C), I = Array.isArray(O) ? O.map((r) => {
-        const _ = { ...r };
+      }, I = this.queryPlanner.createQueryPlan(E, e, S), t = this.buildUnifiedQuery(I, e, S), s = this.queryBuilder.collectNumericFields(E, e), O = await this.dbExecutor.execute(t, s), N = Array.isArray(O) ? O.map((L) => {
+        const n = { ...L };
         if (e.timeDimensions) {
-          for (const D of e.timeDimensions)
-            if (D.dimension in _) {
-              let o = _[D.dimension];
+          for (const i of e.timeDimensions)
+            if (i.dimension in n) {
+              let o = n[i.dimension];
               if (typeof o == "string" && o.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
                 const u = o.replace(" ", "T"), P = !u.endsWith("Z") && !u.includes("+") ? u + "Z" : u;
                 o = new Date(P);
               }
-              o = this.databaseAdapter.convertTimeDimensionResult(o), _[D.dimension] = o;
+              o = this.databaseAdapter.convertTimeDimensionResult(o), n[i.dimension] = o;
             }
         }
-        return _;
-      }) : [O], s = this.generateAnnotations(N, e);
+        return n;
+      }) : [O], C = this.generateAnnotations(I, e);
       return {
-        data: I,
-        annotation: s
+        data: N,
+        annotation: C
       };
     } catch (A) {
       throw new Error(`Query execution failed: ${A instanceof Error ? A.message : "Unknown error"}`);
@@ -2569,73 +2599,73 @@ class GE {
    * Build pre-aggregation CTE for hasMany relationships
    */
   buildPreAggregationCTE(E, e, R, A) {
-    const S = E.cube, N = S.sql(R), t = {};
+    const S = E.cube, I = S.sql(R), t = {};
     for (const P of E.joinKeys)
       if (P.targetColumnObj) {
         t[P.targetColumn] = P.targetColumnObj;
         for (const [l, M] of Object.entries(S.dimensions || {}))
-          M.sql === P.targetColumnObj && l !== P.targetColumn && (t[l] = L`${P.targetColumnObj}`.as(l));
+          M.sql === P.targetColumnObj && l !== P.targetColumn && (t[l] = r`${P.targetColumnObj}`.as(l));
       }
-    const C = S.name, O = /* @__PURE__ */ new Map([[C, S]]), I = this.queryBuilder.buildResolvedMeasures(
+    const s = S.name, O = /* @__PURE__ */ new Map([[s, S]]), N = this.queryBuilder.buildResolvedMeasures(
       E.measures,
       O,
       R
     );
     for (const P of E.measures) {
-      const [, l] = P.split("."), M = I.get(P);
+      const [, l] = P.split("."), M = N.get(P);
       if (M) {
         const G = M();
-        t[l] = L`${G}`.as(l);
+        t[l] = r`${G}`.as(l);
       }
     }
     if (e.dimensions)
       for (const P of e.dimensions) {
         const [l, M] = P.split(".");
-        if (l === C && S.dimensions && S.dimensions[M]) {
+        if (l === s && S.dimensions && S.dimensions[M]) {
           const G = S.dimensions[M], m = this.queryBuilder.buildMeasureExpression({ sql: G.sql, type: "number" }, R);
-          t[M] = L`${m}`.as(M);
+          t[M] = r`${m}`.as(M);
         }
       }
     if (e.timeDimensions)
       for (const P of e.timeDimensions) {
         const [l, M] = P.dimension.split(".");
-        if (l === C && S.dimensions && S.dimensions[M]) {
+        if (l === s && S.dimensions && S.dimensions[M]) {
           const G = S.dimensions[M], m = this.queryBuilder.buildTimeDimensionExpression(G.sql, P.granularity, R);
-          t[M] = L`${m}`.as(M);
+          t[M] = r`${m}`.as(M);
         }
       }
     if (Object.keys(t).length === 0)
       return null;
-    let s = R.db.select(t).from(N.from);
-    const r = A ? {
+    let C = R.db.select(t).from(I.from);
+    const L = A ? {
       ...A,
       preAggregationCTEs: A.preAggregationCTEs?.filter((P) => P.cube.name !== S.name)
-    } : void 0, _ = this.queryBuilder.buildWhereConditions(S, e, R, r), D = [];
+    } : void 0, n = this.queryBuilder.buildWhereConditions(S, e, R, L), i = [];
     if (e.timeDimensions)
       for (const P of e.timeDimensions) {
         const [l, M] = P.dimension.split(".");
-        if (l === C && S.dimensions && S.dimensions[M] && P.dateRange) {
+        if (l === s && S.dimensions && S.dimensions[M] && P.dateRange) {
           const G = S.dimensions[M], m = this.queryBuilder.buildMeasureExpression({ sql: G.sql, type: "number" }, R), B = this.queryBuilder.buildDateRangeCondition(m, P.dateRange);
-          B && D.push(B);
+          B && i.push(B);
         }
       }
     if (e.filters) {
       for (const P of e.filters)
         if (!("and" in P) && !("or" in P) && "member" in P && "operator" in P) {
           const l = P, [M, G] = l.member.split(".");
-          if (M === C && S.dimensions && S.dimensions[G]) {
+          if (M === s && S.dimensions && S.dimensions[G]) {
             const m = S.dimensions[G];
             if (l.operator === "inDateRange") {
               const B = this.queryBuilder.buildMeasureExpression({ sql: m.sql, type: "number" }, R), b = this.queryBuilder.buildDateRangeCondition(B, l.values);
-              b && D.push(b);
+              b && i.push(b);
             }
           }
         }
     }
     const o = [];
-    if (N.where && o.push(N.where), o.push(..._, ...D), o.length > 0) {
+    if (I.where && o.push(I.where), o.push(...n, ...i), o.length > 0) {
       const P = o.length === 1 ? o[0] : h(...o);
-      s = s.where(P);
+      C = C.where(P);
     }
     const u = [];
     for (const P of E.joinKeys)
@@ -2643,7 +2673,7 @@ class GE {
     if (e.dimensions)
       for (const P of e.dimensions) {
         const [l, M] = P.split(".");
-        if (l === C && S.dimensions && S.dimensions[M]) {
+        if (l === s && S.dimensions && S.dimensions[M]) {
           const G = S.dimensions[M], m = w(G.sql, R);
           u.push(m);
         }
@@ -2651,25 +2681,25 @@ class GE {
     if (e.timeDimensions)
       for (const P of e.timeDimensions) {
         const [l, M] = P.dimension.split(".");
-        if (l === C && S.dimensions && S.dimensions[M]) {
+        if (l === s && S.dimensions && S.dimensions[M]) {
           const G = S.dimensions[M], m = this.queryBuilder.buildTimeDimensionExpression(G.sql, P.granularity, R);
           u.push(m);
         }
       }
-    return u.length > 0 && (s = s.groupBy(...u)), R.db.$with(E.cteAlias).as(s);
+    return u.length > 0 && (C = C.groupBy(...u)), R.db.$with(E.cteAlias).as(C);
   }
   // Removed unused getActualJoinTargetColumn method
   /**
    * Build join condition for CTE
    */
   buildCTEJoinCondition(E, e, R) {
-    const A = R.preAggregationCTEs?.find((N) => N.cube.name === E.cube.name);
+    const A = R.preAggregationCTEs?.find((I) => I.cube.name === E.cube.name);
     if (!A)
       throw new Error(`CTE info not found for cube ${E.cube.name}`);
     const S = [];
-    for (const N of A.joinKeys) {
-      const t = N.sourceColumnObj || L.identifier(N.sourceColumn), C = L`${L.identifier(e)}.${L.identifier(N.targetColumn)}`;
-      S.push(k(t, C));
+    for (const I of A.joinKeys) {
+      const t = I.sourceColumnObj || r.identifier(I.sourceColumn), s = r`${r.identifier(e)}.${r.identifier(I.targetColumn)}`;
+      S.push(k(t, s));
     }
     return S.length === 1 ? S[0] : h(...S);
   }
@@ -2683,7 +2713,7 @@ class GE {
         const u = this.buildPreAggregationCTE(o, e, R, E);
         u && (A.push(u), S.set(o.cube.name, o.cteAlias));
       }
-    const N = E.primaryCube.sql(R), C = { ...this.queryBuilder.buildSelections(
+    const I = E.primaryCube.sql(R), s = { ...this.queryBuilder.buildSelections(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       e,
@@ -2693,7 +2723,7 @@ class GE {
       for (const o of E.preAggregationCTEs) {
         const u = o.cube.name;
         for (const P of o.measures)
-          if (C[P]) {
+          if (s[P]) {
             const [, l] = P.split("."), M = this.getCubesFromPlan(E).get(u);
             if (M && M.measures && M.measures[l]) {
               const G = M.measures[l];
@@ -2708,7 +2738,7 @@ class GE {
                   R
                 );
               } else {
-                const B = L`${L.identifier(o.cteAlias)}.${L.identifier(l)}`;
+                const B = r`${r.identifier(o.cteAlias)}.${r.identifier(l)}`;
                 switch (G.type) {
                   case "count":
                   case "countDistinct":
@@ -2731,10 +2761,10 @@ class GE {
                     m = y(B);
                 }
               }
-              C[P] = L`${m}`.as(P);
+              s[P] = r`${m}`.as(P);
             }
           }
-        for (const P in C) {
+        for (const P in s) {
           const [l, M] = P.split(".");
           if (l === u) {
             const G = this.getCubesFromPlan(E).get(u), m = G && G.dimensions?.[M], B = P.startsWith(u + ".");
@@ -2744,27 +2774,27 @@ class GE {
                 const _E = G.dimensions[M].sql;
                 b = o.joinKeys.find((_e) => _e.targetColumnObj === _E);
               }
-              b ? C[P] = L`${L.identifier(o.cteAlias)}.${L.identifier(M)}`.as(P) : B && G?.dimensions?.[M] && (C[P] = L`${L.identifier(o.cteAlias)}.${L.identifier(M)}`.as(P));
+              b ? s[P] = r`${r.identifier(o.cteAlias)}.${r.identifier(M)}`.as(P) : B && G?.dimensions?.[M] && (s[P] = r`${r.identifier(o.cteAlias)}.${r.identifier(M)}`.as(P));
             }
           }
         }
       }
     const O = [];
-    let I = R.db.select(C).from(N.from);
-    if (A.length > 0 && (I = R.db.with(...A).select(C).from(N.from)), N.joins)
-      for (const o of N.joins)
+    let N = R.db.select(s).from(I.from);
+    if (A.length > 0 && (N = R.db.with(...A).select(s).from(I.from)), I.joins)
+      for (const o of I.joins)
         switch (o.type || "left") {
           case "left":
-            I = I.leftJoin(o.table, o.on);
+            N = N.leftJoin(o.table, o.on);
             break;
           case "inner":
-            I = I.innerJoin(o.table, o.on);
+            N = N.innerJoin(o.table, o.on);
             break;
           case "right":
-            I = I.rightJoin(o.table, o.on);
+            N = N.rightJoin(o.table, o.on);
             break;
           case "full":
-            I = I.fullJoin(o.table, o.on);
+            N = N.fullJoin(o.table, o.on);
             break;
         }
     if (E.joinCubes && E.joinCubes.length > 0)
@@ -2779,16 +2809,16 @@ class GE {
           try {
             switch (M.joinType || "left") {
               case "left":
-                I = I.leftJoin(M.table, M.joinCondition);
+                N = N.leftJoin(M.table, M.joinCondition);
                 break;
               case "inner":
-                I = I.innerJoin(M.table, M.joinCondition);
+                N = N.innerJoin(M.table, M.joinCondition);
                 break;
               case "right":
-                I = I.rightJoin(M.table, M.joinCondition);
+                N = N.rightJoin(M.table, M.joinCondition);
                 break;
               case "full":
-                I = I.fullJoin(M.table, M.joinCondition);
+                N = N.fullJoin(M.table, M.joinCondition);
                 break;
             }
             G.length > 0 && O.push(...G);
@@ -2796,33 +2826,33 @@ class GE {
           }
         }
         let P, l;
-        u ? (P = L`${L.identifier(u)}`, l = this.buildCTEJoinCondition(o, u, E)) : (P = o.cube.sql(R).from, l = o.joinCondition);
+        u ? (P = r`${r.identifier(u)}`, l = this.buildCTEJoinCondition(o, u, E)) : (P = o.cube.sql(R).from, l = o.joinCondition);
         try {
           switch (o.joinType || "left") {
             case "left":
-              I = I.leftJoin(P, l);
+              N = N.leftJoin(P, l);
               break;
             case "inner":
-              I = I.innerJoin(P, l);
+              N = N.innerJoin(P, l);
               break;
             case "right":
-              I = I.rightJoin(P, l);
+              N = N.rightJoin(P, l);
               break;
             case "full":
-              I = I.fullJoin(P, l);
+              N = N.fullJoin(P, l);
               break;
           }
         } catch {
         }
       }
-    if (N.where && O.push(N.where), E.joinCubes && E.joinCubes.length > 0)
+    if (I.where && O.push(I.where), E.joinCubes && E.joinCubes.length > 0)
       for (const o of E.joinCubes) {
         if (S.get(o.cube.name))
           continue;
         const P = o.cube.sql(R);
         P.where && O.push(P.where);
       }
-    const s = this.queryBuilder.buildWhereConditions(
+    const C = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       e,
@@ -2830,11 +2860,11 @@ class GE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (s.length > 0 && O.push(...s), O.length > 0) {
+    if (C.length > 0 && O.push(...C), O.length > 0) {
       const o = O.length === 1 ? O[0] : h(...O);
-      I = I.where(o);
+      N = N.where(o);
     }
-    const r = this.queryBuilder.buildGroupByFields(
+    const L = this.queryBuilder.buildGroupByFields(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       e,
@@ -2842,8 +2872,8 @@ class GE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    r.length > 0 && (I = I.groupBy(...r));
-    const _ = this.queryBuilder.buildHavingConditions(
+    L.length > 0 && (N = N.groupBy(...L));
+    const n = this.queryBuilder.buildHavingConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       e,
@@ -2851,12 +2881,12 @@ class GE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (_.length > 0) {
-      const o = _.length === 1 ? _[0] : h(..._);
-      I = I.having(o);
+    if (n.length > 0) {
+      const o = n.length === 1 ? n[0] : h(...n);
+      N = N.having(o);
     }
-    const D = this.queryBuilder.buildOrderBy(e);
-    return D.length > 0 && (I = I.orderBy(...D)), I = this.queryBuilder.applyLimitAndOffset(I, e), I;
+    const i = this.queryBuilder.buildOrderBy(e);
+    return i.length > 0 && (N = N.orderBy(...i)), N = this.queryBuilder.applyLimitAndOffset(N, e), N;
   }
   /**
    * Convert query plan to cube map for QueryBuilder methods
@@ -2899,40 +2929,40 @@ class GE {
    * Generate annotations for UI metadata - unified approach
    */
   generateAnnotations(E, e) {
-    const R = {}, A = {}, S = {}, N = [E.primaryCube];
-    if (E.joinCubes && E.joinCubes.length > 0 && N.push(...E.joinCubes.map((t) => t.cube)), e.measures)
+    const R = {}, A = {}, S = {}, I = [E.primaryCube];
+    if (E.joinCubes && E.joinCubes.length > 0 && I.push(...E.joinCubes.map((t) => t.cube)), e.measures)
       for (const t of e.measures) {
-        const [C, O] = t.split("."), I = N.find((s) => s.name === C);
-        if (I && I.measures[O]) {
-          const s = I.measures[O];
+        const [s, O] = t.split("."), N = I.find((C) => C.name === s);
+        if (N && N.measures[O]) {
+          const C = N.measures[O];
           R[t] = {
-            title: s.title || O,
-            shortTitle: s.title || O,
-            type: s.type
+            title: C.title || O,
+            shortTitle: C.title || O,
+            type: C.type
           };
         }
       }
     if (e.dimensions)
       for (const t of e.dimensions) {
-        const [C, O] = t.split("."), I = N.find((s) => s.name === C);
-        if (I && I.dimensions[O]) {
-          const s = I.dimensions[O];
+        const [s, O] = t.split("."), N = I.find((C) => C.name === s);
+        if (N && N.dimensions[O]) {
+          const C = N.dimensions[O];
           A[t] = {
-            title: s.title || O,
-            shortTitle: s.title || O,
-            type: s.type
+            title: C.title || O,
+            shortTitle: C.title || O,
+            type: C.type
           };
         }
       }
     if (e.timeDimensions)
       for (const t of e.timeDimensions) {
-        const [C, O] = t.dimension.split("."), I = N.find((s) => s.name === C);
-        if (I && I.dimensions && I.dimensions[O]) {
-          const s = I.dimensions[O];
+        const [s, O] = t.dimension.split("."), N = I.find((C) => C.name === s);
+        if (N && N.dimensions && N.dimensions[O]) {
+          const C = N.dimensions[O];
           S[t.dimension] = {
-            title: s.title || O,
-            shortTitle: s.title || O,
-            type: s.type,
+            title: C.title || O,
+            shortTitle: C.title || O,
+            type: C.type,
             granularity: t.granularity
           };
         }
@@ -2945,13 +2975,13 @@ class GE {
     };
   }
 }
-const n = (T) => T.flatMap(Xe), Xe = (T) => IE(Ke(T)).map(ye), ye = (T) => T.replace(/ +/g, " ").trim(), Ke = (T) => ({
+const _ = (T) => T.flatMap(Xe), Xe = (T) => IE(ge(T)).map(ye), ye = (T) => T.replace(/ +/g, " ").trim(), ge = (T) => ({
   type: "mandatory_block",
   items: ET(T, 0)[0]
 }), ET = (T, E, e) => {
   const R = [];
   for (; T[E]; ) {
-    const [A, S] = ge(T, E);
+    const [A, S] = Ke(T, E);
     if (R.push(A), E = S, T[E] === "|")
       E++;
     else if (T[E] === "}" || T[E] === "]") {
@@ -2966,7 +2996,7 @@ const n = (T) => T.flatMap(Xe), Xe = (T) => IE(Ke(T)).map(ye), ye = (T) => T.rep
       throw new Error(`Unexpected "${T[E]}"`);
   }
   return [R, E];
-}, ge = (T, E) => {
+}, Ke = (T, E) => {
   const e = [];
   for (; ; ) {
     const [R, A] = $e(T, E);
@@ -3010,23 +3040,23 @@ const n = (T) => T.flatMap(Xe), Xe = (T) => IE(Ke(T)).map(ye), ye = (T) => T.rep
       e.push(R + A);
   return e;
 };
-var a;
+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";
-})(a = a || (a = {}));
+})(D = D || (D = {}));
 const Ee = (T) => ({
-  type: a.EOF,
+  type: D.EOF,
   raw: "«EOF»",
   text: "«EOF»",
   start: T
 }), z = Ee(1 / 0), q = (T) => (E) => E.type === T.type && E.text === T.text, x = {
-  ARRAY: q({ text: "ARRAY", type: a.RESERVED_DATA_TYPE }),
-  BY: q({ text: "BY", type: a.RESERVED_KEYWORD }),
-  SET: q({ text: "SET", type: a.RESERVED_CLAUSE }),
-  STRUCT: q({ text: "STRUCT", type: a.RESERVED_DATA_TYPE }),
-  WINDOW: q({ text: "WINDOW", type: a.RESERVED_CLAUSE }),
-  VALUES: q({ text: "VALUES", type: a.RESERVED_CLAUSE })
-}, Te = (T) => T === a.RESERVED_DATA_TYPE || T === a.RESERVED_KEYWORD || T === a.RESERVED_FUNCTION_NAME || T === a.RESERVED_KEYWORD_PHRASE || T === a.RESERVED_DATA_TYPE_PHRASE || T === a.RESERVED_CLAUSE || T === a.RESERVED_SELECT || T === a.RESERVED_SET_OPERATION || T === a.RESERVED_JOIN || T === a.ARRAY_KEYWORD || T === a.CASE || T === a.END || T === a.WHEN || T === a.ELSE || T === a.THEN || T === a.LIMIT || T === a.BETWEEN || T === a.AND || T === a.OR || T === a.XOR, ve = (T) => T === a.AND || T === a.OR || T === a.XOR, Qe = [
+  ARRAY: q({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
+  BY: q({ text: "BY", type: D.RESERVED_KEYWORD }),
+  SET: q({ text: "SET", type: D.RESERVED_CLAUSE }),
+  STRUCT: q({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
+  WINDOW: q({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
+  VALUES: q({ text: "VALUES", type: D.RESERVED_CLAUSE })
+}, Te = (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, ve = (T) => T === D.AND || T === D.OR || T === D.XOR, Qe = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -3703,7 +3733,7 @@ const Ee = (T) => ({
   "STRUCT",
   "TIME",
   "TIMEZONE"
-], je = n(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), ke = n([
+], je = _(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), ke = _([
   // Queries: https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax
   "WITH [RECURSIVE]",
   "FROM",
@@ -3732,9 +3762,9 @@ const Ee = (T) => ({
   "WITH CONNECTION",
   "WITH PARTITION COLUMNS",
   "REMOTE WITH CONNECTION"
-]), nT = n([
+]), nT = _([
   "CREATE [OR REPLACE] [TEMP|TEMPORARY|SNAPSHOT|EXTERNAL] TABLE [IF NOT EXISTS]"
-]), mE = n([
+]), mE = _([
   // - create:
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -3822,15 +3852,15 @@ const Ee = (T) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), ze = n([
+]), ze = _([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), ER = n([
+]), ER = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), TR = n([
+]), TR = _([
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax#tablesample_operator
   "TABLESAMPLE SYSTEM",
   // From DDL: https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
@@ -3841,7 +3871,7 @@ const Ee = (T) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), eR = n([]), RR = {
+]), eR = _([]), RR = {
   name: "bigquery",
   tokenizerOptions: {
     reservedSelect: je,
@@ -3882,7 +3912,7 @@ function AR(T) {
 }
 function SR(T) {
   let E = z;
-  return T.map((e) => e.text === "OFFSET" && E.text === "[" ? (E = e, Object.assign(Object.assign({}, e), { type: a.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 IR(T) {
   var E;
@@ -3890,11 +3920,11 @@ function IR(T) {
   for (let R = 0; R < T.length; R++) {
     const A = T[R];
     if ((x.ARRAY(A) || x.STRUCT(A)) && ((E = T[R + 1]) === null || E === void 0 ? void 0 : E.text) === "<") {
-      const S = NR(T, R + 1), N = T.slice(R, S + 1);
+      const S = NR(T, R + 1), I = T.slice(R, S + 1);
       e.push({
-        type: a.IDENTIFIER,
-        raw: N.map(_T("raw")).join(""),
-        text: N.map(_T("text")).join(""),
+        type: D.IDENTIFIER,
+        raw: I.map(_T("raw")).join(""),
+        text: I.map(_T("text")).join(""),
         start: A.start
       }), R = S;
     } else
@@ -3902,7 +3932,7 @@ function IR(T) {
   }
   return e;
 }
-const _T = (T) => (E) => E.type === a.IDENTIFIER || E.type === a.COMMA ? E[T] + " " : E[T];
+const _T = (T) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[T] + " " : E[T];
 function NR(T, E) {
   let e = 0;
   for (let R = E; R < T.length; R++) {
@@ -4675,7 +4705,7 @@ const tR = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], rR = n(["SELECT [ALL | DISTINCT]"]), LR = n([
+], rR = _(["SELECT [ALL | DISTINCT]"]), LR = _([
   // queries
   "WITH",
   "FROM",
@@ -4704,9 +4734,9 @@ const tR = [
   "WHEN [NOT] MATCHED [THEN]",
   "UPDATE SET",
   "INSERT"
-]), iT = n([
+]), iT = _([
   "CREATE [GLOBAL TEMPORARY | EXTERNAL] TABLE [IF NOT EXISTS]"
-]), HE = n([
+]), HE = _([
   // - create:
   "CREATE [OR REPLACE] VIEW",
   // - update:
@@ -4909,16 +4939,16 @@ const tR = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), nR = n(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), _R = n([
+]), nR = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), _R = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), iR = n([
+]), iR = _([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), aR = n([]), oR = {
+]), aR = _([]), oR = {
   name: "db2",
   tokenizerOptions: {
     reservedSelect: rR,
@@ -5829,7 +5859,7 @@ const tR = [
   "VARCHAR",
   "VARGRAPHIC",
   "XML"
-], UR = n(["SELECT [ALL | DISTINCT]"]), lR = n([
+], UR = _(["SELECT [ALL | DISTINCT]"]), lR = _([
   // queries
   "WITH [RECURSIVE]",
   "INTO",
@@ -5859,7 +5889,7 @@ const tR = [
   "INSERT",
   // Data definition - table
   "FOR SYSTEM NAME"
-]), aT = n(["CREATE [OR REPLACE] TABLE"]), dE = n([
+]), aT = _(["CREATE [OR REPLACE] TABLE"]), dE = _([
   // - create:
   "CREATE [OR REPLACE] [RECURSIVE] VIEW",
   // - update:
@@ -5955,17 +5985,17 @@ const tR = [
   "TAG",
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}"
-]), cR = n(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), uR = n([
+]), cR = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), uR = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "[LEFT | RIGHT] EXCEPTION JOIN",
   "{INNER | CROSS} JOIN"
-]), GR = n([
+]), GR = _([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), mR = n([]), HR = {
+]), mR = _([]), HR = {
   name: "db2i",
   tokenizerOptions: {
     reservedSelect: UR,
@@ -6818,7 +6848,7 @@ const tR = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], FR = n(["SELECT [ALL | DISTINCT]"]), YR = n([
+], FR = _(["SELECT [ALL | DISTINCT]"]), YR = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -6842,9 +6872,9 @@ const tR = [
   "SET",
   // other:
   "RETURNING"
-]), oT = n([
+]), oT = _([
   "CREATE [OR REPLACE] [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"
-]), BE = n([
+]), BE = _([
   // TABLE
   // - update:
   "UPDATE",
@@ -6922,11 +6952,11 @@ const tR = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), fR = n([
+]), fR = _([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
-]), hR = n([
+]), hR = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -6935,11 +6965,11 @@ const tR = [
   "POSITIONAL JOIN",
   "ANTI JOIN",
   "SEMI JOIN"
-]), VR = n([
+]), VR = _([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "SIMILAR TO",
   "IS [NOT] DISTINCT FROM"
-]), WR = n(["TIMESTAMP WITH TIME ZONE"]), bR = {
+]), WR = _(["TIMESTAMP WITH TIME ZONE"]), bR = {
   name: "duckdb",
   tokenizerOptions: {
     reservedSelect: FR,
@@ -7538,7 +7568,7 @@ const tR = [
   "JSONFILE",
   "INPUTFORMAT",
   "OUTPUTFORMAT"
-], KR = [
+], gR = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types
   "ARRAY",
   "BIGINT",
@@ -7559,7 +7589,7 @@ const tR = [
   "STRUCT",
   "TIMESTAMP",
   "VARCHAR"
-], gR = n(["SELECT [ALL | DISTINCT]"]), $R = n([
+], KR = _(["SELECT [ALL | DISTINCT]"]), $R = _([
   // queries
   "WITH",
   "FROM",
@@ -7593,9 +7623,9 @@ const tR = [
   //   https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML#LanguageManualDML-Loadingfilesintotables
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), DT = n([
+]), DT = _([
   "CREATE [TEMPORARY] [EXTERNAL] TABLE [IF NOT EXISTS]"
-]), pE = n([
+]), pE = _([
   // - create:
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
   // - update:
@@ -7620,23 +7650,23 @@ const tR = [
   "STORED AS",
   "STORED BY",
   "ROW FORMAT"
-]), wR = n(["UNION [ALL | DISTINCT]"]), JR = n([
+]), wR = _(["UNION [ALL | DISTINCT]"]), JR = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "LEFT SEMI JOIN"
-]), xR = n(["{ROWS | RANGE} BETWEEN"]), vR = n([]), QR = {
+]), xR = _(["{ROWS | RANGE} BETWEEN"]), vR = _([]), QR = {
   name: "hive",
   tokenizerOptions: {
-    reservedSelect: gR,
+    reservedSelect: KR,
     reservedClauses: [...$R, ...DT, ...pE],
     reservedSetOperations: wR,
     reservedJoins: JR,
     reservedKeywordPhrases: xR,
     reservedDataTypePhrases: vR,
     reservedKeywords: yR,
-    reservedDataTypes: KR,
+    reservedDataTypes: gR,
     reservedFunctionNames: XR,
     extraParens: ["[]"],
     stringTypes: ['""-bs', "''-bs"],
@@ -7653,9 +7683,9 @@ function nE(T) {
   return T.map((E, e) => {
     const R = T[e + 1] || z;
     if (x.SET(E) && R.text === "(")
-      return Object.assign(Object.assign({}, E), { type: a.RESERVED_FUNCTION_NAME });
+      return Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME });
     const A = T[e - 1] || z;
-    return x.VALUES(E) && A.text === "=" ? Object.assign(Object.assign({}, E), { type: a.RESERVED_FUNCTION_NAME }) : E;
+    return x.VALUES(E) && A.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
   });
 }
 const ZR = [
@@ -8164,7 +8194,7 @@ const ZR = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], kR = n(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), zR = n([
+], kR = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), zR = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8186,9 +8216,9 @@ const ZR = [
   "SET",
   // other
   "RETURNING"
-]), PT = n([
+]), PT = _([
   "CREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]"
-]), FE = n([
+]), FE = _([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -8395,12 +8425,12 @@ const ZR = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), EA = n([
+]), EA = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]",
   "MINUS [ALL | DISTINCT]"
-]), TA = n([
+]), TA = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8408,12 +8438,12 @@ const ZR = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), eA = n([
+]), eA = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), RA = n([]), AA = {
+]), RA = _([]), AA = {
   name: "mariadb",
   tokenizerOptions: {
     reservedSelect: kR,
@@ -9170,7 +9200,7 @@ const ZR = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], OA = n(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), tA = n([
+], OA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), tA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -9190,7 +9220,7 @@ const ZR = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), MT = n(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), YE = n([
+]), MT = _(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), YE = _([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -9371,7 +9401,7 @@ const ZR = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), sA = n(["UNION [ALL | DISTINCT]"]), CA = n([
+]), sA = _(["UNION [ALL | DISTINCT]"]), CA = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -9379,12 +9409,12 @@ const ZR = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), rA = n([
+]), rA = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), LA = n([]), nA = {
+]), LA = _([]), nA = {
   name: "mysql",
   tokenizerOptions: {
     reservedSelect: OA,
@@ -10002,7 +10032,7 @@ const ZR = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], oA = n(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), DA = n([
+], oA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), DA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -10022,7 +10052,7 @@ const ZR = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), UT = n(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), fE = n([
+]), UT = _(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), fE = _([
   // https://docs.pingcap.com/tidb/stable/sql-statement-create-view
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // https://docs.pingcap.com/tidb/stable/sql-statement-update
@@ -10137,7 +10167,7 @@ const ZR = [
   "UNLOCK TABLES",
   // https://docs.pingcap.com/tidb/stable/sql-statement-use
   "USE"
-]), PA = n(["UNION [ALL | DISTINCT]"]), MA = n([
+]), PA = _(["UNION [ALL | DISTINCT]"]), MA = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10145,12 +10175,12 @@ const ZR = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), UA = n([
+]), UA = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), lA = n([]), cA = {
+]), lA = _([]), cA = {
   name: "tidb",
   tokenizerOptions: {
     reservedSelect: oA,
@@ -10648,7 +10678,7 @@ const ZR = [
   // which it actually doesn't use.
   //
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/datatypes.html
-], HA = n(["SELECT [ALL | DISTINCT]"]), dA = n([
+], HA = _(["SELECT [ALL | DISTINCT]"]), dA = _([
   // queries
   "WITH",
   "FROM",
@@ -10675,7 +10705,7 @@ const ZR = [
   "NEST",
   "UNNEST",
   "RETURNING"
-]), lT = n([
+]), lT = _([
   // - update:
   "UPDATE",
   // - delete:
@@ -10715,7 +10745,7 @@ const ZR = [
   "SET CURRENT SCHEMA",
   "SHOW",
   "USE [PRIMARY] KEYS"
-]), BA = n(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), pA = n(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), FA = n(["{ROWS | RANGE | GROUPS} BETWEEN"]), YA = n([]), fA = {
+]), BA = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), pA = _(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), FA = _(["{ROWS | RANGE | GROUPS} BETWEEN"]), YA = _([]), fA = {
   name: "n1ql",
   tokenizerOptions: {
     reservedSelect: HA,
@@ -11349,7 +11379,7 @@ const ZR = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], bA = n(["SELECT [ALL | DISTINCT | UNIQUE]"]), XA = n([
+], bA = _(["SELECT [ALL | DISTINCT | UNIQUE]"]), XA = _([
   // queries
   "WITH",
   "FROM",
@@ -11373,9 +11403,9 @@ const ZR = [
   "UPDATE SET",
   // other
   "RETURNING"
-]), cT = n([
+]), cT = _([
   "CREATE [GLOBAL TEMPORARY | PRIVATE TEMPORARY | SHARDED | DUPLICATED | IMMUTABLE BLOCKCHAIN | BLOCKCHAIN | IMMUTABLE] TABLE"
-]), hE = n([
+]), hE = _([
   // - create:
   "CREATE [OR REPLACE] [NO FORCE | FORCE] [EDITIONING | EDITIONABLE | EDITIONABLE EDITIONING | NONEDITIONABLE] VIEW",
   "CREATE MATERIALIZED VIEW",
@@ -11403,7 +11433,7 @@ const ZR = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), yA = n(["UNION [ALL]", "MINUS", "INTERSECT"]), KA = n([
+]), yA = _(["UNION [ALL]", "MINUS", "INTERSECT"]), gA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -11411,18 +11441,18 @@ const ZR = [
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), gA = n([
+]), KA = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "ON COMMIT",
   "{ROWS | RANGE} BETWEEN"
-]), $A = n([]), wA = {
+]), $A = _([]), wA = {
   name: "plsql",
   tokenizerOptions: {
     reservedSelect: bA,
     reservedClauses: [...XA, ...cT, ...hE],
     reservedSetOperations: yA,
-    reservedJoins: KA,
-    reservedKeywordPhrases: gA,
+    reservedJoins: gA,
+    reservedKeywordPhrases: KA,
     reservedDataTypePhrases: $A,
     supportsXor: !0,
     reservedKeywords: hA,
@@ -11462,7 +11492,7 @@ const ZR = [
 };
 function JA(T) {
   let E = z;
-  return T.map((e) => x.SET(e) && x.BY(E) ? Object.assign(Object.assign({}, e), { type: a.RESERVED_KEYWORD }) : (Te(e.type) && (E = e), e));
+  return T.map((e) => x.SET(e) && x.BY(E) ? Object.assign(Object.assign({}, e), { type: D.RESERVED_KEYWORD }) : (Te(e.type) && (E = e), e));
 }
 const xA = [
   // https://www.postgresql.org/docs/14/functions.html
@@ -12301,7 +12331,7 @@ const xA = [
   "VARCHAR",
   "XML",
   "ZONE"
-], ZA = n(["SELECT [ALL | DISTINCT]"]), qA = n([
+], ZA = _(["SELECT [ALL | DISTINCT]"]), qA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12324,9 +12354,9 @@ const xA = [
   "SET",
   // other
   "RETURNING"
-]), uT = n([
+]), uT = _([
   "CREATE [GLOBAL | LOCAL] [TEMPORARY | TEMP | UNLOGGED] TABLE [IF NOT EXISTS]"
-]), VE = n([
+]), VE = _([
   // - create
   "CREATE [OR REPLACE] [TEMP | TEMPORARY] [RECURSIVE] VIEW",
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -12524,17 +12554,17 @@ const xA = [
   "START TRANSACTION",
   "UNLISTEN",
   "VACUUM"
-]), jA = n([
+]), jA = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), kA = n([
+]), kA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), zA = n([
+]), zA = _([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
@@ -12545,7 +12575,7 @@ const xA = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), ES = n([
+]), ES = _([
   // https://www.postgresql.org/docs/current/datatype-datetime.html
   "[TIMESTAMP | TIME] {WITH | WITHOUT} TIME ZONE"
 ]), TS = {
@@ -13230,7 +13260,7 @@ const xA = [
   "TEXT",
   "VARBYTE",
   "VARCHAR"
-], SS = n(["SELECT [ALL | DISTINCT]"]), IS = n([
+], SS = _(["SELECT [ALL | DISTINCT]"]), IS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13248,9 +13278,9 @@ const xA = [
   "VALUES",
   // - update:
   "SET"
-]), GT = n([
+]), GT = _([
   "CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]"
-]), WE = n([
+]), WE = _([
   // - create:
   "CREATE [OR REPLACE | MATERIALIZED] VIEW",
   // - update:
@@ -13341,13 +13371,13 @@ const xA = [
   "START TRANSACTION",
   "UNLOAD",
   "VACUUM"
-]), NS = n(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), OS = n([
+]), NS = _(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), OS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), tS = n([
+]), tS = _([
   // https://docs.aws.amazon.com/redshift/latest/dg/copy-parameters-data-conversion.html
   "NULL AS",
   // https://docs.aws.amazon.com/redshift/latest/dg/r_CREATE_EXTERNAL_SCHEMA.html
@@ -13355,7 +13385,7 @@ const xA = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), sS = n([]), CS = {
+]), sS = _([]), CS = {
   name: "redshift",
   tokenizerOptions: {
     reservedSelect: SS,
@@ -14011,7 +14041,7 @@ const xA = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], _S = n(["SELECT [ALL | DISTINCT]"]), iS = n([
+], _S = _(["SELECT [ALL | DISTINCT]"]), iS = _([
   // queries
   "WITH",
   "FROM",
@@ -14036,7 +14066,7 @@ const xA = [
   //   https://spark.apache.org/docs/latest/sql-ref-syntax-dml-load.html
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), mT = n(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), bE = n([
+]), mT = _(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), bE = _([
   // - create:
   "CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]",
   // - drop table:
@@ -14092,11 +14122,11 @@ const xA = [
   "SHOW TBLPROPERTIES",
   "SHOW VIEWS",
   "UNCACHE TABLE"
-]), aS = n([
+]), aS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), oS = n([
+]), oS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -14105,12 +14135,12 @@ const xA = [
   // non-standard-joins
   "[LEFT] {ANTI | SEMI} JOIN",
   "NATURAL [LEFT] {ANTI | SEMI} JOIN"
-]), DS = n([
+]), DS = _([
   "ON DELETE",
   "ON UPDATE",
   "CURRENT ROW",
   "{ROWS | RANGE} BETWEEN"
-]), PS = n([]), MS = {
+]), PS = _([]), MS = {
   name: "spark",
   tokenizerOptions: {
     reservedSelect: _S,
@@ -14144,7 +14174,7 @@ const xA = [
 function US(T) {
   return T.map((E, e) => {
     const R = T[e - 1] || z, A = T[e + 1] || z;
-    return x.WINDOW(E) && A.type === a.OPEN_PAREN ? Object.assign(Object.assign({}, E), { type: a.RESERVED_FUNCTION_NAME }) : E.text === "ITEMS" && E.type === a.RESERVED_KEYWORD && !(R.text === "COLLECTION" && A.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: a.IDENTIFIER, text: E.raw }) : E;
+    return x.WINDOW(E) && A.type === D.OPEN_PAREN ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E.text === "ITEMS" && E.type === D.RESERVED_KEYWORD && !(R.text === "COLLECTION" && A.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: D.IDENTIFIER, text: E.raw }) : E;
   });
 }
 const lS = [
@@ -14445,7 +14475,7 @@ const lS = [
   "TEXT",
   "VARCHAR",
   "VARYING CHARACTER"
-], GS = n(["SELECT [ALL | DISTINCT]"]), mS = n([
+], GS = _(["SELECT [ALL | DISTINCT]"]), mS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14466,7 +14496,7 @@ const lS = [
   "SET",
   // other:
   "RETURNING"
-]), HT = n(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), XE = n([
+]), HT = _(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), XE = _([
   // - create:
   "CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]",
   // - update:
@@ -14485,17 +14515,17 @@ const lS = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), HS = n(["UNION [ALL]", "EXCEPT", "INTERSECT"]), dS = n([
+]), HS = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), dS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), BS = n([
+]), BS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
-]), pS = n([]), FS = {
+]), pS = _([]), FS = {
   name: "sqlite",
   tokenizerOptions: {
     reservedSelect: GS,
@@ -14857,7 +14887,7 @@ const lS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], VS = n(["SELECT [ALL | DISTINCT]"]), WS = n([
+], VS = _(["SELECT [ALL | DISTINCT]"]), WS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14876,7 +14906,7 @@ const lS = [
   "VALUES",
   // - update:
   "SET"
-]), dT = n(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), yE = n([
+]), dT = _(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), yE = _([
   // - create:
   "CREATE [RECURSIVE] VIEW",
   // - update:
@@ -14901,20 +14931,20 @@ const lS = [
   "TRUNCATE TABLE",
   // other
   "SET SCHEMA"
-]), bS = n([
+]), bS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), XS = n([
+]), XS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), yS = n([
+]), yS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), KS = n([]), gS = {
+]), gS = _([]), KS = {
   name: "sql",
   tokenizerOptions: {
     reservedSelect: VS,
@@ -14922,7 +14952,7 @@ const lS = [
     reservedSetOperations: bS,
     reservedJoins: XS,
     reservedKeywordPhrases: yS,
-    reservedDataTypePhrases: KS,
+    reservedDataTypePhrases: gS,
     reservedKeywords: fS,
     reservedDataTypes: hS,
     reservedFunctionNames: YS,
@@ -15648,7 +15678,7 @@ const lS = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], xS = n(["SELECT [ALL | DISTINCT]"]), vS = n([
+], xS = _(["SELECT [ALL | DISTINCT]"]), vS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -15676,7 +15706,7 @@ const lS = [
   "PATTERN",
   "SUBSET",
   "DEFINE"
-]), BT = n(["CREATE TABLE [IF NOT EXISTS]"]), KE = n([
+]), BT = _(["CREATE TABLE [IF NOT EXISTS]"]), gE = _([
   // - create:
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW",
   // - update:
@@ -15734,25 +15764,25 @@ const lS = [
   "SHOW ROLE GRANTS",
   "SHOW FUNCTIONS",
   "SHOW SESSION"
-]), QS = n([
+]), QS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), ZS = n([
+]), ZS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), qS = n([
+]), qS = _([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), jS = n([]), kS = {
+]), jS = _([]), kS = {
   name: "trino",
   tokenizerOptions: {
     reservedSelect: xS,
-    reservedClauses: [...vS, ...BT, ...KE],
+    reservedClauses: [...vS, ...BT, ...gE],
     reservedSetOperations: QS,
     reservedJoins: ZS,
     reservedKeywordPhrases: qS,
@@ -15788,8 +15818,8 @@ const lS = [
     ]
   },
   formatOptions: {
-    onelineClauses: [...BT, ...KE],
-    tabularOnelineClauses: KE
+    onelineClauses: [...BT, ...gE],
+    tabularOnelineClauses: gE
   }
 }, zS = [
   // https://docs.microsoft.com/en-us/sql/t-sql/functions/functions?view=sql-server-ver15
@@ -16304,7 +16334,7 @@ const lS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], eI = n(["SELECT [ALL | DISTINCT]"]), RI = n([
+], eI = _(["SELECT [ALL | DISTINCT]"]), RI = _([
   // queries
   "WITH",
   "INTO",
@@ -16329,7 +16359,7 @@ const lS = [
   "MERGE [INTO]",
   "WHEN [NOT] MATCHED [BY TARGET | BY SOURCE] [THEN]",
   "UPDATE SET"
-]), pT = n(["CREATE TABLE"]), gE = n([
+]), pT = _(["CREATE TABLE"]), KE = _([
   // - create:
   "CREATE [OR ALTER] [MATERIALIZED] VIEW",
   // - update:
@@ -16509,20 +16539,20 @@ const lS = [
   "XACT_ABORT",
   "XML INDEX",
   "XML SCHEMA COLLECTION"
-]), AI = n(["UNION [ALL]", "EXCEPT", "INTERSECT"]), SI = n([
+]), AI = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), SI = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), II = n([
+]), II = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), NI = n([]), OI = {
+]), NI = _([]), OI = {
   name: "transactsql",
   tokenizerOptions: {
     reservedSelect: eI,
-    reservedClauses: [...RI, ...pT, ...gE],
+    reservedClauses: [...RI, ...pT, ...KE],
     reservedSetOperations: AI,
     reservedJoins: SI,
     reservedKeywordPhrases: II,
@@ -16559,8 +16589,8 @@ const lS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...pT, ...gE],
-    tabularOnelineClauses: gE
+    onelineClauses: [...pT, ...KE],
+    tabularOnelineClauses: KE
   }
 }, tI = [
   // List of all keywords taken from:
@@ -17104,7 +17134,7 @@ const lS = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], rI = n(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), LI = n([
+], rI = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), LI = _([
   // queries
   "WITH",
   "FROM",
@@ -17126,9 +17156,9 @@ const lS = [
   // Data definition
   "CREATE [OR REPLACE] [TEMPORARY] PROCEDURE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [EXTERNAL] FUNCTION"
-]), FT = n([
+]), FT = _([
   "CREATE [ROWSTORE] [REFERENCE | TEMPORARY | GLOBAL TEMPORARY] TABLE [IF NOT EXISTS]"
-]), $E = n([
+]), $E = _([
   // - create:
   "CREATE VIEW",
   // - update:
@@ -17305,25 +17335,25 @@ const lS = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), nI = n([
+]), nI = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
   "MINUS"
-]), _I = n([
+]), _I = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), iI = n([
+]), iI = _([
   "ON DELETE",
   "ON UPDATE",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), aI = n([]), oI = {
+]), aI = _([]), oI = {
   name: "singlestoredb",
   tokenizerOptions: {
     reservedSelect: rI,
@@ -18116,7 +18146,7 @@ const lS = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], UI = n(["SELECT [ALL | DISTINCT]"]), lI = n([
+], UI = _(["SELECT [ALL | DISTINCT]"]), lI = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -18144,10 +18174,10 @@ const lS = [
   "WHEN MATCHED [AND]",
   "THEN {UPDATE SET | DELETE}",
   "WHEN NOT MATCHED THEN INSERT"
-]), YT = n([
+]), YT = _([
   "CREATE [OR REPLACE] [VOLATILE] TABLE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [LOCAL | GLOBAL] {TEMP|TEMPORARY} TABLE [IF NOT EXISTS]"
-]), wE = n([
+]), wE = _([
   // - create:
   "CREATE [OR REPLACE] [SECURE] [RECURSIVE] VIEW [IF NOT EXISTS]",
   // - update:
@@ -18388,14 +18418,14 @@ const lS = [
   "USE SCHEMA",
   "USE SECONDARY ROLES",
   "USE WAREHOUSE"
-]), cI = n(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), uI = n([
+]), cI = _(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), uI = _([
   "[INNER] JOIN",
   "[NATURAL] {LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{CROSS | NATURAL} JOIN"
-]), GI = n([
+]), GI = _([
   "{ROWS | RANGE} BETWEEN",
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]"
-]), mI = n([]), HI = {
+]), mI = _([]), HI = {
   name: "snowflake",
   tokenizerOptions: {
     reservedSelect: UI,
@@ -18455,7 +18485,7 @@ const lS = [
   singlestoredb: oI,
   snowflake: HI,
   spark: MS,
-  sql: gS,
+  sql: KS,
   sqlite: FS,
   tidb: cA,
   transactsql: OI,
@@ -18465,7 +18495,7 @@ const lS = [
 |$)`, "uy"), hT = (T, E = []) => {
   const e = T === "open" ? 0 : 1, R = ["()", ...E].map((A) => A[e]);
   return v(R.map(X).join("|"));
-}, VT = (T) => v(`${ee(T).map(X).join("|")}`), fI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", g = (T, E = {}) => {
+}, VT = (T) => v(`${ee(T).map(X).join("|")}`), fI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", K = (T, E = {}) => {
   if (T.length === 0)
     return /^\b$/u;
   const e = fI(E), R = ee(T).map(X).join("|").replace(/ /gu, "\\s+");
@@ -18481,7 +18511,7 @@ const lS = [
     "[": "]",
     "(": ")",
     "{": "}"
-  }, E = "{left}(?:(?!{right}').)*?{right}", e = Object.entries(T).map(([N, t]) => E.replace(/{left}/g, X(N)).replace(/{right}/g, X(t))), R = X(Object.keys(T).join(""));
+  }, E = "{left}(?:(?!{right}').)*?{right}", e = Object.entries(T).map(([I, t]) => E.replace(/{left}/g, X(I)).replace(/{right}/g, X(t))), R = X(Object.keys(T).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${R}])(?:(?!\k<tag>').)*?\k<tag>`}|${e.join("|")})'`;
 }, WT = {
   // - backtick quoted (using `` to escape)
@@ -18509,8 +18539,8 @@ const lS = [
   // Oracle q'' strings: q'<text>' q'|text|' ...
   "q''": hI()
 }, Re = (T) => typeof T == "string" ? WT[T] : "regex" in T ? T.regex : FI(T) + WT[T.quote], VI = (T) => v(T.map((E) => "regex" in E ? E.regex : Re(E)).join("|")), Ae = (T) => T.map(Re).join("|"), bT = (T) => v(Ae(T)), WI = (T = {}) => v(Se(T)), Se = ({ first: T, rest: E, dashes: e, allowFirstCharNumber: R } = {}) => {
-  const A = "\\p{Alphabetic}\\p{Mark}_", S = "\\p{Decimal_Number}", N = X(T ?? ""), t = X(E ?? ""), C = R ? `[${A}${S}${N}][${A}${S}${t}]*` : `[${A}${N}][${A}${S}${t}]*`;
-  return e ? pI(C) : C;
+  const A = "\\p{Alphabetic}\\p{Mark}_", S = "\\p{Decimal_Number}", I = X(T ?? ""), t = X(E ?? ""), s = R ? `[${A}${S}${I}][${A}${S}${t}]*` : `[${A}${I}][${A}${S}${t}]*`;
+  return e ? pI(s) : s;
 };
 function Ie(T, E) {
   const e = T.slice(0, E).split(/\n/);
@@ -18579,7 +18609,7 @@ If possible, please select a more specific dialect (like sqlite, postgresql, etc
   }
 }
 const XT = /\/\*/uy, XI = /[\s\S]/uy, yI = /\*\//uy;
-class KI {
+class gI {
   constructor() {
     this.lastIndex = 0;
   }
@@ -18606,7 +18636,7 @@ class KI {
     return R && (this.lastIndex += R[0].length), R ? R[0] : null;
   }
 }
-class gI {
+class KI {
   constructor(E, e) {
     this.cfg = E, this.dialectName = e, this.rulesBeforeParams = this.buildRulesBeforeParams(E), this.rulesAfterParams = this.buildRulesAfterParams(E);
   }
@@ -18624,126 +18654,126 @@ class gI {
     var e, R, A;
     return this.validRules([
       {
-        type: a.DISABLE_COMMENT,
+        type: D.DISABLE_COMMENT,
         regex: /(\/\* *sql-formatter-disable *\*\/[\s\S]*?(?:\/\* *sql-formatter-enable *\*\/|$))/uy
       },
       {
-        type: a.BLOCK_COMMENT,
-        regex: E.nestedBlockComments ? new KI() : /(\/\*[^]*?\*\/)/uy
+        type: D.BLOCK_COMMENT,
+        regex: E.nestedBlockComments ? new gI() : /(\/\*[^]*?\*\/)/uy
       },
       {
-        type: a.LINE_COMMENT,
+        type: D.LINE_COMMENT,
         regex: YI((e = E.lineCommentTypes) !== null && e !== void 0 ? e : ["--"])
       },
       {
-        type: a.QUOTED_IDENTIFIER,
+        type: D.QUOTED_IDENTIFIER,
         regex: bT(E.identTypes)
       },
       {
-        type: a.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: a.RESERVED_KEYWORD_PHRASE,
-        regex: g((R = E.reservedKeywordPhrases) !== null && R !== void 0 ? R : [], E.identChars),
+        type: D.RESERVED_KEYWORD_PHRASE,
+        regex: K((R = E.reservedKeywordPhrases) !== null && R !== void 0 ? R : [], E.identChars),
         text: p
       },
       {
-        type: a.RESERVED_DATA_TYPE_PHRASE,
-        regex: g((A = E.reservedDataTypePhrases) !== null && A !== void 0 ? A : [], E.identChars),
+        type: D.RESERVED_DATA_TYPE_PHRASE,
+        regex: K((A = E.reservedDataTypePhrases) !== null && A !== void 0 ? A : [], E.identChars),
         text: p
       },
       {
-        type: a.CASE,
+        type: D.CASE,
         regex: /CASE\b/iuy,
         text: p
       },
       {
-        type: a.END,
+        type: D.END,
         regex: /END\b/iuy,
         text: p
       },
       {
-        type: a.BETWEEN,
+        type: D.BETWEEN,
         regex: /BETWEEN\b/iuy,
         text: p
       },
       {
-        type: a.LIMIT,
+        type: D.LIMIT,
         regex: E.reservedClauses.includes("LIMIT") ? /LIMIT\b/iuy : void 0,
         text: p
       },
       {
-        type: a.RESERVED_CLAUSE,
-        regex: g(E.reservedClauses, E.identChars),
+        type: D.RESERVED_CLAUSE,
+        regex: K(E.reservedClauses, E.identChars),
         text: p
       },
       {
-        type: a.RESERVED_SELECT,
-        regex: g(E.reservedSelect, E.identChars),
+        type: D.RESERVED_SELECT,
+        regex: K(E.reservedSelect, E.identChars),
         text: p
       },
       {
-        type: a.RESERVED_SET_OPERATION,
-        regex: g(E.reservedSetOperations, E.identChars),
+        type: D.RESERVED_SET_OPERATION,
+        regex: K(E.reservedSetOperations, E.identChars),
         text: p
       },
       {
-        type: a.WHEN,
+        type: D.WHEN,
         regex: /WHEN\b/iuy,
         text: p
       },
       {
-        type: a.ELSE,
+        type: D.ELSE,
         regex: /ELSE\b/iuy,
         text: p
       },
       {
-        type: a.THEN,
+        type: D.THEN,
         regex: /THEN\b/iuy,
         text: p
       },
       {
-        type: a.RESERVED_JOIN,
-        regex: g(E.reservedJoins, E.identChars),
+        type: D.RESERVED_JOIN,
+        regex: K(E.reservedJoins, E.identChars),
         text: p
       },
       {
-        type: a.AND,
+        type: D.AND,
         regex: /AND\b/iuy,
         text: p
       },
       {
-        type: a.OR,
+        type: D.OR,
         regex: /OR\b/iuy,
         text: p
       },
       {
-        type: a.XOR,
+        type: D.XOR,
         regex: E.supportsXor ? /XOR\b/iuy : void 0,
         text: p
       },
       ...E.operatorKeyword ? [
         {
-          type: a.OPERATOR,
+          type: D.OPERATOR,
           regex: /OPERATOR *\([^)]+\)/iuy
         }
       ] : [],
       {
-        type: a.RESERVED_FUNCTION_NAME,
-        regex: g(E.reservedFunctionNames, E.identChars),
+        type: D.RESERVED_FUNCTION_NAME,
+        regex: K(E.reservedFunctionNames, E.identChars),
         text: p
       },
       {
-        type: a.RESERVED_DATA_TYPE,
-        regex: g(E.reservedDataTypes, E.identChars),
+        type: D.RESERVED_DATA_TYPE,
+        regex: K(E.reservedDataTypes, E.identChars),
         text: p
       },
       {
-        type: a.RESERVED_KEYWORD,
-        regex: g(E.reservedKeywords, E.identChars),
+        type: D.RESERVED_KEYWORD,
+        regex: K(E.reservedKeywords, E.identChars),
         text: p
       }
     ]);
@@ -18754,26 +18784,26 @@ class gI {
     var e, R;
     return this.validRules([
       {
-        type: a.VARIABLE,
+        type: D.VARIABLE,
         regex: E.variableTypes ? VI(E.variableTypes) : void 0
       },
-      { type: a.STRING, regex: bT(E.stringTypes) },
+      { type: D.STRING, regex: bT(E.stringTypes) },
       {
-        type: a.IDENTIFIER,
+        type: D.IDENTIFIER,
         regex: WI(E.identChars)
       },
-      { type: a.DELIMITER, regex: /[;]/uy },
-      { type: a.COMMA, regex: /[,]/y },
+      { type: D.DELIMITER, regex: /[;]/uy },
+      { type: D.COMMA, regex: /[,]/y },
       {
-        type: a.OPEN_PAREN,
+        type: D.OPEN_PAREN,
         regex: hT("open", E.extraParens)
       },
       {
-        type: a.CLOSE_PAREN,
+        type: D.CLOSE_PAREN,
         regex: hT("close", E.extraParens)
       },
       {
-        type: a.OPERATOR,
+        type: D.OPERATOR,
         regex: VT([
           // standard operators
           "+",
@@ -18789,9 +18819,9 @@ class gI {
           ...(e = E.operators) !== null && e !== void 0 ? e : []
         ])
       },
-      { type: a.ASTERISK, regex: /[*]/uy },
+      { type: D.ASTERISK, regex: /[*]/uy },
       {
-        type: a.PROPERTY_ACCESS_OPERATOR,
+        type: D.PROPERTY_ACCESS_OPERATOR,
         regex: VT([".", ...(R = E.propertyAccessOperators) !== null && R !== void 0 ? R : []])
       }
     ]);
@@ -18799,43 +18829,43 @@ class gI {
   // These rules can't be blindly cached as the paramTypesOverrides object
   // can differ on each invocation of the format() function.
   buildParamRules(E, e) {
-    var R, A, S, N, t;
-    const C = {
+    var R, A, S, I, t;
+    const s = {
       named: e?.named || ((R = E.paramTypes) === null || R === void 0 ? void 0 : R.named) || [],
       quoted: e?.quoted || ((A = E.paramTypes) === null || A === void 0 ? void 0 : A.quoted) || [],
       numbered: e?.numbered || ((S = E.paramTypes) === null || S === void 0 ? void 0 : S.numbered) || [],
-      positional: typeof e?.positional == "boolean" ? e.positional : (N = E.paramTypes) === null || N === void 0 ? void 0 : N.positional,
+      positional: typeof e?.positional == "boolean" ? e.positional : (I = E.paramTypes) === null || I === void 0 ? void 0 : I.positional,
       custom: e?.custom || ((t = E.paramTypes) === null || t === void 0 ? void 0 : t.custom) || []
     };
     return this.validRules([
       {
-        type: a.NAMED_PARAMETER,
-        regex: xE(C.named, Se(E.paramChars || E.identChars)),
+        type: D.NAMED_PARAMETER,
+        regex: xE(s.named, Se(E.paramChars || E.identChars)),
         key: (O) => O.slice(1)
       },
       {
-        type: a.QUOTED_PARAMETER,
-        regex: xE(C.quoted, Ae(E.identTypes)),
-        key: (O) => (({ tokenKey: I, quoteChar: s }) => I.replace(new RegExp(X("\\" + s), "gu"), s))({
+        type: D.QUOTED_PARAMETER,
+        regex: xE(s.quoted, Ae(E.identTypes)),
+        key: (O) => (({ tokenKey: N, quoteChar: C }) => N.replace(new RegExp(X("\\" + C), "gu"), C))({
           tokenKey: O.slice(2, -1),
           quoteChar: O.slice(-1)
         })
       },
       {
-        type: a.NUMBERED_PARAMETER,
-        regex: xE(C.numbered, "[0-9]+"),
+        type: D.NUMBERED_PARAMETER,
+        regex: xE(s.numbered, "[0-9]+"),
         key: (O) => O.slice(1)
       },
       {
-        type: a.POSITIONAL_PARAMETER,
-        regex: C.positional ? /[?]/y : void 0
+        type: D.POSITIONAL_PARAMETER,
+        regex: s.positional ? /[?]/y : void 0
       },
-      ...C.custom.map((O) => {
-        var I;
+      ...s.custom.map((O) => {
+        var N;
         return {
-          type: a.CUSTOM_PARAMETER,
+          type: D.CUSTOM_PARAMETER,
           regex: v(O.regex),
-          key: (I = O.key) !== null && I !== void 0 ? I : ((s) => s)
+          key: (N = O.key) !== null && N !== void 0 ? N : ((C) => C)
         };
       })
     ]);
@@ -18849,7 +18879,7 @@ const p = (T) => NE(T.toUpperCase()), yT = /* @__PURE__ */ new Map(), $I = (T) =
   let E = yT.get(T);
   return E || (E = wI(T), yT.set(T, E)), E;
 }, wI = (T) => ({
-  tokenizer: new gI(T.tokenizerOptions, T.name),
+  tokenizer: new KI(T.tokenizerOptions, T.name),
   formatOptions: JI(T.formatOptions)
 }), JI = (T) => {
   var E;
@@ -18891,98 +18921,98 @@ class vI {
 function QI(T) {
   return T && T.__esModule && Object.prototype.hasOwnProperty.call(T, "default") ? T.default : T;
 }
-var OE = { exports: {} }, ZI = OE.exports, KT;
+var OE = { exports: {} }, ZI = OE.exports, gT;
 function qI() {
-  return KT || (KT = 1, (function(T) {
+  return gT || (gT = 1, (function(T) {
     (function(E, e) {
       T.exports ? T.exports = e() : E.nearley = e();
     })(ZI, function() {
-      function E(O, I, s) {
-        return this.id = ++E.highestId, this.name = O, this.symbols = I, this.postprocess = s, this;
+      function E(O, N, C) {
+        return this.id = ++E.highestId, this.name = O, this.symbols = N, this.postprocess = C, this;
       }
       E.highestId = 0, E.prototype.toString = function(O) {
-        var I = typeof O > "u" ? this.symbols.map(C).join(" ") : this.symbols.slice(0, O).map(C).join(" ") + " ● " + this.symbols.slice(O).map(C).join(" ");
-        return this.name + " → " + I;
+        var N = typeof O > "u" ? this.symbols.map(s).join(" ") : this.symbols.slice(0, O).map(s).join(" ") + " ● " + this.symbols.slice(O).map(s).join(" ");
+        return this.name + " → " + N;
       };
-      function e(O, I, s, r) {
-        this.rule = O, this.dot = I, this.reference = s, this.data = [], this.wantedBy = r, this.isComplete = this.dot === O.symbols.length;
+      function e(O, N, C, L) {
+        this.rule = O, this.dot = N, this.reference = C, this.data = [], this.wantedBy = L, this.isComplete = this.dot === O.symbols.length;
       }
       e.prototype.toString = function() {
         return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
       }, e.prototype.nextState = function(O) {
-        var I = new e(this.rule, this.dot + 1, this.reference, this.wantedBy);
-        return I.left = this, I.right = O, I.isComplete && (I.data = I.build(), I.right = void 0), I;
+        var N = new e(this.rule, this.dot + 1, this.reference, this.wantedBy);
+        return N.left = this, N.right = O, N.isComplete && (N.data = N.build(), N.right = void 0), N;
       }, e.prototype.build = function() {
-        var O = [], I = this;
+        var O = [], N = this;
         do
-          O.push(I.right.data), I = I.left;
-        while (I.left);
+          O.push(N.right.data), N = N.left;
+        while (N.left);
         return O.reverse(), O;
       }, e.prototype.finish = function() {
-        this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, N.fail));
+        this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, I.fail));
       };
-      function R(O, I) {
-        this.grammar = O, this.index = I, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
+      function R(O, N) {
+        this.grammar = O, this.index = N, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
       }
       R.prototype.process = function(O) {
-        for (var I = this.states, s = this.wants, r = this.completed, _ = 0; _ < I.length; _++) {
-          var D = I[_];
-          if (D.isComplete) {
-            if (D.finish(), D.data !== N.fail) {
-              for (var o = D.wantedBy, u = o.length; u--; ) {
+        for (var N = this.states, C = this.wants, L = this.completed, n = 0; n < N.length; n++) {
+          var i = N[n];
+          if (i.isComplete) {
+            if (i.finish(), i.data !== I.fail) {
+              for (var o = i.wantedBy, u = o.length; u--; ) {
                 var P = o[u];
-                this.complete(P, D);
+                this.complete(P, i);
               }
-              if (D.reference === this.index) {
-                var l = D.rule.name;
-                (this.completed[l] = this.completed[l] || []).push(D);
+              if (i.reference === this.index) {
+                var l = i.rule.name;
+                (this.completed[l] = this.completed[l] || []).push(i);
               }
             }
           } else {
-            var l = D.rule.symbols[D.dot];
+            var l = i.rule.symbols[i.dot];
             if (typeof l != "string") {
-              this.scannable.push(D);
+              this.scannable.push(i);
               continue;
             }
-            if (s[l]) {
-              if (s[l].push(D), r.hasOwnProperty(l))
-                for (var M = r[l], u = 0; u < M.length; u++) {
+            if (C[l]) {
+              if (C[l].push(i), L.hasOwnProperty(l))
+                for (var M = L[l], u = 0; u < M.length; u++) {
                   var G = M[u];
-                  this.complete(D, G);
+                  this.complete(i, G);
                 }
             } else
-              s[l] = [D], this.predict(l);
+              C[l] = [i], this.predict(l);
           }
         }
       }, R.prototype.predict = function(O) {
-        for (var I = this.grammar.byName[O] || [], s = 0; s < I.length; s++) {
-          var r = I[s], _ = this.wants[O], D = new e(r, 0, this.index, _);
-          this.states.push(D);
+        for (var N = this.grammar.byName[O] || [], C = 0; C < N.length; C++) {
+          var L = N[C], n = this.wants[O], i = new e(L, 0, this.index, n);
+          this.states.push(i);
         }
-      }, R.prototype.complete = function(O, I) {
-        var s = O.nextState(I);
-        this.states.push(s);
+      }, R.prototype.complete = function(O, N) {
+        var C = O.nextState(N);
+        this.states.push(C);
       };
-      function A(O, I) {
-        this.rules = O, this.start = I || this.rules[0].name;
-        var s = this.byName = {};
-        this.rules.forEach(function(r) {
-          s.hasOwnProperty(r.name) || (s[r.name] = []), s[r.name].push(r);
+      function A(O, N) {
+        this.rules = O, this.start = N || this.rules[0].name;
+        var C = this.byName = {};
+        this.rules.forEach(function(L) {
+          C.hasOwnProperty(L.name) || (C[L.name] = []), C[L.name].push(L);
         });
       }
-      A.fromCompiled = function(r, I) {
-        var s = r.Lexer;
-        r.ParserStart && (I = r.ParserStart, r = r.ParserRules);
-        var r = r.map(function(D) {
-          return new E(D.name, D.symbols, D.postprocess);
-        }), _ = new A(r, I);
-        return _.lexer = s, _;
+      A.fromCompiled = function(L, N) {
+        var C = L.Lexer;
+        L.ParserStart && (N = L.ParserStart, L = L.ParserRules);
+        var L = L.map(function(i) {
+          return new E(i.name, i.symbols, i.postprocess);
+        }), n = new A(L, N);
+        return n.lexer = C, n;
       };
       function S() {
         this.reset("");
       }
-      S.prototype.reset = function(O, I) {
-        this.buffer = O, this.index = 0, this.line = I ? I.line : 1, this.lastLineBreak = I ? -I.col : 0;
+      S.prototype.reset = function(O, N) {
+        this.buffer = O, this.index = 0, this.line = N ? N.line : 1, this.lastLineBreak = N ? -N.col : 0;
       }, S.prototype.next = function() {
         if (this.index < this.buffer.length) {
           var O = this.buffer[this.index++];
@@ -18994,144 +19024,144 @@ function qI() {
           line: this.line,
           col: this.index - this.lastLineBreak
         };
-      }, S.prototype.formatError = function(O, I) {
-        var s = this.buffer;
-        if (typeof s == "string") {
-          var r = s.split(`
+      }, S.prototype.formatError = function(O, N) {
+        var C = this.buffer;
+        if (typeof C == "string") {
+          var L = C.split(`
 `).slice(
             Math.max(0, this.line - 5),
             this.line
-          ), _ = s.indexOf(`
+          ), n = C.indexOf(`
 `, this.index);
-          _ === -1 && (_ = s.length);
-          var D = this.index - this.lastLineBreak, o = String(this.line).length;
-          return I += " at line " + this.line + " col " + D + `:
+          n === -1 && (n = C.length);
+          var i = this.index - this.lastLineBreak, o = String(this.line).length;
+          return N += " at line " + this.line + " col " + i + `:
 
-`, I += r.map(function(P, l) {
-            return u(this.line - r.length + l + 1, o) + " " + P;
+`, N += L.map(function(P, l) {
+            return u(this.line - L.length + l + 1, o) + " " + P;
           }, this).join(`
-`), I += `
-` + u("", o + D) + `^
-`, I;
+`), N += `
+` + u("", o + i) + `^
+`, N;
         } else
-          return I + " at index " + (this.index - 1);
+          return N + " at index " + (this.index - 1);
         function u(P, l) {
           var M = String(P);
           return Array(l - M.length + 1).join(" ") + M;
         }
       };
-      function N(O, I, s) {
+      function I(O, N, C) {
         if (O instanceof A)
-          var r = O, s = I;
+          var L = O, C = N;
         else
-          var r = A.fromCompiled(O, I);
-        this.grammar = r, this.options = {
+          var L = A.fromCompiled(O, N);
+        this.grammar = L, this.options = {
           keepHistory: !1,
-          lexer: r.lexer || new S()
+          lexer: L.lexer || new S()
         };
-        for (var _ in s || {})
-          this.options[_] = s[_];
+        for (var n in C || {})
+          this.options[n] = C[n];
         this.lexer = this.options.lexer, this.lexerState = void 0;
-        var D = new R(r, 0);
-        this.table = [D], D.wants[r.start] = [], D.predict(r.start), D.process(), this.current = 0;
+        var i = new R(L, 0);
+        this.table = [i], i.wants[L.start] = [], i.predict(L.start), i.process(), this.current = 0;
       }
-      N.fail = {}, N.prototype.feed = function(O) {
-        var I = this.lexer;
-        I.reset(O, this.lexerState);
-        for (var s; ; ) {
+      I.fail = {}, I.prototype.feed = function(O) {
+        var N = this.lexer;
+        N.reset(O, this.lexerState);
+        for (var C; ; ) {
           try {
-            if (s = I.next(), !s)
+            if (C = N.next(), !C)
               break;
           } catch (b) {
             var o = new R(this.grammar, this.current + 1);
             this.table.push(o);
-            var r = new Error(this.reportLexerError(b));
-            throw r.offset = this.current, r.token = b.token, r;
+            var L = new Error(this.reportLexerError(b));
+            throw L.offset = this.current, L.token = b.token, L;
           }
-          var _ = this.table[this.current];
+          var n = this.table[this.current];
           this.options.keepHistory || delete this.table[this.current - 1];
-          var D = this.current + 1, o = new R(this.grammar, D);
+          var i = this.current + 1, o = new R(this.grammar, i);
           this.table.push(o);
-          for (var u = s.text !== void 0 ? s.text : s.value, P = I.constructor === S ? s.value : s, l = _.scannable, M = l.length; M--; ) {
+          for (var u = C.text !== void 0 ? C.text : C.value, P = N.constructor === S ? C.value : C, l = n.scannable, M = l.length; M--; ) {
             var G = l[M], m = G.rule.symbols[G.dot];
-            if (m.test ? m.test(P) : m.type ? m.type === s.type : m.literal === u) {
-              var B = G.nextState({ data: P, token: s, isToken: !0, reference: D - 1 });
+            if (m.test ? m.test(P) : m.type ? m.type === C.type : m.literal === u) {
+              var B = G.nextState({ data: P, token: C, isToken: !0, reference: i - 1 });
               o.states.push(B);
             }
           }
           if (o.process(), o.states.length === 0) {
-            var r = new Error(this.reportError(s));
-            throw r.offset = this.current, r.token = s, r;
+            var L = new Error(this.reportError(C));
+            throw L.offset = this.current, L.token = C, L;
           }
-          this.options.keepHistory && (_.lexerState = I.save()), this.current++;
+          this.options.keepHistory && (n.lexerState = N.save()), this.current++;
         }
-        return _ && (this.lexerState = I.save()), this.results = this.finish(), this;
-      }, N.prototype.reportLexerError = function(O) {
-        var I, s, r = O.token;
-        return r ? (I = "input " + JSON.stringify(r.text[0]) + " (lexer error)", s = this.lexer.formatError(r, "Syntax error")) : (I = "input (lexer error)", s = O.message), this.reportErrorCommon(s, I);
-      }, N.prototype.reportError = function(O) {
-        var I = (O.type ? O.type + " token: " : "") + JSON.stringify(O.value !== void 0 ? O.value : O), s = this.lexer.formatError(O, "Syntax error");
-        return this.reportErrorCommon(s, I);
-      }, N.prototype.reportErrorCommon = function(O, I) {
-        var s = [];
-        s.push(O);
-        var r = this.table.length - 2, _ = this.table[r], D = _.states.filter(function(u) {
+        return n && (this.lexerState = N.save()), this.results = this.finish(), this;
+      }, I.prototype.reportLexerError = function(O) {
+        var N, C, L = O.token;
+        return L ? (N = "input " + JSON.stringify(L.text[0]) + " (lexer error)", C = this.lexer.formatError(L, "Syntax error")) : (N = "input (lexer error)", C = O.message), this.reportErrorCommon(C, N);
+      }, I.prototype.reportError = function(O) {
+        var N = (O.type ? O.type + " token: " : "") + JSON.stringify(O.value !== void 0 ? O.value : O), C = this.lexer.formatError(O, "Syntax error");
+        return this.reportErrorCommon(C, N);
+      }, I.prototype.reportErrorCommon = function(O, N) {
+        var C = [];
+        C.push(O);
+        var L = this.table.length - 2, n = this.table[L], i = n.states.filter(function(u) {
           var P = u.rule.symbols[u.dot];
           return P && typeof P != "string";
         });
-        if (D.length === 0)
-          s.push("Unexpected " + I + `. I did not expect any more input. Here is the state of my parse table:
-`), this.displayStateStack(_.states, s);
+        if (i.length === 0)
+          C.push("Unexpected " + N + `. I did not expect any more input. Here is the state of my parse table:
+`), this.displayStateStack(n.states, C);
         else {
-          s.push("Unexpected " + I + `. Instead, I was expecting to see one of the following:
+          C.push("Unexpected " + N + `. Instead, I was expecting to see one of the following:
 `);
-          var o = D.map(function(u) {
+          var o = i.map(function(u) {
             return this.buildFirstStateStack(u, []) || [u];
           }, this);
           o.forEach(function(u) {
             var P = u[0], l = P.rule.symbols[P.dot], M = this.getSymbolDisplay(l);
-            s.push("A " + M + " based on:"), this.displayStateStack(u, s);
+            C.push("A " + M + " based on:"), this.displayStateStack(u, C);
           }, this);
         }
-        return s.push(""), s.join(`
+        return C.push(""), C.join(`
 `);
-      }, N.prototype.displayStateStack = function(O, I) {
-        for (var s, r = 0, _ = 0; _ < O.length; _++) {
-          var D = O[_], o = D.rule.toString(D.dot);
-          o === s ? r++ : (r > 0 && I.push("    ^ " + r + " more lines identical to this"), r = 0, I.push("    " + o)), s = o;
+      }, I.prototype.displayStateStack = function(O, N) {
+        for (var C, L = 0, n = 0; n < O.length; n++) {
+          var i = O[n], o = i.rule.toString(i.dot);
+          o === C ? L++ : (L > 0 && N.push("    ^ " + L + " more lines identical to this"), L = 0, N.push("    " + o)), C = o;
         }
-      }, N.prototype.getSymbolDisplay = function(O) {
+      }, I.prototype.getSymbolDisplay = function(O) {
         return t(O);
-      }, N.prototype.buildFirstStateStack = function(O, I) {
-        if (I.indexOf(O) !== -1)
+      }, I.prototype.buildFirstStateStack = function(O, N) {
+        if (N.indexOf(O) !== -1)
           return null;
         if (O.wantedBy.length === 0)
           return [O];
-        var s = O.wantedBy[0], r = [O].concat(I), _ = this.buildFirstStateStack(s, r);
-        return _ === null ? null : [O].concat(_);
-      }, N.prototype.save = function() {
+        var C = O.wantedBy[0], L = [O].concat(N), n = this.buildFirstStateStack(C, L);
+        return n === null ? null : [O].concat(n);
+      }, I.prototype.save = function() {
         var O = this.table[this.current];
         return O.lexerState = this.lexerState, O;
-      }, N.prototype.restore = function(O) {
-        var I = O.index;
-        this.current = I, this.table[I] = O, this.table.splice(I + 1), this.lexerState = O.lexerState, this.results = this.finish();
-      }, N.prototype.rewind = function(O) {
+      }, I.prototype.restore = function(O) {
+        var N = O.index;
+        this.current = N, this.table[N] = O, this.table.splice(N + 1), this.lexerState = O.lexerState, this.results = this.finish();
+      }, I.prototype.rewind = function(O) {
         if (!this.options.keepHistory)
           throw new Error("set option `keepHistory` to enable rewinding");
         this.restore(this.table[O]);
-      }, N.prototype.finish = function() {
-        var O = [], I = this.grammar.start, s = this.table[this.table.length - 1];
-        return s.states.forEach(function(r) {
-          r.rule.name === I && r.dot === r.rule.symbols.length && r.reference === 0 && r.data !== N.fail && O.push(r);
-        }), O.map(function(r) {
-          return r.data;
+      }, I.prototype.finish = function() {
+        var O = [], N = this.grammar.start, C = this.table[this.table.length - 1];
+        return C.states.forEach(function(L) {
+          L.rule.name === N && L.dot === L.rule.symbols.length && L.reference === 0 && L.data !== I.fail && O.push(L);
+        }), O.map(function(L) {
+          return L.data;
         });
       };
       function t(O) {
-        var I = typeof O;
-        if (I === "string")
+        var N = typeof O;
+        if (N === "string")
           return O;
-        if (I === "object") {
+        if (N === "object") {
           if (O.literal)
             return JSON.stringify(O.literal);
           if (O instanceof RegExp)
@@ -19143,11 +19173,11 @@ function qI() {
           throw new Error("Unknown symbol type: " + O);
         }
       }
-      function C(O) {
-        var I = typeof O;
-        if (I === "string")
+      function s(O) {
+        var N = typeof O;
+        if (N === "string")
           return O;
-        if (I === "object") {
+        if (N === "object") {
           if (O.literal)
             return JSON.stringify(O.literal);
           if (O instanceof RegExp)
@@ -19160,7 +19190,7 @@ function qI() {
         }
       }
       return {
-        Parser: N,
+        Parser: I,
         Grammar: A,
         Rule: E
       };
@@ -19175,39 +19205,39 @@ function zI(T) {
 const EN = (T, E, e) => {
   if (Te(T.type)) {
     const R = SN(e, E);
-    if (R && R.type === a.PROPERTY_ACCESS_OPERATOR)
-      return Object.assign(Object.assign({}, T), { type: a.IDENTIFIER, text: T.raw });
+    if (R && R.type === D.PROPERTY_ACCESS_OPERATOR)
+      return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
     const A = EE(e, E);
-    if (A && A.type === a.PROPERTY_ACCESS_OPERATOR)
-      return Object.assign(Object.assign({}, T), { type: a.IDENTIFIER, text: T.raw });
+    if (A && A.type === D.PROPERTY_ACCESS_OPERATOR)
+      return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
 }, TN = (T, E, e) => {
-  if (T.type === a.RESERVED_FUNCTION_NAME) {
+  if (T.type === D.RESERVED_FUNCTION_NAME) {
     const R = EE(e, E);
     if (!R || !Ne(R))
-      return Object.assign(Object.assign({}, T), { type: a.IDENTIFIER, text: T.raw });
+      return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
 }, eN = (T, E, e) => {
-  if (T.type === a.RESERVED_DATA_TYPE) {
+  if (T.type === D.RESERVED_DATA_TYPE) {
     const R = EE(e, E);
     if (R && Ne(R))
-      return Object.assign(Object.assign({}, T), { type: a.RESERVED_PARAMETERIZED_DATA_TYPE });
+      return Object.assign(Object.assign({}, T), { type: D.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return T;
 }, RN = (T, E, e) => {
-  if (T.type === a.IDENTIFIER) {
+  if (T.type === D.IDENTIFIER) {
     const R = EE(e, E);
     if (R && Oe(R))
-      return Object.assign(Object.assign({}, T), { type: a.ARRAY_IDENTIFIER });
+      return Object.assign(Object.assign({}, T), { type: D.ARRAY_IDENTIFIER });
   }
   return T;
 }, AN = (T, E, e) => {
-  if (T.type === a.RESERVED_DATA_TYPE) {
+  if (T.type === D.RESERVED_DATA_TYPE) {
     const R = EE(e, E);
     if (R && Oe(R))
-      return Object.assign(Object.assign({}, T), { type: a.ARRAY_KEYWORD });
+      return Object.assign(Object.assign({}, T), { type: D.ARRAY_KEYWORD });
   }
   return T;
 }, SN = (T, E) => EE(T, E, -1), EE = (T, E, e = 1) => {
@@ -19215,7 +19245,7 @@ const EN = (T, E, e) => {
   for (; T[E + R * e] && IN(T[E + R * e]); )
     R++;
   return T[E + R * e];
-}, Ne = (T) => T.type === a.OPEN_PAREN && T.text === "(", Oe = (T) => T.type === a.OPEN_PAREN && T.text === "[", IN = (T) => T.type === a.BLOCK_COMMENT || T.type === a.LINE_COMMENT;
+}, Ne = (T) => T.type === D.OPEN_PAREN && T.text === "(", Oe = (T) => T.type === D.OPEN_PAREN && T.text === "[", IN = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
 class te {
   constructor(E) {
     this.tokenize = E, this.index = 0, this.tokens = [], this.input = "";
@@ -19233,7 +19263,7 @@ class te {
     return `Parse error at token: ${E.text} at line ${e} column ${R}`;
   }
   has(E) {
-    return E in a;
+    return E in D;
   }
 }
 var U;
@@ -19248,7 +19278,7 @@ const c = new te((T) => []), $ = ([[T]]) => T, F = (T) => ({
   tokenType: T.type,
   text: T.text,
   raw: T.raw
-}), gT = (T) => ({
+}), KT = (T) => ({
   type: U.data_type,
   text: T.text,
   raw: T.raw
@@ -19283,7 +19313,7 @@ const c = new te((T) => []), $ = ([[T]]) => T, F = (T) => ({
       postprocess: ([T, [E]]) => ({
         type: U.statement,
         children: T,
-        hasSemicolon: E.type === a.DELIMITER
+        hasSemicolon: E.type === D.DELIMITER
       })
     },
     { name: "expressions_or_clauses$ebnf$1", symbols: [] },
@@ -19524,12 +19554,12 @@ const c = new te((T) => []), $ = ([[T]]) => T, F = (T) => ({
     {
       name: "between_predicate",
       symbols: [c.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", c.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
-      postprocess: ([T, E, e, R, A, S, N]) => ({
+      postprocess: ([T, E, e, R, A, S, I]) => ({
         type: U.between_predicate,
         betweenKw: F(T),
         expr1: NN(e, { leading: E, trailing: R }),
         andKw: F(A),
-        expr2: [Y(N, { leading: S })]
+        expr2: [Y(I, { leading: S })]
       })
     },
     { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: vE },
@@ -19599,14 +19629,14 @@ const c = new te((T) => []), $ = ([[T]]) => T, F = (T) => ({
     {
       name: "data_type",
       symbols: ["data_type$subexpression$1"],
-      postprocess: ([[T]]) => gT(T)
+      postprocess: ([[T]]) => KT(T)
     },
     {
       name: "data_type",
       symbols: [c.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(gT(T), { trailing: E }),
+        dataType: Y(KT(T), { trailing: E }),
         parenthesis: e
       })
     },
@@ -19669,18 +19699,18 @@ function CN(T) {
   return {
     parse: (A, S) => {
       E = S;
-      const { results: N } = R.feed(A);
-      if (N.length === 1)
-        return N[0];
-      throw N.length === 0 ? new Error("Parse error: Invalid SQL") : new Error(`Parse error: Ambiguous grammar
-${JSON.stringify(N, void 0, 2)}`);
+      const { results: I } = R.feed(A);
+      if (I.length === 1)
+        return I[0];
+      throw I.length === 0 ? new Error("Parse error: Invalid SQL") : new Error(`Parse error: Ambiguous grammar
+${JSON.stringify(I, void 0, 2)}`);
     }
   };
 }
-var i;
+var a;
 (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";
-})(i = i || (i = {}));
+})(a = a || (a = {}));
 class se {
   constructor(E) {
     this.indentation = E, this.items = [];
@@ -19691,26 +19721,26 @@ class se {
   add(...E) {
     for (const e of E)
       switch (e) {
-        case i.SPACE:
-          this.items.push(i.SPACE);
+        case a.SPACE:
+          this.items.push(a.SPACE);
           break;
-        case i.NO_SPACE:
+        case a.NO_SPACE:
           this.trimHorizontalWhitespace();
           break;
-        case i.NO_NEWLINE:
+        case a.NO_NEWLINE:
           this.trimWhitespace();
           break;
-        case i.NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(i.NEWLINE);
+        case a.NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(a.NEWLINE);
           break;
-        case i.MANDATORY_NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(i.MANDATORY_NEWLINE);
+        case a.MANDATORY_NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(a.MANDATORY_NEWLINE);
           break;
-        case i.INDENT:
+        case a.INDENT:
           this.addIndentation();
           break;
-        case i.SINGLE_INDENT:
-          this.items.push(i.SINGLE_INDENT);
+        case a.SINGLE_INDENT:
+          this.items.push(a.SINGLE_INDENT);
           break;
         default:
           this.items.push(e);
@@ -19727,10 +19757,10 @@ class se {
   addNewline(E) {
     if (this.items.length > 0)
       switch (eE(this.items)) {
-        case i.NEWLINE:
+        case a.NEWLINE:
           this.items.pop(), this.items.push(E);
           break;
-        case i.MANDATORY_NEWLINE:
+        case a.MANDATORY_NEWLINE:
           break;
         default:
           this.items.push(E);
@@ -19739,7 +19769,7 @@ class se {
   }
   addIndentation() {
     for (let E = 0; E < this.indentation.getLevel(); E++)
-      this.items.push(i.SINGLE_INDENT);
+      this.items.push(a.SINGLE_INDENT);
   }
   /**
    * Returns the final SQL string.
@@ -19755,20 +19785,20 @@ class se {
   }
   itemToString(E) {
     switch (E) {
-      case i.SPACE:
+      case a.SPACE:
         return " ";
-      case i.NEWLINE:
-      case i.MANDATORY_NEWLINE:
+      case a.NEWLINE:
+      case a.MANDATORY_NEWLINE:
         return `
 `;
-      case i.SINGLE_INDENT:
+      case a.SINGLE_INDENT:
         return this.indentation.getSingleIndent();
       default:
         return E;
     }
   }
 }
-const rN = (T) => T === i.SPACE || T === i.SINGLE_INDENT, LN = (T) => T === i.SPACE || T === i.SINGLE_INDENT || T === i.NEWLINE;
+const rN = (T) => T === a.SPACE || T === a.SINGLE_INDENT, LN = (T) => T === a.SPACE || T === a.SINGLE_INDENT || T === a.NEWLINE;
 function $T(T, E) {
   if (E === "standard")
     return T;
@@ -19776,7 +19806,7 @@ function $T(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 wT(T) {
-  return ve(T) || T === a.RESERVED_CLAUSE || T === a.RESERVED_SELECT || T === a.RESERVED_SET_OPERATION || T === a.RESERVED_JOIN || T === a.LIMIT;
+  return ve(T) || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.LIMIT;
 }
 const QE = "top-level", nN = "block-level";
 class Ce {
@@ -19840,9 +19870,9 @@ class _N extends se {
     if (typeof E == "string")
       this.length += E.length, this.trailingSpace = !1;
     else {
-      if (E === i.MANDATORY_NEWLINE || E === i.NEWLINE)
+      if (E === a.MANDATORY_NEWLINE || E === a.NEWLINE)
         throw new qE();
-      E === i.INDENT || E === i.SINGLE_INDENT || E === i.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (E === i.NO_NEWLINE || E === i.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
+      E === a.INDENT || E === a.SINGLE_INDENT || E === a.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (E === a.NO_NEWLINE || E === a.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
     }
   }
 }
@@ -19938,23 +19968,23 @@ class LE {
     }), this.formatNode(E.parenthesis);
   }
   formatPropertyAccess(E) {
-    this.formatNode(E.object), this.layout.add(i.NO_SPACE, E.operator), this.formatNode(E.property);
+    this.formatNode(E.object), this.layout.add(a.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(i.NO_SPACE, E.closeParen, i.SPACE)) : (this.layout.add(E.openParen, i.NEWLINE), j(this.cfg) ? (this.layout.add(i.INDENT), this.layout = this.formatSubExpression(E.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(i.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(i.NEWLINE, i.INDENT, E.closeParen, i.SPACE));
+    e ? (this.layout.add(E.openParen), this.layout.add(...e.getLayoutItems()), this.layout.add(a.NO_SPACE, E.closeParen, a.SPACE)) : (this.layout.add(E.openParen, a.NEWLINE), j(this.cfg) ? (this.layout.add(a.INDENT), this.layout = this.formatSubExpression(E.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(a.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(a.NEWLINE, a.INDENT, E.closeParen, a.SPACE));
   }
   formatBetweenPredicate(E) {
-    this.layout.add(this.showKw(E.betweenKw), i.SPACE), this.layout = this.formatSubExpression(E.expr1), this.layout.add(i.NO_SPACE, i.SPACE, this.showNonTabularKw(E.andKw), i.SPACE), this.layout = this.formatSubExpression(E.expr2), this.layout.add(i.SPACE);
+    this.layout.add(this.showKw(E.betweenKw), a.SPACE), this.layout = this.formatSubExpression(E.expr1), this.layout.add(a.NO_SPACE, a.SPACE, this.showNonTabularKw(E.andKw), a.SPACE), this.layout = this.formatSubExpression(E.expr2), this.layout.add(a.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(i.NEWLINE, i.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(a.NEWLINE, a.INDENT), this.formatNode(E.endKw);
   }
   formatCaseWhen(E) {
-    this.layout.add(i.NEWLINE, i.INDENT), this.formatNode(E.whenKw), this.layout = this.formatSubExpression(E.condition), this.formatNode(E.thenKw), this.layout = this.formatSubExpression(E.result);
+    this.layout.add(a.NEWLINE, a.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(i.NEWLINE, i.INDENT), this.formatNode(E.elseKw), this.layout = this.formatSubExpression(E.result);
+    this.layout.add(a.NEWLINE, a.INDENT), this.formatNode(E.elseKw), this.layout = this.formatSubExpression(E.result);
   }
   formatClause(E) {
     this.isOnelineClause(E) ? this.formatClauseInOnelineStyle(E) : j(this.cfg) ? this.formatClauseInTabularStyle(E) : this.formatClauseInIndentedStyle(E);
@@ -19963,39 +19993,39 @@ class LE {
     return j(this.cfg) ? this.dialectCfg.tabularOnelineClauses[E.nameKw.text] : this.dialectCfg.onelineClauses[E.nameKw.text];
   }
   formatClauseInIndentedStyle(E) {
-    this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E.nameKw), i.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(i.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
+    this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E.nameKw), a.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(a.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
   }
   formatClauseInOnelineStyle(E) {
-    this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E.nameKw), i.SPACE), this.layout = this.formatSubExpression(E.children);
+    this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E.nameKw), a.SPACE), this.layout = this.formatSubExpression(E.children);
   }
   formatClauseInTabularStyle(E) {
-    this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E.nameKw), i.SPACE), this.layout.indentation.increaseTopLevel(), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
+    this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E.nameKw), a.SPACE), this.layout.indentation.increaseTopLevel(), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
   }
   formatSetOperation(E) {
-    this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E.nameKw), i.NEWLINE), this.layout.add(i.INDENT), this.layout = this.formatSubExpression(E.children);
+    this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E.nameKw), a.NEWLINE), this.layout.add(a.INDENT), this.layout = this.formatSubExpression(E.children);
   }
   formatLimitClause(E) {
     this.withComments(E.limitKw, () => {
-      this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E.limitKw));
-    }), this.layout.indentation.increaseTopLevel(), j(this.cfg) ? this.layout.add(i.SPACE) : this.layout.add(i.NEWLINE, i.INDENT), E.offset ? (this.layout = this.formatSubExpression(E.offset), this.layout.add(i.NO_SPACE, ",", i.SPACE), this.layout = this.formatSubExpression(E.count)) : this.layout = this.formatSubExpression(E.count), this.layout.indentation.decreaseTopLevel();
+      this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E.limitKw));
+    }), this.layout.indentation.increaseTopLevel(), j(this.cfg) ? this.layout.add(a.SPACE) : this.layout.add(a.NEWLINE, a.INDENT), E.offset ? (this.layout = this.formatSubExpression(E.offset), this.layout.add(a.NO_SPACE, ",", a.SPACE), this.layout = this.formatSubExpression(E.count)) : this.layout = this.formatSubExpression(E.count), this.layout.indentation.decreaseTopLevel();
   }
   formatAllColumnsAsterisk(E) {
-    this.layout.add("*", i.SPACE);
+    this.layout.add("*", a.SPACE);
   }
   formatLiteral(E) {
-    this.layout.add(E.text, i.SPACE);
+    this.layout.add(E.text, a.SPACE);
   }
   formatIdentifier(E) {
-    this.layout.add(this.showIdentifier(E), i.SPACE);
+    this.layout.add(this.showIdentifier(E), a.SPACE);
   }
   formatParameter(E) {
-    this.layout.add(this.params.get(E), i.SPACE);
+    this.layout.add(this.params.get(E), a.SPACE);
   }
   formatOperator({ text: E }) {
-    this.cfg.denseOperators || this.dialectCfg.alwaysDenseOperators.includes(E) ? this.layout.add(i.NO_SPACE, E) : E === ":" ? this.layout.add(i.NO_SPACE, E, i.SPACE) : this.layout.add(E, i.SPACE);
+    this.cfg.denseOperators || this.dialectCfg.alwaysDenseOperators.includes(E) ? this.layout.add(a.NO_SPACE, E) : E === ":" ? this.layout.add(a.NO_SPACE, E, a.SPACE) : this.layout.add(E, a.SPACE);
   }
   formatComma(E) {
-    this.inline ? this.layout.add(i.NO_SPACE, ",", i.SPACE) : this.layout.add(i.NO_SPACE, ",", i.NEWLINE, i.INDENT);
+    this.inline ? this.layout.add(a.NO_SPACE, ",", a.SPACE) : this.layout.add(a.NO_SPACE, ",", a.NEWLINE, a.INDENT);
   }
   withComments(E, e) {
     this.formatComments(E.leadingComments), e(), this.formatComments(E.trailingComments);
@@ -20006,12 +20036,12 @@ class LE {
     });
   }
   formatLineComment(E) {
-    JE(E.precedingWhitespace || "") ? this.layout.add(i.NEWLINE, i.INDENT, E.text, i.MANDATORY_NEWLINE, i.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(i.NO_NEWLINE, i.SPACE, E.text, i.MANDATORY_NEWLINE, i.INDENT) : this.layout.add(E.text, i.MANDATORY_NEWLINE, i.INDENT);
+    JE(E.precedingWhitespace || "") ? this.layout.add(a.NEWLINE, a.INDENT, E.text, a.MANDATORY_NEWLINE, a.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(a.NO_NEWLINE, a.SPACE, E.text, a.MANDATORY_NEWLINE, a.INDENT) : this.layout.add(E.text, a.MANDATORY_NEWLINE, a.INDENT);
   }
   formatBlockComment(E) {
     E.type === U.block_comment && this.isMultilineBlockComment(E) ? (this.splitBlockComment(E.text).forEach((e) => {
-      this.layout.add(i.NEWLINE, i.INDENT, e);
-    }), this.layout.add(i.NEWLINE, i.INDENT)) : this.layout.add(E.text, i.SPACE);
+      this.layout.add(a.NEWLINE, a.INDENT, e);
+    }), this.layout.add(a.NEWLINE, a.INDENT)) : this.layout.add(E.text, a.SPACE);
   }
   isMultilineBlockComment(E) {
     return JE(E.text) || JE(E.precedingWhitespace || "");
@@ -20084,27 +20114,27 @@ class LE {
   }
   formatKeywordNode(E) {
     switch (E.tokenType) {
-      case a.RESERVED_JOIN:
+      case D.RESERVED_JOIN:
         return this.formatJoin(E);
-      case a.AND:
-      case a.OR:
-      case a.XOR:
+      case D.AND:
+      case D.OR:
+      case D.XOR:
         return this.formatLogicalOperator(E);
       default:
         return this.formatKeyword(E);
     }
   }
   formatJoin(E) {
-    j(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E), i.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E), i.SPACE);
+    j(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E), a.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E), a.SPACE);
   }
   formatKeyword(E) {
-    this.layout.add(this.showKw(E), i.SPACE);
+    this.layout.add(this.showKw(E), a.SPACE);
   }
   formatLogicalOperator(E) {
-    this.cfg.logicalOperatorNewline === "before" ? j(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E), i.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E), i.SPACE) : this.layout.add(this.showKw(E), i.NEWLINE, i.INDENT);
+    this.cfg.logicalOperatorNewline === "before" ? j(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E), a.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E), a.SPACE) : this.layout.add(this.showKw(E), a.NEWLINE, a.INDENT);
   }
   formatDataType(E) {
-    this.layout.add(this.showDataType(E), i.SPACE);
+    this.layout.add(this.showDataType(E), a.SPACE);
   }
   showKw(E) {
     return wT(E.tokenType) ? $T(this.showNonTabularKw(E), this.cfg.indentStyle) : this.showNonTabularKw(E);
@@ -20184,7 +20214,7 @@ class iN {
       params: this.params,
       layout: new se(new Ce(xI(this.cfg)))
     }).format(E.children);
-    return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? e.add(i.NEWLINE, ";") : e.add(i.NO_NEWLINE, ";")), e.toString();
+    return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? e.add(a.NEWLINE, ";") : e.add(a.NO_NEWLINE, ";")), e.toString();
   }
 }
 class tE extends Error {
@@ -20313,34 +20343,34 @@ async function BN(T, E, e) {
   if (!R.isValid)
     throw new Error(`Query validation failed: ${R.errors.join(", ")}`);
   const A = /* @__PURE__ */ new Set();
-  T.measures?.forEach((C) => {
-    const O = C.split(".")[0];
+  T.measures?.forEach((s) => {
+    const O = s.split(".")[0];
     A.add(O);
-  }), T.dimensions?.forEach((C) => {
-    const O = C.split(".")[0];
+  }), T.dimensions?.forEach((s) => {
+    const O = s.split(".")[0];
     A.add(O);
-  }), T.timeDimensions?.forEach((C) => {
-    const O = C.dimension.split(".")[0];
+  }), T.timeDimensions?.forEach((s) => {
+    const O = s.dimension.split(".")[0];
     A.add(O);
-  }), T.filters?.forEach((C) => {
-    if ("member" in C) {
-      const O = C.member.split(".")[0];
+  }), T.filters?.forEach((s) => {
+    if ("member" in s) {
+      const O = s.member.split(".")[0];
       A.add(O);
     }
   });
   const S = A.size > 1;
-  let N;
+  let I;
   if (S)
-    N = await e.generateMultiCubeSQL(T, E);
+    I = await e.generateMultiCubeSQL(T, E);
   else {
-    const C = Array.from(A)[0];
-    N = await e.generateSQL(C, T, E);
+    const s = Array.from(A)[0];
+    I = await e.generateSQL(s, T, E);
   }
-  const t = Array.from(A).map((C) => ({
-    cube: C,
+  const t = Array.from(A).map((s) => ({
+    cube: s,
     query: {
-      measures: T.measures?.filter((O) => O.startsWith(C + ".")) || [],
-      dimensions: T.dimensions?.filter((O) => O.startsWith(C + ".")) || [],
+      measures: T.measures?.filter((O) => O.startsWith(s + ".")) || [],
+      dimensions: T.dimensions?.filter((O) => O.startsWith(s + ".")) || [],
       filters: T.filters || [],
       timeDimensions: T.timeDimensions || [],
       order: T.order || {},
@@ -20358,8 +20388,8 @@ async function BN(T, E, e) {
       cubes: Array.from(A)
     },
     sql: {
-      sql: [N.sql],
-      params: N.params || []
+      sql: [I.sql],
+      params: I.params || []
     },
     complexity: uN(T),
     valid: !0,
@@ -20369,14 +20399,14 @@ async function BN(T, E, e) {
   };
 }
 function pN(T, E, e) {
-  const R = HN(e), A = GN(), S = (/* @__PURE__ */ new Date()).toISOString(), N = mN(T);
+  const R = HN(e), A = GN(), S = (/* @__PURE__ */ new Date()).toISOString(), I = mN(T);
   return {
     queryType: "regularQuery",
     results: [{
       query: T,
       lastRefreshTime: S,
       usedPreAggregations: {},
-      transformedQuery: N,
+      transformedQuery: I,
       requestId: A,
       annotation: E.annotation,
       dataSource: "default",
@@ -20495,13 +20525,13 @@ class dN {
           );
           continue;
         }
-        const N = new Map(this.cubes);
-        N.set(E.name, E);
-        const t = new J(N);
+        const I = new Map(this.cubes);
+        I.set(E.name, E);
+        const t = new J(I);
         try {
           t.validateDependencies(E);
-        } catch (C) {
-          e.push(C instanceof Error ? C.message : String(C));
+        } catch (s) {
+          e.push(s instanceof Error ? s.message : String(s));
         }
       }
     if (e.length === 0) {
@@ -20595,11 +20625,11 @@ ${e.join(`
   generateCubeMetadata(E) {
     const e = Object.keys(E.measures), R = Object.keys(E.dimensions), A = new Array(e.length), S = new Array(R.length);
     for (let t = 0; t < e.length; t++) {
-      const C = e[t], O = E.measures[C];
+      const s = e[t], O = E.measures[s];
       A[t] = {
-        name: `${E.name}.${C}`,
-        title: O.title || C,
-        shortTitle: O.title || C,
+        name: `${E.name}.${s}`,
+        title: O.title || s,
+        shortTitle: O.title || s,
         type: O.type,
         format: void 0,
         // Measure doesn't have format field
@@ -20607,23 +20637,23 @@ ${e.join(`
       };
     }
     for (let t = 0; t < R.length; t++) {
-      const C = R[t], O = E.dimensions[C];
+      const s = R[t], O = E.dimensions[s];
       S[t] = {
-        name: `${E.name}.${C}`,
-        title: O.title || C,
-        shortTitle: O.title || C,
+        name: `${E.name}.${s}`,
+        title: O.title || s,
+        shortTitle: O.title || s,
         type: O.type,
         format: void 0,
         // Dimension doesn't have format field
         description: O.description
       };
     }
-    const N = [];
+    const I = [];
     if (E.joins)
       for (const [, t] of Object.entries(E.joins)) {
-        const C = typeof t.targetCube == "function" ? t.targetCube() : t.targetCube;
-        N.push({
-          targetCube: C.name,
+        const s = typeof t.targetCube == "function" ? t.targetCube() : t.targetCube;
+        I.push({
+          targetCube: s.name,
           relationship: t.relationship,
           joinFields: t.on.map((O) => ({
             sourceField: this.getColumnName(O.source),
@@ -20639,7 +20669,7 @@ ${e.join(`
       dimensions: S,
       segments: [],
       // Add segments support later if needed
-      relationships: N.length > 0 ? N : void 0
+      relationships: I.length > 0 ? I : void 0
     };
   }
   /**
@@ -20651,10 +20681,10 @@ ${e.join(`
       throw new Error(`Cube '${E}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const N = await new GE(this.dbExecutor).generateSQL(A, e, R), t = this.dbExecutor.getEngineType();
+    const I = await new GE(this.dbExecutor).generateSQL(A, e, R), t = this.dbExecutor.getEngineType();
     return {
-      sql: JT(N.sql, t),
-      params: N.params
+      sql: JT(I.sql, t),
+      params: I.params
     };
   }
   /**
@@ -20713,8 +20743,8 @@ function Le(T, E) {
   const e = [], R = /* @__PURE__ */ new Set();
   if (E.measures)
     for (const A of E.measures) {
-      const [S, N] = A.split(".");
-      if (!S || !N) {
+      const [S, I] = A.split(".");
+      if (!S || !I) {
         e.push(`Invalid measure format: ${A}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
@@ -20724,12 +20754,12 @@ function Le(T, E) {
         e.push(`Cube '${S}' not found (referenced in measure '${A}')`);
         continue;
       }
-      t.measures[N] || e.push(`Measure '${N}' not found on cube '${S}'`);
+      t.measures[I] || e.push(`Measure '${I}' not found on cube '${S}'`);
     }
   if (E.dimensions)
     for (const A of E.dimensions) {
-      const [S, N] = A.split(".");
-      if (!S || !N) {
+      const [S, I] = A.split(".");
+      if (!S || !I) {
         e.push(`Invalid dimension format: ${A}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
@@ -20739,12 +20769,12 @@ function Le(T, E) {
         e.push(`Cube '${S}' not found (referenced in dimension '${A}')`);
         continue;
       }
-      t.dimensions[N] || e.push(`Dimension '${N}' not found on cube '${S}'`);
+      t.dimensions[I] || e.push(`Dimension '${I}' not found on cube '${S}'`);
     }
   if (E.timeDimensions)
     for (const A of E.timeDimensions) {
-      const [S, N] = A.dimension.split(".");
-      if (!S || !N) {
+      const [S, I] = A.dimension.split(".");
+      if (!S || !I) {
         e.push(`Invalid timeDimension format: ${A.dimension}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
@@ -20754,7 +20784,7 @@ function Le(T, E) {
         e.push(`Cube '${S}' not found (referenced in timeDimension '${A.dimension}')`);
         continue;
       }
-      t.dimensions[N] || e.push(`TimeDimension '${N}' not found on cube '${S}' (must be a dimension with time type)`);
+      t.dimensions[I] || e.push(`TimeDimension '${I}' not found on cube '${S}' (must be a dimension with time type)`);
     }
   if (E.filters)
     for (const A of E.filters)
@@ -20767,8 +20797,8 @@ function Le(T, E) {
 function ne(T, E, e, R) {
   if ("and" in T || "or" in T) {
     const t = T.and || T.or || [];
-    for (const C of t)
-      ne(C, E, e, R);
+    for (const s of t)
+      ne(s, E, e, R);
     return;
   }
   if (!("member" in T)) {
@@ -20781,12 +20811,12 @@ function ne(T, E, e, R) {
     return;
   }
   R.add(A);
-  const N = E.get(A);
-  if (!N) {
+  const I = E.get(A);
+  if (!I) {
     e.push(`Cube '${A}' not found (referenced in filter '${T.member}')`);
     return;
   }
-  !N.dimensions[S] && !N.measures[S] && e.push(`Filter field '${S}' not found on cube '${A}' (must be a dimension or measure)`);
+  !I.dimensions[S] && !I.measures[S] && e.push(`Filter field '${S}' not found on cube '${A}' (must be a dimension or measure)`);
 }
 new dN();
 export {