drizzle-cube 0.3.32 → 0.3.33

package/dist/server/index.js

@@ -1,4 +1,4 @@
-import { sql as o, eq as K, and as G, SQL as HE, gte as Ae, lte as Re, arrayContained as YE, arrayOverlaps as VE, arrayContains as $E, isNotNull as Lt, ne as _t, or as le, isNull as ct, notInArray as dt, inArray as be, lt as ye, gt as Fe, StringChunk as wE, sum as q, max as ee, min as ue, count as Tt, countDistinct as WE, desc as vE, asc as Dt } from "drizzle-orm";
+import { sql as o, eq as K, and as b, SQL as HE, gte as Ae, lte as Re, arrayContained as YE, arrayOverlaps as VE, arrayContains as $E, isNotNull as Lt, ne as _t, or as le, isNull as ct, notInArray as dt, inArray as be, lt as ye, gt as Fe, StringChunk as wE, sum as q, max as ee, min as ue, count as Tt, countDistinct as WE, desc as vE, asc as Dt } from "drizzle-orm";
 class fe {
   /**
    * Default implementation returns template unchanged
@@ -2032,7 +2032,7 @@ function at(n, e) {
 function ot(n) {
   return n && typeof n == "object" ? o`${o`${n}`}` : n;
 }
-function F(n, e) {
+function y(n, e) {
   const t = typeof n == "function" ? n(e) : n;
   return ot(t);
 }
@@ -2073,13 +2073,13 @@ function Rs(n, e) {
       {
         joinType: a,
         table: t,
-        condition: G(...r)
+        condition: b(...r)
       },
       {
         joinType: a,
         table: t,
         // This will be replaced with target cube table in query planner
-        condition: G(...T)
+        condition: b(...T)
       }
     ],
     junctionSecurityConditions: A
@@ -2288,7 +2288,7 @@ class Ce {
    * Build time dimension expression with granularity using database adapter
    */
   buildTimeDimensionExpression(e, t, E) {
-    const s = F(e, E);
+    const s = y(e, E);
     return t ? this.databaseAdapter.buildTimeDimension(t, s) : s instanceof HE ? s : o`${s}`;
   }
   /**
@@ -2304,7 +2304,7 @@ class Ce {
         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 G(
+      return b(
         Ae(e, E),
         Re(e, s)
       );
@@ -2313,7 +2313,7 @@ class Ce {
       const E = this.parseRelativeDateRange(t);
       if (E) {
         let R, S;
-        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (R = Math.floor(E.start.getTime() / 1e3), S = Math.floor(E.end.getTime() / 1e3)) : (R = E.start.getTime(), S = E.end.getTime()) : (R = E.start.toISOString(), S = E.end.toISOString()), G(
+        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (R = Math.floor(E.start.getTime() / 1e3), S = Math.floor(E.end.getTime() / 1e3)) : (R = E.start.getTime(), S = E.end.getTime()) : (R = E.start.toISOString(), S = E.end.toISOString()), b(
           Ae(e, R),
           Re(e, S)
         );
@@ -2325,7 +2325,7 @@ class Ce {
       const T = new Date(i);
       T.setUTCHours(23, 59, 59, 999);
       let A, a;
-      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (A = Math.floor(r.getTime() / 1e3), a = Math.floor(T.getTime() / 1e3)) : (A = r.getTime(), a = T.getTime()) : (A = r.toISOString(), a = T.toISOString()), G(
+      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (A = Math.floor(r.getTime() / 1e3), a = Math.floor(T.getTime() / 1e3)) : (A = r.getTime(), a = T.getTime()) : (A = r.toISOString(), a = T.toISOString()), b(
         Ae(e, A),
         Re(e, a)
       );
@@ -2511,7 +2511,7 @@ class ge {
               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 G(
+            return b(
               Ae(e, A),
               Re(e, a)
             );
@@ -2527,7 +2527,7 @@ class ge {
         return A ? Fe(e, A) : null;
       }
       case "between":
-        return r.length >= 2 ? G(
+        return r.length >= 2 ? b(
           Ae(e, r[0]),
           Re(e, r[1])
         ) : null;
@@ -2556,7 +2556,7 @@ class ge {
           K(e, "")
         );
       case "isNotEmpty":
-        return G(
+        return b(
           Lt(e),
           _t(e, "")
         );
@@ -2579,7 +2579,7 @@ class ge {
   buildLogicalFilter(e, t, E) {
     if ("and" in e && e.and) {
       const s = e.and.map((i) => this.buildSingleFilter(i, t, E)).filter((i) => i !== null);
-      return s.length > 0 ? s.length === 1 ? s[0] : G(...s) : null;
+      return s.length > 0 ? s.length === 1 ? s[0] : b(...s) : null;
     }
     if ("or" in e && e.or) {
       const s = e.or.map((i) => this.buildSingleFilter(i, t, E)).filter((i) => i !== null);
@@ -2598,7 +2598,7 @@ class ge {
     if (!T) return null;
     const A = T.dimensions?.[r];
     if (!A) return null;
-    const a = F(A.sql, E);
+    const a = y(A.sql, E);
     return this.buildFilterCondition(
       a,
       s.operator,
@@ -2836,12 +2836,12 @@ function us(n, e) {
       throw new Error(
         `Cannot substitute {${I}}: cube '${l}' not found`
       );
-    const C = `${l}.${O}`, c = s.get(C);
-    if (!c)
+    const C = `${l}.${O}`, _ = s.get(C);
+    if (!_)
       throw new Error(
         `Cannot substitute {${I}}: measure '${C}' not resolved yet. Ensure measures are resolved in dependency order.`
       );
-    const U = c(), D = o`${U}`;
+    const U = _(), D = o`${U}`;
     r.set(I, D);
   }
   const T = [], A = [];
@@ -2943,10 +2943,10 @@ class H {
           continue;
         }
         re.isCalculatedMeasure(O) ? (T.push(R), Be(O.calculatedSql, S).forEach((C) => A.add(C)), a.getAllDependencies(R).forEach((C) => {
-          const [c, U] = C.split("."), D = t.get(c);
+          const [_, U] = C.split("."), D = t.get(_);
           if (D && D.measures[U]) {
             const m = D.measures[U];
-            re.isCalculatedMeasure(m) && Be(m.calculatedSql, c).forEach((M) => A.add(M));
+            re.isCalculatedMeasure(m) && Be(m.calculatedSql, _).forEach((M) => A.add(M));
           }
         })) : r.push(R);
       }
@@ -3124,14 +3124,14 @@ class H {
       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 = F(e.sql, t);
+    let s = y(e.sql, t);
     if (e.filters && e.filters.length > 0) {
       const i = e.filters.map((r) => {
         const T = r(t);
         return T ? o`(${T})` : void 0;
       }).filter(Boolean);
       if (i.length > 0) {
-        const r = i.length === 1 ? i[0] : G(...i);
+        const r = i.length === 1 ? i[0] : b(...i);
         s = this.databaseAdapter.buildCaseWhen([
           { when: r, then: s }
         ]);
@@ -3200,7 +3200,7 @@ class H {
         if (i.partitionBy && i.partitionBy.length > 0 && E) {
           const a = i.partitionBy.map((R) => {
             const S = R.includes(".") ? R.split(".")[1] : R, I = E.dimensions?.[S];
-            return I ? F(I.sql, t) : (console.warn(`[drizzle-cube] Window function partition dimension '${R}' not found in cube '${E.name}'`), null);
+            return I ? y(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);
         }
@@ -3210,12 +3210,12 @@ class H {
             const S = R.field.includes(".") ? R.field.split(".")[1] : R.field, I = E.dimensions?.[S];
             if (I)
               return {
-                field: F(I.sql, t),
+                field: y(I.sql, t),
                 direction: R.direction
               };
             const N = E.measures?.[S];
             return N && N.sql ? {
-              field: F(N.sql, t),
+              field: y(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);
@@ -3450,7 +3450,7 @@ class _s {
         if (H.isPostAggregationWindow(l)) {
           const u = H.getWindowBaseMeasure(l, I);
           if (u) {
-            const [C, c] = u.split("."), D = r.get(C)?.measures?.[c];
+            const [C, _] = u.split("."), D = r.get(C)?.measures?.[_];
             if (D && this.isAggregateFunctionType(D.type)) {
               R = !0;
               break;
@@ -3466,15 +3466,15 @@ class _s {
         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((c) => c.cube.name === I), C = u.joinKeys.find((c) => c.targetColumn === N);
+            const u = s.preAggregationCTEs.find((_) => _.cube.name === I), C = u.joinKeys.find((_) => _.targetColumn === N);
             if (C && C.sourceColumnObj)
               i.push(C.sourceColumnObj);
             else {
-              const c = o`${o.identifier(u.cteAlias)}.${o.identifier(N)}`;
-              i.push(c);
+              const _ = o`${o.identifier(u.cteAlias)}.${o.identifier(N)}`;
+              i.push(_);
             }
           } else {
-            const u = O.dimensions[N], C = F(u.sql, E);
+            const u = O.dimensions[N], C = y(u.sql, E);
             i.push(C);
           }
       }
@@ -3483,17 +3483,17 @@ class _s {
         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((c) => c.cube.name === I), C = u.joinKeys.find((c) => c.targetColumn === N);
+            const u = s.preAggregationCTEs.find((_) => _.cube.name === I), C = u.joinKeys.find((_) => _.targetColumn === N);
             if (C && C.sourceColumnObj) {
-              const c = this.dateTimeBuilder.buildTimeDimensionExpression(
+              const _ = this.dateTimeBuilder.buildTimeDimensionExpression(
                 C.sourceColumnObj,
                 S.granularity,
                 E
               );
-              i.push(c);
+              i.push(_);
             } else {
-              const c = o`${o.identifier(u.cteAlias)}.${o.identifier(N)}`;
-              i.push(c);
+              const _ = o`${o.identifier(u.cteAlias)}.${o.identifier(N)}`;
+              i.push(_);
             }
           } else {
             const u = O.dimensions[N], C = this.dateTimeBuilder.buildTimeDimensionExpression(
@@ -3533,7 +3533,7 @@ class cs {
       for (const r of t.dimensions) {
         const [T, A] = r.split("."), a = i.get(T);
         if (a && a.dimensions && a.dimensions[A]) {
-          const R = a.dimensions[A], S = F(R.sql, E);
+          const R = a.dimensions[A], S = y(R.sql, E);
           s[r] = o`${S}`.as(r);
         }
       }
@@ -3634,7 +3634,7 @@ class cs {
               continue;
             }
           }
-          const N = I.dimensions[S], O = F(N.sql, E), l = this.buildDateRangeCondition(O, a.dateRange);
+          const N = I.dimensions[S], O = y(N.sql, E), l = this.buildDateRangeCondition(O, a.dateRange);
           l && r.push(l);
         }
       }
@@ -3662,7 +3662,7 @@ class cs {
       const N = e;
       if (N.and) {
         const O = N.and.map((l) => this.processFilter(l, t, E, s, i)).filter((l) => l !== null);
-        return O.length > 0 ? G(...O) : null;
+        return O.length > 0 ? b(...O) : null;
       }
       if (N.or) {
         const O = N.or.map((l) => this.processFilter(l, t, E, s, i)).filter((l) => l !== null);
@@ -3682,7 +3682,7 @@ class cs {
         if (u)
           return u;
       }
-      const O = N ? typeof R.sql == "function" ? R.sql(E) : R.sql : F(R.sql, E);
+      const O = N ? typeof R.sql == "function" ? R.sql(E) : R.sql : y(R.sql, E);
       return this.buildFilterCondition(
         O,
         r.operator,
@@ -3966,7 +3966,7 @@ class Le {
       const r = t ? o`${o.identifier(t)}.${o.identifier(i.source.name)}` : ot(i.source), T = E ? o`${o.identifier(E)}.${o.identifier(i.target.name)}` : ot(i.target), A = i.as || K;
       s.push(A(r, T));
     }
-    return G(...s);
+    return b(...s);
   }
   /**
    * Get all reachable cubes from a starting cube
@@ -4161,13 +4161,13 @@ class LE {
       for (const { fromCube: l, toCube: u, joinDef: C } of O) {
         if (A.has(u))
           continue;
-        const c = e.get(u);
-        if (!c)
+        const _ = e.get(u);
+        if (!_)
           throw new Error(`Cube '${u}' not found`);
         if (C.relationship === "belongsToMany" && C.through) {
           const U = Rs(C, s.securityContext);
           T.push({
-            cube: c,
+            cube: _,
             alias: `${u.toLowerCase()}_cube`,
             joinType: U.junctionJoins[1].joinType,
             // Use the target join type
@@ -4191,7 +4191,7 @@ class LE {
             // No target alias needed - use the actual column
           ), D = at(C.relationship, C.sqlJoinType);
           T.push({
-            cube: c,
+            cube: _,
             alias: `${u.toLowerCase()}_cube`,
             joinType: D,
             joinCondition: U
@@ -4253,28 +4253,35 @@ class LE {
       if (u.length === 0)
         continue;
       const C = this.analyzeJoinPathToPrimary(e, t, R.name, i);
-      let c, U;
+      let _, U;
       if (C?.hasIntermediateHasMany && C.intermediateJoins.length > 0)
-        c = C.correctJoinKeys, U = C.intermediateJoins;
+        _ = C.correctJoinKeys, U = C.intermediateJoins;
       else {
         const f = I ? this.findJoinInfoToCube(e, t.name) : this.findJoinInfoForCube(e, t, R.name);
         if (!f)
           continue;
-        f.joinDef.relationship === "belongsToMany" && f.joinDef.through ? c = f.joinDef.through.sourceKey.map((b) => ({
-          sourceColumn: b.target.name,
-          targetColumn: b.source.name,
-          sourceColumnObj: b.target,
-          targetColumnObj: b.source
-        })) : c = I || "reversed" in f && f.reversed ? f.joinDef.on.map((y) => ({
-          sourceColumn: y.target.name,
-          targetColumn: y.source.name,
-          sourceColumnObj: y.target,
-          targetColumnObj: y.source
-        })) : f.joinDef.on.map((y) => ({
-          sourceColumn: y.source.name,
-          targetColumn: y.target.name,
-          sourceColumnObj: y.source,
-          targetColumnObj: y.target
+        f.joinDef.relationship === "belongsToMany" && f.joinDef.through ? f.sourceCube?.name === t.name && !("reversed" in f && f.reversed) ? _ = f.joinDef.through.targetKey.map((G) => ({
+          sourceColumn: G.source.name,
+          // junction table column
+          targetColumn: G.target.name,
+          // CTE cube column
+          sourceColumnObj: G.source,
+          targetColumnObj: G.target
+        })) : _ = f.joinDef.through.sourceKey.map((G) => ({
+          sourceColumn: G.target.name,
+          targetColumn: G.source.name,
+          sourceColumnObj: G.target,
+          targetColumnObj: G.source
+        })) : _ = I || "reversed" in f && f.reversed ? f.joinDef.on.map((G) => ({
+          sourceColumn: G.target.name,
+          targetColumn: G.source.name,
+          sourceColumnObj: G.target,
+          targetColumnObj: G.source
+        })) : f.joinDef.on.map((G) => ({
+          sourceColumn: G.source.name,
+          targetColumn: G.target.name,
+          sourceColumnObj: G.source,
+          targetColumnObj: G.target
         })), U = void 0;
       }
       const D = this.findPropagatingFilters(s, R, e), m = /* @__PURE__ */ new Map([[R.name, R]]), { aggregateMeasures: P, requiredBaseMeasures: M } = H.categorizeForPostAggregation(
@@ -4288,7 +4295,7 @@ class LE {
         const f = this.expandCalculatedMeasureDependencies(
           R,
           g
-        ), b = this.findDownstreamJoinKeys(
+        ), F = this.findDownstreamJoinKeys(
           R,
           s,
           e
@@ -4297,10 +4304,10 @@ class LE {
           cube: R,
           alias: S,
           cteAlias: `${R.name.toLowerCase()}_agg`,
-          joinKeys: c,
+          joinKeys: _,
           measures: f,
           propagatingFilters: D.length > 0 ? D : void 0,
-          downstreamJoinKeys: b.length > 0 ? b : void 0,
+          downstreamJoinKeys: F.length > 0 ? F : void 0,
           intermediateJoins: U && U.length > 0 ? U : void 0,
           cteType: "aggregate",
           cteReason: N
@@ -4357,11 +4364,11 @@ class LE {
     for (let N = 0; N < T.length - 1; N++) {
       const O = T[N], l = T[N + 1], u = e.get(O.toCube);
       if (!u) continue;
-      const c = u.sql(s).where, U = l.joinDef.on[0]?.source, D = O.joinDef.on[0]?.target;
+      const _ = u.sql(s).where, U = l.joinDef.on[0]?.source, D = O.joinDef.on[0]?.target;
       R.push({
         cube: u,
         joinDef: l.joinDef,
-        securityFilter: c,
+        securityFilter: _,
         primaryJoinColumn: D,
         cteJoinColumn: U
       });
@@ -4876,26 +4883,26 @@ class LE {
       if (!A)
         continue;
       const a = s.measures.filter(
-        (c) => c.startsWith(r + ".")
+        (_) => _.startsWith(r + ".")
       ), R = this.extractMeasuresFromFilters(s, A), S = [.../* @__PURE__ */ new Set([...a, ...R])];
       if (S.length === 0)
         continue;
-      const I = T.on.map((c) => ({
-        sourceColumn: c.source.name,
-        targetColumn: c.target.name
+      const I = T.on.map((_) => ({
+        sourceColumn: _.source.name,
+        targetColumn: _.target.name
       })), N = /* @__PURE__ */ new Map([[r, A]]), { aggregateMeasures: O, postAggWindowMeasures: l, requiredBaseMeasures: u } = H.categorizeForPostAggregation(
         S,
         N
       ), C = [.../* @__PURE__ */ new Set([
         ...O,
-        ...Array.from(u).filter((c) => c.startsWith(r + "."))
+        ...Array.from(u).filter((_) => _.startsWith(r + "."))
       ])];
       if (C.length > 0) {
-        const c = l.length > 0;
+        const _ = l.length > 0;
         i.push({
           cubeName: r,
           cteAlias: `${r.toLowerCase()}_agg`,
-          reason: c ? `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)`,
+          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: C,
           joinKeys: I,
@@ -5022,7 +5029,7 @@ class ds {
         const P = m.cube.sql(E), g = [K(m.cteJoinColumn, m.joinDef.on[0]?.target)];
         m.securityFilter && g.push(m.securityFilter), N = N.leftJoin(
           P.from,
-          G(...g)
+          b(...g)
         );
       }
     const O = s ? {
@@ -5033,8 +5040,8 @@ class ds {
       for (const m of t.timeDimensions) {
         const [P, M] = m.dimension.split(".");
         if (P === R && r.dimensions && r.dimensions[M] && m.dateRange) {
-          const g = r.dimensions[M], f = this.queryBuilder.buildMeasureExpression({ sql: g.sql, type: "number" }, E), b = this.queryBuilder.buildDateRangeCondition(f, m.dateRange);
-          b && u.push(b);
+          const g = r.dimensions[M], f = this.queryBuilder.buildMeasureExpression({ sql: g.sql, type: "number" }, E), F = this.queryBuilder.buildDateRangeCondition(f, m.dateRange);
+          F && u.push(F);
         }
       }
     if (t.filters) {
@@ -5044,8 +5051,8 @@ class ds {
           if (M === R && r.dimensions && r.dimensions[g]) {
             const f = r.dimensions[g];
             if (P.operator === "inDateRange") {
-              const b = this.queryBuilder.buildMeasureExpression({ sql: f.sql, type: "number" }, E), y = this.queryBuilder.buildDateRangeCondition(b, P.values);
-              y && u.push(y);
+              const F = this.queryBuilder.buildMeasureExpression({ sql: f.sql, type: "number" }, E), G = this.queryBuilder.buildDateRangeCondition(F, P.values);
+              G && u.push(G);
             }
           }
         }
@@ -5060,12 +5067,12 @@ class ds {
       }
     const C = [];
     if (T.where && C.push(T.where), C.push(...l, ...u), C.length > 0) {
-      const m = C.length === 1 ? C[0] : G(...C);
+      const m = C.length === 1 ? C[0] : b(...C);
       N = N.where(m);
     }
-    const c = [], U = /* @__PURE__ */ new Set(), D = (m) => {
+    const _ = [], U = /* @__PURE__ */ new Set(), D = (m) => {
       const P = m?.name || (typeof m == "string" ? m : null);
-      P && !U.has(P) ? (U.add(P), c.push(m)) : P || c.push(m);
+      P && !U.has(P) ? (U.add(P), _.push(m)) : P || _.push(m);
     };
     if (A && e.intermediateJoins) {
       const m = e.intermediateJoins[0];
@@ -5081,8 +5088,8 @@ class ds {
       for (const m of t.dimensions) {
         const [P, M] = m.split(".");
         if (P === R && r.dimensions && r.dimensions[M]) {
-          const g = r.dimensions[M], f = F(g.sql, E);
-          c.push(f);
+          const g = r.dimensions[M], f = y(g.sql, E);
+          _.push(f);
         }
       }
     if (t.timeDimensions)
@@ -5090,10 +5097,10 @@ class ds {
         const [P, M] = m.dimension.split(".");
         if (P === R && r.dimensions && r.dimensions[M]) {
           const g = r.dimensions[M], f = this.queryBuilder.buildTimeDimensionExpression(g.sql, m.granularity, E);
-          c.push(f);
+          _.push(f);
         }
       }
-    return c.length > 0 && (N = N.groupBy(...c)), E.db.$with(e.cteAlias).as(N);
+    return _.length > 0 && (N = N.groupBy(..._)), E.db.$with(e.cteAlias).as(N);
   }
   /**
    * Build join condition for CTE
@@ -5119,7 +5126,7 @@ class ds {
         const T = r.sourceColumnObj || o.identifier(r.sourceColumn), A = o`${o.identifier(t)}.${o.identifier(r.targetColumn)}`;
         i.push(K(T, A));
       }
-    return i.length === 1 ? i[0] : G(...i);
+    return i.length === 1 ? i[0] : b(...i);
   }
   /**
    * Build a subquery filter for propagating filters from related cubes.
@@ -5148,12 +5155,12 @@ class ds {
     }
     if (i.length === 0)
       return null;
-    const r = i.length === 1 ? i[0] : G(...i), T = e.joinConditions;
+    const r = i.length === 1 ? i[0] : b(...i), T = e.joinConditions;
     if (T.length === 1) {
       const { source: A, target: a } = T[0], R = t.db.select({ pk: A }).from(s.from).where(r);
       return o`${a} IN ${R}`;
     } else {
-      const A = T.map((S) => K(S.source, S.target)), a = G(
+      const A = T.map((S) => K(S.source, S.target)), a = b(
         ...A,
         r
       ), R = t.db.select({ one: o`1` }).from(s.from).where(a);
@@ -5268,10 +5275,10 @@ function Ms(n, e) {
           [t]: l
         };
         if (N)
-          for (const c of T)
-            C[c] = N[c];
-        for (const c of r)
-          C[c] = i;
+          for (const _ of T)
+            C[_] = N[_];
+        for (const _ of r)
+          C[_] = i;
         R.push(C);
       }
     }
@@ -5687,7 +5694,7 @@ class hs {
       const [, T] = e.bindingKey.split("."), A = t.dimensions?.[T];
       if (!A)
         throw new Error(`Binding key dimension not found: ${e.bindingKey}`);
-      return F(A.sql, E);
+      return y(A.sql, E);
     }
     const s = e.bindingKey.find((T) => T.cube === t.name);
     if (!s)
@@ -5695,7 +5702,7 @@ class hs {
     const [, i] = s.dimension.split("."), r = t.dimensions?.[i];
     if (!r)
       throw new Error(`Binding key dimension not found: ${s.dimension}`);
-    return F(r.sql, E);
+    return y(r.sql, E);
   }
   /**
    * Resolve time dimension expression for a cube
@@ -5705,7 +5712,7 @@ class hs {
       const [, T] = e.timeDimension.split("."), A = t.dimensions?.[T];
       if (!A)
         throw new Error(`Time dimension not found: ${e.timeDimension}`);
-      return F(A.sql, E);
+      return y(A.sql, E);
     }
     const s = e.timeDimension.find((T) => T.cube === t.name);
     if (!s)
@@ -5713,7 +5720,7 @@ class hs {
     const [, i] = s.dimension.split("."), r = t.dimensions?.[i];
     if (!r)
       throw new Error(`Time dimension not found: ${s.dimension}`);
-    return F(r.sql, E);
+    return y(r.sql, E);
   }
   /**
    * Build filter conditions for a step
@@ -5747,20 +5754,20 @@ class hs {
       if (r) {
         const C = e;
         u = C.type === "and";
-        for (const c of C.filters || []) {
-          const U = this.buildFilterCondition(c, t, E, s);
+        for (const _ of C.filters || []) {
+          const U = this.buildFilterCondition(_, t, E, s);
           U && l.push(U);
         }
       } else {
         const C = e;
         u = "and" in C && !!C.and;
-        const c = C.and || C.or || [];
-        for (const U of c) {
+        const _ = C.and || C.or || [];
+        for (const U of _) {
           const D = this.buildFilterCondition(U, t, E, s);
           D && l.push(D);
         }
       }
-      return l.length === 0 ? null : l.length === 1 ? l[0] : u ? G(...l) : o`(${o.join(l, o` OR `)})`;
+      return l.length === 0 ? null : l.length === 1 ? l[0] : u ? b(...l) : o`(${o.join(l, o` OR `)})`;
     }
     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] === ""))
@@ -5777,7 +5784,7 @@ class hs {
     }
     const N = I.dimensions?.[a];
     if (!N) return null;
-    const O = F(N.sql, s);
+    const O = y(N.sql, s);
     return this.filterBuilder.buildFilterCondition(
       O,
       T.operator,
@@ -5816,7 +5823,7 @@ class hs {
       step_time: o`MIN(${e.timeExpr})`.as("step_time")
     }).from(s.from);
     if (r = this.addCrossJoinsToQuery(r, e, t, i), i.length > 0) {
-      const T = i.length === 1 ? i[0] : G(...i);
+      const T = i.length === 1 ? i[0] : b(...i);
       r = r.where(T);
     }
     return r = r.groupBy(e.bindingKeyExpr), t.db.$with(E).as(r);
@@ -5849,7 +5856,7 @@ class hs {
       o`${e.bindingKeyExpr} = ${o.identifier(i)}.binding_key`
     );
     if (R = this.addCrossJoinsToQuery(R, e, t, T), T.length > 0) {
-      const S = T.length === 1 ? T[0] : G(...T);
+      const S = T.length === 1 ? T[0] : b(...T);
       R = R.where(S);
     }
     return R = R.groupBy(e.bindingKeyExpr), t.db.$with(s).as(R);
@@ -5866,7 +5873,7 @@ class hs {
         const T = r.joinDef, A = [];
         for (const I of T.on)
           I.as ? A.push(I.as(I.source, I.target)) : A.push(K(I.source, I.target));
-        const a = A.length === 1 ? A[0] : G(...A), S = i.cube.sql(E);
+        const a = A.length === 1 ? A[0] : b(...A), S = i.cube.sql(E);
         e = e.leftJoin(S.from, a), S.where && s.push(S.where);
       }
     return e;
@@ -6115,7 +6122,7 @@ class gs {
       const [, T] = e.bindingKey.split("."), A = t.dimensions?.[T];
       if (!A)
         throw new Error(`Binding key dimension not found: ${e.bindingKey}`);
-      return F(A.sql, E);
+      return y(A.sql, E);
     }
     const s = e.bindingKey.find((T) => T.cube === t.name);
     if (!s)
@@ -6123,7 +6130,7 @@ class gs {
     const [, i] = s.dimension.split("."), r = t.dimensions?.[i];
     if (!r)
       throw new Error(`Binding key dimension not found: ${s.dimension}`);
-    return F(r.sql, E);
+    return y(r.sql, E);
   }
   /**
    * Resolve time dimension expression
@@ -6133,7 +6140,7 @@ class gs {
       const [, T] = e.timeDimension.split("."), A = t.dimensions?.[T];
       if (!A)
         throw new Error(`Time dimension not found: ${e.timeDimension}`);
-      return F(A.sql, E);
+      return y(A.sql, E);
     }
     const s = e.timeDimension.find((T) => T.cube === t.name);
     if (!s)
@@ -6141,7 +6148,7 @@ class gs {
     const [, i] = s.dimension.split("."), r = t.dimensions?.[i];
     if (!r)
       throw new Error(`Time dimension not found: ${s.dimension}`);
-    return F(r.sql, E);
+    return y(r.sql, E);
   }
   /**
    * Resolve event dimension expression
@@ -6150,7 +6157,7 @@ class gs {
     const [, s] = e.eventDimension.split("."), i = t.dimensions?.[s];
     if (!i)
       throw new Error(`Event dimension not found: ${e.eventDimension}`);
-    return F(i.sql, E);
+    return y(i.sql, E);
   }
   /**
    * Build filter conditions for the starting step
@@ -6175,7 +6182,7 @@ class gs {
         const I = this.buildFilterCondition(S, t, E);
         I && a.push(I);
       }
-      return a.length === 0 ? null : a.length === 1 ? a[0] : "and" in e ? G(...a) : o`(${o.join(a, o` OR `)})`;
+      return a.length === 0 ? null : a.length === 1 ? a[0] : "and" in e ? b(...a) : o`(${o.join(a, o` OR `)})`;
     }
     if ("type" in e && "filters" in e) {
       const A = e, a = [];
@@ -6183,11 +6190,11 @@ class gs {
         const S = this.buildFilterCondition(R, t, E);
         S && a.push(S);
       }
-      return a.length === 0 ? null : a.length === 1 ? a[0] : A.type === "and" ? G(...a) : o`(${o.join(a, o` OR `)})`;
+      return a.length === 0 ? null : a.length === 1 ? a[0] : A.type === "and" ? b(...a) : o`(${o.join(a, o` OR `)})`;
     }
     const s = e, [, i] = s.member.split("."), r = t.dimensions?.[i];
     if (!r) return null;
-    const T = F(r.sql, E);
+    const T = y(r.sql, E);
     return this.filterBuilder.buildFilterCondition(
       T,
       s.operator,
@@ -6215,7 +6222,7 @@ class gs {
       event_path: o`${T}`.as("event_path")
     }).from(s.from);
     if (a.length > 0) {
-      const S = a.length === 1 ? a[0] : G(...a);
+      const S = a.length === 1 ? a[0] : b(...a);
       R = R.where(S);
     }
     return R = R.groupBy(i, T), e.entityLimit && (R = R.limit(e.entityLimit)), E.db.$with("starting_entities").as(R);
@@ -6232,12 +6239,12 @@ class gs {
         o`${i} = ${o.identifier(S)}.binding_key`,
         o`${r} < ${o.identifier(S)}.${o.identifier(I)}`
       );
-      const l = O.length === 1 ? O[0] : G(...O), u = a ? o`${T} || ${"→"} || ${o.identifier(S)}.event_path` : o`${T}`, C = E.db.select({
+      const l = O.length === 1 ? O[0] : b(...O), u = a ? o`${T} || ${"→"} || ${o.identifier(S)}.event_path` : o`${T}`, C = 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(l).orderBy(o`${r} DESC`).limit(1), c = E.db.$with(N).as(
+      }).from(s.from).where(l).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"),
@@ -6245,7 +6252,7 @@ class gs {
           event_path: o`e.event_path`.as("event_path")
         }).from(o`${o.identifier(S)}`).crossJoinLateral(C.as("e"))
       );
-      A.push(c);
+      A.push(_);
     }
     return A;
   }
@@ -6261,12 +6268,12 @@ class gs {
         o`${i} = ${o.identifier(S)}.binding_key`,
         o`${r} > ${o.identifier(S)}.${o.identifier(I)}`
       );
-      const l = O.length === 1 ? O[0] : G(...O), u = a ? o`${o.identifier(S)}.event_path || ${"→"} || ${T}` : o`${T}`, C = E.db.select({
+      const l = O.length === 1 ? O[0] : b(...O), u = a ? o`${o.identifier(S)}.event_path || ${"→"} || ${T}` : o`${T}`, C = 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(l).orderBy(o`${r} ASC`).limit(1), c = E.db.$with(N).as(
+      }).from(s.from).where(l).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"),
@@ -6274,7 +6281,7 @@ class gs {
           event_path: o`e.event_path`.as("event_path")
         }).from(o`${o.identifier(S)}`).crossJoinLateral(C.as("e"))
       );
-      A.push(c);
+      A.push(_);
     }
     return A;
   }
@@ -6292,7 +6299,7 @@ class gs {
       s.where && O.push(s.where), O.push(
         o`${r} < ${o.identifier(S)}.${o.identifier(I)}`
       );
-      const l = O.length === 1 ? O[0] : G(...O), u = a ? o`${T} || ${"→"} || ${o.identifier(S)}.event_path` : o`${T}`, C = E.db.select({
+      const l = O.length === 1 ? O[0] : b(...O), u = a ? o`${T} || ${"→"} || ${o.identifier(S)}.event_path` : o`${T}`, C = E.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${T}`.as("event_type"),
@@ -6301,13 +6308,13 @@ class gs {
       }).from(s.from).innerJoin(
         o`${o.identifier(S)}`,
         o`${i} = ${o.identifier(S)}.binding_key`
-      ).where(l), c = E.db.select({
+      ).where(l), _ = E.db.select({
         binding_key: o`binding_key`.as("binding_key"),
         step_time: o`step_time`.as("step_time"),
         event_type: o`event_type`.as("event_type"),
         event_path: o`event_path`.as("event_path")
       }).from(C.as("ranked")).where(o`rn = 1`);
-      A.push(E.db.$with(N).as(c));
+      A.push(E.db.$with(N).as(_));
     }
     return A;
   }
@@ -6325,7 +6332,7 @@ class gs {
       s.where && O.push(s.where), O.push(
         o`${r} > ${o.identifier(S)}.${o.identifier(I)}`
       );
-      const l = O.length === 1 ? O[0] : G(...O), u = a ? o`${o.identifier(S)}.event_path || ${"→"} || ${T}` : o`${T}`, C = E.db.select({
+      const l = O.length === 1 ? O[0] : b(...O), u = a ? o`${o.identifier(S)}.event_path || ${"→"} || ${T}` : o`${T}`, C = E.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${T}`.as("event_type"),
@@ -6334,13 +6341,13 @@ class gs {
       }).from(s.from).innerJoin(
         o`${o.identifier(S)}`,
         o`${i} = ${o.identifier(S)}.binding_key`
-      ).where(l), c = E.db.select({
+      ).where(l), _ = E.db.select({
         binding_key: o`binding_key`.as("binding_key"),
         step_time: o`step_time`.as("step_time"),
         event_type: o`event_type`.as("event_type"),
         event_path: o`event_path`.as("event_path")
       }).from(C.as("ranked")).where(o`rn = 1`);
-      A.push(E.db.$with(N).as(c));
+      A.push(E.db.$with(N).as(_));
     }
     return A;
   }
@@ -6704,12 +6711,12 @@ class Gs {
     const T = r.dimensions?.[i];
     if (!T)
       throw new Error(`Time dimension not found: ${i}`);
-    const A = F(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 = [];
+    const A = y(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 N of e.breakdownDimensions) {
         const [O, l] = N.split("."), u = t.get(O);
         if (u && u.dimensions?.[l]) {
-          const C = F(u.dimensions[l].sql, E);
+          const C = y(u.dimensions[l].sql, E);
           I.push({ dimension: N, expr: C });
         }
       }
@@ -6729,7 +6736,7 @@ class Gs {
       const I = S.dimensions?.[R];
       if (!I)
         throw new Error(`Binding key dimension not found: ${a.dimension}`);
-      return F(I.sql, s);
+      return y(I.sql, s);
     }
     const [i, r] = e.split("."), T = E.get(i);
     if (!T)
@@ -6737,7 +6744,7 @@ class Gs {
     const A = T.dimensions?.[r];
     if (!A)
       throw new Error(`Binding key dimension not found: ${e}`);
-    return F(A.sql, s);
+    return y(A.sql, s);
   }
   /**
    * Build filter conditions from config filters
@@ -6761,13 +6768,13 @@ class Gs {
         const u = this.buildSingleFilterCondition(l, t, E, s);
         u && I.push(u);
       }
-      return I.length === 0 ? null : I.length === 1 ? I[0] : N ? G(...I) : o`(${o.join(I, o` OR `)})`;
+      return I.length === 0 ? null : I.length === 1 ? I[0] : N ? b(...I) : o`(${o.join(I, o` OR `)})`;
     }
     const i = e, [r, T] = i.member.split("."), A = E.get(r);
     if (!A) return null;
     const a = A.dimensions?.[T];
     if (!a) return null;
-    const R = F(a.sql, s);
+    const R = y(a.sql, s);
     return this.filterBuilder.buildFilterCondition(
       R,
       i.operator,
@@ -6803,7 +6810,7 @@ class Gs {
     }
     let A = E.db.select(T).from(s.from);
     if (i.length > 0) {
-      const R = i.length === 1 ? i[0] : G(...i);
+      const R = i.length === 1 ? i[0] : b(...i);
       A = A.where(R);
     }
     const a = [t.bindingKeyExpr];
@@ -6858,7 +6865,7 @@ class Gs {
       o`${t.bindingKeyExpr} = cohort_base.binding_key`
     );
     if (i.length > 0) {
-      const S = i.length === 1 ? i[0] : G(...i);
+      const S = i.length === 1 ? i[0] : b(...i);
       a = a.where(S);
     }
     const R = [
@@ -6999,19 +7006,19 @@ class ne {
           });
         else
           try {
-            const C = Date.now(), c = await this.cacheConfig.provider.get(i);
-            if (c)
+            const C = Date.now(), _ = await this.cacheConfig.provider.get(i);
+            if (_)
               return this.cacheConfig.onCacheEvent?.({
                 type: "hit",
                 key: i,
                 durationMs: Date.now() - C
               }), {
-                ...c.value,
-                cache: c.metadata ? {
+                ..._.value,
+                cache: _.metadata ? {
                   hit: !0,
-                  cachedAt: new Date(c.metadata.cachedAt).toISOString(),
-                  ttlMs: c.metadata.ttlMs,
-                  ttlRemainingMs: c.metadata.ttlRemainingMs
+                  cachedAt: new Date(_.metadata.cachedAt).toISOString(),
+                  ttlMs: _.metadata.ttlMs,
+                  ttlRemainingMs: _.metadata.ttlRemainingMs
                 } : {
                   hit: !0,
                   cachedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -7045,19 +7052,19 @@ class ne {
       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), I = Array.isArray(S) ? S.map((C) => {
-        const c = { ...C };
+        const _ = { ...C };
         if (t.timeDimensions) {
           for (const U of t.timeDimensions)
-            if (U.dimension in c) {
-              let D = c[U.dimension];
+            if (U.dimension in _) {
+              let D = _[U.dimension];
               if (typeof D == "string" && D.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
                 const m = D.replace(" ", "T"), P = !m.endsWith("Z") && !m.includes("+") ? m + "Z" : m;
                 D = new Date(P);
               }
-              D = this.databaseAdapter.convertTimeDimensionResult(D), c[U.dimension] = D;
+              D = this.databaseAdapter.convertTimeDimensionResult(D), _[U.dimension] = D;
             }
         }
-        return c;
+        return _;
       }) : [S], N = t.measures || [], O = ht(I, t, N), l = this.generateAnnotations(A, t), u = {
         data: O,
         annotation: l,
@@ -7336,7 +7343,7 @@ class ne {
           if (u.dimension in l) {
             let C = l[u.dimension];
             if (typeof C == "string" && C.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-              const c = C.replace(" ", "T"), U = !c.endsWith("Z") && !c.includes("+") ? c + "Z" : c;
+              const _ = C.replace(" ", "T"), U = !_.endsWith("Z") && !_.includes("+") ? _ + "Z" : _;
               C = new Date(U);
             }
             C = this.databaseAdapter.convertTimeDimensionResult(C), l[u.dimension] = C;
@@ -7391,15 +7398,15 @@ class ne {
             if (!s.has(P)) {
               const g = {
                 filters: m.filters
-              }, f = /* @__PURE__ */ new Map([[P, m.sourceCube]]), b = this.queryBuilder.buildWhereConditions(
+              }, f = /* @__PURE__ */ new Map([[P, m.sourceCube]]), F = this.queryBuilder.buildWhereConditions(
                 f,
                 g,
                 E
               );
-              s.set(P, b);
+              s.set(P, F);
             }
             const M = s.get(P);
-            M && M.length > 0 && (m.preBuiltFilterSQL = M.length === 1 ? M[0] : G(...M));
+            M && M.length > 0 && (m.preBuiltFilterSQL = M.length === 1 ? M[0] : b(...M));
           }
     }
     const i = [], r = /* @__PURE__ */ new Map(), T = /* @__PURE__ */ new Map();
@@ -7426,10 +7433,10 @@ class ne {
           if (S[P]) {
             const [, M] = P.split("."), g = a.get(m);
             if (g && g.measures && g.measures[M]) {
-              const f = g.measures[M], b = o`${o.identifier(D.cteAlias)}.${o.identifier(M)}`;
-              let y;
+              const f = g.measures[M], F = o`${o.identifier(D.cteAlias)}.${o.identifier(M)}`;
+              let G;
               if (f.type === "calculated" && f.calculatedSql)
-                y = this.queryBuilder.buildCTECalculatedMeasure(
+                G = this.queryBuilder.buildCTECalculatedMeasure(
                   f,
                   g,
                   D,
@@ -7446,38 +7453,38 @@ class ne {
                   case "count":
                   case "countDistinct":
                   case "sum":
-                    y = w ? ee(b) : q(b);
+                    G = w ? ee(F) : q(F);
                     break;
                   case "avg":
-                    y = w ? ee(b) : this.databaseAdapter.buildAvg(b);
+                    G = w ? ee(F) : this.databaseAdapter.buildAvg(F);
                     break;
                   case "min":
-                    y = ue(b);
+                    G = ue(F);
                     break;
                   case "max":
-                    y = ee(b);
+                    G = ee(F);
                     break;
                   case "number":
-                    y = w ? ee(b) : q(b);
+                    G = w ? ee(F) : q(F);
                     break;
                   default:
-                    y = w ? ee(b) : q(b);
+                    G = w ? ee(F) : q(F);
                 }
               }
-              S[P] = o`${y}`.as(P);
+              S[P] = o`${G}`.as(P);
             }
           }
         for (const P in S) {
           const [M, g] = P.split(".");
           if (M === m) {
-            const f = a.get(m), b = f && f.dimensions?.[g], y = P.startsWith(m + ".");
-            if (b || y) {
+            const f = a.get(m), F = f && f.dimensions?.[g], G = P.startsWith(m + ".");
+            if (F || G) {
               let B = D.joinKeys.find((W) => W.targetColumn === g);
               if (!B && f?.dimensions?.[g]) {
                 const W = f.dimensions[g].sql;
                 B = D.joinKeys.find((w) => w.targetColumnObj === W);
               }
-              B ? S[P] = o`${o.identifier(D.cteAlias)}.${o.identifier(g)}`.as(P) : y && f?.dimensions?.[g] && (S[P] = o`${o.identifier(D.cteAlias)}.${o.identifier(g)}`.as(P));
+              B ? S[P] = o`${o.identifier(D.cteAlias)}.${o.identifier(g)}`.as(P) : G && f?.dimensions?.[g] && (S[P] = o`${o.identifier(D.cteAlias)}.${o.identifier(g)}`.as(P));
             }
           }
         }
@@ -7490,14 +7497,14 @@ class ne {
           if (H.isPostAggregationWindow(g)) {
             const f = H.getWindowBaseMeasure(g, m);
             if (f) {
-              const [b, y] = f.split("."), B = a.get(b);
-              if (B?.measures?.[y]) {
-                const W = B.measures[y], w = e.preAggregationCTEs?.find(
-                  (k) => k.cube?.name === b && k.measures?.includes(f)
+              const [F, G] = f.split("."), B = a.get(F);
+              if (B?.measures?.[G]) {
+                const W = B.measures[G], w = e.preAggregationCTEs?.find(
+                  (k) => k.cube?.name === F && k.measures?.includes(f)
                 );
                 let X;
                 if (w) {
-                  const k = o`${o.identifier(w.cteAlias)}.${o.identifier(y)}`;
+                  const k = o`${o.identifier(w.cteAlias)}.${o.identifier(G)}`;
                   X = o`sum(${k})`;
                 } else
                   X = this.queryBuilder.buildMeasureExpression(W, E, B);
@@ -7563,7 +7570,7 @@ class ne {
                 const BE = o`${o.identifier(w)}.${o.identifier(lt.sourceColumn)}`, ut = lt.targetColumnObj;
                 ut && se.push(K(ut, BE));
               }
-              se.length > 0 && (W = G(...se));
+              se.length > 0 && (W = b(...se));
             }
           }
           const X = [];
@@ -7601,24 +7608,24 @@ class ne {
               const j = o`${o.identifier(B.cteAlias)}.${o.identifier(X.sourceColumn)}`, k = X.targetColumnObj || o.identifier(X.targetColumn);
               w.push(K(j, k));
             }
-            g = w.length === 1 ? w[0] : G(...w);
+            g = w.length === 1 ? w[0] : b(...w);
           } else
             g = D.joinCondition;
         }
-        const b = D.joinType || "left", y = b !== "inner" && f ? G(g, f) : g;
+        const F = D.joinType || "left", G = F !== "inner" && f ? b(g, f) : g;
         try {
-          switch (b) {
+          switch (F) {
             case "left":
-              N = N.leftJoin(M, y), f && O.add(D.cube.name);
+              N = N.leftJoin(M, G), f && O.add(D.cube.name);
               break;
             case "inner":
               N = N.innerJoin(M, g);
               break;
             case "right":
-              N = N.rightJoin(M, y), f && O.add(D.cube.name);
+              N = N.rightJoin(M, G), f && O.add(D.cube.name);
               break;
             case "full":
-              N = N.fullJoin(M, y), f && O.add(D.cube.name);
+              N = N.fullJoin(M, G), f && O.add(D.cube.name);
               break;
           }
         } catch {
@@ -7643,7 +7650,7 @@ class ne {
       // Reuse pre-built filters for parameter deduplication
     );
     if (u.length > 0 && I.push(...u), I.length > 0) {
-      const D = I.length === 1 ? I[0] : G(...I);
+      const D = I.length === 1 ? I[0] : b(...I);
       N = N.where(D);
     }
     const C = this.queryBuilder.buildGroupByFields(
@@ -7655,7 +7662,7 @@ class ne {
       // Pass the queryPlan to handle CTE scenarios
     );
     C.length > 0 && (N = N.groupBy(...C));
-    const c = this.queryBuilder.buildHavingConditions(
+    const _ = this.queryBuilder.buildHavingConditions(
       e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : e.primaryCube,
       // Single cube
       t,
@@ -7663,8 +7670,8 @@ class ne {
       e
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (c.length > 0) {
-      const D = c.length === 1 ? c[0] : G(...c);
+    if (_.length > 0) {
+      const D = _.length === 1 ? _[0] : b(..._);
       N = N.having(D);
     }
     const U = this.queryBuilder.buildOrderBy(t);
@@ -7875,7 +7882,7 @@ class ne {
         const S = R.dimensions?.[a];
         if (!S || ["arrayContains", "arrayOverlaps", "arrayContained"].includes(r.operator))
           continue;
-        const N = F(S.sql, s), O = this.queryBuilder.buildFilterConditionPublic(
+        const N = y(S.sql, s), O = this.queryBuilder.buildFilterConditionPublic(
           N,
           r.operator,
           r.values,
@@ -7894,7 +7901,7 @@ class ne {
           if (!a) continue;
           const R = a.dimensions?.[A];
           if (!R) continue;
-          const S = F(R.sql, s), I = this.queryBuilder.buildDateRangeCondition(S, i.dateRange);
+          const S = y(R.sql, s), I = this.queryBuilder.buildDateRangeCondition(S, i.dateRange);
           I && t.set(r, I);
         }
     }
@@ -7926,9 +7933,9 @@ class ne {
         const O = N.field.includes(".") ? N.field.split(".")[1] : N.field;
         if (E.timeDimensions)
           for (const C of E.timeDimensions) {
-            const [c, U] = C.dimension.split(".");
+            const [_, U] = C.dimension.split(".");
             if (U === O) {
-              const D = A(c, O);
+              const D = A(_, O);
               if (D)
                 return {
                   field: D,
@@ -7949,7 +7956,7 @@ class ne {
         const l = i.dimensions?.[O];
         if (l)
           return {
-            field: F(l.sql, s),
+            field: y(l.sql, s),
             direction: N.direction
           };
         const u = T.measure?.includes(".") ? T.measure.split(".")[1] : T.measure;
@@ -7968,10 +7975,10 @@ class ne {
       else {
         const C = i.name === O ? i : void 0;
         if (C?.dimensions?.[l]) {
-          const c = C.dimensions[l];
+          const _ = C.dimensions[l];
           a = [{
             field: this.queryBuilder.buildTimeDimensionExpression(
-              c.sql,
+              _.sql,
               N.granularity,
               s
             ),
@@ -7983,7 +7990,7 @@ class ne {
     let R;
     T.partitionBy && T.partitionBy.length > 0 && (R = T.partitionBy.map((N) => {
       const O = N.includes(".") ? N.split(".")[1] : N, l = i.dimensions?.[O];
-      return l ? F(l.sql, s) : null;
+      return l ? y(l.sql, s) : null;
     }).filter((N) => N !== null));
     const S = this.databaseAdapter.buildWindowFunction(
       e.type,
@@ -26578,24 +26585,24 @@ function ea() {
                 this.complete(C, O);
               }
               if (O.reference === this.index) {
-                var c = O.rule.name;
-                (this.completed[c] = this.completed[c] || []).push(O);
+                var _ = O.rule.name;
+                (this.completed[_] = this.completed[_] || []).push(O);
               }
             }
           } else {
-            var c = O.rule.symbols[O.dot];
-            if (typeof c != "string") {
+            var _ = O.rule.symbols[O.dot];
+            if (typeof _ != "string") {
               this.scannable.push(O);
               continue;
             }
-            if (S[c]) {
-              if (S[c].push(O), I.hasOwnProperty(c))
-                for (var U = I[c], u = 0; u < U.length; u++) {
+            if (S[_]) {
+              if (S[_].push(O), I.hasOwnProperty(_))
+                for (var U = I[_], u = 0; u < U.length; u++) {
                   var D = U[u];
                   this.complete(O, D);
                 }
             } else
-              S[c] = [O], this.predict(c);
+              S[_] = [O], this.predict(_);
           }
         }
       }, E.prototype.predict = function(a) {
@@ -26651,17 +26658,17 @@ function ea() {
           var O = this.index - this.lastLineBreak, l = String(this.line).length;
           return R += " at line " + this.line + " col " + O + `:
 
-`, R += I.map(function(C, c) {
-            return u(this.line - I.length + c + 1, l) + " " + C;
+`, R += I.map(function(C, _) {
+            return u(this.line - I.length + _ + 1, l) + " " + C;
           }, this).join(`
 `), R += `
 ` + u("", l + O) + `^
 `, R;
         } else
           return R + " at index " + (this.index - 1);
-        function u(C, c) {
+        function u(C, _) {
           var U = String(C);
-          return Array(c - U.length + 1).join(" ") + U;
+          return Array(_ - U.length + 1).join(" ") + U;
         }
       };
       function r(a, R, S) {
@@ -26696,8 +26703,8 @@ function ea() {
           this.options.keepHistory || delete this.table[this.current - 1];
           var O = this.current + 1, l = new E(this.grammar, O);
           this.table.push(l);
-          for (var u = S.text !== void 0 ? S.text : S.value, C = R.constructor === i ? S.value : S, c = N.scannable, U = c.length; U--; ) {
-            var D = c[U], m = D.rule.symbols[D.dot];
+          for (var u = S.text !== void 0 ? S.text : S.value, C = 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(C) : m.type ? m.type === S.type : m.literal === u) {
               var P = D.nextState({ data: C, token: S, isToken: !0, reference: O - 1 });
               l.states.push(P);
@@ -26733,7 +26740,7 @@ function ea() {
             return this.buildFirstStateStack(u, []) || [u];
           }, this);
           l.forEach(function(u) {
-            var C = u[0], c = C.rule.symbols[C.dot], U = this.getSymbolDisplay(c);
+            var C = u[0], _ = C.rule.symbols[C.dot], U = this.getSymbolDisplay(_);
             S.push("A " + U + " based on:"), this.displayStateStack(u, S);
           }, this);
         }
@@ -27321,10 +27328,10 @@ ${JSON.stringify(r, void 0, 2)}`);
     }
   };
 }
-var _;
+var c;
 (function(n) {
   n[n.SPACE = 0] = "SPACE", n[n.NO_SPACE = 1] = "NO_SPACE", n[n.NO_NEWLINE = 2] = "NO_NEWLINE", n[n.NEWLINE = 3] = "NEWLINE", n[n.MANDATORY_NEWLINE = 4] = "MANDATORY_NEWLINE", n[n.INDENT = 5] = "INDENT", n[n.SINGLE_INDENT = 6] = "SINGLE_INDENT";
-})(_ = _ || (_ = {}));
+})(c = c || (c = {}));
 class gE {
   constructor(e) {
     this.indentation = e, this.items = [];
@@ -27335,26 +27342,26 @@ class gE {
   add(...e) {
     for (const t of e)
       switch (t) {
-        case _.SPACE:
-          this.items.push(_.SPACE);
+        case c.SPACE:
+          this.items.push(c.SPACE);
           break;
-        case _.NO_SPACE:
+        case c.NO_SPACE:
           this.trimHorizontalWhitespace();
           break;
-        case _.NO_NEWLINE:
+        case c.NO_NEWLINE:
           this.trimWhitespace();
           break;
-        case _.NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(_.NEWLINE);
+        case c.NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(c.NEWLINE);
           break;
-        case _.MANDATORY_NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(_.MANDATORY_NEWLINE);
+        case c.MANDATORY_NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(c.MANDATORY_NEWLINE);
           break;
-        case _.INDENT:
+        case c.INDENT:
           this.addIndentation();
           break;
-        case _.SINGLE_INDENT:
-          this.items.push(_.SINGLE_INDENT);
+        case c.SINGLE_INDENT:
+          this.items.push(c.SINGLE_INDENT);
           break;
         default:
           this.items.push(t);
@@ -27371,10 +27378,10 @@ class gE {
   addNewline(e) {
     if (this.items.length > 0)
       switch (Oe(this.items)) {
-        case _.NEWLINE:
+        case c.NEWLINE:
           this.items.pop(), this.items.push(e);
           break;
-        case _.MANDATORY_NEWLINE:
+        case c.MANDATORY_NEWLINE:
           break;
         default:
           this.items.push(e);
@@ -27383,7 +27390,7 @@ class gE {
   }
   addIndentation() {
     for (let e = 0; e < this.indentation.getLevel(); e++)
-      this.items.push(_.SINGLE_INDENT);
+      this.items.push(c.SINGLE_INDENT);
   }
   /**
    * Returns the final SQL string.
@@ -27399,20 +27406,20 @@ class gE {
   }
   itemToString(e) {
     switch (e) {
-      case _.SPACE:
+      case c.SPACE:
         return " ";
-      case _.NEWLINE:
-      case _.MANDATORY_NEWLINE:
+      case c.NEWLINE:
+      case c.MANDATORY_NEWLINE:
         return `
 `;
-      case _.SINGLE_INDENT:
+      case c.SINGLE_INDENT:
         return this.indentation.getSingleIndent();
       default:
         return e;
     }
   }
 }
-const Ca = (n) => n === _.SPACE || n === _.SINGLE_INDENT, la = (n) => n === _.SPACE || n === _.SINGLE_INDENT || n === _.NEWLINE;
+const Ca = (n) => n === c.SPACE || n === c.SINGLE_INDENT, la = (n) => n === c.SPACE || n === c.SINGLE_INDENT || n === c.NEWLINE;
 function AE(n, e) {
   if (e === "standard")
     return n;
@@ -27484,9 +27491,9 @@ class La extends gE {
     if (typeof e == "string")
       this.length += e.length, this.trailingSpace = !1;
     else {
-      if (e === _.MANDATORY_NEWLINE || e === _.NEWLINE)
+      if (e === c.MANDATORY_NEWLINE || e === c.NEWLINE)
         throw new Rt();
-      e === _.INDENT || e === _.SINGLE_INDENT || e === _.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (e === _.NO_NEWLINE || e === _.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
+      e === c.INDENT || e === c.SINGLE_INDENT || e === c.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (e === c.NO_NEWLINE || e === c.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
     }
   }
 }
@@ -27582,23 +27589,23 @@ class pe {
     }), this.formatNode(e.parenthesis);
   }
   formatPropertyAccess(e) {
-    this.formatNode(e.object), this.layout.add(_.NO_SPACE, e.operator), this.formatNode(e.property);
+    this.formatNode(e.object), this.layout.add(c.NO_SPACE, e.operator), this.formatNode(e.property);
   }
   formatParenthesis(e) {
     const t = this.formatInlineExpression(e.children);
-    t ? (this.layout.add(e.openParen), this.layout.add(...t.getLayoutItems()), this.layout.add(_.NO_SPACE, e.closeParen, _.SPACE)) : (this.layout.add(e.openParen, _.NEWLINE), oe(this.cfg) ? (this.layout.add(_.INDENT), this.layout = this.formatSubExpression(e.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(_.INDENT), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(_.NEWLINE, _.INDENT, e.closeParen, _.SPACE));
+    t ? (this.layout.add(e.openParen), this.layout.add(...t.getLayoutItems()), this.layout.add(c.NO_SPACE, e.closeParen, c.SPACE)) : (this.layout.add(e.openParen, c.NEWLINE), oe(this.cfg) ? (this.layout.add(c.INDENT), this.layout = this.formatSubExpression(e.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(c.INDENT), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(c.NEWLINE, c.INDENT, e.closeParen, c.SPACE));
   }
   formatBetweenPredicate(e) {
-    this.layout.add(this.showKw(e.betweenKw), _.SPACE), this.layout = this.formatSubExpression(e.expr1), this.layout.add(_.NO_SPACE, _.SPACE, this.showNonTabularKw(e.andKw), _.SPACE), this.layout = this.formatSubExpression(e.expr2), this.layout.add(_.SPACE);
+    this.layout.add(this.showKw(e.betweenKw), c.SPACE), this.layout = this.formatSubExpression(e.expr1), this.layout.add(c.NO_SPACE, c.SPACE, this.showNonTabularKw(e.andKw), c.SPACE), this.layout = this.formatSubExpression(e.expr2), this.layout.add(c.SPACE);
   }
   formatCaseExpression(e) {
-    this.formatNode(e.caseKw), this.layout.indentation.increaseBlockLevel(), this.layout = this.formatSubExpression(e.expr), this.layout = this.formatSubExpression(e.clauses), this.layout.indentation.decreaseBlockLevel(), this.layout.add(_.NEWLINE, _.INDENT), this.formatNode(e.endKw);
+    this.formatNode(e.caseKw), this.layout.indentation.increaseBlockLevel(), this.layout = this.formatSubExpression(e.expr), this.layout = this.formatSubExpression(e.clauses), this.layout.indentation.decreaseBlockLevel(), this.layout.add(c.NEWLINE, c.INDENT), this.formatNode(e.endKw);
   }
   formatCaseWhen(e) {
-    this.layout.add(_.NEWLINE, _.INDENT), this.formatNode(e.whenKw), this.layout = this.formatSubExpression(e.condition), this.formatNode(e.thenKw), this.layout = this.formatSubExpression(e.result);
+    this.layout.add(c.NEWLINE, c.INDENT), this.formatNode(e.whenKw), this.layout = this.formatSubExpression(e.condition), this.formatNode(e.thenKw), this.layout = this.formatSubExpression(e.result);
   }
   formatCaseElse(e) {
-    this.layout.add(_.NEWLINE, _.INDENT), this.formatNode(e.elseKw), this.layout = this.formatSubExpression(e.result);
+    this.layout.add(c.NEWLINE, c.INDENT), this.formatNode(e.elseKw), this.layout = this.formatSubExpression(e.result);
   }
   formatClause(e) {
     this.isOnelineClause(e) ? this.formatClauseInOnelineStyle(e) : oe(this.cfg) ? this.formatClauseInTabularStyle(e) : this.formatClauseInIndentedStyle(e);
@@ -27607,39 +27614,39 @@ class pe {
     return oe(this.cfg) ? this.dialectCfg.tabularOnelineClauses[e.nameKw.text] : this.dialectCfg.onelineClauses[e.nameKw.text];
   }
   formatClauseInIndentedStyle(e) {
-    this.layout.add(_.NEWLINE, _.INDENT, this.showKw(e.nameKw), _.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(_.INDENT), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseTopLevel();
+    this.layout.add(c.NEWLINE, c.INDENT, this.showKw(e.nameKw), c.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(c.INDENT), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseTopLevel();
   }
   formatClauseInOnelineStyle(e) {
-    this.layout.add(_.NEWLINE, _.INDENT, this.showKw(e.nameKw), _.SPACE), this.layout = this.formatSubExpression(e.children);
+    this.layout.add(c.NEWLINE, c.INDENT, this.showKw(e.nameKw), c.SPACE), this.layout = this.formatSubExpression(e.children);
   }
   formatClauseInTabularStyle(e) {
-    this.layout.add(_.NEWLINE, _.INDENT, this.showKw(e.nameKw), _.SPACE), this.layout.indentation.increaseTopLevel(), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseTopLevel();
+    this.layout.add(c.NEWLINE, c.INDENT, this.showKw(e.nameKw), c.SPACE), this.layout.indentation.increaseTopLevel(), this.layout = this.formatSubExpression(e.children), this.layout.indentation.decreaseTopLevel();
   }
   formatSetOperation(e) {
-    this.layout.add(_.NEWLINE, _.INDENT, this.showKw(e.nameKw), _.NEWLINE), this.layout.add(_.INDENT), this.layout = this.formatSubExpression(e.children);
+    this.layout.add(c.NEWLINE, c.INDENT, this.showKw(e.nameKw), c.NEWLINE), this.layout.add(c.INDENT), this.layout = this.formatSubExpression(e.children);
   }
   formatLimitClause(e) {
     this.withComments(e.limitKw, () => {
-      this.layout.add(_.NEWLINE, _.INDENT, this.showKw(e.limitKw));
-    }), this.layout.indentation.increaseTopLevel(), oe(this.cfg) ? this.layout.add(_.SPACE) : this.layout.add(_.NEWLINE, _.INDENT), e.offset ? (this.layout = this.formatSubExpression(e.offset), this.layout.add(_.NO_SPACE, ",", _.SPACE), this.layout = this.formatSubExpression(e.count)) : this.layout = this.formatSubExpression(e.count), this.layout.indentation.decreaseTopLevel();
+      this.layout.add(c.NEWLINE, c.INDENT, this.showKw(e.limitKw));
+    }), this.layout.indentation.increaseTopLevel(), oe(this.cfg) ? this.layout.add(c.SPACE) : this.layout.add(c.NEWLINE, c.INDENT), e.offset ? (this.layout = this.formatSubExpression(e.offset), this.layout.add(c.NO_SPACE, ",", c.SPACE), this.layout = this.formatSubExpression(e.count)) : this.layout = this.formatSubExpression(e.count), this.layout.indentation.decreaseTopLevel();
   }
   formatAllColumnsAsterisk(e) {
-    this.layout.add("*", _.SPACE);
+    this.layout.add("*", c.SPACE);
   }
   formatLiteral(e) {
-    this.layout.add(e.text, _.SPACE);
+    this.layout.add(e.text, c.SPACE);
   }
   formatIdentifier(e) {
-    this.layout.add(this.showIdentifier(e), _.SPACE);
+    this.layout.add(this.showIdentifier(e), c.SPACE);
   }
   formatParameter(e) {
-    this.layout.add(this.params.get(e), _.SPACE);
+    this.layout.add(this.params.get(e), c.SPACE);
   }
   formatOperator({ text: e }) {
-    this.cfg.denseOperators || this.dialectCfg.alwaysDenseOperators.includes(e) ? this.layout.add(_.NO_SPACE, e) : e === ":" ? this.layout.add(_.NO_SPACE, e, _.SPACE) : this.layout.add(e, _.SPACE);
+    this.cfg.denseOperators || this.dialectCfg.alwaysDenseOperators.includes(e) ? this.layout.add(c.NO_SPACE, e) : e === ":" ? this.layout.add(c.NO_SPACE, e, c.SPACE) : this.layout.add(e, c.SPACE);
   }
   formatComma(e) {
-    this.inline ? this.layout.add(_.NO_SPACE, ",", _.SPACE) : this.layout.add(_.NO_SPACE, ",", _.NEWLINE, _.INDENT);
+    this.inline ? this.layout.add(c.NO_SPACE, ",", c.SPACE) : this.layout.add(c.NO_SPACE, ",", c.NEWLINE, c.INDENT);
   }
   withComments(e, t) {
     this.formatComments(e.leadingComments), t(), this.formatComments(e.trailingComments);
@@ -27650,12 +27657,12 @@ class pe {
     });
   }
   formatLineComment(e) {
-    Et(e.precedingWhitespace || "") ? this.layout.add(_.NEWLINE, _.INDENT, e.text, _.MANDATORY_NEWLINE, _.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(_.NO_NEWLINE, _.SPACE, e.text, _.MANDATORY_NEWLINE, _.INDENT) : this.layout.add(e.text, _.MANDATORY_NEWLINE, _.INDENT);
+    Et(e.precedingWhitespace || "") ? this.layout.add(c.NEWLINE, c.INDENT, e.text, c.MANDATORY_NEWLINE, c.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(c.NO_NEWLINE, c.SPACE, e.text, c.MANDATORY_NEWLINE, c.INDENT) : this.layout.add(e.text, c.MANDATORY_NEWLINE, c.INDENT);
   }
   formatBlockComment(e) {
     e.type === p.block_comment && this.isMultilineBlockComment(e) ? (this.splitBlockComment(e.text).forEach((t) => {
-      this.layout.add(_.NEWLINE, _.INDENT, t);
-    }), this.layout.add(_.NEWLINE, _.INDENT)) : this.layout.add(e.text, _.SPACE);
+      this.layout.add(c.NEWLINE, c.INDENT, t);
+    }), this.layout.add(c.NEWLINE, c.INDENT)) : this.layout.add(e.text, c.SPACE);
   }
   isMultilineBlockComment(e) {
     return Et(e.text) || Et(e.precedingWhitespace || "");
@@ -27739,16 +27746,16 @@ class pe {
     }
   }
   formatJoin(e) {
-    oe(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(_.NEWLINE, _.INDENT, this.showKw(e), _.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(_.NEWLINE, _.INDENT, this.showKw(e), _.SPACE);
+    oe(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(c.NEWLINE, c.INDENT, this.showKw(e), c.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(c.NEWLINE, c.INDENT, this.showKw(e), c.SPACE);
   }
   formatKeyword(e) {
-    this.layout.add(this.showKw(e), _.SPACE);
+    this.layout.add(this.showKw(e), c.SPACE);
   }
   formatLogicalOperator(e) {
-    this.cfg.logicalOperatorNewline === "before" ? oe(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(_.NEWLINE, _.INDENT, this.showKw(e), _.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(_.NEWLINE, _.INDENT, this.showKw(e), _.SPACE) : this.layout.add(this.showKw(e), _.NEWLINE, _.INDENT);
+    this.cfg.logicalOperatorNewline === "before" ? oe(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(c.NEWLINE, c.INDENT, this.showKw(e), c.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(c.NEWLINE, c.INDENT, this.showKw(e), c.SPACE) : this.layout.add(this.showKw(e), c.NEWLINE, c.INDENT);
   }
   formatDataType(e) {
-    this.layout.add(this.showDataType(e), _.SPACE);
+    this.layout.add(this.showDataType(e), c.SPACE);
   }
   showKw(e) {
     return RE(e.tokenType) ? AE(this.showNonTabularKw(e), this.cfg.indentStyle) : this.showNonTabularKw(e);
@@ -27828,7 +27835,7 @@ class _a {
       params: this.params,
       layout: new gE(new GE(qT(this.cfg)))
     }).format(e.children);
-    return e.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? t.add(_.NEWLINE, ";") : t.add(_.NO_NEWLINE, ";")), t.toString();
+    return e.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? t.add(c.NEWLINE, ";") : t.add(c.NO_NEWLINE, ";")), t.toString();
   }
 }
 class De extends Error {
@@ -29710,7 +29717,7 @@ function To(n, e, t) {
     const u = n.find((C) => C.name === t);
     u ? (T = [u], E.push(`Using specified cube: ${t}`)) : (s.push(`Specified cube '${t}' not found`), T = []);
   } else
-    T = Ya(n, { intent: e, limit: 3 }).map((C) => n.find((c) => c.name === C.cube)).filter((C) => C !== void 0), T.length > 0 && E.push(`Identified relevant cubes: ${T.map((C) => C.name).join(", ")}`);
+    T = Ya(n, { intent: e, limit: 3 }).map((C) => n.find((_) => _.name === C.cube)).filter((C) => C !== void 0), T.length > 0 && E.push(`Identified relevant cubes: ${T.map((C) => C.name).join(", ")}`);
   if (T.length === 0) {
     const u = r !== "query", C = u ? OE(r, void 0) : void 0;
     return {
@@ -29728,12 +29735,12 @@ function To(n, e, t) {
   R && (E.push(`Detected ${R.type} aggregation intent`), a += 0.1);
   const S = [], I = e.toLowerCase();
   for (const u of A.measures) {
-    const c = [
+    const _ = [
       (u.name.split(".").pop() || u.name).toLowerCase(),
       u.title.toLowerCase(),
       ...(u.synonyms || []).map((U) => U.toLowerCase())
     ];
-    for (const U of c)
+    for (const U of _)
       if (I.includes(U)) {
         S.push(u.name), E.push(`Matched measure '${u.name}' via keyword '${U}'`), a += 0.15;
         break;
@@ -29745,7 +29752,7 @@ function To(n, e, t) {
       S.push(u[0].name), E.push(`Suggested ${u[0].name} based on ${R.type} intent`);
     else if (R.type === "count") {
       const C = A.measures.find(
-        (c) => c.type === "count" || c.type === "countDistinct"
+        (_) => _.type === "count" || _.type === "countDistinct"
       );
       C && (S.push(C.name), E.push(`Suggested ${C.name} for counting`));
     }
@@ -30181,6 +30188,6 @@ export {
   at as getJoinType,
   Is as normalizeQuery,
   x as resolveCubeReference,
-  F as resolveSqlExpression,
+  y as resolveSqlExpression,
   To as suggestQuery
 };