drizzle-cube 0.3.30 → 0.3.31

package/dist/adapters/{mcp-transport-DkdMX4bA.js → mcp-transport-D4KrudfS.js}

@@ -136,10 +136,10 @@ class j {
     this.value = Array.isArray(e) ? e : [e];
   }
   getSQL() {
-    return new F([this]);
+    return new O([this]);
   }
 }
-class F {
+class O {
   constructor(e) {
     this.queryChunks = e;
     for (const t of e)
@@ -193,7 +193,7 @@ class F {
           m.push(f), p < l.length - 1 && m.push(new j(", "));
         return m.push(new j(")")), this.buildQueryFromSourceParams(m, n);
       }
-      if (L(l, F))
+      if (L(l, O))
         return this.buildQueryFromSourceParams(l.queryChunks, {
           ...n,
           inlineParams: u || l.shouldInlineParams
@@ -226,14 +226,14 @@ class F {
         if (L(l.value, ce))
           return { sql: r(c.value++, l), params: [l], typings: ["none"] };
         const m = l.value === null ? null : l.encoder.mapToDriverValue(l.value);
-        if (L(m, F))
+        if (L(m, O))
           return this.buildQueryFromSourceParams([m], n);
         if (u)
           return { sql: this.mapInlineParam(m, n), params: [] };
         let p = ["none"];
         return a && (p = [a(l.encoder)]), { sql: r(c.value++, m), params: [m], typings: p };
       }
-      return L(l, ce) ? { sql: r(c.value++, l), params: [l], typings: ["none"] } : L(l, F.Aliased) && l.fieldAlias !== void 0 ? { sql: i(l.fieldAlias), params: [] } : L(l, Ze) ? l._.isWith ? { sql: i(l._.alias), params: [] } : this.buildQueryFromSourceParams([
+      return L(l, ce) ? { sql: r(c.value++, l), params: [l], typings: ["none"] } : L(l, O.Aliased) && l.fieldAlias !== void 0 ? { sql: i(l.fieldAlias), params: [] } : L(l, Ze) ? l._.isWith ? { sql: i(l._.alias), params: [] } : this.buildQueryFromSourceParams([
         new j("("),
         l._.sql,
         new j(") "),
@@ -262,7 +262,7 @@ class F {
     return this;
   }
   as(e) {
-    return e === void 0 ? this : new F.Aliased(this, e);
+    return e === void 0 ? this : new O.Aliased(this, e);
   }
   mapWith(e) {
     return this.decoder = typeof e == "function" ? { mapFromDriverValue: e } : e, this;
@@ -287,7 +287,7 @@ class Ne {
   static [x] = "Name";
   brand;
   getSQL() {
-    return new F([this]);
+    return new O([this]);
   }
 }
 function wt(d) {
@@ -313,7 +313,7 @@ class le {
   static [x] = "Param";
   brand;
   getSQL() {
-    return new F([this]);
+    return new O([this]);
   }
 }
 function o(d, ...e) {
@@ -321,26 +321,26 @@ function o(d, ...e) {
   (e.length > 0 || d.length > 0 && d[0] !== "") && t.push(new j(d[0]));
   for (const [n, s] of e.entries())
     t.push(s, new j(d[n + 1]));
-  return new F(t);
+  return new O(t);
 }
 ((d) => {
   function e() {
-    return new F([]);
+    return new O([]);
   }
   d.empty = e;
   function t(u) {
-    return new F(u);
+    return new O(u);
   }
   d.fromList = t;
   function n(u) {
-    return new F([new j(u)]);
+    return new O([new j(u)]);
   }
   d.raw = n;
   function s(u, c) {
     const l = [];
     for (const [m, p] of u.entries())
       m > 0 && c !== void 0 && l.push(c), l.push(p);
-    return new F(l);
+    return new O(l);
   }
   d.join = s;
   function i(u) {
@@ -373,14 +373,14 @@ function o(d, ...e) {
     }
   }
   d.Aliased = e;
-})(F || (F = {}));
+})(O || (O = {}));
 class ce {
   constructor(e) {
     this.name = e;
   }
   static [x] = "Placeholder";
   getSQL() {
-    return new F([this]);
+    return new O([this]);
   }
 }
 const $t = /* @__PURE__ */ Symbol.for("drizzle:IsDrizzleView");
@@ -402,28 +402,28 @@ class st {
     };
   }
   getSQL() {
-    return new F([this]);
+    return new O([this]);
   }
 }
 te.prototype.getSQL = function() {
-  return new F([this]);
+  return new O([this]);
 };
 B.prototype.getSQL = function() {
-  return new F([this]);
+  return new O([this]);
 };
 Ze.prototype.getSQL = function() {
-  return new F([this]);
+  return new O([this]);
 };
 function U(d, e) {
   return wt(e) && !et(d) && !L(d, le) && !L(d, ce) && !L(d, te) && !L(d, B) && !L(d, st) ? new le(d, e) : d;
 }
-const P = (d, e) => o`${d} = ${U(e, d)}`, Me = (d, e) => o`${d} <> ${U(e, d)}`;
-function A(...d) {
+const Q = (d, e) => o`${d} = ${U(e, d)}`, Me = (d, e) => o`${d} <> ${U(e, d)}`;
+function D(...d) {
   const e = d.filter(
     (t) => t !== void 0
   );
   if (e.length !== 0)
-    return e.length === 1 ? new F(e) : new F([
+    return e.length === 1 ? new O(e) : new O([
       new j("("),
       o.join(e, new j(" and ")),
       new j(")")
@@ -434,7 +434,7 @@ function ie(...d) {
     (t) => t !== void 0
   );
   if (e.length !== 0)
-    return e.length === 1 ? new F(e) : new F([
+    return e.length === 1 ? new O(e) : new O([
       new j("("),
       o.join(e, new j(" or ")),
       new j(")")
@@ -492,7 +492,7 @@ function De(d) {
 function Dt(d) {
   return o`count(distinct ${d})`.mapWith(Number);
 }
-function W(d) {
+function K(d) {
   return o`sum(${d})`.mapWith(String);
 }
 function V(d) {
@@ -2509,7 +2509,7 @@ function Qe(d, e, t) {
     return Be(d, e);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
-function K(d) {
+function P(d) {
   return typeof d == "function" ? d() : d;
 }
 function Ae(d, e) {
@@ -2543,12 +2543,12 @@ function Jt(d, e) {
     throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
   const { table: t, sourceKey: n, targetKey: s, securitySql: i } = d.through, r = [];
   for (const l of n) {
-    const m = l.as || P;
+    const m = l.as || Q;
     r.push(m(l.source, l.target));
   }
   const a = [];
   for (const l of s) {
-    const m = l.as || P;
+    const m = l.as || Q;
     a.push(m(l.source, l.target));
   }
   let u;
@@ -2562,13 +2562,13 @@ function Jt(d, e) {
       {
         joinType: c,
         table: t,
-        condition: A(...r)
+        condition: D(...r)
       },
       {
         joinType: c,
         table: t,
         // This will be replaced with target cube table in query planner
-        condition: A(...a)
+        condition: D(...a)
       }
     ],
     junctionSecurityConditions: u
@@ -2663,7 +2663,7 @@ function Ht(d) {
   return {
     measures: d.measures ? [...d.measures].sort() : void 0,
     dimensions: d.dimensions ? [...d.dimensions].sort() : void 0,
-    filters: d.filters ? Q(d.filters) : void 0,
+    filters: d.filters ? W(d.filters) : void 0,
     timeDimensions: d.timeDimensions ? en(d.timeDimensions) : void 0,
     limit: d.limit,
     offset: d.offset,
@@ -2685,7 +2685,7 @@ function Yt(d) {
     steps: d.steps.map((e) => {
       const t = {
         name: e.name,
-        filter: e.filter ? Array.isArray(e.filter) ? Q(e.filter) : Q([e.filter])[0] : void 0,
+        filter: e.filter ? Array.isArray(e.filter) ? W(e.filter) : W([e.filter])[0] : void 0,
         timeToConvert: e.timeToConvert
       };
       return "cube" in e && e.cube && (t.cube = e.cube), t;
@@ -2702,7 +2702,7 @@ function Xt(d) {
     // Normalize starting step - sort filters for consistent hashing
     startingStep: {
       name: d.startingStep.name,
-      filter: d.startingStep.filter ? Array.isArray(d.startingStep.filter) ? Q(d.startingStep.filter) : Q([d.startingStep.filter])[0] : void 0
+      filter: d.startingStep.filter ? Array.isArray(d.startingStep.filter) ? W(d.startingStep.filter) : W([d.startingStep.filter])[0] : void 0
     },
     // CRITICAL: Include step counts in cache key
     stepsBefore: d.stepsBefore,
@@ -2724,18 +2724,18 @@ function Zt(d) {
     periods: d.periods,
     retentionType: d.retentionType,
     // Normalize filters for consistent hashing
-    cohortFilters: d.cohortFilters ? Array.isArray(d.cohortFilters) ? Q(d.cohortFilters) : Q([d.cohortFilters])[0] : void 0,
-    activityFilters: d.activityFilters ? Array.isArray(d.activityFilters) ? Q(d.activityFilters) : Q([d.activityFilters])[0] : void 0,
+    cohortFilters: d.cohortFilters ? Array.isArray(d.cohortFilters) ? W(d.cohortFilters) : W([d.cohortFilters])[0] : void 0,
+    activityFilters: d.activityFilters ? Array.isArray(d.activityFilters) ? W(d.activityFilters) : W([d.activityFilters])[0] : void 0,
     // Include breakdown dimensions for cache key
     breakdownDimensions: d.breakdownDimensions
   };
 }
-function Q(d) {
+function W(d) {
   return [...d].map((e) => {
     if ("and" in e && e.and)
-      return { and: Q(e.and) };
+      return { and: W(e.and) };
     if ("or" in e && e.or)
-      return { or: Q(e.or) };
+      return { or: W(e.or) };
     const t = e;
     return {
       ...t,
@@ -2775,7 +2775,7 @@ class ne {
    */
   buildTimeDimensionExpression(e, t, n) {
     const s = v(e, n);
-    return t ? this.databaseAdapter.buildTimeDimension(t, s) : s instanceof F ? s : o`${s}`;
+    return t ? this.databaseAdapter.buildTimeDimension(t, s) : s instanceof O ? s : o`${s}`;
   }
   /**
    * Build date range condition for time dimensions
@@ -2790,7 +2790,7 @@ class ne {
         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 D(
         Y(e, n),
         X(e, s)
       );
@@ -2799,7 +2799,7 @@ class ne {
       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()), D(
           Y(e, l),
           X(e, m)
         );
@@ -2811,7 +2811,7 @@ class ne {
       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()), D(
         Y(e, u),
         X(e, c)
       );
@@ -2962,7 +2962,7 @@ class he {
           return Te(e, r);
         } else if (r.length === 1) {
           const u = s?.type === "time" && this.dateTimeBuilder.normalizeDate(a) || a;
-          return P(e, u);
+          return Q(e, u);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
@@ -2997,7 +2997,7 @@ class he {
               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 D(
               Y(e, u),
               X(e, c)
             );
@@ -3013,7 +3013,7 @@ class he {
         return u ? we(e, u) : null;
       }
       case "between":
-        return r.length >= 2 ? A(
+        return r.length >= 2 ? D(
           Y(e, r[0]),
           X(e, r[1])
         ) : null;
@@ -3039,10 +3039,10 @@ class he {
       case "isEmpty":
         return ie(
           Ue(e),
-          P(e, "")
+          Q(e, "")
         );
       case "isNotEmpty":
-        return A(
+        return D(
           ke(e),
           Me(e, "")
         );
@@ -3065,7 +3065,7 @@ class he {
   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] : D(...s) : null;
     }
     if ("or" in e && e.or) {
       const s = e.or.map((i) => this.buildSingleFilter(i, t, n)).filter((i) => i !== null);
@@ -3327,7 +3327,7 @@ function tn(d, e) {
       throw new Error(
         `Cannot substitute {${p}}: measure '${b}' not resolved yet. Ensure measures are resolved in dependency order.`
       );
-    const _ = w(), $ = o`${_}`;
+    const A = w(), $ = o`${A}`;
     r.set(p, $);
   }
   const a = [], u = [];
@@ -3429,9 +3429,9 @@ class I {
           continue;
         }
         G.isCalculatedMeasure(h) ? (a.push(l), Ee(h.calculatedSql, m).forEach((b) => u.add(b)), c.getAllDependencies(l).forEach((b) => {
-          const [w, _] = b.split("."), $ = t.get(w);
-          if ($ && $.measures[_]) {
-            const C = $.measures[_];
+          const [w, A] = b.split("."), $ = t.get(w);
+          if ($ && $.measures[A]) {
+            const C = $.measures[A];
             G.isCalculatedMeasure(C) && Ee(C.calculatedSql, w).forEach((E) => u.add(E));
           }
         })) : r.push(l);
@@ -3516,7 +3516,7 @@ class I {
             case "count":
             case "countDistinct":
             case "sum":
-              h = W(f);
+              h = K(f);
               break;
             case "avg":
               h = this.databaseAdapter.buildAvg(f);
@@ -3528,10 +3528,10 @@ class I {
               h = V(f);
               break;
             case "number":
-              h = W(f);
+              h = K(f);
               break;
             default:
-              h = W(f);
+              h = K(f);
           }
           r.set(u, () => h);
         }
@@ -3573,7 +3573,7 @@ class I {
             case "count":
             case "countDistinct":
             case "sum":
-              return W(a);
+              return K(a);
             case "avg":
               return this.databaseAdapter.buildAvg(a);
             case "min":
@@ -3581,9 +3581,9 @@ class I {
             case "max":
               return V(a);
             case "number":
-              return W(a);
+              return K(a);
             default:
-              return W(a);
+              return K(a);
           }
         }
     }
@@ -3617,7 +3617,7 @@ class I {
         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] : D(...i);
         s = this.databaseAdapter.buildCaseWhen([
           { when: r, then: s }
         ]);
@@ -3629,7 +3629,7 @@ class I {
       case "countDistinct":
         return Dt(s);
       case "sum":
-        return W(s);
+        return K(s);
       case "avg":
         return this.databaseAdapter.buildAvg(s);
       case "min":
@@ -4148,7 +4148,7 @@ class rn {
       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 ? D(...h) : null;
       }
       if (f.or) {
         const h = f.or.map((g) => this.processFilter(g, t, n, s, i)).filter((g) => g !== null);
@@ -4321,7 +4321,7 @@ class oe {
       const { cube: u, path: c } = r.shift(), l = this.cubes.get(u);
       if (l?.joins)
         for (const [, m] of Object.entries(l.joins)) {
-          const f = K(m.targetCube).name;
+          const f = P(m.targetCube).name;
           if (a.has(f))
             continue;
           const h = [
@@ -4401,7 +4401,7 @@ class oe {
       const l = this.cubes.get(a);
       if (l?.joins)
         for (const [, m] of Object.entries(l.joins)) {
-          const f = K(m.targetCube).name;
+          const f = P(m.targetCube).name;
           if (c.has(f))
             continue;
           const h = [
@@ -4449,10 +4449,10 @@ class oe {
   buildJoinCondition(e, t, n) {
     const s = [];
     for (const i of e.on) {
-      const r = t ? o`${o.identifier(t)}.${o.identifier(i.source.name)}` : _e(i.source), a = n ? o`${o.identifier(n)}.${o.identifier(i.target.name)}` : _e(i.target), u = i.as || P;
+      const r = t ? o`${o.identifier(t)}.${o.identifier(i.source.name)}` : _e(i.source), a = n ? o`${o.identifier(n)}.${o.identifier(i.target.name)}` : _e(i.target), u = i.as || Q;
       s.push(u(r, a));
     }
-    return A(...s);
+    return D(...s);
   }
   /**
    * Get all reachable cubes from a starting cube
@@ -4467,7 +4467,7 @@ class oe {
       const s = n.shift(), i = this.cubes.get(s);
       if (i?.joins)
         for (const [, r] of Object.entries(i.joins)) {
-          const u = K(r.targetCube).name;
+          const u = P(r.targetCube).name;
           t.has(u) || (t.add(u), n.push(u));
         }
     }
@@ -4674,11 +4674,11 @@ class at {
             // No source alias needed - use the actual column
             null
             // No target alias needed - use the actual column
-          ), _ = Ae(y.relationship, y.sqlJoinType);
+          ), A = Ae(y.relationship, y.sqlJoinType);
           a.push({
             cube: b,
             alias: `${g.toLowerCase()}_cube`,
-            joinType: _,
+            joinType: A,
             joinCondition: w
           });
         }
@@ -4738,24 +4738,24 @@ class at {
       if (y.length === 0)
         continue;
       const b = this.analyzeJoinPathToPrimary(e, t, l.name, i);
-      let w, _;
+      let w, A;
       if (b?.hasIntermediateHasMany && b.intermediateJoins.length > 0)
-        w = b.correctJoinKeys, _ = b.intermediateJoins;
+        w = b.correctJoinKeys, A = b.intermediateJoins;
       else {
         const S = p ? this.findJoinInfoToCube(e, t.name) : this.findJoinInfoForCube(e, t, l.name);
         if (!S)
           continue;
-        w = p ? 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
-        })), _ = void 0;
+        w = p || "reversed" in S && S.reversed ? S.joinDef.on.map((_) => ({
+          sourceColumn: _.target.name,
+          targetColumn: _.source.name,
+          sourceColumnObj: _.target,
+          targetColumnObj: _.source
+        })) : S.joinDef.on.map((_) => ({
+          sourceColumn: _.source.name,
+          targetColumn: _.target.name,
+          sourceColumnObj: _.source,
+          targetColumnObj: _.target
+        })), A = void 0;
       }
       const $ = this.findPropagatingFilters(s, l, e), C = /* @__PURE__ */ new Map([[l.name, l]]), { aggregateMeasures: T, requiredBaseMeasures: E } = I.categorizeForPostAggregation(
         y,
@@ -4768,7 +4768,7 @@ class at {
         const S = this.expandCalculatedMeasureDependencies(
           l,
           N
-        ), D = this.findDownstreamJoinKeys(
+        ), R = this.findDownstreamJoinKeys(
           l,
           s,
           e
@@ -4780,8 +4780,8 @@ class at {
           joinKeys: w,
           measures: S,
           propagatingFilters: $.length > 0 ? $ : void 0,
-          downstreamJoinKeys: D.length > 0 ? D : void 0,
-          intermediateJoins: _ && _.length > 0 ? _ : void 0,
+          downstreamJoinKeys: R.length > 0 ? R : void 0,
+          intermediateJoins: A && A.length > 0 ? A : void 0,
           cteType: "aggregate",
           cteReason: f
         });
@@ -4797,7 +4797,7 @@ class at {
     for (const [, n] of e)
       if (n.name !== t && n.joins) {
         for (const [, s] of Object.entries(n.joins))
-          if (K(s.targetCube).name === t)
+          if (P(s.targetCube).name === t)
             return { sourceCube: n, joinDef: s };
       }
     return null;
@@ -4837,13 +4837,13 @@ class at {
     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 w = y.sql(s).where, _ = g.joinDef.on[0]?.source, $ = h.joinDef.on[0]?.target;
+      const w = y.sql(s).where, A = g.joinDef.on[0]?.source, $ = h.joinDef.on[0]?.target;
       l.push({
         cube: y,
         joinDef: g.joinDef,
         securityFilter: w,
         primaryJoinColumn: $,
-        cteJoinColumn: _
+        cteJoinColumn: A
       });
     }
     const p = a[0].joinDef.on.map((f) => ({
@@ -4882,7 +4882,7 @@ class at {
       if (!i.has(a) && (i.add(a), !!u.joins)) {
         for (const [, c] of Object.entries(u.joins))
           if (c.relationship === "hasMany") {
-            const l = K(c.targetCube);
+            const l = P(c.targetCube);
             (r.has(a) || r.has(l.name)) && s.push({
               fromCube: a,
               toCube: l.name,
@@ -4922,15 +4922,21 @@ class at {
    */
   findJoinInfoForCube(e, t, n) {
     if (t.joins) {
-      for (const [, s] of Object.entries(t.joins))
-        if (K(s.targetCube).name === n)
-          return { sourceCube: t, joinDef: s };
-    }
-    for (const [, s] of e)
-      if (s.name !== t.name && s.joins) {
-        for (const [, i] of Object.entries(s.joins))
-          if (K(i.targetCube).name === n)
-            return { sourceCube: s, joinDef: i };
+      for (const [, i] of Object.entries(t.joins))
+        if (P(i.targetCube).name === n)
+          return { sourceCube: t, joinDef: i };
+    }
+    const s = e.get(n);
+    if (s?.joins) {
+      for (const [, i] of Object.entries(s.joins))
+        if (P(i.targetCube).name === t.name)
+          return { sourceCube: s, joinDef: i, reversed: !0 };
+    }
+    for (const [, i] of e)
+      if (!(i.name === t.name || i.name === n) && i.joins) {
+        for (const [, r] of Object.entries(i.joins))
+          if (P(r.targetCube).name === n)
+            return { sourceCube: i, joinDef: r };
       }
     return null;
   }
@@ -4961,7 +4967,7 @@ class at {
       }
     if (e.joins)
       for (const [, r] of Object.entries(e.joins)) {
-        const u = K(r.targetCube).name;
+        const u = P(r.targetCube).name;
         if (i.has(u)) {
           const c = r.on.map((l) => ({
             sourceColumn: l.source.name,
@@ -5017,7 +5023,7 @@ class at {
     if (!e.joins)
       return null;
     for (const [, n] of Object.entries(e.joins))
-      if (K(n.targetCube).name === t && n.relationship === "hasMany")
+      if (P(n.targetCube).name === t && n.relationship === "hasMany")
         return n;
     return null;
   }
@@ -5045,7 +5051,7 @@ class at {
       const a = n.get(r);
       if (a?.joins) {
         for (const [, u] of Object.entries(a.joins))
-          if (K(u.targetCube).name === t.name && u.relationship === "hasMany") {
+          if (P(u.targetCube).name === t.name && u.relationship === "hasMany") {
             const l = this.extractFiltersForCube(e.filters, r), m = this.extractTimeDimensionFiltersForCube(e, r), p = [...l, ...m];
             p.length > 0 && u.on.length > 0 && s.push({
               sourceCube: a,
@@ -5488,10 +5494,10 @@ class on {
     let f = n.db.select(c).from(a.from);
     if (u && e.intermediateJoins)
       for (const C of e.intermediateJoins) {
-        const T = C.cube.sql(n), N = [P(C.cteJoinColumn, C.joinDef.on[0]?.target)];
+        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)
+          D(...N)
         );
       }
     const h = s ? {
@@ -5502,8 +5508,8 @@ class on {
       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), D = this.queryBuilder.buildDateRangeCondition(S, C.dateRange);
-          D && y.push(D);
+          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) {
@@ -5513,8 +5519,8 @@ class on {
           if (E === l && r.dimensions && r.dimensions[N]) {
             const S = r.dimensions[N];
             if (T.operator === "inDateRange") {
-              const D = this.queryBuilder.buildMeasureExpression({ sql: S.sql, type: "number" }, n), O = this.queryBuilder.buildDateRangeCondition(D, T.values);
-              O && y.push(O);
+              const R = this.queryBuilder.buildMeasureExpression({ sql: S.sql, type: "number" }, n), _ = this.queryBuilder.buildDateRangeCondition(R, T.values);
+              _ && y.push(_);
             }
           }
         }
@@ -5529,12 +5535,12 @@ class on {
       }
     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] : D(...b);
       f = f.where(C);
     }
-    const w = [], _ = /* @__PURE__ */ new Set(), $ = (C) => {
+    const w = [], A = /* @__PURE__ */ new Set(), $ = (C) => {
       const T = C?.name || (typeof C == "string" ? C : null);
-      T && !_.has(T) ? (_.add(T), w.push(C)) : T || w.push(C);
+      T && !A.has(T) ? (A.add(T), w.push(C)) : T || w.push(C);
     };
     if (u && e.intermediateJoins) {
       const C = e.intermediateJoins[0];
@@ -5582,13 +5588,13 @@ class on {
     const i = [];
     if (s.intermediateJoins && s.intermediateJoins.length > 0) {
       const r = s.intermediateJoins[0], a = s.joinKeys[0]?.sourceColumnObj, u = o`${o.identifier(t)}.${o.identifier(r.primaryJoinColumn.name)}`;
-      i.push(P(a, u));
+      i.push(Q(a, u));
     } else
       for (const r of s.joinKeys) {
         const a = r.sourceColumnObj || o.identifier(r.sourceColumn), u = o`${o.identifier(t)}.${o.identifier(r.targetColumn)}`;
-        i.push(P(a, u));
+        i.push(Q(a, u));
       }
-    return i.length === 1 ? i[0] : A(...i);
+    return i.length === 1 ? i[0] : D(...i);
   }
   /**
    * Build a subquery filter for propagating filters from related cubes.
@@ -5617,12 +5623,12 @@ class on {
     }
     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] : D(...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) => P(m.source, m.target)), c = A(
+      const u = a.map((m) => Q(m.source, m.target)), c = D(
         ...u,
         r
       ), l = t.db.select({ one: o`1` }).from(s.from).where(c);
@@ -6217,19 +6223,19 @@ class pn {
         const b = e;
         y = b.type === "and";
         for (const w of b.filters || []) {
-          const _ = this.buildFilterCondition(w, t, n, s);
-          _ && g.push(_);
+          const A = this.buildFilterCondition(w, t, n, s);
+          A && g.push(A);
         }
       } else {
         const b = e;
         y = "and" in b && !!b.and;
         const w = b.and || b.or || [];
-        for (const _ of w) {
-          const $ = this.buildFilterCondition(_, t, n, s);
+        for (const A of w) {
+          const $ = this.buildFilterCondition(A, t, n, s);
           $ && g.push($);
         }
       }
-      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 ? D(...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] === ""))
@@ -6285,7 +6291,7 @@ class pn {
       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] : D(...i);
       r = r.where(a);
     }
     return r = r.groupBy(e.bindingKeyExpr), t.db.$with(n).as(r);
@@ -6318,7 +6324,7 @@ class pn {
       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] : D(...a);
       l = l.where(m);
     }
     return l = l.groupBy(e.bindingKeyExpr), t.db.$with(s).as(l);
@@ -6334,8 +6340,8 @@ class pn {
       for (const r of i.joinPath) {
         const a = r.joinDef, u = [];
         for (const p of a.on)
-          p.as ? u.push(p.as(p.source, p.target)) : u.push(P(p.source, p.target));
-        const c = u.length === 1 ? u[0] : A(...u), m = i.cube.sql(n);
+          p.as ? u.push(p.as(p.source, p.target)) : u.push(Q(p.source, p.target));
+        const c = u.length === 1 ? u[0] : D(...u), m = i.cube.sql(n);
         e = e.leftJoin(m.from, c), m.where && s.push(m.where);
       }
     return e;
@@ -6644,7 +6650,7 @@ class hn {
         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 ? D(...c) : o`(${o.join(c, o` OR `)})`;
     }
     if ("type" in e && "filters" in e) {
       const u = e, c = [];
@@ -6652,7 +6658,7 @@ class hn {
         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" ? D(...c) : o`(${o.join(c, o` OR `)})`;
     }
     const s = e, [, i] = s.member.split("."), r = t.dimensions?.[i];
     if (!r) return null;
@@ -6684,7 +6690,7 @@ class hn {
       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] : D(...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);
@@ -6701,7 +6707,7 @@ class hn {
         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] : D(...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"),
@@ -6730,7 +6736,7 @@ class hn {
         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] : D(...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"),
@@ -6761,7 +6767,7 @@ class hn {
       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] : D(...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"),
@@ -6794,7 +6800,7 @@ class hn {
       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] : D(...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"),
@@ -7230,7 +7236,7 @@ class gn {
         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 ? D(...p) : o`(${o.join(p, o` OR `)})`;
     }
     const i = e, [r, a] = i.member.split("."), u = n.get(r);
     if (!u) return null;
@@ -7272,7 +7278,7 @@ class gn {
     }
     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] : D(...i);
       u = u.where(l);
     }
     const c = [t.bindingKeyExpr];
@@ -7327,7 +7333,7 @@ class gn {
       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] : D(...i);
       c = c.where(m);
     }
     const l = [
@@ -7516,14 +7522,14 @@ class J {
       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 w = { ...b };
         if (t.timeDimensions) {
-          for (const _ of t.timeDimensions)
-            if (_.dimension in w) {
-              let $ = w[_.dimension];
+          for (const A of t.timeDimensions)
+            if (A.dimension in w) {
+              let $ = w[A.dimension];
               if (typeof $ == "string" && $.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
                 const C = $.replace(" ", "T"), T = !C.endsWith("Z") && !C.includes("+") ? C + "Z" : C;
                 $ = new Date(T);
               }
-              $ = this.databaseAdapter.convertTimeDimensionResult($), w[_.dimension] = $;
+              $ = this.databaseAdapter.convertTimeDimensionResult($), w[A.dimension] = $;
             }
         }
         return w;
@@ -7805,8 +7811,8 @@ class J {
           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 w = b.replace(" ", "T"), _ = !w.endsWith("Z") && !w.includes("+") ? w + "Z" : w;
-              b = new Date(_);
+              const w = b.replace(" ", "T"), A = !w.endsWith("Z") && !w.includes("+") ? w + "Z" : w;
+              b = new Date(A);
             }
             b = this.databaseAdapter.convertTimeDimensionResult(b), g[y.dimension] = b;
           }
@@ -7860,15 +7866,15 @@ class J {
             if (!s.has(T)) {
               const N = {
                 filters: C.filters
-              }, S = /* @__PURE__ */ new Map([[T, C.sourceCube]]), D = this.queryBuilder.buildWhereConditions(
+              }, S = /* @__PURE__ */ new Map([[T, C.sourceCube]]), R = this.queryBuilder.buildWhereConditions(
                 S,
                 N,
                 n
               );
-              s.set(T, D);
+              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] : D(...E));
           }
     }
     const i = [], r = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map();
@@ -7895,10 +7901,10 @@ class J {
           if (m[T]) {
             const [, E] = T.split("."), N = c.get(C);
             if (N && N.measures && N.measures[E]) {
-              const S = N.measures[E], D = o`${o.identifier($.cteAlias)}.${o.identifier(E)}`;
-              let O;
+              const S = N.measures[E], R = o`${o.identifier($.cteAlias)}.${o.identifier(E)}`;
+              let _;
               if (S.type === "calculated" && S.calculatedSql)
-                O = this.queryBuilder.buildCTECalculatedMeasure(
+                _ = this.queryBuilder.buildCTECalculatedMeasure(
                   S,
                   N,
                   $,
@@ -7906,47 +7912,47 @@ class J {
                   n
                 );
               else {
-                const R = $.cteReason === "fanOutPrevention", k = this.shouldUseMaxForHasManyAtJoinKeyGrain(
+                const F = $.cteReason === "fanOutPrevention", k = this.shouldUseMaxForHasManyAtJoinKeyGrain(
                   $,
                   t,
                   c
-                ), M = R || k;
+                ), M = F || k;
                 switch (S.type) {
                   case "count":
                   case "countDistinct":
                   case "sum":
-                    O = M ? V(D) : W(D);
+                    _ = M ? V(R) : K(R);
                     break;
                   case "avg":
-                    O = M ? V(D) : this.databaseAdapter.buildAvg(D);
+                    _ = M ? V(R) : this.databaseAdapter.buildAvg(R);
                     break;
                   case "min":
-                    O = re(D);
+                    _ = re(R);
                     break;
                   case "max":
-                    O = V(D);
+                    _ = V(R);
                     break;
                   case "number":
-                    O = M ? V(D) : W(D);
+                    _ = M ? V(R) : K(R);
                     break;
                   default:
-                    O = M ? V(D) : W(D);
+                    _ = M ? V(R) : K(R);
                 }
               }
-              m[T] = o`${O}`.as(T);
+              m[T] = o`${_}`.as(T);
             }
           }
         for (const T in m) {
           const [E, N] = T.split(".");
           if (E === C) {
-            const S = c.get(C), D = S && S.dimensions?.[N], O = T.startsWith(C + ".");
-            if (D || O) {
-              let R = $.joinKeys.find((k) => k.targetColumn === N);
-              if (!R && S?.dimensions?.[N]) {
+            const S = c.get(C), R = S && S.dimensions?.[N], _ = T.startsWith(C + ".");
+            if (R || _) {
+              let F = $.joinKeys.find((k) => k.targetColumn === N);
+              if (!F && S?.dimensions?.[N]) {
                 const k = S.dimensions[N].sql;
-                R = $.joinKeys.find((M) => M.targetColumnObj === k);
+                F = $.joinKeys.find((M) => M.targetColumnObj === k);
               }
-              R ? m[T] = o`${o.identifier($.cteAlias)}.${o.identifier(N)}`.as(T) : O && S?.dimensions?.[N] && (m[T] = o`${o.identifier($.cteAlias)}.${o.identifier(N)}`.as(T));
+              F ? m[T] = o`${o.identifier($.cteAlias)}.${o.identifier(N)}`.as(T) : _ && S?.dimensions?.[N] && (m[T] = o`${o.identifier($.cteAlias)}.${o.identifier(N)}`.as(T));
             }
           }
         }
@@ -7959,17 +7965,17 @@ class J {
           if (I.isPostAggregationWindow(N)) {
             const S = I.getWindowBaseMeasure(N, C);
             if (S) {
-              const [D, O] = S.split("."), R = c.get(D);
-              if (R?.measures?.[O]) {
-                const k = R.measures[O], M = e.preAggregationCTEs?.find(
-                  (H) => H.cube?.name === D && H.measures?.includes(S)
+              const [R, _] = S.split("."), F = c.get(R);
+              if (F?.measures?.[_]) {
+                const k = F.measures[_], M = e.preAggregationCTEs?.find(
+                  (H) => H.cube?.name === R && H.measures?.includes(S)
                 );
                 let z;
                 if (M) {
-                  const H = o`${o.identifier(M.cteAlias)}.${o.identifier(O)}`;
+                  const H = o`${o.identifier(M.cteAlias)}.${o.identifier(_)}`;
                   z = o`sum(${H})`;
                 } else
-                  z = this.queryBuilder.buildMeasureExpression(k, n, R);
+                  z = this.queryBuilder.buildMeasureExpression(k, n, F);
                 m[S] || (m[S] = o`${z}`.as(S));
                 const se = this.buildPostAggregationWindowExpression(
                   N,
@@ -8017,24 +8023,24 @@ class J {
           continue;
         const T = r.get($.cube.name);
         if ($.junctionTable) {
-          const R = $.junctionTable, k = [];
-          if (R.securitySql) {
-            const M = R.securitySql(n.securityContext);
+          const F = $.junctionTable, k = [];
+          if (F.securitySql) {
+            const M = F.securitySql(n.securityContext);
             Array.isArray(M) ? k.push(...M) : k.push(M);
           }
           try {
-            switch (R.joinType || "left") {
+            switch (F.joinType || "left") {
               case "left":
-                f = f.leftJoin(R.table, R.joinCondition);
+                f = f.leftJoin(F.table, F.joinCondition);
                 break;
               case "inner":
-                f = f.innerJoin(R.table, R.joinCondition);
+                f = f.innerJoin(F.table, F.joinCondition);
                 break;
               case "right":
-                f = f.rightJoin(R.table, R.joinCondition);
+                f = f.rightJoin(F.table, F.joinCondition);
                 break;
               case "full":
-                f = f.fullJoin(R.table, R.joinCondition);
+                f = f.fullJoin(F.table, F.joinCondition);
                 break;
             }
             k.length > 0 && p.push(...k);
@@ -8045,31 +8051,31 @@ class J {
         if (T)
           E = o`${o.identifier(T)}`, N = this.cteBuilder.buildCTEJoinCondition($, T, e), S = void 0;
         else {
-          const R = a.get($.cube.name), k = $.cube.sql(n);
-          if (E = k.from, S = k.where, R) {
+          const F = a.get($.cube.name), k = $.cube.sql(n);
+          if (E = k.from, S = k.where, F) {
             const M = [];
-            for (const z of R.joinKeys) {
-              const se = o`${o.identifier(R.cteAlias)}.${o.identifier(z.sourceColumn)}`, H = z.targetColumnObj || o.identifier(z.targetColumn);
-              M.push(P(se, H));
+            for (const z of F.joinKeys) {
+              const se = o`${o.identifier(F.cteAlias)}.${o.identifier(z.sourceColumn)}`, H = z.targetColumnObj || o.identifier(z.targetColumn);
+              M.push(Q(se, H));
             }
-            N = M.length === 1 ? M[0] : A(...M);
+            N = M.length === 1 ? M[0] : D(...M);
           } else
             N = $.joinCondition;
         }
-        const D = $.joinType || "left", O = D !== "inner" && S ? A(N, S) : N;
+        const R = $.joinType || "left", _ = R !== "inner" && S ? D(N, S) : N;
         try {
-          switch (D) {
+          switch (R) {
             case "left":
-              f = f.leftJoin(E, O), S && h.add($.cube.name);
+              f = f.leftJoin(E, _), S && h.add($.cube.name);
               break;
             case "inner":
               f = f.innerJoin(E, N);
               break;
             case "right":
-              f = f.rightJoin(E, O), S && h.add($.cube.name);
+              f = f.rightJoin(E, _), S && h.add($.cube.name);
               break;
             case "full":
-              f = f.fullJoin(E, O), S && h.add($.cube.name);
+              f = f.fullJoin(E, _), S && h.add($.cube.name);
               break;
           }
         } catch {
@@ -8094,7 +8100,7 @@ class J {
       // Reuse pre-built filters for parameter deduplication
     );
     if (y.length > 0 && p.push(...y), p.length > 0) {
-      const $ = p.length === 1 ? p[0] : A(...p);
+      const $ = p.length === 1 ? p[0] : D(...p);
       f = f.where($);
     }
     const b = this.queryBuilder.buildGroupByFields(
@@ -8115,11 +8121,11 @@ class J {
       // Pass the queryPlan to handle CTE scenarios
     );
     if (w.length > 0) {
-      const $ = w.length === 1 ? w[0] : A(...w);
+      const $ = w.length === 1 ? w[0] : D(...w);
       f = f.having($);
     }
-    const _ = this.queryBuilder.buildOrderBy(t);
-    return _.length > 0 && (f = f.orderBy(..._)), 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
@@ -8377,15 +8383,15 @@ class J {
         const h = f.field.includes(".") ? f.field.split(".")[1] : f.field;
         if (n.timeDimensions)
           for (const b of n.timeDimensions) {
-            const [w, _] = b.dimension.split(".");
-            if (_ === h) {
+            const [w, A] = b.dimension.split(".");
+            if (A === h) {
               const $ = u(w, h);
               if ($)
                 return {
                   field: $,
                   direction: f.direction
                 };
-              const C = i.dimensions?.[_];
+              const C = i.dimensions?.[A];
               if (C)
                 return {
                   field: this.queryBuilder.buildTimeDimensionExpression(