drizzle-cube 0.1.18 → 0.1.20

package/dist/adapters/{compiler-Dec55JjO.js → compiler-CPsEzFP2.js}

@@ -81,9 +81,9 @@ const dR = {
   startActiveSpan(T, E) {
     return E();
   }
-}, SE = Symbol.for("drizzle:ViewBaseConfig"), aE = Symbol.for("drizzle:Schema"), TT = Symbol.for("drizzle:Columns"), RT = Symbol.for("drizzle:ExtraConfigColumns"), oE = Symbol.for("drizzle:OriginalName"), PE = Symbol.for("drizzle:BaseName"), CE = Symbol.for("drizzle:IsAlias"), AT = Symbol.for("drizzle:ExtraConfigBuilder"), fR = Symbol.for("drizzle:IsDrizzleTable");
+}, SE = Symbol.for("drizzle:ViewBaseConfig"), aE = Symbol.for("drizzle:Schema"), TT = Symbol.for("drizzle:Columns"), RT = Symbol.for("drizzle:ExtraConfigColumns"), PE = Symbol.for("drizzle:OriginalName"), oE = Symbol.for("drizzle:BaseName"), CE = Symbol.for("drizzle:IsAlias"), AT = Symbol.for("drizzle:ExtraConfigBuilder"), fR = Symbol.for("drizzle:IsDrizzleTable");
 var wT, xT, vT, QT, ZT, qT, jT, kT, zT, ER;
-ER = X, zT = DE, kT = oE, jT = aE, qT = TT, ZT = RT, QT = PE, vT = CE, xT = fR, wT = AT;
+ER = X, zT = DE, kT = PE, jT = aE, qT = TT, ZT = RT, QT = oE, vT = CE, xT = fR, wT = AT;
 class W {
   constructor(E, R, A) {
     /**
@@ -113,17 +113,17 @@ class W {
     l(this, xT, !0);
     /** @internal */
     l(this, wT);
-    this[DE] = this[oE] = E, this[aE] = R, this[PE] = A;
+    this[DE] = this[PE] = E, this[aE] = R, this[oE] = A;
   }
 }
 l(W, ER, "Table"), /** @internal */
 l(W, "Symbol", {
   Name: DE,
   Schema: aE,
-  OriginalName: oE,
+  OriginalName: PE,
   Columns: TT,
   ExtraConfigColumns: RT,
-  BaseName: PE,
+  BaseName: oE,
   IsAlias: CE,
   ExtraConfigBuilder: AT
 });
@@ -186,75 +186,75 @@ const v = class v {
     }), {
       casing: S,
       escapeName: e,
-      escapeParam: O,
-      prepareTyping: C,
+      escapeParam: N,
+      prepareTyping: s,
       inlineParams: _,
       paramStartIndex: I
     } = A;
-    return hR(E.map((N) => {
-      var s;
-      if (F(N, h))
-        return { sql: N.value.join(""), params: [] };
-      if (F(N, LE))
-        return { sql: e(N.value), params: [] };
-      if (N === void 0)
+    return hR(E.map((O) => {
+      var C;
+      if (F(O, h))
+        return { sql: O.value.join(""), params: [] };
+      if (F(O, LE))
+        return { sql: e(O.value), params: [] };
+      if (O === void 0)
         return { sql: "", params: [] };
-      if (Array.isArray(N)) {
+      if (Array.isArray(O)) {
         const t = [new h("(")];
-        for (const [n, P] of N.entries())
-          t.push(P), n < N.length - 1 && t.push(new h(", "));
+        for (const [i, o] of O.entries())
+          t.push(o), i < O.length - 1 && t.push(new h(", "));
         return t.push(new h(")")), this.buildQueryFromSourceParams(t, A);
       }
-      if (F(N, v))
-        return this.buildQueryFromSourceParams(N.queryChunks, {
+      if (F(O, v))
+        return this.buildQueryFromSourceParams(O.queryChunks, {
           ...A,
-          inlineParams: _ || N.shouldInlineParams
+          inlineParams: _ || O.shouldInlineParams
         });
-      if (F(N, W)) {
-        const t = N[W.Symbol.Schema], n = N[W.Symbol.Name];
+      if (F(O, W)) {
+        const t = O[W.Symbol.Schema], i = O[W.Symbol.Name];
         return {
-          sql: t === void 0 || N[CE] ? e(n) : e(t) + "." + e(n),
+          sql: t === void 0 || O[CE] ? e(i) : e(t) + "." + e(i),
           params: []
         };
       }
-      if (F(N, EE)) {
-        const t = S.getColumnCasing(N);
+      if (F(O, EE)) {
+        const t = S.getColumnCasing(O);
         if (R.invokeSource === "indexes")
           return { sql: e(t), params: [] };
-        const n = N.table[W.Symbol.Schema];
+        const i = O.table[W.Symbol.Schema];
         return {
-          sql: N.table[CE] || n === void 0 ? e(N.table[W.Symbol.Name]) + "." + e(t) : e(n) + "." + e(N.table[W.Symbol.Name]) + "." + e(t),
+          sql: O.table[CE] || i === void 0 ? e(O.table[W.Symbol.Name]) + "." + e(t) : e(i) + "." + e(O.table[W.Symbol.Name]) + "." + e(t),
           params: []
         };
       }
-      if (F(N, ZE)) {
-        const t = N[SE].schema, n = N[SE].name;
+      if (F(O, ZE)) {
+        const t = O[SE].schema, i = O[SE].name;
         return {
-          sql: t === void 0 || N[SE].isAlias ? e(n) : e(t) + "." + e(n),
+          sql: t === void 0 || O[SE].isAlias ? e(i) : e(t) + "." + e(i),
           params: []
         };
       }
-      if (F(N, IE)) {
-        if (F(N.value, OE))
-          return { sql: O(I.value++, N), params: [N], typings: ["none"] };
-        const t = N.value === null ? null : N.encoder.mapToDriverValue(N.value);
+      if (F(O, IE)) {
+        if (F(O.value, OE))
+          return { sql: N(I.value++, O), params: [O], typings: ["none"] };
+        const t = O.value === null ? null : O.encoder.mapToDriverValue(O.value);
         if (F(t, v))
           return this.buildQueryFromSourceParams([t], A);
         if (_)
           return { sql: this.mapInlineParam(t, A), params: [] };
-        let n = ["none"];
-        return C && (n = [C(N.encoder)]), { sql: O(I.value++, t), params: [t], typings: n };
+        let i = ["none"];
+        return s && (i = [s(O.encoder)]), { sql: N(I.value++, t), params: [t], typings: i };
       }
-      return F(N, OE) ? { sql: O(I.value++, N), params: [N], typings: ["none"] } : F(N, v.Aliased) && N.fieldAlias !== void 0 ? { sql: e(N.fieldAlias), params: [] } : F(N, QE) ? N._.isWith ? { sql: e(N._.alias), params: [] } : this.buildQueryFromSourceParams([
+      return F(O, OE) ? { sql: N(I.value++, O), params: [O], typings: ["none"] } : F(O, v.Aliased) && O.fieldAlias !== void 0 ? { sql: e(O.fieldAlias), params: [] } : F(O, QE) ? O._.isWith ? { sql: e(O._.alias), params: [] } : this.buildQueryFromSourceParams([
         new h("("),
-        N._.sql,
+        O._.sql,
         new h(") "),
-        new LE(N._.alias)
-      ], A) : pR(N) ? N.schema ? { sql: e(N.schema) + "." + e(N.enumName), params: [] } : { sql: e(N.enumName), params: [] } : sR(N) ? (s = N.shouldOmitSQLParens) != null && s.call(N) ? this.buildQueryFromSourceParams([N.getSQL()], A) : this.buildQueryFromSourceParams([
+        new LE(O._.alias)
+      ], A) : pR(O) ? O.schema ? { sql: e(O.schema) + "." + e(O.enumName), params: [] } : { sql: e(O.enumName), params: [] } : sR(O) ? (C = O.shouldOmitSQLParens) != null && C.call(O) ? this.buildQueryFromSourceParams([O.getSQL()], A) : this.buildQueryFromSourceParams([
         new h("("),
-        N.getSQL(),
+        O.getSQL(),
         new h(")")
-      ], A) : _ ? { sql: this.mapInlineParam(N, A), params: [] } : { sql: O(I.value++, N), params: [N], typings: ["none"] };
+      ], A) : _ ? { sql: this.mapInlineParam(O, A), params: [] } : { sql: N(I.value++, O), params: [O], typings: ["none"] };
     }));
   }
   mapInlineParam(E, { escapeString: R }) {
@@ -355,33 +355,33 @@ function L(T, ...E) {
   }
   T.raw = A;
   function S(_, I) {
-    const N = [];
-    for (const [s, t] of _.entries())
-      s > 0 && I !== void 0 && N.push(I), N.push(t);
-    return new m(N);
+    const O = [];
+    for (const [C, t] of _.entries())
+      C > 0 && I !== void 0 && O.push(I), O.push(t);
+    return new m(O);
   }
   T.join = S;
   function e(_) {
     return new LE(_);
   }
   T.identifier = e;
-  function O(_) {
+  function N(_) {
     return new OE(_);
   }
-  T.placeholder = O;
-  function C(_, I) {
+  T.placeholder = N;
+  function s(_, I) {
     return new IE(_, I);
   }
-  T.param = C;
+  T.param = s;
 })(L || (L = {}));
 ((T) => {
   var R;
   R = X;
   const A = class A {
-    constructor(e, O) {
+    constructor(e, N) {
       /** @internal */
       l(this, "isSelectionField", !1);
-      this.sql = e, this.fieldAlias = O;
+      this.sql = e, this.fieldAlias = N;
     }
     getSQL() {
       return this.sql;
@@ -780,8 +780,8 @@ class vR extends jE {
         const e = L`datetime(${R}, 'unixepoch')`;
         return L`datetime(strftime('%Y-%m-%d %H:%M:00', ${e}))`;
       case "second":
-        const O = L`datetime(${R}, 'unixepoch')`;
-        return L`datetime(strftime('%Y-%m-%d %H:%M:%S', ${O}))`;
+        const N = L`datetime(${R}, 'unixepoch')`;
+        return L`datetime(strftime('%Y-%m-%d %H:%M:%S', ${N}))`;
       default:
         return L`datetime(${R}, 'unixepoch')`;
     }
@@ -909,8 +909,8 @@ class ZR extends kE {
           return Array.isArray(S) ? S.map((e) => this.convertNumericFields(e, R)) : S;
         } catch (S) {
           if (typeof E.getSQL == "function") {
-            const e = E.getSQL(), O = await this.db.execute(e);
-            return Array.isArray(O) ? O.map((C) => this.convertNumericFields(C, R)) : O;
+            const e = E.getSQL(), N = await this.db.execute(e);
+            return Array.isArray(N) ? N.map((s) => this.convertNumericFields(s, R)) : N;
           }
           throw S;
         }
@@ -961,27 +961,22 @@ class ZR extends kE {
     return "postgres";
   }
 }
+function NT(T, E) {
+  return new ZR(T, E, "postgres");
+}
 class qR extends kE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
-      const A = await E.execute();
-      return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
-    }
-    try {
-      if (this.db.all) {
-        const A = this.db.all(E);
-        return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
-      } else {
-        if (this.db.run)
-          return this.db.run(E);
-        throw new Error("SQLite database instance must have an all() or run() method");
-      }
-    } catch (A) {
-      throw new Error(`SQLite execution failed: ${A instanceof Error ? A.message : "Unknown error"}`);
+      const S = await E.execute();
+      return Array.isArray(S) ? S.map((e) => this.convertNumericFields(e, R)) : S;
     }
+    if (!this.db.execute)
+      throw new Error("MySQL database instance must have an execute method");
+    const A = await this.db.execute(E);
+    return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
   }
   /**
-   * Convert numeric string fields to numbers (only for measure fields)
+   * Convert numeric string fields to numbers (measure fields + numeric dimensions)
    */
   convertNumericFields(E, R) {
     if (!E || typeof E != "object") return E;
@@ -1004,22 +999,33 @@ class qR extends kE {
     return E;
   }
   getEngineType() {
-    return "sqlite";
+    return "mysql";
   }
 }
-class jR extends kE {
+function jR(T, E) {
+  return new qR(T, E, "mysql");
+}
+class kR extends kE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
-      const S = await E.execute();
-      return Array.isArray(S) ? S.map((e) => this.convertNumericFields(e, R)) : S;
+      const A = await E.execute();
+      return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
+    }
+    try {
+      if (this.db.all) {
+        const A = this.db.all(E);
+        return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
+      } else {
+        if (this.db.run)
+          return this.db.run(E);
+        throw new Error("SQLite database instance must have an all() or run() method");
+      }
+    } catch (A) {
+      throw new Error(`SQLite execution failed: ${A instanceof Error ? A.message : "Unknown error"}`);
     }
-    if (!this.db.execute)
-      throw new Error("MySQL database instance must have an execute method");
-    const A = await this.db.execute(E);
-    return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
   }
   /**
-   * Convert numeric string fields to numbers (measure fields + numeric dimensions)
+   * Convert numeric string fields to numbers (only for measure fields)
    */
   convertNumericFields(E, R) {
     if (!E || typeof E != "object") return E;
@@ -1042,17 +1048,11 @@ class jR extends kE {
     return E;
   }
   getEngineType() {
-    return "mysql";
+    return "sqlite";
   }
 }
-function NT(T, E) {
-  return new ZR(T, E, "postgres");
-}
 function tT(T, E) {
-  return new qR(T, E, "sqlite");
-}
-function kR(T, E) {
-  return new jR(T, E, "mysql");
+  return new kR(T, E, "sqlite");
 }
 function sT(T, E, R) {
   if (R)
@@ -1060,7 +1060,7 @@ function sT(T, E, R) {
       case "postgres":
         return NT(T, E);
       case "mysql":
-        return kR(T, E);
+        return jR(T, E);
       case "sqlite":
         return tT(T, E);
     }
@@ -1100,31 +1100,31 @@ class EA {
   buildSelections(E, R, A) {
     const S = {}, e = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
-      for (const O of R.dimensions) {
-        const [C, _] = O.split("."), I = e.get(C);
+      for (const N of R.dimensions) {
+        const [s, _] = N.split("."), I = e.get(s);
         if (I && I.dimensions && I.dimensions[_]) {
-          const N = I.dimensions[_], s = x(N.sql, A);
-          S[O] = L`${s}`.as(O);
+          const O = I.dimensions[_], C = x(O.sql, A);
+          S[N] = L`${C}`.as(N);
         }
       }
     if (R.measures)
-      for (const O of R.measures) {
-        const [C, _] = O.split("."), I = e.get(C);
+      for (const N of R.measures) {
+        const [s, _] = N.split("."), I = e.get(s);
         if (I && I.measures && I.measures[_]) {
-          const N = I.measures[_], s = this.buildMeasureExpression(N, A);
-          S[O] = L`${s}`.as(O);
+          const O = I.measures[_], C = this.buildMeasureExpression(O, A);
+          S[N] = L`${C}`.as(N);
         }
       }
     if (R.timeDimensions)
-      for (const O of R.timeDimensions) {
-        const [C, _] = O.dimension.split("."), I = e.get(C);
+      for (const N of R.timeDimensions) {
+        const [s, _] = N.dimension.split("."), I = e.get(s);
         if (I && I.dimensions && I.dimensions[_]) {
-          const N = I.dimensions[_], s = this.buildTimeDimensionExpression(
-            N.sql,
-            O.granularity,
+          const O = I.dimensions[_], C = this.buildTimeDimensionExpression(
+            O.sql,
+            N.granularity,
             A
           );
-          S[O.dimension] = L`${s}`.as(O.dimension);
+          S[N.dimension] = L`${C}`.as(N.dimension);
         }
       }
     return Object.keys(S).length === 0 && (S.count = ME()), S;
@@ -1134,24 +1134,24 @@ class EA {
    */
   buildHavingMeasureExpression(E, R, A, S, e) {
     if (e && e.preAggregationCTEs) {
-      const O = e.preAggregationCTEs.find((C) => C.cube.name === E);
-      if (O && O.measures.includes(`${E}.${R}`)) {
-        const C = L`${L.identifier(O.cteAlias)}.${L.identifier(R)}`;
+      const N = e.preAggregationCTEs.find((s) => s.cube.name === E);
+      if (N && N.measures.includes(`${E}.${R}`)) {
+        const s = L`${L.identifier(N.cteAlias)}.${L.identifier(R)}`;
         switch (A.type) {
           case "count":
           case "countDistinct":
           case "sum":
-            return Q(C);
+            return Q(s);
           case "avg":
-            return this.databaseAdapter.buildAvg(C);
+            return this.databaseAdapter.buildAvg(s);
           case "min":
-            return xE(C);
+            return xE(s);
           case "max":
-            return wE(C);
+            return wE(s);
           case "number":
-            return Q(C);
+            return Q(s);
           default:
-            return Q(C);
+            return Q(s);
         }
       }
     }
@@ -1202,20 +1202,20 @@ class EA {
    * Works for both single and multi-cube queries
    */
   buildWhereConditions(E, R, A, S) {
-    const e = [], O = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const e = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
-      for (const C of R.filters) {
-        const _ = this.processFilter(C, O, A, "where", S);
+      for (const s of R.filters) {
+        const _ = this.processFilter(s, N, A, "where", S);
         _ && e.push(_);
       }
     if (R.timeDimensions)
-      for (const C of R.timeDimensions) {
-        const [_, I] = C.dimension.split("."), N = O.get(_);
-        if (N && N.dimensions[I] && C.dateRange) {
+      for (const s of R.timeDimensions) {
+        const [_, I] = s.dimension.split("."), O = N.get(_);
+        if (O && O.dimensions[I] && s.dateRange) {
           if (S != null && S.preAggregationCTEs && S.preAggregationCTEs.some((M) => M.cube.name === _))
             continue;
-          const s = N.dimensions[I], t = x(s.sql, A), n = this.buildDateRangeCondition(t, C.dateRange);
-          n && e.push(n);
+          const C = O.dimensions[I], t = x(C.sql, A), i = this.buildDateRangeCondition(t, s.dateRange);
+          i && e.push(i);
         }
       }
     return e;
@@ -1225,10 +1225,10 @@ class EA {
    * Works for both single and multi-cube queries
    */
   buildHavingConditions(E, R, A, S) {
-    const e = [], O = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const e = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
-      for (const C of R.filters) {
-        const _ = this.processFilter(C, O, A, "having", S);
+      for (const s of R.filters) {
+        const _ = this.processFilter(s, N, A, "having", S);
         _ && e.push(_);
       }
     return e;
@@ -1239,31 +1239,31 @@ class EA {
    */
   processFilter(E, R, A, S, e) {
     if ("and" in E || "or" in E) {
-      const n = E;
-      if (n.and) {
-        const P = n.and.map((M) => this.processFilter(M, R, A, S, e)).filter((M) => M !== null);
-        return P.length > 0 ? b(...P) : null;
+      const i = E;
+      if (i.and) {
+        const o = i.and.map((M) => this.processFilter(M, R, A, S, e)).filter((M) => M !== null);
+        return o.length > 0 ? b(...o) : null;
       }
-      if (n.or) {
-        const P = n.or.map((M) => this.processFilter(M, R, A, S, e)).filter((M) => M !== null);
-        return P.length > 0 ? bR(...P) : null;
+      if (i.or) {
+        const o = i.or.map((M) => this.processFilter(M, R, A, S, e)).filter((M) => M !== null);
+        return o.length > 0 ? bR(...o) : null;
       }
     }
-    const O = E, [C, _] = O.member.split("."), I = R.get(C);
+    const N = E, [s, _] = N.member.split("."), I = R.get(s);
     if (!I) return null;
-    const N = I.dimensions[_], s = I.measures[_], t = N || s;
+    const O = I.dimensions[_], C = I.measures[_], t = O || C;
     if (!t) return null;
-    if (S === "where" && N) {
-      if (e != null && e.preAggregationCTEs && e.preAggregationCTEs.some((M) => M.cube.name === C))
+    if (S === "where" && O) {
+      if (e != null && e.preAggregationCTEs && e.preAggregationCTEs.some((M) => M.cube.name === s))
         return null;
-      const n = x(N.sql, A);
-      return this.buildFilterCondition(n, O.operator, O.values, t);
+      const i = x(O.sql, A);
+      return this.buildFilterCondition(i, N.operator, N.values, t);
     } else {
-      if (S === "where" && s)
+      if (S === "where" && C)
         return null;
-      if (S === "having" && s) {
-        const n = this.buildHavingMeasureExpression(C, _, s, A, e);
-        return this.buildFilterCondition(n, O.operator, O.values, t);
+      if (S === "having" && C) {
+        const i = this.buildHavingMeasureExpression(s, _, C, A, e);
+        return this.buildFilterCondition(i, N.operator, N.values, t);
       }
     }
     return null;
@@ -1274,62 +1274,62 @@ class EA {
   buildFilterCondition(E, R, A, S) {
     if (!A || A.length === 0)
       return R === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const e = A.filter((C) => !(C == null || C === "" || typeof C == "string" && C.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
+    const e = A.filter((s) => !(s == null || s === "" || typeof s == "string" && s.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
     if (e.length === 0 && !["set", "notSet"].includes(R))
       return R === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const O = e[0];
+    const N = e[0];
     switch (R) {
       case "equals":
         if (e.length > 1) {
           if ((S == null ? void 0 : S.type) === "time") {
-            const C = e.map((_) => this.normalizeDate(_) || _);
-            return IT(E, C);
+            const s = e.map((_) => this.normalizeDate(_) || _);
+            return IT(E, s);
           }
           return IT(E, e);
         } else if (e.length === 1) {
-          const C = (S == null ? void 0 : S.type) === "time" && this.normalizeDate(O) || O;
-          return qE(E, C);
+          const s = (S == null ? void 0 : S.type) === "time" && this.normalizeDate(N) || N;
+          return qE(E, s);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return e.length > 1 ? yR(E, e) : e.length === 1 ? XR(E, O) : null;
+        return e.length > 1 ? yR(E, e) : e.length === 1 ? XR(E, N) : null;
       case "contains":
-        return this.databaseAdapter.buildStringCondition(E, "contains", O);
+        return this.databaseAdapter.buildStringCondition(E, "contains", N);
       case "notContains":
-        return this.databaseAdapter.buildStringCondition(E, "notContains", O);
+        return this.databaseAdapter.buildStringCondition(E, "notContains", N);
       case "startsWith":
-        return this.databaseAdapter.buildStringCondition(E, "startsWith", O);
+        return this.databaseAdapter.buildStringCondition(E, "startsWith", N);
       case "endsWith":
-        return this.databaseAdapter.buildStringCondition(E, "endsWith", O);
+        return this.databaseAdapter.buildStringCondition(E, "endsWith", N);
       case "gt":
-        return ST(E, O);
+        return ST(E, N);
       case "gte":
-        return RE(E, O);
+        return RE(E, N);
       case "lt":
-        return eT(E, O);
+        return eT(E, N);
       case "lte":
-        return AE(E, O);
+        return AE(E, N);
       case "set":
         return $R(E);
       case "notSet":
         return KR(E);
       case "inDateRange":
         if (e.length >= 2) {
-          const C = this.normalizeDate(e[0]), _ = this.normalizeDate(e[1]);
-          if (C && _)
+          const s = this.normalizeDate(e[0]), _ = this.normalizeDate(e[1]);
+          if (s && _)
             return b(
-              RE(E, C),
+              RE(E, s),
               AE(E, _)
             );
         }
         return null;
       case "beforeDate": {
-        const C = this.normalizeDate(O);
-        return C ? eT(E, C) : null;
+        const s = this.normalizeDate(N);
+        return s ? eT(E, s) : null;
       }
       case "afterDate": {
-        const C = this.normalizeDate(O);
-        return C ? ST(E, C) : null;
+        const s = this.normalizeDate(N);
+        return s ? ST(E, s) : null;
       }
       default:
         return null;
@@ -1358,10 +1358,10 @@ class EA {
       if (!S) return null;
       const e = new Date(S);
       e.setUTCHours(0, 0, 0, 0);
-      const O = new Date(S);
-      return O.setUTCHours(23, 59, 59, 999), b(
+      const N = new Date(S);
+      return N.setUTCHours(23, 59, 59, 999), b(
         RE(E, e),
-        AE(E, O)
+        AE(E, N)
       );
     }
     return null;
@@ -1371,75 +1371,75 @@ class EA {
    * Handles all 14 DATE_RANGE_OPTIONS from the client
    */
   parseRelativeDateRange(E) {
-    const R = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), S = R.getUTCFullYear(), e = R.getUTCMonth(), O = R.getUTCDate(), C = R.getUTCDay();
+    const R = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), S = R.getUTCFullYear(), e = R.getUTCMonth(), N = R.getUTCDate(), s = R.getUTCDay();
     if (A === "today") {
-      const s = new Date(R);
-      s.setUTCHours(0, 0, 0, 0);
+      const C = new Date(R);
+      C.setUTCHours(0, 0, 0, 0);
       const t = new Date(R);
-      return t.setUTCHours(23, 59, 59, 999), { start: s, end: t };
+      return t.setUTCHours(23, 59, 59, 999), { start: C, end: t };
     }
     if (A === "yesterday") {
-      const s = new Date(R);
-      s.setUTCDate(O - 1), s.setUTCHours(0, 0, 0, 0);
+      const C = new Date(R);
+      C.setUTCDate(N - 1), C.setUTCHours(0, 0, 0, 0);
       const t = new Date(R);
-      return t.setUTCDate(O - 1), t.setUTCHours(23, 59, 59, 999), { start: s, end: t };
+      return t.setUTCDate(N - 1), t.setUTCHours(23, 59, 59, 999), { start: C, end: t };
     }
     if (A === "this week") {
-      const s = C === 0 ? -6 : 1 - C, t = new Date(R);
-      t.setUTCDate(O + s), t.setUTCHours(0, 0, 0, 0);
-      const n = new Date(t);
-      return n.setUTCDate(t.getUTCDate() + 6), n.setUTCHours(23, 59, 59, 999), { start: t, end: n };
+      const C = s === 0 ? -6 : 1 - s, t = new Date(R);
+      t.setUTCDate(N + C), t.setUTCHours(0, 0, 0, 0);
+      const i = new Date(t);
+      return i.setUTCDate(t.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     if (A === "this month") {
-      const s = new Date(Date.UTC(S, e, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, e + 1, 0, 23, 59, 59, 999));
-      return { start: s, end: t };
+      const C = new Date(Date.UTC(S, e, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, e + 1, 0, 23, 59, 59, 999));
+      return { start: C, end: t };
     }
     if (A === "this quarter") {
-      const s = Math.floor(e / 3), t = new Date(Date.UTC(S, s * 3, 1, 0, 0, 0, 0)), n = new Date(Date.UTC(S, s * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: t, end: n };
+      const C = Math.floor(e / 3), t = new Date(Date.UTC(S, C * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(S, C * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: t, end: i };
     }
     if (A === "this year") {
-      const s = new Date(Date.UTC(S, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, 11, 31, 23, 59, 59, 999));
-      return { start: s, end: t };
+      const C = new Date(Date.UTC(S, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, 11, 31, 23, 59, 59, 999));
+      return { start: C, end: t };
     }
     const _ = A.match(/^last\s+(\d+)\s+days?$/);
     if (_) {
-      const s = parseInt(_[1], 10), t = new Date(R);
-      t.setUTCDate(O - s + 1), t.setUTCHours(0, 0, 0, 0);
-      const n = new Date(R);
-      return n.setUTCHours(23, 59, 59, 999), { start: t, end: n };
+      const C = parseInt(_[1], 10), t = new Date(R);
+      t.setUTCDate(N - C + 1), t.setUTCHours(0, 0, 0, 0);
+      const i = new Date(R);
+      return i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     if (A === "last week") {
-      const s = C === 0 ? -13 : -6 - C, t = new Date(R);
-      t.setUTCDate(O + s), t.setUTCHours(0, 0, 0, 0);
-      const n = new Date(t);
-      return n.setUTCDate(t.getUTCDate() + 6), n.setUTCHours(23, 59, 59, 999), { start: t, end: n };
+      const C = s === 0 ? -13 : -6 - s, t = new Date(R);
+      t.setUTCDate(N + C), t.setUTCHours(0, 0, 0, 0);
+      const i = new Date(t);
+      return i.setUTCDate(t.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     if (A === "last month") {
-      const s = new Date(Date.UTC(S, e - 1, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, e, 0, 23, 59, 59, 999));
-      return { start: s, end: t };
+      const C = new Date(Date.UTC(S, e - 1, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, e, 0, 23, 59, 59, 999));
+      return { start: C, end: t };
     }
     if (A === "last quarter") {
-      const s = Math.floor(e / 3), t = s === 0 ? 3 : s - 1, n = s === 0 ? S - 1 : S, P = new Date(Date.UTC(n, t * 3, 1, 0, 0, 0, 0)), M = new Date(Date.UTC(n, t * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: P, end: M };
+      const C = Math.floor(e / 3), t = C === 0 ? 3 : C - 1, i = C === 0 ? S - 1 : S, o = new Date(Date.UTC(i, t * 3, 1, 0, 0, 0, 0)), M = new Date(Date.UTC(i, t * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: o, end: M };
     }
     if (A === "last year") {
-      const s = new Date(Date.UTC(S - 1, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S - 1, 11, 31, 23, 59, 59, 999));
-      return { start: s, end: t };
+      const C = new Date(Date.UTC(S - 1, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S - 1, 11, 31, 23, 59, 59, 999));
+      return { start: C, end: t };
     }
     if (A === "last 12 months") {
-      const s = new Date(Date.UTC(S, e - 11, 1, 0, 0, 0, 0)), t = new Date(R);
-      return t.setUTCHours(23, 59, 59, 999), { start: s, end: t };
+      const C = new Date(Date.UTC(S, e - 11, 1, 0, 0, 0, 0)), t = new Date(R);
+      return t.setUTCHours(23, 59, 59, 999), { start: C, end: t };
     }
     const I = A.match(/^last\s+(\d+)\s+months?$/);
     if (I) {
-      const s = parseInt(I[1], 10), t = new Date(Date.UTC(S, e - s + 1, 1, 0, 0, 0, 0)), n = new Date(R);
-      return n.setUTCHours(23, 59, 59, 999), { start: t, end: n };
+      const C = parseInt(I[1], 10), t = new Date(Date.UTC(S, e - C + 1, 1, 0, 0, 0, 0)), i = new Date(R);
+      return i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
-    const N = A.match(/^last\s+(\d+)\s+years?$/);
-    if (N) {
-      const s = parseInt(N[1], 10), t = new Date(Date.UTC(S - s, 0, 1, 0, 0, 0, 0)), n = new Date(R);
-      return n.setUTCHours(23, 59, 59, 999), { start: t, end: n };
+    const O = A.match(/^last\s+(\d+)\s+years?$/);
+    if (O) {
+      const C = parseInt(O[1], 10), t = new Date(Date.UTC(S - C, 0, 1, 0, 0, 0, 0)), i = new Date(R);
+      return i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     return null;
   }
@@ -1472,34 +1472,34 @@ class EA {
     const e = [];
     if (!(R.measures && R.measures.length > 0))
       return [];
-    const C = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const s = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
-      for (const N of R.dimensions) {
-        const [s, t] = N.split("."), n = C.get(s);
-        if (n && n.dimensions && n.dimensions[t])
-          if ((_ = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : _.some((M) => M.cube.name === s)) {
-            const M = S.preAggregationCTEs.find((G) => G.cube.name === s), o = M.joinKeys.find((G) => G.targetColumn === t);
-            if (o && o.sourceColumnObj)
-              e.push(o.sourceColumnObj);
+      for (const O of R.dimensions) {
+        const [C, t] = O.split("."), i = s.get(C);
+        if (i && i.dimensions && i.dimensions[t])
+          if ((_ = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : _.some((M) => M.cube.name === C)) {
+            const M = S.preAggregationCTEs.find((G) => G.cube.name === C), P = M.joinKeys.find((G) => G.targetColumn === t);
+            if (P && P.sourceColumnObj)
+              e.push(P.sourceColumnObj);
             else {
               const G = L`${L.identifier(M.cteAlias)}.${L.identifier(t)}`;
               e.push(G);
             }
           } else {
-            const M = n.dimensions[t], o = x(M.sql, A);
-            e.push(o);
+            const M = i.dimensions[t], P = x(M.sql, A);
+            e.push(P);
           }
       }
     if (R.timeDimensions)
-      for (const N of R.timeDimensions) {
-        const [s, t] = N.dimension.split("."), n = C.get(s);
-        if (n && n.dimensions && n.dimensions[t])
-          if ((I = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : I.some((M) => M.cube.name === s)) {
-            const M = S.preAggregationCTEs.find((G) => G.cube.name === s), o = M.joinKeys.find((G) => G.targetColumn === t);
-            if (o && o.sourceColumnObj) {
+      for (const O of R.timeDimensions) {
+        const [C, t] = O.dimension.split("."), i = s.get(C);
+        if (i && i.dimensions && i.dimensions[t])
+          if ((I = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : I.some((M) => M.cube.name === C)) {
+            const M = S.preAggregationCTEs.find((G) => G.cube.name === C), P = M.joinKeys.find((G) => G.targetColumn === t);
+            if (P && P.sourceColumnObj) {
               const G = this.buildTimeDimensionExpression(
-                o.sourceColumnObj,
-                N.granularity,
+                P.sourceColumnObj,
+                O.granularity,
                 A
               );
               e.push(G);
@@ -1508,12 +1508,12 @@ class EA {
               e.push(G);
             }
           } else {
-            const M = n.dimensions[t], o = this.buildTimeDimensionExpression(
+            const M = i.dimensions[t], P = this.buildTimeDimensionExpression(
               M.sql,
-              N.granularity,
+              O.granularity,
               A
             );
-            e.push(o);
+            e.push(P);
           }
       }
     return e;
@@ -1526,21 +1526,21 @@ class EA {
     const A = [], S = R || [
       ...E.measures || [],
       ...E.dimensions || [],
-      ...((e = E.timeDimensions) == null ? void 0 : e.map((O) => O.dimension)) || []
+      ...((e = E.timeDimensions) == null ? void 0 : e.map((N) => N.dimension)) || []
     ];
     if (E.order && Object.keys(E.order).length > 0)
-      for (const [O, C] of Object.entries(E.order)) {
-        if (!S.includes(O))
-          throw new Error(`Cannot order by '${O}': field is not selected in the query`);
-        const _ = C === "desc" ? gR(L.identifier(O)) : OT(L.identifier(O));
+      for (const [N, s] of Object.entries(E.order)) {
+        if (!S.includes(N))
+          throw new Error(`Cannot order by '${N}': field is not selected in the query`);
+        const _ = s === "desc" ? gR(L.identifier(N)) : OT(L.identifier(N));
         A.push(_);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
-      const O = new Set(Object.keys(E.order || {})), C = [...E.timeDimensions].sort(
+      const N = new Set(Object.keys(E.order || {})), s = [...E.timeDimensions].sort(
         (_, I) => _.dimension.localeCompare(I.dimension)
       );
-      for (const _ of C)
-        O.has(_.dimension) || A.push(OT(L.identifier(_.dimension)));
+      for (const _ of s)
+        N.has(_.dimension) || A.push(OT(L.identifier(_.dimension)));
     }
     return A;
   }
@@ -1552,9 +1552,9 @@ class EA {
     const A = [], S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.measures && A.push(...R.measures), R.dimensions)
       for (const e of R.dimensions) {
-        const [O, C] = e.split("."), _ = S.get(O);
+        const [N, s] = e.split("."), _ = S.get(N);
         if (_) {
-          const I = _.dimensions[C];
+          const I = _.dimensions[s];
           I && I.type === "number" && A.push(e);
         }
       }
@@ -1655,12 +1655,12 @@ class TA {
     const S = this.analyzeCubeUsage(R), e = Array.from(S);
     if (e.length === 0)
       throw new Error("No cubes found in query");
-    const O = this.choosePrimaryCube(e, R, E), C = E.get(O);
-    if (!C)
-      throw new Error(`Primary cube '${O}' not found`);
+    const N = this.choosePrimaryCube(e, R, E), s = E.get(N);
+    if (!s)
+      throw new Error(`Primary cube '${N}' not found`);
     if (e.length === 1)
       return {
-        primaryCube: C,
+        primaryCube: s,
         joinCubes: [],
         // Empty for single cube
         selections: {},
@@ -1670,9 +1670,9 @@ class TA {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const _ = this.buildJoinPlan(E, C, e, A), I = this.planPreAggregationCTEs(E, C, _, R);
+    const _ = this.buildJoinPlan(E, s, e), I = this.planPreAggregationCTEs(E, s, _, R);
     return {
-      primaryCube: C,
+      primaryCube: s,
       joinCubes: _,
       selections: {},
       // Will be built by QueryBuilder
@@ -1689,12 +1689,12 @@ class TA {
    */
   choosePrimaryCube(E, R, A) {
     if (R.dimensions && R.dimensions.length > 0 && A) {
-      const S = R.dimensions.map((O) => O.split(".")[0]), e = /* @__PURE__ */ new Map();
-      for (const O of S)
-        e.set(O, (e.get(O) || 0) + 1);
+      const S = R.dimensions.map((N) => N.split(".")[0]), e = /* @__PURE__ */ new Map();
+      for (const N of S)
+        e.set(N, (e.get(N) || 0) + 1);
       if (e.size > 0) {
-        const O = Math.max(...e.values()), C = [...e.entries()].filter(([_, I]) => I === O).map(([_, I]) => _).sort();
-        for (const _ of C)
+        const N = Math.max(...e.values()), s = [...e.entries()].filter(([, _]) => _ === N).map(([_]) => _).sort();
+        for (const _ of s)
           if (this.canReachAllCubes(_, E, A))
             return _;
       }
@@ -1703,12 +1703,12 @@ class TA {
       const S = /* @__PURE__ */ new Map();
       for (const e of E)
         if (this.canReachAllCubes(e, E, A)) {
-          const O = A.get(e), C = O != null && O.joins ? Object.keys(O.joins).length : 0;
-          S.set(e, C);
+          const N = A.get(e), s = N != null && N.joins ? Object.keys(N.joins).length : 0;
+          S.set(e, s);
         }
       if (S.size > 0) {
         const e = Math.max(...S.values());
-        return [...S.entries()].filter(([C, _]) => _ === e).map(([C, _]) => C).sort()[0];
+        return [...S.entries()].filter(([, s]) => s === e).map(([s]) => s).sort()[0];
       }
     }
     return [...E].sort()[0];
@@ -1719,8 +1719,8 @@ class TA {
   canReachAllCubes(E, R, A) {
     const S = R.filter((e) => e !== E);
     for (const e of S) {
-      const O = this.findJoinPath(A, E, e, /* @__PURE__ */ new Set());
-      if (!O || O.length === 0)
+      const N = this.findJoinPath(A, E, e, /* @__PURE__ */ new Set());
+      if (!N || N.length === 0)
         return !1;
     }
     return !0;
@@ -1729,48 +1729,47 @@ class TA {
    * Build join plan for multi-cube query
    * Supports both direct joins and transitive joins through intermediate cubes
    */
-  buildJoinPlan(E, R, A, S) {
-    const e = [], O = /* @__PURE__ */ new Set([R.name]), C = A.filter((_) => _ !== R.name);
-    for (const _ of C) {
-      if (O.has(_))
+  buildJoinPlan(E, R, A) {
+    const S = [], e = /* @__PURE__ */ new Set([R.name]), N = A.filter((s) => s !== R.name);
+    for (const s of N) {
+      if (e.has(s))
         continue;
-      const I = this.findJoinPath(E, R.name, _, O);
-      if (!I || I.length === 0)
-        throw new Error(`No join path found from '${R.name}' to '${_}'`);
-      for (const { fromCube: N, toCube: s, joinDef: t } of I) {
-        if (O.has(s))
+      const _ = this.findJoinPath(E, R.name, s, e);
+      if (!_ || _.length === 0)
+        throw new Error(`No join path found from '${R.name}' to '${s}'`);
+      for (const { toCube: I, joinDef: O } of _) {
+        if (e.has(I))
           continue;
-        const n = E.get(s);
-        if (!n)
-          throw new Error(`Cube '${s}' not found`);
-        const P = this.buildJoinCondition(
-          t,
+        const C = E.get(I);
+        if (!C)
+          throw new Error(`Cube '${I}' not found`);
+        const t = this.buildJoinCondition(
+          O,
           null,
           // No source alias needed - use the actual column
-          null,
+          null
           // No target alias needed - use the actual column 
-          S
-        ), M = zR(t.relationship, t.sqlJoinType);
-        e.push({
-          cube: n,
-          alias: `${s.toLowerCase()}_cube`,
-          joinType: M,
-          joinCondition: P
-        }), O.add(s);
+        ), i = zR(O.relationship, O.sqlJoinType);
+        S.push({
+          cube: C,
+          alias: `${I.toLowerCase()}_cube`,
+          joinType: i,
+          joinCondition: t
+        }), e.add(I);
       }
     }
-    return e;
+    return S;
   }
   /**
    * Build join condition from new array-based join definition
    */
-  buildJoinCondition(E, R, A, S) {
-    const e = [];
-    for (const O of E.on) {
-      const C = R ? L`${L.identifier(R)}.${L.identifier(O.source.name)}` : O.source, _ = A ? L`${L.identifier(A)}.${L.identifier(O.target.name)}` : O.target, I = O.as || qE;
-      e.push(I(C, _));
+  buildJoinCondition(E, R, A) {
+    const S = [];
+    for (const e of E.on) {
+      const N = R ? L`${L.identifier(R)}.${L.identifier(e.source.name)}` : e.source, s = A ? L`${L.identifier(A)}.${L.identifier(e.target.name)}` : e.target, _ = e.as || qE;
+      S.push(_(N, s));
     }
-    return b(...e);
+    return b(...S);
   }
   /**
    * Find join path from source cube to target cube
@@ -1781,22 +1780,22 @@ class TA {
       return [];
     const e = [
       { cube: R, path: [] }
-    ], O = /* @__PURE__ */ new Set([R, ...S]);
+    ], N = /* @__PURE__ */ new Set([R, ...S]);
     for (; e.length > 0; ) {
-      const { cube: C, path: _ } = e.shift(), I = E.get(C);
+      const { cube: s, path: _ } = e.shift(), I = E.get(s);
       if (I != null && I.joins)
-        for (const [N, s] of Object.entries(I.joins)) {
-          const n = CT(s.targetCube).name;
-          if (O.has(n))
+        for (const [, O] of Object.entries(I.joins)) {
+          const t = CT(O.targetCube).name;
+          if (N.has(t))
             continue;
-          const P = [..._, {
-            fromCube: C,
-            toCube: n,
-            joinDef: s
+          const i = [..._, {
+            fromCube: s,
+            toCube: t,
+            joinDef: O
           }];
-          if (n === A)
-            return P;
-          O.add(n), e.push({ cube: n, path: P });
+          if (t === A)
+            return i;
+          N.add(t), e.push({ cube: t, path: i });
         }
     }
     return null;
@@ -1808,27 +1807,27 @@ class TA {
     const e = [];
     if (!S.measures || S.measures.length === 0)
       return e;
-    for (const O of A) {
-      const C = this.findHasManyJoinDef(R, O.cube.name);
-      if (!C)
+    for (const N of A) {
+      const s = this.findHasManyJoinDef(R, N.cube.name);
+      if (!s)
         continue;
       const _ = S.measures ? S.measures.filter(
-        (t) => t.startsWith(O.cube.name + ".")
-      ) : [], I = this.extractMeasuresFromFilters(S, O.cube.name), N = [.../* @__PURE__ */ new Set([..._, ...I])];
-      if (N.length === 0)
+        (t) => t.startsWith(N.cube.name + ".")
+      ) : [], I = this.extractMeasuresFromFilters(S, N.cube.name), O = [.../* @__PURE__ */ new Set([..._, ...I])];
+      if (O.length === 0)
         continue;
-      const s = C.on.map((t) => ({
+      const C = s.on.map((t) => ({
         sourceColumn: t.source.name,
         targetColumn: t.target.name,
         sourceColumnObj: t.source,
         targetColumnObj: t.target
       }));
       e.push({
-        cube: O.cube,
-        alias: O.alias,
-        cteAlias: `${O.cube.name.toLowerCase()}_agg`,
-        joinKeys: s,
-        measures: N
+        cube: N.cube,
+        alias: N.alias,
+        cteAlias: `${N.cube.name.toLowerCase()}_agg`,
+        joinKeys: C,
+        measures: O
       });
     }
     return e;
@@ -1839,9 +1838,9 @@ class TA {
   findHasManyJoinDef(E, R) {
     if (!E.joins)
       return null;
-    for (const [A, S] of Object.entries(E.joins))
-      if (CT(S.targetCube).name === R && S.relationship === "hasMany")
-        return S;
+    for (const [, A] of Object.entries(E.joins))
+      if (CT(A.targetCube).name === R && A.relationship === "hasMany")
+        return A;
     return null;
   }
 }
@@ -1866,24 +1865,24 @@ class UE {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: A
-      }, O = this.queryPlanner.createQueryPlan(E, R, e), C = this.buildUnifiedQuery(O, R, e), _ = this.queryBuilder.collectNumericFields(E, R), I = await this.dbExecutor.execute(C, _), N = Array.isArray(I) ? I.map((t) => {
-        const n = { ...t };
+      }, N = this.queryPlanner.createQueryPlan(E, R, e), s = this.buildUnifiedQuery(N, R, e), _ = this.queryBuilder.collectNumericFields(E, R), I = await this.dbExecutor.execute(s, _), O = Array.isArray(I) ? I.map((t) => {
+        const i = { ...t };
         if (R.timeDimensions) {
-          for (const P of R.timeDimensions)
-            if (P.dimension in n) {
-              let M = n[P.dimension];
+          for (const o of R.timeDimensions)
+            if (o.dimension in i) {
+              let M = i[o.dimension];
               if (typeof M == "string" && M.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-                const o = M.replace(" ", "T"), G = !o.endsWith("Z") && !o.includes("+") ? o + "Z" : o;
+                const P = M.replace(" ", "T"), G = !P.endsWith("Z") && !P.includes("+") ? P + "Z" : P;
                 M = new Date(G);
               }
-              M = this.databaseAdapter.convertTimeDimensionResult(M), n[P.dimension] = M;
+              M = this.databaseAdapter.convertTimeDimensionResult(M), i[o.dimension] = M;
             }
         }
-        return n;
-      }) : [I], s = this.generateAnnotations(O, R);
+        return i;
+      }) : [I], C = this.generateAnnotations(N, R);
       return {
-        data: N,
-        annotation: s
+        data: O,
+        annotation: C
       };
     } catch (S) {
       throw new Error(`Query execution failed: ${S instanceof Error ? S.message : "Unknown error"}`);
@@ -1901,56 +1900,56 @@ class UE {
    */
   buildPreAggregationCTE(E, R, A, S) {
     var M;
-    const e = E.cube, O = e.sql(A), C = {};
-    for (const o of E.joinKeys)
-      if (o.targetColumnObj) {
-        C[o.targetColumn] = o.targetColumnObj;
+    const e = E.cube, N = e.sql(A), s = {};
+    for (const P of E.joinKeys)
+      if (P.targetColumnObj) {
+        s[P.targetColumn] = P.targetColumnObj;
         for (const [G, a] of Object.entries(e.dimensions || {}))
-          a.sql === o.targetColumnObj && G !== o.targetColumn && (C[G] = L`${o.targetColumnObj}`.as(G));
+          a.sql === P.targetColumnObj && G !== P.targetColumn && (s[G] = L`${P.targetColumnObj}`.as(G));
       }
-    for (const o of E.measures) {
-      const [, G] = o.split(".");
+    for (const P of E.measures) {
+      const [, G] = P.split(".");
       if (e.measures && e.measures[G]) {
         const a = e.measures[G], H = this.queryBuilder.buildMeasureExpression(a, A);
-        C[G] = L`${H}`.as(G);
+        s[G] = L`${H}`.as(G);
       }
     }
     const _ = e.name;
     if (R.dimensions)
-      for (const o of R.dimensions) {
-        const [G, a] = o.split(".");
+      for (const P of R.dimensions) {
+        const [G, a] = P.split(".");
         if (G === _ && e.dimensions && e.dimensions[a]) {
           const H = e.dimensions[a], u = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A);
-          C[a] = L`${u}`.as(a);
+          s[a] = L`${u}`.as(a);
         }
       }
     if (R.timeDimensions)
-      for (const o of R.timeDimensions) {
-        const [G, a] = o.dimension.split(".");
+      for (const P of R.timeDimensions) {
+        const [G, a] = P.dimension.split(".");
         if (G === _ && e.dimensions && e.dimensions[a]) {
-          const H = e.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
-          C[a] = L`${u}`.as(a);
+          const H = e.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, P.granularity, A);
+          s[a] = L`${u}`.as(a);
         }
       }
-    if (Object.keys(C).length === 0)
+    if (Object.keys(s).length === 0)
       return null;
-    let I = A.db.select(C).from(O.from);
-    const N = S ? {
+    let I = A.db.select(s).from(N.from);
+    const O = S ? {
       ...S,
-      preAggregationCTEs: (M = S.preAggregationCTEs) == null ? void 0 : M.filter((o) => o.cube.name !== e.name)
-    } : void 0, s = this.queryBuilder.buildWhereConditions(e, R, A, N), t = [];
+      preAggregationCTEs: (M = S.preAggregationCTEs) == null ? void 0 : M.filter((P) => P.cube.name !== e.name)
+    } : void 0, C = this.queryBuilder.buildWhereConditions(e, R, A, O), t = [];
     if (R.timeDimensions)
-      for (const o of R.timeDimensions) {
-        const [G, a] = o.dimension.split(".");
-        if (G === _ && e.dimensions && e.dimensions[a] && o.dateRange) {
-          const H = e.dimensions[a], u = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(u, o.dateRange);
+      for (const P of R.timeDimensions) {
+        const [G, a] = P.dimension.split(".");
+        if (G === _ && e.dimensions && e.dimensions[a] && P.dateRange) {
+          const H = e.dimensions[a], u = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(u, P.dateRange);
           B && t.push(B);
         }
       }
     if (R.filters) {
-      for (const o of R.filters)
-        if (!("and" in o) && !("or" in o) && "member" in o && "operator" in o) {
-          const G = o, [a, H] = G.member.split(".");
+      for (const P of R.filters)
+        if (!("and" in P) && !("or" in P) && "member" in P && "operator" in P) {
+          const G = P, [a, H] = G.member.split(".");
           if (a === _ && e.dimensions && e.dimensions[H]) {
             const u = e.dimensions[H];
             if (G.operator === "inDateRange") {
@@ -1960,44 +1959,44 @@ class UE {
           }
         }
     }
-    const n = [];
-    if (O.where && n.push(O.where), n.push(...s, ...t), n.length > 0) {
-      const o = n.length === 1 ? n[0] : b(...n);
-      I = I.where(o);
+    const i = [];
+    if (N.where && i.push(N.where), i.push(...C, ...t), i.length > 0) {
+      const P = i.length === 1 ? i[0] : b(...i);
+      I = I.where(P);
     }
-    const P = [];
-    for (const o of E.joinKeys)
-      o.targetColumnObj && P.push(o.targetColumnObj);
+    const o = [];
+    for (const P of E.joinKeys)
+      P.targetColumnObj && o.push(P.targetColumnObj);
     if (R.dimensions)
-      for (const o of R.dimensions) {
-        const [G, a] = o.split(".");
+      for (const P of R.dimensions) {
+        const [G, a] = P.split(".");
         if (G === _ && e.dimensions && e.dimensions[a]) {
           const H = e.dimensions[a], u = x(H.sql, A);
-          P.push(u);
+          o.push(u);
         }
       }
     if (R.timeDimensions)
-      for (const o of R.timeDimensions) {
-        const [G, a] = o.dimension.split(".");
+      for (const P of R.timeDimensions) {
+        const [G, a] = P.dimension.split(".");
         if (G === _ && e.dimensions && e.dimensions[a]) {
-          const H = e.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
-          P.push(u);
+          const H = e.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, P.granularity, A);
+          o.push(u);
         }
       }
-    return P.length > 0 && (I = I.groupBy(...P)), A.db.$with(E.cteAlias).as(I);
+    return o.length > 0 && (I = I.groupBy(...o)), A.db.$with(E.cteAlias).as(I);
   }
   // Removed unused getActualJoinTargetColumn method
   /**
    * Build join condition for CTE
    */
   buildCTEJoinCondition(E, R, A) {
-    var O;
-    const S = (O = A.preAggregationCTEs) == null ? void 0 : O.find((C) => C.cube.name === E.cube.name);
+    var N;
+    const S = (N = A.preAggregationCTEs) == null ? void 0 : N.find((s) => s.cube.name === E.cube.name);
     if (!S)
       throw new Error(`CTE info not found for cube ${E.cube.name}`);
     const e = [];
-    for (const C of S.joinKeys) {
-      const _ = C.sourceColumnObj || L.identifier(C.sourceColumn), I = L`${L.identifier(R)}.${L.identifier(C.targetColumn)}`;
+    for (const s of S.joinKeys) {
+      const _ = s.sourceColumnObj || L.identifier(s.sourceColumn), I = L`${L.identifier(R)}.${L.identifier(s.targetColumn)}`;
       e.push(qE(_, I));
     }
     return e.length === 1 ? e[0] : b(...e);
@@ -2006,14 +2005,14 @@ class UE {
    * Build unified query that works for both single and multi-cube queries
    */
   buildUnifiedQuery(E, R, A) {
-    var M, o, G;
+    var M, P, G;
     const S = [], e = /* @__PURE__ */ new Map();
     if (E.preAggregationCTEs && E.preAggregationCTEs.length > 0)
       for (const a of E.preAggregationCTEs) {
         const H = this.buildPreAggregationCTE(a, R, A, E);
         H && (S.push(H), e.set(a.cube.name, a.cteAlias));
       }
-    const O = E.primaryCube.sql(A), _ = { ...this.queryBuilder.buildSelections(
+    const N = E.primaryCube.sql(A), _ = { ...this.queryBuilder.buildSelections(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -2058,7 +2057,7 @@ class UE {
             const V = this.getCubesFromPlan(E).get(H), g = V && ((M = V.dimensions) == null ? void 0 : M[Y]), K = u.startsWith(H + ".");
             if (g || K) {
               let nE = a.joinKeys.find((iE) => iE.targetColumn === Y);
-              if (!nE && ((o = V == null ? void 0 : V.dimensions) != null && o[Y])) {
+              if (!nE && ((P = V == null ? void 0 : V.dimensions) != null && P[Y])) {
                 const iE = V.dimensions[Y].sql;
                 nE = a.joinKeys.find((mR) => mR.targetColumnObj === iE);
               }
@@ -2067,9 +2066,9 @@ class UE {
           }
         }
       }
-    let I = A.db.select(_).from(O.from);
-    if (S.length > 0 && (I = A.db.with(...S).select(_).from(O.from)), O.joins)
-      for (const a of O.joins)
+    let I = A.db.select(_).from(N.from);
+    if (S.length > 0 && (I = A.db.with(...S).select(_).from(N.from)), N.joins)
+      for (const a of N.joins)
         switch (a.type || "left") {
           case "left":
             I = I.leftJoin(a.table, a.on);
@@ -2107,15 +2106,15 @@ class UE {
         } catch {
         }
       }
-    const N = [];
-    if (O.where && N.push(O.where), E.joinCubes && E.joinCubes.length > 0)
+    const O = [];
+    if (N.where && O.push(N.where), E.joinCubes && E.joinCubes.length > 0)
       for (const a of E.joinCubes) {
         if (e.get(a.cube.name))
           continue;
         const u = a.cube.sql(A);
-        u.where && N.push(u.where);
+        u.where && O.push(u.where);
       }
-    const s = this.queryBuilder.buildWhereConditions(
+    const C = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -2123,8 +2122,8 @@ class UE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (s.length > 0 && N.push(...s), N.length > 0) {
-      const a = N.length === 1 ? N[0] : b(...N);
+    if (C.length > 0 && O.push(...C), O.length > 0) {
+      const a = O.length === 1 ? O[0] : b(...O);
       I = I.where(a);
     }
     const t = this.queryBuilder.buildGroupByFields(
@@ -2136,7 +2135,7 @@ class UE {
       // Pass the queryPlan to handle CTE scenarios
     );
     t.length > 0 && (I = I.groupBy(...t));
-    const n = this.queryBuilder.buildHavingConditions(
+    const i = this.queryBuilder.buildHavingConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -2144,12 +2143,12 @@ class UE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (n.length > 0) {
-      const a = n.length === 1 ? n[0] : b(...n);
+    if (i.length > 0) {
+      const a = i.length === 1 ? i[0] : b(...i);
       I = I.having(a);
     }
-    const P = this.queryBuilder.buildOrderBy(R);
-    return P.length > 0 && (I = I.orderBy(...P)), I = this.queryBuilder.applyLimitAndOffset(I, R), I;
+    const o = this.queryBuilder.buildOrderBy(R);
+    return o.length > 0 && (I = I.orderBy(...o)), I = this.queryBuilder.applyLimitAndOffset(I, R), I;
   }
   /**
    * Convert query plan to cube map for QueryBuilder methods
@@ -2182,51 +2181,51 @@ class UE {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: A
-    }, e = this.queryPlanner.createQueryPlan(E, R, S), C = this.buildUnifiedQuery(e, R, S).toSQL();
+    }, e = this.queryPlanner.createQueryPlan(E, R, S), s = this.buildUnifiedQuery(e, R, S).toSQL();
     return {
-      sql: C.sql,
-      params: C.params
+      sql: s.sql,
+      params: s.params
     };
   }
   /**
    * Generate annotations for UI metadata - unified approach
    */
   generateAnnotations(E, R) {
-    const A = {}, S = {}, e = {}, O = [E.primaryCube];
-    if (E.joinCubes && E.joinCubes.length > 0 && O.push(...E.joinCubes.map((C) => C.cube)), R.measures)
-      for (const C of R.measures) {
-        const [_, I] = C.split("."), N = O.find((s) => s.name === _);
-        if (N && N.measures[I]) {
-          const s = N.measures[I];
-          A[C] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
-            type: s.type
+    const A = {}, S = {}, e = {}, N = [E.primaryCube];
+    if (E.joinCubes && E.joinCubes.length > 0 && N.push(...E.joinCubes.map((s) => s.cube)), R.measures)
+      for (const s of R.measures) {
+        const [_, I] = s.split("."), O = N.find((C) => C.name === _);
+        if (O && O.measures[I]) {
+          const C = O.measures[I];
+          A[s] = {
+            title: C.title || I,
+            shortTitle: C.title || I,
+            type: C.type
           };
         }
       }
     if (R.dimensions)
-      for (const C of R.dimensions) {
-        const [_, I] = C.split("."), N = O.find((s) => s.name === _);
-        if (N && N.dimensions[I]) {
-          const s = N.dimensions[I];
-          S[C] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
-            type: s.type
+      for (const s of R.dimensions) {
+        const [_, I] = s.split("."), O = N.find((C) => C.name === _);
+        if (O && O.dimensions[I]) {
+          const C = O.dimensions[I];
+          S[s] = {
+            title: C.title || I,
+            shortTitle: C.title || I,
+            type: C.type
           };
         }
       }
     if (R.timeDimensions)
-      for (const C of R.timeDimensions) {
-        const [_, I] = C.dimension.split("."), N = O.find((s) => s.name === _);
-        if (N && N.dimensions && N.dimensions[I]) {
-          const s = N.dimensions[I];
-          e[C.dimension] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
-            type: s.type,
-            granularity: C.granularity
+      for (const s of R.timeDimensions) {
+        const [_, I] = s.dimension.split("."), O = N.find((C) => C.name === _);
+        if (O && O.dimensions && O.dimensions[I]) {
+          const C = O.dimensions[I];
+          e[s.dimension] = {
+            title: C.title || I,
+            shortTitle: C.title || I,
+            type: C.type,
+            granularity: s.granularity
           };
         }
       }
@@ -3134,7 +3133,7 @@ const _R = (T) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), oA = {
+]), PA = {
   name: "bigquery",
   tokenizerOptions: {
     reservedSelect: rA,
@@ -3162,14 +3161,14 @@ const _R = (T) => ({
     variableTypes: [{ regex: String.raw`@@\w+` }],
     lineCommentTypes: ["--", "#"],
     operators: ["&", "|", "^", "~", ">>", "<<", "||", "=>"],
-    postProcess: PA
+    postProcess: oA
   },
   formatOptions: {
     onelineClauses: [...LT, ...GE],
     tabularOnelineClauses: GE
   }
 };
-function PA(T) {
+function oA(T) {
   return MA(UA(T));
 }
 function MA(T) {
@@ -3182,11 +3181,11 @@ function UA(T) {
   for (let A = 0; A < T.length; A++) {
     const S = T[A];
     if ((Z.ARRAY(S) || Z.STRUCT(S)) && ((E = T[A + 1]) === null || E === void 0 ? void 0 : E.text) === "<") {
-      const e = GA(T, A + 1), O = T.slice(A, e + 1);
+      const e = GA(T, A + 1), N = T.slice(A, e + 1);
       R.push({
         type: D.IDENTIFIER,
-        raw: O.map(_T("raw")).join(""),
-        text: O.map(_T("text")).join(""),
+        raw: N.map(_T("raw")).join(""),
+        text: N.map(_T("text")).join(""),
         start: S.start
       }), A = e;
     } else
@@ -8457,7 +8456,7 @@ const IS = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], aS = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), oS = r([
+], aS = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), PS = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8477,7 +8476,7 @@ const IS = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), oT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), mE = r([
+]), PT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), mE = r([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -8658,7 +8657,7 @@ const IS = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), PS = r(["UNION [ALL | DISTINCT]"]), MS = r([
+]), oS = r(["UNION [ALL | DISTINCT]"]), MS = r([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8675,8 +8674,8 @@ const IS = [
   name: "mysql",
   tokenizerOptions: {
     reservedSelect: aS,
-    reservedClauses: [...oS, ...oT, ...mE],
-    reservedSetOperations: PS,
+    reservedClauses: [...PS, ...PT, ...mE],
+    reservedSetOperations: oS,
     reservedJoins: MS,
     reservedPhrases: US,
     supportsXor: !0,
@@ -8720,7 +8719,7 @@ const IS = [
     postProcess: rE
   },
   formatOptions: {
-    onelineClauses: [...oT, ...mE],
+    onelineClauses: [...PT, ...mE],
     tabularOnelineClauses: mE
   }
 }, lS = [
@@ -9308,7 +9307,7 @@ const IS = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), PT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), FE = r([
+]), oT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), FE = r([
   // 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
@@ -9440,7 +9439,7 @@ const IS = [
   name: "tidb",
   tokenizerOptions: {
     reservedSelect: HS,
-    reservedClauses: [...BS, ...PT, ...FE],
+    reservedClauses: [...BS, ...oT, ...FE],
     reservedSetOperations: mS,
     reservedJoins: FS,
     reservedPhrases: YS,
@@ -9485,7 +9484,7 @@ const IS = [
     postProcess: rE
   },
   formatOptions: {
-    onelineClauses: [...PT, ...FE],
+    onelineClauses: [...oT, ...FE],
     tabularOnelineClauses: FE
   }
 }, dS = [
@@ -13289,7 +13288,7 @@ const kS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], oe = r(["SELECT [ALL | DISTINCT]"]), Pe = r([
+], Pe = r(["SELECT [ALL | DISTINCT]"]), oe = r([
   // queries
   "WITH",
   "FROM",
@@ -13391,8 +13390,8 @@ const kS = [
 ]), le = {
   name: "spark",
   tokenizerOptions: {
-    reservedSelect: oe,
-    reservedClauses: [...Pe, ...cT, ...fE],
+    reservedSelect: Pe,
+    reservedClauses: [...oe, ...cT, ...fE],
     reservedSetOperations: Me,
     reservedJoins: Ue,
     reservedPhrases: Ge,
@@ -17350,7 +17349,7 @@ const ue = [
   "WITH",
   // These are definitely keywords, but haven't found a definite list in the docs
   "COMMENT"
-], oI = [
+], PI = [
   "NUMBER",
   "DECIMAL",
   "NUMERIC",
@@ -17387,7 +17386,7 @@ const ue = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], PI = r(["SELECT [ALL | DISTINCT]"]), MI = r([
+], oI = r(["SELECT [ALL | DISTINCT]"]), MI = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -17669,13 +17668,13 @@ const ue = [
 ]), cI = {
   name: "snowflake",
   tokenizerOptions: {
-    reservedSelect: PI,
+    reservedSelect: oI,
     reservedClauses: [...MI, ...YT, ...yE],
     reservedSetOperations: UI,
     reservedJoins: GI,
     reservedPhrases: lI,
     reservedKeywords: aI,
-    reservedDataTypes: oI,
+    reservedDataTypes: PI,
     reservedFunctionNames: DI,
     stringTypes: ["$$", "''-qq-bs"],
     identTypes: ['""-qq'],
@@ -17711,7 +17710,7 @@ const ue = [
   }
 }, uI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  bigquery: oA,
+  bigquery: PA,
   db2: pA,
   db2i: KA,
   duckdb: qA,
@@ -17751,7 +17750,7 @@ const ue = [
     "[": "]",
     "(": ")",
     "{": "}"
-  }, E = "{left}(?:(?!{right}').)*?{right}", R = Object.entries(T).map(([O, C]) => E.replace(/{left}/g, y(O)).replace(/{right}/g, y(C))), A = y(Object.keys(T).join(""));
+  }, E = "{left}(?:(?!{right}').)*?{right}", R = Object.entries(T).map(([N, s]) => E.replace(/{left}/g, y(N)).replace(/{right}/g, y(s))), A = y(Object.keys(T).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${A}])(?:(?!\k<tag>').)*?\k<tag>`}|${R.join("|")})'`;
 }, hT = {
   // - backtick quoted (using `` to escape)
@@ -17779,10 +17778,10 @@ const ue = [
   // Oracle q'' strings: q'<text>' q'|text|' ...
   "q''": pI()
 }, iR = (T) => typeof T == "string" ? hT[T] : "regex" in T ? T.regex : mI(T) + hT[T.quote], dI = (T) => q(T.map((E) => "regex" in E ? E.regex : iR(E)).join("|")), DR = (T) => T.map(iR).join("|"), VT = (T) => q(DR(T)), fI = (T = {}) => q(aR(T)), aR = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
-  const S = "\\p{Alphabetic}\\p{Mark}_", e = "\\p{Decimal_Number}", O = y(T ?? ""), C = y(E ?? ""), _ = A ? `[${S}${e}${O}][${S}${e}${C}]*` : `[${S}${O}][${S}${e}${C}]*`;
+  const S = "\\p{Alphabetic}\\p{Mark}_", e = "\\p{Decimal_Number}", N = y(T ?? ""), s = y(E ?? ""), _ = A ? `[${S}${e}${N}][${S}${e}${s}]*` : `[${S}${N}][${S}${e}${s}]*`;
   return R ? BI(_) : _;
 };
-function oR(T, E) {
+function PR(T, E) {
   const R = T.slice(0, E).split(/\n/);
   return { line: R.length, col: R[R.length - 1].length + 1 };
 }
@@ -17812,7 +17811,7 @@ class hI {
     return R;
   }
   createParseError() {
-    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = oR(this.input, this.index);
+    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = PR(this.input, this.index);
     return new Error(`Parse error: Unexpected "${E}" at line ${R} column ${A}.
 ${this.dialectInfo()}`);
   }
@@ -18064,13 +18063,13 @@ class bI {
   // These rules can't be blindly cached as the paramTypesOverrides object
   // can differ on each invocation of the format() function.
   buildParamRules(E, R) {
-    var A, S, e, O, C;
+    var A, S, e, N, s;
     const _ = {
       named: (R == null ? void 0 : R.named) || ((A = E.paramTypes) === null || A === void 0 ? void 0 : A.named) || [],
       quoted: (R == null ? void 0 : R.quoted) || ((S = E.paramTypes) === null || S === void 0 ? void 0 : S.quoted) || [],
       numbered: (R == null ? void 0 : R.numbered) || ((e = E.paramTypes) === null || e === void 0 ? void 0 : e.numbered) || [],
-      positional: typeof (R == null ? void 0 : R.positional) == "boolean" ? R.positional : (O = E.paramTypes) === null || O === void 0 ? void 0 : O.positional,
-      custom: (R == null ? void 0 : R.custom) || ((C = E.paramTypes) === null || C === void 0 ? void 0 : C.custom) || []
+      positional: typeof (R == null ? void 0 : R.positional) == "boolean" ? R.positional : (N = E.paramTypes) === null || N === void 0 ? void 0 : N.positional,
+      custom: (R == null ? void 0 : R.custom) || ((s = E.paramTypes) === null || s === void 0 ? void 0 : s.custom) || []
     };
     return this.validRules([
       {
@@ -18081,7 +18080,7 @@ class bI {
       {
         type: D.QUOTED_PARAMETER,
         regex: $E(_.quoted, DR(E.identTypes)),
-        key: (I) => (({ tokenKey: N, quoteChar: s }) => N.replace(new RegExp(y("\\" + s), "gu"), s))({
+        key: (I) => (({ tokenKey: O, quoteChar: C }) => O.replace(new RegExp(y("\\" + C), "gu"), C))({
           tokenKey: I.slice(2, -1),
           quoteChar: I.slice(-1)
         })
@@ -18096,11 +18095,11 @@ class bI {
         regex: _.positional ? /[?]/y : void 0
       },
       ..._.custom.map((I) => {
-        var N;
+        var O;
         return {
           type: D.CUSTOM_PARAMETER,
           regex: q(I.regex),
-          key: (N = I.key) !== null && N !== void 0 ? N : (s) => s
+          key: (O = I.key) !== null && O !== void 0 ? O : (C) => C
         };
       })
     ]);
@@ -18157,97 +18156,97 @@ var wI = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : t
 function xI(T) {
   return T && T.__esModule && Object.prototype.hasOwnProperty.call(T, "default") ? T.default : T;
 }
-var PR = { exports: {} };
+var oR = { exports: {} };
 (function(T) {
   (function(E, R) {
     T.exports ? T.exports = R() : E.nearley = R();
   })(wI, function() {
-    function E(I, N, s) {
-      return this.id = ++E.highestId, this.name = I, this.symbols = N, this.postprocess = s, this;
+    function E(I, O, C) {
+      return this.id = ++E.highestId, this.name = I, this.symbols = O, this.postprocess = C, this;
     }
     E.highestId = 0, E.prototype.toString = function(I) {
-      var N = typeof I > "u" ? this.symbols.map(_).join(" ") : this.symbols.slice(0, I).map(_).join(" ") + " ● " + this.symbols.slice(I).map(_).join(" ");
-      return this.name + " → " + N;
+      var O = typeof I > "u" ? this.symbols.map(_).join(" ") : this.symbols.slice(0, I).map(_).join(" ") + " ● " + this.symbols.slice(I).map(_).join(" ");
+      return this.name + " → " + O;
     };
-    function R(I, N, s, t) {
-      this.rule = I, this.dot = N, this.reference = s, this.data = [], this.wantedBy = t, this.isComplete = this.dot === I.symbols.length;
+    function R(I, O, C, t) {
+      this.rule = I, this.dot = O, this.reference = C, this.data = [], this.wantedBy = t, this.isComplete = this.dot === I.symbols.length;
     }
     R.prototype.toString = function() {
       return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
     }, R.prototype.nextState = function(I) {
-      var N = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
-      return N.left = this, N.right = I, N.isComplete && (N.data = N.build(), N.right = void 0), N;
+      var O = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
+      return O.left = this, O.right = I, O.isComplete && (O.data = O.build(), O.right = void 0), O;
     }, R.prototype.build = function() {
-      var I = [], N = this;
+      var I = [], O = this;
       do
-        I.push(N.right.data), N = N.left;
-      while (N.left);
+        I.push(O.right.data), O = O.left;
+      while (O.left);
       return I.reverse(), I;
     }, R.prototype.finish = function() {
-      this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, O.fail));
+      this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, N.fail));
     };
-    function A(I, N) {
-      this.grammar = I, this.index = N, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
+    function A(I, O) {
+      this.grammar = I, this.index = O, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
     }
     A.prototype.process = function(I) {
-      for (var N = this.states, s = this.wants, t = this.completed, n = 0; n < N.length; n++) {
-        var P = N[n];
-        if (P.isComplete) {
-          if (P.finish(), P.data !== O.fail) {
-            for (var M = P.wantedBy, o = M.length; o--; ) {
-              var G = M[o];
-              this.complete(G, P);
+      for (var O = this.states, C = this.wants, t = this.completed, i = 0; i < O.length; i++) {
+        var o = O[i];
+        if (o.isComplete) {
+          if (o.finish(), o.data !== N.fail) {
+            for (var M = o.wantedBy, P = M.length; P--; ) {
+              var G = M[P];
+              this.complete(G, o);
             }
-            if (P.reference === this.index) {
-              var a = P.rule.name;
-              (this.completed[a] = this.completed[a] || []).push(P);
+            if (o.reference === this.index) {
+              var a = o.rule.name;
+              (this.completed[a] = this.completed[a] || []).push(o);
             }
           }
         } else {
-          var a = P.rule.symbols[P.dot];
+          var a = o.rule.symbols[o.dot];
           if (typeof a != "string") {
-            this.scannable.push(P);
+            this.scannable.push(o);
             continue;
           }
-          if (s[a]) {
-            if (s[a].push(P), t.hasOwnProperty(a))
-              for (var H = t[a], o = 0; o < H.length; o++) {
-                var u = H[o];
-                this.complete(P, u);
+          if (C[a]) {
+            if (C[a].push(o), t.hasOwnProperty(a))
+              for (var H = t[a], P = 0; P < H.length; P++) {
+                var u = H[P];
+                this.complete(o, u);
               }
           } else
-            s[a] = [P], this.predict(a);
+            C[a] = [o], this.predict(a);
         }
       }
     }, A.prototype.predict = function(I) {
-      for (var N = this.grammar.byName[I] || [], s = 0; s < N.length; s++) {
-        var t = N[s], n = this.wants[I], P = new R(t, 0, this.index, n);
-        this.states.push(P);
+      for (var O = this.grammar.byName[I] || [], C = 0; C < O.length; C++) {
+        var t = O[C], i = this.wants[I], o = new R(t, 0, this.index, i);
+        this.states.push(o);
       }
-    }, A.prototype.complete = function(I, N) {
-      var s = I.nextState(N);
-      this.states.push(s);
+    }, A.prototype.complete = function(I, O) {
+      var C = I.nextState(O);
+      this.states.push(C);
     };
-    function S(I, N) {
-      this.rules = I, this.start = N || this.rules[0].name;
-      var s = this.byName = {};
+    function S(I, O) {
+      this.rules = I, this.start = O || this.rules[0].name;
+      var C = this.byName = {};
       this.rules.forEach(function(t) {
-        s.hasOwnProperty(t.name) || (s[t.name] = []), s[t.name].push(t);
+        C.hasOwnProperty(t.name) || (C[t.name] = []), C[t.name].push(t);
       });
     }
-    S.fromCompiled = function(t, N) {
-      var s = t.Lexer;
-      t.ParserStart && (N = t.ParserStart, t = t.ParserRules);
-      var t = t.map(function(P) {
-        return new E(P.name, P.symbols, P.postprocess);
-      }), n = new S(t, N);
-      return n.lexer = s, n;
+    S.fromCompiled = function(t, O) {
+      var C = t.Lexer;
+      t.ParserStart && (O = t.ParserStart, t = t.ParserRules);
+      var t = t.map(function(o) {
+        return new E(o.name, o.symbols, o.postprocess);
+      }), i = new S(t, O);
+      return i.lexer = C, i;
     };
     function e() {
       this.reset("");
     }
-    e.prototype.reset = function(I, N) {
-      this.buffer = I, this.index = 0, this.line = N ? N.line : 1, this.lastLineBreak = N ? -N.col : 0;
+    e.prototype.reset = function(I, O) {
+      this.buffer = I, this.index = 0, this.line = O ? O.line : 1, this.lastLineBreak = O ? -O.col : 0;
     }, e.prototype.next = function() {
       if (this.index < this.buffer.length) {
         var I = this.buffer[this.index++];
@@ -18259,53 +18258,53 @@ var PR = { exports: {} };
         line: this.line,
         col: this.index - this.lastLineBreak
       };
-    }, e.prototype.formatError = function(I, N) {
-      var s = this.buffer;
-      if (typeof s == "string") {
-        var t = s.split(`
+    }, e.prototype.formatError = function(I, O) {
+      var C = this.buffer;
+      if (typeof C == "string") {
+        var t = C.split(`
 `).slice(
           Math.max(0, this.line - 5),
           this.line
-        ), n = s.indexOf(`
+        ), i = C.indexOf(`
 `, this.index);
-        n === -1 && (n = s.length);
-        var P = this.index - this.lastLineBreak, M = String(this.line).length;
-        return N += " at line " + this.line + " col " + P + `:
+        i === -1 && (i = C.length);
+        var o = this.index - this.lastLineBreak, M = String(this.line).length;
+        return O += " at line " + this.line + " col " + o + `:
 
-`, N += t.map(function(G, a) {
-          return o(this.line - t.length + a + 1, M) + " " + G;
+`, O += t.map(function(G, a) {
+          return P(this.line - t.length + a + 1, M) + " " + G;
         }, this).join(`
-`), N += `
-` + o("", M + P) + `^
-`, N;
+`), O += `
+` + P("", M + o) + `^
+`, O;
       } else
-        return N + " at index " + (this.index - 1);
-      function o(G, a) {
+        return O + " at index " + (this.index - 1);
+      function P(G, a) {
         var H = String(G);
         return Array(a - H.length + 1).join(" ") + H;
       }
     };
-    function O(I, N, s) {
+    function N(I, O, C) {
       if (I instanceof S)
-        var t = I, s = N;
+        var t = I, C = O;
       else
-        var t = S.fromCompiled(I, N);
+        var t = S.fromCompiled(I, O);
       this.grammar = t, this.options = {
         keepHistory: !1,
         lexer: t.lexer || new e()
       };
-      for (var n in s || {})
-        this.options[n] = s[n];
+      for (var i in C || {})
+        this.options[i] = C[i];
       this.lexer = this.options.lexer, this.lexerState = void 0;
-      var P = new A(t, 0);
-      this.table = [P], P.wants[t.start] = [], P.predict(t.start), P.process(), this.current = 0;
+      var o = new A(t, 0);
+      this.table = [o], o.wants[t.start] = [], o.predict(t.start), o.process(), this.current = 0;
     }
-    O.fail = {}, O.prototype.feed = function(I) {
-      var N = this.lexer;
-      N.reset(I, this.lexerState);
-      for (var s; ; ) {
+    N.fail = {}, N.prototype.feed = function(I) {
+      var O = this.lexer;
+      O.reset(I, this.lexerState);
+      for (var C; ; ) {
         try {
-          if (s = N.next(), !s)
+          if (C = O.next(), !C)
             break;
         } catch (V) {
           var M = new A(this.grammar, this.current + 1);
@@ -18313,90 +18312,90 @@ var PR = { exports: {} };
           var t = new Error(this.reportLexerError(V));
           throw t.offset = this.current, t.token = V.token, t;
         }
-        var n = this.table[this.current];
+        var i = this.table[this.current];
         this.options.keepHistory || delete this.table[this.current - 1];
-        var P = this.current + 1, M = new A(this.grammar, P);
+        var o = this.current + 1, M = new A(this.grammar, o);
         this.table.push(M);
-        for (var o = s.text !== void 0 ? s.text : s.value, G = N.constructor === e ? s.value : s, a = n.scannable, H = a.length; H--; ) {
+        for (var P = C.text !== void 0 ? C.text : C.value, G = O.constructor === e ? C.value : C, a = i.scannable, H = a.length; H--; ) {
           var u = a[H], B = u.rule.symbols[u.dot];
-          if (B.test ? B.test(G) : B.type ? B.type === s.type : B.literal === o) {
-            var Y = u.nextState({ data: G, token: s, isToken: !0, reference: P - 1 });
+          if (B.test ? B.test(G) : B.type ? B.type === C.type : B.literal === P) {
+            var Y = u.nextState({ data: G, token: C, isToken: !0, reference: o - 1 });
             M.states.push(Y);
           }
         }
         if (M.process(), M.states.length === 0) {
-          var t = new Error(this.reportError(s));
-          throw t.offset = this.current, t.token = s, t;
+          var t = new Error(this.reportError(C));
+          throw t.offset = this.current, t.token = C, t;
         }
-        this.options.keepHistory && (n.lexerState = N.save()), this.current++;
+        this.options.keepHistory && (i.lexerState = O.save()), this.current++;
       }
-      return n && (this.lexerState = N.save()), this.results = this.finish(), this;
-    }, O.prototype.reportLexerError = function(I) {
-      var N, s, t = I.token;
-      return t ? (N = "input " + JSON.stringify(t.text[0]) + " (lexer error)", s = this.lexer.formatError(t, "Syntax error")) : (N = "input (lexer error)", s = I.message), this.reportErrorCommon(s, N);
-    }, O.prototype.reportError = function(I) {
-      var N = (I.type ? I.type + " token: " : "") + JSON.stringify(I.value !== void 0 ? I.value : I), s = this.lexer.formatError(I, "Syntax error");
-      return this.reportErrorCommon(s, N);
-    }, O.prototype.reportErrorCommon = function(I, N) {
-      var s = [];
-      s.push(I);
-      var t = this.table.length - 2, n = this.table[t], P = n.states.filter(function(o) {
-        var G = o.rule.symbols[o.dot];
+      return i && (this.lexerState = O.save()), this.results = this.finish(), this;
+    }, N.prototype.reportLexerError = function(I) {
+      var O, C, t = I.token;
+      return t ? (O = "input " + JSON.stringify(t.text[0]) + " (lexer error)", C = this.lexer.formatError(t, "Syntax error")) : (O = "input (lexer error)", C = I.message), this.reportErrorCommon(C, O);
+    }, N.prototype.reportError = function(I) {
+      var O = (I.type ? I.type + " token: " : "") + JSON.stringify(I.value !== void 0 ? I.value : I), C = this.lexer.formatError(I, "Syntax error");
+      return this.reportErrorCommon(C, O);
+    }, N.prototype.reportErrorCommon = function(I, O) {
+      var C = [];
+      C.push(I);
+      var t = this.table.length - 2, i = this.table[t], o = i.states.filter(function(P) {
+        var G = P.rule.symbols[P.dot];
         return G && typeof G != "string";
       });
-      if (P.length === 0)
-        s.push("Unexpected " + N + `. I did not expect any more input. Here is the state of my parse table:
-`), this.displayStateStack(n.states, s);
+      if (o.length === 0)
+        C.push("Unexpected " + O + `. I did not expect any more input. Here is the state of my parse table:
+`), this.displayStateStack(i.states, C);
       else {
-        s.push("Unexpected " + N + `. Instead, I was expecting to see one of the following:
+        C.push("Unexpected " + O + `. Instead, I was expecting to see one of the following:
 `);
-        var M = P.map(function(o) {
-          return this.buildFirstStateStack(o, []) || [o];
+        var M = o.map(function(P) {
+          return this.buildFirstStateStack(P, []) || [P];
         }, this);
-        M.forEach(function(o) {
-          var G = o[0], a = G.rule.symbols[G.dot], H = this.getSymbolDisplay(a);
-          s.push("A " + H + " based on:"), this.displayStateStack(o, s);
+        M.forEach(function(P) {
+          var G = P[0], a = G.rule.symbols[G.dot], H = this.getSymbolDisplay(a);
+          C.push("A " + H + " based on:"), this.displayStateStack(P, C);
         }, this);
       }
-      return s.push(""), s.join(`
+      return C.push(""), C.join(`
 `);
-    }, O.prototype.displayStateStack = function(I, N) {
-      for (var s, t = 0, n = 0; n < I.length; n++) {
-        var P = I[n], M = P.rule.toString(P.dot);
-        M === s ? t++ : (t > 0 && N.push("    ^ " + t + " more lines identical to this"), t = 0, N.push("    " + M)), s = M;
+    }, N.prototype.displayStateStack = function(I, O) {
+      for (var C, t = 0, i = 0; i < I.length; i++) {
+        var o = I[i], M = o.rule.toString(o.dot);
+        M === C ? t++ : (t > 0 && O.push("    ^ " + t + " more lines identical to this"), t = 0, O.push("    " + M)), C = M;
       }
-    }, O.prototype.getSymbolDisplay = function(I) {
-      return C(I);
-    }, O.prototype.buildFirstStateStack = function(I, N) {
-      if (N.indexOf(I) !== -1)
+    }, N.prototype.getSymbolDisplay = function(I) {
+      return s(I);
+    }, N.prototype.buildFirstStateStack = function(I, O) {
+      if (O.indexOf(I) !== -1)
         return null;
       if (I.wantedBy.length === 0)
         return [I];
-      var s = I.wantedBy[0], t = [I].concat(N), n = this.buildFirstStateStack(s, t);
-      return n === null ? null : [I].concat(n);
-    }, O.prototype.save = function() {
+      var C = I.wantedBy[0], t = [I].concat(O), i = this.buildFirstStateStack(C, t);
+      return i === null ? null : [I].concat(i);
+    }, N.prototype.save = function() {
       var I = this.table[this.current];
       return I.lexerState = this.lexerState, I;
-    }, O.prototype.restore = function(I) {
-      var N = I.index;
-      this.current = N, this.table[N] = I, this.table.splice(N + 1), this.lexerState = I.lexerState, this.results = this.finish();
-    }, O.prototype.rewind = function(I) {
+    }, N.prototype.restore = function(I) {
+      var O = I.index;
+      this.current = O, this.table[O] = I, this.table.splice(O + 1), this.lexerState = I.lexerState, this.results = this.finish();
+    }, N.prototype.rewind = function(I) {
       if (!this.options.keepHistory)
         throw new Error("set option `keepHistory` to enable rewinding");
       this.restore(this.table[I]);
-    }, O.prototype.finish = function() {
-      var I = [], N = this.grammar.start, s = this.table[this.table.length - 1];
-      return s.states.forEach(function(t) {
-        t.rule.name === N && t.dot === t.rule.symbols.length && t.reference === 0 && t.data !== O.fail && I.push(t);
+    }, N.prototype.finish = function() {
+      var I = [], O = this.grammar.start, C = this.table[this.table.length - 1];
+      return C.states.forEach(function(t) {
+        t.rule.name === O && t.dot === t.rule.symbols.length && t.reference === 0 && t.data !== N.fail && I.push(t);
       }), I.map(function(t) {
         return t.data;
       });
     };
-    function C(I) {
-      var N = typeof I;
-      if (N === "string")
+    function s(I) {
+      var O = typeof I;
+      if (O === "string")
         return I;
-      if (N === "object") {
+      if (O === "object") {
         if (I.literal)
           return JSON.stringify(I.literal);
         if (I instanceof RegExp)
@@ -18409,10 +18408,10 @@ var PR = { exports: {} };
       }
     }
     function _(I) {
-      var N = typeof I;
-      if (N === "string")
+      var O = typeof I;
+      if (O === "string")
         return I;
-      if (N === "object") {
+      if (O === "object") {
         if (I.literal)
           return JSON.stringify(I.literal);
         if (I instanceof RegExp)
@@ -18425,13 +18424,13 @@ var PR = { exports: {} };
       }
     }
     return {
-      Parser: O,
+      Parser: N,
       Grammar: S,
       Rule: E
     };
   });
-})(PR);
-var vI = PR.exports;
+})(oR);
+var vI = oR.exports;
 const QI = /* @__PURE__ */ xI(vI);
 function ZI(T) {
   return T.map(qI).map(jI).map(kI).map(zI).map(EO);
@@ -18493,7 +18492,7 @@ class GR {
   save() {
   }
   formatError(E) {
-    const { line: R, col: A } = oR(this.input, E.start);
+    const { line: R, col: A } = PR(this.input, E.start);
     return `Parse error at token: ${E.text} at line ${R} column ${A}`;
   }
   has(E) {
@@ -18788,12 +18787,12 @@ const c = new GR((T) => []), w = ([[T]]) => T, d = (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, R, A, S, e, O]) => ({
+      postprocess: ([T, E, R, A, S, e, N]) => ({
         type: U.between_predicate,
         betweenKw: d(T),
         expr1: AO(R, { leading: E, trailing: A }),
         andKw: d(S),
-        expr2: [f(O, { leading: e })]
+        expr2: [f(N, { leading: e })]
       })
     },
     { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: gE },
@@ -18932,18 +18931,18 @@ function OO(T) {
   return {
     parse: (S, e) => {
       E = e;
-      const { results: O } = A.feed(S);
-      if (O.length === 1)
-        return O[0];
-      throw O.length === 0 ? new Error("Parse error: Invalid SQL") : new Error(`Parse error: Ambiguous grammar
-${JSON.stringify(O, void 0, 2)}`);
+      const { results: N } = A.feed(S);
+      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)}`);
     }
   };
 }
-var i;
+var n;
 (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 = {}));
+})(n = n || (n = {}));
 class lR {
   constructor(E) {
     this.indentation = E, this.items = [];
@@ -18954,26 +18953,26 @@ class lR {
   add(...E) {
     for (const R of E)
       switch (R) {
-        case i.SPACE:
-          this.items.push(i.SPACE);
+        case n.SPACE:
+          this.items.push(n.SPACE);
           break;
-        case i.NO_SPACE:
+        case n.NO_SPACE:
           this.trimHorizontalWhitespace();
           break;
-        case i.NO_NEWLINE:
+        case n.NO_NEWLINE:
           this.trimWhitespace();
           break;
-        case i.NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(i.NEWLINE);
+        case n.NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(n.NEWLINE);
           break;
-        case i.MANDATORY_NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(i.MANDATORY_NEWLINE);
+        case n.MANDATORY_NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(n.MANDATORY_NEWLINE);
           break;
-        case i.INDENT:
+        case n.INDENT:
           this.addIndentation();
           break;
-        case i.SINGLE_INDENT:
-          this.items.push(i.SINGLE_INDENT);
+        case n.SINGLE_INDENT:
+          this.items.push(n.SINGLE_INDENT);
           break;
         default:
           this.items.push(R);
@@ -18990,10 +18989,10 @@ class lR {
   addNewline(E) {
     if (this.items.length > 0)
       switch (eE(this.items)) {
-        case i.NEWLINE:
+        case n.NEWLINE:
           this.items.pop(), this.items.push(E);
           break;
-        case i.MANDATORY_NEWLINE:
+        case n.MANDATORY_NEWLINE:
           break;
         default:
           this.items.push(E);
@@ -19002,7 +19001,7 @@ class lR {
   }
   addIndentation() {
     for (let E = 0; E < this.indentation.getLevel(); E++)
-      this.items.push(i.SINGLE_INDENT);
+      this.items.push(n.SINGLE_INDENT);
   }
   /**
    * Returns the final SQL string.
@@ -19018,20 +19017,20 @@ class lR {
   }
   itemToString(E) {
     switch (E) {
-      case i.SPACE:
+      case n.SPACE:
         return " ";
-      case i.NEWLINE:
-      case i.MANDATORY_NEWLINE:
+      case n.NEWLINE:
+      case n.MANDATORY_NEWLINE:
         return `
 `;
-      case i.SINGLE_INDENT:
+      case n.SINGLE_INDENT:
         return this.indentation.getSingleIndent();
       default:
         return E;
     }
   }
 }
-const NO = (T) => T === i.SPACE || T === i.SINGLE_INDENT, tO = (T) => T === i.SPACE || T === i.SINGLE_INDENT || T === i.NEWLINE;
+const NO = (T) => T === n.SPACE || T === n.SINGLE_INDENT, tO = (T) => T === n.SPACE || T === n.SINGLE_INDENT || T === n.NEWLINE;
 function yT(T, E) {
   if (E === "standard")
     return T;
@@ -19103,9 +19102,9 @@ class CO extends lR {
     if (typeof E == "string")
       this.length += E.length, this.trailingSpace = !1;
     else {
-      if (E === i.MANDATORY_NEWLINE || E === i.NEWLINE)
+      if (E === n.MANDATORY_NEWLINE || E === n.NEWLINE)
         throw new vE();
-      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 === n.INDENT || E === n.SINGLE_INDENT || E === n.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (E === n.NO_NEWLINE || E === n.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
     }
   }
 }
@@ -19201,23 +19200,23 @@ class _E {
     }), 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(n.NO_SPACE, E.operator), this.formatNode(E.property);
   }
   formatParenthesis(E) {
     const R = this.formatInlineExpression(E.children);
-    R ? (this.layout.add(E.openParen), this.layout.add(...R.getLayoutItems()), this.layout.add(i.NO_SPACE, E.closeParen, i.SPACE)) : (this.layout.add(E.openParen, i.NEWLINE), k(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));
+    R ? (this.layout.add(E.openParen), this.layout.add(...R.getLayoutItems()), this.layout.add(n.NO_SPACE, E.closeParen, n.SPACE)) : (this.layout.add(E.openParen, n.NEWLINE), k(this.cfg) ? (this.layout.add(n.INDENT), this.layout = this.formatSubExpression(E.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(n.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(n.NEWLINE, n.INDENT, E.closeParen, n.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), n.SPACE), this.layout = this.formatSubExpression(E.expr1), this.layout.add(n.NO_SPACE, n.SPACE, this.showNonTabularKw(E.andKw), n.SPACE), this.layout = this.formatSubExpression(E.expr2), this.layout.add(n.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(n.NEWLINE, n.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(n.NEWLINE, n.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(n.NEWLINE, n.INDENT), this.formatNode(E.elseKw), this.layout = this.formatSubExpression(E.result);
   }
   formatClause(E) {
     this.isOnelineClause(E) ? this.formatClauseInOnelineStyle(E) : k(this.cfg) ? this.formatClauseInTabularStyle(E) : this.formatClauseInIndentedStyle(E);
@@ -19226,39 +19225,39 @@ class _E {
     return k(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(n.NEWLINE, n.INDENT, this.showKw(E.nameKw), n.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(n.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(n.NEWLINE, n.INDENT, this.showKw(E.nameKw), n.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(n.NEWLINE, n.INDENT, this.showKw(E.nameKw), n.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(n.NEWLINE, n.INDENT, this.showKw(E.nameKw), n.NEWLINE), this.layout.add(n.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(), k(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(n.NEWLINE, n.INDENT, this.showKw(E.limitKw));
+    }), this.layout.indentation.increaseTopLevel(), k(this.cfg) ? this.layout.add(n.SPACE) : this.layout.add(n.NEWLINE, n.INDENT), E.offset ? (this.layout = this.formatSubExpression(E.offset), this.layout.add(n.NO_SPACE, ",", n.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("*", n.SPACE);
   }
   formatLiteral(E) {
-    this.layout.add(E.text, i.SPACE);
+    this.layout.add(E.text, n.SPACE);
   }
   formatIdentifier(E) {
-    this.layout.add(this.showIdentifier(E), i.SPACE);
+    this.layout.add(this.showIdentifier(E), n.SPACE);
   }
   formatParameter(E) {
-    this.layout.add(this.params.get(E), i.SPACE);
+    this.layout.add(this.params.get(E), n.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(n.NO_SPACE, E) : E === ":" ? this.layout.add(n.NO_SPACE, E, n.SPACE) : this.layout.add(E, n.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(n.NO_SPACE, ",", n.SPACE) : this.layout.add(n.NO_SPACE, ",", n.NEWLINE, n.INDENT);
   }
   withComments(E, R) {
     this.formatComments(E.leadingComments), R(), this.formatComments(E.trailingComments);
@@ -19269,12 +19268,12 @@ class _E {
     });
   }
   formatLineComment(E) {
-    KE(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);
+    KE(E.precedingWhitespace || "") ? this.layout.add(n.NEWLINE, n.INDENT, E.text, n.MANDATORY_NEWLINE, n.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(n.NO_NEWLINE, n.SPACE, E.text, n.MANDATORY_NEWLINE, n.INDENT) : this.layout.add(E.text, n.MANDATORY_NEWLINE, n.INDENT);
   }
   formatBlockComment(E) {
     E.type === U.block_comment && this.isMultilineBlockComment(E) ? (this.splitBlockComment(E.text).forEach((R) => {
-      this.layout.add(i.NEWLINE, i.INDENT, R);
-    }), this.layout.add(i.NEWLINE, i.INDENT)) : this.layout.add(E.text, i.SPACE);
+      this.layout.add(n.NEWLINE, n.INDENT, R);
+    }), this.layout.add(n.NEWLINE, n.INDENT)) : this.layout.add(E.text, n.SPACE);
   }
   isMultilineBlockComment(E) {
     return KE(E.text) || KE(E.precedingWhitespace || "");
@@ -19358,16 +19357,16 @@ class _E {
     }
   }
   formatJoin(E) {
-    k(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);
+    k(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE);
   }
   formatKeyword(E) {
-    this.layout.add(this.showKw(E), i.SPACE);
+    this.layout.add(this.showKw(E), n.SPACE);
   }
   formatLogicalOperator(E) {
-    this.cfg.logicalOperatorNewline === "before" ? k(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" ? k(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE) : this.layout.add(this.showKw(E), n.NEWLINE, n.INDENT);
   }
   formatDataType(E) {
-    this.layout.add(this.showDataType(E), i.SPACE);
+    this.layout.add(this.showDataType(E), n.SPACE);
   }
   showKw(E) {
     return KT(E.tokenType) ? yT(this.showNonTabularKw(E), this.cfg.indentStyle) : this.showNonTabularKw(E);
@@ -19447,7 +19446,7 @@ class LO {
       params: this.params,
       layout: new lR(new cR(gI(this.cfg)))
     }).format(E.children);
-    return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? R.add(i.NEWLINE, ";") : R.add(i.NO_NEWLINE, ";")), R.toString();
+    return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? R.add(n.NEWLINE, ";") : R.add(n.NO_NEWLINE, ";")), R.toString();
   }
 }
 class sE extends Error {
@@ -19518,12 +19517,12 @@ const uR = {
   linesBetweenQueries: 1,
   denseOperators: !1,
   newlineBeforeSemicolon: !1
-}, oO = (T, E = {}) => {
+}, PO = (T, E = {}) => {
   if (typeof E.language == "string" && !DO.includes(E.language))
     throw new sE(`Unsupported SQL dialect: ${E.language}`);
   const R = uR[E.language || "sql"];
-  return PO(T, Object.assign(Object.assign({}, E), { dialect: uI[R] }));
-}, PO = (T, E) => {
+  return oO(T, Object.assign(Object.assign({}, E), { dialect: uI[R] }));
+}, oO = (T, E) => {
   var { dialect: R } = E, A = iO(E, ["dialect"]);
   if (typeof T != "string")
     throw new Error("Invalid query argument. Expected string, instead got " + typeof T);
@@ -19573,41 +19572,41 @@ function lO(T) {
   return "postgres";
 }
 async function HO(T, E, R) {
-  var _, I, N, s;
+  var _, I, O, C;
   const A = R.validateQuery(T);
   if (!A.isValid)
     throw new Error(`Query validation failed: ${A.errors.join(", ")}`);
   const S = /* @__PURE__ */ new Set();
   (_ = T.measures) == null || _.forEach((t) => {
-    const n = t.split(".")[0];
-    S.add(n);
+    const i = t.split(".")[0];
+    S.add(i);
   }), (I = T.dimensions) == null || I.forEach((t) => {
-    const n = t.split(".")[0];
-    S.add(n);
-  }), (N = T.timeDimensions) == null || N.forEach((t) => {
-    const n = t.dimension.split(".")[0];
-    S.add(n);
-  }), (s = T.filters) == null || s.forEach((t) => {
+    const i = t.split(".")[0];
+    S.add(i);
+  }), (O = T.timeDimensions) == null || O.forEach((t) => {
+    const i = t.dimension.split(".")[0];
+    S.add(i);
+  }), (C = T.filters) == null || C.forEach((t) => {
     if ("member" in t) {
-      const n = t.member.split(".")[0];
-      S.add(n);
+      const i = t.member.split(".")[0];
+      S.add(i);
     }
   });
   const e = S.size > 1;
-  let O;
+  let N;
   if (e)
-    O = await R.generateMultiCubeSQL(T, E);
+    N = await R.generateMultiCubeSQL(T, E);
   else {
     const t = Array.from(S)[0];
-    O = await R.generateSQL(t, T, E);
+    N = await R.generateSQL(t, T, E);
   }
-  const C = Array.from(S).map((t) => {
-    var n, P;
+  const s = Array.from(S).map((t) => {
+    var i, o;
     return {
       cube: t,
       query: {
-        measures: ((n = T.measures) == null ? void 0 : n.filter((M) => M.startsWith(t + "."))) || [],
-        dimensions: ((P = T.dimensions) == null ? void 0 : P.filter((M) => M.startsWith(t + "."))) || [],
+        measures: ((i = T.measures) == null ? void 0 : i.filter((M) => M.startsWith(t + "."))) || [],
+        dimensions: ((o = T.dimensions) == null ? void 0 : o.filter((M) => M.startsWith(t + "."))) || [],
         filters: T.filters || [],
         timeDimensions: T.timeDimensions || [],
         order: T.order || {},
@@ -19618,16 +19617,16 @@ async function HO(T, E, R) {
   });
   return {
     queryType: "regularQuery",
-    normalizedQueries: C,
+    normalizedQueries: s,
     queryOrder: Array.from(S),
-    transformedQueries: C,
+    transformedQueries: s,
     pivotQuery: {
       query: T,
       cubes: Array.from(S)
     },
     sql: {
-      sql: [O.sql],
-      params: O.params || []
+      sql: [N.sql],
+      params: N.params || []
     },
     complexity: MO(T),
     valid: !0,
@@ -19637,14 +19636,14 @@ async function HO(T, E, R) {
   };
 }
 function BO(T, E, R) {
-  const A = lO(R), S = UO(), e = (/* @__PURE__ */ new Date()).toISOString(), O = GO(T);
+  const A = lO(R), S = UO(), e = (/* @__PURE__ */ new Date()).toISOString(), N = GO(T);
   return {
     queryType: "regularQuery",
     results: [{
       query: T,
       lastRefreshTime: e,
       usedPreAggregations: {},
-      transformedQuery: O,
+      transformedQuery: N,
       requestId: S,
       annotation: E.annotation,
       dataSource: "default",
@@ -19663,7 +19662,7 @@ function BO(T, E, R) {
 }
 function $T(T, E) {
   try {
-    return oO(T, {
+    return PO(T, {
       language: {
         postgres: "postgresql",
         mysql: "mysql",
@@ -19797,24 +19796,24 @@ class cO {
    */
   generateCubeMetadata(E) {
     const R = Object.keys(E.measures), A = Object.keys(E.dimensions), S = new Array(R.length), e = new Array(A.length);
-    for (let O = 0; O < R.length; O++) {
-      const C = R[O], _ = E.measures[C];
-      S[O] = {
-        name: `${E.name}.${C}`,
-        title: _.title || C,
-        shortTitle: _.title || C,
+    for (let N = 0; N < R.length; N++) {
+      const s = R[N], _ = E.measures[s];
+      S[N] = {
+        name: `${E.name}.${s}`,
+        title: _.title || s,
+        shortTitle: _.title || s,
         type: _.type,
         format: void 0,
         // Measure doesn't have format field
         description: _.description
       };
     }
-    for (let O = 0; O < A.length; O++) {
-      const C = A[O], _ = E.dimensions[C];
-      e[O] = {
-        name: `${E.name}.${C}`,
-        title: _.title || C,
-        shortTitle: _.title || C,
+    for (let N = 0; N < A.length; N++) {
+      const s = A[N], _ = E.dimensions[s];
+      e[N] = {
+        name: `${E.name}.${s}`,
+        title: _.title || s,
+        shortTitle: _.title || s,
         type: _.type,
         format: void 0,
         // Dimension doesn't have format field
@@ -19840,10 +19839,10 @@ class cO {
       throw new Error(`Cube '${E}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const O = await new UE(this.dbExecutor).generateSQL(S, R, A), C = this.dbExecutor.getEngineType();
+    const N = await new UE(this.dbExecutor).generateSQL(S, R, A), s = this.dbExecutor.getEngineType();
     return {
-      sql: $T(O.sql, C),
-      params: O.params
+      sql: $T(N.sql, s),
+      params: N.params
     };
   }
   /**
@@ -19902,48 +19901,48 @@ function HR(T, E) {
   const R = [], A = /* @__PURE__ */ new Set();
   if (E.measures)
     for (const S of E.measures) {
-      const [e, O] = S.split(".");
-      if (!e || !O) {
+      const [e, N] = S.split(".");
+      if (!e || !N) {
         R.push(`Invalid measure format: ${S}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
       A.add(e);
-      const C = T.get(e);
-      if (!C) {
+      const s = T.get(e);
+      if (!s) {
         R.push(`Cube '${e}' not found (referenced in measure '${S}')`);
         continue;
       }
-      C.measures[O] || R.push(`Measure '${O}' not found on cube '${e}'`);
+      s.measures[N] || R.push(`Measure '${N}' not found on cube '${e}'`);
     }
   if (E.dimensions)
     for (const S of E.dimensions) {
-      const [e, O] = S.split(".");
-      if (!e || !O) {
+      const [e, N] = S.split(".");
+      if (!e || !N) {
         R.push(`Invalid dimension format: ${S}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
       A.add(e);
-      const C = T.get(e);
-      if (!C) {
+      const s = T.get(e);
+      if (!s) {
         R.push(`Cube '${e}' not found (referenced in dimension '${S}')`);
         continue;
       }
-      C.dimensions[O] || R.push(`Dimension '${O}' not found on cube '${e}'`);
+      s.dimensions[N] || R.push(`Dimension '${N}' not found on cube '${e}'`);
     }
   if (E.timeDimensions)
     for (const S of E.timeDimensions) {
-      const [e, O] = S.dimension.split(".");
-      if (!e || !O) {
+      const [e, N] = S.dimension.split(".");
+      if (!e || !N) {
         R.push(`Invalid timeDimension format: ${S.dimension}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
       A.add(e);
-      const C = T.get(e);
-      if (!C) {
+      const s = T.get(e);
+      if (!s) {
         R.push(`Cube '${e}' not found (referenced in timeDimension '${S.dimension}')`);
         continue;
       }
-      C.dimensions[O] || R.push(`TimeDimension '${O}' not found on cube '${e}' (must be a dimension with time type)`);
+      s.dimensions[N] || R.push(`TimeDimension '${N}' not found on cube '${e}' (must be a dimension with time type)`);
     }
   if (E.filters)
     for (const S of E.filters)
@@ -19955,8 +19954,8 @@ function HR(T, E) {
 }
 function BR(T, E, R, A) {
   if ("and" in T || "or" in T) {
-    const C = T.and || T.or || [];
-    for (const _ of C)
+    const s = T.and || T.or || [];
+    for (const _ of s)
       BR(_, E, R, A);
     return;
   }
@@ -19970,12 +19969,12 @@ function BR(T, E, R, A) {
     return;
   }
   A.add(S);
-  const O = E.get(S);
-  if (!O) {
+  const N = E.get(S);
+  if (!N) {
     R.push(`Cube '${S}' not found (referenced in filter '${T.member}')`);
     return;
   }
-  !O.dimensions[e] && !O.measures[e] && R.push(`Filter field '${e}' not found on cube '${S}' (must be a dimension or measure)`);
+  !N.dimensions[e] && !N.measures[e] && R.push(`Filter field '${e}' not found on cube '${S}' (must be a dimension or measure)`);
 }
 new cO();
 export {