drizzle-cube 0.3.25 → 0.3.28

package/dist/server/index.js

@@ -1,4 +1,4 @@
-import { sql as o, eq as v, and as y, SQL as yE, gte as Te, lte as ae, arrayContained as bE, arrayOverlaps as FE, arrayContains as BE, isNotNull as Ct, ne as lt, or as Ce, isNull as ut, notInArray as Lt, inArray as Ge, lt as ye, gt as be, StringChunk as HE, sum as x, max as q, min as le, count as rt, countDistinct as YE, desc as VE, asc as _t } from "drizzle-orm";
+import { sql as o, eq as X, and as y, SQL as yE, gte as ae, lte as oe, arrayContained as bE, arrayOverlaps as FE, arrayContains as BE, isNotNull as Ct, ne as lt, or as Ce, isNull as ut, notInArray as Lt, inArray as Ge, lt as ye, gt as be, StringChunk as HE, sum as J, max as Z, min as le, count as rt, countDistinct as YE, desc as VE, asc as _t } from "drizzle-orm";
 class Ue {
   /**
    * Default implementation returns template unchanged
@@ -2007,7 +2007,7 @@ function Dt(n, e, t) {
     return ct(n, e);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
-function J(n) {
+function Q(n) {
   return typeof n == "function" ? n() : n;
 }
 function Tt(n, e) {
@@ -2032,7 +2032,7 @@ function Tt(n, e) {
 function at(n) {
   return n && typeof n == "object" ? o`${o`${n}`}` : n;
 }
-function F(n, e) {
+function b(n, e) {
   const t = typeof n == "function" ? n(e) : n;
   return at(t);
 }
@@ -2054,12 +2054,12 @@ function Ts(n, e) {
     throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
   const { table: t, sourceKey: E, targetKey: s, securitySql: i } = n.through, r = [];
   for (const R of E) {
-    const S = R.as || v;
+    const S = R.as || X;
     r.push(S(R.source, R.target));
   }
   const T = [];
   for (const R of s) {
-    const S = R.as || v;
+    const S = R.as || X;
     T.push(S(R.source, R.target));
   }
   let A;
@@ -2174,7 +2174,7 @@ function os(n) {
   return {
     measures: n.measures ? [...n.measures].sort() : void 0,
     dimensions: n.dimensions ? [...n.dimensions].sort() : void 0,
-    filters: n.filters ? X(n.filters) : void 0,
+    filters: n.filters ? K(n.filters) : void 0,
     timeDimensions: n.timeDimensions ? Is(n.timeDimensions) : void 0,
     limit: n.limit,
     offset: n.offset,
@@ -2196,7 +2196,7 @@ function As(n) {
     steps: n.steps.map((e) => {
       const t = {
         name: e.name,
-        filter: e.filter ? Array.isArray(e.filter) ? X(e.filter) : X([e.filter])[0] : void 0,
+        filter: e.filter ? Array.isArray(e.filter) ? K(e.filter) : K([e.filter])[0] : void 0,
         timeToConvert: e.timeToConvert
       };
       return "cube" in e && e.cube && (t.cube = e.cube), t;
@@ -2213,7 +2213,7 @@ function Rs(n) {
     // Normalize starting step - sort filters for consistent hashing
     startingStep: {
       name: n.startingStep.name,
-      filter: n.startingStep.filter ? Array.isArray(n.startingStep.filter) ? X(n.startingStep.filter) : X([n.startingStep.filter])[0] : void 0
+      filter: n.startingStep.filter ? Array.isArray(n.startingStep.filter) ? K(n.startingStep.filter) : K([n.startingStep.filter])[0] : void 0
     },
     // CRITICAL: Include step counts in cache key
     stepsBefore: n.stepsBefore,
@@ -2235,18 +2235,18 @@ function Ss(n) {
     periods: n.periods,
     retentionType: n.retentionType,
     // Normalize filters for consistent hashing
-    cohortFilters: n.cohortFilters ? Array.isArray(n.cohortFilters) ? X(n.cohortFilters) : X([n.cohortFilters])[0] : void 0,
-    activityFilters: n.activityFilters ? Array.isArray(n.activityFilters) ? X(n.activityFilters) : X([n.activityFilters])[0] : void 0,
+    cohortFilters: n.cohortFilters ? Array.isArray(n.cohortFilters) ? K(n.cohortFilters) : K([n.cohortFilters])[0] : void 0,
+    activityFilters: n.activityFilters ? Array.isArray(n.activityFilters) ? K(n.activityFilters) : K([n.activityFilters])[0] : void 0,
     // Include breakdown dimensions for cache key
     breakdownDimensions: n.breakdownDimensions
   };
 }
-function X(n) {
+function K(n) {
   return [...n].map((e) => {
     if ("and" in e && e.and)
-      return { and: X(e.and) };
+      return { and: K(e.and) };
     if ("or" in e && e.or)
-      return { or: X(e.or) };
+      return { or: K(e.or) };
     const t = e;
     return {
       ...t,
@@ -2280,7 +2280,7 @@ function Pt(n) {
 function Qa(n, e) {
   return `${e ?? "drizzle-cube:"}*${n}*`;
 }
-class Ie {
+class Ne {
   constructor(e) {
     this.databaseAdapter = e;
   }
@@ -2288,7 +2288,7 @@ class Ie {
    * Build time dimension expression with granularity using database adapter
    */
   buildTimeDimensionExpression(e, t, E) {
-    const s = F(e, E);
+    const s = b(e, E);
     return t ? this.databaseAdapter.buildTimeDimension(t, s) : s instanceof yE ? s : o`${s}`;
   }
   /**
@@ -2305,8 +2305,8 @@ class Ie {
         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 y(
-        Te(e, E),
-        ae(e, s)
+        ae(e, E),
+        oe(e, s)
       );
     }
     if (typeof t == "string") {
@@ -2314,8 +2314,8 @@ class Ie {
       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()), y(
-          Te(e, R),
-          ae(e, S)
+          ae(e, R),
+          oe(e, S)
         );
       }
       const s = this.normalizeDate(t);
@@ -2326,8 +2326,8 @@ class Ie {
       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()), y(
-        Te(e, A),
-        ae(e, a)
+        ae(e, A),
+        oe(e, a)
       );
     }
     return null;
@@ -2476,7 +2476,7 @@ class he {
           return Ge(e, r);
         } else if (r.length === 1) {
           const A = s?.type === "time" && this.dateTimeBuilder.normalizeDate(T) || T;
-          return v(e, A);
+          return X(e, A);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
@@ -2492,11 +2492,11 @@ class he {
       case "gt":
         return be(e, T);
       case "gte":
-        return Te(e, T);
+        return ae(e, T);
       case "lt":
         return ye(e, T);
       case "lte":
-        return ae(e, T);
+        return oe(e, T);
       case "set":
         return Ct(e);
       case "notSet":
@@ -2512,8 +2512,8 @@ class he {
               I.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? a = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(I.getTime() / 1e3) : I.getTime() : a = I.toISOString();
             }
             return y(
-              Te(e, A),
-              ae(e, a)
+              ae(e, A),
+              oe(e, a)
             );
           }
         }
@@ -2528,8 +2528,8 @@ class he {
       }
       case "between":
         return r.length >= 2 ? y(
-          Te(e, r[0]),
-          ae(e, r[1])
+          ae(e, r[0]),
+          oe(e, r[1])
         ) : null;
       case "notBetween":
         return r.length >= 2 ? Ce(
@@ -2553,7 +2553,7 @@ class he {
       case "isEmpty":
         return Ce(
           ut(e),
-          v(e, "")
+          X(e, "")
         );
       case "isNotEmpty":
         return y(
@@ -2598,7 +2598,7 @@ class he {
     if (!T) return null;
     const A = T.dimensions?.[r];
     if (!A) return null;
-    const a = F(A.sql, E);
+    const a = b(A.sql, E);
     return this.buildFilterCondition(
       a,
       s.operator,
@@ -2608,7 +2608,7 @@ class he {
     );
   }
 }
-class te {
+class se {
   dependencyGraph;
   cubes;
   constructor(e) {
@@ -2836,13 +2836,13 @@ function Ns(n, e) {
       throw new Error(
         `Cannot substitute {${I}}: cube '${C}' not found`
       );
-    const l = `${C}.${O}`, c = s.get(l);
-    if (!c)
+    const l = `${C}.${O}`, _ = s.get(l);
+    if (!_)
       throw new Error(
         `Cannot substitute {${I}}: measure '${l}' not resolved yet. Ensure measures are resolved in dependency order.`
       );
-    const D = c(), p = o`${D}`;
-    r.set(I, p);
+    const U = _(), D = o`${U}`;
+    r.set(I, D);
   }
   const T = [], A = [];
   let a = 0;
@@ -2914,7 +2914,7 @@ function Fe(n, e) {
   }
   return Array.from(E);
 }
-class B {
+class H {
   constructor(e) {
     this.databaseAdapter = e;
   }
@@ -2930,23 +2930,23 @@ class B {
    * @returns Map of measure names to SQL builder functions
    */
   buildResolvedMeasures(e, t, E, s) {
-    const i = /* @__PURE__ */ new Map(), r = [], T = [], A = new Set(e), a = new te(t);
+    const i = /* @__PURE__ */ new Map(), r = [], T = [], A = new Set(e), a = new se(t);
     for (const R of t.values())
       a.buildGraph(R);
     for (const R of e) {
       const [S, I] = R.split("."), N = t.get(S);
       if (N && N.measures && N.measures[I]) {
         const O = N.measures[I];
-        if (B.isPostAggregationWindow(O)) {
-          const C = B.getWindowBaseMeasure(O, S);
+        if (H.isPostAggregationWindow(O)) {
+          const C = H.getWindowBaseMeasure(O, S);
           C && A.add(C);
           continue;
         }
-        te.isCalculatedMeasure(O) ? (T.push(R), Fe(O.calculatedSql, S).forEach((l) => A.add(l)), a.getAllDependencies(R).forEach((l) => {
-          const [c, D] = l.split("."), p = t.get(c);
-          if (p && p.measures[D]) {
-            const m = p.measures[D];
-            te.isCalculatedMeasure(m) && Fe(m.calculatedSql, c).forEach((M) => A.add(M));
+        se.isCalculatedMeasure(O) ? (T.push(R), Fe(O.calculatedSql, S).forEach((l) => A.add(l)), a.getAllDependencies(R).forEach((l) => {
+          const [_, U] = l.split("."), D = t.get(_);
+          if (D && D.measures[U]) {
+            const m = D.measures[U];
+            se.isCalculatedMeasure(m) && Fe(m.calculatedSql, _).forEach((M) => A.add(M));
           }
         })) : r.push(R);
       }
@@ -2955,9 +2955,9 @@ class B {
       const [S, I] = R.split("."), N = t.get(S);
       if (N && N.measures && N.measures[I]) {
         const O = N.measures[I];
-        if (B.isPostAggregationWindow(O))
+        if (H.isPostAggregationWindow(O))
           continue;
-        te.isCalculatedMeasure(O) ? T.includes(R) || T.push(R) : r.includes(R) || r.push(R);
+        se.isCalculatedMeasure(O) ? T.includes(R) || T.push(R) : r.includes(R) || r.push(R);
       }
     }
     for (const R of r) {
@@ -3030,7 +3030,7 @@ class B {
             case "count":
             case "countDistinct":
             case "sum":
-              O = x(N);
+              O = J(N);
               break;
             case "avg":
               O = this.databaseAdapter.buildAvg(N);
@@ -3039,13 +3039,13 @@ class B {
               O = le(N);
               break;
             case "max":
-              O = q(N);
+              O = Z(N);
               break;
             case "number":
-              O = x(N);
+              O = J(N);
               break;
             default:
-              O = x(N);
+              O = J(N);
           }
           r.set(A, () => O);
         }
@@ -3087,17 +3087,17 @@ class B {
             case "count":
             case "countDistinct":
             case "sum":
-              return x(T);
+              return J(T);
             case "avg":
               return this.databaseAdapter.buildAvg(T);
             case "min":
               return le(T);
             case "max":
-              return q(T);
+              return Z(T);
             case "number":
-              return x(T);
+              return J(T);
             default:
-              return x(T);
+              return J(T);
           }
         }
     }
@@ -3116,7 +3116,7 @@ class B {
       throw new Error(
         `Cannot build calculated measure '${e.name}' directly. Use buildCalculatedMeasure instead.`
       );
-    if (B.isPostAggregationWindow(e))
+    if (H.isPostAggregationWindow(e))
       throw new Error(
         `Post-aggregation window measure '${e.name}' should be built via buildPostAggregationWindowExpression, not buildMeasureExpression.`
       );
@@ -3124,7 +3124,7 @@ class B {
       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 = b(e.sql, t);
     if (e.filters && e.filters.length > 0) {
       const i = e.filters.map((r) => {
         const T = r(t);
@@ -3143,13 +3143,13 @@ class B {
       case "countDistinct":
         return YE(s);
       case "sum":
-        return x(s);
+        return J(s);
       case "avg":
         return this.databaseAdapter.buildAvg(s);
       case "min":
         return le(s);
       case "max":
-        return q(s);
+        return Z(s);
       case "number":
         return s;
       // Statistical functions (Phase 1)
@@ -3200,7 +3200,7 @@ class B {
         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 ? b(I.sql, t) : (console.warn(`[drizzle-cube] Window function partition dimension '${R}' not found in cube '${E.name}'`), null);
           }).filter((R) => R !== null);
           a.length > 0 && (r = a);
         }
@@ -3210,12 +3210,12 @@ class B {
             const S = R.field.includes(".") ? R.field.split(".")[1] : R.field, I = E.dimensions?.[S];
             if (I)
               return {
-                field: F(I.sql, t),
+                field: b(I.sql, t),
                 direction: R.direction
               };
             const N = E.measures?.[S];
             return N && N.sql ? {
-              field: F(N.sql, t),
+              field: b(N.sql, t),
               direction: R.direction
             } : (console.warn(`[drizzle-cube] Window function order field '${R.field}' not found in cube '${E.name}'`), null);
           }).filter((R) => R !== null);
@@ -3264,7 +3264,7 @@ class B {
    * @returns true if this is a window function type
    */
   static isWindowFunction(e) {
-    return B.WINDOW_FUNCTION_TYPES.includes(e);
+    return H.WINDOW_FUNCTION_TYPES.includes(e);
   }
   /**
    * Categorize measures into window functions and regular aggregates
@@ -3280,7 +3280,7 @@ class B {
       const [r, T] = i.split("."), A = t.get(r);
       if (A?.measures?.[T]) {
         const a = A.measures[T];
-        B.isWindowFunction(a.type) ? E.push(i) : s.push(i);
+        H.isWindowFunction(a.type) ? E.push(i) : s.push(i);
       }
     }
     return { windowMeasures: E, aggregateMeasures: s };
@@ -3292,7 +3292,7 @@ class B {
    * @returns true if any measure is a window function
    */
   static hasWindowFunctions(e, t) {
-    const { windowMeasures: E } = B.categorizeMeasures(e, t);
+    const { windowMeasures: E } = H.categorizeMeasures(e, t);
     return E.length > 0;
   }
   // ============================================================================
@@ -3307,7 +3307,7 @@ class B {
    * @returns true if this is a post-aggregation window function
    */
   static isPostAggregationWindow(e) {
-    return B.isWindowFunction(e.type) && e.windowConfig?.measure !== void 0;
+    return H.isWindowFunction(e.type) && e.windowConfig?.measure !== void 0;
   }
   /**
    * Get the base measure reference for a post-aggregation window function.
@@ -3358,11 +3358,11 @@ class B {
       const [T, A] = r.split("."), a = t.get(T);
       if (a?.measures?.[A]) {
         const R = a.measures[A];
-        if (B.isPostAggregationWindow(R)) {
+        if (H.isPostAggregationWindow(R)) {
           s.push(r);
-          const S = B.getWindowBaseMeasure(R, T);
+          const S = H.getWindowBaseMeasure(R, T);
           S && i.add(S);
-        } else B.isWindowFunction(R.type) || E.push(r);
+        } else H.isWindowFunction(R.type) || E.push(r);
       }
     }
     return { aggregateMeasures: E, postAggWindowMeasures: s, requiredBaseMeasures: i };
@@ -3375,7 +3375,7 @@ class B {
    * @returns true if any measure is a post-aggregation window function
    */
   static hasPostAggregationWindows(e, t) {
-    const { postAggWindowMeasures: E } = B.categorizeForPostAggregation(
+    const { postAggWindowMeasures: E } = H.categorizeForPostAggregation(
       e,
       t
     );
@@ -3447,11 +3447,11 @@ class Cs {
           R = !0;
           break;
         }
-        if (B.isPostAggregationWindow(C)) {
-          const u = B.getWindowBaseMeasure(C, I);
+        if (H.isPostAggregationWindow(C)) {
+          const u = H.getWindowBaseMeasure(C, I);
           if (u) {
-            const [l, c] = u.split("."), p = r.get(l)?.measures?.[c];
-            if (p && this.isAggregateFunctionType(p.type)) {
+            const [l, _] = u.split("."), D = r.get(l)?.measures?.[_];
+            if (D && this.isAggregateFunctionType(D.type)) {
               R = !0;
               break;
             }
@@ -3466,15 +3466,15 @@ class Cs {
         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), l = u.joinKeys.find((c) => c.targetColumn === N);
+            const u = s.preAggregationCTEs.find((_) => _.cube.name === I), l = u.joinKeys.find((_) => _.targetColumn === N);
             if (l && l.sourceColumnObj)
               i.push(l.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], l = F(u.sql, E);
+            const u = O.dimensions[N], l = b(u.sql, E);
             i.push(l);
           }
       }
@@ -3483,17 +3483,17 @@ class Cs {
         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), l = u.joinKeys.find((c) => c.targetColumn === N);
+            const u = s.preAggregationCTEs.find((_) => _.cube.name === I), l = u.joinKeys.find((_) => _.targetColumn === N);
             if (l && l.sourceColumnObj) {
-              const c = this.dateTimeBuilder.buildTimeDimensionExpression(
+              const _ = this.dateTimeBuilder.buildTimeDimensionExpression(
                 l.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], l = this.dateTimeBuilder.buildTimeDimensionExpression(
@@ -3513,7 +3513,7 @@ class ls {
   groupByBuilder;
   measureBuilder;
   constructor(e) {
-    this.dateTimeBuilder = new Ie(e), this.filterBuilder = new he(e, this.dateTimeBuilder), this.groupByBuilder = new Cs(this.dateTimeBuilder), this.measureBuilder = new B(e);
+    this.dateTimeBuilder = new Ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder), this.groupByBuilder = new Cs(this.dateTimeBuilder), this.measureBuilder = new H(e);
   }
   /**
    * Build resolvedMeasures map for a set of measures
@@ -3533,7 +3533,7 @@ class ls {
       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 = b(R.sql, E);
           s[r] = o`${S}`.as(r);
         }
       }
@@ -3634,7 +3634,7 @@ class ls {
               continue;
             }
           }
-          const N = I.dimensions[S], O = F(N.sql, E), C = this.buildDateRangeCondition(O, a.dateRange);
+          const N = I.dimensions[S], O = b(N.sql, E), C = this.buildDateRangeCondition(O, a.dateRange);
           C && r.push(C);
         }
       }
@@ -3682,7 +3682,7 @@ class ls {
         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 : b(R.sql, E);
       return this.buildFilterCondition(
         O,
         r.operator,
@@ -3835,7 +3835,7 @@ class ue {
       const { cube: A, path: a } = r.shift(), R = this.cubes.get(A);
       if (R?.joins)
         for (const [, S] of Object.entries(R.joins)) {
-          const N = J(S.targetCube).name;
+          const N = Q(S.targetCube).name;
           if (T.has(N))
             continue;
           const O = [
@@ -3915,7 +3915,7 @@ class ue {
       const R = this.cubes.get(T);
       if (R?.joins)
         for (const [, S] of Object.entries(R.joins)) {
-          const N = J(S.targetCube).name;
+          const N = Q(S.targetCube).name;
           if (a.has(N))
             continue;
           const O = [
@@ -3963,7 +3963,7 @@ class ue {
   buildJoinCondition(e, t, E) {
     const s = [];
     for (const i of e.on) {
-      const r = t ? o`${o.identifier(t)}.${o.identifier(i.source.name)}` : at(i.source), T = E ? o`${o.identifier(E)}.${o.identifier(i.target.name)}` : at(i.target), A = i.as || v;
+      const r = t ? o`${o.identifier(t)}.${o.identifier(i.source.name)}` : at(i.source), T = E ? o`${o.identifier(E)}.${o.identifier(i.target.name)}` : at(i.target), A = i.as || X;
       s.push(A(r, T));
     }
     return y(...s);
@@ -3981,7 +3981,7 @@ class ue {
       const s = E.shift(), i = this.cubes.get(s);
       if (i?.joins)
         for (const [, r] of Object.entries(i.joins)) {
-          const A = J(r.targetCube).name;
+          const A = Q(r.targetCube).name;
           t.has(A) || (t.add(A), E.push(A));
         }
     }
@@ -4165,35 +4165,35 @@ class CE {
         if (!l)
           throw new Error(`Cube '${C}' not found`);
         if (u.relationship === "belongsToMany" && u.through) {
-          const c = Ts(u, s.securityContext);
+          const _ = Ts(u, s.securityContext);
           T.push({
             cube: l,
             alias: `${C.toLowerCase()}_cube`,
-            joinType: c.junctionJoins[1].joinType,
+            joinType: _.junctionJoins[1].joinType,
             // Use the target join type
-            joinCondition: c.junctionJoins[1].condition,
+            joinCondition: _.junctionJoins[1].condition,
             // Target join condition
             junctionTable: {
               table: u.through.table,
               alias: `junction_${C.toLowerCase()}`,
-              joinType: c.junctionJoins[0].joinType,
-              joinCondition: c.junctionJoins[0].condition,
+              joinType: _.junctionJoins[0].joinType,
+              joinCondition: _.junctionJoins[0].condition,
               securitySql: u.through.securitySql
             }
           });
         } else {
-          const c = r.buildJoinCondition(
+          const _ = r.buildJoinCondition(
             u,
             null,
             // No source alias needed - use the actual column
             null
             // No target alias needed - use the actual column
-          ), D = Tt(u.relationship, u.sqlJoinType);
+          ), U = Tt(u.relationship, u.sqlJoinType);
           T.push({
             cube: l,
             alias: `${C.toLowerCase()}_cube`,
-            joinType: D,
-            joinCondition: c
+            joinType: U,
+            joinCondition: _
           });
         }
         A.add(C);
@@ -4252,14 +4252,14 @@ class CE {
       if (u.length === 0)
         continue;
       const l = this.analyzeJoinPathToPrimary(e, t, R.name, i);
-      let c, D;
+      let _, U;
       if (l?.hasIntermediateHasMany && l.intermediateJoins.length > 0)
-        c = l.correctJoinKeys, D = l.intermediateJoins;
+        _ = l.correctJoinKeys, U = l.intermediateJoins;
       else {
         const h = I ? this.findJoinInfoToCube(e, t.name) : this.findJoinInfoForCube(e, t, R.name);
         if (!h)
           continue;
-        c = I ? h.joinDef.on.map((G) => ({
+        _ = I ? h.joinDef.on.map((G) => ({
           sourceColumn: G.target.name,
           targetColumn: G.source.name,
           sourceColumnObj: G.target,
@@ -4269,9 +4269,9 @@ class CE {
           targetColumn: G.target.name,
           sourceColumnObj: G.source,
           targetColumnObj: G.target
-        })), D = void 0;
+        })), U = void 0;
       }
-      const p = this.findPropagatingFilters(s, R, e), m = /* @__PURE__ */ new Map([[R.name, R]]), { aggregateMeasures: P, requiredBaseMeasures: M } = B.categorizeForPostAggregation(
+      const D = this.findPropagatingFilters(s, R, e), m = /* @__PURE__ */ new Map([[R.name, R]]), { aggregateMeasures: P, requiredBaseMeasures: M } = H.categorizeForPostAggregation(
         u,
         m
       ), g = [.../* @__PURE__ */ new Set([
@@ -4291,11 +4291,11 @@ class CE {
           cube: R,
           alias: S,
           cteAlias: `${R.name.toLowerCase()}_agg`,
-          joinKeys: c,
+          joinKeys: _,
           measures: h,
-          propagatingFilters: p.length > 0 ? p : void 0,
+          propagatingFilters: D.length > 0 ? D : void 0,
           downstreamJoinKeys: G.length > 0 ? G : void 0,
-          intermediateJoins: D && D.length > 0 ? D : void 0,
+          intermediateJoins: U && U.length > 0 ? U : void 0,
           cteType: "aggregate",
           cteReason: N
         });
@@ -4311,7 +4311,7 @@ class CE {
     for (const [, E] of e)
       if (E.name !== t && E.joins) {
         for (const [, s] of Object.entries(E.joins))
-          if (J(s.targetCube).name === t)
+          if (Q(s.targetCube).name === t)
             return { sourceCube: E, joinDef: s };
       }
     return null;
@@ -4351,13 +4351,13 @@ class CE {
     for (let N = 0; N < T.length - 1; N++) {
       const O = T[N], C = T[N + 1], u = e.get(O.toCube);
       if (!u) continue;
-      const c = u.sql(s).where, D = C.joinDef.on[0]?.source, p = O.joinDef.on[0]?.target;
+      const _ = u.sql(s).where, U = C.joinDef.on[0]?.source, D = O.joinDef.on[0]?.target;
       R.push({
         cube: u,
         joinDef: C.joinDef,
-        securityFilter: c,
-        primaryJoinColumn: p,
-        cteJoinColumn: D
+        securityFilter: _,
+        primaryJoinColumn: D,
+        cteJoinColumn: U
       });
     }
     const I = T[0].joinDef.on.map((N) => ({
@@ -4396,7 +4396,7 @@ class CE {
       if (!i.has(T) && (i.add(T), !!A.joins)) {
         for (const [, a] of Object.entries(A.joins))
           if (a.relationship === "hasMany") {
-            const R = J(a.targetCube);
+            const R = Q(a.targetCube);
             (r.has(T) || r.has(R.name)) && s.push({
               fromCube: T,
               toCube: R.name,
@@ -4437,13 +4437,13 @@ class CE {
   findJoinInfoForCube(e, t, E) {
     if (t.joins) {
       for (const [, s] of Object.entries(t.joins))
-        if (J(s.targetCube).name === E)
+        if (Q(s.targetCube).name === E)
           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 (J(i.targetCube).name === E)
+          if (Q(i.targetCube).name === E)
             return { sourceCube: s, joinDef: i };
       }
     return null;
@@ -4475,7 +4475,7 @@ class CE {
       }
     if (e.joins)
       for (const [, r] of Object.entries(e.joins)) {
-        const A = J(r.targetCube).name;
+        const A = Q(r.targetCube).name;
         if (i.has(A)) {
           const a = r.on.map((R) => ({
             sourceColumn: R.source.name,
@@ -4531,7 +4531,7 @@ class CE {
     if (!e.joins)
       return null;
     for (const [, E] of Object.entries(e.joins))
-      if (J(E.targetCube).name === t && E.relationship === "hasMany")
+      if (Q(E.targetCube).name === t && E.relationship === "hasMany")
         return E;
     return null;
   }
@@ -4559,7 +4559,7 @@ class CE {
       const T = E.get(r);
       if (T?.joins) {
         for (const [, A] of Object.entries(T.joins))
-          if (J(A.targetCube).name === t.name && A.relationship === "hasMany") {
+          if (Q(A.targetCube).name === t.name && A.relationship === "hasMany") {
             const R = this.extractFiltersForCube(e.filters, r), S = this.extractTimeDimensionFiltersForCube(e, r), I = [...R, ...S];
             I.length > 0 && A.on.length > 0 && s.push({
               sourceCube: T,
@@ -4727,7 +4727,7 @@ class CE {
         const u = e.get(C);
         u && N.set(C, u);
       }
-      const O = B.hasPostAggregationWindows(
+      const O = H.hasPostAggregationWindows(
         t.measures || [],
         N
       );
@@ -4859,26 +4859,26 @@ class CE {
       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
-      })), N = /* @__PURE__ */ new Map([[r, A]]), { aggregateMeasures: O, postAggWindowMeasures: C, requiredBaseMeasures: u } = B.categorizeForPostAggregation(
+      const I = T.on.map((_) => ({
+        sourceColumn: _.source.name,
+        targetColumn: _.target.name
+      })), N = /* @__PURE__ */ new Map([[r, A]]), { aggregateMeasures: O, postAggWindowMeasures: C, requiredBaseMeasures: u } = H.categorizeForPostAggregation(
         S,
         N
       ), l = [.../* @__PURE__ */ new Set([
         ...O,
-        ...Array.from(u).filter((c) => c.startsWith(r + "."))
+        ...Array.from(u).filter((_) => _.startsWith(r + "."))
       ])];
       if (l.length > 0) {
-        const c = C.length > 0;
+        const _ = C.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: l,
           joinKeys: I,
@@ -5002,7 +5002,7 @@ class us {
     let N = E.db.select(a).from(T.from);
     if (A && e.intermediateJoins)
       for (const m of e.intermediateJoins) {
-        const P = m.cube.sql(E), g = [v(m.cteJoinColumn, m.joinDef.on[0]?.target)];
+        const P = m.cube.sql(E), g = [X(m.cteJoinColumn, m.joinDef.on[0]?.target)];
         m.securityFilter && g.push(m.securityFilter), N = N.leftJoin(
           P.from,
           y(...g)
@@ -5027,8 +5027,8 @@ class us {
           if (M === R && r.dimensions && r.dimensions[g]) {
             const h = r.dimensions[g];
             if (P.operator === "inDateRange") {
-              const G = this.queryBuilder.buildMeasureExpression({ sql: h.sql, type: "number" }, E), b = this.queryBuilder.buildDateRangeCondition(G, P.values);
-              b && u.push(b);
+              const G = this.queryBuilder.buildMeasureExpression({ sql: h.sql, type: "number" }, E), B = this.queryBuilder.buildDateRangeCondition(G, P.values);
+              B && u.push(B);
             }
           }
         }
@@ -5046,26 +5046,26 @@ class us {
       const m = l.length === 1 ? l[0] : y(...l);
       N = N.where(m);
     }
-    const c = [], D = /* @__PURE__ */ new Set(), p = (m) => {
+    const _ = [], U = /* @__PURE__ */ new Set(), D = (m) => {
       const P = m?.name || (typeof m == "string" ? m : null);
-      P && !D.has(P) ? (D.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];
-      m.primaryJoinColumn && p(m.primaryJoinColumn);
+      m.primaryJoinColumn && D(m.primaryJoinColumn);
     } else
       for (const m of e.joinKeys)
-        m.targetColumnObj && p(m.targetColumnObj);
+        m.targetColumnObj && D(m.targetColumnObj);
     if (e.downstreamJoinKeys)
       for (const m of e.downstreamJoinKeys)
         for (const P of m.joinKeys)
-          P.sourceColumnObj && p(P.sourceColumnObj);
+          P.sourceColumnObj && D(P.sourceColumnObj);
     if (t.dimensions)
       for (const m of t.dimensions) {
         const [P, M] = m.split(".");
         if (P === R && r.dimensions && r.dimensions[M]) {
-          const g = r.dimensions[M], h = F(g.sql, E);
-          c.push(h);
+          const g = r.dimensions[M], h = b(g.sql, E);
+          _.push(h);
         }
       }
     if (t.timeDimensions)
@@ -5073,10 +5073,10 @@ class us {
         const [P, M] = m.dimension.split(".");
         if (P === R && r.dimensions && r.dimensions[M]) {
           const g = r.dimensions[M], h = this.queryBuilder.buildTimeDimensionExpression(g.sql, m.granularity, E);
-          c.push(h);
+          _.push(h);
         }
       }
-    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
@@ -5096,11 +5096,11 @@ class us {
     const i = [];
     if (s.intermediateJoins && s.intermediateJoins.length > 0) {
       const r = s.intermediateJoins[0], T = s.joinKeys[0]?.sourceColumnObj, A = o`${o.identifier(t)}.${o.identifier(r.primaryJoinColumn.name)}`;
-      i.push(v(T, A));
+      i.push(X(T, A));
     } else
       for (const r of s.joinKeys) {
         const T = r.sourceColumnObj || o.identifier(r.sourceColumn), A = o`${o.identifier(t)}.${o.identifier(r.targetColumn)}`;
-        i.push(v(T, A));
+        i.push(X(T, A));
       }
     return i.length === 1 ? i[0] : y(...i);
   }
@@ -5136,7 +5136,7 @@ class us {
       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) => v(S.source, S.target)), a = y(
+      const A = T.map((S) => X(S.source, S.target)), a = y(
         ...A,
         r
       ), R = t.db.select({ one: o`1` }).from(s.from).where(a);
@@ -5251,10 +5251,10 @@ function Ds(n, e) {
           [t]: C
         };
         if (N)
-          for (const c of T)
-            l[c] = N[c];
-        for (const c of r)
-          l[c] = i;
+          for (const _ of T)
+            l[_] = N[_];
+        for (const _ of r)
+          l[_] = i;
         R.push(l);
       }
     }
@@ -5303,7 +5303,7 @@ function Mt(n, e, t) {
 class Ps {
   dateTimeBuilder;
   constructor(e) {
-    this.dateTimeBuilder = new Ie(e);
+    this.dateTimeBuilder = new Ne(e);
   }
   /**
    * Check if a query contains compareDateRange
@@ -5486,7 +5486,7 @@ class Ps {
 }
 class ps {
   constructor(e) {
-    this.databaseAdapter = e, this.dateTimeBuilder = new Ie(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
+    this.databaseAdapter = e, this.dateTimeBuilder = new Ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
   }
   filterBuilder;
   dateTimeBuilder;
@@ -5670,7 +5670,7 @@ class ps {
       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 b(A.sql, E);
     }
     const s = e.bindingKey.find((T) => T.cube === t.name);
     if (!s)
@@ -5678,7 +5678,7 @@ class ps {
     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 b(r.sql, E);
   }
   /**
    * Resolve time dimension expression for a cube
@@ -5688,7 +5688,7 @@ class ps {
       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 b(A.sql, E);
     }
     const s = e.timeDimension.find((T) => T.cube === t.name);
     if (!s)
@@ -5696,7 +5696,7 @@ class ps {
     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 b(r.sql, E);
   }
   /**
    * Build filter conditions for a step
@@ -5730,17 +5730,17 @@ class ps {
       if (r) {
         const l = e;
         u = l.type === "and";
-        for (const c of l.filters || []) {
-          const D = this.buildFilterCondition(c, t, E, s);
-          D && C.push(D);
+        for (const _ of l.filters || []) {
+          const U = this.buildFilterCondition(_, t, E, s);
+          U && C.push(U);
         }
       } else {
         const l = e;
         u = "and" in l && !!l.and;
-        const c = l.and || l.or || [];
-        for (const D of c) {
-          const p = this.buildFilterCondition(D, t, E, s);
-          p && C.push(p);
+        const _ = l.and || l.or || [];
+        for (const U of _) {
+          const D = this.buildFilterCondition(U, t, E, s);
+          D && C.push(D);
         }
       }
       return C.length === 0 ? null : C.length === 1 ? C[0] : u ? y(...C) : o`(${o.join(C, o` OR `)})`;
@@ -5760,7 +5760,7 @@ class ps {
     }
     const N = I.dimensions?.[a];
     if (!N) return null;
-    const O = F(N.sql, s);
+    const O = b(N.sql, s);
     return this.filterBuilder.buildFilterCondition(
       O,
       T.operator,
@@ -5848,7 +5848,7 @@ class ps {
       for (const r of i.joinPath) {
         const T = r.joinDef, A = [];
         for (const I of T.on)
-          I.as ? A.push(I.as(I.source, I.target)) : A.push(v(I.source, I.target));
+          I.as ? A.push(I.as(I.source, I.target)) : A.push(X(I.source, I.target));
         const a = A.length === 1 ? A[0] : y(...A), S = i.cube.sql(E);
         e = e.leftJoin(S.from, a), S.where && s.push(S.where);
       }
@@ -5927,7 +5927,7 @@ class Ms {
   dateTimeBuilder;
   databaseAdapter;
   constructor(e) {
-    this.databaseAdapter = e, this.dateTimeBuilder = new Ie(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
+    this.databaseAdapter = e, this.dateTimeBuilder = new Ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
   }
   /**
    * Check if query contains flow configuration
@@ -6098,7 +6098,7 @@ class Ms {
       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 b(A.sql, E);
     }
     const s = e.bindingKey.find((T) => T.cube === t.name);
     if (!s)
@@ -6106,7 +6106,7 @@ class Ms {
     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 b(r.sql, E);
   }
   /**
    * Resolve time dimension expression
@@ -6116,7 +6116,7 @@ class Ms {
       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 b(A.sql, E);
     }
     const s = e.timeDimension.find((T) => T.cube === t.name);
     if (!s)
@@ -6124,7 +6124,7 @@ class Ms {
     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 b(r.sql, E);
   }
   /**
    * Resolve event dimension expression
@@ -6133,7 +6133,7 @@ class Ms {
     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 b(i.sql, E);
   }
   /**
    * Build filter conditions for the starting step
@@ -6170,7 +6170,7 @@ class Ms {
     }
     const s = e, [, i] = s.member.split("."), r = t.dimensions?.[i];
     if (!r) return null;
-    const T = F(r.sql, E);
+    const T = b(r.sql, E);
     return this.filterBuilder.buildFilterCondition(
       T,
       s.operator,
@@ -6220,7 +6220,7 @@ class Ms {
         step_time: o`${r}`.as("step_time"),
         event_type: o`${T}`.as("event_type"),
         event_path: u.as("event_path")
-      }).from(s.from).where(C).orderBy(o`${r} DESC`).limit(1), c = E.db.$with(N).as(
+      }).from(s.from).where(C).orderBy(o`${r} DESC`).limit(1), _ = E.db.$with(N).as(
         E.db.select({
           binding_key: o`e.binding_key`.as("binding_key"),
           step_time: o`e.step_time`.as("step_time"),
@@ -6228,7 +6228,7 @@ class Ms {
           event_path: o`e.event_path`.as("event_path")
         }).from(o`${o.identifier(S)}`).crossJoinLateral(l.as("e"))
       );
-      A.push(c);
+      A.push(_);
     }
     return A;
   }
@@ -6249,7 +6249,7 @@ class Ms {
         step_time: o`${r}`.as("step_time"),
         event_type: o`${T}`.as("event_type"),
         event_path: u.as("event_path")
-      }).from(s.from).where(C).orderBy(o`${r} ASC`).limit(1), c = E.db.$with(N).as(
+      }).from(s.from).where(C).orderBy(o`${r} ASC`).limit(1), _ = E.db.$with(N).as(
         E.db.select({
           binding_key: o`e.binding_key`.as("binding_key"),
           step_time: o`e.step_time`.as("step_time"),
@@ -6257,7 +6257,7 @@ class Ms {
           event_path: o`e.event_path`.as("event_path")
         }).from(o`${o.identifier(S)}`).crossJoinLateral(l.as("e"))
       );
-      A.push(c);
+      A.push(_);
     }
     return A;
   }
@@ -6284,13 +6284,13 @@ class Ms {
       }).from(s.from).innerJoin(
         o`${o.identifier(S)}`,
         o`${i} = ${o.identifier(S)}.binding_key`
-      ).where(C), c = E.db.select({
+      ).where(C), _ = 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(l.as("ranked")).where(o`rn = 1`);
-      A.push(E.db.$with(N).as(c));
+      A.push(E.db.$with(N).as(_));
     }
     return A;
   }
@@ -6317,13 +6317,13 @@ class Ms {
       }).from(s.from).innerJoin(
         o`${o.identifier(S)}`,
         o`${i} = ${o.identifier(S)}.binding_key`
-      ).where(C), c = E.db.select({
+      ).where(C), _ = 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(l.as("ranked")).where(o`rn = 1`);
-      A.push(E.db.$with(N).as(c));
+      A.push(E.db.$with(N).as(_));
     }
     return A;
   }
@@ -6548,7 +6548,7 @@ function ht(n) {
 }
 class Us {
   constructor(e) {
-    this.databaseAdapter = e, this.dateTimeBuilder = new Ie(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
+    this.databaseAdapter = e, this.dateTimeBuilder = new Ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
   }
   filterBuilder;
   dateTimeBuilder;
@@ -6687,12 +6687,12 @@ class Us {
     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 = b(T.sql, E), a = this.resolveBindingKey(e.bindingKey, r, t, E), R = this.buildFilterConditions(e.cohortFilters, r, t, E), S = this.buildFilterConditions(e.activityFilters, r, t, E), I = [];
     if (e.breakdownDimensions && e.breakdownDimensions.length > 0)
       for (const N of e.breakdownDimensions) {
         const [O, C] = N.split("."), u = t.get(O);
         if (u && u.dimensions?.[C]) {
-          const l = F(u.dimensions[C].sql, E);
+          const l = b(u.dimensions[C].sql, E);
           I.push({ dimension: N, expr: l });
         }
       }
@@ -6712,7 +6712,7 @@ class Us {
       const I = S.dimensions?.[R];
       if (!I)
         throw new Error(`Binding key dimension not found: ${a.dimension}`);
-      return F(I.sql, s);
+      return b(I.sql, s);
     }
     const [i, r] = e.split("."), T = E.get(i);
     if (!T)
@@ -6720,7 +6720,7 @@ class Us {
     const A = T.dimensions?.[r];
     if (!A)
       throw new Error(`Binding key dimension not found: ${e}`);
-    return F(A.sql, s);
+    return b(A.sql, s);
   }
   /**
    * Build filter conditions from config filters
@@ -6750,7 +6750,7 @@ class Us {
     if (!A) return null;
     const a = A.dimensions?.[T];
     if (!a) return null;
-    const R = F(a.sql, s);
+    const R = b(a.sql, s);
     return this.filterBuilder.buildFilterCondition(
       R,
       i.operator,
@@ -6934,7 +6934,7 @@ class Us {
     return t.length > 1 ? t[1] : t[0];
   }
 }
-class z {
+class te {
   constructor(e, t) {
     if (this.dbExecutor = e, this.databaseAdapter = e.databaseAdapter, !this.databaseAdapter)
       throw new Error("DatabaseExecutor must have a databaseAdapter property");
@@ -6982,19 +6982,19 @@ class z {
           });
         else
           try {
-            const l = Date.now(), c = await this.cacheConfig.provider.get(i);
-            if (c)
+            const l = Date.now(), _ = await this.cacheConfig.provider.get(i);
+            if (_)
               return this.cacheConfig.onCacheEvent?.({
                 type: "hit",
                 key: i,
                 durationMs: Date.now() - l
               }), {
-                ...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(),
@@ -7028,19 +7028,19 @@ class z {
       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((l) => {
-        const c = { ...l };
+        const _ = { ...l };
         if (t.timeDimensions) {
-          for (const D of t.timeDimensions)
-            if (D.dimension in c) {
-              let p = c[D.dimension];
-              if (typeof p == "string" && p.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-                const m = p.replace(" ", "T"), P = !m.endsWith("Z") && !m.includes("+") ? m + "Z" : m;
-                p = new Date(P);
+          for (const U of t.timeDimensions)
+            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);
               }
-              p = this.databaseAdapter.convertTimeDimensionResult(p), c[D.dimension] = p;
+              D = this.databaseAdapter.convertTimeDimensionResult(D), _[U.dimension] = D;
             }
         }
-        return c;
+        return _;
       }) : [S], N = t.measures || [], O = Mt(I, t, N), C = this.generateAnnotations(A, t), u = {
         data: O,
         annotation: C,
@@ -7319,8 +7319,8 @@ class z {
           if (u.dimension in C) {
             let l = C[u.dimension];
             if (typeof l == "string" && l.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-              const c = l.replace(" ", "T"), D = !c.endsWith("Z") && !c.includes("+") ? c + "Z" : c;
-              l = new Date(D);
+              const _ = l.replace(" ", "T"), U = !_.endsWith("Z") && !_.includes("+") ? _ + "Z" : _;
+              l = new Date(U);
             }
             l = this.databaseAdapter.convertTimeDimensionResult(l), C[u.dimension] = l;
           }
@@ -7369,234 +7369,235 @@ class z {
     if (e.preAggregationCTEs && e.preAggregationCTEs.length > 0) {
       for (const D of e.preAggregationCTEs)
         if (D.propagatingFilters && D.propagatingFilters.length > 0)
-          for (const p of D.propagatingFilters) {
-            const m = p.sourceCube.name;
-            if (!s.has(m)) {
-              const M = {
-                filters: p.filters
-              }, g = /* @__PURE__ */ new Map([[m, p.sourceCube]]), h = this.queryBuilder.buildWhereConditions(
+          for (const m of D.propagatingFilters) {
+            const P = m.sourceCube.name;
+            if (!s.has(P)) {
+              const g = {
+                filters: m.filters
+              }, h = /* @__PURE__ */ new Map([[P, m.sourceCube]]), G = this.queryBuilder.buildWhereConditions(
+                h,
                 g,
-                M,
                 E
               );
-              s.set(m, h);
+              s.set(P, G);
             }
-            const P = s.get(m);
-            P && P.length > 0 && (p.preBuiltFilterSQL = P.length === 1 ? P[0] : y(...P));
+            const M = s.get(P);
+            M && M.length > 0 && (m.preBuiltFilterSQL = M.length === 1 ? M[0] : y(...M));
           }
     }
     const i = [], r = /* @__PURE__ */ new Map(), T = /* @__PURE__ */ new Map();
     if (e.preAggregationCTEs && e.preAggregationCTEs.length > 0)
       for (const D of e.preAggregationCTEs) {
-        const p = this.cteBuilder.buildPreAggregationCTE(D, t, E, e, s);
-        if (p && (i.push(p), r.set(D.cube.name, D.cteAlias), D.downstreamJoinKeys))
-          for (const m of D.downstreamJoinKeys)
-            T.set(m.targetCubeName, {
+        const m = this.cteBuilder.buildPreAggregationCTE(D, t, E, e, s);
+        if (m && (i.push(m), r.set(D.cube.name, D.cteAlias), D.downstreamJoinKeys))
+          for (const P of D.downstreamJoinKeys)
+            T.set(P.targetCubeName, {
               cteAlias: D.cteAlias,
-              joinKeys: m.joinKeys
+              joinKeys: P.joinKeys
             });
       }
-    const A = e.primaryCube.sql(E), R = { ...this.queryBuilder.buildSelections(
-      e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : e.primaryCube,
+    const A = e.primaryCube.sql(E), a = e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : /* @__PURE__ */ new Map([[e.primaryCube.name, e.primaryCube]]), S = { ...this.queryBuilder.buildSelections(
+      e.joinCubes.length > 0 ? a : e.primaryCube,
       // Single cube
       t,
       E
     ) };
     if (e.preAggregationCTEs)
       for (const D of e.preAggregationCTEs) {
-        const p = D.cube.name;
-        for (const m of D.measures)
-          if (R[m]) {
-            const [, P] = m.split("."), M = this.getCubesFromPlan(e).get(p);
-            if (M && M.measures && M.measures[P]) {
-              const g = M.measures[P], h = o`${o.identifier(D.cteAlias)}.${o.identifier(P)}`;
-              let G;
-              if (g.type === "calculated" && g.calculatedSql) {
-                const b = this.getCubesFromPlan(e);
-                G = this.queryBuilder.buildCTECalculatedMeasure(
+        const m = D.cube.name;
+        for (const P of D.measures)
+          if (S[P]) {
+            const [, M] = P.split("."), g = a.get(m);
+            if (g && g.measures && g.measures[M]) {
+              const h = g.measures[M], G = o`${o.identifier(D.cteAlias)}.${o.identifier(M)}`;
+              let B;
+              if (h.type === "calculated" && h.calculatedSql)
+                B = this.queryBuilder.buildCTECalculatedMeasure(
+                  h,
                   g,
-                  M,
                   D,
-                  b,
+                  a,
                   E
                 );
-              } else {
-                const b = D.cteReason === "fanOutPrevention";
-                switch (g.type) {
+              else {
+                const F = D.cteReason === "fanOutPrevention", W = this.shouldUseMaxForHasManyAtJoinKeyGrain(
+                  D,
+                  t,
+                  a
+                ), V = F || W;
+                switch (h.type) {
                   case "count":
                   case "countDistinct":
                   case "sum":
-                    G = b ? q(h) : x(h);
+                    B = V ? Z(G) : J(G);
                     break;
                   case "avg":
-                    G = b ? q(h) : this.databaseAdapter.buildAvg(h);
+                    B = V ? Z(G) : this.databaseAdapter.buildAvg(G);
                     break;
                   case "min":
-                    G = le(h);
+                    B = le(G);
                     break;
                   case "max":
-                    G = q(h);
+                    B = Z(G);
                     break;
                   case "number":
-                    G = b ? q(h) : x(h);
+                    B = V ? Z(G) : J(G);
                     break;
                   default:
-                    G = b ? q(h) : x(h);
+                    B = V ? Z(G) : J(G);
                 }
               }
-              R[m] = o`${G}`.as(m);
+              S[P] = o`${B}`.as(P);
             }
           }
-        for (const m in R) {
-          const [P, M] = m.split(".");
-          if (P === p) {
-            const g = this.getCubesFromPlan(e).get(p), h = g && g.dimensions?.[M], G = m.startsWith(p + ".");
-            if (h || G) {
-              let b = D.joinKeys.find(($) => $.targetColumn === M);
-              if (!b && g?.dimensions?.[M]) {
-                const $ = g.dimensions[M].sql;
-                b = D.joinKeys.find((W) => W.targetColumnObj === $);
+        for (const P in S) {
+          const [M, g] = P.split(".");
+          if (M === m) {
+            const h = a.get(m), G = h && h.dimensions?.[g], B = P.startsWith(m + ".");
+            if (G || B) {
+              let F = D.joinKeys.find((W) => W.targetColumn === g);
+              if (!F && h?.dimensions?.[g]) {
+                const W = h.dimensions[g].sql;
+                F = D.joinKeys.find((V) => V.targetColumnObj === W);
               }
-              b ? R[m] = o`${o.identifier(D.cteAlias)}.${o.identifier(M)}`.as(m) : G && g?.dimensions?.[M] && (R[m] = o`${o.identifier(D.cteAlias)}.${o.identifier(M)}`.as(m));
+              F ? S[P] = o`${o.identifier(D.cteAlias)}.${o.identifier(g)}`.as(P) : B && h?.dimensions?.[g] && (S[P] = o`${o.identifier(D.cteAlias)}.${o.identifier(g)}`.as(P));
             }
           }
         }
       }
-    if (t.measures) {
-      const D = this.getCubesFromPlan(e);
-      for (const p of t.measures) {
-        const [m, P] = p.split("."), M = D.get(m);
+    if (t.measures)
+      for (const D of t.measures) {
+        const [m, P] = D.split("."), M = a.get(m);
         if (M?.measures?.[P]) {
           const g = M.measures[P];
-          if (B.isPostAggregationWindow(g)) {
-            const h = B.getWindowBaseMeasure(g, m);
+          if (H.isPostAggregationWindow(g)) {
+            const h = H.getWindowBaseMeasure(g, m);
             if (h) {
-              const [G, b] = h.split("."), $ = D.get(G);
-              if ($?.measures?.[b]) {
-                const W = $.measures[b], se = e.preAggregationCTEs?.find(
-                  (Oe) => Oe.cube?.name === G && Oe.measures?.includes(h)
+              const [G, B] = h.split("."), F = a.get(G);
+              if (F?.measures?.[B]) {
+                const W = F.measures[B], V = e.preAggregationCTEs?.find(
+                  (ie) => ie.cube?.name === G && ie.measures?.includes(h)
                 );
-                let ne;
-                if (se) {
-                  const Oe = o`${o.identifier(se.cteAlias)}.${o.identifier(b)}`;
-                  ne = o`sum(${Oe})`;
+                let j;
+                if (V) {
+                  const ie = o`${o.identifier(V.cteAlias)}.${o.identifier(B)}`;
+                  j = o`sum(${ie})`;
                 } else
-                  ne = this.queryBuilder.buildMeasureExpression(W, E, $);
-                R[h] || (R[h] = o`${ne}`.as(h));
-                const Ne = this.buildPostAggregationWindowExpression(
+                  j = this.queryBuilder.buildMeasureExpression(W, E, F);
+                S[h] || (S[h] = o`${j}`.as(h));
+                const Oe = this.buildPostAggregationWindowExpression(
                   g,
-                  ne,
+                  j,
                   t,
                   E,
                   M,
                   e
                 );
-                Ne && (R[p] = o`${Ne}`.as(p));
+                Oe && (S[D] = o`${Oe}`.as(D));
               }
             }
           }
         }
       }
-    }
-    const S = [];
-    let I = E.db.select(R).from(A.from);
-    if (i.length > 0 && (I = E.db.with(...i).select(R).from(A.from)), A.joins)
+    const I = [];
+    let N = E.db.select(S).from(A.from);
+    if (i.length > 0 && (N = E.db.with(...i).select(S).from(A.from)), A.joins)
       for (const D of A.joins)
         switch (D.type || "left") {
           case "left":
-            I = I.leftJoin(D.table, D.on);
+            N = N.leftJoin(D.table, D.on);
             break;
           case "inner":
-            I = I.innerJoin(D.table, D.on);
+            N = N.innerJoin(D.table, D.on);
             break;
           case "right":
-            I = I.rightJoin(D.table, D.on);
+            N = N.rightJoin(D.table, D.on);
             break;
           case "full":
-            I = I.fullJoin(D.table, D.on);
+            N = N.fullJoin(D.table, D.on);
             break;
         }
-    const N = /* @__PURE__ */ new Set(), O = /* @__PURE__ */ new Set();
+    const O = /* @__PURE__ */ new Set(), C = /* @__PURE__ */ new Set();
     if (e.preAggregationCTEs) {
       for (const D of e.preAggregationCTEs)
         if (D.intermediateJoins && D.intermediateJoins.length > 0)
-          for (const p of D.intermediateJoins)
-            O.add(p.cube.name);
+          for (const m of D.intermediateJoins)
+            C.add(m.cube.name);
     }
     if (e.joinCubes && e.joinCubes.length > 0)
       for (const D of e.joinCubes) {
-        const p = D.cube.name;
-        if (O.has(p) && !r.has(p))
+        const m = D.cube.name;
+        if (C.has(m) && !r.has(m))
           continue;
-        const m = r.get(D.cube.name);
+        const P = r.get(D.cube.name);
         if (D.junctionTable) {
-          const b = D.junctionTable, $ = [];
-          if (b.securitySql) {
-            const W = b.securitySql(E.securityContext);
-            Array.isArray(W) ? $.push(...W) : $.push(W);
+          const F = D.junctionTable, W = [];
+          if (F.securitySql) {
+            const V = F.securitySql(E.securityContext);
+            Array.isArray(V) ? W.push(...V) : W.push(V);
           }
           try {
-            switch (b.joinType || "left") {
+            switch (F.joinType || "left") {
               case "left":
-                I = I.leftJoin(b.table, b.joinCondition);
+                N = N.leftJoin(F.table, F.joinCondition);
                 break;
               case "inner":
-                I = I.innerJoin(b.table, b.joinCondition);
+                N = N.innerJoin(F.table, F.joinCondition);
                 break;
               case "right":
-                I = I.rightJoin(b.table, b.joinCondition);
+                N = N.rightJoin(F.table, F.joinCondition);
                 break;
               case "full":
-                I = I.fullJoin(b.table, b.joinCondition);
+                N = N.fullJoin(F.table, F.joinCondition);
                 break;
             }
-            $.length > 0 && S.push(...$);
+            W.length > 0 && I.push(...W);
           } catch {
           }
         }
-        let P, M, g;
-        if (m)
-          P = o`${o.identifier(m)}`, M = this.cteBuilder.buildCTEJoinCondition(D, m, e), g = void 0;
+        let M, g, h;
+        if (P)
+          M = o`${o.identifier(P)}`, g = this.cteBuilder.buildCTEJoinCondition(D, P, e), h = void 0;
         else {
-          const b = T.get(D.cube.name), $ = D.cube.sql(E);
-          if (P = $.from, g = $.where, b) {
-            const W = [];
-            for (const se of b.joinKeys) {
-              const ne = o`${o.identifier(b.cteAlias)}.${o.identifier(se.sourceColumn)}`, Ne = se.targetColumnObj || o.identifier(se.targetColumn);
-              W.push(v(ne, Ne));
+          const F = T.get(D.cube.name), W = D.cube.sql(E);
+          if (M = W.from, h = W.where, F) {
+            const V = [];
+            for (const j of F.joinKeys) {
+              const Oe = o`${o.identifier(F.cteAlias)}.${o.identifier(j.sourceColumn)}`, ie = j.targetColumnObj || o.identifier(j.targetColumn);
+              V.push(X(Oe, ie));
             }
-            M = W.length === 1 ? W[0] : y(...W);
+            g = V.length === 1 ? V[0] : y(...V);
           } else
-            M = D.joinCondition;
+            g = D.joinCondition;
         }
-        const h = D.joinType || "left", G = h !== "inner" && g ? y(M, g) : M;
+        const G = D.joinType || "left", B = G !== "inner" && h ? y(g, h) : g;
         try {
-          switch (h) {
+          switch (G) {
             case "left":
-              I = I.leftJoin(P, G), g && N.add(D.cube.name);
+              N = N.leftJoin(M, B), h && O.add(D.cube.name);
               break;
             case "inner":
-              I = I.innerJoin(P, M);
+              N = N.innerJoin(M, g);
               break;
             case "right":
-              I = I.rightJoin(P, G), g && N.add(D.cube.name);
+              N = N.rightJoin(M, B), h && O.add(D.cube.name);
               break;
             case "full":
-              I = I.fullJoin(P, G), g && N.add(D.cube.name);
+              N = N.fullJoin(M, B), h && O.add(D.cube.name);
               break;
           }
         } catch {
         }
       }
-    if (A.where && S.push(A.where), e.joinCubes && e.joinCubes.length > 0)
+    if (A.where && I.push(A.where), e.joinCubes && e.joinCubes.length > 0)
       for (const D of e.joinCubes) {
-        const p = D.cube.name;
-        if (r.get(p) || O.has(p) || N.has(p))
+        const m = D.cube.name;
+        if (r.get(m) || C.has(m) || O.has(m))
           continue;
-        const P = D.cube.sql(E);
-        P.where && S.push(P.where);
+        const M = D.cube.sql(E);
+        M.where && I.push(M.where);
       }
-    const C = this.queryBuilder.buildWhereConditions(
+    const u = this.queryBuilder.buildWhereConditions(
       e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : e.primaryCube,
       // Single cube
       t,
@@ -7606,11 +7607,11 @@ class z {
       s
       // Reuse pre-built filters for parameter deduplication
     );
-    if (C.length > 0 && S.push(...C), S.length > 0) {
-      const D = S.length === 1 ? S[0] : y(...S);
-      I = I.where(D);
+    if (u.length > 0 && I.push(...u), I.length > 0) {
+      const D = I.length === 1 ? I[0] : y(...I);
+      N = N.where(D);
     }
-    const u = this.queryBuilder.buildGroupByFields(
+    const l = this.queryBuilder.buildGroupByFields(
       e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : e.primaryCube,
       // Single cube
       t,
@@ -7618,8 +7619,8 @@ class z {
       e
       // Pass the queryPlan to handle CTE scenarios
     );
-    u.length > 0 && (I = I.groupBy(...u));
-    const l = this.queryBuilder.buildHavingConditions(
+    l.length > 0 && (N = N.groupBy(...l));
+    const _ = this.queryBuilder.buildHavingConditions(
       e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : e.primaryCube,
       // Single cube
       t,
@@ -7627,12 +7628,12 @@ class z {
       e
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (l.length > 0) {
-      const D = l.length === 1 ? l[0] : y(...l);
-      I = I.having(D);
+    if (_.length > 0) {
+      const D = _.length === 1 ? _[0] : y(..._);
+      N = N.having(D);
     }
-    const c = this.queryBuilder.buildOrderBy(t);
-    return c.length > 0 && (I = I.orderBy(...c)), I = this.queryBuilder.applyLimitAndOffset(I, t), I;
+    const U = this.queryBuilder.buildOrderBy(t);
+    return U.length > 0 && (N = N.orderBy(...U)), N = this.queryBuilder.applyLimitAndOffset(N, t), N;
   }
   /**
    * Convert query plan to cube map for QueryBuilder methods
@@ -7644,6 +7645,36 @@ class z {
         t.set(E.cube.name, E.cube);
     return t;
   }
+  /**
+   * For hasMany CTEs, detect when the outer query grain already matches the CTE join key.
+   * In that case, re-aggregation should use MAX (not SUM) to avoid multiplying values by
+   * lower-grain primary cube rows.
+   */
+  shouldUseMaxForHasManyAtJoinKeyGrain(e, t, E) {
+    return e.cteReason !== "hasMany" || e.downstreamJoinKeys && e.downstreamJoinKeys.length > 0 || e.intermediateJoins && e.intermediateJoins.length > 0 || !!!(t.dimensions && t.dimensions.length > 0 || t.timeDimensions && t.timeDimensions.length > 0) || !!(t.dimensions?.some((r) => r.startsWith(`${e.cube.name}.`)) || t.timeDimensions?.some((r) => r.dimension.startsWith(`${e.cube.name}.`))) ? !1 : e.joinKeys.length > 0 && e.joinKeys.every(
+      (r) => !!r.sourceColumnObj && this.queryGroupsByColumn(r.sourceColumnObj, t, E)
+    );
+  }
+  /**
+   * Checks whether query grouping includes a dimension backed by the given column.
+   */
+  queryGroupsByColumn(e, t, E) {
+    if (t.dimensions)
+      for (const s of t.dimensions) {
+        const [i, r] = s.split(".");
+        if (E.get(i)?.dimensions?.[r]?.sql === e)
+          return !0;
+      }
+    if (t.timeDimensions)
+      for (const s of t.timeDimensions) {
+        if (s.granularity)
+          continue;
+        const [i, r] = s.dimension.split(".");
+        if (E.get(i)?.dimensions?.[r]?.sql === e)
+          return !0;
+      }
+    return !1;
+  }
   /**
    * Generate raw SQL for debugging (without execution) - unified approach
    */
@@ -7809,7 +7840,7 @@ class z {
         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 = b(S.sql, s), O = this.queryBuilder.buildFilterConditionPublic(
           N,
           r.operator,
           r.values,
@@ -7828,7 +7859,7 @@ class z {
           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 = b(R.sql, s), I = this.queryBuilder.buildDateRangeCondition(S, i.dateRange);
           I && t.set(r, I);
         }
     }
@@ -7860,15 +7891,15 @@ class z {
         const O = N.field.includes(".") ? N.field.split(".")[1] : N.field;
         if (E.timeDimensions)
           for (const l of E.timeDimensions) {
-            const [c, D] = l.dimension.split(".");
-            if (D === O) {
-              const p = A(c, O);
-              if (p)
+            const [_, U] = l.dimension.split(".");
+            if (U === O) {
+              const D = A(_, O);
+              if (D)
                 return {
-                  field: p,
+                  field: D,
                   direction: N.direction
                 };
-              const m = i.dimensions?.[D];
+              const m = i.dimensions?.[U];
               if (m)
                 return {
                   field: this.queryBuilder.buildTimeDimensionExpression(
@@ -7883,7 +7914,7 @@ class z {
         const C = i.dimensions?.[O];
         if (C)
           return {
-            field: F(C.sql, s),
+            field: b(C.sql, s),
             direction: N.direction
           };
         const u = T.measure?.includes(".") ? T.measure.split(".")[1] : T.measure;
@@ -7902,10 +7933,10 @@ class z {
       else {
         const l = i.name === O ? i : void 0;
         if (l?.dimensions?.[C]) {
-          const c = l.dimensions[C];
+          const _ = l.dimensions[C];
           a = [{
             field: this.queryBuilder.buildTimeDimensionExpression(
-              c.sql,
+              _.sql,
               N.granularity,
               s
             ),
@@ -7917,7 +7948,7 @@ class z {
     let R;
     T.partitionBy && T.partitionBy.length > 0 && (R = T.partitionBy.map((N) => {
       const O = N.includes(".") ? N.split(".")[1] : N, C = i.dimensions?.[O];
-      return C ? F(C.sql, s) : null;
+      return C ? b(C.sql, s) : null;
     }).filter((N) => N !== null));
     const S = this.databaseAdapter.buildWindowFunction(
       e.type,
@@ -7933,7 +7964,7 @@ class z {
     );
     if (!S)
       return null;
-    switch (T.operation || B.getDefaultWindowOperation(e.type)) {
+    switch (T.operation || H.getDefaultWindowOperation(e.type)) {
       case "difference":
         return o`${t} - ${S}`;
       case "ratio":
@@ -8019,13 +8050,13 @@ const uE = (n) => ({
   raw: "«EOF»",
   text: "«EOF»",
   start: n
-}), j = uE(1 / 0), ie = (n) => (e) => e.type === n.type && e.text === n.text, Z = {
-  ARRAY: ie({ text: "ARRAY", type: d.RESERVED_DATA_TYPE }),
-  BY: ie({ text: "BY", type: d.RESERVED_KEYWORD }),
-  SET: ie({ text: "SET", type: d.RESERVED_CLAUSE }),
-  STRUCT: ie({ text: "STRUCT", type: d.RESERVED_DATA_TYPE }),
-  WINDOW: ie({ text: "WINDOW", type: d.RESERVED_CLAUSE }),
-  VALUES: ie({ text: "VALUES", type: d.RESERVED_CLAUSE })
+}), z = uE(1 / 0), re = (n) => (e) => e.type === n.type && e.text === n.text, ee = {
+  ARRAY: re({ text: "ARRAY", type: d.RESERVED_DATA_TYPE }),
+  BY: re({ text: "BY", type: d.RESERVED_KEYWORD }),
+  SET: re({ text: "SET", type: d.RESERVED_CLAUSE }),
+  STRUCT: re({ text: "STRUCT", type: d.RESERVED_DATA_TYPE }),
+  WINDOW: re({ text: "WINDOW", type: d.RESERVED_CLAUSE }),
+  VALUES: re({ text: "VALUES", type: d.RESERVED_CLAUSE })
 }, LE = (n) => n === d.RESERVED_DATA_TYPE || n === d.RESERVED_KEYWORD || n === d.RESERVED_FUNCTION_NAME || n === d.RESERVED_KEYWORD_PHRASE || n === d.RESERVED_DATA_TYPE_PHRASE || n === d.RESERVED_CLAUSE || n === d.RESERVED_SELECT || n === d.RESERVED_SET_OPERATION || n === d.RESERVED_JOIN || n === d.ARRAY_KEYWORD || n === d.CASE || n === d.END || n === d.WHEN || n === d.ELSE || n === d.THEN || n === d.LIMIT || n === d.BETWEEN || n === d.AND || n === d.OR || n === d.XOR, Hs = (n) => n === d.AND || n === d.OR || n === d.XOR, Ys = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
@@ -8881,7 +8912,7 @@ function Qs(n) {
   return ks(qs(n));
 }
 function ks(n) {
-  let e = j;
+  let e = z;
   return n.map((t) => t.text === "OFFSET" && e.text === "[" ? (e = t, Object.assign(Object.assign({}, t), { type: d.RESERVED_FUNCTION_NAME })) : (e = t, t));
 }
 function qs(n) {
@@ -8889,7 +8920,7 @@ function qs(n) {
   const t = [];
   for (let E = 0; E < n.length; E++) {
     const s = n[E];
-    if ((Z.ARRAY(s) || Z.STRUCT(s)) && ((e = n[E + 1]) === null || e === void 0 ? void 0 : e.text) === "<") {
+    if ((ee.ARRAY(s) || ee.STRUCT(s)) && ((e = n[E + 1]) === null || e === void 0 ? void 0 : e.text) === "<") {
       const i = js(n, E + 1), r = n.slice(E, i + 1);
       t.push({
         type: d.IDENTIFIER,
@@ -11480,8 +11511,8 @@ const Zs = [
 };
 function an(n) {
   return n.map((e, t) => {
-    const E = n[t + 1] || j, s = n[t - 1] || j;
-    return e.type === d.RESERVED_SELECT && (E.type === d.COMMA || s.type === d.RESERVED_CLAUSE || s.type === d.COMMA) ? Object.assign(Object.assign({}, e), { type: d.RESERVED_KEYWORD }) : Z.SET(e) && E.type === d.OPEN_PAREN ? Object.assign(Object.assign({}, e), { type: d.RESERVED_FUNCTION_NAME }) : e;
+    const E = n[t + 1] || z, s = n[t - 1] || z;
+    return e.type === d.RESERVED_SELECT && (E.type === d.COMMA || s.type === d.RESERVED_CLAUSE || s.type === d.COMMA) ? Object.assign(Object.assign({}, e), { type: d.RESERVED_KEYWORD }) : ee.SET(e) && E.type === d.OPEN_PAREN ? Object.assign(Object.assign({}, e), { type: d.RESERVED_FUNCTION_NAME }) : e;
   });
 }
 const on = [
@@ -15223,11 +15254,11 @@ const on = [
 };
 function ge(n) {
   return n.map((e, t) => {
-    const E = n[t + 1] || j;
-    if (Z.SET(e) && E.text === "(")
+    const E = n[t + 1] || z;
+    if (ee.SET(e) && E.text === "(")
       return Object.assign(Object.assign({}, e), { type: d.RESERVED_FUNCTION_NAME });
-    const s = n[t - 1] || j;
-    return Z.VALUES(e) && s.text === "=" ? Object.assign(Object.assign({}, e), { type: d.RESERVED_FUNCTION_NAME }) : e;
+    const s = n[t - 1] || z;
+    return ee.VALUES(e) && s.text === "=" ? Object.assign(Object.assign({}, e), { type: d.RESERVED_FUNCTION_NAME }) : e;
   });
 }
 const kn = [
@@ -16535,7 +16566,7 @@ const kn = [
   "MBRTOUCHES",
   "MBRWITHIN",
   "MD5",
-  "MEMBER OF",
+  // 'MEMBER OF',
   "MICROSECOND",
   "MID",
   "MIN",
@@ -16547,10 +16578,10 @@ const kn = [
   "MULTIPOINT",
   "MULTIPOLYGON",
   "NAME_CONST",
-  "NOT",
-  "NOT IN",
-  "NOT LIKE",
-  "NOT REGEXP",
+  // 'NOT',
+  // 'NOT IN',
+  // 'NOT LIKE',
+  // 'NOT REGEXP',
   "NOW",
   "NTH_VALUE",
   "NTILE",
@@ -19033,8 +19064,8 @@ const kn = [
   }
 };
 function Ki(n) {
-  let e = j;
-  return n.map((t) => Z.SET(t) && Z.BY(e) ? Object.assign(Object.assign({}, t), { type: d.RESERVED_KEYWORD }) : (LE(t.type) && (e = t), t));
+  let e = z;
+  return n.map((t) => ee.SET(t) && ee.BY(e) ? Object.assign(Object.assign({}, t), { type: d.RESERVED_KEYWORD }) : (LE(t.type) && (e = t), t));
 }
 const xi = [
   // https://www.postgresql.org/docs/14/functions.html
@@ -21720,8 +21751,8 @@ const xi = [
 };
 function dr(n) {
   return n.map((e, t) => {
-    const E = n[t - 1] || j, s = n[t + 1] || j;
-    return Z.WINDOW(e) && s.type === d.OPEN_PAREN ? Object.assign(Object.assign({}, e), { type: d.RESERVED_FUNCTION_NAME }) : e.text === "ITEMS" && e.type === d.RESERVED_KEYWORD && !(E.text === "COLLECTION" && s.text === "TERMINATED") ? Object.assign(Object.assign({}, e), { type: d.IDENTIFIER, text: e.raw }) : e;
+    const E = n[t - 1] || z, s = n[t + 1] || z;
+    return ee.WINDOW(e) && s.type === d.OPEN_PAREN ? Object.assign(Object.assign({}, e), { type: d.RESERVED_FUNCTION_NAME }) : e.text === "ITEMS" && e.type === d.RESERVED_KEYWORD && !(E.text === "COLLECTION" && s.text === "TERMINATED") ? Object.assign(Object.assign({}, e), { type: d.IDENTIFIER, text: e.raw }) : e;
   });
 }
 const Dr = [
@@ -26038,28 +26069,28 @@ const Dr = [
   tidb: mi,
   transactsql: aT,
   trino: Zr
-}, Symbol.toStringTag, { value: "Module" })), Se = (n) => n[n.length - 1], _E = (n) => n.sort((e, t) => t.length - e.length || e.localeCompare(t)), _e = (n) => n.replace(/\s+/gu, " "), tt = (n) => /\n/.test(n), K = (n) => n.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), Zt = /\s+/uy, Ee = (n) => new RegExp(`(?:${n})`, "uy"), hT = (n) => n.split("").map((e) => / /gu.test(e) ? "\\s+" : `[${e.toUpperCase()}${e.toLowerCase()}]`).join(""), gT = (n) => n + "(?:-" + n + ")*", GT = ({ prefixes: n, requirePrefix: e }) => `(?:${n.map(hT).join("|")}${e ? "" : "|"})`, yT = (n) => new RegExp(`(?:${n.map(K).join("|")}).*?(?=\r
+}, Symbol.toStringTag, { value: "Module" })), Ie = (n) => n[n.length - 1], _E = (n) => n.sort((e, t) => t.length - e.length || e.localeCompare(t)), _e = (n) => n.replace(/\s+/gu, " "), tt = (n) => /\n/.test(n), x = (n) => n.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), Zt = /\s+/uy, ne = (n) => new RegExp(`(?:${n})`, "uy"), hT = (n) => n.split("").map((e) => / /gu.test(e) ? "\\s+" : `[${e.toUpperCase()}${e.toLowerCase()}]`).join(""), gT = (n) => n + "(?:-" + n + ")*", GT = ({ prefixes: n, requirePrefix: e }) => `(?:${n.map(hT).join("|")}${e ? "" : "|"})`, yT = (n) => new RegExp(`(?:${n.map(x).join("|")}).*?(?=\r
 |\r|
 |$)`, "uy"), zt = (n, e = []) => {
   const t = n === "open" ? 0 : 1, E = ["()", ...e].map((s) => s[t]);
-  return Ee(E.map(K).join("|"));
-}, eE = (n) => Ee(`${_E(n).map(K).join("|")}`), bT = ({ rest: n, dashes: e }) => n || e ? `(?![${n || ""}${e ? "-" : ""}])` : "", Q = (n, e = {}) => {
+  return ne(E.map(x).join("|"));
+}, eE = (n) => ne(`${_E(n).map(x).join("|")}`), bT = ({ rest: n, dashes: e }) => n || e ? `(?![${n || ""}${e ? "-" : ""}])` : "", k = (n, e = {}) => {
   if (n.length === 0)
     return /^\b$/u;
-  const t = bT(e), E = _E(n).map(K).join("|").replace(/ /gu, "\\s+");
+  const t = bT(e), E = _E(n).map(x).join("|").replace(/ /gu, "\\s+");
   return new RegExp(`(?:${E})${t}\\b`, "iuy");
 }, Et = (n, e) => {
   if (!n.length)
     return;
-  const t = n.map(K).join("|");
-  return Ee(`(?:${t})(?:${e})`);
+  const t = n.map(x).join("|");
+  return ne(`(?:${t})(?:${e})`);
 }, FT = () => {
   const n = {
     "<": ">",
     "[": "]",
     "(": ")",
     "{": "}"
-  }, e = "{left}(?:(?!{right}').)*?{right}", t = Object.entries(n).map(([r, T]) => e.replace(/{left}/g, K(r)).replace(/{right}/g, K(T))), E = K(Object.keys(n).join(""));
+  }, e = "{left}(?:(?!{right}').)*?{right}", t = Object.entries(n).map(([r, T]) => e.replace(/{left}/g, x(r)).replace(/{right}/g, x(T))), E = x(Object.keys(n).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${E}])(?:(?!\k<tag>').)*?\k<tag>`}|${t.join("|")})'`;
 }, tE = {
   // - backtick quoted (using `` to escape)
@@ -26086,8 +26117,8 @@ const Dr = [
   "{}": String.raw`(?:\{[^\}]*\})`,
   // Oracle q'' strings: q'<text>' q'|text|' ...
   "q''": FT()
-}, cE = (n) => typeof n == "string" ? tE[n] : "regex" in n ? n.regex : GT(n) + tE[n.quote], BT = (n) => Ee(n.map((e) => "regex" in e ? e.regex : cE(e)).join("|")), dE = (n) => n.map(cE).join("|"), EE = (n) => Ee(dE(n)), HT = (n = {}) => Ee(DE(n)), DE = ({ first: n, rest: e, dashes: t, allowFirstCharNumber: E } = {}) => {
-  const s = "\\p{Alphabetic}\\p{Mark}_", i = "\\p{Decimal_Number}", r = K(n ?? ""), T = K(e ?? ""), A = E ? `[${s}${i}${r}][${s}${i}${T}]*` : `[${s}${r}][${s}${i}${T}]*`;
+}, cE = (n) => typeof n == "string" ? tE[n] : "regex" in n ? n.regex : GT(n) + tE[n.quote], BT = (n) => ne(n.map((e) => "regex" in e ? e.regex : cE(e)).join("|")), dE = (n) => n.map(cE).join("|"), EE = (n) => ne(dE(n)), HT = (n = {}) => ne(DE(n)), DE = ({ first: n, rest: e, dashes: t, allowFirstCharNumber: E } = {}) => {
+  const s = "\\p{Alphabetic}\\p{Mark}_", i = "\\p{Decimal_Number}", r = x(n ?? ""), T = x(e ?? ""), A = E ? `[${s}${i}${r}][${s}${i}${T}]*` : `[${s}${r}][${s}${i}${T}]*`;
   return t ? gT(A) : A;
 };
 function mE(n, e) {
@@ -26225,83 +26256,83 @@ class WT {
       // to e.g. prioritize matching "TIMESTAMP WITH TIME ZONE" phrase over "WITH" clause.
       {
         type: d.RESERVED_KEYWORD_PHRASE,
-        regex: Q((E = e.reservedKeywordPhrases) !== null && E !== void 0 ? E : [], e.identChars),
-        text: H
+        regex: k((E = e.reservedKeywordPhrases) !== null && E !== void 0 ? E : [], e.identChars),
+        text: Y
       },
       {
         type: d.RESERVED_DATA_TYPE_PHRASE,
-        regex: Q((s = e.reservedDataTypePhrases) !== null && s !== void 0 ? s : [], e.identChars),
-        text: H
+        regex: k((s = e.reservedDataTypePhrases) !== null && s !== void 0 ? s : [], e.identChars),
+        text: Y
       },
       {
         type: d.CASE,
         regex: /CASE\b/iuy,
-        text: H
+        text: Y
       },
       {
         type: d.END,
         regex: /END\b/iuy,
-        text: H
+        text: Y
       },
       {
         type: d.BETWEEN,
         regex: /BETWEEN\b/iuy,
-        text: H
+        text: Y
       },
       {
         type: d.LIMIT,
         regex: e.reservedClauses.includes("LIMIT") ? /LIMIT\b/iuy : void 0,
-        text: H
+        text: Y
       },
       {
         type: d.RESERVED_CLAUSE,
-        regex: Q(e.reservedClauses, e.identChars),
-        text: H
+        regex: k(e.reservedClauses, e.identChars),
+        text: Y
       },
       {
         type: d.RESERVED_SELECT,
-        regex: Q(e.reservedSelect, e.identChars),
-        text: H
+        regex: k(e.reservedSelect, e.identChars),
+        text: Y
       },
       {
         type: d.RESERVED_SET_OPERATION,
-        regex: Q(e.reservedSetOperations, e.identChars),
-        text: H
+        regex: k(e.reservedSetOperations, e.identChars),
+        text: Y
       },
       {
         type: d.WHEN,
         regex: /WHEN\b/iuy,
-        text: H
+        text: Y
       },
       {
         type: d.ELSE,
         regex: /ELSE\b/iuy,
-        text: H
+        text: Y
       },
       {
         type: d.THEN,
         regex: /THEN\b/iuy,
-        text: H
+        text: Y
       },
       {
         type: d.RESERVED_JOIN,
-        regex: Q(e.reservedJoins, e.identChars),
-        text: H
+        regex: k(e.reservedJoins, e.identChars),
+        text: Y
       },
       {
         type: d.AND,
         regex: /AND\b/iuy,
-        text: H
+        text: Y
       },
       {
         type: d.OR,
         regex: /OR\b/iuy,
-        text: H
+        text: Y
       },
       {
         type: d.XOR,
         regex: e.supportsXor ? /XOR\b/iuy : void 0,
-        text: H
+        text: Y
       },
       ...e.operatorKeyword ? [
         {
@@ -26311,18 +26342,18 @@ class WT {
       ] : [],
       {
         type: d.RESERVED_FUNCTION_NAME,
-        regex: Q(e.reservedFunctionNames, e.identChars),
-        text: H
+        regex: k(e.reservedFunctionNames, e.identChars),
+        text: Y
       },
       {
         type: d.RESERVED_DATA_TYPE,
-        regex: Q(e.reservedDataTypes, e.identChars),
-        text: H
+        regex: k(e.reservedDataTypes, e.identChars),
+        text: Y
       },
       {
         type: d.RESERVED_KEYWORD,
-        regex: Q(e.reservedKeywords, e.identChars),
-        text: H
+        regex: k(e.reservedKeywords, e.identChars),
+        text: Y
       }
     ]);
   }
@@ -26394,7 +26425,7 @@ class WT {
       {
         type: d.QUOTED_PARAMETER,
         regex: Et(A.quoted, dE(e.identTypes)),
-        key: (a) => (({ tokenKey: R, quoteChar: S }) => R.replace(new RegExp(K("\\" + S), "gu"), S))({
+        key: (a) => (({ tokenKey: R, quoteChar: S }) => R.replace(new RegExp(x("\\" + S), "gu"), S))({
           tokenKey: a.slice(2, -1),
           quoteChar: a.slice(-1)
         })
@@ -26412,7 +26443,7 @@ class WT {
         var R;
         return {
           type: d.CUSTOM_PARAMETER,
-          regex: Ee(a.regex),
+          regex: ne(a.regex),
           key: (R = a.key) !== null && R !== void 0 ? R : ((S) => S)
         };
       })
@@ -26423,7 +26454,7 @@ class WT {
     return e.filter((t) => !!t.regex);
   }
 }
-const H = (n) => _e(n.toUpperCase()), nE = /* @__PURE__ */ new Map(), vT = (n) => {
+const Y = (n) => _e(n.toUpperCase()), nE = /* @__PURE__ */ new Map(), vT = (n) => {
   let e = nE.get(n);
   return e || (e = XT(n), nE.set(n, e)), e;
 }, XT = (n) => ({
@@ -26440,7 +26471,7 @@ const H = (n) => _e(n.toUpperCase()), nE = /* @__PURE__ */ new Map(), vT = (n) =
 function xT(n) {
   return n.indentStyle === "tabularLeft" || n.indentStyle === "tabularRight" ? " ".repeat(10) : n.useTabs ? "	" : " ".repeat(n.tabWidth);
 }
-function re(n) {
+function Te(n) {
   return n.indentStyle === "tabularLeft" || n.indentStyle === "tabularRight";
 }
 class JT {
@@ -26512,24 +26543,24 @@ function qT() {
                 this.complete(l, 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 D = I[c], u = 0; u < D.length; u++) {
-                  var p = D[u];
-                  this.complete(O, p);
+            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) {
@@ -26585,17 +26616,17 @@ function qT() {
           var O = this.index - this.lastLineBreak, C = String(this.line).length;
           return R += " at line " + this.line + " col " + O + `:
 
-`, R += I.map(function(l, c) {
-            return u(this.line - I.length + c + 1, C) + " " + l;
+`, R += I.map(function(l, _) {
+            return u(this.line - I.length + _ + 1, C) + " " + l;
           }, this).join(`
 `), R += `
 ` + u("", C + O) + `^
 `, R;
         } else
           return R + " at index " + (this.index - 1);
-        function u(l, c) {
-          var D = String(l);
-          return Array(c - D.length + 1).join(" ") + D;
+        function u(l, _) {
+          var U = String(l);
+          return Array(_ - U.length + 1).join(" ") + U;
         }
       };
       function r(a, R, S) {
@@ -26630,10 +26661,10 @@ function qT() {
           this.options.keepHistory || delete this.table[this.current - 1];
           var O = this.current + 1, C = new E(this.grammar, O);
           this.table.push(C);
-          for (var u = S.text !== void 0 ? S.text : S.value, l = R.constructor === i ? S.value : S, c = N.scannable, D = c.length; D--; ) {
-            var p = c[D], m = p.rule.symbols[p.dot];
+          for (var u = S.text !== void 0 ? S.text : S.value, l = R.constructor === i ? S.value : S, _ = N.scannable, U = _.length; U--; ) {
+            var D = _[U], m = D.rule.symbols[D.dot];
             if (m.test ? m.test(l) : m.type ? m.type === S.type : m.literal === u) {
-              var P = p.nextState({ data: l, token: S, isToken: !0, reference: O - 1 });
+              var P = D.nextState({ data: l, token: S, isToken: !0, reference: O - 1 });
               C.states.push(P);
             }
           }
@@ -26667,8 +26698,8 @@ function qT() {
             return this.buildFirstStateStack(u, []) || [u];
           }, this);
           C.forEach(function(u) {
-            var l = u[0], c = l.rule.symbols[l.dot], D = this.getSymbolDisplay(c);
-            S.push("A " + D + " based on:"), this.displayStateStack(u, S);
+            var l = u[0], _ = l.rule.symbols[l.dot], U = this.getSymbolDisplay(_);
+            S.push("A " + U + " based on:"), this.displayStateStack(u, S);
           }, this);
         }
         return S.push(""), S.join(`
@@ -26755,40 +26786,40 @@ const ea = (n, e, t) => {
     const E = ia(t, e);
     if (E && E.type === d.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, n), { type: d.IDENTIFIER, text: n.raw });
-    const s = Ae(t, e);
+    const s = Re(t, e);
     if (s && s.type === d.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, n), { type: d.IDENTIFIER, text: n.raw });
   }
   return n;
 }, ta = (n, e, t) => {
   if (n.type === d.RESERVED_FUNCTION_NAME) {
-    const E = Ae(t, e);
+    const E = Re(t, e);
     if (!E || !PE(E))
       return Object.assign(Object.assign({}, n), { type: d.IDENTIFIER, text: n.raw });
   }
   return n;
 }, Ea = (n, e, t) => {
   if (n.type === d.RESERVED_DATA_TYPE) {
-    const E = Ae(t, e);
+    const E = Re(t, e);
     if (E && PE(E))
       return Object.assign(Object.assign({}, n), { type: d.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return n;
 }, sa = (n, e, t) => {
   if (n.type === d.IDENTIFIER) {
-    const E = Ae(t, e);
+    const E = Re(t, e);
     if (E && pE(E))
       return Object.assign(Object.assign({}, n), { type: d.ARRAY_IDENTIFIER });
   }
   return n;
 }, na = (n, e, t) => {
   if (n.type === d.RESERVED_DATA_TYPE) {
-    const E = Ae(t, e);
+    const E = Re(t, e);
     if (E && pE(E))
       return Object.assign(Object.assign({}, n), { type: d.ARRAY_KEYWORD });
   }
   return n;
-}, ia = (n, e) => Ae(n, e, -1), Ae = (n, e, t = 1) => {
+}, ia = (n, e) => Re(n, e, -1), Re = (n, e, t = 1) => {
   let E = 1;
   for (; n[e + E * t] && ra(n[e + E * t]); )
     E++;
@@ -26814,30 +26845,30 @@ class ME {
     return e in d;
   }
 }
-var U;
+var p;
 (function(n) {
   n.statement = "statement", n.clause = "clause", n.set_operation = "set_operation", n.function_call = "function_call", n.parameterized_data_type = "parameterized_data_type", n.array_subscript = "array_subscript", n.property_access = "property_access", n.parenthesis = "parenthesis", n.between_predicate = "between_predicate", n.case_expression = "case_expression", n.case_when = "case_when", n.case_else = "case_else", n.limit_clause = "limit_clause", n.all_columns_asterisk = "all_columns_asterisk", n.literal = "literal", n.identifier = "identifier", n.keyword = "keyword", n.data_type = "data_type", n.parameter = "parameter", n.operator = "operator", n.comma = "comma", n.line_comment = "line_comment", n.block_comment = "block_comment", n.disable_comment = "disable_comment";
-})(U = U || (U = {}));
+})(p = p || (p = {}));
 function st(n) {
   return n[0];
 }
-const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
-  type: U.keyword,
+const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
+  type: p.keyword,
   tokenType: n.type,
   text: n.text,
   raw: n.raw
 }), rE = (n) => ({
-  type: U.data_type,
+  type: p.data_type,
   text: n.text,
   raw: n.raw
-}), V = (n, { leading: e, trailing: t }) => (e?.length && (n = Object.assign(Object.assign({}, n), { leadingComments: e })), t?.length && (n = Object.assign(Object.assign({}, n), { trailingComments: t })), n), Ta = (n, { leading: e, trailing: t }) => {
+}), w = (n, { leading: e, trailing: t }) => (e?.length && (n = Object.assign(Object.assign({}, n), { leadingComments: e })), t?.length && (n = Object.assign(Object.assign({}, n), { trailingComments: t })), n), Ta = (n, { leading: e, trailing: t }) => {
   if (e?.length) {
     const [E, ...s] = n;
-    n = [V(E, { leading: e }), ...s];
+    n = [w(E, { leading: e }), ...s];
   }
   if (t?.length) {
     const E = n.slice(0, -1), s = n[n.length - 1];
-    n = [...E, V(s, { trailing: t })];
+    n = [...E, w(s, { trailing: t })];
   }
   return n;
 }, aa = {
@@ -26859,7 +26890,7 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "statement",
       symbols: ["expressions_or_clauses", "statement$subexpression$1"],
       postprocess: ([n, [e]]) => ({
-        type: U.statement,
+        type: p.statement,
         children: n,
         hasSemicolon: e.type === d.DELIMITER
       })
@@ -26877,7 +26908,7 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
     { name: "clause$subexpression$1", symbols: ["select_clause"] },
     { name: "clause$subexpression$1", symbols: ["other_clause"] },
     { name: "clause$subexpression$1", symbols: ["set_operation"] },
-    { name: "clause", symbols: ["clause$subexpression$1"], postprocess: ee },
+    { name: "clause", symbols: ["clause$subexpression$1"], postprocess: Ee },
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["free_form_sql"] },
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1$ebnf$1", "free_form_sql"], postprocess: (n) => n[0].concat([n[1]]) },
     { name: "limit_clause$ebnf$1$subexpression$1", symbols: [f.has("COMMA") ? { type: "COMMA" } : COMMA, "limit_clause$ebnf$1$subexpression$1$ebnf$1"] },
@@ -26890,15 +26921,15 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
         if (E) {
           const [s, i] = E;
           return {
-            type: U.limit_clause,
-            limitKw: V(Y(n), { trailing: e }),
+            type: p.limit_clause,
+            limitKw: w($(n), { trailing: e }),
             offset: t,
             count: i
           };
         } else
           return {
-            type: U.limit_clause,
-            limitKw: V(Y(n), { trailing: e }),
+            type: p.limit_clause,
+            limitKw: w($(n), { trailing: e }),
             count: t
           };
       }
@@ -26913,8 +26944,8 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "select_clause",
       symbols: [f.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT, "select_clause$subexpression$1"],
       postprocess: ([n, [e, t]]) => ({
-        type: U.clause,
-        nameKw: Y(n),
+        type: p.clause,
+        nameKw: $(n),
         children: [e, ...t]
       })
     },
@@ -26922,15 +26953,15 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "select_clause",
       symbols: [f.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT],
       postprocess: ([n]) => ({
-        type: U.clause,
-        nameKw: Y(n),
+        type: p.clause,
+        nameKw: $(n),
         children: []
       })
     },
     {
       name: "all_columns_asterisk",
       symbols: [f.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK],
-      postprocess: () => ({ type: U.all_columns_asterisk })
+      postprocess: () => ({ type: p.all_columns_asterisk })
     },
     { name: "other_clause$ebnf$1", symbols: [] },
     { name: "other_clause$ebnf$1", symbols: ["other_clause$ebnf$1", "free_form_sql"], postprocess: (n) => n[0].concat([n[1]]) },
@@ -26938,8 +26969,8 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "other_clause",
       symbols: [f.has("RESERVED_CLAUSE") ? { type: "RESERVED_CLAUSE" } : RESERVED_CLAUSE, "other_clause$ebnf$1"],
       postprocess: ([n, e]) => ({
-        type: U.clause,
-        nameKw: Y(n),
+        type: p.clause,
+        nameKw: $(n),
         children: e
       })
     },
@@ -26949,8 +26980,8 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "set_operation",
       symbols: [f.has("RESERVED_SET_OPERATION") ? { type: "RESERVED_SET_OPERATION" } : RESERVED_SET_OPERATION, "set_operation$ebnf$1"],
       postprocess: ([n, e]) => ({
-        type: U.set_operation,
-        nameKw: Y(n),
+        type: p.set_operation,
+        nameKw: $(n),
         children: e
       })
     },
@@ -26974,37 +27005,37 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
     {
       name: "expression_with_comments_",
       symbols: ["expression", "_"],
-      postprocess: ([n, e]) => V(n, { trailing: e })
+      postprocess: ([n, e]) => w(n, { trailing: e })
     },
     {
       name: "_expression_with_comments",
       symbols: ["_", "expression"],
-      postprocess: ([n, e]) => V(e, { leading: n })
+      postprocess: ([n, e]) => w(e, { leading: n })
     },
     {
       name: "_andless_expression_with_comments",
       symbols: ["_", "andless_expression"],
-      postprocess: ([n, e]) => V(e, { leading: n })
+      postprocess: ([n, e]) => w(e, { leading: n })
     },
     { name: "free_form_sql$subexpression$1", symbols: ["asteriskless_free_form_sql"] },
     { name: "free_form_sql$subexpression$1", symbols: ["asterisk"] },
-    { name: "free_form_sql", symbols: ["free_form_sql$subexpression$1"], postprocess: ee },
+    { name: "free_form_sql", symbols: ["free_form_sql$subexpression$1"], postprocess: Ee },
     { name: "asteriskless_free_form_sql$subexpression$1", symbols: ["asteriskless_andless_expression"] },
     { name: "asteriskless_free_form_sql$subexpression$1", symbols: ["logic_operator"] },
     { name: "asteriskless_free_form_sql$subexpression$1", symbols: ["comma"] },
     { name: "asteriskless_free_form_sql$subexpression$1", symbols: ["comment"] },
     { name: "asteriskless_free_form_sql$subexpression$1", symbols: ["other_keyword"] },
-    { name: "asteriskless_free_form_sql", symbols: ["asteriskless_free_form_sql$subexpression$1"], postprocess: ee },
+    { name: "asteriskless_free_form_sql", symbols: ["asteriskless_free_form_sql$subexpression$1"], postprocess: Ee },
     { name: "expression$subexpression$1", symbols: ["andless_expression"] },
     { name: "expression$subexpression$1", symbols: ["logic_operator"] },
-    { name: "expression", symbols: ["expression$subexpression$1"], postprocess: ee },
+    { name: "expression", symbols: ["expression$subexpression$1"], postprocess: Ee },
     { name: "andless_expression$subexpression$1", symbols: ["asteriskless_andless_expression"] },
     { name: "andless_expression$subexpression$1", symbols: ["asterisk"] },
-    { name: "andless_expression", symbols: ["andless_expression$subexpression$1"], postprocess: ee },
+    { name: "andless_expression", symbols: ["andless_expression$subexpression$1"], postprocess: Ee },
     { name: "asteriskless_andless_expression$subexpression$1", symbols: ["atomic_expression"] },
     { name: "asteriskless_andless_expression$subexpression$1", symbols: ["between_predicate"] },
     { name: "asteriskless_andless_expression$subexpression$1", symbols: ["case_expression"] },
-    { name: "asteriskless_andless_expression", symbols: ["asteriskless_andless_expression$subexpression$1"], postprocess: ee },
+    { name: "asteriskless_andless_expression", symbols: ["asteriskless_andless_expression$subexpression$1"], postprocess: Ee },
     { name: "atomic_expression$subexpression$1", symbols: ["array_subscript"] },
     { name: "atomic_expression$subexpression$1", symbols: ["function_call"] },
     { name: "atomic_expression$subexpression$1", symbols: ["property_access"] },
@@ -27017,13 +27048,13 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
     { name: "atomic_expression$subexpression$1", symbols: ["literal"] },
     { name: "atomic_expression$subexpression$1", symbols: ["data_type"] },
     { name: "atomic_expression$subexpression$1", symbols: ["keyword"] },
-    { name: "atomic_expression", symbols: ["atomic_expression$subexpression$1"], postprocess: ee },
+    { name: "atomic_expression", symbols: ["atomic_expression$subexpression$1"], postprocess: Ee },
     {
       name: "array_subscript",
       symbols: [f.has("ARRAY_IDENTIFIER") ? { type: "ARRAY_IDENTIFIER" } : ARRAY_IDENTIFIER, "_", "square_brackets"],
       postprocess: ([n, e, t]) => ({
-        type: U.array_subscript,
-        array: V({ type: U.identifier, quoted: !1, text: n.text }, { trailing: e }),
+        type: p.array_subscript,
+        array: w({ type: p.identifier, quoted: !1, text: n.text }, { trailing: e }),
         parenthesis: t
       })
     },
@@ -27031,8 +27062,8 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "array_subscript",
       symbols: [f.has("ARRAY_KEYWORD") ? { type: "ARRAY_KEYWORD" } : ARRAY_KEYWORD, "_", "square_brackets"],
       postprocess: ([n, e, t]) => ({
-        type: U.array_subscript,
-        array: V(Y(n), { trailing: e }),
+        type: p.array_subscript,
+        array: w($(n), { trailing: e }),
         parenthesis: t
       })
     },
@@ -27040,8 +27071,8 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "function_call",
       symbols: [f.has("RESERVED_FUNCTION_NAME") ? { type: "RESERVED_FUNCTION_NAME" } : RESERVED_FUNCTION_NAME, "_", "parenthesis"],
       postprocess: ([n, e, t]) => ({
-        type: U.function_call,
-        nameKw: V(Y(n), { trailing: e }),
+        type: p.function_call,
+        nameKw: w($(n), { trailing: e }),
         parenthesis: t
       })
     },
@@ -27049,7 +27080,7 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "parenthesis",
       symbols: [{ literal: "(" }, "expressions_or_clauses", { literal: ")" }],
       postprocess: ([n, e, t]) => ({
-        type: U.parenthesis,
+        type: p.parenthesis,
         children: e,
         openParen: "(",
         closeParen: ")"
@@ -27061,7 +27092,7 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "curly_braces",
       symbols: [{ literal: "{" }, "curly_braces$ebnf$1", { literal: "}" }],
       postprocess: ([n, e, t]) => ({
-        type: U.parenthesis,
+        type: p.parenthesis,
         children: e,
         openParen: "{",
         closeParen: "}"
@@ -27073,7 +27104,7 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "square_brackets",
       symbols: [{ literal: "[" }, "square_brackets$ebnf$1", { literal: "]" }],
       postprocess: ([n, e, t]) => ({
-        type: U.parenthesis,
+        type: p.parenthesis,
         children: e,
         openParen: "[",
         closeParen: "]"
@@ -27092,10 +27123,10 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
         // but we currently can't do that because of another hack that requires
         // %ARRAY_IDENTIFIER on the left side of <array_subscript>.
         ([n, e, t, E, [s]]) => ({
-          type: U.property_access,
-          object: V(n, { trailing: e }),
+          type: p.property_access,
+          object: w(n, { trailing: e }),
           operator: t.text,
-          property: V(s, { leading: E })
+          property: w(s, { leading: E })
         })
       )
     },
@@ -27103,11 +27134,11 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "between_predicate",
       symbols: [f.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", f.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
       postprocess: ([n, e, t, E, s, i, r]) => ({
-        type: U.between_predicate,
-        betweenKw: Y(n),
+        type: p.between_predicate,
+        betweenKw: $(n),
         expr1: Ta(t, { leading: e, trailing: E }),
-        andKw: Y(s),
-        expr2: [V(r, { leading: i })]
+        andKw: $(s),
+        expr2: [w(r, { leading: i })]
       })
     },
     { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: st },
@@ -27118,9 +27149,9 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "case_expression",
       symbols: [f.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", f.has("END") ? { type: "END" } : END],
       postprocess: ([n, e, t, E, s]) => ({
-        type: U.case_expression,
-        caseKw: V(Y(n), { trailing: e }),
-        endKw: Y(s),
+        type: p.case_expression,
+        caseKw: w($(n), { trailing: e }),
+        endKw: $(s),
         expr: t || [],
         clauses: E
       })
@@ -27129,9 +27160,9 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "case_clause",
       symbols: [f.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", f.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
       postprocess: ([n, e, t, E, s, i]) => ({
-        type: U.case_when,
-        whenKw: V(Y(n), { trailing: e }),
-        thenKw: V(Y(E), { trailing: s }),
+        type: p.case_when,
+        whenKw: w($(n), { trailing: e }),
+        thenKw: w($(E), { trailing: s }),
         condition: t,
         result: i
       })
@@ -27140,37 +27171,37 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "case_clause",
       symbols: [f.has("ELSE") ? { type: "ELSE" } : ELSE, "_", "expression_chain_"],
       postprocess: ([n, e, t]) => ({
-        type: U.case_else,
-        elseKw: V(Y(n), { trailing: e }),
+        type: p.case_else,
+        elseKw: w($(n), { trailing: e }),
         result: t
       })
     },
     { name: "comma$subexpression$1", symbols: [f.has("COMMA") ? { type: "COMMA" } : COMMA] },
-    { name: "comma", symbols: ["comma$subexpression$1"], postprocess: ([[n]]) => ({ type: U.comma }) },
+    { name: "comma", symbols: ["comma$subexpression$1"], postprocess: ([[n]]) => ({ type: p.comma }) },
     { name: "asterisk$subexpression$1", symbols: [f.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK] },
-    { name: "asterisk", symbols: ["asterisk$subexpression$1"], postprocess: ([[n]]) => ({ type: U.operator, text: n.text }) },
+    { name: "asterisk", symbols: ["asterisk$subexpression$1"], postprocess: ([[n]]) => ({ type: p.operator, text: n.text }) },
     { name: "operator$subexpression$1", symbols: [f.has("OPERATOR") ? { type: "OPERATOR" } : OPERATOR] },
-    { name: "operator", symbols: ["operator$subexpression$1"], postprocess: ([[n]]) => ({ type: U.operator, text: n.text }) },
+    { name: "operator", symbols: ["operator$subexpression$1"], postprocess: ([[n]]) => ({ type: p.operator, text: n.text }) },
     { name: "identifier$subexpression$1", symbols: [f.has("IDENTIFIER") ? { type: "IDENTIFIER" } : IDENTIFIER] },
     { name: "identifier$subexpression$1", symbols: [f.has("QUOTED_IDENTIFIER") ? { type: "QUOTED_IDENTIFIER" } : QUOTED_IDENTIFIER] },
     { name: "identifier$subexpression$1", symbols: [f.has("VARIABLE") ? { type: "VARIABLE" } : VARIABLE] },
-    { name: "identifier", symbols: ["identifier$subexpression$1"], postprocess: ([[n]]) => ({ type: U.identifier, quoted: n.type !== "IDENTIFIER", text: n.text }) },
+    { name: "identifier", symbols: ["identifier$subexpression$1"], postprocess: ([[n]]) => ({ type: p.identifier, quoted: n.type !== "IDENTIFIER", text: n.text }) },
     { name: "parameter$subexpression$1", symbols: [f.has("NAMED_PARAMETER") ? { type: "NAMED_PARAMETER" } : NAMED_PARAMETER] },
     { name: "parameter$subexpression$1", symbols: [f.has("QUOTED_PARAMETER") ? { type: "QUOTED_PARAMETER" } : QUOTED_PARAMETER] },
     { name: "parameter$subexpression$1", symbols: [f.has("NUMBERED_PARAMETER") ? { type: "NUMBERED_PARAMETER" } : NUMBERED_PARAMETER] },
     { name: "parameter$subexpression$1", symbols: [f.has("POSITIONAL_PARAMETER") ? { type: "POSITIONAL_PARAMETER" } : POSITIONAL_PARAMETER] },
     { name: "parameter$subexpression$1", symbols: [f.has("CUSTOM_PARAMETER") ? { type: "CUSTOM_PARAMETER" } : CUSTOM_PARAMETER] },
-    { name: "parameter", symbols: ["parameter$subexpression$1"], postprocess: ([[n]]) => ({ type: U.parameter, key: n.key, text: n.text }) },
+    { name: "parameter", symbols: ["parameter$subexpression$1"], postprocess: ([[n]]) => ({ type: p.parameter, key: n.key, text: n.text }) },
     { name: "literal$subexpression$1", symbols: [f.has("NUMBER") ? { type: "NUMBER" } : NUMBER] },
     { name: "literal$subexpression$1", symbols: [f.has("STRING") ? { type: "STRING" } : STRING] },
-    { name: "literal", symbols: ["literal$subexpression$1"], postprocess: ([[n]]) => ({ type: U.literal, text: n.text }) },
+    { name: "literal", symbols: ["literal$subexpression$1"], postprocess: ([[n]]) => ({ type: p.literal, text: n.text }) },
     { name: "keyword$subexpression$1", symbols: [f.has("RESERVED_KEYWORD") ? { type: "RESERVED_KEYWORD" } : RESERVED_KEYWORD] },
     { name: "keyword$subexpression$1", symbols: [f.has("RESERVED_KEYWORD_PHRASE") ? { type: "RESERVED_KEYWORD_PHRASE" } : RESERVED_KEYWORD_PHRASE] },
     { name: "keyword$subexpression$1", symbols: [f.has("RESERVED_JOIN") ? { type: "RESERVED_JOIN" } : RESERVED_JOIN] },
     {
       name: "keyword",
       symbols: ["keyword$subexpression$1"],
-      postprocess: ([[n]]) => Y(n)
+      postprocess: ([[n]]) => $(n)
     },
     { name: "data_type$subexpression$1", symbols: [f.has("RESERVED_DATA_TYPE") ? { type: "RESERVED_DATA_TYPE" } : RESERVED_DATA_TYPE] },
     { name: "data_type$subexpression$1", symbols: [f.has("RESERVED_DATA_TYPE_PHRASE") ? { type: "RESERVED_DATA_TYPE_PHRASE" } : RESERVED_DATA_TYPE_PHRASE] },
@@ -27183,8 +27214,8 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "data_type",
       symbols: [f.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
       postprocess: ([n, e, t]) => ({
-        type: U.parameterized_data_type,
-        dataType: V(rE(n), { trailing: e }),
+        type: p.parameterized_data_type,
+        dataType: w(rE(n), { trailing: e }),
         parenthesis: t
       })
     },
@@ -27194,7 +27225,7 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
     {
       name: "logic_operator",
       symbols: ["logic_operator$subexpression$1"],
-      postprocess: ([[n]]) => Y(n)
+      postprocess: ([[n]]) => $(n)
     },
     { name: "other_keyword$subexpression$1", symbols: [f.has("WHEN") ? { type: "WHEN" } : WHEN] },
     { name: "other_keyword$subexpression$1", symbols: [f.has("THEN") ? { type: "THEN" } : THEN] },
@@ -27203,7 +27234,7 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
     {
       name: "other_keyword",
       symbols: ["other_keyword$subexpression$1"],
-      postprocess: ([[n]]) => Y(n)
+      postprocess: ([[n]]) => $(n)
     },
     { name: "_$ebnf$1", symbols: [] },
     { name: "_$ebnf$1", symbols: ["_$ebnf$1", "comment"], postprocess: (n) => n[0].concat([n[1]]) },
@@ -27212,7 +27243,7 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "comment",
       symbols: [f.has("LINE_COMMENT") ? { type: "LINE_COMMENT" } : LINE_COMMENT],
       postprocess: ([n]) => ({
-        type: U.line_comment,
+        type: p.line_comment,
         text: n.text,
         precedingWhitespace: n.precedingWhitespace
       })
@@ -27221,7 +27252,7 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "comment",
       symbols: [f.has("BLOCK_COMMENT") ? { type: "BLOCK_COMMENT" } : BLOCK_COMMENT],
       postprocess: ([n]) => ({
-        type: U.block_comment,
+        type: p.block_comment,
         text: n.text,
         precedingWhitespace: n.precedingWhitespace
       })
@@ -27230,7 +27261,7 @@ const f = new ME((n) => []), ee = ([[n]]) => n, Y = (n) => ({
       name: "comment",
       symbols: [f.has("DISABLE_COMMENT") ? { type: "DISABLE_COMMENT" } : DISABLE_COMMENT],
       postprocess: ([n]) => ({
-        type: U.disable_comment,
+        type: p.disable_comment,
         text: n.text,
         precedingWhitespace: n.precedingWhitespace
       })
@@ -27255,10 +27286,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 UE {
   constructor(e) {
     this.indentation = e, this.items = [];
@@ -27269,46 +27300,46 @@ class UE {
   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);
       }
   }
   trimHorizontalWhitespace() {
-    for (; Sa(Se(this.items)); )
+    for (; Sa(Ie(this.items)); )
       this.items.pop();
   }
   trimWhitespace() {
-    for (; Ia(Se(this.items)); )
+    for (; Ia(Ie(this.items)); )
       this.items.pop();
   }
   addNewline(e) {
     if (this.items.length > 0)
-      switch (Se(this.items)) {
-        case _.NEWLINE:
+      switch (Ie(this.items)) {
+        case c.NEWLINE:
           this.items.pop(), this.items.push(e);
           break;
-        case _.MANDATORY_NEWLINE:
+        case c.MANDATORY_NEWLINE:
           break;
         default:
           this.items.push(e);
@@ -27317,7 +27348,7 @@ class UE {
   }
   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.
@@ -27333,20 +27364,20 @@ class UE {
   }
   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 Sa = (n) => n === _.SPACE || n === _.SINGLE_INDENT, Ia = (n) => n === _.SPACE || n === _.SINGLE_INDENT || n === _.NEWLINE;
+const Sa = (n) => n === c.SPACE || n === c.SINGLE_INDENT, Ia = (n) => n === c.SPACE || n === c.SINGLE_INDENT || n === c.NEWLINE;
 function TE(n, e) {
   if (e === "standard")
     return n;
@@ -27393,7 +27424,7 @@ class fE {
    * Does nothing when the previous indent is not top-level.
    */
   decreaseTopLevel() {
-    this.indentTypes.length > 0 && Se(this.indentTypes) === nt && this.indentTypes.pop();
+    this.indentTypes.length > 0 && Ie(this.indentTypes) === nt && this.indentTypes.pop();
   }
   /**
    * Decreases indentation by one block-level indent.
@@ -27418,9 +27449,9 @@ class Oa extends UE {
     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 At();
-      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--);
     }
   }
 }
@@ -27440,51 +27471,51 @@ class Pe {
   }
   formatNodeWithoutComments(e) {
     switch (e.type) {
-      case U.function_call:
+      case p.function_call:
         return this.formatFunctionCall(e);
-      case U.parameterized_data_type:
+      case p.parameterized_data_type:
         return this.formatParameterizedDataType(e);
-      case U.array_subscript:
+      case p.array_subscript:
         return this.formatArraySubscript(e);
-      case U.property_access:
+      case p.property_access:
         return this.formatPropertyAccess(e);
-      case U.parenthesis:
+      case p.parenthesis:
         return this.formatParenthesis(e);
-      case U.between_predicate:
+      case p.between_predicate:
         return this.formatBetweenPredicate(e);
-      case U.case_expression:
+      case p.case_expression:
         return this.formatCaseExpression(e);
-      case U.case_when:
+      case p.case_when:
         return this.formatCaseWhen(e);
-      case U.case_else:
+      case p.case_else:
         return this.formatCaseElse(e);
-      case U.clause:
+      case p.clause:
         return this.formatClause(e);
-      case U.set_operation:
+      case p.set_operation:
         return this.formatSetOperation(e);
-      case U.limit_clause:
+      case p.limit_clause:
         return this.formatLimitClause(e);
-      case U.all_columns_asterisk:
+      case p.all_columns_asterisk:
         return this.formatAllColumnsAsterisk(e);
-      case U.literal:
+      case p.literal:
         return this.formatLiteral(e);
-      case U.identifier:
+      case p.identifier:
         return this.formatIdentifier(e);
-      case U.parameter:
+      case p.parameter:
         return this.formatParameter(e);
-      case U.operator:
+      case p.operator:
         return this.formatOperator(e);
-      case U.comma:
+      case p.comma:
         return this.formatComma(e);
-      case U.line_comment:
+      case p.line_comment:
         return this.formatLineComment(e);
-      case U.block_comment:
+      case p.block_comment:
         return this.formatBlockComment(e);
-      case U.disable_comment:
+      case p.disable_comment:
         return this.formatBlockComment(e);
-      case U.data_type:
+      case p.data_type:
         return this.formatDataType(e);
-      case U.keyword:
+      case p.keyword:
         return this.formatKeywordNode(e);
     }
   }
@@ -27501,10 +27532,10 @@ class Pe {
   formatArraySubscript(e) {
     let t;
     switch (e.array.type) {
-      case U.data_type:
+      case p.data_type:
         t = this.showDataType(e.array);
         break;
-      case U.keyword:
+      case p.keyword:
         t = this.showKw(e.array);
         break;
       default:
@@ -27516,80 +27547,80 @@ 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), re(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), Te(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) : re(this.cfg) ? this.formatClauseInTabularStyle(e) : this.formatClauseInIndentedStyle(e);
+    this.isOnelineClause(e) ? this.formatClauseInOnelineStyle(e) : Te(this.cfg) ? this.formatClauseInTabularStyle(e) : this.formatClauseInIndentedStyle(e);
   }
   isOnelineClause(e) {
-    return re(this.cfg) ? this.dialectCfg.tabularOnelineClauses[e.nameKw.text] : this.dialectCfg.onelineClauses[e.nameKw.text];
+    return Te(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(), re(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(), Te(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);
   }
   formatComments(e) {
     e && e.forEach((t) => {
-      t.type === U.line_comment ? this.formatLineComment(t) : this.formatBlockComment(t);
+      t.type === p.line_comment ? this.formatLineComment(t) : this.formatBlockComment(t);
     });
   }
   formatLineComment(e) {
-    tt(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);
+    tt(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 === U.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);
+    e.type === p.block_comment && this.isMultilineBlockComment(e) ? (this.splitBlockComment(e.text).forEach((t) => {
+      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 tt(e.text) || tt(e.precedingWhitespace || "");
@@ -27600,7 +27631,7 @@ class Pe {
       // first line starts with /* or /**
       /^\/\*\*?$/.test(t[0]) && // intermediate lines start with *
       t.slice(1, t.length - 1).every((E) => /^\s*\*/.test(E)) && // last line ends with */
-      /^\s*\*\/$/.test(Se(t))
+      /^\s*\*\/$/.test(Ie(t))
     );
   }
   // Breaks up block comment to multiple lines.
@@ -27673,16 +27704,16 @@ class Pe {
     }
   }
   formatJoin(e) {
-    re(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);
+    Te(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" ? re(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" ? Te(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 aE(e.tokenType) ? TE(this.showNonTabularKw(e), this.cfg.indentStyle) : this.showNonTabularKw(e);
@@ -27762,7 +27793,7 @@ class Ca {
       params: this.params,
       layout: new UE(new fE(xT(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 {
@@ -27846,7 +27877,7 @@ const hE = {
   const s = la(Object.assign(Object.assign({}, da), E));
   return new Ca(vT(t), s).format(n);
 };
-function Re(n, e) {
+function Se(n, e) {
   try {
     return Da(n, {
       language: {
@@ -27907,7 +27938,7 @@ class Nt {
    * Validates calculated measures during registration
    */
   registerCube(e) {
-    e.meta && console.log(`[DEBUG] registerCube: ${e.name} has meta:`, JSON.stringify(e.meta)), this.validateCalculatedMeasures(e), new te(this.cubes).populateDependencies(e), this.cubes.set(e.name, e), this.invalidateMetadataCache();
+    e.meta && console.log(`[DEBUG] registerCube: ${e.name} has meta:`, JSON.stringify(e.meta)), this.validateCalculatedMeasures(e), new se(this.cubes).populateDependencies(e), this.cubes.set(e.name, e), this.invalidateMetadataCache();
   }
   /**
    * Validate calculated measures in a cube
@@ -27932,7 +27963,7 @@ class Nt {
         }
         const r = new Map(this.cubes);
         r.set(e.name, e);
-        const T = new te(r);
+        const T = new se(r);
         try {
           T.validateDependencies(e);
         } catch (A) {
@@ -27942,7 +27973,7 @@ class Nt {
     if (t.length === 0) {
       const E = new Map(this.cubes);
       E.set(e.name, e);
-      const s = new te(E);
+      const s = new se(E);
       s.buildGraph(e);
       const i = s.detectCycle();
       i && t.push(
@@ -27981,7 +28012,7 @@ ${t.join(`
   async execute(e, t, E) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new z(this.dbExecutor, this.cacheConfig).execute(this.cubes, e, t, E);
+    return new te(this.dbExecutor, this.cacheConfig).execute(this.cubes, e, t, E);
   }
   /**
    * Execute a multi-cube query
@@ -28118,9 +28149,9 @@ ${t.join(`
       throw new Error(`Cube '${e}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const r = await new z(this.dbExecutor).generateSQL(s, t, E), T = this.dbExecutor.getEngineType();
+    const r = await new te(this.dbExecutor).generateSQL(s, t, E), T = this.dbExecutor.getEngineType();
     return {
-      sql: Re(r.sql, T),
+      sql: Se(r.sql, T),
       params: r.params
     };
   }
@@ -28130,9 +28161,9 @@ ${t.join(`
   async generateMultiCubeSQL(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const s = await new z(this.dbExecutor).generateMultiCubeSQL(this.cubes, e, t), i = this.dbExecutor.getEngineType();
+    const s = await new te(this.dbExecutor).generateMultiCubeSQL(this.cubes, e, t), i = this.dbExecutor.getEngineType();
     return {
-      sql: Re(s.sql, i),
+      sql: Se(s.sql, i),
       params: s.params
     };
   }
@@ -28143,9 +28174,9 @@ ${t.join(`
   async dryRunFunnel(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const s = await new z(this.dbExecutor).dryRunFunnel(this.cubes, e, t), i = this.dbExecutor.getEngineType();
+    const s = await new te(this.dbExecutor).dryRunFunnel(this.cubes, e, t), i = this.dbExecutor.getEngineType();
     return {
-      sql: Re(s.sql, i),
+      sql: Se(s.sql, i),
       params: s.params
     };
   }
@@ -28156,9 +28187,9 @@ ${t.join(`
   async dryRunFlow(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const s = await new z(this.dbExecutor).dryRunFlow(this.cubes, e, t), i = this.dbExecutor.getEngineType();
+    const s = await new te(this.dbExecutor).dryRunFlow(this.cubes, e, t), i = this.dbExecutor.getEngineType();
     return {
-      sql: Re(s.sql, i),
+      sql: Se(s.sql, i),
       params: s.params
     };
   }
@@ -28169,9 +28200,9 @@ ${t.join(`
   async dryRunRetention(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const s = await new z(this.dbExecutor).dryRunRetention(this.cubes, e, t), i = this.dbExecutor.getEngineType();
+    const s = await new te(this.dbExecutor).dryRunRetention(this.cubes, e, t), i = this.dbExecutor.getEngineType();
     return {
-      sql: Re(s.sql, i),
+      sql: Se(s.sql, i),
       params: s.params
     };
   }
@@ -28183,7 +28214,7 @@ ${t.join(`
   async explainQuery(e, t, E) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new z(this.dbExecutor).explainQuery(this.cubes, e, t, E);
+    return new te(this.dbExecutor).explainQuery(this.cubes, e, t, E);
   }
   /**
    * Check if a cube exists
@@ -29148,7 +29179,7 @@ function ga(n, e) {
       );
   return t[e.length][n.length];
 }
-function w(n, e) {
+function v(n, e) {
   const t = n.toLowerCase().trim(), E = e.toLowerCase().trim();
   if (t === E) return 1;
   if (E.includes(t)) return 0.9;
@@ -29163,7 +29194,7 @@ function w(n, e) {
 function pe(n, e) {
   let t = 0;
   for (const E of e) {
-    const s = w(n, E);
+    const s = v(n, E);
     s > t && (t = s);
   }
   return t;
@@ -29266,22 +29297,22 @@ function ya(n, e) {
   let t = 0;
   const E = [], s = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map();
   for (const a of e) {
-    const R = w(a, n.name);
+    const R = v(a, n.name);
     R > 0.5 && (t += R * 2, E.includes("name") || E.push("name"));
-    const S = w(a, n.title);
+    const S = v(a, n.title);
     if (S > 0.5 && (t += S * 1.5, E.includes("title") || E.push("title")), n.description) {
-      const I = w(a, n.description);
+      const I = v(a, n.description);
       I > 0.3 && (t += I, E.includes("description") || E.push("description"));
     }
     if (n.exampleQuestions)
       for (const I of n.exampleQuestions) {
-        const N = w(a, I);
+        const N = v(a, I);
         N > 0.3 && (t += N * 1.5, E.includes("exampleQuestions") || E.push("exampleQuestions"));
       }
     for (const I of n.measures) {
       let N = 0;
       const O = I.name.split(".").pop() || I.name;
-      if (N = Math.max(N, w(a, O)), N = Math.max(N, w(a, I.title)), I.description && (N = Math.max(N, w(a, I.description) * 0.8)), I.synonyms && (N = Math.max(N, pe(a, I.synonyms))), N > 0.4) {
+      if (N = Math.max(N, v(a, O)), N = Math.max(N, v(a, I.title)), I.description && (N = Math.max(N, v(a, I.description) * 0.8)), I.synonyms && (N = Math.max(N, pe(a, I.synonyms))), N > 0.4) {
         t += N, E.includes("measures") || E.push("measures");
         const C = s.get(I.name) || 0;
         s.set(I.name, Math.max(C, N));
@@ -29290,7 +29321,7 @@ function ya(n, e) {
     for (const I of n.dimensions) {
       let N = 0;
       const O = I.name.split(".").pop() || I.name;
-      if (N = Math.max(N, w(a, O)), N = Math.max(N, w(a, I.title)), I.description && (N = Math.max(N, w(a, I.description) * 0.8)), I.synonyms && (N = Math.max(N, pe(a, I.synonyms))), N > 0.4) {
+      if (N = Math.max(N, v(a, O)), N = Math.max(N, v(a, I.title)), I.description && (N = Math.max(N, v(a, I.description) * 0.8)), I.synonyms && (N = Math.max(N, pe(a, I.synonyms))), N > 0.4) {
         t += N, E.includes("dimensions") || E.push("dimensions");
         const C = i.get(I.name) || 0;
         i.set(I.name, Math.max(C, N));
@@ -29415,14 +29446,14 @@ function Ot(n, e, t) {
     if (!t || t === "measure")
       for (const i of s.measures) {
         const r = i.name.split(".").pop() || i.name;
-        let T = w(e, r);
-        T = Math.max(T, w(e, i.title)), i.synonyms && (T = Math.max(T, pe(e, i.synonyms))), T > 0.5 && (!E || T > E.score) && (E = { field: i.name, cube: s.name, score: T, type: "measure" });
+        let T = v(e, r);
+        T = Math.max(T, v(e, i.title)), i.synonyms && (T = Math.max(T, pe(e, i.synonyms))), T > 0.5 && (!E || T > E.score) && (E = { field: i.name, cube: s.name, score: T, type: "measure" });
       }
     if (!t || t === "dimension")
       for (const i of s.dimensions) {
         const r = i.name.split(".").pop() || i.name;
-        let T = w(e, r);
-        T = Math.max(T, w(e, i.title)), i.synonyms && (T = Math.max(T, pe(e, i.synonyms))), T > 0.5 && (!E || T > E.score) && (E = { field: i.name, cube: s.name, score: T, type: "dimension" });
+        let T = v(e, r);
+        T = Math.max(T, v(e, i.title)), i.synonyms && (T = Math.max(T, pe(e, i.synonyms))), T > 0.5 && (!E || T > E.score) && (E = { field: i.name, cube: s.name, score: T, type: "dimension" });
       }
   }
   return E;
@@ -29645,7 +29676,7 @@ function so(n, e, t) {
     const u = n.find((l) => l.name === t);
     u ? (T = [u], E.push(`Using specified cube: ${t}`)) : (s.push(`Specified cube '${t}' not found`), T = []);
   } else
-    T = ba(n, { intent: e, limit: 3 }).map((l) => n.find((c) => c.name === l.cube)).filter((l) => l !== void 0), T.length > 0 && E.push(`Identified relevant cubes: ${T.map((l) => l.name).join(", ")}`);
+    T = ba(n, { intent: e, limit: 3 }).map((l) => n.find((_) => _.name === l.cube)).filter((l) => l !== void 0), T.length > 0 && E.push(`Identified relevant cubes: ${T.map((l) => l.name).join(", ")}`);
   if (T.length === 0) {
     const u = r !== "query", l = u ? SE(r, void 0) : void 0;
     return {
@@ -29663,14 +29694,14 @@ function so(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((D) => D.toLowerCase())
+      ...(u.synonyms || []).map((U) => U.toLowerCase())
     ];
-    for (const D of c)
-      if (I.includes(D)) {
-        S.push(u.name), E.push(`Matched measure '${u.name}' via keyword '${D}'`), a += 0.15;
+    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;
       }
   }
@@ -29680,7 +29711,7 @@ function so(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 l = A.measures.find(
-        (c) => c.type === "count" || c.type === "countDistinct"
+        (_) => _.type === "count" || _.type === "countDistinct"
       );
       l && (S.push(l.name), E.push(`Suggested ${l.name} for counting`));
     }
@@ -29693,13 +29724,13 @@ function so(n, e, t) {
   }
   for (const u of T)
     for (const l of u.dimensions) {
-      const D = [
+      const U = [
         (l.name.split(".").pop() || l.name).toLowerCase(),
         l.title.toLowerCase(),
-        ...(l.synonyms || []).map((p) => p.toLowerCase())
+        ...(l.synonyms || []).map((D) => D.toLowerCase())
       ];
-      for (const p of D)
-        if (I.includes(p) && !O.includes(l.name) && (I.includes(`by ${p}`) || I.includes(`per ${p}`))) {
+      for (const D of U)
+        if (I.includes(D) && !O.includes(l.name) && (I.includes(`by ${D}`) || I.includes(`per ${D}`))) {
           O.push(l.name), E.push(`Matched dimension '${l.name}' as grouping`), a += 0.1;
           break;
         }
@@ -29754,7 +29785,7 @@ function $a(n, e) {
       );
   return t[e.length][n.length];
 }
-function oe(n, e) {
+function Ae(n, e) {
   let t = null;
   for (const E of e) {
     const s = $a(n.toLowerCase(), E.toLowerCase());
@@ -29774,7 +29805,7 @@ function wa(n, e, t, E) {
   }
   const [i, r] = s, T = e.find((a) => a.name === i);
   if (!T) {
-    const a = e.map((S) => S.name), R = oe(i, a);
+    const a = e.map((S) => S.name), R = Ae(i, a);
     R ? (t.push({
       type: "cube_not_found",
       message: `Cube '${i}' not found`,
@@ -29800,7 +29831,7 @@ function wa(n, e, t, E) {
         correctedValue: a.field
       }), E.set(n, a.field);
     else {
-      const R = T.measures.map((I) => I.name.split(".").pop()), S = oe(r, R);
+      const R = T.measures.map((I) => I.name.split(".").pop()), S = Ae(r, R);
       if (S) {
         const I = `${i}.${S.field}`;
         t.push({
@@ -29820,7 +29851,7 @@ function wa(n, e, t, E) {
     }
   }
 }
-function k(n, e, t, E) {
+function q(n, e, t, E) {
   const s = n.split(".");
   if (s.length !== 2) {
     t.push({
@@ -29832,7 +29863,7 @@ function k(n, e, t, E) {
   }
   const [i, r] = s, T = e.find((a) => a.name === i);
   if (!T) {
-    const a = e.map((S) => S.name), R = oe(i, a);
+    const a = e.map((S) => S.name), R = Ae(i, a);
     R ? (t.push({
       type: "cube_not_found",
       message: `Cube '${i}' not found`,
@@ -29858,7 +29889,7 @@ function k(n, e, t, E) {
         correctedValue: a.field
       }), E.set(n, a.field);
     else {
-      const R = T.dimensions.map((I) => I.name.split(".").pop()), S = oe(r, R);
+      const R = T.dimensions.map((I) => I.name.split(".").pop()), S = Ae(r, R);
       if (S) {
         const I = `${i}.${S.field}`;
         t.push({
@@ -29900,7 +29931,7 @@ function Me(n, e, t, E) {
       }
       const [T, A] = r, a = e.find((I) => I.name === T);
       if (!a) {
-        const I = e.map((O) => O.name), N = oe(T, I);
+        const I = e.map((O) => O.name), N = Ae(T, I);
         N && E.set(i, `${N.field}.${A}`), t.push({
           type: "cube_not_found",
           message: `Cube '${T}' not found in filter`,
@@ -29915,7 +29946,7 @@ function Me(n, e, t, E) {
         const I = [
           ...a.dimensions.map((O) => O.name.split(".").pop()),
           ...a.measures.map((O) => O.name.split(".").pop())
-        ], N = oe(A, I);
+        ], N = Ae(A, I);
         if (N) {
           const O = `${T}.${N.field}`;
           E.set(i, O), t.push({
@@ -29938,10 +29969,10 @@ function Me(n, e, t, E) {
 function Wa(n, e, t, E, s) {
   const i = n.funnel;
   if (i)
-    if (i.bindingKey ? typeof i.bindingKey == "string" && k(i.bindingKey, e, t, s) : t.push({
+    if (i.bindingKey ? typeof i.bindingKey == "string" && q(i.bindingKey, e, t, s) : t.push({
       type: "syntax_error",
       message: "funnel.bindingKey is required"
-    }), i.timeDimension ? typeof i.timeDimension == "string" && k(i.timeDimension, e, t, s) : t.push({
+    }), i.timeDimension ? typeof i.timeDimension == "string" && q(i.timeDimension, e, t, s) : t.push({
       type: "syntax_error",
       message: "funnel.timeDimension is required"
     }), !i.steps || !Array.isArray(i.steps))
@@ -29966,13 +29997,13 @@ function Wa(n, e, t, E, s) {
 }
 function va(n, e, t, E, s) {
   const i = n.flow;
-  i && (i.bindingKey ? typeof i.bindingKey == "string" && k(i.bindingKey, e, t, s) : t.push({
+  i && (i.bindingKey ? typeof i.bindingKey == "string" && q(i.bindingKey, e, t, s) : t.push({
     type: "syntax_error",
     message: "flow.bindingKey is required"
-  }), i.timeDimension ? typeof i.timeDimension == "string" && k(i.timeDimension, e, t, s) : t.push({
+  }), i.timeDimension ? typeof i.timeDimension == "string" && q(i.timeDimension, e, t, s) : t.push({
     type: "syntax_error",
     message: "flow.timeDimension is required"
-  }), i.eventDimension ? typeof i.eventDimension == "string" && k(i.eventDimension, e, t, s) : t.push({
+  }), i.eventDimension ? typeof i.eventDimension == "string" && q(i.eventDimension, e, t, s) : t.push({
     type: "syntax_error",
     message: "flow.eventDimension is required"
   }), i.stepsBefore === void 0 && i.stepsAfter === void 0 && E.push({
@@ -29983,10 +30014,10 @@ function va(n, e, t, E, s) {
 }
 function Xa(n, e, t, E, s) {
   const i = n.retention;
-  i && (i.bindingKey ? typeof i.bindingKey == "string" && k(i.bindingKey, e, t, s) : t.push({
+  i && (i.bindingKey ? typeof i.bindingKey == "string" && q(i.bindingKey, e, t, s) : t.push({
     type: "syntax_error",
     message: "retention.bindingKey is required"
-  }), i.timeDimension ? typeof i.timeDimension == "string" && k(i.timeDimension, e, t, s) : t.push({
+  }), i.timeDimension ? typeof i.timeDimension == "string" && q(i.timeDimension, e, t, s) : t.push({
     type: "syntax_error",
     message: "retention.timeDimension is required"
   }), i.granularity || E.push({
@@ -30028,10 +30059,10 @@ function no(n, e) {
       wa(r, e, t, s);
   if (n.dimensions)
     for (const r of n.dimensions)
-      k(r, e, t, s);
+      q(r, e, t, s);
   if (n.timeDimensions)
     for (const r of n.timeDimensions) {
-      k(r.dimension, e, t, s);
+      q(r.dimension, e, t, s);
       const [T] = r.dimension.split("."), A = e.find((a) => a.name === T);
       if (A) {
         const a = A.dimensions.find((R) => R.name === r.dimension);
@@ -30084,7 +30115,7 @@ export {
   NE as MySQLExecutor,
   JE as PostgresExecutor,
   ls as QueryBuilder,
-  z as QueryExecutor,
+  te as QueryExecutor,
   CE as QueryPlanner,
   zE as SQLiteExecutor,
   pa as STEP0_VALIDATION_PROMPT,
@@ -30115,7 +30146,7 @@ export {
   Qa as getCubeInvalidationPattern,
   Tt as getJoinType,
   os as normalizeQuery,
-  J as resolveCubeReference,
-  F as resolveSqlExpression,
+  Q as resolveCubeReference,
+  b as resolveSqlExpression,
   so as suggestQuery
 };