drizzle-cube 0.3.27 → 0.3.28

package/dist/server/index.js

@@ -282,11 +282,11 @@ class $E extends Ue {
    */
   buildWindowFunction(e, t, E, s, i) {
     const r = E && E.length > 0 ? o`PARTITION BY ${o.join(E, o`, `)}` : o``, T = s && s.length > 0 ? o`ORDER BY ${o.join(s.map(
-      (N) => N.direction === "desc" ? o`${N.field} DESC` : o`${N.field} ASC`
+      (I) => I.direction === "desc" ? o`${I.field} DESC` : o`${I.field} ASC`
     ), o`, `)}` : o``;
     let A = o``;
     if (i?.frame) {
-      const { type: N, start: I, end: O } = i.frame, C = N.toUpperCase(), u = I === "unbounded" ? "UNBOUNDED PRECEDING" : typeof I == "number" ? `${I} PRECEDING` : "CURRENT ROW", l = O === "unbounded" ? "UNBOUNDED FOLLOWING" : O === "current" ? "CURRENT ROW" : typeof O == "number" ? `${O} FOLLOWING` : "CURRENT ROW";
+      const { type: I, start: N, end: O } = i.frame, C = I.toUpperCase(), u = N === "unbounded" ? "UNBOUNDED PRECEDING" : typeof N == "number" ? `${N} PRECEDING` : "CURRENT ROW", l = O === "unbounded" ? "UNBOUNDED FOLLOWING" : O === "current" ? "CURRENT ROW" : typeof O == "number" ? `${O} FOLLOWING` : "CURRENT ROW";
       A = o`${o.raw(C)} BETWEEN ${o.raw(u)} AND ${o.raw(l)}`;
     }
     const a = [];
@@ -318,7 +318,7 @@ class $E extends Ue {
     }
   }
 }
-class NE extends Ue {
+class IE extends Ue {
   getEngineType() {
     return "mysql";
   }
@@ -560,11 +560,11 @@ class NE extends Ue {
    */
   buildWindowFunction(e, t, E, s, i) {
     const r = E && E.length > 0 ? o`PARTITION BY ${o.join(E, o`, `)}` : o``, T = s && s.length > 0 ? o`ORDER BY ${o.join(s.map(
-      (N) => N.direction === "desc" ? o`${N.field} DESC` : o`${N.field} ASC`
+      (I) => I.direction === "desc" ? o`${I.field} DESC` : o`${I.field} ASC`
     ), o`, `)}` : o``;
     let A = o``;
     if (i?.frame) {
-      const { type: N, start: I, end: O } = i.frame, C = N.toUpperCase(), u = I === "unbounded" ? "UNBOUNDED PRECEDING" : typeof I == "number" ? `${I} PRECEDING` : "CURRENT ROW", l = O === "unbounded" ? "UNBOUNDED FOLLOWING" : O === "current" ? "CURRENT ROW" : typeof O == "number" ? `${O} FOLLOWING` : "CURRENT ROW";
+      const { type: I, start: N, end: O } = i.frame, C = I.toUpperCase(), u = N === "unbounded" ? "UNBOUNDED PRECEDING" : typeof N == "number" ? `${N} PRECEDING` : "CURRENT ROW", l = O === "unbounded" ? "UNBOUNDED FOLLOWING" : O === "current" ? "CURRENT ROW" : typeof O == "number" ? `${O} FOLLOWING` : "CURRENT ROW";
       A = o`${o.raw(C)} BETWEEN ${o.raw(u)} AND ${o.raw(l)}`;
     }
     const a = [];
@@ -877,11 +877,11 @@ class wE extends Ue {
    */
   buildWindowFunction(e, t, E, s, i) {
     const r = E && E.length > 0 ? o`PARTITION BY ${o.join(E, o`, `)}` : o``, T = s && s.length > 0 ? o`ORDER BY ${o.join(s.map(
-      (N) => N.direction === "desc" ? o`${N.field} DESC` : o`${N.field} ASC`
+      (I) => I.direction === "desc" ? o`${I.field} DESC` : o`${I.field} ASC`
     ), o`, `)}` : o``;
     let A = o``;
     if (i?.frame) {
-      const { type: N, start: I, end: O } = i.frame, C = N.toUpperCase(), u = I === "unbounded" ? "UNBOUNDED PRECEDING" : typeof I == "number" ? `${I} PRECEDING` : "CURRENT ROW", l = O === "unbounded" ? "UNBOUNDED FOLLOWING" : O === "current" ? "CURRENT ROW" : typeof O == "number" ? `${O} FOLLOWING` : "CURRENT ROW";
+      const { type: I, start: N, end: O } = i.frame, C = I.toUpperCase(), u = N === "unbounded" ? "UNBOUNDED PRECEDING" : typeof N == "number" ? `${N} PRECEDING` : "CURRENT ROW", l = O === "unbounded" ? "UNBOUNDED FOLLOWING" : O === "current" ? "CURRENT ROW" : typeof O == "number" ? `${O} FOLLOWING` : "CURRENT ROW";
       A = o`${o.raw(C)} BETWEEN ${o.raw(u)} AND ${o.raw(l)}`;
     }
     const a = [];
@@ -913,7 +913,7 @@ class wE extends Ue {
     }
   }
 }
-class WE extends NE {
+class WE extends IE {
   getEngineType() {
     return "singlestore";
   }
@@ -1155,11 +1155,11 @@ class vE extends Ue {
    */
   buildWindowFunction(e, t, E, s, i) {
     const r = E && E.length > 0 ? o`PARTITION BY ${o.join(E, o`, `)}` : o``, T = s && s.length > 0 ? o`ORDER BY ${o.join(s.map(
-      (N) => N.direction === "desc" ? o`${N.field} DESC` : o`${N.field} ASC`
+      (I) => I.direction === "desc" ? o`${I.field} DESC` : o`${I.field} ASC`
     ), o`, `)}` : o``;
     let A = o``;
     if (i?.frame) {
-      const { type: N, start: I, end: O } = i.frame, C = N.toUpperCase(), u = I === "unbounded" ? "UNBOUNDED PRECEDING" : typeof I == "number" ? `${I} PRECEDING` : "CURRENT ROW", l = O === "unbounded" ? "UNBOUNDED FOLLOWING" : O === "current" ? "CURRENT ROW" : typeof O == "number" ? `${O} FOLLOWING` : "CURRENT ROW";
+      const { type: I, start: N, end: O } = i.frame, C = I.toUpperCase(), u = N === "unbounded" ? "UNBOUNDED PRECEDING" : typeof N == "number" ? `${N} PRECEDING` : "CURRENT ROW", l = O === "unbounded" ? "UNBOUNDED FOLLOWING" : O === "current" ? "CURRENT ROW" : typeof O == "number" ? `${O} FOLLOWING` : "CURRENT ROW";
       A = o`${o.raw(C)} BETWEEN ${o.raw(u)} AND ${o.raw(l)}`;
     }
     const a = [];
@@ -1196,7 +1196,7 @@ function XE(n) {
     case "postgres":
       return new $E();
     case "mysql":
-      return new NE();
+      return new IE();
     case "sqlite":
       return new wE();
     case "singlestore":
@@ -1225,24 +1225,24 @@ function KE(n, e) {
       i = parseFloat(S[1]);
       continue;
     }
-    const N = R.match(/Execution Time:\s*([\d.]+)\s*ms/i);
-    if (N) {
-      r = parseFloat(N[1]);
+    const I = R.match(/Execution Time:\s*([\d.]+)\s*ms/i);
+    if (I) {
+      r = parseFloat(I[1]);
       continue;
     }
-    const I = xE(R);
-    if (I) {
-      I.type.includes("Seq Scan") && (s = !0), I.index && E.push(I.index), t.length === 0 && I.estimatedCost !== void 0 && (T = I.estimatedCost);
+    const N = xE(R);
+    if (N) {
+      N.type.includes("Seq Scan") && (s = !0), N.index && E.push(N.index), t.length === 0 && N.estimatedCost !== void 0 && (T = N.estimatedCost);
       const O = R.search(/\S/);
       for (; A.length > 0 && A[A.length - 1].indent >= O; )
         A.pop();
       if (A.length === 0)
-        t.push(I);
+        t.push(N);
       else {
         const C = A[A.length - 1].op;
-        C.children || (C.children = []), C.children.push(I);
+        C.children || (C.children = []), C.children.push(N);
       }
-      A.push({ indent: O, op: I });
+      A.push({ indent: O, op: N });
     }
   }
   const a = {
@@ -1461,7 +1461,7 @@ function kE(n, e) {
     sql: e
   };
 }
-class IE extends fe {
+class NE extends fe {
   async execute(e, t) {
     if (e && typeof e == "object" && typeof e.execute == "function") {
       const s = await e.execute();
@@ -1566,7 +1566,7 @@ class IE extends fe {
   }
 }
 function qE(n, e) {
-  return new IE(n, e, "mysql");
+  return new NE(n, e, "mysql");
 }
 function jE(n) {
   const e = n.toLowerCase(), t = n.match(/^SCAN\s+(\S+)/i);
@@ -1736,8 +1736,8 @@ class zE extends fe {
             ), R = [];
             if (Array.isArray(a))
               for (const S of a) {
-                const N = S.name;
-                typeof N == "string" && R.push(N);
+                const I = S.name;
+                typeof I == "string" && R.push(I);
               }
             t.push({
               table_name: E.toLowerCase(),
@@ -1757,7 +1757,7 @@ class zE extends fe {
 function dt(n, e) {
   return new zE(n, e, "sqlite");
 }
-class es extends IE {
+class es extends NE {
   getEngineType() {
     return "singlestore";
   }
@@ -2175,7 +2175,7 @@ function os(n) {
     measures: n.measures ? [...n.measures].sort() : void 0,
     dimensions: n.dimensions ? [...n.dimensions].sort() : void 0,
     filters: n.filters ? K(n.filters) : void 0,
-    timeDimensions: n.timeDimensions ? Ns(n.timeDimensions) : void 0,
+    timeDimensions: n.timeDimensions ? Is(n.timeDimensions) : void 0,
     limit: n.limit,
     offset: n.offset,
     order: n.order ? me(n.order) : void 0,
@@ -2254,7 +2254,7 @@ function K(n) {
     };
   }).sort((e, t) => JSON.stringify(e).localeCompare(JSON.stringify(t)));
 }
-function Ns(n) {
+function Is(n) {
   return [...n].map((e) => ({
     dimension: e.dimension,
     granularity: e.granularity,
@@ -2280,7 +2280,7 @@ function Pt(n) {
 function Qa(n, e) {
   return `${e ?? "drizzle-cube:"}*${n}*`;
 }
-class Ie {
+class Ne {
   constructor(e) {
     this.databaseAdapter = e;
   }
@@ -2339,80 +2339,80 @@ class Ie {
   parseRelativeDateRange(e) {
     const t = /* @__PURE__ */ new Date(), E = e.toLowerCase().trim(), s = t.getUTCFullYear(), i = t.getUTCMonth(), r = t.getUTCDate(), T = t.getUTCDay();
     if (E === "today") {
-      const N = new Date(t);
-      N.setUTCHours(0, 0, 0, 0);
       const I = new Date(t);
-      return I.setUTCHours(23, 59, 59, 999), { start: N, end: I };
+      I.setUTCHours(0, 0, 0, 0);
+      const N = new Date(t);
+      return N.setUTCHours(23, 59, 59, 999), { start: I, end: N };
     }
     if (E === "yesterday") {
-      const N = new Date(t);
-      N.setUTCDate(r - 1), N.setUTCHours(0, 0, 0, 0);
       const I = new Date(t);
-      return I.setUTCDate(r - 1), I.setUTCHours(23, 59, 59, 999), { start: N, end: I };
+      I.setUTCDate(r - 1), I.setUTCHours(0, 0, 0, 0);
+      const N = new Date(t);
+      return N.setUTCDate(r - 1), N.setUTCHours(23, 59, 59, 999), { start: I, end: N };
     }
     if (E === "this week") {
-      const N = T === 0 ? -6 : 1 - T, I = new Date(t);
-      I.setUTCDate(r + N), I.setUTCHours(0, 0, 0, 0);
-      const O = new Date(I);
-      return O.setUTCDate(I.getUTCDate() + 6), O.setUTCHours(23, 59, 59, 999), { start: I, end: O };
+      const I = T === 0 ? -6 : 1 - T, N = new Date(t);
+      N.setUTCDate(r + I), N.setUTCHours(0, 0, 0, 0);
+      const O = new Date(N);
+      return O.setUTCDate(N.getUTCDate() + 6), O.setUTCHours(23, 59, 59, 999), { start: N, end: O };
     }
     if (E === "this month") {
-      const N = new Date(Date.UTC(s, i, 1, 0, 0, 0, 0)), I = new Date(Date.UTC(s, i + 1, 0, 23, 59, 59, 999));
-      return { start: N, end: I };
+      const I = new Date(Date.UTC(s, i, 1, 0, 0, 0, 0)), N = new Date(Date.UTC(s, i + 1, 0, 23, 59, 59, 999));
+      return { start: I, end: N };
     }
     if (E === "this quarter") {
-      const N = Math.floor(i / 3), I = new Date(Date.UTC(s, N * 3, 1, 0, 0, 0, 0)), O = new Date(Date.UTC(s, N * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: I, end: O };
+      const I = Math.floor(i / 3), N = new Date(Date.UTC(s, I * 3, 1, 0, 0, 0, 0)), O = new Date(Date.UTC(s, I * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: N, end: O };
     }
     if (E === "this year") {
-      const N = new Date(Date.UTC(s, 0, 1, 0, 0, 0, 0)), I = new Date(Date.UTC(s, 11, 31, 23, 59, 59, 999));
-      return { start: N, end: I };
+      const I = new Date(Date.UTC(s, 0, 1, 0, 0, 0, 0)), N = new Date(Date.UTC(s, 11, 31, 23, 59, 59, 999));
+      return { start: I, end: N };
     }
     const A = E.match(/^last\s+(\d+)\s+days?$/);
     if (A) {
-      const N = parseInt(A[1], 10), I = new Date(t);
-      I.setUTCDate(r - N + 1), I.setUTCHours(0, 0, 0, 0);
+      const I = parseInt(A[1], 10), N = new Date(t);
+      N.setUTCDate(r - I + 1), N.setUTCHours(0, 0, 0, 0);
       const O = new Date(t);
-      return O.setUTCHours(23, 59, 59, 999), { start: I, end: O };
+      return O.setUTCHours(23, 59, 59, 999), { start: N, end: O };
     }
     const a = E.match(/^last\s+(\d+)\s+weeks?$/);
     if (a) {
-      const I = parseInt(a[1], 10) * 7, O = new Date(t);
-      O.setUTCDate(r - I + 1), O.setUTCHours(0, 0, 0, 0);
+      const N = parseInt(a[1], 10) * 7, O = new Date(t);
+      O.setUTCDate(r - N + 1), O.setUTCHours(0, 0, 0, 0);
       const C = new Date(t);
       return C.setUTCHours(23, 59, 59, 999), { start: O, end: C };
     }
     if (E === "last week") {
-      const N = T === 0 ? -13 : -6 - T, I = new Date(t);
-      I.setUTCDate(r + N), I.setUTCHours(0, 0, 0, 0);
-      const O = new Date(I);
-      return O.setUTCDate(I.getUTCDate() + 6), O.setUTCHours(23, 59, 59, 999), { start: I, end: O };
+      const I = T === 0 ? -13 : -6 - T, N = new Date(t);
+      N.setUTCDate(r + I), N.setUTCHours(0, 0, 0, 0);
+      const O = new Date(N);
+      return O.setUTCDate(N.getUTCDate() + 6), O.setUTCHours(23, 59, 59, 999), { start: N, end: O };
     }
     if (E === "last month") {
-      const N = new Date(Date.UTC(s, i - 1, 1, 0, 0, 0, 0)), I = new Date(Date.UTC(s, i, 0, 23, 59, 59, 999));
-      return { start: N, end: I };
+      const I = new Date(Date.UTC(s, i - 1, 1, 0, 0, 0, 0)), N = new Date(Date.UTC(s, i, 0, 23, 59, 59, 999));
+      return { start: I, end: N };
     }
     if (E === "last quarter") {
-      const N = Math.floor(i / 3), I = N === 0 ? 3 : N - 1, O = N === 0 ? s - 1 : s, C = new Date(Date.UTC(O, I * 3, 1, 0, 0, 0, 0)), u = new Date(Date.UTC(O, I * 3 + 3, 0, 23, 59, 59, 999));
+      const I = Math.floor(i / 3), N = I === 0 ? 3 : I - 1, O = I === 0 ? s - 1 : s, C = new Date(Date.UTC(O, N * 3, 1, 0, 0, 0, 0)), u = new Date(Date.UTC(O, N * 3 + 3, 0, 23, 59, 59, 999));
       return { start: C, end: u };
     }
     if (E === "last year") {
-      const N = new Date(Date.UTC(s - 1, 0, 1, 0, 0, 0, 0)), I = new Date(Date.UTC(s - 1, 11, 31, 23, 59, 59, 999));
-      return { start: N, end: I };
+      const I = new Date(Date.UTC(s - 1, 0, 1, 0, 0, 0, 0)), N = new Date(Date.UTC(s - 1, 11, 31, 23, 59, 59, 999));
+      return { start: I, end: N };
     }
     if (E === "last 12 months") {
-      const N = new Date(Date.UTC(s, i - 11, 1, 0, 0, 0, 0)), I = new Date(t);
-      return I.setUTCHours(23, 59, 59, 999), { start: N, end: I };
+      const I = new Date(Date.UTC(s, i - 11, 1, 0, 0, 0, 0)), N = new Date(t);
+      return N.setUTCHours(23, 59, 59, 999), { start: I, end: N };
     }
     const R = E.match(/^last\s+(\d+)\s+months?$/);
     if (R) {
-      const N = parseInt(R[1], 10), I = new Date(Date.UTC(s, i - N + 1, 1, 0, 0, 0, 0)), O = new Date(t);
-      return O.setUTCHours(23, 59, 59, 999), { start: I, end: O };
+      const I = parseInt(R[1], 10), N = new Date(Date.UTC(s, i - I + 1, 1, 0, 0, 0, 0)), O = new Date(t);
+      return O.setUTCHours(23, 59, 59, 999), { start: N, end: O };
     }
     const S = E.match(/^last\s+(\d+)\s+years?$/);
     if (S) {
-      const N = parseInt(S[1], 10), I = new Date(Date.UTC(s - N, 0, 1, 0, 0, 0, 0)), O = new Date(t);
-      return O.setUTCHours(23, 59, 59, 999), { start: I, end: O };
+      const I = parseInt(S[1], 10), N = new Date(Date.UTC(s - I, 0, 1, 0, 0, 0, 0)), O = new Date(t);
+      return O.setUTCHours(23, 59, 59, 999), { start: N, end: O };
     }
     return null;
   }
@@ -2508,8 +2508,8 @@ class he {
           if (A && a) {
             const R = E[1];
             if (typeof R == "string" && /^\d{4}-\d{2}-\d{2}$/.test(R.trim())) {
-              const S = typeof a == "number" ? new Date(a * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(a), N = new Date(S);
-              N.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? a = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(N.getTime() / 1e3) : N.getTime() : a = N.toISOString();
+              const S = typeof a == "number" ? new Date(a * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(a), I = new Date(S);
+              I.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? a = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(I.getTime() / 1e3) : I.getTime() : a = I.toISOString();
             }
             return y(
               ae(e, A),
@@ -2828,30 +2828,30 @@ class se {
     return e.type === "calculated" && !!e.calculatedSql;
   }
 }
-function Is(n, e) {
+function Ns(n, e) {
   const { cube: t, allCubes: E, resolvedMeasures: s } = e, i = St(n), r = /* @__PURE__ */ new Map();
   for (const S of i) {
-    const { originalRef: N, cubeName: I, fieldName: O } = S, C = I || t.name;
+    const { originalRef: I, cubeName: N, fieldName: O } = S, C = N || t.name;
     if (!E.get(C))
       throw new Error(
-        `Cannot substitute {${N}}: cube '${C}' not found`
+        `Cannot substitute {${I}}: cube '${C}' not found`
       );
     const l = `${C}.${O}`, _ = s.get(l);
     if (!_)
       throw new Error(
-        `Cannot substitute {${N}}: measure '${l}' not resolved yet. Ensure measures are resolved in dependency order.`
+        `Cannot substitute {${I}}: measure '${l}' not resolved yet. Ensure measures are resolved in dependency order.`
       );
     const U = _(), D = o`${U}`;
-    r.set(N, D);
+    r.set(I, D);
   }
   const T = [], A = [];
   let a = 0;
   for (const S of i) {
-    const N = `{${S.originalRef}}`, I = n.indexOf(N, a);
-    if (I >= 0) {
-      T.push(n.substring(a, I));
+    const I = `{${S.originalRef}}`, N = n.indexOf(I, a);
+    if (N >= 0) {
+      T.push(n.substring(a, N));
       const O = r.get(S.originalRef);
-      O && A.push(O), a = I + N.length;
+      O && A.push(O), a = N + I.length;
     }
   }
   if (T.push(n.substring(a)), A.length === 0)
@@ -2934,9 +2934,9 @@ class H {
     for (const R of t.values())
       a.buildGraph(R);
     for (const R of e) {
-      const [S, N] = R.split("."), I = t.get(S);
-      if (I && I.measures && I.measures[N]) {
-        const O = I.measures[N];
+      const [S, I] = R.split("."), N = t.get(S);
+      if (N && N.measures && N.measures[I]) {
+        const O = N.measures[I];
         if (H.isPostAggregationWindow(O)) {
           const C = H.getWindowBaseMeasure(O, S);
           C && A.add(C);
@@ -2952,26 +2952,26 @@ class H {
       }
     }
     for (const R of A) {
-      const [S, N] = R.split("."), I = t.get(S);
-      if (I && I.measures && I.measures[N]) {
-        const O = I.measures[N];
+      const [S, I] = R.split("."), N = t.get(S);
+      if (N && N.measures && N.measures[I]) {
+        const O = N.measures[I];
         if (H.isPostAggregationWindow(O))
           continue;
         se.isCalculatedMeasure(O) ? T.includes(R) || T.push(R) : r.includes(R) || r.push(R);
       }
     }
     for (const R of r) {
-      const [S, N] = R.split("."), I = t.get(S), O = I.measures[N];
+      const [S, I] = R.split("."), N = t.get(S), O = N.measures[I];
       if (s) {
-        const C = s(R, O, I);
+        const C = s(R, O, N);
         i.set(R, () => C);
       } else
-        i.set(R, () => this.buildMeasureExpression(O, E, I));
+        i.set(R, () => this.buildMeasureExpression(O, E, N));
     }
     if (T.length > 0) {
       const R = a.topologicalSort(T);
       for (const S of R) {
-        const [N, I] = S.split("."), O = t.get(N), C = O.measures[I];
+        const [I, N] = S.split("."), O = t.get(I), C = O.measures[N];
         i.set(S, () => this.buildCalculatedMeasure(
           C,
           O,
@@ -2993,7 +2993,7 @@ class H {
         `Calculated measure '${t.name}.${e.name}' missing calculatedSql property`
       );
     const r = this.databaseAdapter.preprocessCalculatedTemplate(e.calculatedSql);
-    return Is(r, {
+    return Ns(r, {
       cube: t,
       allCubes: E,
       resolvedMeasures: s
@@ -3022,30 +3022,30 @@ class H {
     for (const A of T) {
       const [a, R] = A.split("."), S = s.get(a);
       if (S && S.measures[R]) {
-        const N = S.measures[R];
+        const I = S.measures[R];
         if (E.measures.includes(A)) {
-          const I = o`${o.identifier(E.cteAlias)}.${o.identifier(R)}`;
+          const N = o`${o.identifier(E.cteAlias)}.${o.identifier(R)}`;
           let O;
-          switch (N.type) {
+          switch (I.type) {
             case "count":
             case "countDistinct":
             case "sum":
-              O = J(I);
+              O = J(N);
               break;
             case "avg":
-              O = this.databaseAdapter.buildAvg(I);
+              O = this.databaseAdapter.buildAvg(N);
               break;
             case "min":
-              O = le(I);
+              O = le(N);
               break;
             case "max":
-              O = Z(I);
+              O = Z(N);
               break;
             case "number":
-              O = J(I);
+              O = J(N);
               break;
             default:
-              O = J(I);
+              O = J(N);
           }
           r.set(A, () => O);
         }
@@ -3199,23 +3199,23 @@ class H {
         let r;
         if (i.partitionBy && i.partitionBy.length > 0 && E) {
           const a = i.partitionBy.map((R) => {
-            const S = R.includes(".") ? R.split(".")[1] : R, N = E.dimensions?.[S];
-            return N ? b(N.sql, t) : (console.warn(`[drizzle-cube] Window function partition dimension '${R}' not found in cube '${E.name}'`), null);
+            const S = R.includes(".") ? R.split(".")[1] : R, I = E.dimensions?.[S];
+            return I ? b(I.sql, t) : (console.warn(`[drizzle-cube] Window function partition dimension '${R}' not found in cube '${E.name}'`), null);
           }).filter((R) => R !== null);
           a.length > 0 && (r = a);
         }
         let T;
         if (i.orderBy && i.orderBy.length > 0 && E) {
           const a = i.orderBy.map((R) => {
-            const S = R.field.includes(".") ? R.field.split(".")[1] : R.field, N = E.dimensions?.[S];
-            if (N)
+            const S = R.field.includes(".") ? R.field.split(".")[1] : R.field, I = E.dimensions?.[S];
+            if (I)
               return {
-                field: b(N.sql, t),
+                field: b(I.sql, t),
                 direction: R.direction
               };
-            const I = E.measures?.[S];
-            return I && I.sql ? {
-              field: b(I.sql, t),
+            const N = E.measures?.[S];
+            return N && N.sql ? {
+              field: b(N.sql, t),
               direction: R.direction
             } : (console.warn(`[drizzle-cube] Window function order field '${R.field}' not found in cube '${E.name}'`), null);
           }).filter((R) => R !== null);
@@ -3440,15 +3440,15 @@ class Cs {
     const i = [], r = e instanceof Map ? e : /* @__PURE__ */ new Map([[e.name, e]]), T = t.dimensions && t.dimensions.length > 0 || t.timeDimensions && t.timeDimensions.length > 0, A = t.measures && t.measures.length > 0, a = T && !A;
     let R = !1;
     for (const S of t.measures || []) {
-      const [N, I] = S.split("."), O = r.get(N);
-      if (O && O.measures && O.measures[I]) {
-        const C = O.measures[I];
+      const [I, N] = S.split("."), O = r.get(I);
+      if (O && O.measures && O.measures[N]) {
+        const C = O.measures[N];
         if (this.isAggregateFunctionType(C.type) || C.type === "calculated") {
           R = !0;
           break;
         }
         if (H.isPostAggregationWindow(C)) {
-          const u = H.getWindowBaseMeasure(C, N);
+          const u = H.getWindowBaseMeasure(C, I);
           if (u) {
             const [l, _] = u.split("."), D = r.get(l)?.measures?.[_];
             if (D && this.isAggregateFunctionType(D.type)) {
@@ -3463,27 +3463,27 @@ class Cs {
       return [];
     if (t.dimensions)
       for (const S of t.dimensions) {
-        const [N, I] = S.split("."), O = r.get(N);
-        if (O && O.dimensions && O.dimensions[I])
-          if (s?.preAggregationCTEs?.some((u) => u.cube.name === N)) {
-            const u = s.preAggregationCTEs.find((_) => _.cube.name === N), l = u.joinKeys.find((_) => _.targetColumn === I);
+        const [I, N] = S.split("."), O = r.get(I);
+        if (O && O.dimensions && O.dimensions[N])
+          if (s?.preAggregationCTEs?.some((u) => u.cube.name === I)) {
+            const u = s.preAggregationCTEs.find((_) => _.cube.name === I), l = u.joinKeys.find((_) => _.targetColumn === N);
             if (l && l.sourceColumnObj)
               i.push(l.sourceColumnObj);
             else {
-              const _ = o`${o.identifier(u.cteAlias)}.${o.identifier(I)}`;
+              const _ = o`${o.identifier(u.cteAlias)}.${o.identifier(N)}`;
               i.push(_);
             }
           } else {
-            const u = O.dimensions[I], l = b(u.sql, E);
+            const u = O.dimensions[N], l = b(u.sql, E);
             i.push(l);
           }
       }
     if (t.timeDimensions)
       for (const S of t.timeDimensions) {
-        const [N, I] = S.dimension.split("."), O = r.get(N);
-        if (O && O.dimensions && O.dimensions[I])
-          if (s?.preAggregationCTEs?.some((u) => u.cube.name === N)) {
-            const u = s.preAggregationCTEs.find((_) => _.cube.name === N), l = u.joinKeys.find((_) => _.targetColumn === I);
+        const [I, N] = S.dimension.split("."), O = r.get(I);
+        if (O && O.dimensions && O.dimensions[N])
+          if (s?.preAggregationCTEs?.some((u) => u.cube.name === I)) {
+            const u = s.preAggregationCTEs.find((_) => _.cube.name === I), l = u.joinKeys.find((_) => _.targetColumn === N);
             if (l && l.sourceColumnObj) {
               const _ = this.dateTimeBuilder.buildTimeDimensionExpression(
                 l.sourceColumnObj,
@@ -3492,11 +3492,11 @@ class Cs {
               );
               i.push(_);
             } else {
-              const _ = o`${o.identifier(u.cteAlias)}.${o.identifier(I)}`;
+              const _ = o`${o.identifier(u.cteAlias)}.${o.identifier(N)}`;
               i.push(_);
             }
           } else {
-            const u = O.dimensions[I], l = this.dateTimeBuilder.buildTimeDimensionExpression(
+            const u = O.dimensions[N], l = this.dateTimeBuilder.buildTimeDimensionExpression(
               u.sql,
               S.granularity,
               E
@@ -3513,7 +3513,7 @@ class ls {
   groupByBuilder;
   measureBuilder;
   constructor(e) {
-    this.dateTimeBuilder = new Ie(e), this.filterBuilder = new he(e, this.dateTimeBuilder), this.groupByBuilder = new Cs(this.dateTimeBuilder), this.measureBuilder = new H(e);
+    this.dateTimeBuilder = new Ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder), this.groupByBuilder = new Cs(this.dateTimeBuilder), this.measureBuilder = new H(e);
   }
   /**
    * Build resolvedMeasures map for a set of measures
@@ -3612,8 +3612,8 @@ class ls {
         if (i && "member" in a) {
           const [S] = a.member.split(".");
           if (T.has(S) && i.has(S) && !A.has(S)) {
-            const I = i.get(S);
-            r.push(...I), A.add(S);
+            const N = i.get(S);
+            r.push(...N), A.add(S);
             continue;
           } else if (A.has(S))
             continue;
@@ -3623,8 +3623,8 @@ class ls {
       }
     if (t.timeDimensions)
       for (const a of t.timeDimensions) {
-        const [R, S] = a.dimension.split("."), N = T.get(R);
-        if (N && N.dimensions[S] && a.dateRange) {
+        const [R, S] = a.dimension.split("."), I = T.get(R);
+        if (I && I.dimensions[S] && a.dateRange) {
           if (s?.preAggregationCTEs && s.preAggregationCTEs.some((l) => l.cube.name === R))
             continue;
           if (E.filterCache) {
@@ -3634,7 +3634,7 @@ class ls {
               continue;
             }
           }
-          const I = N.dimensions[S], O = b(I.sql, E), C = this.buildDateRangeCondition(O, a.dateRange);
+          const N = I.dimensions[S], O = b(N.sql, E), C = this.buildDateRangeCondition(O, a.dateRange);
           C && r.push(C);
         }
       }
@@ -3659,47 +3659,47 @@ class ls {
    */
   processFilter(e, t, E, s, i) {
     if ("and" in e || "or" in e) {
-      const I = e;
-      if (I.and) {
-        const O = I.and.map((C) => this.processFilter(C, t, E, s, i)).filter((C) => C !== null);
+      const N = e;
+      if (N.and) {
+        const O = N.and.map((C) => this.processFilter(C, t, E, s, i)).filter((C) => C !== null);
         return O.length > 0 ? y(...O) : null;
       }
-      if (I.or) {
-        const O = I.or.map((C) => this.processFilter(C, t, E, s, i)).filter((C) => C !== null);
+      if (N.or) {
+        const O = N.or.map((C) => this.processFilter(C, t, E, s, i)).filter((C) => C !== null);
         return O.length > 0 ? Ce(...O) : null;
       }
     }
     const r = e, [T, A] = r.member.split("."), a = t.get(T);
     if (!a) return null;
-    const R = a.dimensions[A], S = a.measures[A], N = R || S;
-    if (!N) return null;
+    const R = a.dimensions[A], S = a.measures[A], I = R || S;
+    if (!I) return null;
     if (s === "where" && R) {
       if (i?.preAggregationCTEs && i.preAggregationCTEs.some((u) => u.cube.name === T))
         return null;
-      const I = ["arrayContains", "arrayOverlaps", "arrayContained"].includes(r.operator);
-      if (!I && E.filterCache) {
+      const N = ["arrayContains", "arrayOverlaps", "arrayContained"].includes(r.operator);
+      if (!N && E.filterCache) {
         const C = De(e), u = E.filterCache.get(C);
         if (u)
           return u;
       }
-      const O = I ? typeof R.sql == "function" ? R.sql(E) : R.sql : b(R.sql, E);
+      const O = N ? typeof R.sql == "function" ? R.sql(E) : R.sql : b(R.sql, E);
       return this.buildFilterCondition(
         O,
         r.operator,
         r.values,
-        N,
+        I,
         r.dateRange
       );
     } else {
       if (s === "where" && S)
         return null;
       if (s === "having" && S) {
-        const I = this.buildHavingMeasureExpression(T, A, S, E, i);
+        const N = this.buildHavingMeasureExpression(T, A, S, E, i);
         return this.buildFilterCondition(
-          I,
+          N,
           r.operator,
           r.values,
-          N,
+          I,
           r.dateRange
         );
       }
@@ -3835,20 +3835,20 @@ class ue {
       const { cube: A, path: a } = r.shift(), R = this.cubes.get(A);
       if (R?.joins)
         for (const [, S] of Object.entries(R.joins)) {
-          const I = Q(S.targetCube).name;
-          if (T.has(I))
+          const N = Q(S.targetCube).name;
+          if (T.has(N))
             continue;
           const O = [
             ...a,
             {
               fromCube: A,
-              toCube: I,
+              toCube: N,
               joinDef: S
             }
           ];
-          if (I === t)
+          if (N === t)
             return this.setInCache(s, O), O;
-          T.add(I), r.push({ cube: I, path: O });
+          T.add(N), r.push({ cube: N, path: O });
         }
     }
     return this.setInCache(s, null), null;
@@ -3881,7 +3881,7 @@ class ue {
     const r = i.map((T) => {
       let A = 0;
       T.some(
-        (S, N) => S.joinDef.preferredFor?.includes(t) && N === 0
+        (S, I) => S.joinDef.preferredFor?.includes(t) && I === 0
       ) && (A += 10);
       const R = T.filter((S) => E.has(S.toCube)).length;
       return A += R, A -= T.length - 1, {
@@ -3915,22 +3915,22 @@ class ue {
       const R = this.cubes.get(T);
       if (R?.joins)
         for (const [, S] of Object.entries(R.joins)) {
-          const I = Q(S.targetCube).name;
-          if (a.has(I))
+          const N = Q(S.targetCube).name;
+          if (a.has(N))
             continue;
           const O = [
             ...A,
             {
               fromCube: T,
-              toCube: I,
+              toCube: N,
               joinDef: S
             }
           ];
-          if (I === t)
+          if (N === t)
             i.push(O);
           else {
             const C = new Set(a);
-            C.add(I), r.push({ cube: I, path: O, visited: C });
+            C.add(N), r.push({ cube: N, path: O, visited: C });
           }
         }
     }
@@ -4135,29 +4135,29 @@ class CE {
   buildJoinPlan(e, t, E, s, i) {
     const r = this.getResolver(e), T = [], A = /* @__PURE__ */ new Set([t.name]), a = /* @__PURE__ */ new Set();
     if (i.measures)
-      for (const N of i.measures) {
-        const [I] = N.split(".");
-        a.add(I);
+      for (const I of i.measures) {
+        const [N] = I.split(".");
+        a.add(N);
       }
     const R = /* @__PURE__ */ new Set();
-    for (const N of a) {
-      if (N === t.name) continue;
-      this.findHasManyJoinDef(t, N) && R.add(N);
+    for (const I of a) {
+      if (I === t.name) continue;
+      this.findHasManyJoinDef(t, I) && R.add(I);
     }
-    const S = E.filter((N) => N !== t.name);
-    for (const N of S) {
-      if (A.has(N))
+    const S = E.filter((I) => I !== t.name);
+    for (const I of S) {
+      if (A.has(I))
         continue;
-      const I = new Set(
+      const N = new Set(
         [...A].filter((C) => !R.has(C))
       ), O = r.findPathPreferring(
         t.name,
-        N,
+        I,
         a,
-        I
+        N
       );
       if (!O || O.length === 0)
-        throw new Error(`No join path found from '${t.name}' to '${N}'`);
+        throw new Error(`No join path found from '${t.name}' to '${I}'`);
       for (const { toCube: C, joinDef: u } of O) {
         if (A.has(C))
           continue;
@@ -4237,14 +4237,14 @@ class CE {
         alias: R.alias,
         isPrimary: !1
       });
-    for (const { cube: R, alias: S, isPrimary: N } of a) {
-      const I = this.getCTEReason(
+    for (const { cube: R, alias: S, isPrimary: I } of a) {
+      const N = this.getCTEReason(
         R,
         t,
         T,
         s
       );
-      if (!I)
+      if (!N)
         continue;
       const O = s.measures.filter(
         (h) => h.startsWith(R.name + ".")
@@ -4256,10 +4256,10 @@ class CE {
       if (l?.hasIntermediateHasMany && l.intermediateJoins.length > 0)
         _ = l.correctJoinKeys, U = l.intermediateJoins;
       else {
-        const h = N ? this.findJoinInfoToCube(e, t.name) : this.findJoinInfoForCube(e, t, R.name);
+        const h = I ? this.findJoinInfoToCube(e, t.name) : this.findJoinInfoForCube(e, t, R.name);
         if (!h)
           continue;
-        _ = N ? h.joinDef.on.map((G) => ({
+        _ = I ? h.joinDef.on.map((G) => ({
           sourceColumn: G.target.name,
           targetColumn: G.source.name,
           sourceColumnObj: G.target,
@@ -4297,7 +4297,7 @@ class CE {
           downstreamJoinKeys: G.length > 0 ? G : void 0,
           intermediateJoins: U && U.length > 0 ? U : void 0,
           cteType: "aggregate",
-          cteReason: I
+          cteReason: N
         });
       }
     }
@@ -4335,12 +4335,12 @@ class CE {
     const r = this.getResolver(e).findPath(t.name, E);
     if (!r || r.length === 0)
       return null;
-    const T = r.map((I) => ({
-      fromCube: I.fromCube,
-      toCube: I.toCube,
-      joinDef: I.joinDef
+    const T = r.map((N) => ({
+      fromCube: N.fromCube,
+      toCube: N.toCube,
+      joinDef: N.joinDef
     }));
-    if (!T.slice(0, -1).some((I) => I.joinDef.relationship === "hasMany"))
+    if (!T.slice(0, -1).some((N) => N.joinDef.relationship === "hasMany"))
       return {
         path: T,
         hasIntermediateHasMany: !1,
@@ -4348,8 +4348,8 @@ class CE {
         correctJoinKeys: []
       };
     const R = [];
-    for (let I = 0; I < T.length - 1; I++) {
-      const O = T[I], C = T[I + 1], u = e.get(O.toCube);
+    for (let N = 0; N < T.length - 1; N++) {
+      const O = T[N], C = T[N + 1], u = e.get(O.toCube);
       if (!u) continue;
       const _ = u.sql(s).where, U = C.joinDef.on[0]?.source, D = O.joinDef.on[0]?.target;
       R.push({
@@ -4360,19 +4360,19 @@ class CE {
         cteJoinColumn: U
       });
     }
-    const N = T[0].joinDef.on.map((I) => ({
-      sourceColumn: I.source.name,
+    const I = T[0].joinDef.on.map((N) => ({
+      sourceColumn: N.source.name,
       // Column on primary cube
-      targetColumn: I.target.name,
+      targetColumn: N.target.name,
       // Column on first intermediate (which CTE will include via JOIN)
-      sourceColumnObj: I.source,
-      targetColumnObj: I.target
+      sourceColumnObj: N.source,
+      targetColumnObj: N.target
     }));
     return {
       path: T,
       hasIntermediateHasMany: !0,
       intermediateJoins: R,
-      correctJoinKeys: N
+      correctJoinKeys: I
     };
   }
   /**
@@ -4560,16 +4560,16 @@ class CE {
       if (T?.joins) {
         for (const [, A] of Object.entries(T.joins))
           if (Q(A.targetCube).name === t.name && A.relationship === "hasMany") {
-            const R = this.extractFiltersForCube(e.filters, r), S = this.extractTimeDimensionFiltersForCube(e, r), N = [...R, ...S];
-            N.length > 0 && A.on.length > 0 && s.push({
+            const R = this.extractFiltersForCube(e.filters, r), S = this.extractTimeDimensionFiltersForCube(e, r), I = [...R, ...S];
+            I.length > 0 && A.on.length > 0 && s.push({
               sourceCube: T,
-              filters: N,
+              filters: I,
               // Map all join keys for composite key support
               // source = filterCube PK (e.g., employees.id)
               // target = cteCube FK (e.g., productivity.employeeId)
-              joinConditions: A.on.map((I) => ({
-                source: I.source,
-                target: I.target
+              joinConditions: A.on.map((N) => ({
+                source: N.source,
+                target: N.target
               }))
             });
           }
@@ -4720,19 +4720,19 @@ class CE {
         a,
         t
       ));
-      const S = A.joinPaths.filter((C) => C.pathFound), N = A.joinPaths.filter((C) => !C.pathFound);
+      const S = A.joinPaths.filter((C) => C.pathFound), I = A.joinPaths.filter((C) => !C.pathFound);
       A.querySummary.joinCount = S.length, A.querySummary.cteCount = A.preAggregations.length, A.querySummary.hasPreAggregation = A.preAggregations.length > 0;
-      const I = /* @__PURE__ */ new Map();
+      const N = /* @__PURE__ */ new Map();
       for (const C of i) {
         const u = e.get(C);
-        u && I.set(C, u);
+        u && N.set(C, u);
       }
       const O = H.hasPostAggregationWindows(
         t.measures || [],
-        I
+        N
       );
       A.querySummary.hasWindowFunctions = O, A.preAggregations.length > 0 ? A.querySummary.queryType = "multi_cube_cte" : A.querySummary.queryType = "multi_cube_join";
-      for (const C of N)
+      for (const C of I)
         A.warnings.push(
           `No join path found to cube '${C.targetCube}'. Check that joins are defined correctly.`
         );
@@ -4757,31 +4757,31 @@ class CE {
       r.set(R, (r.get(R) || 0) + 1);
     const T = this.getResolver(E);
     for (const R of e) {
-      const S = E.get(R), N = r.get(R) || 0, I = S?.joins ? Object.keys(S.joins).length : 0, O = T.canReachAll(R, e);
+      const S = E.get(R), I = r.get(R) || 0, N = S?.joins ? Object.keys(S.joins).length : 0, O = T.canReachAll(R, e);
       s.push({
         cubeName: R,
-        dimensionCount: N,
-        joinCount: I,
+        dimensionCount: I,
+        joinCount: N,
         canReachAll: O
       });
     }
     if (t.dimensions && t.dimensions.length > 0) {
       const R = Math.max(...s.map((S) => S.dimensionCount));
       if (R > 0) {
-        const S = s.filter((N) => N.dimensionCount === R).sort((N, I) => N.cubeName.localeCompare(I.cubeName));
-        for (const N of S)
-          if (N.canReachAll)
+        const S = s.filter((I) => I.dimensionCount === R).sort((I, N) => I.cubeName.localeCompare(N.cubeName));
+        for (const I of S)
+          if (I.canReachAll)
             return {
-              selectedCube: N.cubeName,
+              selectedCube: I.cubeName,
               reason: "most_dimensions",
-              explanation: `Selected because it has ${N.dimensionCount} dimension${N.dimensionCount !== 1 ? "s" : ""} in the query (defines the analytical grain)`,
+              explanation: `Selected because it has ${I.dimensionCount} dimension${I.dimensionCount !== 1 ? "s" : ""} in the query (defines the analytical grain)`,
               candidates: s
             };
       }
     }
     const A = s.filter((R) => R.canReachAll);
     if (A.length > 0) {
-      const R = Math.max(...A.map((N) => N.joinCount)), S = A.filter((N) => N.joinCount === R).sort((N, I) => N.cubeName.localeCompare(I.cubeName))[0];
+      const R = Math.max(...A.map((I) => I.joinCount)), S = A.filter((I) => I.joinCount === R).sort((I, N) => I.cubeName.localeCompare(N.cubeName))[0];
       return {
         selectedCube: S.cubeName,
         reason: "most_connected",
@@ -4815,9 +4815,9 @@ class CE {
         visitedCubes: r
       };
     const T = i.map((A) => {
-      const a = Tt(A.joinDef.relationship, A.joinDef.sqlJoinType), R = A.joinDef.on.map((N) => ({
-        sourceColumn: N.source.name,
-        targetColumn: N.target.name
+      const a = Tt(A.joinDef.relationship, A.joinDef.sqlJoinType), R = A.joinDef.on.map((I) => ({
+        sourceColumn: I.source.name,
+        targetColumn: I.target.name
       })), S = {
         fromCube: A.fromCube,
         toCube: A.toCube,
@@ -4826,11 +4826,11 @@ class CE {
         joinColumns: R
       };
       if (A.joinDef.relationship === "belongsToMany" && A.joinDef.through) {
-        const N = A.joinDef.through;
+        const I = A.joinDef.through;
         S.junctionTable = {
-          tableName: N.table[/* @__PURE__ */ Symbol.for("drizzle:Name")] || "junction_table",
-          sourceColumns: N.sourceKey.map((I) => I.target.name),
-          targetColumns: N.targetKey.map((I) => I.source.name)
+          tableName: I.table[/* @__PURE__ */ Symbol.for("drizzle:Name")] || "junction_table",
+          sourceColumns: I.sourceKey.map((N) => N.target.name),
+          targetColumns: I.targetKey.map((N) => N.source.name)
         };
       }
       return S;
@@ -4863,12 +4863,12 @@ class CE {
       ), R = this.extractMeasuresFromFilters(s, A), S = [.../* @__PURE__ */ new Set([...a, ...R])];
       if (S.length === 0)
         continue;
-      const N = T.on.map((_) => ({
+      const I = T.on.map((_) => ({
         sourceColumn: _.source.name,
         targetColumn: _.target.name
-      })), I = /* @__PURE__ */ new Map([[r, A]]), { aggregateMeasures: O, postAggWindowMeasures: C, requiredBaseMeasures: u } = H.categorizeForPostAggregation(
+      })), N = /* @__PURE__ */ new Map([[r, A]]), { aggregateMeasures: O, postAggWindowMeasures: C, requiredBaseMeasures: u } = H.categorizeForPostAggregation(
         S,
-        I
+        N
       ), l = [.../* @__PURE__ */ new Set([
         ...O,
         ...Array.from(u).filter((_) => _.startsWith(r + "."))
@@ -4881,7 +4881,7 @@ class CE {
           reason: _ ? `hasMany relationship from ${t.name} - requires pre-aggregation; includes base measures for post-aggregation window functions` : `hasMany relationship from ${t.name} - requires pre-aggregation to prevent row duplication (fan-out)`,
           reasonType: "hasMany",
           measures: l,
-          joinKeys: N,
+          joinKeys: I,
           cteType: "aggregate"
         });
       }
@@ -4969,13 +4969,13 @@ class us {
       for (const m of e.downstreamJoinKeys)
         for (const P of m.joinKeys)
           P.sourceColumnObj && (a[P.sourceColumn] = P.sourceColumnObj);
-    const R = r.name, S = /* @__PURE__ */ new Map([[R, r]]), N = this.queryBuilder.buildResolvedMeasures(
+    const R = r.name, S = /* @__PURE__ */ new Map([[R, r]]), I = this.queryBuilder.buildResolvedMeasures(
       e.measures,
       S,
       E
     );
     for (const m of e.measures) {
-      const [, P] = m.split("."), M = N.get(m);
+      const [, P] = m.split("."), M = I.get(m);
       if (M) {
         const g = M();
         a[P] = o`${g}`.as(P);
@@ -4999,11 +4999,11 @@ class us {
       }
     if (Object.keys(a).length === 0)
       return null;
-    let I = E.db.select(a).from(T.from);
+    let N = E.db.select(a).from(T.from);
     if (A && e.intermediateJoins)
       for (const m of e.intermediateJoins) {
         const P = m.cube.sql(E), g = [X(m.cteJoinColumn, m.joinDef.on[0]?.target)];
-        m.securityFilter && g.push(m.securityFilter), I = I.leftJoin(
+        m.securityFilter && g.push(m.securityFilter), N = N.leftJoin(
           P.from,
           y(...g)
         );
@@ -5044,7 +5044,7 @@ class us {
     const l = [];
     if (T.where && l.push(T.where), l.push(...C, ...u), l.length > 0) {
       const m = l.length === 1 ? l[0] : y(...l);
-      I = I.where(m);
+      N = N.where(m);
     }
     const _ = [], U = /* @__PURE__ */ new Set(), D = (m) => {
       const P = m?.name || (typeof m == "string" ? m : null);
@@ -5076,7 +5076,7 @@ class us {
           _.push(h);
         }
       }
-    return _.length > 0 && (I = I.groupBy(..._)), E.db.$with(e.cteAlias).as(I);
+    return _.length > 0 && (N = N.groupBy(..._)), E.db.$with(e.cteAlias).as(N);
   }
   /**
    * Build join condition for CTE
@@ -5235,24 +5235,24 @@ function Ds(n, e) {
     return n;
   const a = /* @__PURE__ */ new Map();
   for (const S of n) {
-    const N = ds(S, T), I = cs(S[t]);
-    a.has(N) || a.set(N, /* @__PURE__ */ new Map()), a.get(N).set(I, S);
+    const I = ds(S, T), N = cs(S[t]);
+    a.has(I) || a.set(I, /* @__PURE__ */ new Map()), a.get(I).set(N, S);
   }
   a.size === 0 && T.length === 0 && a.set("__all__", /* @__PURE__ */ new Map());
   const R = [];
-  for (const [S, N] of a) {
-    const I = N.size > 0 ? N.values().next().value : null;
+  for (const [S, I] of a) {
+    const N = I.size > 0 ? I.values().next().value : null;
     for (const O of A) {
-      const C = O.toISOString(), u = N.get(C);
+      const C = O.toISOString(), u = I.get(C);
       if (u)
         R.push(u);
       else {
         const l = {
           [t]: C
         };
-        if (I)
+        if (N)
           for (const _ of T)
-            l[_] = I[_];
+            l[_] = N[_];
         for (const _ of r)
           l[_] = i;
         R.push(l);
@@ -5303,7 +5303,7 @@ function Mt(n, e, t) {
 class Ps {
   dateTimeBuilder;
   constructor(e) {
-    this.dateTimeBuilder = new Ie(e);
+    this.dateTimeBuilder = new Ne(e);
   }
   /**
    * Check if a query contains compareDateRange
@@ -5486,7 +5486,7 @@ class Ps {
 }
 class ps {
   constructor(e) {
-    this.databaseAdapter = e, this.dateTimeBuilder = new Ie(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
+    this.databaseAdapter = e, this.dateTimeBuilder = new Ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
   }
   filterBuilder;
   dateTimeBuilder;
@@ -5536,14 +5536,14 @@ class ps {
         const T = r ? new ue(t) : null, A = Array.isArray(i.filter) ? i.filter : [i.filter];
         for (const a of A)
           if ("member" in a) {
-            const [R, S] = a.member.split("."), N = t.get(R);
-            if (!N)
+            const [R, S] = a.member.split("."), I = t.get(R);
+            if (!I)
               E.push(`Step ${s} filter cube not found: ${R}`);
-            else if (N.dimensions?.[S] || (N.measures?.[S] ? E.push(
+            else if (I.dimensions?.[S] || (I.measures?.[S] ? E.push(
               `Step ${s} filter '${R}.${S}' is a measure. Funnel step filters only support dimensions, not measures.`
             ) : E.push(`Step ${s} filter member not found: ${S} in cube ${R}`)), r && R !== r && T) {
-              const I = T.findPath(r, R);
-              (!I || I.length === 0) && E.push(
+              const N = T.findPath(r, R);
+              (!N || N.length === 0) && E.push(
                 `Step ${s} filter '${R}.${S}' requires a join from '${r}' but no join path was found. Define a join relationship between these cubes.`
               );
             }
@@ -5623,13 +5623,13 @@ class ps {
   resolveSteps(e, t, E) {
     const s = new ue(t);
     return e.steps.map((i, r) => {
-      const T = this.resolveCubeForStep(i, e, t), A = this.resolveBindingKey(e, T, E), a = this.resolveTimeDimension(e, T, E), R = this.buildStepFilters(i, T, t, E), S = this.extractFilterCubeNames(i), N = [];
-      for (const I of S)
-        if (I !== T.name) {
-          const O = t.get(I);
+      const T = this.resolveCubeForStep(i, e, t), A = this.resolveBindingKey(e, T, E), a = this.resolveTimeDimension(e, T, E), R = this.buildStepFilters(i, T, t, E), S = this.extractFilterCubeNames(i), I = [];
+      for (const N of S)
+        if (N !== T.name) {
+          const O = t.get(N);
           if (O) {
-            const C = s.findPath(T.name, I);
-            C && C.length > 0 && N.push({ cube: O, joinPath: C });
+            const C = s.findPath(T.name, N);
+            C && C.length > 0 && I.push({ cube: O, joinPath: C });
           }
         }
       return {
@@ -5640,7 +5640,7 @@ class ps {
         timeExpr: a,
         filterConditions: R,
         timeToConvert: i.timeToConvert,
-        joinedCubes: N
+        joinedCubes: I
       };
     });
   }
@@ -5748,8 +5748,8 @@ class ps {
     const T = e, [A, a] = T.member.split("."), R = T.dateRange !== void 0;
     if (T.operator !== "set" && T.operator !== "notSet" && !R && (!T.values || T.values.length === 0 || T.values[0] === void 0 || T.values[0] === ""))
       return null;
-    const N = E.get(A);
-    if (!N)
+    const I = E.get(A);
+    if (!I)
       return null;
     if (A !== t.name) {
       const u = new ue(E).findPath(t.name, A);
@@ -5758,14 +5758,14 @@ class ps {
           `Funnel filter: Cannot filter by '${A}.${a}' in step using '${t.name}'. No join path found. Filter will be skipped.`
         ), null;
     }
-    const I = N.dimensions?.[a];
-    if (!I) return null;
-    const O = b(I.sql, s);
+    const N = I.dimensions?.[a];
+    if (!N) return null;
+    const O = b(N.sql, s);
     return this.filterBuilder.buildFilterCondition(
       O,
       T.operator,
       T.values || [],
-      I,
+      N,
       T.dateRange
     );
   }
@@ -5847,8 +5847,8 @@ class ps {
     for (const i of t.joinedCubes)
       for (const r of i.joinPath) {
         const T = r.joinDef, A = [];
-        for (const N of T.on)
-          N.as ? A.push(N.as(N.source, N.target)) : A.push(X(N.source, N.target));
+        for (const I of T.on)
+          I.as ? A.push(I.as(I.source, I.target)) : A.push(X(I.source, I.target));
         const a = A.length === 1 ? A[0] : y(...A), S = i.cube.sql(E);
         e = e.leftJoin(S.from, a), S.where && s.push(S.where);
       }
@@ -5911,12 +5911,12 @@ class ps {
         const a = o.identifier(`step_${A}_time`), R = o.identifier(`step_${A - 1}_time`), S = this.databaseAdapter.buildTimeDifferenceSeconds(
           o`${a}`,
           o`${R}`
-        ), N = o`${a} IS NOT NULL`;
-        r[`step_${A}_avg_seconds`] = this.databaseAdapter.buildConditionalAggregation("avg", S, N).as(`step_${A}_avg_seconds`), r[`step_${A}_min_seconds`] = this.databaseAdapter.buildConditionalAggregation("min", S, N).as(`step_${A}_min_seconds`), r[`step_${A}_max_seconds`] = this.databaseAdapter.buildConditionalAggregation("max", S, N).as(`step_${A}_max_seconds`);
-        const I = this.databaseAdapter.getCapabilities(), O = this.databaseAdapter.buildPercentile(S, 50);
-        O && I.supportsPercentileSubqueries && (r[`step_${A}_median_seconds`] = o`(SELECT ${O} FROM ${o.identifier("funnel_joined")} WHERE ${a} IS NOT NULL)`.as(`step_${A}_median_seconds`));
+        ), I = o`${a} IS NOT NULL`;
+        r[`step_${A}_avg_seconds`] = this.databaseAdapter.buildConditionalAggregation("avg", S, I).as(`step_${A}_avg_seconds`), r[`step_${A}_min_seconds`] = this.databaseAdapter.buildConditionalAggregation("min", S, I).as(`step_${A}_min_seconds`), r[`step_${A}_max_seconds`] = this.databaseAdapter.buildConditionalAggregation("max", S, I).as(`step_${A}_max_seconds`);
+        const N = this.databaseAdapter.getCapabilities(), O = this.databaseAdapter.buildPercentile(S, 50);
+        O && N.supportsPercentileSubqueries && (r[`step_${A}_median_seconds`] = o`(SELECT ${O} FROM ${o.identifier("funnel_joined")} WHERE ${a} IS NOT NULL)`.as(`step_${A}_median_seconds`));
         const C = this.databaseAdapter.buildPercentile(S, 90);
-        C && I.supportsPercentileSubqueries && (r[`step_${A}_p90_seconds`] = o`(SELECT ${C} FROM ${o.identifier("funnel_joined")} WHERE ${a} IS NOT NULL)`.as(`step_${A}_p90_seconds`));
+        C && N.supportsPercentileSubqueries && (r[`step_${A}_p90_seconds`] = o`(SELECT ${C} FROM ${o.identifier("funnel_joined")} WHERE ${a} IS NOT NULL)`.as(`step_${A}_p90_seconds`));
       }
     const T = i.db.select(r).from(e);
     return i.db.$with("funnel_metrics").as(T);
@@ -5927,7 +5927,7 @@ class Ms {
   dateTimeBuilder;
   databaseAdapter;
   constructor(e) {
-    this.databaseAdapter = e, this.dateTimeBuilder = new Ie(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
+    this.databaseAdapter = e, this.dateTimeBuilder = new Ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
   }
   /**
    * Check if query contains flow configuration
@@ -6023,10 +6023,10 @@ class Ms {
       stepsBefore: e.outputMode === "sunburst" ? 0 : e.stepsBefore
     }, a = this.resolveFlowConfig(A, t, E), R = [], S = this.buildStartingEntitiesCTE(A, a, E);
     R.push(S);
-    const N = T ? this.buildBeforeCTEsLateral(A, a, E) : this.buildBeforeCTEsWindow(A, a, E);
-    R.push(...N);
-    const I = T ? this.buildAfterCTEsLateral(A, a, E) : this.buildAfterCTEsWindow(A, a, E);
+    const I = T ? this.buildBeforeCTEsLateral(A, a, E) : this.buildBeforeCTEsWindow(A, a, E);
     R.push(...I);
+    const N = T ? this.buildAfterCTEsLateral(A, a, E) : this.buildAfterCTEsWindow(A, a, E);
+    R.push(...N);
     const O = this.buildNodesAggregationCTE(A, E);
     R.push(O);
     const C = this.buildLinksAggregationCTE(A, E);
@@ -6155,8 +6155,8 @@ class Ms {
     if ("and" in e || "or" in e) {
       const A = e, a = [], R = A.and || A.or || [];
       for (const S of R) {
-        const N = this.buildFilterCondition(S, t, E);
-        N && a.push(N);
+        const I = this.buildFilterCondition(S, t, E);
+        I && a.push(I);
       }
       return a.length === 0 ? null : a.length === 1 ? a[0] : "and" in e ? y(...a) : o`(${o.join(a, o` OR `)})`;
     }
@@ -6210,17 +6210,17 @@ class Ms {
   buildBeforeCTEsLateral(e, t, E) {
     const { cubeBase: s, bindingKeyExpr: i, timeExpr: r, eventExpr: T } = t, A = [], a = e.outputMode === "sunburst";
     for (let R = 1; R <= e.stepsBefore; R++) {
-      const S = R === 1 ? "starting_entities" : `before_step_${R - 1}`, N = R === 1 ? "start_time" : "step_time", I = `before_step_${R}`, O = [];
+      const S = R === 1 ? "starting_entities" : `before_step_${R - 1}`, I = R === 1 ? "start_time" : "step_time", N = `before_step_${R}`, O = [];
       s.where && O.push(s.where), O.push(
         o`${i} = ${o.identifier(S)}.binding_key`,
-        o`${r} < ${o.identifier(S)}.${o.identifier(N)}`
+        o`${r} < ${o.identifier(S)}.${o.identifier(I)}`
       );
       const C = O.length === 1 ? O[0] : y(...O), u = a ? o`${T} || ${"→"} || ${o.identifier(S)}.event_path` : o`${T}`, l = E.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${T}`.as("event_type"),
         event_path: u.as("event_path")
-      }).from(s.from).where(C).orderBy(o`${r} DESC`).limit(1), _ = E.db.$with(I).as(
+      }).from(s.from).where(C).orderBy(o`${r} DESC`).limit(1), _ = E.db.$with(N).as(
         E.db.select({
           binding_key: o`e.binding_key`.as("binding_key"),
           step_time: o`e.step_time`.as("step_time"),
@@ -6239,17 +6239,17 @@ class Ms {
   buildAfterCTEsLateral(e, t, E) {
     const { cubeBase: s, bindingKeyExpr: i, timeExpr: r, eventExpr: T } = t, A = [], a = e.outputMode === "sunburst";
     for (let R = 1; R <= e.stepsAfter; R++) {
-      const S = R === 1 ? "starting_entities" : `after_step_${R - 1}`, N = R === 1 ? "start_time" : "step_time", I = `after_step_${R}`, O = [];
+      const S = R === 1 ? "starting_entities" : `after_step_${R - 1}`, I = R === 1 ? "start_time" : "step_time", N = `after_step_${R}`, O = [];
       s.where && O.push(s.where), O.push(
         o`${i} = ${o.identifier(S)}.binding_key`,
-        o`${r} > ${o.identifier(S)}.${o.identifier(N)}`
+        o`${r} > ${o.identifier(S)}.${o.identifier(I)}`
       );
       const C = O.length === 1 ? O[0] : y(...O), u = a ? o`${o.identifier(S)}.event_path || ${"→"} || ${T}` : o`${T}`, l = E.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${T}`.as("event_type"),
         event_path: u.as("event_path")
-      }).from(s.from).where(C).orderBy(o`${r} ASC`).limit(1), _ = E.db.$with(I).as(
+      }).from(s.from).where(C).orderBy(o`${r} ASC`).limit(1), _ = E.db.$with(N).as(
         E.db.select({
           binding_key: o`e.binding_key`.as("binding_key"),
           step_time: o`e.step_time`.as("step_time"),
@@ -6271,9 +6271,9 @@ class Ms {
   buildBeforeCTEsWindow(e, t, E) {
     const { cubeBase: s, bindingKeyExpr: i, timeExpr: r, eventExpr: T } = t, A = [], a = e.outputMode === "sunburst";
     for (let R = 1; R <= e.stepsBefore; R++) {
-      const S = R === 1 ? "starting_entities" : `before_step_${R - 1}`, N = R === 1 ? "start_time" : "step_time", I = `before_step_${R}`, O = [];
+      const S = R === 1 ? "starting_entities" : `before_step_${R - 1}`, I = R === 1 ? "start_time" : "step_time", N = `before_step_${R}`, O = [];
       s.where && O.push(s.where), O.push(
-        o`${r} < ${o.identifier(S)}.${o.identifier(N)}`
+        o`${r} < ${o.identifier(S)}.${o.identifier(I)}`
       );
       const C = O.length === 1 ? O[0] : y(...O), u = a ? o`${T} || ${"→"} || ${o.identifier(S)}.event_path` : o`${T}`, l = E.db.select({
         binding_key: o`${i}`.as("binding_key"),
@@ -6290,7 +6290,7 @@ class Ms {
         event_type: o`event_type`.as("event_type"),
         event_path: o`event_path`.as("event_path")
       }).from(l.as("ranked")).where(o`rn = 1`);
-      A.push(E.db.$with(I).as(_));
+      A.push(E.db.$with(N).as(_));
     }
     return A;
   }
@@ -6304,9 +6304,9 @@ class Ms {
   buildAfterCTEsWindow(e, t, E) {
     const { cubeBase: s, bindingKeyExpr: i, timeExpr: r, eventExpr: T } = t, A = [], a = e.outputMode === "sunburst";
     for (let R = 1; R <= e.stepsAfter; R++) {
-      const S = R === 1 ? "starting_entities" : `after_step_${R - 1}`, N = R === 1 ? "start_time" : "step_time", I = `after_step_${R}`, O = [];
+      const S = R === 1 ? "starting_entities" : `after_step_${R - 1}`, I = R === 1 ? "start_time" : "step_time", N = `after_step_${R}`, O = [];
       s.where && O.push(s.where), O.push(
-        o`${r} > ${o.identifier(S)}.${o.identifier(N)}`
+        o`${r} > ${o.identifier(S)}.${o.identifier(I)}`
       );
       const C = O.length === 1 ? O[0] : y(...O), u = a ? o`${o.identifier(S)}.event_path || ${"→"} || ${T}` : o`${T}`, l = E.db.select({
         binding_key: o`${i}`.as("binding_key"),
@@ -6323,7 +6323,7 @@ class Ms {
         event_type: o`event_type`.as("event_type"),
         event_path: o`event_path`.as("event_path")
       }).from(l.as("ranked")).where(o`rn = 1`);
-      A.push(E.db.$with(I).as(_));
+      A.push(E.db.$with(N).as(_));
     }
     return A;
   }
@@ -6548,7 +6548,7 @@ function ht(n) {
 }
 class Us {
   constructor(e) {
-    this.databaseAdapter = e, this.dateTimeBuilder = new Ie(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
+    this.databaseAdapter = e, this.dateTimeBuilder = new Ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
   }
   filterBuilder;
   dateTimeBuilder;
@@ -6640,18 +6640,18 @@ class Us {
     };
     for (let O = 0; O < s.breakdowns.length; O++)
       S[`breakdown_${O}`] = o.raw(`rc.breakdown_${O}`).as(`breakdown_${O}`);
-    let N = E.db.with(r, T, A, a).select(S).from(o`retention_counts rc`);
+    let I = E.db.with(r, T, A, a).select(S).from(o`retention_counts rc`);
     if (R) {
       const O = s.breakdowns.map(
         (u, l) => o`COALESCE(CAST(rc.breakdown_${o.raw(String(l))} AS TEXT), '') = COALESCE(CAST(cs.breakdown_${o.raw(String(l))} AS TEXT), '')`
       ), C = O.length === 1 ? O[0] : o.join(O, o` AND `);
-      N = N.innerJoin(o`cohort_sizes cs`, C);
+      I = I.innerJoin(o`cohort_sizes cs`, C);
     } else
-      N = N.innerJoin(o`cohort_sizes cs`, o`1 = 1`);
-    const I = [];
+      I = I.innerJoin(o`cohort_sizes cs`, o`1 = 1`);
+    const N = [];
     for (let O = 0; O < s.breakdowns.length; O++)
-      I.push(o.raw(`rc.breakdown_${O}`));
-    return I.push(o`rc.period_number`), N = N.orderBy(...I), N;
+      N.push(o.raw(`rc.breakdown_${O}`));
+    return N.push(o`rc.period_number`), I = I.orderBy(...N), I;
   }
   /**
    * Transform raw SQL results to RetentionResultRow[]
@@ -6687,32 +6687,32 @@ class Us {
     const T = r.dimensions?.[i];
     if (!T)
       throw new Error(`Time dimension not found: ${i}`);
-    const A = b(T.sql, E), a = this.resolveBindingKey(e.bindingKey, r, t, E), R = this.buildFilterConditions(e.cohortFilters, r, t, E), S = this.buildFilterConditions(e.activityFilters, r, t, E), N = [];
+    const A = b(T.sql, E), a = this.resolveBindingKey(e.bindingKey, r, t, E), R = this.buildFilterConditions(e.cohortFilters, r, t, E), S = this.buildFilterConditions(e.activityFilters, r, t, E), I = [];
     if (e.breakdownDimensions && e.breakdownDimensions.length > 0)
-      for (const I of e.breakdownDimensions) {
-        const [O, C] = I.split("."), u = t.get(O);
+      for (const N of e.breakdownDimensions) {
+        const [O, C] = N.split("."), u = t.get(O);
         if (u && u.dimensions?.[C]) {
           const l = b(u.dimensions[C].sql, E);
-          N.push({ dimension: I, expr: l });
+          I.push({ dimension: N, expr: l });
         }
       }
-    return { cube: r, bindingKeyExpr: a, timeExpr: A, cohortFilterConditions: R, activityFilterConditions: S, breakdowns: N };
+    return { cube: r, bindingKeyExpr: a, timeExpr: A, cohortFilterConditions: R, activityFilterConditions: S, breakdowns: I };
   }
   /**
    * Resolve binding key expression for a cube
    */
   resolveBindingKey(e, t, E, s) {
     if (Ut(e)) {
-      const a = e.find((I) => I.cube === t.name);
+      const a = e.find((N) => N.cube === t.name);
       if (!a)
         throw new Error(`No binding key mapping found for cube: ${t.name}`);
       const R = this.extractDimensionName(a.dimension), S = E.get(a.cube);
       if (!S)
         throw new Error(`Binding key cube not found: ${a.cube}`);
-      const N = S.dimensions?.[R];
-      if (!N)
+      const I = S.dimensions?.[R];
+      if (!I)
         throw new Error(`Binding key dimension not found: ${a.dimension}`);
-      return b(N.sql, s);
+      return b(I.sql, s);
     }
     const [i, r] = e.split("."), T = E.get(i);
     if (!T)
@@ -6739,12 +6739,12 @@ class Us {
    */
   buildSingleFilterCondition(e, t, E, s) {
     if ("and" in e || "or" in e) {
-      const S = e, N = [], I = "and" in S && !!S.and, O = S.and || S.or || [];
+      const S = e, I = [], N = "and" in S && !!S.and, O = S.and || S.or || [];
       for (const C of O) {
         const u = this.buildSingleFilterCondition(C, t, E, s);
-        u && N.push(u);
+        u && I.push(u);
       }
-      return N.length === 0 ? null : N.length === 1 ? N[0] : I ? y(...N) : o`(${o.join(N, o` OR `)})`;
+      return I.length === 0 ? null : I.length === 1 ? I[0] : N ? y(...I) : o`(${o.join(I, o` OR `)})`;
     }
     const i = e, [r, T] = i.member.split("."), A = E.get(r);
     if (!A) return null;
@@ -7027,7 +7027,7 @@ class te {
       this.preloadFilterCache(t, r, e, T);
       const A = this.queryPlanner.createQueryPlan(e, t, T);
       this.validateSecurityContext(A, T);
-      const a = this.buildUnifiedQuery(A, t, T), R = this.queryBuilder.collectNumericFields(e, t), S = await this.dbExecutor.execute(a, R), N = Array.isArray(S) ? S.map((l) => {
+      const a = this.buildUnifiedQuery(A, t, T), R = this.queryBuilder.collectNumericFields(e, t), S = await this.dbExecutor.execute(a, R), I = Array.isArray(S) ? S.map((l) => {
         const _ = { ...l };
         if (t.timeDimensions) {
           for (const U of t.timeDimensions)
@@ -7041,7 +7041,7 @@ class te {
             }
         }
         return _;
-      }) : [S], I = t.measures || [], O = Mt(N, t, I), C = this.generateAnnotations(A, t), u = {
+      }) : [S], N = t.measures || [], O = Mt(I, t, N), C = this.generateAnnotations(A, t), u = {
         data: O,
         annotation: C,
         // Include warnings from query planning (e.g., fan-out without dimensions)
@@ -7177,9 +7177,9 @@ class te {
     };
     return R.funnel = {
       config: s,
-      steps: s.steps.map((S, N) => ({
+      steps: s.steps.map((S, I) => ({
         name: S.name,
-        index: N,
+        index: I,
         timeToConvert: S.timeToConvert
       }))
     }, {
@@ -7326,10 +7326,10 @@ class te {
           }
       }
       return C;
-    }) : [a], S = t.measures || [], N = Mt(R, t, S), I = this.generateAnnotations(r, t);
+    }) : [a], S = t.measures || [], I = Mt(R, t, S), N = this.generateAnnotations(r, t);
     return {
-      data: N,
-      annotation: I
+      data: I,
+      annotation: N
     };
   }
   /**
@@ -7499,22 +7499,22 @@ class te {
           }
         }
       }
-    const N = [];
-    let I = E.db.select(S).from(A.from);
-    if (i.length > 0 && (I = E.db.with(...i).select(S).from(A.from)), A.joins)
+    const I = [];
+    let N = E.db.select(S).from(A.from);
+    if (i.length > 0 && (N = E.db.with(...i).select(S).from(A.from)), A.joins)
       for (const D of A.joins)
         switch (D.type || "left") {
           case "left":
-            I = I.leftJoin(D.table, D.on);
+            N = N.leftJoin(D.table, D.on);
             break;
           case "inner":
-            I = I.innerJoin(D.table, D.on);
+            N = N.innerJoin(D.table, D.on);
             break;
           case "right":
-            I = I.rightJoin(D.table, D.on);
+            N = N.rightJoin(D.table, D.on);
             break;
           case "full":
-            I = I.fullJoin(D.table, D.on);
+            N = N.fullJoin(D.table, D.on);
             break;
         }
     const O = /* @__PURE__ */ new Set(), C = /* @__PURE__ */ new Set();
@@ -7539,19 +7539,19 @@ class te {
           try {
             switch (F.joinType || "left") {
               case "left":
-                I = I.leftJoin(F.table, F.joinCondition);
+                N = N.leftJoin(F.table, F.joinCondition);
                 break;
               case "inner":
-                I = I.innerJoin(F.table, F.joinCondition);
+                N = N.innerJoin(F.table, F.joinCondition);
                 break;
               case "right":
-                I = I.rightJoin(F.table, F.joinCondition);
+                N = N.rightJoin(F.table, F.joinCondition);
                 break;
               case "full":
-                I = I.fullJoin(F.table, F.joinCondition);
+                N = N.fullJoin(F.table, F.joinCondition);
                 break;
             }
-            W.length > 0 && N.push(...W);
+            W.length > 0 && I.push(...W);
           } catch {
           }
         }
@@ -7574,28 +7574,28 @@ class te {
         try {
           switch (G) {
             case "left":
-              I = I.leftJoin(M, B), h && O.add(D.cube.name);
+              N = N.leftJoin(M, B), h && O.add(D.cube.name);
               break;
             case "inner":
-              I = I.innerJoin(M, g);
+              N = N.innerJoin(M, g);
               break;
             case "right":
-              I = I.rightJoin(M, B), h && O.add(D.cube.name);
+              N = N.rightJoin(M, B), h && O.add(D.cube.name);
               break;
             case "full":
-              I = I.fullJoin(M, B), h && O.add(D.cube.name);
+              N = N.fullJoin(M, B), h && O.add(D.cube.name);
               break;
           }
         } catch {
         }
       }
-    if (A.where && N.push(A.where), e.joinCubes && e.joinCubes.length > 0)
+    if (A.where && I.push(A.where), e.joinCubes && e.joinCubes.length > 0)
       for (const D of e.joinCubes) {
         const m = D.cube.name;
         if (r.get(m) || C.has(m) || O.has(m))
           continue;
         const M = D.cube.sql(E);
-        M.where && N.push(M.where);
+        M.where && I.push(M.where);
       }
     const u = this.queryBuilder.buildWhereConditions(
       e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : e.primaryCube,
@@ -7607,9 +7607,9 @@ class te {
       s
       // Reuse pre-built filters for parameter deduplication
     );
-    if (u.length > 0 && N.push(...u), N.length > 0) {
-      const D = N.length === 1 ? N[0] : y(...N);
-      I = I.where(D);
+    if (u.length > 0 && I.push(...u), I.length > 0) {
+      const D = I.length === 1 ? I[0] : y(...I);
+      N = N.where(D);
     }
     const l = this.queryBuilder.buildGroupByFields(
       e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : e.primaryCube,
@@ -7619,7 +7619,7 @@ class te {
       e
       // Pass the queryPlan to handle CTE scenarios
     );
-    l.length > 0 && (I = I.groupBy(...l));
+    l.length > 0 && (N = N.groupBy(...l));
     const _ = this.queryBuilder.buildHavingConditions(
       e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : e.primaryCube,
       // Single cube
@@ -7630,10 +7630,10 @@ class te {
     );
     if (_.length > 0) {
       const D = _.length === 1 ? _[0] : y(..._);
-      I = I.having(D);
+      N = N.having(D);
     }
     const U = this.queryBuilder.buildOrderBy(t);
-    return U.length > 0 && (I = I.orderBy(...U)), I = this.queryBuilder.applyLimitAndOffset(I, t), I;
+    return U.length > 0 && (N = N.orderBy(...U)), N = this.queryBuilder.applyLimitAndOffset(N, t), N;
   }
   /**
    * Convert query plan to cube map for QueryBuilder methods
@@ -7840,8 +7840,8 @@ class te {
         const S = R.dimensions?.[a];
         if (!S || ["arrayContains", "arrayOverlaps", "arrayContained"].includes(r.operator))
           continue;
-        const I = b(S.sql, s), O = this.queryBuilder.buildFilterConditionPublic(
-          I,
+        const N = b(S.sql, s), O = this.queryBuilder.buildFilterConditionPublic(
+          N,
           r.operator,
           r.values,
           S,
@@ -7859,8 +7859,8 @@ class te {
           if (!a) continue;
           const R = a.dimensions?.[A];
           if (!R) continue;
-          const S = b(R.sql, s), N = this.queryBuilder.buildDateRangeCondition(S, i.dateRange);
-          N && t.set(r, N);
+          const S = b(R.sql, s), I = this.queryBuilder.buildDateRangeCondition(S, i.dateRange);
+          I && t.set(r, I);
         }
     }
   }
@@ -7880,15 +7880,15 @@ class te {
    * @returns SQL expression for the window function
    */
   buildPostAggregationWindowExpression(e, t, E, s, i, r) {
-    const T = e.windowConfig || {}, A = (I, O) => {
+    const T = e.windowConfig || {}, A = (N, O) => {
       if (!r?.preAggregationCTEs) return null;
-      const C = r.preAggregationCTEs.find((u) => u.cube?.name === I);
+      const C = r.preAggregationCTEs.find((u) => u.cube?.name === N);
       return C && C.cteAlias ? o`${o.identifier(C.cteAlias)}.${o.identifier(O)}` : null;
     };
     let a;
     if (T.orderBy && T.orderBy.length > 0)
-      a = T.orderBy.map((I) => {
-        const O = I.field.includes(".") ? I.field.split(".")[1] : I.field;
+      a = T.orderBy.map((N) => {
+        const O = N.field.includes(".") ? N.field.split(".")[1] : N.field;
         if (E.timeDimensions)
           for (const l of E.timeDimensions) {
             const [_, U] = l.dimension.split(".");
@@ -7897,7 +7897,7 @@ class te {
               if (D)
                 return {
                   field: D,
-                  direction: I.direction
+                  direction: N.direction
                 };
               const m = i.dimensions?.[U];
               if (m)
@@ -7907,7 +7907,7 @@ class te {
                     l.granularity,
                     s
                   ),
-                  direction: I.direction
+                  direction: N.direction
                 };
             }
           }
@@ -7915,16 +7915,16 @@ class te {
         if (C)
           return {
             field: b(C.sql, s),
-            direction: I.direction
+            direction: N.direction
           };
         const u = T.measure?.includes(".") ? T.measure.split(".")[1] : T.measure;
-        return O === u || I.field === T.measure ? {
+        return O === u || N.field === T.measure ? {
           field: t,
-          direction: I.direction
+          direction: N.direction
         } : null;
-      }).filter((I) => I !== null);
+      }).filter((N) => N !== null);
     else if (E.timeDimensions && E.timeDimensions.length > 0) {
-      const I = E.timeDimensions[0], [O, C] = I.dimension.split("."), u = A(O, C);
+      const N = E.timeDimensions[0], [O, C] = N.dimension.split("."), u = A(O, C);
       if (u)
         a = [{
           field: u,
@@ -7937,7 +7937,7 @@ class te {
           a = [{
             field: this.queryBuilder.buildTimeDimensionExpression(
               _.sql,
-              I.granularity,
+              N.granularity,
               s
             ),
             direction: "asc"
@@ -7946,10 +7946,10 @@ class te {
       }
     }
     let R;
-    T.partitionBy && T.partitionBy.length > 0 && (R = T.partitionBy.map((I) => {
-      const O = I.includes(".") ? I.split(".")[1] : I, C = i.dimensions?.[O];
+    T.partitionBy && T.partitionBy.length > 0 && (R = T.partitionBy.map((N) => {
+      const O = N.includes(".") ? N.split(".")[1] : N, C = i.dimensions?.[O];
       return C ? b(C.sql, s) : null;
-    }).filter((I) => I !== null));
+    }).filter((N) => N !== null));
     const S = this.databaseAdapter.buildWindowFunction(
       e.type,
       t,
@@ -7978,8 +7978,8 @@ class te {
 }
 const L = (n) => n.flatMap(fs), fs = (n) => Le(gs(n)).map(hs), hs = (n) => n.replace(/ +/g, " ").trim(), gs = (n) => ({
   type: "mandatory_block",
-  items: Nt(n, 0)[0]
-}), Nt = (n, e, t) => {
+  items: It(n, 0)[0]
+}), It = (n, e, t) => {
   const E = [];
   for (; n[e]; ) {
     const [s, i] = Gs(n, e);
@@ -8019,10 +8019,10 @@ const L = (n) => n.flatMap(fs), fs = (n) => Le(gs(n)).map(hs), hs = (n) => n.rep
     return [t, e];
   }
 }, bs = (n, e) => {
-  const [t, E] = Nt(n, e, "}");
+  const [t, E] = It(n, e, "}");
   return [{ type: "mandatory_block", items: t }, E];
 }, Fs = (n, e) => {
-  const [t, E] = Nt(n, e, "]");
+  const [t, E] = It(n, e, "]");
   return [{ type: "optional_block", items: t }, E];
 }, Le = (n) => {
   if (typeof n == "string")
@@ -12278,7 +12278,7 @@ const on = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], Sn = L(["SELECT [ALL | DISTINCT]"]), Nn = L([
+], Sn = L(["SELECT [ALL | DISTINCT]"]), In = L([
   // queries
   "WITH",
   "FROM",
@@ -12512,7 +12512,7 @@ const on = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), In = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), On = L([
+]), Nn = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), On = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
@@ -12525,8 +12525,8 @@ const on = [
   name: "db2",
   tokenizerOptions: {
     reservedSelect: Sn,
-    reservedClauses: [...Nn, ...bt, ...Ye],
-    reservedSetOperations: In,
+    reservedClauses: [...In, ...bt, ...Ye],
+    reservedSetOperations: Nn,
     reservedJoins: On,
     reservedKeywordPhrases: Cn,
     reservedDataTypePhrases: ln,
@@ -16566,7 +16566,7 @@ const kn = [
   "MBRTOUCHES",
   "MBRWITHIN",
   "MD5",
-  "MEMBER OF",
+  // 'MEMBER OF',
   "MICROSECOND",
   "MID",
   "MIN",
@@ -16578,10 +16578,10 @@ const kn = [
   "MULTIPOINT",
   "MULTIPOLYGON",
   "NAME_CONST",
-  "NOT",
-  "NOT IN",
-  "NOT LIKE",
-  "NOT REGEXP",
+  // 'NOT',
+  // 'NOT IN',
+  // 'NOT LIKE',
+  // 'NOT REGEXP',
   "NOW",
   "NTH_VALUE",
   "NTILE",
@@ -16987,7 +16987,7 @@ const kn = [
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), Ni = L([]), Ii = {
+]), Ii = L([]), Ni = {
   name: "mysql",
   tokenizerOptions: {
     reservedSelect: ai,
@@ -16995,7 +16995,7 @@ const kn = [
     reservedSetOperations: Ai,
     reservedJoins: Ri,
     reservedKeywordPhrases: Si,
-    reservedDataTypePhrases: Ni,
+    reservedDataTypePhrases: Ii,
     supportsXor: !0,
     reservedKeywords: ii,
     reservedDataTypes: ri,
@@ -21268,7 +21268,7 @@ const xi = [
   "UNSIGNED",
   "VARIABLES",
   "YEAR_MONTH"
-], Nr = [
+], Ir = [
   // https://spark.apache.org/docs/latest/sql-ref-datatypes.html
   "ARRAY",
   "BIGINT",
@@ -21298,7 +21298,7 @@ const xi = [
   "TINYINT",
   "VARCHAR"
   // No varchar type in Spark, only STRING. Added for the sake of tests
-], Ir = [
+], Nr = [
   // http://spark.apache.org/docs/latest/sql-ref-functions.html
   //
   // http://spark.apache.org/docs/latest/sql-ref-functions-builtin.html#aggregate-functions
@@ -21729,8 +21729,8 @@ const xi = [
     reservedDataTypePhrases: _r,
     supportsXor: !0,
     reservedKeywords: Sr,
-    reservedDataTypes: Nr,
-    reservedFunctionNames: Ir,
+    reservedDataTypes: Ir,
+    reservedFunctionNames: Nr,
     extraParens: ["[]"],
     stringTypes: [
       "''-bs",
@@ -24712,7 +24712,7 @@ const Dr = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], ST = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), NT = L([
+], ST = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), IT = L([
   // queries
   "WITH",
   "FROM",
@@ -24913,7 +24913,7 @@ const Dr = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), IT = L([
+]), NT = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
@@ -24935,8 +24935,8 @@ const Dr = [
   name: "singlestoredb",
   tokenizerOptions: {
     reservedSelect: ST,
-    reservedClauses: [...NT, ...qt, ...ze],
-    reservedSetOperations: IT,
+    reservedClauses: [...IT, ...qt, ...ze],
+    reservedSetOperations: NT,
     reservedJoins: OT,
     reservedKeywordPhrases: CT,
     reservedDataTypePhrases: lT,
@@ -26056,7 +26056,7 @@ const Dr = [
   duckdb: Yn,
   hive: Qn,
   mariadb: ni,
-  mysql: Ii,
+  mysql: Ni,
   n1ql: bi,
   plsql: Xi,
   postgresql: tr,
@@ -26069,7 +26069,7 @@ const Dr = [
   tidb: mi,
   transactsql: aT,
   trino: Zr
-}, Symbol.toStringTag, { value: "Module" })), Ne = (n) => n[n.length - 1], _E = (n) => n.sort((e, t) => t.length - e.length || e.localeCompare(t)), _e = (n) => n.replace(/\s+/gu, " "), tt = (n) => /\n/.test(n), x = (n) => n.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), Zt = /\s+/uy, ne = (n) => new RegExp(`(?:${n})`, "uy"), hT = (n) => n.split("").map((e) => / /gu.test(e) ? "\\s+" : `[${e.toUpperCase()}${e.toLowerCase()}]`).join(""), gT = (n) => n + "(?:-" + n + ")*", GT = ({ prefixes: n, requirePrefix: e }) => `(?:${n.map(hT).join("|")}${e ? "" : "|"})`, yT = (n) => new RegExp(`(?:${n.map(x).join("|")}).*?(?=\r
+}, Symbol.toStringTag, { value: "Module" })), Ie = (n) => n[n.length - 1], _E = (n) => n.sort((e, t) => t.length - e.length || e.localeCompare(t)), _e = (n) => n.replace(/\s+/gu, " "), tt = (n) => /\n/.test(n), x = (n) => n.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), Zt = /\s+/uy, ne = (n) => new RegExp(`(?:${n})`, "uy"), hT = (n) => n.split("").map((e) => / /gu.test(e) ? "\\s+" : `[${e.toUpperCase()}${e.toLowerCase()}]`).join(""), gT = (n) => n + "(?:-" + n + ")*", GT = ({ prefixes: n, requirePrefix: e }) => `(?:${n.map(hT).join("|")}${e ? "" : "|"})`, yT = (n) => new RegExp(`(?:${n.map(x).join("|")}).*?(?=\r
 |\r|
 |$)`, "uy"), zt = (n, e = []) => {
   const t = n === "open" ? 0 : 1, E = ["()", ...e].map((s) => s[t]);
@@ -26513,8 +26513,8 @@ function qT() {
         var R = typeof a > "u" ? this.symbols.map(A).join(" ") : this.symbols.slice(0, a).map(A).join(" ") + " ● " + this.symbols.slice(a).map(A).join(" ");
         return this.name + " → " + R;
       };
-      function t(a, R, S, N) {
-        this.rule = a, this.dot = R, this.reference = S, this.data = [], this.wantedBy = N, this.isComplete = this.dot === a.symbols.length;
+      function t(a, R, S, I) {
+        this.rule = a, this.dot = R, this.reference = S, this.data = [], this.wantedBy = I, this.isComplete = this.dot === a.symbols.length;
       }
       t.prototype.toString = function() {
         return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
@@ -26534,8 +26534,8 @@ function qT() {
         this.grammar = a, this.index = R, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
       }
       E.prototype.process = function(a) {
-        for (var R = this.states, S = this.wants, N = this.completed, I = 0; I < R.length; I++) {
-          var O = R[I];
+        for (var R = this.states, S = this.wants, I = this.completed, N = 0; N < R.length; N++) {
+          var O = R[N];
           if (O.isComplete) {
             if (O.finish(), O.data !== r.fail) {
               for (var C = O.wantedBy, u = C.length; u--; ) {
@@ -26554,8 +26554,8 @@ function qT() {
               continue;
             }
             if (S[_]) {
-              if (S[_].push(O), N.hasOwnProperty(_))
-                for (var U = N[_], u = 0; u < U.length; u++) {
+              if (S[_].push(O), I.hasOwnProperty(_))
+                for (var U = I[_], u = 0; u < U.length; u++) {
                   var D = U[u];
                   this.complete(O, D);
                 }
@@ -26565,7 +26565,7 @@ function qT() {
         }
       }, E.prototype.predict = function(a) {
         for (var R = this.grammar.byName[a] || [], S = 0; S < R.length; S++) {
-          var N = R[S], I = this.wants[a], O = new t(N, 0, this.index, I);
+          var I = R[S], N = this.wants[a], O = new t(I, 0, this.index, N);
           this.states.push(O);
         }
       }, E.prototype.complete = function(a, R) {
@@ -26575,17 +26575,17 @@ function qT() {
       function s(a, R) {
         this.rules = a, this.start = R || this.rules[0].name;
         var S = this.byName = {};
-        this.rules.forEach(function(N) {
-          S.hasOwnProperty(N.name) || (S[N.name] = []), S[N.name].push(N);
+        this.rules.forEach(function(I) {
+          S.hasOwnProperty(I.name) || (S[I.name] = []), S[I.name].push(I);
         });
       }
-      s.fromCompiled = function(N, R) {
-        var S = N.Lexer;
-        N.ParserStart && (R = N.ParserStart, N = N.ParserRules);
-        var N = N.map(function(O) {
+      s.fromCompiled = function(I, R) {
+        var S = I.Lexer;
+        I.ParserStart && (R = I.ParserStart, I = I.ParserRules);
+        var I = I.map(function(O) {
           return new e(O.name, O.symbols, O.postprocess);
-        }), I = new s(N, R);
-        return I.lexer = S, I;
+        }), N = new s(I, R);
+        return N.lexer = S, N;
       };
       function i() {
         this.reset("");
@@ -26606,18 +26606,18 @@ function qT() {
       }, i.prototype.formatError = function(a, R) {
         var S = this.buffer;
         if (typeof S == "string") {
-          var N = S.split(`
+          var I = S.split(`
 `).slice(
             Math.max(0, this.line - 5),
             this.line
-          ), I = S.indexOf(`
+          ), N = S.indexOf(`
 `, this.index);
-          I === -1 && (I = S.length);
+          N === -1 && (N = S.length);
           var O = this.index - this.lastLineBreak, C = String(this.line).length;
           return R += " at line " + this.line + " col " + O + `:
 
-`, R += N.map(function(l, _) {
-            return u(this.line - N.length + _ + 1, C) + " " + l;
+`, R += I.map(function(l, _) {
+            return u(this.line - I.length + _ + 1, C) + " " + l;
           }, this).join(`
 `), R += `
 ` + u("", C + O) + `^
@@ -26631,18 +26631,18 @@ function qT() {
       };
       function r(a, R, S) {
         if (a instanceof s)
-          var N = a, S = R;
+          var I = a, S = R;
         else
-          var N = s.fromCompiled(a, R);
-        this.grammar = N, this.options = {
+          var I = s.fromCompiled(a, R);
+        this.grammar = I, this.options = {
           keepHistory: !1,
-          lexer: N.lexer || new i()
+          lexer: I.lexer || new i()
         };
-        for (var I in S || {})
-          this.options[I] = S[I];
+        for (var N in S || {})
+          this.options[N] = S[N];
         this.lexer = this.options.lexer, this.lexerState = void 0;
-        var O = new E(N, 0);
-        this.table = [O], O.wants[N.start] = [], O.predict(N.start), O.process(), this.current = 0;
+        var O = new E(I, 0);
+        this.table = [O], O.wants[I.start] = [], O.predict(I.start), O.process(), this.current = 0;
       }
       r.fail = {}, r.prototype.feed = function(a) {
         var R = this.lexer;
@@ -26654,14 +26654,14 @@ function qT() {
           } catch (M) {
             var C = new E(this.grammar, this.current + 1);
             this.table.push(C);
-            var N = new Error(this.reportLexerError(M));
-            throw N.offset = this.current, N.token = M.token, N;
+            var I = new Error(this.reportLexerError(M));
+            throw I.offset = this.current, I.token = M.token, I;
           }
-          var I = this.table[this.current];
+          var N = this.table[this.current];
           this.options.keepHistory || delete this.table[this.current - 1];
           var O = this.current + 1, C = new E(this.grammar, O);
           this.table.push(C);
-          for (var u = S.text !== void 0 ? S.text : S.value, l = R.constructor === i ? S.value : S, _ = I.scannable, U = _.length; U--; ) {
+          for (var u = S.text !== void 0 ? S.text : S.value, l = R.constructor === i ? S.value : S, _ = N.scannable, U = _.length; U--; ) {
             var D = _[U], m = D.rule.symbols[D.dot];
             if (m.test ? m.test(l) : m.type ? m.type === S.type : m.literal === u) {
               var P = D.nextState({ data: l, token: S, isToken: !0, reference: O - 1 });
@@ -26669,28 +26669,28 @@ function qT() {
             }
           }
           if (C.process(), C.states.length === 0) {
-            var N = new Error(this.reportError(S));
-            throw N.offset = this.current, N.token = S, N;
+            var I = new Error(this.reportError(S));
+            throw I.offset = this.current, I.token = S, I;
           }
-          this.options.keepHistory && (I.lexerState = R.save()), this.current++;
+          this.options.keepHistory && (N.lexerState = R.save()), this.current++;
         }
-        return I && (this.lexerState = R.save()), this.results = this.finish(), this;
+        return N && (this.lexerState = R.save()), this.results = this.finish(), this;
       }, r.prototype.reportLexerError = function(a) {
-        var R, S, N = a.token;
-        return N ? (R = "input " + JSON.stringify(N.text[0]) + " (lexer error)", S = this.lexer.formatError(N, "Syntax error")) : (R = "input (lexer error)", S = a.message), this.reportErrorCommon(S, R);
+        var R, S, I = a.token;
+        return I ? (R = "input " + JSON.stringify(I.text[0]) + " (lexer error)", S = this.lexer.formatError(I, "Syntax error")) : (R = "input (lexer error)", S = a.message), this.reportErrorCommon(S, R);
       }, r.prototype.reportError = function(a) {
         var R = (a.type ? a.type + " token: " : "") + JSON.stringify(a.value !== void 0 ? a.value : a), S = this.lexer.formatError(a, "Syntax error");
         return this.reportErrorCommon(S, R);
       }, r.prototype.reportErrorCommon = function(a, R) {
         var S = [];
         S.push(a);
-        var N = this.table.length - 2, I = this.table[N], O = I.states.filter(function(u) {
+        var I = this.table.length - 2, N = this.table[I], O = N.states.filter(function(u) {
           var l = u.rule.symbols[u.dot];
           return l && typeof l != "string";
         });
         if (O.length === 0)
           S.push("Unexpected " + R + `. I did not expect any more input. Here is the state of my parse table:
-`), this.displayStateStack(I.states, S);
+`), this.displayStateStack(N.states, S);
         else {
           S.push("Unexpected " + R + `. Instead, I was expecting to see one of the following:
 `);
@@ -26705,9 +26705,9 @@ function qT() {
         return S.push(""), S.join(`
 `);
       }, r.prototype.displayStateStack = function(a, R) {
-        for (var S, N = 0, I = 0; I < a.length; I++) {
-          var O = a[I], C = O.rule.toString(O.dot);
-          C === S ? N++ : (N > 0 && R.push("    ^ " + N + " more lines identical to this"), N = 0, R.push("    " + C)), S = C;
+        for (var S, I = 0, N = 0; N < a.length; N++) {
+          var O = a[N], C = O.rule.toString(O.dot);
+          C === S ? I++ : (I > 0 && R.push("    ^ " + I + " more lines identical to this"), I = 0, R.push("    " + C)), S = C;
         }
       }, r.prototype.getSymbolDisplay = function(a) {
         return T(a);
@@ -26716,8 +26716,8 @@ function qT() {
           return null;
         if (a.wantedBy.length === 0)
           return [a];
-        var S = a.wantedBy[0], N = [a].concat(R), I = this.buildFirstStateStack(S, N);
-        return I === null ? null : [a].concat(I);
+        var S = a.wantedBy[0], I = [a].concat(R), N = this.buildFirstStateStack(S, I);
+        return N === null ? null : [a].concat(N);
       }, r.prototype.save = function() {
         var a = this.table[this.current];
         return a.lexerState = this.lexerState, a;
@@ -26730,10 +26730,10 @@ function qT() {
         this.restore(this.table[a]);
       }, r.prototype.finish = function() {
         var a = [], R = this.grammar.start, S = this.table[this.table.length - 1];
-        return S.states.forEach(function(N) {
-          N.rule.name === R && N.dot === N.rule.symbols.length && N.reference === 0 && N.data !== r.fail && a.push(N);
-        }), a.map(function(N) {
-          return N.data;
+        return S.states.forEach(function(I) {
+          I.rule.name === R && I.dot === I.rule.symbols.length && I.reference === 0 && I.data !== r.fail && a.push(I);
+        }), a.map(function(I) {
+          return I.data;
         });
       };
       function T(a) {
@@ -27326,16 +27326,16 @@ class UE {
       }
   }
   trimHorizontalWhitespace() {
-    for (; Sa(Ne(this.items)); )
+    for (; Sa(Ie(this.items)); )
       this.items.pop();
   }
   trimWhitespace() {
-    for (; Na(Ne(this.items)); )
+    for (; Ia(Ie(this.items)); )
       this.items.pop();
   }
   addNewline(e) {
     if (this.items.length > 0)
-      switch (Ne(this.items)) {
+      switch (Ie(this.items)) {
         case c.NEWLINE:
           this.items.pop(), this.items.push(e);
           break;
@@ -27377,7 +27377,7 @@ class UE {
     }
   }
 }
-const Sa = (n) => n === c.SPACE || n === c.SINGLE_INDENT, Na = (n) => n === c.SPACE || n === c.SINGLE_INDENT || n === c.NEWLINE;
+const Sa = (n) => n === c.SPACE || n === c.SINGLE_INDENT, Ia = (n) => n === c.SPACE || n === c.SINGLE_INDENT || n === c.NEWLINE;
 function TE(n, e) {
   if (e === "standard")
     return n;
@@ -27387,7 +27387,7 @@ function TE(n, e) {
 function aE(n) {
   return Hs(n) || n === d.RESERVED_CLAUSE || n === d.RESERVED_SELECT || n === d.RESERVED_SET_OPERATION || n === d.RESERVED_JOIN || n === d.LIMIT;
 }
-const nt = "top-level", Ia = "block-level";
+const nt = "top-level", Na = "block-level";
 class fE {
   /**
    * @param {string} indent A string to indent with
@@ -27417,14 +27417,14 @@ class fE {
    * Increases indentation by one block-level indent.
    */
   increaseBlockLevel() {
-    this.indentTypes.push(Ia);
+    this.indentTypes.push(Na);
   }
   /**
    * Decreases indentation by one top-level indent.
    * Does nothing when the previous indent is not top-level.
    */
   decreaseTopLevel() {
-    this.indentTypes.length > 0 && Ne(this.indentTypes) === nt && this.indentTypes.pop();
+    this.indentTypes.length > 0 && Ie(this.indentTypes) === nt && this.indentTypes.pop();
   }
   /**
    * Decreases indentation by one block-level indent.
@@ -27631,7 +27631,7 @@ class Pe {
       // first line starts with /* or /**
       /^\/\*\*?$/.test(t[0]) && // intermediate lines start with *
       t.slice(1, t.length - 1).every((E) => /^\s*\*/.test(E)) && // last line ends with */
-      /^\s*\*\/$/.test(Ne(t))
+      /^\s*\*\/$/.test(Ie(t))
     );
   }
   // Breaks up block comment to multiple lines.
@@ -27897,7 +27897,7 @@ function Se(n, e) {
     return console.warn("SQL formatting failed:", t), n;
   }
 }
-class It {
+class Nt {
   cubes = /* @__PURE__ */ new Map();
   dbExecutor;
   metadataCache;
@@ -28074,8 +28074,8 @@ ${t.join(`
     const t = Object.keys(e.measures), E = Object.keys(e.dimensions), s = new Array(t.length), i = new Array(E.length);
     for (let a = 0; a < t.length; a++) {
       const R = t[a], S = e.measures[R];
-      let N;
-      S.drillMembers && S.drillMembers.length > 0 && (N = S.drillMembers.map((I) => I.includes(".") ? I : `${e.name}.${I}`)), s[a] = {
+      let I;
+      S.drillMembers && S.drillMembers.length > 0 && (I = S.drillMembers.map((N) => N.includes(".") ? N : `${e.name}.${N}`)), s[a] = {
         name: `${e.name}.${R}`,
         title: S.title || R,
         shortTitle: S.title || R,
@@ -28084,13 +28084,13 @@ ${t.join(`
         // Measure doesn't have format field
         description: S.description,
         synonyms: S.synonyms,
-        drillMembers: N
+        drillMembers: I
       };
     }
     for (let a = 0; a < E.length; a++) {
       const R = E[a], S = e.dimensions[R];
-      let N;
-      S.type === "time" && (N = S.granularities || It.DEFAULT_TIME_GRANULARITIES), i[a] = {
+      let I;
+      S.type === "time" && (I = S.granularities || Nt.DEFAULT_TIME_GRANULARITIES), i[a] = {
         name: `${e.name}.${R}`,
         title: S.title || R,
         shortTitle: S.title || R,
@@ -28099,7 +28099,7 @@ ${t.join(`
         // Dimension doesn't have format field
         description: S.description,
         synonyms: S.synonyms,
-        granularities: N
+        granularities: I
       };
     }
     const r = [];
@@ -29301,30 +29301,30 @@ function ya(n, e) {
     R > 0.5 && (t += R * 2, E.includes("name") || E.push("name"));
     const S = v(a, n.title);
     if (S > 0.5 && (t += S * 1.5, E.includes("title") || E.push("title")), n.description) {
-      const N = v(a, n.description);
-      N > 0.3 && (t += N, E.includes("description") || E.push("description"));
+      const I = v(a, n.description);
+      I > 0.3 && (t += I, E.includes("description") || E.push("description"));
     }
     if (n.exampleQuestions)
-      for (const N of n.exampleQuestions) {
-        const I = v(a, N);
-        I > 0.3 && (t += I * 1.5, E.includes("exampleQuestions") || E.push("exampleQuestions"));
+      for (const I of n.exampleQuestions) {
+        const N = v(a, I);
+        N > 0.3 && (t += N * 1.5, E.includes("exampleQuestions") || E.push("exampleQuestions"));
       }
-    for (const N of n.measures) {
-      let I = 0;
-      const O = N.name.split(".").pop() || N.name;
-      if (I = Math.max(I, v(a, O)), I = Math.max(I, v(a, N.title)), N.description && (I = Math.max(I, v(a, N.description) * 0.8)), N.synonyms && (I = Math.max(I, pe(a, N.synonyms))), I > 0.4) {
-        t += I, E.includes("measures") || E.push("measures");
-        const C = s.get(N.name) || 0;
-        s.set(N.name, Math.max(C, I));
+    for (const I of n.measures) {
+      let N = 0;
+      const O = I.name.split(".").pop() || I.name;
+      if (N = Math.max(N, v(a, O)), N = Math.max(N, v(a, I.title)), I.description && (N = Math.max(N, v(a, I.description) * 0.8)), I.synonyms && (N = Math.max(N, pe(a, I.synonyms))), N > 0.4) {
+        t += N, E.includes("measures") || E.push("measures");
+        const C = s.get(I.name) || 0;
+        s.set(I.name, Math.max(C, N));
       }
     }
-    for (const N of n.dimensions) {
-      let I = 0;
-      const O = N.name.split(".").pop() || N.name;
-      if (I = Math.max(I, v(a, O)), I = Math.max(I, v(a, N.title)), N.description && (I = Math.max(I, v(a, N.description) * 0.8)), N.synonyms && (I = Math.max(I, pe(a, N.synonyms))), I > 0.4) {
-        t += I, E.includes("dimensions") || E.push("dimensions");
-        const C = i.get(N.name) || 0;
-        i.set(N.name, Math.max(C, I));
+    for (const I of n.dimensions) {
+      let N = 0;
+      const O = I.name.split(".").pop() || I.name;
+      if (N = Math.max(N, v(a, O)), N = Math.max(N, v(a, I.title)), I.description && (N = Math.max(N, v(a, I.description) * 0.8)), I.synonyms && (N = Math.max(N, pe(a, I.synonyms))), N > 0.4) {
+        t += N, E.includes("dimensions") || E.push("dimensions");
+        const C = i.get(I.name) || 0;
+        i.set(I.name, Math.max(C, N));
       }
     }
   }
@@ -29400,7 +29400,7 @@ function ba(n, e = {}) {
   const { topic: t, intent: E, limit: s = 10, minScore: i = 0.1 } = e, r = [t, E].filter(Boolean).join(" ");
   if (!r.trim())
     return n.slice(0, s).map((a) => {
-      const R = Rt(a), S = AE(a), N = RE(a, S), I = R.funnel || R.flow || R.retention;
+      const R = Rt(a), S = AE(a), I = RE(a, S), N = R.funnel || R.flow || R.retention;
       return {
         cube: a.name,
         title: a.title,
@@ -29411,8 +29411,8 @@ function ba(n, e = {}) {
         suggestedDimensions: a.dimensions.slice(0, 5).map((O) => O.name),
         capabilities: R,
         analysisConfig: S,
-        hints: N.length > 0 ? N : void 0,
-        querySchemas: I ? oE : void 0
+        hints: I.length > 0 ? I : void 0,
+        querySchemas: N ? oE : void 0
       };
     });
   const T = Ga(r);
@@ -29420,7 +29420,7 @@ function ba(n, e = {}) {
     return [];
   const A = [];
   for (const a of n) {
-    const { score: R, matchedOn: S, suggestedMeasures: N, suggestedDimensions: I } = ya(a, T);
+    const { score: R, matchedOn: S, suggestedMeasures: I, suggestedDimensions: N } = ya(a, T);
     if (R >= i) {
       const O = Rt(a), C = AE(a), u = RE(a, C), l = O.funnel || O.flow || O.retention;
       A.push({
@@ -29429,8 +29429,8 @@ function ba(n, e = {}) {
         description: a.description,
         relevanceScore: R,
         matchedOn: S,
-        suggestedMeasures: N,
-        suggestedDimensions: I,
+        suggestedMeasures: I,
+        suggestedDimensions: N,
         capabilities: O,
         analysisConfig: C,
         hints: u.length > 0 ? u : void 0,
@@ -29635,7 +29635,7 @@ function Ha(n) {
         }
       }
       if (/^q[1-4]$/i.test(s[0])) {
-        const i = parseInt(s[1], 10), T = (/* @__PURE__ */ new Date()).getFullYear(), A = (i - 1) * 3, a = new Date(T, A, 1), R = new Date(T, A + 3, 0), S = (N) => N.toISOString().split("T")[0];
+        const i = parseInt(s[1], 10), T = (/* @__PURE__ */ new Date()).getFullYear(), A = (i - 1) * 3, a = new Date(T, A, 1), R = new Date(T, A + 3, 0), S = (I) => I.toISOString().split("T")[0];
         return { dateRange: [S(a), S(R)], granularity: "month" };
       }
       return { dateRange: E.getDateRange(), granularity: E.granularity };
@@ -29692,7 +29692,7 @@ function so(n, e, t) {
   let a = 0.5;
   const R = Ya(e);
   R && (E.push(`Detected ${R.type} aggregation intent`), a += 0.1);
-  const S = [], N = e.toLowerCase();
+  const S = [], I = e.toLowerCase();
   for (const u of A.measures) {
     const _ = [
       (u.name.split(".").pop() || u.name).toLowerCase(),
@@ -29700,7 +29700,7 @@ function so(n, e, t) {
       ...(u.synonyms || []).map((U) => U.toLowerCase())
     ];
     for (const U of _)
-      if (N.includes(U)) {
+      if (I.includes(U)) {
         S.push(u.name), E.push(`Matched measure '${u.name}' via keyword '${U}'`), a += 0.15;
         break;
       }
@@ -29717,8 +29717,8 @@ function so(n, e, t) {
     }
   }
   S.length === 0 && A.measures.length > 0 && (S.push(A.measures[0].name), E.push(`Using default measure: ${A.measures[0].name}`), s.push("Could not determine specific measure from query, using default")), i.measures = S;
-  const I = Va(e), O = [];
-  for (const u of I) {
+  const N = Va(e), O = [];
+  for (const u of N) {
     const l = Ot(T, u, "dimension");
     l && (O.push(l.field), E.push(`Matched dimension '${l.field}' from grouping keyword '${u}'`), a += 0.1);
   }
@@ -29730,7 +29730,7 @@ function so(n, e, t) {
         ...(l.synonyms || []).map((D) => D.toLowerCase())
       ];
       for (const D of U)
-        if (N.includes(D) && !O.includes(l.name) && (N.includes(`by ${D}`) || N.includes(`per ${D}`))) {
+        if (I.includes(D) && !O.includes(l.name) && (I.includes(`by ${D}`) || I.includes(`per ${D}`))) {
           O.push(l.name), E.push(`Matched dimension '${l.name}' as grouping`), a += 0.1;
           break;
         }
@@ -29831,16 +29831,16 @@ function wa(n, e, t, E) {
         correctedValue: a.field
       }), E.set(n, a.field);
     else {
-      const R = T.measures.map((N) => N.name.split(".").pop()), S = Ae(r, R);
+      const R = T.measures.map((I) => I.name.split(".").pop()), S = Ae(r, R);
       if (S) {
-        const N = `${i}.${S.field}`;
+        const I = `${i}.${S.field}`;
         t.push({
           type: "measure_not_found",
           message: `Measure '${r}' not found on cube '${i}'`,
           field: n,
           suggestion: `Did you mean '${S.field}'?`,
-          correctedValue: N
-        }), E.set(n, N);
+          correctedValue: I
+        }), E.set(n, I);
       } else
         t.push({
           type: "measure_not_found",
@@ -29889,16 +29889,16 @@ function q(n, e, t, E) {
         correctedValue: a.field
       }), E.set(n, a.field);
     else {
-      const R = T.dimensions.map((N) => N.name.split(".").pop()), S = Ae(r, R);
+      const R = T.dimensions.map((I) => I.name.split(".").pop()), S = Ae(r, R);
       if (S) {
-        const N = `${i}.${S.field}`;
+        const I = `${i}.${S.field}`;
         t.push({
           type: "dimension_not_found",
           message: `Dimension '${r}' not found on cube '${i}'`,
           field: n,
           suggestion: `Did you mean '${S.field}'?`,
-          correctedValue: N
-        }), E.set(n, N);
+          correctedValue: I
+        }), E.set(n, I);
       } else
         t.push({
           type: "dimension_not_found",
@@ -29929,31 +29929,31 @@ function Me(n, e, t, E) {
         });
         continue;
       }
-      const [T, A] = r, a = e.find((N) => N.name === T);
+      const [T, A] = r, a = e.find((I) => I.name === T);
       if (!a) {
-        const N = e.map((O) => O.name), I = Ae(T, N);
-        I && E.set(i, `${I.field}.${A}`), t.push({
+        const I = e.map((O) => O.name), N = Ae(T, I);
+        N && E.set(i, `${N.field}.${A}`), t.push({
           type: "cube_not_found",
           message: `Cube '${T}' not found in filter`,
           field: i,
-          suggestion: I ? `Did you mean '${I.field}'?` : void 0,
-          correctedValue: I ? `${I.field}.${A}` : void 0
+          suggestion: N ? `Did you mean '${N.field}'?` : void 0,
+          correctedValue: N ? `${N.field}.${A}` : void 0
         });
         continue;
       }
-      const R = a.dimensions.some((N) => N.name === i), S = a.measures.some((N) => N.name === i);
+      const R = a.dimensions.some((I) => I.name === i), S = a.measures.some((I) => I.name === i);
       if (!R && !S) {
-        const N = [
+        const I = [
           ...a.dimensions.map((O) => O.name.split(".").pop()),
           ...a.measures.map((O) => O.name.split(".").pop())
-        ], I = Ae(A, N);
-        if (I) {
-          const O = `${T}.${I.field}`;
+        ], N = Ae(A, I);
+        if (N) {
+          const O = `${T}.${N.field}`;
           E.set(i, O), t.push({
             type: "invalid_filter",
             message: `Filter field '${A}' not found on cube '${T}'`,
             field: i,
-            suggestion: `Did you mean '${I.field}'?`,
+            suggestion: `Did you mean '${N.field}'?`,
             correctedValue: O
           });
         } else
@@ -30102,7 +30102,7 @@ function no(n, e) {
   };
 }
 function io(n) {
-  return new It({
+  return new Nt({
     drizzle: n.drizzle,
     schema: n.schema
   });
@@ -30112,7 +30112,7 @@ export {
   is as DuckDBExecutor,
   ha as EXPLAIN_ANALYSIS_PROMPT,
   ka as MemoryCacheProvider,
-  IE as MySQLExecutor,
+  NE as MySQLExecutor,
   JE as PostgresExecutor,
   ls as QueryBuilder,
   te as QueryExecutor,
@@ -30122,7 +30122,7 @@ export {
   Ua as STEP1_SYSTEM_PROMPT,
   fa as STEP2_SYSTEM_PROMPT,
   Ma as SYSTEM_PROMPT_TEMPLATE,
-  It as SemanticLayerCompiler,
+  Nt as SemanticLayerCompiler,
   no as aiValidateQuery,
   eo as buildExplainAnalysisPrompt,
   qa as buildStep0Prompt,