drizzle-cube 0.3.32 → 0.3.33

package/dist/adapters/{mcp-transport-B2rGcu1X.js → mcp-transport-n-4QT0Xg.js}

@@ -418,7 +418,7 @@ function x(d, e) {
   return St(e) && !st(d) && !L(d, ce) && !L(d, de) && !L(d, se) && !L(d, P) && !L(d, ot) ? new ce(d, e) : d;
 }
 const Q = (d, e) => o`${d} = ${x(e, d)}`, xe = (d, e) => o`${d} <> ${x(e, d)}`;
-function A(...d) {
+function _(...d) {
   const e = d.filter(
     (t) => t !== void 0
   );
@@ -2534,7 +2534,7 @@ function _e(d, e) {
 function ve(d) {
   return d && typeof d == "object" ? o`${o`${d}`}` : d;
 }
-function R(d, e) {
+function v(d, e) {
   const t = typeof d == "function" ? d(e) : d;
   return ve(t);
 }
@@ -2562,13 +2562,13 @@ function Xt(d, e) {
       {
         joinType: c,
         table: t,
-        condition: A(...r)
+        condition: _(...r)
       },
       {
         joinType: c,
         table: t,
         // This will be replaced with target cube table in query planner
-        condition: A(...a)
+        condition: _(...a)
       }
     ],
     junctionSecurityConditions: u
@@ -2774,7 +2774,7 @@ class ie {
    * Build time dimension expression with granularity using database adapter
    */
   buildTimeDimensionExpression(e, t, n) {
-    const s = R(e, n);
+    const s = v(e, n);
     return t ? this.databaseAdapter.buildTimeDimension(t, s) : s instanceof O ? s : o`${s}`;
   }
   /**
@@ -2790,7 +2790,7 @@ class ie {
         const i = typeof s == "number" ? new Date(s * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(s), r = new Date(i);
         r.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? s = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(r.getTime() / 1e3) : r.getTime() : s = r.toISOString();
       }
-      return A(
+      return _(
         Z(e, n),
         ee(e, s)
       );
@@ -2799,7 +2799,7 @@ class ie {
       const n = this.parseRelativeDateRange(t);
       if (n) {
         let l, m;
-        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (l = Math.floor(n.start.getTime() / 1e3), m = Math.floor(n.end.getTime() / 1e3)) : (l = n.start.getTime(), m = n.end.getTime()) : (l = n.start.toISOString(), m = n.end.toISOString()), A(
+        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (l = Math.floor(n.start.getTime() / 1e3), m = Math.floor(n.end.getTime() / 1e3)) : (l = n.start.getTime(), m = n.end.getTime()) : (l = n.start.toISOString(), m = n.end.toISOString()), _(
           Z(e, l),
           ee(e, m)
         );
@@ -2811,7 +2811,7 @@ class ie {
       const a = new Date(i);
       a.setUTCHours(23, 59, 59, 999);
       let u, c;
-      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (u = Math.floor(r.getTime() / 1e3), c = Math.floor(a.getTime() / 1e3)) : (u = r.getTime(), c = a.getTime()) : (u = r.toISOString(), c = a.toISOString()), A(
+      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (u = Math.floor(r.getTime() / 1e3), c = Math.floor(a.getTime() / 1e3)) : (u = r.getTime(), c = a.getTime()) : (u = r.toISOString(), c = a.toISOString()), _(
         Z(e, u),
         ee(e, c)
       );
@@ -2997,7 +2997,7 @@ class ge {
               const m = typeof c == "number" ? new Date(c * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(c), p = new Date(m);
               p.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? c = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(p.getTime() / 1e3) : p.getTime() : c = p.toISOString();
             }
-            return A(
+            return _(
               Z(e, u),
               ee(e, c)
             );
@@ -3013,7 +3013,7 @@ class ge {
         return u ? $e(e, u) : null;
       }
       case "between":
-        return r.length >= 2 ? A(
+        return r.length >= 2 ? _(
           Z(e, r[0]),
           ee(e, r[1])
         ) : null;
@@ -3042,7 +3042,7 @@ class ge {
           Q(e, "")
         );
       case "isNotEmpty":
-        return A(
+        return _(
           Pe(e),
           xe(e, "")
         );
@@ -3065,7 +3065,7 @@ class ge {
   buildLogicalFilter(e, t, n) {
     if ("and" in e && e.and) {
       const s = e.and.map((i) => this.buildSingleFilter(i, t, n)).filter((i) => i !== null);
-      return s.length > 0 ? s.length === 1 ? s[0] : A(...s) : null;
+      return s.length > 0 ? s.length === 1 ? s[0] : _(...s) : null;
     }
     if ("or" in e && e.or) {
       const s = e.or.map((i) => this.buildSingleFilter(i, t, n)).filter((i) => i !== null);
@@ -3084,7 +3084,7 @@ class ge {
     if (!a) return null;
     const u = a.dimensions?.[r];
     if (!u) return null;
-    const c = R(u.sql, n);
+    const c = v(u.sql, n);
     return this.buildFilterCondition(
       c,
       s.operator,
@@ -3327,7 +3327,7 @@ function on(d, e) {
       throw new Error(
         `Cannot substitute {${p}}: measure '${b}' not resolved yet. Ensure measures are resolved in dependency order.`
       );
-    const D = $(), w = o`${D}`;
+    const A = $(), w = o`${A}`;
     r.set(p, w);
   }
   const a = [], u = [];
@@ -3429,9 +3429,9 @@ class I {
           continue;
         }
         X.isCalculatedMeasure(h) ? (a.push(l), Se(h.calculatedSql, m).forEach((b) => u.add(b)), c.getAllDependencies(l).forEach((b) => {
-          const [$, D] = b.split("."), w = t.get($);
-          if (w && w.measures[D]) {
-            const C = w.measures[D];
+          const [$, A] = b.split("."), w = t.get($);
+          if (w && w.measures[A]) {
+            const C = w.measures[A];
             X.isCalculatedMeasure(C) && Se(C.calculatedSql, $).forEach((E) => u.add(E));
           }
         })) : r.push(l);
@@ -3610,14 +3610,14 @@ class I {
       throw new Error(
         `Measure '${e.name}' of type '${e.type}' is missing required 'sql' property. Only calculated measures and post-aggregation window functions can omit 'sql'.`
       );
-    let s = R(e.sql, t);
+    let s = v(e.sql, t);
     if (e.filters && e.filters.length > 0) {
       const i = e.filters.map((r) => {
         const a = r(t);
         return a ? o`(${a})` : void 0;
       }).filter(Boolean);
       if (i.length > 0) {
-        const r = i.length === 1 ? i[0] : A(...i);
+        const r = i.length === 1 ? i[0] : _(...i);
         s = this.databaseAdapter.buildCaseWhen([
           { when: r, then: s }
         ]);
@@ -3686,7 +3686,7 @@ class I {
         if (i.partitionBy && i.partitionBy.length > 0 && n) {
           const c = i.partitionBy.map((l) => {
             const m = l.includes(".") ? l.split(".")[1] : l, p = n.dimensions?.[m];
-            return p ? R(p.sql, t) : (console.warn(`[drizzle-cube] Window function partition dimension '${l}' not found in cube '${n.name}'`), null);
+            return p ? v(p.sql, t) : (console.warn(`[drizzle-cube] Window function partition dimension '${l}' not found in cube '${n.name}'`), null);
           }).filter((l) => l !== null);
           c.length > 0 && (r = c);
         }
@@ -3696,12 +3696,12 @@ class I {
             const m = l.field.includes(".") ? l.field.split(".")[1] : l.field, p = n.dimensions?.[m];
             if (p)
               return {
-                field: R(p.sql, t),
+                field: v(p.sql, t),
                 direction: l.direction
               };
             const f = n.measures?.[m];
             return f && f.sql ? {
-              field: R(f.sql, t),
+              field: v(f.sql, t),
               direction: l.direction
             } : (console.warn(`[drizzle-cube] Window function order field '${l.field}' not found in cube '${n.name}'`), null);
           }).filter((l) => l !== null);
@@ -3960,7 +3960,7 @@ class un {
               i.push($);
             }
           } else {
-            const y = h.dimensions[f], b = R(y.sql, n);
+            const y = h.dimensions[f], b = v(y.sql, n);
             i.push(b);
           }
       }
@@ -4019,7 +4019,7 @@ class ln {
       for (const r of t.dimensions) {
         const [a, u] = r.split("."), c = i.get(a);
         if (c && c.dimensions && c.dimensions[u]) {
-          const l = c.dimensions[u], m = R(l.sql, n);
+          const l = c.dimensions[u], m = v(l.sql, n);
           s[r] = o`${m}`.as(r);
         }
       }
@@ -4120,7 +4120,7 @@ class ln {
               continue;
             }
           }
-          const f = p.dimensions[m], h = R(f.sql, n), g = this.buildDateRangeCondition(h, c.dateRange);
+          const f = p.dimensions[m], h = v(f.sql, n), g = this.buildDateRangeCondition(h, c.dateRange);
           g && r.push(g);
         }
       }
@@ -4148,7 +4148,7 @@ class ln {
       const f = e;
       if (f.and) {
         const h = f.and.map((g) => this.processFilter(g, t, n, s, i)).filter((g) => g !== null);
-        return h.length > 0 ? A(...h) : null;
+        return h.length > 0 ? _(...h) : null;
       }
       if (f.or) {
         const h = f.or.map((g) => this.processFilter(g, t, n, s, i)).filter((g) => g !== null);
@@ -4168,7 +4168,7 @@ class ln {
         if (y)
           return y;
       }
-      const h = f ? typeof l.sql == "function" ? l.sql(n) : l.sql : R(l.sql, n);
+      const h = f ? typeof l.sql == "function" ? l.sql(n) : l.sql : v(l.sql, n);
       return this.buildFilterCondition(
         h,
         r.operator,
@@ -4452,7 +4452,7 @@ class ae {
       const r = t ? o`${o.identifier(t)}.${o.identifier(i.source.name)}` : ve(i.source), a = n ? o`${o.identifier(n)}.${o.identifier(i.target.name)}` : ve(i.target), u = i.as || Q;
       s.push(u(r, a));
     }
-    return A(...s);
+    return _(...s);
   }
   /**
    * Get all reachable cubes from a starting cube
@@ -4651,25 +4651,25 @@ class ct {
         if (!$)
           throw new Error(`Cube '${y}' not found`);
         if (b.relationship === "belongsToMany" && b.through) {
-          const D = Xt(b, s.securityContext);
+          const A = Xt(b, s.securityContext);
           a.push({
             cube: $,
             alias: `${y.toLowerCase()}_cube`,
-            joinType: D.junctionJoins[1].joinType,
+            joinType: A.junctionJoins[1].joinType,
             // Use the target join type
-            joinCondition: D.junctionJoins[1].condition,
+            joinCondition: A.junctionJoins[1].condition,
             // Target join condition
             junctionTable: {
               table: b.through.table,
               alias: `junction_${y.toLowerCase()}`,
-              joinType: D.junctionJoins[0].joinType,
-              joinCondition: D.junctionJoins[0].condition,
+              joinType: A.junctionJoins[0].joinType,
+              joinCondition: A.junctionJoins[0].condition,
               securitySql: b.through.securitySql,
               sourceCubeName: g
             }
           });
         } else {
-          const D = r.buildJoinCondition(
+          const A = r.buildJoinCondition(
             b,
             null,
             // No source alias needed - use the actual column
@@ -4680,7 +4680,7 @@ class ct {
             cube: $,
             alias: `${y.toLowerCase()}_cube`,
             joinType: w,
-            joinCondition: D
+            joinCondition: A
           });
         }
         u.add(y);
@@ -4739,29 +4739,36 @@ class ct {
       if (y.length === 0)
         continue;
       const b = this.analyzeJoinPathToPrimary(e, t, l.name, i);
-      let $, D;
+      let $, A;
       if (b?.hasIntermediateHasMany && b.intermediateJoins.length > 0)
-        $ = b.correctJoinKeys, D = b.intermediateJoins;
+        $ = b.correctJoinKeys, A = b.intermediateJoins;
       else {
         const S = p ? this.findJoinInfoToCube(e, t.name) : this.findJoinInfoForCube(e, t, l.name);
         if (!S)
           continue;
-        S.joinDef.relationship === "belongsToMany" && S.joinDef.through ? $ = S.joinDef.through.sourceKey.map((_) => ({
-          sourceColumn: _.target.name,
-          targetColumn: _.source.name,
-          sourceColumnObj: _.target,
-          targetColumnObj: _.source
-        })) : $ = p || "reversed" in S && S.reversed ? S.joinDef.on.map((v) => ({
-          sourceColumn: v.target.name,
-          targetColumn: v.source.name,
-          sourceColumnObj: v.target,
-          targetColumnObj: v.source
-        })) : S.joinDef.on.map((v) => ({
-          sourceColumn: v.source.name,
-          targetColumn: v.target.name,
-          sourceColumnObj: v.source,
-          targetColumnObj: v.target
-        })), D = void 0;
+        S.joinDef.relationship === "belongsToMany" && S.joinDef.through ? S.sourceCube?.name === t.name && !("reversed" in S && S.reversed) ? $ = S.joinDef.through.targetKey.map((D) => ({
+          sourceColumn: D.source.name,
+          // junction table column
+          targetColumn: D.target.name,
+          // CTE cube column
+          sourceColumnObj: D.source,
+          targetColumnObj: D.target
+        })) : $ = S.joinDef.through.sourceKey.map((D) => ({
+          sourceColumn: D.target.name,
+          targetColumn: D.source.name,
+          sourceColumnObj: D.target,
+          targetColumnObj: D.source
+        })) : $ = p || "reversed" in S && S.reversed ? S.joinDef.on.map((D) => ({
+          sourceColumn: D.target.name,
+          targetColumn: D.source.name,
+          sourceColumnObj: D.target,
+          targetColumnObj: D.source
+        })) : S.joinDef.on.map((D) => ({
+          sourceColumn: D.source.name,
+          targetColumn: D.target.name,
+          sourceColumnObj: D.source,
+          targetColumnObj: D.target
+        })), A = void 0;
       }
       const w = this.findPropagatingFilters(s, l, e), C = /* @__PURE__ */ new Map([[l.name, l]]), { aggregateMeasures: T, requiredBaseMeasures: E } = I.categorizeForPostAggregation(
         y,
@@ -4774,7 +4781,7 @@ class ct {
         const S = this.expandCalculatedMeasureDependencies(
           l,
           N
-        ), _ = this.findDownstreamJoinKeys(
+        ), R = this.findDownstreamJoinKeys(
           l,
           s,
           e
@@ -4786,8 +4793,8 @@ class ct {
           joinKeys: $,
           measures: S,
           propagatingFilters: w.length > 0 ? w : void 0,
-          downstreamJoinKeys: _.length > 0 ? _ : void 0,
-          intermediateJoins: D && D.length > 0 ? D : void 0,
+          downstreamJoinKeys: R.length > 0 ? R : void 0,
+          intermediateJoins: A && A.length > 0 ? A : void 0,
           cteType: "aggregate",
           cteReason: f
         });
@@ -4843,13 +4850,13 @@ class ct {
     for (let f = 0; f < a.length - 1; f++) {
       const h = a[f], g = a[f + 1], y = e.get(h.toCube);
       if (!y) continue;
-      const $ = y.sql(s).where, D = g.joinDef.on[0]?.source, w = h.joinDef.on[0]?.target;
+      const $ = y.sql(s).where, A = g.joinDef.on[0]?.source, w = h.joinDef.on[0]?.target;
       l.push({
         cube: y,
         joinDef: g.joinDef,
         securityFilter: $,
         primaryJoinColumn: w,
-        cteJoinColumn: D
+        cteJoinColumn: A
       });
     }
     const p = a[0].joinDef.on.map((f) => ({
@@ -5508,7 +5515,7 @@ class cn {
         const T = C.cube.sql(n), N = [Q(C.cteJoinColumn, C.joinDef.on[0]?.target)];
         C.securityFilter && N.push(C.securityFilter), f = f.leftJoin(
           T.from,
-          A(...N)
+          _(...N)
         );
       }
     const h = s ? {
@@ -5519,8 +5526,8 @@ class cn {
       for (const C of t.timeDimensions) {
         const [T, E] = C.dimension.split(".");
         if (T === l && r.dimensions && r.dimensions[E] && C.dateRange) {
-          const N = r.dimensions[E], S = this.queryBuilder.buildMeasureExpression({ sql: N.sql, type: "number" }, n), _ = this.queryBuilder.buildDateRangeCondition(S, C.dateRange);
-          _ && y.push(_);
+          const N = r.dimensions[E], S = this.queryBuilder.buildMeasureExpression({ sql: N.sql, type: "number" }, n), R = this.queryBuilder.buildDateRangeCondition(S, C.dateRange);
+          R && y.push(R);
         }
       }
     if (t.filters) {
@@ -5530,8 +5537,8 @@ class cn {
           if (E === l && r.dimensions && r.dimensions[N]) {
             const S = r.dimensions[N];
             if (T.operator === "inDateRange") {
-              const _ = this.queryBuilder.buildMeasureExpression({ sql: S.sql, type: "number" }, n), v = this.queryBuilder.buildDateRangeCondition(_, T.values);
-              v && y.push(v);
+              const R = this.queryBuilder.buildMeasureExpression({ sql: S.sql, type: "number" }, n), D = this.queryBuilder.buildDateRangeCondition(R, T.values);
+              D && y.push(D);
             }
           }
         }
@@ -5546,12 +5553,12 @@ class cn {
       }
     const b = [];
     if (a.where && b.push(a.where), b.push(...g, ...y), b.length > 0) {
-      const C = b.length === 1 ? b[0] : A(...b);
+      const C = b.length === 1 ? b[0] : _(...b);
       f = f.where(C);
     }
-    const $ = [], D = /* @__PURE__ */ new Set(), w = (C) => {
+    const $ = [], A = /* @__PURE__ */ new Set(), w = (C) => {
       const T = C?.name || (typeof C == "string" ? C : null);
-      T && !D.has(T) ? (D.add(T), $.push(C)) : T || $.push(C);
+      T && !A.has(T) ? (A.add(T), $.push(C)) : T || $.push(C);
     };
     if (u && e.intermediateJoins) {
       const C = e.intermediateJoins[0];
@@ -5567,7 +5574,7 @@ class cn {
       for (const C of t.dimensions) {
         const [T, E] = C.split(".");
         if (T === l && r.dimensions && r.dimensions[E]) {
-          const N = r.dimensions[E], S = R(N.sql, n);
+          const N = r.dimensions[E], S = v(N.sql, n);
           $.push(S);
         }
       }
@@ -5605,7 +5612,7 @@ class cn {
         const a = r.sourceColumnObj || o.identifier(r.sourceColumn), u = o`${o.identifier(t)}.${o.identifier(r.targetColumn)}`;
         i.push(Q(a, u));
       }
-    return i.length === 1 ? i[0] : A(...i);
+    return i.length === 1 ? i[0] : _(...i);
   }
   /**
    * Build a subquery filter for propagating filters from related cubes.
@@ -5634,12 +5641,12 @@ class cn {
     }
     if (i.length === 0)
       return null;
-    const r = i.length === 1 ? i[0] : A(...i), a = e.joinConditions;
+    const r = i.length === 1 ? i[0] : _(...i), a = e.joinConditions;
     if (a.length === 1) {
       const { source: u, target: c } = a[0], l = t.db.select({ pk: u }).from(s.from).where(r);
       return o`${c} IN ${l}`;
     } else {
-      const u = a.map((m) => Q(m.source, m.target)), c = A(
+      const u = a.map((m) => Q(m.source, m.target)), c = _(
         ...u,
         r
       ), l = t.db.select({ one: o`1` }).from(s.from).where(c);
@@ -6173,7 +6180,7 @@ class yn {
       const [, a] = e.bindingKey.split("."), u = t.dimensions?.[a];
       if (!u)
         throw new Error(`Binding key dimension not found: ${e.bindingKey}`);
-      return R(u.sql, n);
+      return v(u.sql, n);
     }
     const s = e.bindingKey.find((a) => a.cube === t.name);
     if (!s)
@@ -6181,7 +6188,7 @@ class yn {
     const [, i] = s.dimension.split("."), r = t.dimensions?.[i];
     if (!r)
       throw new Error(`Binding key dimension not found: ${s.dimension}`);
-    return R(r.sql, n);
+    return v(r.sql, n);
   }
   /**
    * Resolve time dimension expression for a cube
@@ -6191,7 +6198,7 @@ class yn {
       const [, a] = e.timeDimension.split("."), u = t.dimensions?.[a];
       if (!u)
         throw new Error(`Time dimension not found: ${e.timeDimension}`);
-      return R(u.sql, n);
+      return v(u.sql, n);
     }
     const s = e.timeDimension.find((a) => a.cube === t.name);
     if (!s)
@@ -6199,7 +6206,7 @@ class yn {
     const [, i] = s.dimension.split("."), r = t.dimensions?.[i];
     if (!r)
       throw new Error(`Time dimension not found: ${s.dimension}`);
-    return R(r.sql, n);
+    return v(r.sql, n);
   }
   /**
    * Build filter conditions for a step
@@ -6234,19 +6241,19 @@ class yn {
         const b = e;
         y = b.type === "and";
         for (const $ of b.filters || []) {
-          const D = this.buildFilterCondition($, t, n, s);
-          D && g.push(D);
+          const A = this.buildFilterCondition($, t, n, s);
+          A && g.push(A);
         }
       } else {
         const b = e;
         y = "and" in b && !!b.and;
         const $ = b.and || b.or || [];
-        for (const D of $) {
-          const w = this.buildFilterCondition(D, t, n, s);
+        for (const A of $) {
+          const w = this.buildFilterCondition(A, t, n, s);
           w && g.push(w);
         }
       }
-      return g.length === 0 ? null : g.length === 1 ? g[0] : y ? A(...g) : o`(${o.join(g, o` OR `)})`;
+      return g.length === 0 ? null : g.length === 1 ? g[0] : y ? _(...g) : o`(${o.join(g, o` OR `)})`;
     }
     const a = e, [u, c] = a.member.split("."), l = a.dateRange !== void 0;
     if (a.operator !== "set" && a.operator !== "notSet" && !l && (!a.values || a.values.length === 0 || a.values[0] === void 0 || a.values[0] === ""))
@@ -6263,7 +6270,7 @@ class yn {
     }
     const f = p.dimensions?.[c];
     if (!f) return null;
-    const h = R(f.sql, s);
+    const h = v(f.sql, s);
     return this.filterBuilder.buildFilterCondition(
       h,
       a.operator,
@@ -6302,7 +6309,7 @@ class yn {
       step_time: o`MIN(${e.timeExpr})`.as("step_time")
     }).from(s.from);
     if (r = this.addCrossJoinsToQuery(r, e, t, i), i.length > 0) {
-      const a = i.length === 1 ? i[0] : A(...i);
+      const a = i.length === 1 ? i[0] : _(...i);
       r = r.where(a);
     }
     return r = r.groupBy(e.bindingKeyExpr), t.db.$with(n).as(r);
@@ -6335,7 +6342,7 @@ class yn {
       o`${e.bindingKeyExpr} = ${o.identifier(i)}.binding_key`
     );
     if (l = this.addCrossJoinsToQuery(l, e, t, a), a.length > 0) {
-      const m = a.length === 1 ? a[0] : A(...a);
+      const m = a.length === 1 ? a[0] : _(...a);
       l = l.where(m);
     }
     return l = l.groupBy(e.bindingKeyExpr), t.db.$with(s).as(l);
@@ -6352,7 +6359,7 @@ class yn {
         const a = r.joinDef, u = [];
         for (const p of a.on)
           p.as ? u.push(p.as(p.source, p.target)) : u.push(Q(p.source, p.target));
-        const c = u.length === 1 ? u[0] : A(...u), m = i.cube.sql(n);
+        const c = u.length === 1 ? u[0] : _(...u), m = i.cube.sql(n);
         e = e.leftJoin(m.from, c), m.where && s.push(m.where);
       }
     return e;
@@ -6601,7 +6608,7 @@ class Cn {
       const [, a] = e.bindingKey.split("."), u = t.dimensions?.[a];
       if (!u)
         throw new Error(`Binding key dimension not found: ${e.bindingKey}`);
-      return R(u.sql, n);
+      return v(u.sql, n);
     }
     const s = e.bindingKey.find((a) => a.cube === t.name);
     if (!s)
@@ -6609,7 +6616,7 @@ class Cn {
     const [, i] = s.dimension.split("."), r = t.dimensions?.[i];
     if (!r)
       throw new Error(`Binding key dimension not found: ${s.dimension}`);
-    return R(r.sql, n);
+    return v(r.sql, n);
   }
   /**
    * Resolve time dimension expression
@@ -6619,7 +6626,7 @@ class Cn {
       const [, a] = e.timeDimension.split("."), u = t.dimensions?.[a];
       if (!u)
         throw new Error(`Time dimension not found: ${e.timeDimension}`);
-      return R(u.sql, n);
+      return v(u.sql, n);
     }
     const s = e.timeDimension.find((a) => a.cube === t.name);
     if (!s)
@@ -6627,7 +6634,7 @@ class Cn {
     const [, i] = s.dimension.split("."), r = t.dimensions?.[i];
     if (!r)
       throw new Error(`Time dimension not found: ${s.dimension}`);
-    return R(r.sql, n);
+    return v(r.sql, n);
   }
   /**
    * Resolve event dimension expression
@@ -6636,7 +6643,7 @@ class Cn {
     const [, s] = e.eventDimension.split("."), i = t.dimensions?.[s];
     if (!i)
       throw new Error(`Event dimension not found: ${e.eventDimension}`);
-    return R(i.sql, n);
+    return v(i.sql, n);
   }
   /**
    * Build filter conditions for the starting step
@@ -6661,7 +6668,7 @@ class Cn {
         const p = this.buildFilterCondition(m, t, n);
         p && c.push(p);
       }
-      return c.length === 0 ? null : c.length === 1 ? c[0] : "and" in e ? A(...c) : o`(${o.join(c, o` OR `)})`;
+      return c.length === 0 ? null : c.length === 1 ? c[0] : "and" in e ? _(...c) : o`(${o.join(c, o` OR `)})`;
     }
     if ("type" in e && "filters" in e) {
       const u = e, c = [];
@@ -6669,11 +6676,11 @@ class Cn {
         const m = this.buildFilterCondition(l, t, n);
         m && c.push(m);
       }
-      return c.length === 0 ? null : c.length === 1 ? c[0] : u.type === "and" ? A(...c) : o`(${o.join(c, o` OR `)})`;
+      return c.length === 0 ? null : c.length === 1 ? c[0] : u.type === "and" ? _(...c) : o`(${o.join(c, o` OR `)})`;
     }
     const s = e, [, i] = s.member.split("."), r = t.dimensions?.[i];
     if (!r) return null;
-    const a = R(r.sql, n);
+    const a = v(r.sql, n);
     return this.filterBuilder.buildFilterCondition(
       a,
       s.operator,
@@ -6701,7 +6708,7 @@ class Cn {
       event_path: o`${a}`.as("event_path")
     }).from(s.from);
     if (c.length > 0) {
-      const m = c.length === 1 ? c[0] : A(...c);
+      const m = c.length === 1 ? c[0] : _(...c);
       l = l.where(m);
     }
     return l = l.groupBy(i, a), e.entityLimit && (l = l.limit(e.entityLimit)), n.db.$with("starting_entities").as(l);
@@ -6718,7 +6725,7 @@ class Cn {
         o`${i} = ${o.identifier(m)}.binding_key`,
         o`${r} < ${o.identifier(m)}.${o.identifier(p)}`
       );
-      const g = h.length === 1 ? h[0] : A(...h), y = c ? o`${a} || ${"→"} || ${o.identifier(m)}.event_path` : o`${a}`, b = n.db.select({
+      const g = h.length === 1 ? h[0] : _(...h), y = c ? o`${a} || ${"→"} || ${o.identifier(m)}.event_path` : o`${a}`, b = n.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${a}`.as("event_type"),
@@ -6747,7 +6754,7 @@ class Cn {
         o`${i} = ${o.identifier(m)}.binding_key`,
         o`${r} > ${o.identifier(m)}.${o.identifier(p)}`
       );
-      const g = h.length === 1 ? h[0] : A(...h), y = c ? o`${o.identifier(m)}.event_path || ${"→"} || ${a}` : o`${a}`, b = n.db.select({
+      const g = h.length === 1 ? h[0] : _(...h), y = c ? o`${o.identifier(m)}.event_path || ${"→"} || ${a}` : o`${a}`, b = n.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${a}`.as("event_type"),
@@ -6778,7 +6785,7 @@ class Cn {
       s.where && h.push(s.where), h.push(
         o`${r} < ${o.identifier(m)}.${o.identifier(p)}`
       );
-      const g = h.length === 1 ? h[0] : A(...h), y = c ? o`${a} || ${"→"} || ${o.identifier(m)}.event_path` : o`${a}`, b = n.db.select({
+      const g = h.length === 1 ? h[0] : _(...h), y = c ? o`${a} || ${"→"} || ${o.identifier(m)}.event_path` : o`${a}`, b = n.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${a}`.as("event_type"),
@@ -6811,7 +6818,7 @@ class Cn {
       s.where && h.push(s.where), h.push(
         o`${r} > ${o.identifier(m)}.${o.identifier(p)}`
       );
-      const g = h.length === 1 ? h[0] : A(...h), y = c ? o`${o.identifier(m)}.event_path || ${"→"} || ${a}` : o`${a}`, b = n.db.select({
+      const g = h.length === 1 ? h[0] : _(...h), y = c ? o`${o.identifier(m)}.event_path || ${"→"} || ${a}` : o`${a}`, b = n.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${a}`.as("event_type"),
@@ -7190,12 +7197,12 @@ class wn {
     const a = r.dimensions?.[i];
     if (!a)
       throw new Error(`Time dimension not found: ${i}`);
-    const u = R(a.sql, n), c = this.resolveBindingKey(e.bindingKey, r, t, n), l = this.buildFilterConditions(e.cohortFilters, r, t, n), m = this.buildFilterConditions(e.activityFilters, r, t, n), p = [];
+    const u = v(a.sql, n), c = this.resolveBindingKey(e.bindingKey, r, t, n), l = this.buildFilterConditions(e.cohortFilters, r, t, n), m = this.buildFilterConditions(e.activityFilters, r, t, n), p = [];
     if (e.breakdownDimensions && e.breakdownDimensions.length > 0)
       for (const f of e.breakdownDimensions) {
         const [h, g] = f.split("."), y = t.get(h);
         if (y && y.dimensions?.[g]) {
-          const b = R(y.dimensions[g].sql, n);
+          const b = v(y.dimensions[g].sql, n);
           p.push({ dimension: f, expr: b });
         }
       }
@@ -7215,7 +7222,7 @@ class wn {
       const p = m.dimensions?.[l];
       if (!p)
         throw new Error(`Binding key dimension not found: ${c.dimension}`);
-      return R(p.sql, s);
+      return v(p.sql, s);
     }
     const [i, r] = e.split("."), a = n.get(i);
     if (!a)
@@ -7223,7 +7230,7 @@ class wn {
     const u = a.dimensions?.[r];
     if (!u)
       throw new Error(`Binding key dimension not found: ${e}`);
-    return R(u.sql, s);
+    return v(u.sql, s);
   }
   /**
    * Build filter conditions from config filters
@@ -7247,13 +7254,13 @@ class wn {
         const y = this.buildSingleFilterCondition(g, t, n, s);
         y && p.push(y);
       }
-      return p.length === 0 ? null : p.length === 1 ? p[0] : f ? A(...p) : o`(${o.join(p, o` OR `)})`;
+      return p.length === 0 ? null : p.length === 1 ? p[0] : f ? _(...p) : o`(${o.join(p, o` OR `)})`;
     }
     const i = e, [r, a] = i.member.split("."), u = n.get(r);
     if (!u) return null;
     const c = u.dimensions?.[a];
     if (!c) return null;
-    const l = R(c.sql, s);
+    const l = v(c.sql, s);
     return this.filterBuilder.buildFilterCondition(
       l,
       i.operator,
@@ -7289,7 +7296,7 @@ class wn {
     }
     let u = n.db.select(a).from(s.from);
     if (i.length > 0) {
-      const l = i.length === 1 ? i[0] : A(...i);
+      const l = i.length === 1 ? i[0] : _(...i);
       u = u.where(l);
     }
     const c = [t.bindingKeyExpr];
@@ -7344,7 +7351,7 @@ class wn {
       o`${t.bindingKeyExpr} = cohort_base.binding_key`
     );
     if (i.length > 0) {
-      const m = i.length === 1 ? i[0] : A(...i);
+      const m = i.length === 1 ? i[0] : _(...i);
       c = c.where(m);
     }
     const l = [
@@ -7533,14 +7540,14 @@ class Y {
       const c = this.buildUnifiedQuery(u, t, a), l = this.queryBuilder.collectNumericFields(e, t), m = await this.dbExecutor.execute(c, l), p = Array.isArray(m) ? m.map((b) => {
         const $ = { ...b };
         if (t.timeDimensions) {
-          for (const D of t.timeDimensions)
-            if (D.dimension in $) {
-              let w = $[D.dimension];
+          for (const A of t.timeDimensions)
+            if (A.dimension in $) {
+              let w = $[A.dimension];
               if (typeof w == "string" && w.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
                 const C = w.replace(" ", "T"), T = !C.endsWith("Z") && !C.includes("+") ? C + "Z" : C;
                 w = new Date(T);
               }
-              w = this.databaseAdapter.convertTimeDimensionResult(w), $[D.dimension] = w;
+              w = this.databaseAdapter.convertTimeDimensionResult(w), $[A.dimension] = w;
             }
         }
         return $;
@@ -7822,8 +7829,8 @@ class Y {
           if (y.dimension in g) {
             let b = g[y.dimension];
             if (typeof b == "string" && b.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-              const $ = b.replace(" ", "T"), D = !$.endsWith("Z") && !$.includes("+") ? $ + "Z" : $;
-              b = new Date(D);
+              const $ = b.replace(" ", "T"), A = !$.endsWith("Z") && !$.includes("+") ? $ + "Z" : $;
+              b = new Date(A);
             }
             b = this.databaseAdapter.convertTimeDimensionResult(b), g[y.dimension] = b;
           }
@@ -7877,15 +7884,15 @@ class Y {
             if (!s.has(T)) {
               const N = {
                 filters: C.filters
-              }, S = /* @__PURE__ */ new Map([[T, C.sourceCube]]), _ = this.queryBuilder.buildWhereConditions(
+              }, S = /* @__PURE__ */ new Map([[T, C.sourceCube]]), R = this.queryBuilder.buildWhereConditions(
                 S,
                 N,
                 n
               );
-              s.set(T, _);
+              s.set(T, R);
             }
             const E = s.get(T);
-            E && E.length > 0 && (C.preBuiltFilterSQL = E.length === 1 ? E[0] : A(...E));
+            E && E.length > 0 && (C.preBuiltFilterSQL = E.length === 1 ? E[0] : _(...E));
           }
     }
     const i = [], r = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map();
@@ -7912,10 +7919,10 @@ class Y {
           if (m[T]) {
             const [, E] = T.split("."), N = c.get(C);
             if (N && N.measures && N.measures[E]) {
-              const S = N.measures[E], _ = o`${o.identifier(w.cteAlias)}.${o.identifier(E)}`;
-              let v;
+              const S = N.measures[E], R = o`${o.identifier(w.cteAlias)}.${o.identifier(E)}`;
+              let D;
               if (S.type === "calculated" && S.calculatedSql)
-                v = this.queryBuilder.buildCTECalculatedMeasure(
+                D = this.queryBuilder.buildCTECalculatedMeasure(
                   S,
                   N,
                   w,
@@ -7932,38 +7939,38 @@ class Y {
                   case "count":
                   case "countDistinct":
                   case "sum":
-                    v = j ? G(_) : z(_);
+                    D = j ? G(R) : z(R);
                     break;
                   case "avg":
-                    v = j ? G(_) : this.databaseAdapter.buildAvg(_);
+                    D = j ? G(R) : this.databaseAdapter.buildAvg(R);
                     break;
                   case "min":
-                    v = oe(_);
+                    D = oe(R);
                     break;
                   case "max":
-                    v = G(_);
+                    D = G(R);
                     break;
                   case "number":
-                    v = j ? G(_) : z(_);
+                    D = j ? G(R) : z(R);
                     break;
                   default:
-                    v = j ? G(_) : z(_);
+                    D = j ? G(R) : z(R);
                 }
               }
-              m[T] = o`${v}`.as(T);
+              m[T] = o`${D}`.as(T);
             }
           }
         for (const T in m) {
           const [E, N] = T.split(".");
           if (E === C) {
-            const S = c.get(C), _ = S && S.dimensions?.[N], v = T.startsWith(C + ".");
-            if (_ || v) {
+            const S = c.get(C), R = S && S.dimensions?.[N], D = T.startsWith(C + ".");
+            if (R || D) {
               let F = w.joinKeys.find((U) => U.targetColumn === N);
               if (!F && S?.dimensions?.[N]) {
                 const U = S.dimensions[N].sql;
                 F = w.joinKeys.find((j) => j.targetColumnObj === U);
               }
-              F ? m[T] = o`${o.identifier(w.cteAlias)}.${o.identifier(N)}`.as(T) : v && S?.dimensions?.[N] && (m[T] = o`${o.identifier(w.cteAlias)}.${o.identifier(N)}`.as(T));
+              F ? m[T] = o`${o.identifier(w.cteAlias)}.${o.identifier(N)}`.as(T) : D && S?.dimensions?.[N] && (m[T] = o`${o.identifier(w.cteAlias)}.${o.identifier(N)}`.as(T));
             }
           }
         }
@@ -7976,14 +7983,14 @@ class Y {
           if (I.isPostAggregationWindow(N)) {
             const S = I.getWindowBaseMeasure(N, C);
             if (S) {
-              const [_, v] = S.split("."), F = c.get(_);
-              if (F?.measures?.[v]) {
-                const U = F.measures[v], j = e.preAggregationCTEs?.find(
-                  (q) => q.cube?.name === _ && q.measures?.includes(S)
+              const [R, D] = S.split("."), F = c.get(R);
+              if (F?.measures?.[D]) {
+                const U = F.measures[D], j = e.preAggregationCTEs?.find(
+                  (q) => q.cube?.name === R && q.measures?.includes(S)
                 );
                 let B;
                 if (j) {
-                  const q = o`${o.identifier(j.cteAlias)}.${o.identifier(v)}`;
+                  const q = o`${o.identifier(j.cteAlias)}.${o.identifier(D)}`;
                   B = o`sum(${q})`;
                 } else
                   B = this.queryBuilder.buildMeasureExpression(U, n, F);
@@ -8049,7 +8056,7 @@ class Y {
                 const yt = o`${o.identifier(j)}.${o.identifier(Oe.sourceColumn)}`, Ie = Oe.targetColumnObj;
                 Ie && H.push(Q(Ie, yt));
               }
-              H.length > 0 && (U = A(...H));
+              H.length > 0 && (U = _(...H));
             }
           }
           const B = [];
@@ -8087,24 +8094,24 @@ class Y {
               const V = o`${o.identifier(F.cteAlias)}.${o.identifier(B.sourceColumn)}`, q = B.targetColumnObj || o.identifier(B.targetColumn);
               j.push(Q(V, q));
             }
-            N = j.length === 1 ? j[0] : A(...j);
+            N = j.length === 1 ? j[0] : _(...j);
           } else
             N = w.joinCondition;
         }
-        const _ = w.joinType || "left", v = _ !== "inner" && S ? A(N, S) : N;
+        const R = w.joinType || "left", D = R !== "inner" && S ? _(N, S) : N;
         try {
-          switch (_) {
+          switch (R) {
             case "left":
-              f = f.leftJoin(E, v), S && h.add(w.cube.name);
+              f = f.leftJoin(E, D), S && h.add(w.cube.name);
               break;
             case "inner":
               f = f.innerJoin(E, N);
               break;
             case "right":
-              f = f.rightJoin(E, v), S && h.add(w.cube.name);
+              f = f.rightJoin(E, D), S && h.add(w.cube.name);
               break;
             case "full":
-              f = f.fullJoin(E, v), S && h.add(w.cube.name);
+              f = f.fullJoin(E, D), S && h.add(w.cube.name);
               break;
           }
         } catch {
@@ -8129,7 +8136,7 @@ class Y {
       // Reuse pre-built filters for parameter deduplication
     );
     if (y.length > 0 && p.push(...y), p.length > 0) {
-      const w = p.length === 1 ? p[0] : A(...p);
+      const w = p.length === 1 ? p[0] : _(...p);
       f = f.where(w);
     }
     const b = this.queryBuilder.buildGroupByFields(
@@ -8150,11 +8157,11 @@ class Y {
       // Pass the queryPlan to handle CTE scenarios
     );
     if ($.length > 0) {
-      const w = $.length === 1 ? $[0] : A(...$);
+      const w = $.length === 1 ? $[0] : _(...$);
       f = f.having(w);
     }
-    const D = this.queryBuilder.buildOrderBy(t);
-    return D.length > 0 && (f = f.orderBy(...D)), f = this.queryBuilder.applyLimitAndOffset(f, t), f;
+    const A = this.queryBuilder.buildOrderBy(t);
+    return A.length > 0 && (f = f.orderBy(...A)), f = this.queryBuilder.applyLimitAndOffset(f, t), f;
   }
   /**
    * Convert query plan to cube map for QueryBuilder methods
@@ -8361,7 +8368,7 @@ class Y {
         const m = l.dimensions?.[c];
         if (!m || ["arrayContains", "arrayOverlaps", "arrayContained"].includes(r.operator))
           continue;
-        const f = R(m.sql, s), h = this.queryBuilder.buildFilterConditionPublic(
+        const f = v(m.sql, s), h = this.queryBuilder.buildFilterConditionPublic(
           f,
           r.operator,
           r.values,
@@ -8380,7 +8387,7 @@ class Y {
           if (!c) continue;
           const l = c.dimensions?.[u];
           if (!l) continue;
-          const m = R(l.sql, s), p = this.queryBuilder.buildDateRangeCondition(m, i.dateRange);
+          const m = v(l.sql, s), p = this.queryBuilder.buildDateRangeCondition(m, i.dateRange);
           p && t.set(r, p);
         }
     }
@@ -8412,15 +8419,15 @@ class Y {
         const h = f.field.includes(".") ? f.field.split(".")[1] : f.field;
         if (n.timeDimensions)
           for (const b of n.timeDimensions) {
-            const [$, D] = b.dimension.split(".");
-            if (D === h) {
+            const [$, A] = b.dimension.split(".");
+            if (A === h) {
               const w = u($, h);
               if (w)
                 return {
                   field: w,
                   direction: f.direction
                 };
-              const C = i.dimensions?.[D];
+              const C = i.dimensions?.[A];
               if (C)
                 return {
                   field: this.queryBuilder.buildTimeDimensionExpression(
@@ -8435,7 +8442,7 @@ class Y {
         const g = i.dimensions?.[h];
         if (g)
           return {
-            field: R(g.sql, s),
+            field: v(g.sql, s),
             direction: f.direction
           };
         const y = a.measure?.includes(".") ? a.measure.split(".")[1] : a.measure;
@@ -8469,7 +8476,7 @@ class Y {
     let l;
     a.partitionBy && a.partitionBy.length > 0 && (l = a.partitionBy.map((f) => {
       const h = f.includes(".") ? f.split(".")[1] : f, g = i.dimensions?.[h];
-      return g ? R(g.sql, s) : null;
+      return g ? v(g.sql, s) : null;
     }).filter((f) => f !== null));
     const m = this.databaseAdapter.buildWindowFunction(
       e.type,