drizzle-cube 0.3.0 → 0.3.2

package/dist/adapters/{compiler-DwHoCgZU.js → compiler-BEW9t90_.js}

@@ -177,71 +177,71 @@ class G {
       escapeParam: s,
       prepareTyping: n,
       inlineParams: I,
-      paramStartIndex: S
+      paramStartIndex: r
     } = t;
-    return WT(E.map((r) => {
-      if (H(r, V))
-        return { sql: r.value.join(""), params: [] };
-      if (H(r, Ae))
-        return { sql: A(r.value), params: [] };
-      if (r === void 0)
+    return WT(E.map((S) => {
+      if (H(S, V))
+        return { sql: S.value.join(""), params: [] };
+      if (H(S, Ae))
+        return { sql: A(S.value), params: [] };
+      if (S === void 0)
         return { sql: "", params: [] };
-      if (Array.isArray(r)) {
+      if (Array.isArray(S)) {
         const O = [new V("(")];
-        for (const [i, a] of r.entries())
-          O.push(a), i < r.length - 1 && O.push(new V(", "));
+        for (const [i, a] of S.entries())
+          O.push(a), i < S.length - 1 && O.push(new V(", "));
         return O.push(new V(")")), this.buildQueryFromSourceParams(O, t);
       }
-      if (H(r, G))
-        return this.buildQueryFromSourceParams(r.queryChunks, {
+      if (H(S, G))
+        return this.buildQueryFromSourceParams(S.queryChunks, {
           ...t,
-          inlineParams: I || r.shouldInlineParams
+          inlineParams: I || S.shouldInlineParams
         });
-      if (H(r, X)) {
-        const O = r[X.Symbol.Schema], i = r[X.Symbol.Name];
+      if (H(S, X)) {
+        const O = S[X.Symbol.Schema], i = S[X.Symbol.Name];
         return {
-          sql: O === void 0 || r[DE] ? A(i) : A(O) + "." + A(i),
+          sql: O === void 0 || S[DE] ? A(i) : A(O) + "." + A(i),
           params: []
         };
       }
-      if (H(r, nE)) {
-        const O = R.getColumnCasing(r);
+      if (H(S, nE)) {
+        const O = R.getColumnCasing(S);
         if (e.invokeSource === "indexes")
           return { sql: A(O), params: [] };
-        const i = r.table[X.Symbol.Schema];
+        const i = S.table[X.Symbol.Schema];
         return {
-          sql: r.table[DE] || i === void 0 ? A(r.table[X.Symbol.Name]) + "." + A(O) : A(i) + "." + A(r.table[X.Symbol.Name]) + "." + A(O),
+          sql: S.table[DE] || i === void 0 ? A(S.table[X.Symbol.Name]) + "." + A(O) : A(i) + "." + A(S.table[X.Symbol.Name]) + "." + A(O),
           params: []
         };
       }
-      if (H(r, oT)) {
-        const O = r[RE].schema, i = r[RE].name;
+      if (H(S, oT)) {
+        const O = S[RE].schema, i = S[RE].name;
         return {
-          sql: O === void 0 || r[RE].isAlias ? A(i) : A(O) + "." + A(i),
+          sql: O === void 0 || S[RE].isAlias ? A(i) : A(O) + "." + A(i),
           params: []
         };
       }
-      if (H(r, PE)) {
-        if (H(r.value, lE))
-          return { sql: s(S.value++, r), params: [r], typings: ["none"] };
-        const O = r.value === null ? null : r.encoder.mapToDriverValue(r.value);
+      if (H(S, PE)) {
+        if (H(S.value, lE))
+          return { sql: s(r.value++, S), params: [S], typings: ["none"] };
+        const O = S.value === null ? null : S.encoder.mapToDriverValue(S.value);
         if (H(O, G))
           return this.buildQueryFromSourceParams([O], t);
         if (I)
           return { sql: this.mapInlineParam(O, t), params: [] };
         let i = ["none"];
-        return n && (i = [n(r.encoder)]), { sql: s(S.value++, O), params: [O], typings: i };
+        return n && (i = [n(S.encoder)]), { sql: s(r.value++, O), params: [O], typings: i };
       }
-      return H(r, lE) ? { sql: s(S.value++, r), params: [r], typings: ["none"] } : H(r, G.Aliased) && r.fieldAlias !== void 0 ? { sql: A(r.fieldAlias), params: [] } : H(r, IT) ? r._.isWith ? { sql: A(r._.alias), params: [] } : this.buildQueryFromSourceParams([
+      return H(S, lE) ? { sql: s(r.value++, S), params: [S], typings: ["none"] } : H(S, G.Aliased) && S.fieldAlias !== void 0 ? { sql: A(S.fieldAlias), params: [] } : H(S, IT) ? S._.isWith ? { sql: A(S._.alias), params: [] } : this.buildQueryFromSourceParams([
         new V("("),
-        r._.sql,
+        S._.sql,
         new V(") "),
-        new Ae(r._.alias)
-      ], t) : gT(r) ? r.schema ? { sql: A(r.schema) + "." + A(r.enumName), params: [] } : { sql: A(r.enumName), params: [] } : OT(r) ? r.shouldOmitSQLParens?.() ? this.buildQueryFromSourceParams([r.getSQL()], t) : this.buildQueryFromSourceParams([
+        new Ae(S._.alias)
+      ], t) : gT(S) ? S.schema ? { sql: A(S.schema) + "." + A(S.enumName), params: [] } : { sql: A(S.enumName), params: [] } : OT(S) ? S.shouldOmitSQLParens?.() ? this.buildQueryFromSourceParams([S.getSQL()], t) : this.buildQueryFromSourceParams([
         new V("("),
-        r.getSQL(),
+        S.getSQL(),
         new V(")")
-      ], t) : I ? { sql: this.mapInlineParam(r, t), params: [] } : { sql: s(S.value++, r), params: [r], typings: ["none"] };
+      ], t) : I ? { sql: this.mapInlineParam(S, t), params: [] } : { sql: s(r.value++, S), params: [S], typings: ["none"] };
     }));
   }
   mapInlineParam(E, { escapeString: e }) {
@@ -335,11 +335,11 @@ function N(T, ...E) {
     return new G([new V(I)]);
   }
   T.raw = t;
-  function R(I, S) {
-    const r = [];
+  function R(I, r) {
+    const S = [];
     for (const [O, i] of I.entries())
-      O > 0 && S !== void 0 && r.push(S), r.push(i);
-    return new G(r);
+      O > 0 && r !== void 0 && S.push(r), S.push(i);
+    return new G(S);
   }
   T.join = R;
   function A(I) {
@@ -350,8 +350,8 @@ function N(T, ...E) {
     return new lE(I);
   }
   T.placeholder = s;
-  function n(I, S) {
-    return new PE(I, S);
+  function n(I, r) {
+    return new PE(I, r);
   }
   T.param = n;
 })(N || (N = {}));
@@ -416,7 +416,7 @@ IT.prototype.getSQL = function() {
 function y(T, E) {
   return $T(E) && !OT(T) && !H(T, PE) && !H(T, lE) && !H(T, nE) && !H(T, X) && !H(T, oT) ? new PE(T, E) : T;
 }
-const x = (T, E) => N`${T} = ${y(E, T)}`, ue = (T, E) => N`${T} <> ${y(E, T)}`;
+const J = (T, E) => N`${T} = ${y(E, T)}`, ue = (T, E) => N`${T} <> ${y(E, T)}`;
 function h(...T) {
   const E = T.filter(
     (e) => e !== void 0
@@ -482,13 +482,13 @@ function vT(T, E) {
 function de(T) {
   return N`${T} asc`;
 }
-function xT(T) {
+function JT(T) {
   return N`${T} desc`;
 }
 function se(T) {
   return N`count(${T || N.raw("*")})`.mapWith(Number);
 }
-function JT(T) {
+function xT(T) {
   return N`count(distinct ${T})`.mapWith(Number);
 }
 function w(T) {
@@ -759,9 +759,9 @@ class QT extends Ie {
       const { type: i, start: a, end: o } = A.frame, D = i.toUpperCase(), C = a === "unbounded" ? "UNBOUNDED PRECEDING" : typeof a == "number" ? `${a} PRECEDING` : "CURRENT ROW", P = o === "unbounded" ? "UNBOUNDED FOLLOWING" : o === "current" ? "CURRENT ROW" : typeof o == "number" ? `${o} FOLLOWING` : "CURRENT ROW";
       I = N`${N.raw(D)} BETWEEN ${N.raw(C)} AND ${N.raw(P)}`;
     }
-    const S = [];
-    t && t.length > 0 && S.push(s), R && R.length > 0 && S.push(n), A?.frame && S.push(I);
-    const r = S.length > 0 ? N.join(S, N` `) : N``, O = N`OVER (${r})`;
+    const r = [];
+    t && t.length > 0 && r.push(s), R && R.length > 0 && r.push(n), A?.frame && r.push(I);
+    const S = r.length > 0 ? N.join(r, N` `) : N``, O = N`OVER (${S})`;
     switch (E) {
       case "lag":
         return N`LAG(${e}, ${A?.offset ?? 1}${A?.defaultValue !== void 0 ? N`, ${A.defaultValue}` : N``}) ${O}`;
@@ -1005,9 +1005,9 @@ class CT extends Ie {
       const { type: i, start: a, end: o } = A.frame, D = i.toUpperCase(), C = a === "unbounded" ? "UNBOUNDED PRECEDING" : typeof a == "number" ? `${a} PRECEDING` : "CURRENT ROW", P = o === "unbounded" ? "UNBOUNDED FOLLOWING" : o === "current" ? "CURRENT ROW" : typeof o == "number" ? `${o} FOLLOWING` : "CURRENT ROW";
       I = N`${N.raw(D)} BETWEEN ${N.raw(C)} AND ${N.raw(P)}`;
     }
-    const S = [];
-    t && t.length > 0 && S.push(s), R && R.length > 0 && S.push(n), A?.frame && S.push(I);
-    const r = S.length > 0 ? N.join(S, N` `) : N``, O = N`OVER (${r})`;
+    const r = [];
+    t && t.length > 0 && r.push(s), R && R.length > 0 && r.push(n), A?.frame && r.push(I);
+    const S = r.length > 0 ? N.join(r, N` `) : N``, O = N`OVER (${S})`;
     switch (E) {
       case "lag":
         return N`LAG(${e}, ${A?.offset ?? 1}${A?.defaultValue !== void 0 ? N`, ${A.defaultValue}` : N``}) ${O}`;
@@ -1280,9 +1280,9 @@ class ZT extends Ie {
       const { type: i, start: a, end: o } = A.frame, D = i.toUpperCase(), C = a === "unbounded" ? "UNBOUNDED PRECEDING" : typeof a == "number" ? `${a} PRECEDING` : "CURRENT ROW", P = o === "unbounded" ? "UNBOUNDED FOLLOWING" : o === "current" ? "CURRENT ROW" : typeof o == "number" ? `${o} FOLLOWING` : "CURRENT ROW";
       I = N`${N.raw(D)} BETWEEN ${N.raw(C)} AND ${N.raw(P)}`;
     }
-    const S = [];
-    t && t.length > 0 && S.push(s), R && R.length > 0 && S.push(n), A?.frame && S.push(I);
-    const r = S.length > 0 ? N.join(S, N` `) : N``, O = N`OVER (${r})`;
+    const r = [];
+    t && t.length > 0 && r.push(s), R && R.length > 0 && r.push(n), A?.frame && r.push(I);
+    const S = r.length > 0 ? N.join(r, N` `) : N``, O = N`OVER (${S})`;
     switch (E) {
       case "lag":
         return N`LAG(${e}, ${A?.offset ?? 1}${A?.defaultValue !== void 0 ? N`, ${A.defaultValue}` : N``}) ${O}`;
@@ -1550,30 +1550,30 @@ function tt(T, E) {
   if (T.relationship !== "belongsToMany" || !T.through)
     throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
   const { table: e, sourceKey: t, targetKey: R, securitySql: A } = T.through, s = [];
-  for (const r of t) {
-    const O = r.as || x;
-    s.push(O(r.source, r.target));
+  for (const S of t) {
+    const O = S.as || J;
+    s.push(O(S.source, S.target));
   }
   const n = [];
-  for (const r of R) {
-    const O = r.as || x;
-    n.push(O(r.source, r.target));
+  for (const S of R) {
+    const O = S.as || J;
+    n.push(O(S.source, S.target));
   }
   let I;
   if (A) {
-    const r = A(E);
-    I = Array.isArray(r) ? r : [r];
+    const S = A(E);
+    I = Array.isArray(S) ? S : [S];
   }
-  const S = ne("belongsToMany", T.sqlJoinType);
+  const r = ne("belongsToMany", T.sqlJoinType);
   return {
     junctionJoins: [
       {
-        joinType: S,
+        joinType: r,
         table: e,
         condition: h(...s)
       },
       {
-        joinType: S,
+        joinType: r,
         table: e,
         // This will be replaced with target cube table in query planner
         condition: h(...n)
@@ -1766,9 +1766,9 @@ class ie {
     if (typeof e == "string") {
       const t = this.parseRelativeDateRange(e);
       if (t) {
-        let r, O;
-        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (r = Math.floor(t.start.getTime() / 1e3), O = Math.floor(t.end.getTime() / 1e3)) : (r = t.start.getTime(), O = t.end.getTime()) : (r = t.start.toISOString(), O = t.end.toISOString()), h(
-          EE(E, r),
+        let S, O;
+        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (S = Math.floor(t.start.getTime() / 1e3), O = Math.floor(t.end.getTime() / 1e3)) : (S = t.start.getTime(), O = t.end.getTime()) : (S = t.start.toISOString(), O = t.end.toISOString()), h(
+          EE(E, S),
           eE(E, O)
         );
       }
@@ -1778,10 +1778,10 @@ class ie {
       s.setUTCHours(0, 0, 0, 0);
       const n = new Date(A);
       n.setUTCHours(23, 59, 59, 999);
-      let I, S;
-      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (I = Math.floor(s.getTime() / 1e3), S = Math.floor(n.getTime() / 1e3)) : (I = s.getTime(), S = n.getTime()) : (I = s.toISOString(), S = n.toISOString()), h(
+      let I, r;
+      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (I = Math.floor(s.getTime() / 1e3), r = Math.floor(n.getTime() / 1e3)) : (I = s.getTime(), r = n.getTime()) : (I = s.toISOString(), r = n.toISOString()), h(
         EE(E, I),
-        eE(E, S)
+        eE(E, r)
       );
     }
     return null;
@@ -1829,9 +1829,9 @@ class ie {
       const o = new Date(e);
       return o.setUTCHours(23, 59, 59, 999), { start: a, end: o };
     }
-    const S = t.match(/^last\s+(\d+)\s+weeks?$/);
-    if (S) {
-      const a = parseInt(S[1], 10) * 7, o = new Date(e);
+    const r = t.match(/^last\s+(\d+)\s+weeks?$/);
+    if (r) {
+      const a = parseInt(r[1], 10) * 7, o = new Date(e);
       o.setUTCDate(s - a + 1), o.setUTCHours(0, 0, 0, 0);
       const D = new Date(e);
       return D.setUTCHours(23, 59, 59, 999), { start: o, end: D };
@@ -1858,9 +1858,9 @@ class ie {
       const i = new Date(Date.UTC(R, A - 11, 1, 0, 0, 0, 0)), a = new Date(e);
       return a.setUTCHours(23, 59, 59, 999), { start: i, end: a };
     }
-    const r = t.match(/^last\s+(\d+)\s+months?$/);
-    if (r) {
-      const i = parseInt(r[1], 10), a = new Date(Date.UTC(R, A - i + 1, 1, 0, 0, 0, 0)), o = new Date(e);
+    const S = t.match(/^last\s+(\d+)\s+months?$/);
+    if (S) {
+      const i = parseInt(S[1], 10), a = new Date(Date.UTC(R, A - i + 1, 1, 0, 0, 0, 0)), o = new Date(e);
       return o.setUTCHours(23, 59, 59, 999), { start: a, end: o };
     }
     const O = t.match(/^last\s+(\d+)\s+years?$/);
@@ -1924,13 +1924,13 @@ class DT {
       case "equals":
         if (s.length > 1) {
           if (R?.type === "time") {
-            const I = s.map((S) => this.dateTimeBuilder.normalizeDate(S) || S);
+            const I = s.map((r) => this.dateTimeBuilder.normalizeDate(r) || r);
             return FE(E, I);
           }
           return FE(E, s);
         } else if (s.length === 1) {
           const I = R?.type === "time" && this.dateTimeBuilder.normalizeDate(n) || n;
-          return x(E, I);
+          return J(E, I);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
@@ -1958,16 +1958,16 @@ class DT {
       case "inDateRange":
         if (s.length >= 2) {
           const I = this.dateTimeBuilder.normalizeDate(s[0]);
-          let S = this.dateTimeBuilder.normalizeDate(s[1]);
-          if (I && S) {
-            const r = t[1];
-            if (typeof r == "string" && /^\d{4}-\d{2}-\d{2}$/.test(r.trim())) {
-              const O = typeof S == "number" ? new Date(S * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(S), i = new Date(O);
-              i.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? S = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(i.getTime() / 1e3) : i.getTime() : S = i.toISOString();
+          let r = this.dateTimeBuilder.normalizeDate(s[1]);
+          if (I && r) {
+            const S = t[1];
+            if (typeof S == "string" && /^\d{4}-\d{2}-\d{2}$/.test(S.trim())) {
+              const O = typeof r == "number" ? new Date(r * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(r), i = new Date(O);
+              i.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? r = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(i.getTime() / 1e3) : i.getTime() : r = i.toISOString();
             }
             return h(
               EE(E, I),
-              eE(E, S)
+              eE(E, r)
             );
           }
         }
@@ -2007,7 +2007,7 @@ class DT {
       case "isEmpty":
         return IE(
           Me(E),
-          x(E, "")
+          J(E, "")
         );
       case "isNotEmpty":
         return h(
@@ -2052,9 +2052,9 @@ class DT {
     if (!n) return null;
     const I = n.dimensions?.[s];
     if (!I) return null;
-    const S = F(I.sql, t);
+    const r = F(I.sql, t);
     return this.buildFilterCondition(
-      S,
+      r,
       R.operator,
       R.values,
       I,
@@ -2105,8 +2105,8 @@ class Z {
       if (t.type === "calculated" && t.calculatedSql) {
         const R = `${E.name}.${e}`, A = this.extractDependencies(t.calculatedSql), s = /* @__PURE__ */ new Set();
         for (const n of A) {
-          const S = `${n.cubeName || E.name}.${n.fieldName}`;
-          s.add(S);
+          const r = `${n.cubeName || E.name}.${n.fieldName}`;
+          s.add(r);
         }
         this.dependencyGraph.set(R, {
           id: R,
@@ -2299,21 +2299,21 @@ function St(T, E) {
     s.set(i, c);
   }
   const n = [], I = [];
-  let S = 0;
+  let r = 0;
   for (const O of A) {
-    const i = `{${O.originalRef}}`, a = T.indexOf(i, S);
+    const i = `{${O.originalRef}}`, a = T.indexOf(i, r);
     if (a >= 0) {
-      n.push(T.substring(S, a));
+      n.push(T.substring(r, a));
       const o = s.get(O.originalRef);
-      o && I.push(o), S = a + i.length;
+      o && I.push(o), r = a + i.length;
     }
   }
-  if (n.push(T.substring(S)), I.length === 0)
+  if (n.push(T.substring(r)), I.length === 0)
     return N.raw(T);
-  const r = [];
+  const S = [];
   for (let O = 0; O < n.length; O++)
-    n[O] && r.push(new V(n[O])), O < I.length && r.push(I[O]);
-  return N.join(r, N.raw(""));
+    n[O] && S.push(new V(n[O])), O < I.length && S.push(I[O]);
+  return N.join(S, N.raw(""));
 }
 function ae(T) {
   const E = /\{([^}]+)\}/g, e = T.matchAll(E), t = [];
@@ -2384,11 +2384,11 @@ class B {
    * @returns Map of measure names to SQL builder functions
    */
   buildResolvedMeasures(E, e, t, R) {
-    const A = /* @__PURE__ */ new Map(), s = [], n = [], I = new Set(E), S = new Z(e);
-    for (const r of e.values())
-      S.buildGraph(r);
-    for (const r of E) {
-      const [O, i] = r.split("."), a = e.get(O);
+    const A = /* @__PURE__ */ new Map(), s = [], n = [], I = new Set(E), r = new Z(e);
+    for (const S of e.values())
+      r.buildGraph(S);
+    for (const S of E) {
+      const [O, i] = S.split("."), a = e.get(O);
       if (a && a.measures && a.measures[i]) {
         const o = a.measures[i];
         if (B.isPostAggregationWindow(o)) {
@@ -2396,35 +2396,35 @@ class B {
           D && I.add(D);
           continue;
         }
-        Z.isCalculatedMeasure(o) ? (n.push(r), YE(o.calculatedSql, O).forEach((P) => I.add(P)), S.getAllDependencies(r).forEach((P) => {
+        Z.isCalculatedMeasure(o) ? (n.push(S), YE(o.calculatedSql, O).forEach((P) => I.add(P)), r.getAllDependencies(S).forEach((P) => {
           const [_, M] = P.split("."), c = e.get(_);
           if (c && c.measures[M]) {
             const d = c.measures[M];
             Z.isCalculatedMeasure(d) && YE(d.calculatedSql, _).forEach((f) => I.add(f));
           }
-        })) : s.push(r);
+        })) : s.push(S);
       }
     }
-    for (const r of I) {
-      const [O, i] = r.split("."), a = e.get(O);
+    for (const S of I) {
+      const [O, i] = S.split("."), a = e.get(O);
       if (a && a.measures && a.measures[i]) {
         const o = a.measures[i];
         if (B.isPostAggregationWindow(o))
           continue;
-        Z.isCalculatedMeasure(o) ? n.includes(r) || n.push(r) : s.includes(r) || s.push(r);
+        Z.isCalculatedMeasure(o) ? n.includes(S) || n.push(S) : s.includes(S) || s.push(S);
       }
     }
-    for (const r of s) {
-      const [O, i] = r.split("."), a = e.get(O), o = a.measures[i];
+    for (const S of s) {
+      const [O, i] = S.split("."), a = e.get(O), o = a.measures[i];
       if (R) {
-        const D = R(r, o, a);
-        A.set(r, () => D);
+        const D = R(S, o, a);
+        A.set(S, () => D);
       } else
-        A.set(r, () => this.buildMeasureExpression(o, t, a));
+        A.set(S, () => this.buildMeasureExpression(o, t, a));
     }
     if (n.length > 0) {
-      const r = S.topologicalSort(n);
-      for (const O of r) {
+      const S = r.topologicalSort(n);
+      for (const O of S) {
         const [i, a] = O.split("."), o = e.get(i), D = o.measures[a];
         A.set(O, () => this.buildCalculatedMeasure(
           D,
@@ -2474,11 +2474,11 @@ class B {
       );
     const s = /* @__PURE__ */ new Map(), n = YE(E.calculatedSql, e.name);
     for (const I of n) {
-      const [S, r] = I.split("."), O = R.get(S);
-      if (O && O.measures[r]) {
-        const i = O.measures[r];
+      const [r, S] = I.split("."), O = R.get(r);
+      if (O && O.measures[S]) {
+        const i = O.measures[S];
         if (t.measures.includes(I)) {
-          const a = N`${N.identifier(t.cteAlias)}.${N.identifier(r)}`;
+          const a = N`${N.identifier(t.cteAlias)}.${N.identifier(S)}`;
           let o;
           switch (i.type) {
             case "count":
@@ -2521,13 +2521,13 @@ class B {
       const s = A.preAggregationCTEs.find((n) => n.cube.name === E);
       if (s && s.measures.includes(`${E}.${e}`))
         if (t.type === "calculated" && t.calculatedSql) {
-          const n = A.primaryCube.name === E ? A.primaryCube : A.joinCubes?.find((S) => S.cube.name === E)?.cube;
+          const n = A.primaryCube.name === E ? A.primaryCube : A.joinCubes?.find((r) => r.cube.name === E)?.cube;
           if (!n)
             throw new Error(`Cube ${E} not found in query plan`);
           const I = /* @__PURE__ */ new Map([[A.primaryCube.name, A.primaryCube]]);
           if (A.joinCubes)
-            for (const S of A.joinCubes)
-              I.set(S.cube.name, S.cube);
+            for (const r of A.joinCubes)
+              I.set(r.cube.name, r.cube);
           return this.buildCTECalculatedMeasure(
             t,
             n,
@@ -2595,7 +2595,7 @@ class B {
       case "count":
         return se(R);
       case "countDistinct":
-        return JT(R);
+        return xT(R);
       case "sum":
         return w(R);
       case "avg":
@@ -2652,28 +2652,28 @@ class B {
         const A = E.windowConfig || {};
         let s;
         if (A.partitionBy && A.partitionBy.length > 0 && t) {
-          const S = A.partitionBy.map((r) => {
-            const O = r.includes(".") ? r.split(".")[1] : r, i = t.dimensions?.[O];
-            return i ? F(i.sql, e) : (console.warn(`[drizzle-cube] Window function partition dimension '${r}' not found in cube '${t.name}'`), null);
-          }).filter((r) => r !== null);
-          S.length > 0 && (s = S);
+          const r = A.partitionBy.map((S) => {
+            const O = S.includes(".") ? S.split(".")[1] : S, i = t.dimensions?.[O];
+            return i ? F(i.sql, e) : (console.warn(`[drizzle-cube] Window function partition dimension '${S}' not found in cube '${t.name}'`), null);
+          }).filter((S) => S !== null);
+          r.length > 0 && (s = r);
         }
         let n;
         if (A.orderBy && A.orderBy.length > 0 && t) {
-          const S = A.orderBy.map((r) => {
-            const O = r.field.includes(".") ? r.field.split(".")[1] : r.field, i = t.dimensions?.[O];
+          const r = A.orderBy.map((S) => {
+            const O = S.field.includes(".") ? S.field.split(".")[1] : S.field, i = t.dimensions?.[O];
             if (i)
               return {
                 field: F(i.sql, e),
-                direction: r.direction
+                direction: S.direction
               };
             const a = t.measures?.[O];
             return a && a.sql ? {
               field: F(a.sql, e),
-              direction: r.direction
-            } : (console.warn(`[drizzle-cube] Window function order field '${r.field}' not found in cube '${t.name}'`), null);
-          }).filter((r) => r !== null);
-          S.length > 0 && (n = S);
+              direction: S.direction
+            } : (console.warn(`[drizzle-cube] Window function order field '${S.field}' not found in cube '${t.name}'`), null);
+          }).filter((S) => S !== null);
+          r.length > 0 && (n = r);
         }
         const I = this.databaseAdapter.buildWindowFunction(
           E.type,
@@ -2733,8 +2733,8 @@ class B {
     for (const A of E) {
       const [s, n] = A.split("."), I = e.get(s);
       if (I?.measures?.[n]) {
-        const S = I.measures[n];
-        B.isWindowFunction(S.type) ? t.push(A) : R.push(A);
+        const r = I.measures[n];
+        B.isWindowFunction(r.type) ? t.push(A) : R.push(A);
       }
     }
     return { windowMeasures: t, aggregateMeasures: R };
@@ -2809,14 +2809,14 @@ class B {
   static categorizeForPostAggregation(E, e) {
     const t = [], R = [], A = /* @__PURE__ */ new Set();
     for (const s of E) {
-      const [n, I] = s.split("."), S = e.get(n);
-      if (S?.measures?.[I]) {
-        const r = S.measures[I];
-        if (B.isPostAggregationWindow(r)) {
+      const [n, I] = s.split("."), r = e.get(n);
+      if (r?.measures?.[I]) {
+        const S = r.measures[I];
+        if (B.isPostAggregationWindow(S)) {
           R.push(s);
-          const O = B.getWindowBaseMeasure(r, n);
+          const O = B.getWindowBaseMeasure(S, n);
           O && A.add(O);
-        } else B.isWindowFunction(r.type) || t.push(s);
+        } else B.isWindowFunction(S.type) || t.push(s);
       }
     }
     return { aggregateMeasures: t, postAggWindowMeasures: R, requiredBaseMeasures: A };
@@ -2891,14 +2891,14 @@ class Nt {
    * Window functions do not require GROUP BY and operate on individual rows.
    */
   buildGroupByFields(E, e, t, R) {
-    const A = [], s = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]), n = e.dimensions && e.dimensions.length > 0 || e.timeDimensions && e.timeDimensions.length > 0, I = e.measures && e.measures.length > 0, S = n && !I;
-    let r = !1;
+    const A = [], s = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]), n = e.dimensions && e.dimensions.length > 0 || e.timeDimensions && e.timeDimensions.length > 0, I = e.measures && e.measures.length > 0, r = n && !I;
+    let S = !1;
     for (const O of e.measures || []) {
       const [i, a] = O.split("."), o = s.get(i);
       if (o && o.measures && o.measures[a]) {
         const D = o.measures[a];
         if (this.isAggregateFunctionType(D.type) || D.type === "calculated") {
-          r = !0;
+          S = !0;
           break;
         }
         if (B.isPostAggregationWindow(D)) {
@@ -2906,14 +2906,14 @@ class Nt {
           if (C) {
             const [P, _] = C.split("."), c = s.get(P)?.measures?.[_];
             if (c && this.isAggregateFunctionType(c.type)) {
-              r = !0;
+              S = !0;
               break;
             }
           }
         }
       }
     }
-    if (!r && !S)
+    if (!S && !r)
       return [];
     if (e.dimensions)
       for (const O of e.dimensions) {
@@ -2985,9 +2985,9 @@ class It {
     const R = {}, A = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (e.dimensions)
       for (const s of e.dimensions) {
-        const [n, I] = s.split("."), S = A.get(n);
-        if (S && S.dimensions && S.dimensions[I]) {
-          const r = S.dimensions[I], O = F(r.sql, t);
+        const [n, I] = s.split("."), r = A.get(n);
+        if (r && r.dimensions && r.dimensions[I]) {
+          const S = r.dimensions[I], O = F(S.sql, t);
           R[s] = N`${O}`.as(s);
         }
       }
@@ -3000,17 +3000,17 @@ class It {
       for (const n of e.measures) {
         const I = s.get(n);
         if (I) {
-          const S = I();
-          R[n] = N`${S}`.as(n);
+          const r = I();
+          R[n] = N`${r}`.as(n);
         }
       }
     }
     if (e.timeDimensions)
       for (const s of e.timeDimensions) {
-        const [n, I] = s.dimension.split("."), S = A.get(n);
-        if (S && S.dimensions && S.dimensions[I]) {
-          const r = S.dimensions[I], O = this.buildTimeDimensionExpression(
-            r.sql,
+        const [n, I] = s.dimension.split("."), r = A.get(n);
+        if (r && r.dimensions && r.dimensions[I]) {
+          const S = r.dimensions[I], O = this.buildTimeDimensionExpression(
+            S.sql,
             s.granularity,
             t
           );
@@ -3062,9 +3062,9 @@ class It {
   buildWhereConditions(E, e, t, R, A) {
     const s = [], n = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]), I = /* @__PURE__ */ new Set();
     if (e.filters && e.filters.length > 0)
-      for (const S of e.filters) {
-        if (A && "member" in S) {
-          const [O] = S.member.split(".");
+      for (const r of e.filters) {
+        if (A && "member" in r) {
+          const [O] = r.member.split(".");
           if (n.has(O) && A.has(O) && !I.has(O)) {
             const a = A.get(O);
             s.push(...a), I.add(O);
@@ -3072,23 +3072,23 @@ class It {
           } else if (I.has(O))
             continue;
         }
-        const r = this.processFilter(S, n, t, "where", R);
-        r && s.push(r);
+        const S = this.processFilter(r, n, t, "where", R);
+        S && s.push(S);
       }
     if (e.timeDimensions)
-      for (const S of e.timeDimensions) {
-        const [r, O] = S.dimension.split("."), i = n.get(r);
-        if (i && i.dimensions[O] && S.dateRange) {
-          if (R?.preAggregationCTEs && R.preAggregationCTEs.some((P) => P.cube.name === r))
+      for (const r of e.timeDimensions) {
+        const [S, O] = r.dimension.split("."), i = n.get(S);
+        if (i && i.dimensions[O] && r.dateRange) {
+          if (R?.preAggregationCTEs && R.preAggregationCTEs.some((P) => P.cube.name === S))
             continue;
           if (t.filterCache) {
-            const C = _T(S.dimension, S.dateRange), P = t.filterCache.get(C);
+            const C = _T(r.dimension, r.dateRange), P = t.filterCache.get(C);
             if (P) {
               s.push(P);
               continue;
             }
           }
-          const a = i.dimensions[O], o = F(a.sql, t), D = this.buildDateRangeCondition(o, S.dateRange);
+          const a = i.dimensions[O], o = F(a.sql, t), D = this.buildDateRangeCondition(o, r.dateRange);
           D && s.push(D);
         }
       }
@@ -3123,11 +3123,11 @@ class It {
         return o.length > 0 ? IE(...o) : null;
       }
     }
-    const s = E, [n, I] = s.member.split("."), S = e.get(n);
-    if (!S) return null;
-    const r = S.dimensions[I], O = S.measures[I], i = r || O;
+    const s = E, [n, I] = s.member.split("."), r = e.get(n);
+    if (!r) return null;
+    const S = r.dimensions[I], O = r.measures[I], i = S || O;
     if (!i) return null;
-    if (R === "where" && r) {
+    if (R === "where" && S) {
       if (A?.preAggregationCTEs && A.preAggregationCTEs.some((C) => C.cube.name === n))
         return null;
       const a = ["arrayContains", "arrayOverlaps", "arrayContained"].includes(s.operator);
@@ -3136,7 +3136,7 @@ class It {
         if (C)
           return C;
       }
-      const o = a ? typeof r.sql == "function" ? r.sql(t) : r.sql : F(r.sql, t);
+      const o = a ? typeof S.sql == "function" ? S.sql(t) : S.sql : F(S.sql, t);
       return this.buildFilterCondition(
         o,
         s.operator,
@@ -3194,7 +3194,7 @@ class It {
       for (const [A, s] of Object.entries(E.order)) {
         if (!R.includes(A))
           throw new Error(`Cannot order by '${A}': field is not selected in the query`);
-        const n = s === "desc" ? xT(N.identifier(A)) : de(N.identifier(A));
+        const n = s === "desc" ? JT(N.identifier(A)) : de(N.identifier(A));
         t.push(n);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
@@ -3216,8 +3216,8 @@ class It {
       for (const A of e.dimensions) {
         const [s, n] = A.split("."), I = R.get(s);
         if (I) {
-          const S = I.dimensions[n];
-          S && S.type === "number" && t.push(A);
+          const r = I.dimensions[n];
+          r && r.type === "number" && t.push(A);
         }
       }
     return t;
@@ -3286,14 +3286,14 @@ class aE {
       { cube: E, path: [] }
     ], n = /* @__PURE__ */ new Set([E, ...t]);
     for (; s.length > 0; ) {
-      const { cube: I, path: S } = s.shift(), r = this.cubes.get(I);
-      if (r?.joins)
-        for (const [, O] of Object.entries(r.joins)) {
+      const { cube: I, path: r } = s.shift(), S = this.cubes.get(I);
+      if (S?.joins)
+        for (const [, O] of Object.entries(S.joins)) {
           const a = uE(O.targetCube).name;
           if (n.has(a))
             continue;
           const o = [
-            ...S,
+            ...r,
             {
               fromCube: I,
               toCube: a,
@@ -3334,7 +3334,7 @@ class aE {
   buildJoinCondition(E, e, t) {
     const R = [];
     for (const A of E.on) {
-      const s = e ? N`${N.identifier(e)}.${N.identifier(A.source.name)}` : Se(A.source), n = t ? N`${N.identifier(t)}.${N.identifier(A.target.name)}` : Se(A.target), I = A.as || x;
+      const s = e ? N`${N.identifier(e)}.${N.identifier(A.source.name)}` : Se(A.source), n = t ? N`${N.identifier(t)}.${N.identifier(A.target.name)}` : Se(A.target), I = A.as || J;
       R.push(I(s, n));
     }
     return h(...R);
@@ -3471,7 +3471,7 @@ class PT {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const I = this.buildJoinPlan(E, n, A, t), S = this.planPreAggregationCTEs(E, n, I, e);
+    const I = this.buildJoinPlan(E, n, A, t), r = this.planPreAggregationCTEs(E, n, I, e);
     return {
       primaryCube: n,
       joinCubes: I,
@@ -3481,7 +3481,7 @@ class PT {
       // Will be built by QueryBuilder
       groupByFields: [],
       // Will be built by QueryBuilder
-      preAggregationCTEs: S
+      preAggregationCTEs: r
     };
   }
   /**
@@ -3499,14 +3499,14 @@ class PT {
    * Supports both direct joins and transitive joins through intermediate cubes
    */
   buildJoinPlan(E, e, t, R) {
-    const A = this.getResolver(E), s = [], n = /* @__PURE__ */ new Set([e.name]), I = t.filter((S) => S !== e.name);
-    for (const S of I) {
-      if (n.has(S))
+    const A = this.getResolver(E), s = [], n = /* @__PURE__ */ new Set([e.name]), I = t.filter((r) => r !== e.name);
+    for (const r of I) {
+      if (n.has(r))
         continue;
-      const r = A.findPath(e.name, S, n);
-      if (!r || r.length === 0)
-        throw new Error(`No join path found from '${e.name}' to '${S}'`);
-      for (const { toCube: O, joinDef: i } of r) {
+      const S = A.findPath(e.name, r, n);
+      if (!S || S.length === 0)
+        throw new Error(`No join path found from '${e.name}' to '${r}'`);
+      for (const { toCube: O, joinDef: i } of S) {
         if (n.has(O))
           continue;
         const a = E.get(O);
@@ -3564,8 +3564,8 @@ class PT {
         continue;
       const I = R.measures ? R.measures.filter(
         (P) => P.startsWith(s.cube.name + ".")
-      ) : [], S = this.extractMeasuresFromFilters(R, s.cube), r = [.../* @__PURE__ */ new Set([...I, ...S])];
-      if (r.length === 0)
+      ) : [], r = this.extractMeasuresFromFilters(R, s.cube), S = [.../* @__PURE__ */ new Set([...I, ...r])];
+      if (S.length === 0)
         continue;
       const O = n.on.map((P) => ({
         sourceColumn: P.source.name,
@@ -3573,7 +3573,7 @@ class PT {
         sourceColumnObj: P.source,
         targetColumnObj: P.target
       })), i = this.findPropagatingFilters(R, s.cube, E), a = /* @__PURE__ */ new Map([[s.cube.name, s.cube]]), { aggregateMeasures: o, requiredBaseMeasures: D } = B.categorizeForPostAggregation(
-        r,
+        S,
         a
       ), C = [.../* @__PURE__ */ new Set([
         ...o,
@@ -3613,8 +3613,8 @@ class PT {
       const n = E.measures[s];
       if (n.type === "calculated" && n.calculatedSql) {
         const I = this.extractDependenciesFromTemplate(n.calculatedSql, E.name);
-        for (const S of I)
-          t.has(S) || R.push(S);
+        for (const r of I)
+          t.has(r) || R.push(r);
       }
     }
     return Array.from(t);
@@ -3666,7 +3666,7 @@ class PT {
       if (n?.joins) {
         for (const [, I] of Object.entries(n.joins))
           if (uE(I.targetCube).name === e.name && I.relationship === "hasMany") {
-            const r = this.extractFiltersForCube(E.filters, s), O = this.extractTimeDimensionFiltersForCube(E, s), i = [...r, ...O];
+            const S = this.extractFiltersForCube(E.filters, s), O = this.extractTimeDimensionFiltersForCube(E, s), i = [...S, ...O];
             i.length > 0 && I.on.length > 0 && R.push({
               sourceCube: n,
               filters: i,
@@ -3814,16 +3814,16 @@ class PT {
       warnings: []
     };
     if (A.length > 1) {
-      const S = A.filter((D) => D !== n);
-      for (const D of S)
+      const r = A.filter((D) => D !== n);
+      for (const D of r)
         I.joinPaths.push(
           this.analyzeJoinPath(E, n, D)
         );
-      const r = E.get(n);
-      r && (I.preAggregations = this.analyzePreAggregations(
+      const S = E.get(n);
+      S && (I.preAggregations = this.analyzePreAggregations(
         E,
-        r,
         S,
+        r,
         e
       ));
       const O = I.joinPaths.filter((D) => D.pathFound), i = I.joinPaths.filter((D) => !D.pathFound);
@@ -3858,23 +3858,23 @@ class PT {
         reason: "single_cube",
         explanation: "Only one cube is used in this query"
       };
-    const R = [], A = (e.dimensions || []).map((r) => r.split(".")[0]), s = /* @__PURE__ */ new Map();
-    for (const r of A)
-      s.set(r, (s.get(r) || 0) + 1);
+    const R = [], A = (e.dimensions || []).map((S) => S.split(".")[0]), s = /* @__PURE__ */ new Map();
+    for (const S of A)
+      s.set(S, (s.get(S) || 0) + 1);
     const n = this.getResolver(t);
-    for (const r of E) {
-      const O = t.get(r), i = s.get(r) || 0, a = O?.joins ? Object.keys(O.joins).length : 0, o = n.canReachAll(r, E);
+    for (const S of E) {
+      const O = t.get(S), i = s.get(S) || 0, a = O?.joins ? Object.keys(O.joins).length : 0, o = n.canReachAll(S, E);
       R.push({
-        cubeName: r,
+        cubeName: S,
         dimensionCount: i,
         joinCount: a,
         canReachAll: o
       });
     }
     if (e.dimensions && e.dimensions.length > 0) {
-      const r = Math.max(...R.map((O) => O.dimensionCount));
-      if (r > 0) {
-        const O = R.filter((i) => i.dimensionCount === r).sort((i, a) => i.cubeName.localeCompare(a.cubeName));
+      const S = Math.max(...R.map((O) => O.dimensionCount));
+      if (S > 0) {
+        const O = R.filter((i) => i.dimensionCount === S).sort((i, a) => i.cubeName.localeCompare(a.cubeName));
         for (const i of O)
           if (i.canReachAll)
             return {
@@ -3885,9 +3885,9 @@ class PT {
             };
       }
     }
-    const I = R.filter((r) => r.canReachAll);
+    const I = R.filter((S) => S.canReachAll);
     if (I.length > 0) {
-      const r = Math.max(...I.map((i) => i.joinCount)), O = I.filter((i) => i.joinCount === r).sort((i, a) => i.cubeName.localeCompare(a.cubeName))[0];
+      const S = Math.max(...I.map((i) => i.joinCount)), O = I.filter((i) => i.joinCount === S).sort((i, a) => i.cubeName.localeCompare(a.cubeName))[0];
       return {
         selectedCube: O.cubeName,
         reason: "most_connected",
@@ -3921,15 +3921,15 @@ class PT {
         visitedCubes: s
       };
     const n = A.map((I) => {
-      const S = ne(I.joinDef.relationship, I.joinDef.sqlJoinType), r = I.joinDef.on.map((i) => ({
+      const r = ne(I.joinDef.relationship, I.joinDef.sqlJoinType), S = I.joinDef.on.map((i) => ({
         sourceColumn: i.source.name,
         targetColumn: i.target.name
       })), O = {
         fromCube: I.fromCube,
         toCube: I.toCube,
         relationship: I.joinDef.relationship,
-        joinType: S,
-        joinColumns: r
+        joinType: r,
+        joinColumns: S
       };
       if (I.joinDef.relationship === "belongsToMany" && I.joinDef.through) {
         const i = I.joinDef.through;
@@ -3964,9 +3964,9 @@ class PT {
       const I = E.get(s);
       if (!I)
         continue;
-      const S = R.measures.filter(
+      const r = R.measures.filter(
         (_) => _.startsWith(s + ".")
-      ), r = this.extractMeasuresFromFilters(R, I), O = [.../* @__PURE__ */ new Set([...S, ...r])];
+      ), S = this.extractMeasuresFromFilters(R, I), O = [.../* @__PURE__ */ new Set([...r, ...S])];
       if (O.length === 0)
         continue;
       const i = n.on.map((_) => ({
@@ -4015,9 +4015,9 @@ class Ot {
         for (const [M, c] of Object.entries(s.dimensions || {}))
           c.sql === _.targetColumnObj && M !== _.targetColumn && (I[M] = N`${_.targetColumnObj}`.as(M));
       }
-    const S = s.name, r = /* @__PURE__ */ new Map([[S, s]]), O = this.queryBuilder.buildResolvedMeasures(
+    const r = s.name, S = /* @__PURE__ */ new Map([[r, s]]), O = this.queryBuilder.buildResolvedMeasures(
       E.measures,
-      r,
+      S,
       t
     );
     for (const _ of E.measures) {
@@ -4030,7 +4030,7 @@ class Ot {
     if (e.dimensions)
       for (const _ of e.dimensions) {
         const [M, c] = _.split(".");
-        if (M === S && s.dimensions && s.dimensions[c]) {
+        if (M === r && s.dimensions && s.dimensions[c]) {
           const d = s.dimensions[c], p = this.queryBuilder.buildMeasureExpression({ sql: d.sql, type: "number" }, t);
           I[c] = N`${p}`.as(c);
         }
@@ -4038,7 +4038,7 @@ class Ot {
     if (e.timeDimensions)
       for (const _ of e.timeDimensions) {
         const [M, c] = _.dimension.split(".");
-        if (M === S && s.dimensions && s.dimensions[c]) {
+        if (M === r && s.dimensions && s.dimensions[c]) {
           const d = s.dimensions[c], p = this.queryBuilder.buildTimeDimensionExpression(d.sql, _.granularity, t);
           I[c] = N`${p}`.as(c);
         }
@@ -4053,7 +4053,7 @@ class Ot {
     if (e.timeDimensions)
       for (const _ of e.timeDimensions) {
         const [M, c] = _.dimension.split(".");
-        if (M === S && s.dimensions && s.dimensions[c] && _.dateRange) {
+        if (M === r && s.dimensions && s.dimensions[c] && _.dateRange) {
           const d = s.dimensions[c], p = this.queryBuilder.buildMeasureExpression({ sql: d.sql, type: "number" }, t), f = this.queryBuilder.buildDateRangeCondition(p, _.dateRange);
           f && D.push(f);
         }
@@ -4062,7 +4062,7 @@ class Ot {
       for (const _ of e.filters)
         if (!("and" in _) && !("or" in _) && "member" in _ && "operator" in _) {
           const M = _, [c, d] = M.member.split(".");
-          if (c === S && s.dimensions && s.dimensions[d]) {
+          if (c === r && s.dimensions && s.dimensions[d]) {
             const p = s.dimensions[d];
             if (M.operator === "inDateRange") {
               const f = this.queryBuilder.buildMeasureExpression({ sql: p.sql, type: "number" }, t), $ = this.queryBuilder.buildDateRangeCondition(f, M.values);
@@ -4090,7 +4090,7 @@ class Ot {
     if (e.dimensions)
       for (const _ of e.dimensions) {
         const [M, c] = _.split(".");
-        if (M === S && s.dimensions && s.dimensions[c]) {
+        if (M === r && s.dimensions && s.dimensions[c]) {
           const d = s.dimensions[c], p = F(d.sql, t);
           P.push(p);
         }
@@ -4098,7 +4098,7 @@ class Ot {
     if (e.timeDimensions)
       for (const _ of e.timeDimensions) {
         const [M, c] = _.dimension.split(".");
-        if (M === S && s.dimensions && s.dimensions[c]) {
+        if (M === r && s.dimensions && s.dimensions[c]) {
           const d = s.dimensions[c], p = this.queryBuilder.buildTimeDimensionExpression(d.sql, _.granularity, t);
           P.push(p);
         }
@@ -4118,7 +4118,7 @@ class Ot {
     const A = [];
     for (const s of R.joinKeys) {
       const n = s.sourceColumnObj || N.identifier(s.sourceColumn), I = N`${N.identifier(e)}.${N.identifier(s.targetColumn)}`;
-      A.push(x(n, I));
+      A.push(J(n, I));
     }
     return A.length === 1 ? A[0] : h(...A);
   }
@@ -4140,25 +4140,25 @@ class Ot {
     else {
       const I = {
         filters: E.filters
-      }, S = /* @__PURE__ */ new Map([[t.name, t]]), r = this.queryBuilder.buildWhereConditions(
-        S,
+      }, r = /* @__PURE__ */ new Map([[t.name, t]]), S = this.queryBuilder.buildWhereConditions(
+        r,
         I,
         e
       );
-      A.push(...r);
+      A.push(...S);
     }
     if (A.length === 0)
       return null;
     const s = A.length === 1 ? A[0] : h(...A), n = E.joinConditions;
     if (n.length === 1) {
-      const { source: I, target: S } = n[0], r = e.db.select({ pk: I }).from(R.from).where(s);
-      return N`${S} IN ${r}`;
+      const { source: I, target: r } = n[0], S = e.db.select({ pk: I }).from(R.from).where(s);
+      return N`${r} IN ${S}`;
     } else {
-      const I = n.map((O) => x(O.source, O.target)), S = h(
+      const I = n.map((O) => J(O.source, O.target)), r = h(
         ...I,
         s
-      ), r = e.db.select({ one: N`1` }).from(R.from).where(S);
-      return N`EXISTS ${r}`;
+      ), S = e.db.select({ one: N`1` }).from(R.from).where(r);
+      return N`EXISTS ${S}`;
     }
   }
 }
@@ -4251,19 +4251,19 @@ function Lt(T, E) {
   const { timeDimensionKey: e, granularity: t, dateRange: R, fillValue: A, measures: s, dimensions: n } = E, I = it(R[0], R[1], t);
   if (I.length === 0)
     return T;
-  const S = /* @__PURE__ */ new Map();
+  const r = /* @__PURE__ */ new Map();
   for (const O of T) {
     const i = Ct(O, n), a = ot(O[e]);
-    S.has(i) || S.set(i, /* @__PURE__ */ new Map()), S.get(i).set(a, O);
+    r.has(i) || r.set(i, /* @__PURE__ */ new Map()), r.get(i).set(a, O);
   }
-  S.size === 0 && n.length === 0 && S.set("__all__", /* @__PURE__ */ new Map());
-  const r = [];
-  for (const [O, i] of S) {
+  r.size === 0 && n.length === 0 && r.set("__all__", /* @__PURE__ */ new Map());
+  const S = [];
+  for (const [O, i] of r) {
     const a = i.size > 0 ? i.values().next().value : null;
     for (const o of I) {
       const D = o.toISOString(), C = i.get(D);
       if (C)
-        r.push(C);
+        S.push(C);
       else {
         const P = {
           [e]: D
@@ -4273,11 +4273,11 @@ function Lt(T, E) {
             P[_] = a[_];
         for (const _ of s)
           P[_] = A;
-        r.push(P);
+        S.push(P);
       }
     }
   }
-  return r;
+  return S;
 }
 function _t(T) {
   if (!T)
@@ -4295,26 +4295,26 @@ function He(T, E, e) {
   if (!E.timeDimensions || E.timeDimensions.length === 0)
     return T;
   const t = E.timeDimensions.filter((I) => {
-    const S = I.fillMissingDates !== !1, r = I.granularity && I.dateRange;
-    return S && r;
+    const r = I.fillMissingDates !== !1, S = I.granularity && I.dateRange;
+    return r && S;
   });
   if (t.length === 0)
     return T;
   const R = E.fillMissingDatesValue === void 0 ? 0 : E.fillMissingDatesValue, A = new Set(E.timeDimensions.map((I) => I.dimension)), s = (E.dimensions || []).filter((I) => !A.has(I));
   let n = T;
   for (const I of t) {
-    const S = _t(I.dateRange);
-    if (!S)
+    const r = _t(I.dateRange);
+    if (!r)
       continue;
-    const r = {
+    const S = {
       timeDimensionKey: I.dimension,
       granularity: I.granularity,
-      dateRange: S,
+      dateRange: r,
       fillValue: R,
       measures: e,
       dimensions: s
     };
-    n = Lt(n, r);
+    n = Lt(n, S);
   }
   return n;
 }
@@ -4353,9 +4353,9 @@ class Dt {
         if (I)
           A = I.start, s = I.end, n = R;
         else {
-          const S = new Date(R);
-          if (!isNaN(S.getTime()))
-            A = new Date(S), A.setUTCHours(0, 0, 0, 0), s = new Date(S), s.setUTCHours(23, 59, 59, 999), n = R;
+          const r = new Date(R);
+          if (!isNaN(r.getTime()))
+            A = new Date(r), A.setUTCHours(0, 0, 0, 0), s = new Date(r), s.setUTCHours(23, 59, 59, 999), n = R;
           else
             continue;
         }
@@ -4409,12 +4409,12 @@ class Dt {
       case "week":
         return Math.floor((s - A) / (1e3 * 60 * 60 * 24 * 7));
       case "month": {
-        const n = e.getUTCFullYear(), I = e.getUTCMonth(), S = R.getUTCFullYear(), r = R.getUTCMonth();
-        return (S - n) * 12 + (r - I);
+        const n = e.getUTCFullYear(), I = e.getUTCMonth(), r = R.getUTCFullYear(), S = R.getUTCMonth();
+        return (r - n) * 12 + (S - I);
       }
       case "quarter": {
-        const n = e.getUTCFullYear(), I = Math.floor(e.getUTCMonth() / 3), S = R.getUTCFullYear(), r = Math.floor(R.getUTCMonth() / 3);
-        return (S - n) * 4 + (r - I);
+        const n = e.getUTCFullYear(), I = Math.floor(e.getUTCMonth() / 3), r = R.getUTCFullYear(), S = Math.floor(R.getUTCMonth() / 3);
+        return (r - n) * 4 + (S - I);
       }
       case "year":
         return R.getUTCFullYear() - e.getUTCFullYear();
@@ -4458,14 +4458,14 @@ class Dt {
       timeDimensions: {}
     };
     const s = E.map((I) => I.period);
-    for (const { result: I, period: S } of E) {
-      const r = this.addPeriodMetadata(
+    for (const { result: I, period: r } of E) {
+      const S = this.addPeriodMetadata(
         I.data,
-        S,
+        r,
         e.dimension,
         t
       );
-      R.push(...r), A = {
+      R.push(...S), A = {
         measures: { ...A.measures, ...I.annotation.measures },
         dimensions: { ...A.dimensions, ...I.annotation.dimensions },
         segments: { ...A.segments, ...I.annotation.segments },
@@ -4552,17 +4552,17 @@ class Pt {
         let s;
         "cube" in A && A.cube ? s = A.cube : typeof E.bindingKey == "string" && ([s] = E.bindingKey.split("."));
         const n = s ? new aE(e) : null, I = Array.isArray(A.filter) ? A.filter : [A.filter];
-        for (const S of I)
-          if ("member" in S) {
-            const [r, O] = S.member.split("."), i = e.get(r);
+        for (const r of I)
+          if ("member" in r) {
+            const [S, O] = r.member.split("."), i = e.get(S);
             if (!i)
-              t.push(`Step ${R} filter cube not found: ${r}`);
+              t.push(`Step ${R} filter cube not found: ${S}`);
             else if (i.dimensions?.[O] || (i.measures?.[O] ? t.push(
-              `Step ${R} filter '${r}.${O}' is a measure. Funnel step filters only support dimensions, not measures.`
-            ) : t.push(`Step ${R} filter member not found: ${O} in cube ${r}`)), s && r !== s && n) {
-              const a = n.findPath(s, r);
+              `Step ${R} filter '${S}.${O}' is a measure. Funnel step filters only support dimensions, not measures.`
+            ) : t.push(`Step ${R} filter member not found: ${O} in cube ${S}`)), s && S !== s && n) {
+              const a = n.findPath(s, S);
               (!a || a.length === 0) && t.push(
-                `Step ${R} filter '${r}.${O}' requires a join from '${s}' but no join path was found. Define a join relationship between these cubes.`
+                `Step ${R} filter '${S}.${O}' requires a join from '${s}' but no join path was found. Define a join relationship between these cubes.`
               );
             }
           }
@@ -4583,9 +4583,9 @@ class Pt {
    */
   buildFunnelQuery(E, e, t) {
     const R = this.resolveSteps(E, e, t), A = [];
-    for (let S = 0; S < R.length; S++) {
-      const r = S > 0 ? A[S - 1] : void 0;
-      A.push(this.buildStepCTE(R[S], t, r));
+    for (let r = 0; r < R.length; r++) {
+      const S = r > 0 ? A[r - 1] : void 0;
+      A.push(this.buildStepCTE(R[r], t, S));
     }
     const s = this.buildFunnelResultsCTE(A, R, E, t), n = this.buildAggregationCTE(s, A, R, E, t), I = [...A, s, n];
     return t.db.with(...I).select().from(n);
@@ -4598,14 +4598,14 @@ class Pt {
       return [];
     const t = E[0], R = [], A = Number(t.step_0_count) || 0;
     for (let s = 0; s < e.steps.length; s++) {
-      const n = e.steps[s], I = Number(t[`step_${s}_count`]) || 0, S = s > 0 && Number(t[`step_${s - 1}_count`]) || 0, r = {
+      const n = e.steps[s], I = Number(t[`step_${s}_count`]) || 0, r = s > 0 && Number(t[`step_${s - 1}_count`]) || 0, S = {
         step: n.name,
         stepIndex: s,
         count: I,
-        conversionRate: s === 0 ? null : S > 0 ? I / S : 0,
+        conversionRate: s === 0 ? null : r > 0 ? I / r : 0,
         cumulativeConversionRate: A > 0 ? I / A : 0
       };
-      e.includeTimeMetrics && s > 0 && (r.avgSecondsToConvert = t[`step_${s}_avg_seconds`] !== null ? Number(t[`step_${s}_avg_seconds`]) : null, r.minSecondsToConvert = t[`step_${s}_min_seconds`] !== null ? Number(t[`step_${s}_min_seconds`]) : null, r.maxSecondsToConvert = t[`step_${s}_max_seconds`] !== null ? Number(t[`step_${s}_max_seconds`]) : null, t[`step_${s}_median_seconds`] !== void 0 && (r.medianSecondsToConvert = t[`step_${s}_median_seconds`] !== null ? Number(t[`step_${s}_median_seconds`]) : null), t[`step_${s}_p90_seconds`] !== void 0 && (r.p90SecondsToConvert = t[`step_${s}_p90_seconds`] !== null ? Number(t[`step_${s}_p90_seconds`]) : null)), R.push(r);
+      e.includeTimeMetrics && s > 0 && (S.avgSecondsToConvert = t[`step_${s}_avg_seconds`] !== null ? Number(t[`step_${s}_avg_seconds`]) : null, S.minSecondsToConvert = t[`step_${s}_min_seconds`] !== null ? Number(t[`step_${s}_min_seconds`]) : null, S.maxSecondsToConvert = t[`step_${s}_max_seconds`] !== null ? Number(t[`step_${s}_max_seconds`]) : null, t[`step_${s}_median_seconds`] !== void 0 && (S.medianSecondsToConvert = t[`step_${s}_median_seconds`] !== null ? Number(t[`step_${s}_median_seconds`]) : null), t[`step_${s}_p90_seconds`] !== void 0 && (S.p90SecondsToConvert = t[`step_${s}_p90_seconds`] !== null ? Number(t[`step_${s}_p90_seconds`]) : null)), R.push(S);
     }
     return R;
   }
@@ -4641,7 +4641,7 @@ class Pt {
   resolveSteps(E, e, t) {
     const R = new aE(e);
     return E.steps.map((A, s) => {
-      const n = this.resolveCubeForStep(A, E, e), I = this.resolveBindingKey(E, n, t), S = this.resolveTimeDimension(E, n, t), r = this.buildStepFilters(A, n, e, t), O = this.extractFilterCubeNames(A), i = [];
+      const n = this.resolveCubeForStep(A, E, e), I = this.resolveBindingKey(E, n, t), r = this.resolveTimeDimension(E, n, t), S = this.buildStepFilters(A, n, e, t), O = this.extractFilterCubeNames(A), i = [];
       for (const a of O)
         if (a !== n.name) {
           const o = e.get(a);
@@ -4655,8 +4655,8 @@ class Pt {
         index: s,
         cube: n,
         bindingKeyExpr: I,
-        timeExpr: S,
-        filterConditions: r,
+        timeExpr: r,
+        filterConditions: S,
         timeToConvert: A.timeToConvert,
         joinedCubes: i
       };
@@ -4763,8 +4763,8 @@ class Pt {
       }
       return D.length === 0 ? null : D.length === 1 ? D[0] : C ? h(...D) : N`(${N.join(D, N` OR `)})`;
     }
-    const n = E, [I, S] = n.member.split("."), r = n.dateRange !== void 0;
-    if (n.operator !== "set" && n.operator !== "notSet" && !r && (!n.values || n.values.length === 0 || n.values[0] === void 0 || n.values[0] === ""))
+    const n = E, [I, r] = n.member.split("."), S = n.dateRange !== void 0;
+    if (n.operator !== "set" && n.operator !== "notSet" && !S && (!n.values || n.values.length === 0 || n.values[0] === void 0 || n.values[0] === ""))
       return null;
     const i = t.get(I);
     if (!i)
@@ -4773,10 +4773,10 @@ class Pt {
       const C = new aE(t).findPath(e.name, I);
       if (!C || C.length === 0)
         return console.warn(
-          `Funnel filter: Cannot filter by '${I}.${S}' in step using '${e.name}'. No join path found. Filter will be skipped.`
+          `Funnel filter: Cannot filter by '${I}.${r}' in step using '${e.name}'. No join path found. Filter will be skipped.`
         ), null;
     }
-    const a = i.dimensions?.[S];
+    const a = i.dimensions?.[r];
     if (!a) return null;
     const o = F(a.sql, R);
     return this.filterBuilder.buildFilterCondition(
@@ -4836,24 +4836,24 @@ class Pt {
     const R = `step_${E.index}`, A = `step_${E.index - 1}`, s = E.cube.sql(e), n = [];
     s.where && n.push(s.where), n.push(...E.filterConditions);
     const I = N`${N.identifier(A)}.step_time`;
-    let S = N`${E.timeExpr} > ${I}`;
+    let r = N`${E.timeExpr} > ${I}`;
     if (E.timeToConvert) {
       const O = this.databaseAdapter.buildDateAddInterval(I, E.timeToConvert);
-      S = N`${S} AND ${E.timeExpr} <= ${O}`;
+      r = N`${r} AND ${E.timeExpr} <= ${O}`;
     }
-    n.push(S);
-    let r = e.db.select({
+    n.push(r);
+    let S = e.db.select({
       binding_key: N`${E.bindingKeyExpr}`.as("binding_key"),
       step_time: N`MIN(${E.timeExpr})`.as("step_time")
     }).from(s.from).innerJoin(
       t,
       N`${E.bindingKeyExpr} = ${N.identifier(A)}.binding_key`
     );
-    if (r = this.addCrossJoinsToQuery(r, E, e, n), n.length > 0) {
+    if (S = this.addCrossJoinsToQuery(S, E, e, n), n.length > 0) {
       const O = n.length === 1 ? n[0] : h(...n);
-      r = r.where(O);
+      S = S.where(O);
     }
-    return r = r.groupBy(E.bindingKeyExpr), e.db.$with(R).as(r);
+    return S = S.groupBy(E.bindingKeyExpr), e.db.$with(R).as(S);
   }
   /**
    * Helper to add cross-cube JOINs to a step query
@@ -4866,9 +4866,9 @@ class Pt {
       for (const s of A.joinPath) {
         const n = s.joinDef, I = [];
         for (const i of n.on)
-          i.as ? I.push(i.as(i.source, i.target)) : I.push(x(i.source, i.target));
-        const S = I.length === 1 ? I[0] : h(...I), O = A.cube.sql(t);
-        E = E.leftJoin(O.from, S), O.where && R.push(O.where);
+          i.as ? I.push(i.as(i.source, i.target)) : I.push(J(i.source, i.target));
+        const r = I.length === 1 ? I[0] : h(...I), O = A.cube.sql(t);
+        E = E.leftJoin(O.from, r), O.where && R.push(O.where);
       }
     return E;
   }
@@ -4886,14 +4886,14 @@ class Pt {
       binding_key: N`s0.binding_key`,
       step_0_time: N`s0.step_time`
     };
-    for (let S = 1; S < e.length; S++)
-      A[`step_${S}_time`] = N`s${N.raw(String(S))}.step_time`;
+    for (let r = 1; r < e.length; r++)
+      A[`step_${r}_time`] = N`s${N.raw(String(r))}.step_time`;
     let s = N`${N.identifier("step_0")} s0`;
-    for (let S = 1; S < e.length; S++)
+    for (let r = 1; r < e.length; r++)
       s = N`${s}
-      LEFT JOIN ${N.identifier(`step_${S}`)} s${N.raw(String(S))} ON s0.binding_key = s${N.raw(String(S))}.binding_key`;
+      LEFT JOIN ${N.identifier(`step_${r}`)} s${N.raw(String(r))} ON s0.binding_key = s${N.raw(String(r))}.binding_key`;
     const n = Object.entries(A).map(
-      ([S, r]) => N`${r} AS ${N.identifier(S)}`
+      ([r, S]) => N`${S} AS ${N.identifier(r)}`
     ), I = N`SELECT ${N.join(n, N`, `)} FROM ${s}`;
     return R.db.$with("funnel_joined").as(
       R.db.select({ _all: N`*` }).from(N`(${I}) as _inner`)
@@ -4921,15 +4921,15 @@ class Pt {
       s[`step_${I}_count`] = N`COUNT(${N.identifier(`step_${I}_time`)})`.as(`step_${I}_count`);
     if (R.includeTimeMetrics)
       for (let I = 1; I < t.length; I++) {
-        const S = N.identifier(`step_${I}_time`), r = N.identifier(`step_${I - 1}_time`), O = this.databaseAdapter.buildTimeDifferenceSeconds(
-          N`${S}`,
-          N`${r}`
-        ), i = N`${S} IS NOT NULL`;
+        const r = N.identifier(`step_${I}_time`), S = N.identifier(`step_${I - 1}_time`), O = this.databaseAdapter.buildTimeDifferenceSeconds(
+          N`${r}`,
+          N`${S}`
+        ), i = N`${r} IS NOT NULL`;
         s[`step_${I}_avg_seconds`] = this.databaseAdapter.buildConditionalAggregation("avg", O, i).as(`step_${I}_avg_seconds`), s[`step_${I}_min_seconds`] = this.databaseAdapter.buildConditionalAggregation("min", O, i).as(`step_${I}_min_seconds`), s[`step_${I}_max_seconds`] = this.databaseAdapter.buildConditionalAggregation("max", O, i).as(`step_${I}_max_seconds`);
         const a = this.databaseAdapter.buildPercentile(O, 50);
-        a && (s[`step_${I}_median_seconds`] = N`(SELECT ${a} FROM ${N.identifier("funnel_joined")} WHERE ${S} IS NOT NULL)`.as(`step_${I}_median_seconds`));
+        a && (s[`step_${I}_median_seconds`] = N`(SELECT ${a} FROM ${N.identifier("funnel_joined")} WHERE ${r} IS NOT NULL)`.as(`step_${I}_median_seconds`));
         const o = this.databaseAdapter.buildPercentile(O, 90);
-        o && (s[`step_${I}_p90_seconds`] = N`(SELECT ${o} FROM ${N.identifier("funnel_joined")} WHERE ${S} IS NOT NULL)`.as(`step_${I}_p90_seconds`));
+        o && (s[`step_${I}_p90_seconds`] = N`(SELECT ${o} FROM ${N.identifier("funnel_joined")} WHERE ${r} IS NOT NULL)`.as(`step_${I}_p90_seconds`));
       }
     const n = A.db.select(s).from(E);
     return A.db.$with("funnel_metrics").as(n);
@@ -5008,7 +5008,7 @@ class NE {
       this.preloadFilterCache(e, A, E, s);
       const n = this.queryPlanner.createQueryPlan(E, e, s);
       this.validateSecurityContext(n, s);
-      const I = this.buildUnifiedQuery(n, e, s), S = this.queryBuilder.collectNumericFields(E, e), r = await this.dbExecutor.execute(I, S), O = Array.isArray(r) ? r.map((C) => {
+      const I = this.buildUnifiedQuery(n, e, s), r = this.queryBuilder.collectNumericFields(E, e), S = await this.dbExecutor.execute(I, r), O = Array.isArray(S) ? S.map((C) => {
         const P = { ...C };
         if (e.timeDimensions) {
           for (const _ of e.timeDimensions)
@@ -5022,7 +5022,7 @@ class NE {
             }
         }
         return P;
-      }) : [r], i = e.measures || [], a = He(O, e, i), o = this.generateAnnotations(n, e), D = {
+      }) : [S], i = e.measures || [], a = He(O, e, i), o = this.generateAnnotations(n, e), D = {
         data: a,
         annotation: o
       };
@@ -5097,18 +5097,18 @@ class NE {
     );
     if (A.length < 2)
       throw new Error("compareDateRange requires at least 2 periods");
-    const s = R.granularity || "day", n = A.map(async (r) => {
-      const O = this.comparisonQueryBuilder.createPeriodQuery(e, r);
-      return { result: await this.executeStandardQuery(E, O, t), period: r };
-    }), I = await Promise.all(n), S = this.comparisonQueryBuilder.mergeComparisonResults(
+    const s = R.granularity || "day", n = A.map(async (S) => {
+      const O = this.comparisonQueryBuilder.createPeriodQuery(e, S);
+      return { result: await this.executeStandardQuery(E, O, t), period: S };
+    }), I = await Promise.all(n), r = this.comparisonQueryBuilder.mergeComparisonResults(
       I,
       R,
       s
     );
-    return S.data = this.comparisonQueryBuilder.sortComparisonResults(
-      S.data,
+    return r.data = this.comparisonQueryBuilder.sortComparisonResults(
+      r.data,
       R.dimension
-    ), S;
+    ), r;
   }
   /**
    * Execute a funnel query with caching support
@@ -5148,13 +5148,13 @@ class NE {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: t
-    }, I = await this.funnelQueryBuilder.buildFunnelQuery(R, E, s), S = this.funnelQueryBuilder.transformResult(I, R), r = {
+    }, I = await this.funnelQueryBuilder.buildFunnelQuery(R, E, s), r = this.funnelQueryBuilder.transformResult(I, R), S = {
       measures: {},
       dimensions: {},
       segments: {},
       timeDimensions: {}
     };
-    return r.funnel = {
+    return S.funnel = {
       config: R,
       steps: R.steps.map((O, i) => ({
         name: O.name,
@@ -5162,8 +5162,8 @@ class NE {
         timeToConvert: O.timeToConvert
       }))
     }, {
-      data: S,
-      annotation: r
+      data: r,
+      annotation: S
     };
   }
   /**
@@ -5178,7 +5178,7 @@ class NE {
       filterCache: R
     };
     this.preloadFilterCache(e, R, E, A);
-    const s = this.queryPlanner.createQueryPlan(E, e, A), n = this.buildUnifiedQuery(s, e, A), I = this.queryBuilder.collectNumericFields(E, e), S = await this.dbExecutor.execute(n, I), r = Array.isArray(S) ? S.map((o) => {
+    const s = this.queryPlanner.createQueryPlan(E, e, A), n = this.buildUnifiedQuery(s, e, A), I = this.queryBuilder.collectNumericFields(E, e), r = await this.dbExecutor.execute(n, I), S = Array.isArray(r) ? r.map((o) => {
       const D = { ...o };
       if (e.timeDimensions) {
         for (const C of e.timeDimensions)
@@ -5192,7 +5192,7 @@ class NE {
           }
       }
       return D;
-    }) : [S], O = e.measures || [], i = He(r, e, O), a = this.generateAnnotations(s, e);
+    }) : [r], O = e.measures || [], i = He(S, e, O), a = this.generateAnnotations(s, e);
     return {
       data: i,
       annotation: a
@@ -5256,7 +5256,7 @@ class NE {
         const P = this.cteBuilder.buildPreAggregationCTE(C, e, t, E, R);
         P && (A.push(P), s.set(C.cube.name, C.cteAlias));
       }
-    const n = E.primaryCube.sql(t), S = { ...this.queryBuilder.buildSelections(
+    const n = E.primaryCube.sql(t), r = { ...this.queryBuilder.buildSelections(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       e,
@@ -5266,7 +5266,7 @@ class NE {
       for (const C of E.preAggregationCTEs) {
         const P = C.cube.name;
         for (const _ of C.measures)
-          if (S[_]) {
+          if (r[_]) {
             const [, M] = _.split("."), c = this.getCubesFromPlan(E).get(P);
             if (c && c.measures && c.measures[M]) {
               const d = c.measures[M], p = N`${N.identifier(C.cteAlias)}.${N.identifier(M)}`;
@@ -5302,20 +5302,20 @@ class NE {
                   default:
                     f = w(p);
                 }
-              S[_] = N`${f}`.as(_);
+              r[_] = N`${f}`.as(_);
             }
           }
-        for (const _ in S) {
+        for (const _ in r) {
           const [M, c] = _.split(".");
           if (M === P) {
             const d = this.getCubesFromPlan(E).get(P), p = d && d.dimensions?.[c], f = _.startsWith(P + ".");
             if (p || f) {
-              let $ = C.joinKeys.find((J) => J.targetColumn === c);
+              let $ = C.joinKeys.find((x) => x.targetColumn === c);
               if (!$ && d?.dimensions?.[c]) {
-                const J = d.dimensions[c].sql;
-                $ = C.joinKeys.find((mE) => mE.targetColumnObj === J);
+                const x = d.dimensions[c].sql;
+                $ = C.joinKeys.find((mE) => mE.targetColumnObj === x);
               }
-              $ ? S[_] = N`${N.identifier(C.cteAlias)}.${N.identifier(c)}`.as(_) : f && d?.dimensions?.[c] && (S[_] = N`${N.identifier(C.cteAlias)}.${N.identifier(c)}`.as(_));
+              $ ? r[_] = N`${N.identifier(C.cteAlias)}.${N.identifier(c)}`.as(_) : f && d?.dimensions?.[c] && (r[_] = N`${N.identifier(C.cteAlias)}.${N.identifier(c)}`.as(_));
             }
           }
         }
@@ -5329,9 +5329,9 @@ class NE {
           if (B.isPostAggregationWindow(d)) {
             const p = B.getWindowBaseMeasure(d, _);
             if (p) {
-              const [f, $] = p.split("."), J = C.get(f);
-              if (J?.measures?.[$]) {
-                const mE = J.measures[$], Ce = E.preAggregationCTEs?.find(
+              const [f, $] = p.split("."), x = C.get(f);
+              if (x?.measures?.[$]) {
+                const mE = x.measures[$], Ce = E.preAggregationCTEs?.find(
                   (rE) => rE.cube?.name === f && rE.measures?.includes(p)
                 );
                 let SE;
@@ -5339,8 +5339,8 @@ class NE {
                   const rE = N`${N.identifier(Ce.cteAlias)}.${N.identifier($)}`;
                   SE = N`sum(${rE})`;
                 } else
-                  SE = this.queryBuilder.buildMeasureExpression(mE, t, J);
-                S[p] || (S[p] = N`${SE}`.as(p));
+                  SE = this.queryBuilder.buildMeasureExpression(mE, t, x);
+                r[p] || (r[p] = N`${SE}`.as(p));
                 const Le = this.buildPostAggregationWindowExpression(
                   d,
                   SE,
@@ -5349,16 +5349,16 @@ class NE {
                   c,
                   E
                 );
-                Le && (S[P] = N`${Le}`.as(P));
+                Le && (r[P] = N`${Le}`.as(P));
               }
             }
           }
         }
       }
     }
-    const r = [];
-    let O = t.db.select(S).from(n.from);
-    if (A.length > 0 && (O = t.db.with(...A).select(S).from(n.from)), n.joins)
+    const S = [];
+    let O = t.db.select(r).from(n.from);
+    if (A.length > 0 && (O = t.db.with(...A).select(r).from(n.from)), n.joins)
       for (const C of n.joins)
         switch (C.type || "left") {
           case "left":
@@ -5398,7 +5398,7 @@ class NE {
                 O = O.fullJoin(c.table, c.joinCondition);
                 break;
             }
-            d.length > 0 && r.push(...d);
+            d.length > 0 && S.push(...d);
           } catch {
           }
         }
@@ -5422,12 +5422,12 @@ class NE {
         } catch {
         }
       }
-    if (n.where && r.push(n.where), E.joinCubes && E.joinCubes.length > 0)
+    if (n.where && S.push(n.where), E.joinCubes && E.joinCubes.length > 0)
       for (const C of E.joinCubes) {
         if (s.get(C.cube.name))
           continue;
         const _ = C.cube.sql(t);
-        _.where && r.push(_.where);
+        _.where && S.push(_.where);
       }
     const i = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -5439,8 +5439,8 @@ class NE {
       R
       // Reuse pre-built filters for parameter deduplication
     );
-    if (i.length > 0 && r.push(...i), r.length > 0) {
-      const C = r.length === 1 ? r[0] : h(...r);
+    if (i.length > 0 && S.push(...i), S.length > 0) {
+      const C = S.length === 1 ? S[0] : h(...S);
       O = O.where(C);
     }
     const a = this.queryBuilder.buildGroupByFields(
@@ -5531,36 +5531,36 @@ class NE {
     const t = {}, R = {}, A = {}, s = [E.primaryCube].filter(Boolean);
     if (E.joinCubes && E.joinCubes.length > 0 && s.push(...E.joinCubes.map((n) => n.cube).filter(Boolean)), e.measures)
       for (const n of e.measures) {
-        const [I, S] = n.split("."), r = s.find((O) => O?.name === I);
-        if (r && r.measures[S]) {
-          const O = r.measures[S];
+        const [I, r] = n.split("."), S = s.find((O) => O?.name === I);
+        if (S && S.measures[r]) {
+          const O = S.measures[r];
           t[n] = {
-            title: O.title || S,
-            shortTitle: O.title || S,
+            title: O.title || r,
+            shortTitle: O.title || r,
             type: O.type
           };
         }
       }
     if (e.dimensions)
       for (const n of e.dimensions) {
-        const [I, S] = n.split("."), r = s.find((O) => O?.name === I);
-        if (r && r.dimensions?.[S]) {
-          const O = r.dimensions[S];
+        const [I, r] = n.split("."), S = s.find((O) => O?.name === I);
+        if (S && S.dimensions?.[r]) {
+          const O = S.dimensions[r];
           R[n] = {
-            title: O.title || S,
-            shortTitle: O.title || S,
+            title: O.title || r,
+            shortTitle: O.title || r,
             type: O.type
           };
         }
       }
     if (e.timeDimensions)
       for (const n of e.timeDimensions) {
-        const [I, S] = n.dimension.split("."), r = s.find((O) => O?.name === I);
-        if (r && r.dimensions?.[S]) {
-          const O = r.dimensions[S];
+        const [I, r] = n.dimension.split("."), S = s.find((O) => O?.name === I);
+        if (S && S.dimensions?.[r]) {
+          const O = S.dimensions[r];
           A[n.dimension] = {
-            title: O.title || S,
-            shortTitle: O.title || S,
+            title: O.title || r,
+            shortTitle: O.title || r,
             type: O.type,
             granularity: n.granularity
           };
@@ -5584,9 +5584,9 @@ class NE {
       for (const s of A) {
         const n = cE(s);
         if (e.has(n)) continue;
-        const [I, S] = s.member.split("."), r = t.get(I);
-        if (!r) continue;
-        const O = r.dimensions?.[S];
+        const [I, r] = s.member.split("."), S = t.get(I);
+        if (!S) continue;
+        const O = S.dimensions?.[r];
         if (!O || ["arrayContains", "arrayOverlaps", "arrayContained"].includes(s.operator))
           continue;
         const a = F(O.sql, R), o = this.queryBuilder.buildFilterConditionPublic(
@@ -5604,11 +5604,11 @@ class NE {
         if (A.dateRange) {
           const s = _T(A.dimension, A.dateRange);
           if (e.has(s)) continue;
-          const [n, I] = A.dimension.split("."), S = t.get(n);
-          if (!S) continue;
-          const r = S.dimensions?.[I];
+          const [n, I] = A.dimension.split("."), r = t.get(n);
           if (!r) continue;
-          const O = F(r.sql, R), i = this.queryBuilder.buildDateRangeCondition(O, A.dateRange);
+          const S = r.dimensions?.[I];
+          if (!S) continue;
+          const O = F(S.sql, R), i = this.queryBuilder.buildDateRangeCondition(O, A.dateRange);
           i && e.set(s, i);
         }
     }
@@ -5634,9 +5634,9 @@ class NE {
       const D = s.preAggregationCTEs.find((C) => C.cube?.name === a);
       return D && D.cteAlias ? N`${N.identifier(D.cteAlias)}.${N.identifier(o)}` : null;
     };
-    let S;
+    let r;
     if (n.orderBy && n.orderBy.length > 0)
-      S = n.orderBy.map((a) => {
+      r = n.orderBy.map((a) => {
         const o = a.field.includes(".") ? a.field.split(".")[1] : a.field;
         if (t.timeDimensions)
           for (const P of t.timeDimensions) {
@@ -5675,7 +5675,7 @@ class NE {
     else if (t.timeDimensions && t.timeDimensions.length > 0) {
       const a = t.timeDimensions[0], [o, D] = a.dimension.split("."), C = I(o, D);
       if (C)
-        S = [{
+        r = [{
           field: C,
           direction: "asc"
         }];
@@ -5683,7 +5683,7 @@ class NE {
         const P = A.name === o ? A : void 0;
         if (P?.dimensions?.[D]) {
           const _ = P.dimensions[D];
-          S = [{
+          r = [{
             field: this.queryBuilder.buildTimeDimensionExpression(
               _.sql,
               a.granularity,
@@ -5694,16 +5694,16 @@ class NE {
         }
       }
     }
-    let r;
-    n.partitionBy && n.partitionBy.length > 0 && (r = n.partitionBy.map((a) => {
+    let S;
+    n.partitionBy && n.partitionBy.length > 0 && (S = n.partitionBy.map((a) => {
       const o = a.includes(".") ? a.split(".")[1] : a, D = A.dimensions?.[o];
       return D ? F(D.sql, R) : null;
     }).filter((a) => a !== null));
     const O = this.databaseAdapter.buildWindowFunction(
       E.type,
       e,
-      r,
       S,
+      r,
       {
         offset: n.offset,
         defaultValue: n.defaultValue,
@@ -7413,7 +7413,7 @@ const wt = [
   "XMLNAMESPACES",
   "YEAR",
   "YEARS"
-], xt = [
+], Jt = [
   // https://www.ibm.com/docs/en/db2-for-zos/12?topic=columns-data-types
   "ARRAY",
   "BIGINT",
@@ -7455,7 +7455,7 @@ const wt = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], Jt = L(["SELECT [ALL | DISTINCT]"]), Qt = L([
+], xt = L(["SELECT [ALL | DISTINCT]"]), Qt = L([
   // queries
   "WITH",
   "FROM",
@@ -7701,14 +7701,14 @@ const wt = [
 ]), kt = L([]), zt = {
   name: "db2",
   tokenizerOptions: {
-    reservedSelect: Jt,
+    reservedSelect: xt,
     reservedClauses: [...Qt, ...be, ...gE],
     reservedSetOperations: Zt,
     reservedJoins: jt,
     reservedKeywordPhrases: qt,
     reservedDataTypePhrases: kt,
     reservedKeywords: vt,
-    reservedDataTypes: xt,
+    reservedDataTypes: Jt,
     reservedFunctionNames: wt,
     extraParens: ["[]"],
     stringTypes: [
@@ -12151,7 +12151,7 @@ const hR = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), xR = L(["UNION [ALL | DISTINCT]"]), JR = L([
+]), JR = L(["UNION [ALL | DISTINCT]"]), xR = L([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -12169,8 +12169,8 @@ const hR = [
   tokenizerOptions: {
     reservedSelect: wR,
     reservedClauses: [...vR, ...$e, ...XE],
-    reservedSetOperations: xR,
-    reservedJoins: JR,
+    reservedSetOperations: JR,
+    reservedJoins: xR,
     reservedKeywordPhrases: QR,
     reservedDataTypePhrases: ZR,
     supportsXor: !0,
@@ -16033,9 +16033,9 @@ const pA = [
   "VALUES",
   // - update:
   "SET"
-]), xe = L([
+]), Je = L([
   "CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]"
-]), xE = L([
+]), JE = L([
   // - create:
   "CREATE [OR REPLACE | MATERIALIZED] VIEW",
   // - update:
@@ -16140,15 +16140,15 @@ const pA = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), xA = L([]), JA = {
+]), JA = L([]), xA = {
   name: "redshift",
   tokenizerOptions: {
     reservedSelect: $A,
-    reservedClauses: [...XA, ...xe, ...xE],
+    reservedClauses: [...XA, ...Je, ...JE],
     reservedSetOperations: KA,
     reservedJoins: wA,
     reservedKeywordPhrases: vA,
-    reservedDataTypePhrases: xA,
+    reservedDataTypePhrases: JA,
     reservedKeywords: yA,
     reservedDataTypes: WA,
     reservedFunctionNames: VA,
@@ -16175,8 +16175,8 @@ const pA = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...xe, ...xE],
-    tabularOnelineClauses: xE
+    onelineClauses: [...Je, ...JE],
+    tabularOnelineClauses: JE
   }
 }, QA = [
   // https://deepkb.com/CO_000013/en/kb/IMPORT-fbfa59f0-2bf1-31fe-bb7b-0f9efe9932c6/spark-sql-keywords
@@ -16821,7 +16821,7 @@ const pA = [
   //   https://spark.apache.org/docs/latest/sql-ref-syntax-dml-load.html
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), Je = L(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), JE = L([
+]), xe = L(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), xE = L([
   // - create:
   "CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]",
   // - drop table:
@@ -16899,7 +16899,7 @@ const pA = [
   name: "spark",
   tokenizerOptions: {
     reservedSelect: qA,
-    reservedClauses: [...kA, ...Je, ...JE],
+    reservedClauses: [...kA, ...xe, ...xE],
     reservedSetOperations: zA,
     reservedJoins: Es,
     reservedKeywordPhrases: es,
@@ -16922,8 +16922,8 @@ const pA = [
     postProcess: Rs
   },
   formatOptions: {
-    onelineClauses: [...Je, ...JE],
-    tabularOnelineClauses: JE
+    onelineClauses: [...xe, ...xE],
+    tabularOnelineClauses: xE
   }
 };
 function Rs(T) {
@@ -19560,7 +19560,7 @@ const As = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], xs = [
+], Js = [
   // https://docs.singlestore.com/cloud/reference/sql-reference/data-types/
   "BIGINT",
   "BINARY",
@@ -19609,7 +19609,7 @@ const As = [
   "VARCHAR",
   "VARCHARACTER",
   "YEAR"
-], Js = [
+], xs = [
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/vector-functions/vector-functions.html
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/window-functions/window-functions.html
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/string-functions/string-functions.html
@@ -20118,8 +20118,8 @@ const As = [
     reservedKeywordPhrases: ks,
     reservedDataTypePhrases: zs,
     reservedKeywords: vs,
-    reservedDataTypes: xs,
-    reservedFunctionNames: Js,
+    reservedDataTypes: Js,
+    reservedFunctionNames: xs,
     // TODO: support _binary"some string" prefix
     stringTypes: [
       '""-qq-bs',
@@ -21236,7 +21236,7 @@ const As = [
   n1ql: CA,
   plsql: dA,
   postgresql: gA,
-  redshift: JA,
+  redshift: xA,
   singlestoredb: En,
   snowflake: Nn,
   spark: ts,
@@ -21596,31 +21596,31 @@ class Un {
       {
         type: u.NAMED_PARAMETER,
         regex: ee(I.named, dT(E.paramChars || E.identChars)),
-        key: (S) => S.slice(1)
+        key: (r) => r.slice(1)
       },
       {
         type: u.QUOTED_PARAMETER,
         regex: ee(I.quoted, UT(E.identTypes)),
-        key: (S) => (({ tokenKey: r, quoteChar: O }) => r.replace(new RegExp(K("\\" + O), "gu"), O))({
-          tokenKey: S.slice(2, -1),
-          quoteChar: S.slice(-1)
+        key: (r) => (({ tokenKey: S, quoteChar: O }) => S.replace(new RegExp(K("\\" + O), "gu"), O))({
+          tokenKey: r.slice(2, -1),
+          quoteChar: r.slice(-1)
         })
       },
       {
         type: u.NUMBERED_PARAMETER,
         regex: ee(I.numbered, "[0-9]+"),
-        key: (S) => S.slice(1)
+        key: (r) => r.slice(1)
       },
       {
         type: u.POSITIONAL_PARAMETER,
         regex: I.positional ? /[?]/y : void 0
       },
-      ...I.custom.map((S) => {
-        var r;
+      ...I.custom.map((r) => {
+        var S;
         return {
           type: u.CUSTOM_PARAMETER,
-          regex: q(S.regex),
-          key: (r = S.key) !== null && r !== void 0 ? r : ((O) => O)
+          regex: q(r.regex),
+          key: (S = r.key) !== null && S !== void 0 ? S : ((O) => O)
         };
       })
     ]);
@@ -21682,36 +21682,36 @@ function Hn() {
     (function(E, e) {
       T.exports ? T.exports = e() : E.nearley = e();
     })(Bn, function() {
-      function E(S, r, O) {
-        return this.id = ++E.highestId, this.name = S, this.symbols = r, this.postprocess = O, this;
+      function E(r, S, O) {
+        return this.id = ++E.highestId, this.name = r, this.symbols = S, this.postprocess = O, this;
       }
-      E.highestId = 0, E.prototype.toString = function(S) {
-        var r = typeof S > "u" ? this.symbols.map(I).join(" ") : this.symbols.slice(0, S).map(I).join(" ") + " ● " + this.symbols.slice(S).map(I).join(" ");
-        return this.name + " → " + r;
+      E.highestId = 0, E.prototype.toString = function(r) {
+        var S = typeof r > "u" ? this.symbols.map(I).join(" ") : this.symbols.slice(0, r).map(I).join(" ") + " ● " + this.symbols.slice(r).map(I).join(" ");
+        return this.name + " → " + S;
       };
-      function e(S, r, O, i) {
-        this.rule = S, this.dot = r, this.reference = O, this.data = [], this.wantedBy = i, this.isComplete = this.dot === S.symbols.length;
+      function e(r, S, O, i) {
+        this.rule = r, this.dot = S, this.reference = O, this.data = [], this.wantedBy = i, this.isComplete = this.dot === r.symbols.length;
       }
       e.prototype.toString = function() {
         return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
-      }, e.prototype.nextState = function(S) {
-        var r = new e(this.rule, this.dot + 1, this.reference, this.wantedBy);
-        return r.left = this, r.right = S, r.isComplete && (r.data = r.build(), r.right = void 0), r;
+      }, e.prototype.nextState = function(r) {
+        var S = new e(this.rule, this.dot + 1, this.reference, this.wantedBy);
+        return S.left = this, S.right = r, S.isComplete && (S.data = S.build(), S.right = void 0), S;
       }, e.prototype.build = function() {
-        var S = [], r = this;
+        var r = [], S = this;
         do
-          S.push(r.right.data), r = r.left;
-        while (r.left);
-        return S.reverse(), S;
+          r.push(S.right.data), S = S.left;
+        while (S.left);
+        return r.reverse(), r;
       }, e.prototype.finish = function() {
         this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, s.fail));
       };
-      function t(S, r) {
-        this.grammar = S, this.index = r, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
+      function t(r, S) {
+        this.grammar = r, this.index = S, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
       }
-      t.prototype.process = function(S) {
-        for (var r = this.states, O = this.wants, i = this.completed, a = 0; a < r.length; a++) {
-          var o = r[a];
+      t.prototype.process = function(r) {
+        for (var S = this.states, O = this.wants, i = this.completed, a = 0; a < S.length; a++) {
+          var o = S[a];
           if (o.isComplete) {
             if (o.finish(), o.data !== s.fail) {
               for (var D = o.wantedBy, C = D.length; C--; ) {
@@ -21739,47 +21739,47 @@ function Hn() {
               O[_] = [o], this.predict(_);
           }
         }
-      }, t.prototype.predict = function(S) {
-        for (var r = this.grammar.byName[S] || [], O = 0; O < r.length; O++) {
-          var i = r[O], a = this.wants[S], o = new e(i, 0, this.index, a);
+      }, t.prototype.predict = function(r) {
+        for (var S = this.grammar.byName[r] || [], O = 0; O < S.length; O++) {
+          var i = S[O], a = this.wants[r], o = new e(i, 0, this.index, a);
           this.states.push(o);
         }
-      }, t.prototype.complete = function(S, r) {
-        var O = S.nextState(r);
+      }, t.prototype.complete = function(r, S) {
+        var O = r.nextState(S);
         this.states.push(O);
       };
-      function R(S, r) {
-        this.rules = S, this.start = r || this.rules[0].name;
+      function R(r, S) {
+        this.rules = r, this.start = S || this.rules[0].name;
         var O = this.byName = {};
         this.rules.forEach(function(i) {
           O.hasOwnProperty(i.name) || (O[i.name] = []), O[i.name].push(i);
         });
       }
-      R.fromCompiled = function(i, r) {
+      R.fromCompiled = function(i, S) {
         var O = i.Lexer;
-        i.ParserStart && (r = i.ParserStart, i = i.ParserRules);
+        i.ParserStart && (S = i.ParserStart, i = i.ParserRules);
         var i = i.map(function(o) {
           return new E(o.name, o.symbols, o.postprocess);
-        }), a = new R(i, r);
+        }), a = new R(i, S);
         return a.lexer = O, a;
       };
       function A() {
         this.reset("");
       }
-      A.prototype.reset = function(S, r) {
-        this.buffer = S, this.index = 0, this.line = r ? r.line : 1, this.lastLineBreak = r ? -r.col : 0;
+      A.prototype.reset = function(r, S) {
+        this.buffer = r, this.index = 0, this.line = S ? S.line : 1, this.lastLineBreak = S ? -S.col : 0;
       }, A.prototype.next = function() {
         if (this.index < this.buffer.length) {
-          var S = this.buffer[this.index++];
-          return S === `
-` && (this.line += 1, this.lastLineBreak = this.index), { value: S };
+          var r = this.buffer[this.index++];
+          return r === `
+` && (this.line += 1, this.lastLineBreak = this.index), { value: r };
         }
       }, A.prototype.save = function() {
         return {
           line: this.line,
           col: this.index - this.lastLineBreak
         };
-      }, A.prototype.formatError = function(S, r) {
+      }, A.prototype.formatError = function(r, S) {
         var O = this.buffer;
         if (typeof O == "string") {
           var i = O.split(`
@@ -21790,26 +21790,26 @@ function Hn() {
 `, this.index);
           a === -1 && (a = O.length);
           var o = this.index - this.lastLineBreak, D = String(this.line).length;
-          return r += " at line " + this.line + " col " + o + `:
+          return S += " at line " + this.line + " col " + o + `:
 
-`, r += i.map(function(P, _) {
+`, S += i.map(function(P, _) {
             return C(this.line - i.length + _ + 1, D) + " " + P;
           }, this).join(`
-`), r += `
+`), S += `
 ` + C("", D + o) + `^
-`, r;
+`, S;
         } else
-          return r + " at index " + (this.index - 1);
+          return S + " at index " + (this.index - 1);
         function C(P, _) {
           var M = String(P);
           return Array(_ - M.length + 1).join(" ") + M;
         }
       };
-      function s(S, r, O) {
-        if (S instanceof R)
-          var i = S, O = r;
+      function s(r, S, O) {
+        if (r instanceof R)
+          var i = r, O = S;
         else
-          var i = R.fromCompiled(S, r);
+          var i = R.fromCompiled(r, S);
         this.grammar = i, this.options = {
           keepHistory: !1,
           lexer: i.lexer || new A()
@@ -21820,12 +21820,12 @@ function Hn() {
         var o = new t(i, 0);
         this.table = [o], o.wants[i.start] = [], o.predict(i.start), o.process(), this.current = 0;
       }
-      s.fail = {}, s.prototype.feed = function(S) {
-        var r = this.lexer;
-        r.reset(S, this.lexerState);
+      s.fail = {}, s.prototype.feed = function(r) {
+        var S = this.lexer;
+        S.reset(r, this.lexerState);
         for (var O; ; ) {
           try {
-            if (O = r.next(), !O)
+            if (O = S.next(), !O)
               break;
           } catch (f) {
             var D = new t(this.grammar, this.current + 1);
@@ -21837,7 +21837,7 @@ function Hn() {
           this.options.keepHistory || delete this.table[this.current - 1];
           var o = this.current + 1, D = new t(this.grammar, o);
           this.table.push(D);
-          for (var C = O.text !== void 0 ? O.text : O.value, P = r.constructor === A ? O.value : O, _ = a.scannable, M = _.length; M--; ) {
+          for (var C = O.text !== void 0 ? O.text : O.value, P = S.constructor === A ? O.value : O, _ = a.scannable, M = _.length; M--; ) {
             var c = _[M], d = c.rule.symbols[c.dot];
             if (d.test ? d.test(P) : d.type ? d.type === O.type : d.literal === C) {
               var p = c.nextState({ data: P, token: O, isToken: !0, reference: o - 1 });
@@ -21848,27 +21848,27 @@ function Hn() {
             var i = new Error(this.reportError(O));
             throw i.offset = this.current, i.token = O, i;
           }
-          this.options.keepHistory && (a.lexerState = r.save()), this.current++;
+          this.options.keepHistory && (a.lexerState = S.save()), this.current++;
         }
-        return a && (this.lexerState = r.save()), this.results = this.finish(), this;
-      }, s.prototype.reportLexerError = function(S) {
-        var r, O, i = S.token;
-        return i ? (r = "input " + JSON.stringify(i.text[0]) + " (lexer error)", O = this.lexer.formatError(i, "Syntax error")) : (r = "input (lexer error)", O = S.message), this.reportErrorCommon(O, r);
-      }, s.prototype.reportError = function(S) {
-        var r = (S.type ? S.type + " token: " : "") + JSON.stringify(S.value !== void 0 ? S.value : S), O = this.lexer.formatError(S, "Syntax error");
-        return this.reportErrorCommon(O, r);
-      }, s.prototype.reportErrorCommon = function(S, r) {
+        return a && (this.lexerState = S.save()), this.results = this.finish(), this;
+      }, s.prototype.reportLexerError = function(r) {
+        var S, O, i = r.token;
+        return i ? (S = "input " + JSON.stringify(i.text[0]) + " (lexer error)", O = this.lexer.formatError(i, "Syntax error")) : (S = "input (lexer error)", O = r.message), this.reportErrorCommon(O, S);
+      }, s.prototype.reportError = function(r) {
+        var S = (r.type ? r.type + " token: " : "") + JSON.stringify(r.value !== void 0 ? r.value : r), O = this.lexer.formatError(r, "Syntax error");
+        return this.reportErrorCommon(O, S);
+      }, s.prototype.reportErrorCommon = function(r, S) {
         var O = [];
-        O.push(S);
+        O.push(r);
         var i = this.table.length - 2, a = this.table[i], o = a.states.filter(function(C) {
           var P = C.rule.symbols[C.dot];
           return P && typeof P != "string";
         });
         if (o.length === 0)
-          O.push("Unexpected " + r + `. I did not expect any more input. Here is the state of my parse table:
+          O.push("Unexpected " + S + `. I did not expect any more input. Here is the state of my parse table:
 `), this.displayStateStack(a.states, O);
         else {
-          O.push("Unexpected " + r + `. Instead, I was expecting to see one of the following:
+          O.push("Unexpected " + S + `. Instead, I was expecting to see one of the following:
 `);
           var D = o.map(function(C) {
             return this.buildFirstStateStack(C, []) || [C];
@@ -21880,68 +21880,68 @@ function Hn() {
         }
         return O.push(""), O.join(`
 `);
-      }, s.prototype.displayStateStack = function(S, r) {
-        for (var O, i = 0, a = 0; a < S.length; a++) {
-          var o = S[a], D = o.rule.toString(o.dot);
-          D === O ? i++ : (i > 0 && r.push("    ^ " + i + " more lines identical to this"), i = 0, r.push("    " + D)), O = D;
+      }, s.prototype.displayStateStack = function(r, S) {
+        for (var O, i = 0, a = 0; a < r.length; a++) {
+          var o = r[a], D = o.rule.toString(o.dot);
+          D === O ? i++ : (i > 0 && S.push("    ^ " + i + " more lines identical to this"), i = 0, S.push("    " + D)), O = D;
         }
-      }, s.prototype.getSymbolDisplay = function(S) {
-        return n(S);
-      }, s.prototype.buildFirstStateStack = function(S, r) {
-        if (r.indexOf(S) !== -1)
+      }, s.prototype.getSymbolDisplay = function(r) {
+        return n(r);
+      }, s.prototype.buildFirstStateStack = function(r, S) {
+        if (S.indexOf(r) !== -1)
           return null;
-        if (S.wantedBy.length === 0)
-          return [S];
-        var O = S.wantedBy[0], i = [S].concat(r), a = this.buildFirstStateStack(O, i);
-        return a === null ? null : [S].concat(a);
+        if (r.wantedBy.length === 0)
+          return [r];
+        var O = r.wantedBy[0], i = [r].concat(S), a = this.buildFirstStateStack(O, i);
+        return a === null ? null : [r].concat(a);
       }, s.prototype.save = function() {
-        var S = this.table[this.current];
-        return S.lexerState = this.lexerState, S;
-      }, s.prototype.restore = function(S) {
-        var r = S.index;
-        this.current = r, this.table[r] = S, this.table.splice(r + 1), this.lexerState = S.lexerState, this.results = this.finish();
-      }, s.prototype.rewind = function(S) {
+        var r = this.table[this.current];
+        return r.lexerState = this.lexerState, r;
+      }, s.prototype.restore = function(r) {
+        var S = r.index;
+        this.current = S, this.table[S] = r, this.table.splice(S + 1), this.lexerState = r.lexerState, this.results = this.finish();
+      }, s.prototype.rewind = function(r) {
         if (!this.options.keepHistory)
           throw new Error("set option `keepHistory` to enable rewinding");
-        this.restore(this.table[S]);
+        this.restore(this.table[r]);
       }, s.prototype.finish = function() {
-        var S = [], r = this.grammar.start, O = this.table[this.table.length - 1];
+        var r = [], S = this.grammar.start, O = this.table[this.table.length - 1];
         return O.states.forEach(function(i) {
-          i.rule.name === r && i.dot === i.rule.symbols.length && i.reference === 0 && i.data !== s.fail && S.push(i);
-        }), S.map(function(i) {
+          i.rule.name === S && i.dot === i.rule.symbols.length && i.reference === 0 && i.data !== s.fail && r.push(i);
+        }), r.map(function(i) {
           return i.data;
         });
       };
-      function n(S) {
-        var r = typeof S;
-        if (r === "string")
-          return S;
-        if (r === "object") {
-          if (S.literal)
-            return JSON.stringify(S.literal);
-          if (S instanceof RegExp)
-            return "character matching " + S;
-          if (S.type)
-            return S.type + " token";
-          if (S.test)
-            return "token matching " + String(S.test);
-          throw new Error("Unknown symbol type: " + S);
+      function n(r) {
+        var S = typeof r;
+        if (S === "string")
+          return r;
+        if (S === "object") {
+          if (r.literal)
+            return JSON.stringify(r.literal);
+          if (r instanceof RegExp)
+            return "character matching " + r;
+          if (r.type)
+            return r.type + " token";
+          if (r.test)
+            return "token matching " + String(r.test);
+          throw new Error("Unknown symbol type: " + r);
         }
       }
-      function I(S) {
-        var r = typeof S;
-        if (r === "string")
-          return S;
-        if (r === "object") {
-          if (S.literal)
-            return JSON.stringify(S.literal);
-          if (S instanceof RegExp)
-            return S.toString();
-          if (S.type)
-            return "%" + S.type;
-          if (S.test)
-            return "<" + String(S.test) + ">";
-          throw new Error("Unknown symbol type: " + S);
+      function I(r) {
+        var S = typeof r;
+        if (S === "string")
+          return r;
+        if (S === "object") {
+          if (r.literal)
+            return JSON.stringify(r.literal);
+          if (r instanceof RegExp)
+            return r.toString();
+          if (r.type)
+            return "%" + r.type;
+          if (r.test)
+            return "<" + String(r.test) + ">";
+          throw new Error("Unknown symbol type: " + r);
         }
       }
       return {
@@ -22444,13 +22444,13 @@ const m = new fT((T) => []), Q = ([[T]]) => T, b = (T) => ({
     }
   ],
   ParserStart: "main"
-}, { Parser: xn, Grammar: Jn } = Yn;
+}, { Parser: Jn, Grammar: xn } = Yn;
 function Qn(T) {
   let E = {};
   const e = new fT((R) => [
     ...bn(T.tokenize(R, E)),
     lT(R.length)
-  ]), t = new xn(Jn.fromCompiled(vn), { lexer: e });
+  ]), t = new Jn(xn.fromCompiled(vn), { lexer: e });
   return {
     parse: (R, A) => {
       E = A;
@@ -23112,31 +23112,31 @@ async function aS(T, E, e) {
   if (!t.isValid)
     throw new Error(`Query validation failed: ${t.errors.join(", ")}`);
   const R = /* @__PURE__ */ new Set();
-  T.measures?.forEach((S) => {
-    const r = S.split(".")[0];
-    R.add(r);
-  }), T.dimensions?.forEach((S) => {
-    const r = S.split(".")[0];
-    R.add(r);
-  }), T.timeDimensions?.forEach((S) => {
-    const r = S.dimension.split(".")[0];
-    R.add(r);
-  }), T.filters?.forEach((S) => {
-    FT(S, R);
+  T.measures?.forEach((r) => {
+    const S = r.split(".")[0];
+    R.add(S);
+  }), T.dimensions?.forEach((r) => {
+    const S = r.split(".")[0];
+    R.add(S);
+  }), T.timeDimensions?.forEach((r) => {
+    const S = r.dimension.split(".")[0];
+    R.add(S);
+  }), T.filters?.forEach((r) => {
+    FT(r, R);
   });
   const A = R.size > 1;
   let s;
   if (A)
     s = await e.generateMultiCubeSQL(T, E);
   else {
-    const S = Array.from(R)[0];
-    s = await e.generateSQL(S, T, E);
+    const r = Array.from(R)[0];
+    s = await e.generateSQL(r, T, E);
   }
-  const n = Array.from(R).map((S) => ({
-    cube: S,
+  const n = Array.from(R).map((r) => ({
+    cube: r,
     query: {
-      measures: T.measures?.filter((r) => r.startsWith(S + ".")) || [],
-      dimensions: T.dimensions?.filter((r) => r.startsWith(S + ".")) || [],
+      measures: T.measures?.filter((S) => S.startsWith(r + ".")) || [],
+      dimensions: T.dimensions?.filter((S) => S.startsWith(r + ".")) || [],
       filters: T.filters || [],
       timeDimensions: T.timeDimensions || [],
       order: T.order || {},
@@ -23147,8 +23147,8 @@ async function aS(T, E, e) {
   let I;
   try {
     I = e.analyzeQuery(T, E);
-  } catch (S) {
-    console.warn("Query analysis failed:", S);
+  } catch (r) {
+    console.warn("Query analysis failed:", r);
   }
   return {
     queryType: "regularQuery",
@@ -23347,7 +23347,7 @@ class DS {
    * Validates calculated measures during registration
    */
   registerCube(E) {
-    this.validateCalculatedMeasures(E), new Z(this.cubes).populateDependencies(E), this.cubes.set(E.name, E), this.invalidateMetadataCache();
+    E.meta && console.log(`[DEBUG] registerCube: ${E.name} has meta:`, JSON.stringify(E.meta)), this.validateCalculatedMeasures(E), new Z(this.cubes).populateDependencies(E), this.cubes.set(E.name, E), this.invalidateMetadataCache();
   }
   /**
    * Validate calculated measures in a cube
@@ -23466,24 +23466,24 @@ ${e.join(`
    */
   generateCubeMetadata(E) {
     const e = Object.keys(E.measures), t = Object.keys(E.dimensions), R = new Array(e.length), A = new Array(t.length);
-    for (let n = 0; n < e.length; n++) {
-      const I = e[n], S = E.measures[I];
-      R[n] = {
-        name: `${E.name}.${I}`,
-        title: S.title || I,
-        shortTitle: S.title || I,
+    for (let I = 0; I < e.length; I++) {
+      const r = e[I], S = E.measures[r];
+      R[I] = {
+        name: `${E.name}.${r}`,
+        title: S.title || r,
+        shortTitle: S.title || r,
         type: S.type,
         format: void 0,
         // Measure doesn't have format field
         description: S.description
       };
     }
-    for (let n = 0; n < t.length; n++) {
-      const I = t[n], S = E.dimensions[I];
-      A[n] = {
-        name: `${E.name}.${I}`,
-        title: S.title || I,
-        shortTitle: S.title || I,
+    for (let I = 0; I < t.length; I++) {
+      const r = t[I], S = E.dimensions[r];
+      A[I] = {
+        name: `${E.name}.${r}`,
+        title: S.title || r,
+        shortTitle: S.title || r,
         type: S.type,
         format: void 0,
         // Dimension doesn't have format field
@@ -23492,18 +23492,18 @@ ${e.join(`
     }
     const s = [];
     if (E.joins)
-      for (const [, n] of Object.entries(E.joins)) {
-        const I = typeof n.targetCube == "function" ? n.targetCube() : n.targetCube;
+      for (const [, I] of Object.entries(E.joins)) {
+        const r = typeof I.targetCube == "function" ? I.targetCube() : I.targetCube;
         s.push({
-          targetCube: I.name,
-          relationship: n.relationship,
-          joinFields: n.on.map((S) => ({
+          targetCube: r.name,
+          relationship: I.relationship,
+          joinFields: I.on.map((S) => ({
             sourceField: this.getColumnName(S.source),
             targetField: this.getColumnName(S.target)
           }))
         });
       }
-    return {
+    const n = {
       name: E.name,
       title: E.title || E.name,
       description: E.description,
@@ -23514,6 +23514,7 @@ ${e.join(`
       relationships: s.length > 0 ? s : void 0,
       meta: E.meta
     };
+    return E.meta && console.log(`[DEBUG] Cube ${E.name} has meta:`, JSON.stringify(E.meta)), n;
   }
   /**
    * Get SQL for a query without executing it (debugging)