drizzle-cube 0.2.13 → 0.2.15

package/dist/server/index.js

@@ -1,4 +1,4 @@
-import { sql as _, eq as x, and as F, StringChunk as vT, count as SE, sum as f, max as j, min as q, countDistinct as QT, SQL as ZT, or as IE, arrayContained as jT, arrayOverlaps as qT, arrayContains as kT, isNotNull as gE, ne as KE, isNull as $E, notInArray as wE, inArray as OE, lt as NE, gt as tE, gte as K, lte as $, desc as zT, asc as JE } from "drizzle-orm";
+import { sql as _, eq as x, and as F, StringChunk as vT, count as IE, sum as f, max as q, min as k, countDistinct as QT, SQL as ZT, or as NE, arrayContained as jT, arrayOverlaps as qT, arrayContains as kT, isNotNull as gE, ne as KE, isNull as $E, notInArray as wE, inArray as OE, lt as tE, gt as sE, gte as K, lte as $, desc as zT, asc as JE } from "drizzle-orm";
 class WE {
   /**
    * Default implementation returns template unchanged
@@ -149,7 +149,7 @@ class Ee extends WE {
     return E;
   }
 }
-class BT extends WE {
+class mT extends WE {
   getEngineType() {
     return "mysql";
   }
@@ -431,7 +431,7 @@ class Te extends WE {
     return E;
   }
 }
-class ee extends BT {
+class ee extends mT {
   getEngineType() {
     return "singlestore";
   }
@@ -449,7 +449,7 @@ function Re(e) {
     case "postgres":
       return new Ee();
     case "mysql":
-      return new BT();
+      return new mT();
     case "sqlite":
       return new Te();
     case "singlestore":
@@ -520,7 +520,7 @@ class Ae extends bE {
 function xE(e, E) {
   return new Ae(e, E, "postgres");
 }
-class mT extends bE {
+class BT extends bE {
   async execute(E, T) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const A = await E.execute();
@@ -559,7 +559,7 @@ class mT extends bE {
   }
 }
 function Se(e, E) {
-  return new mT(e, E, "mysql");
+  return new BT(e, E, "mysql");
 }
 class Ie extends bE {
   async execute(E, T) {
@@ -610,7 +610,7 @@ class Ie extends bE {
 function vE(e, E) {
   return new Ie(e, E, "sqlite");
 }
-class Oe extends mT {
+class Ne extends BT {
   getEngineType() {
     return "singlestore";
   }
@@ -618,8 +618,8 @@ class Oe extends mT {
   // For now, we inherit all behavior from MySQLExecutor since
   // SingleStore is largely MySQL-compatible
 }
-function Ne(e, E) {
-  return new Oe(e, E);
+function Oe(e, E) {
+  return new Ne(e, E);
 }
 function QE(e, E, T) {
   if (T)
@@ -631,7 +631,7 @@ function QE(e, E, T) {
       case "sqlite":
         return vE(e, E);
       case "singlestore":
-        return Ne(e, E);
+        return Oe(e, E);
     }
   if (e.all && e.run)
     return vE(e, E);
@@ -639,7 +639,7 @@ function QE(e, E, T) {
     return xE(e, E);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
-function sE(e) {
+function j(e) {
   return typeof e == "function" ? e() : e;
 }
 function fE(e, E) {
@@ -668,14 +668,14 @@ function b(e, E) {
   const T = typeof e == "function" ? e(E) : e;
   return te(T);
 }
-function tO(e, E, T) {
+function tN(e, E, T) {
   return {
     ...e,
     cubes: E,
     currentCube: T
   };
 }
-function sO(e, E) {
+function sN(e, E) {
   return {
     name: e,
     ...E
@@ -685,30 +685,30 @@ function se(e, E) {
   if (e.relationship !== "belongsToMany" || !e.through)
     throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
   const { table: T, sourceKey: R, targetKey: A, securitySql: S } = e.through, I = [];
-  for (const N of R) {
-    const C = N.as || x;
-    I.push(C(N.source, N.target));
+  for (const O of R) {
+    const C = O.as || x;
+    I.push(C(O.source, O.target));
   }
   const t = [];
-  for (const N of A) {
-    const C = N.as || x;
-    t.push(C(N.source, N.target));
+  for (const O of A) {
+    const C = O.as || x;
+    t.push(C(O.source, O.target));
   }
   let s;
   if (S) {
-    const N = S(E);
-    s = Array.isArray(N) ? N : [N];
+    const O = S(E);
+    s = Array.isArray(O) ? O : [O];
   }
-  const O = fE("belongsToMany", e.sqlJoinType);
+  const N = fE("belongsToMany", e.sqlJoinType);
   return {
     junctionJoins: [
       {
-        joinType: O,
+        joinType: N,
         table: T,
         condition: F(...I)
       },
       {
-        joinType: O,
+        joinType: N,
         table: T,
         // This will be replaced with target cube table in query planner
         condition: F(...t)
@@ -760,8 +760,8 @@ class X {
       if (R.type === "calculated" && R.calculatedSql) {
         const A = `${E.name}.${T}`, S = this.extractDependencies(R.calculatedSql), I = /* @__PURE__ */ new Set();
         for (const t of S) {
-          const O = `${t.cubeName || E.name}.${t.fieldName}`;
-          I.add(O);
+          const N = `${t.cubeName || E.name}.${t.fieldName}`;
+          I.add(N);
         }
         this.dependencyGraph.set(A, {
           id: A,
@@ -940,7 +940,7 @@ class X {
 function Ce(e, E) {
   const { cube: T, allCubes: R, resolvedMeasures: A } = E, S = XE(e), I = /* @__PURE__ */ new Map();
   for (const C of S) {
-    const { originalRef: n, cubeName: L, fieldName: i } = C, a = L || T.name;
+    const { originalRef: n, cubeName: r, fieldName: i } = C, a = r || T.name;
     if (!R.get(a))
       throw new Error(
         `Cannot substitute {${n}}: cube '${a}' not found`
@@ -954,21 +954,21 @@ function Ce(e, E) {
     I.set(n, G);
   }
   const t = [], s = [];
-  let O = 0;
+  let N = 0;
   for (const C of S) {
-    const n = `{${C.originalRef}}`, L = e.indexOf(n, O);
-    if (L >= 0) {
-      t.push(e.substring(O, L));
+    const n = `{${C.originalRef}}`, r = e.indexOf(n, N);
+    if (r >= 0) {
+      t.push(e.substring(N, r));
       const i = I.get(C.originalRef);
-      i && s.push(i), O = L + n.length;
+      i && s.push(i), N = r + n.length;
     }
   }
-  if (t.push(e.substring(O)), s.length === 0)
+  if (t.push(e.substring(N)), s.length === 0)
     return _.raw(e);
-  const N = [];
+  const O = [];
   for (let C = 0; C < t.length; C++)
-    t[C] && N.push(new vT(t[C])), C < s.length && N.push(s[C]);
-  return _.join(N, _.raw(""));
+    t[C] && O.push(new vT(t[C])), C < s.length && O.push(s[C]);
+  return _.join(O, _.raw(""));
 }
 function XE(e) {
   const E = /\{([^}]+)\}/g, T = e.matchAll(E), R = [];
@@ -990,7 +990,7 @@ function XE(e) {
   }
   return R;
 }
-function Le(e) {
+function ne(e) {
   const E = [];
   let T = 0;
   for (let I = 0; I < e.length; I++)
@@ -1023,7 +1023,7 @@ function CE(e, E) {
   }
   return Array.from(R);
 }
-class ne {
+class re {
   constructor(E) {
     this.databaseAdapter = E;
   }
@@ -1039,41 +1039,41 @@ class ne {
    * @returns Map of measure names to SQL builder functions
    */
   buildResolvedMeasures(E, T, R, A) {
-    const S = /* @__PURE__ */ new Map(), I = [], t = [], s = new Set(E), O = new X(T);
-    for (const N of T.values())
-      O.buildGraph(N);
-    for (const N of E) {
-      const [C, n] = N.split("."), L = T.get(C);
-      if (L && L.measures && L.measures[n]) {
-        const i = L.measures[n];
-        X.isCalculatedMeasure(i) ? (t.push(N), CE(i.calculatedSql, C).forEach((P) => s.add(P)), O.getAllDependencies(N).forEach((P) => {
+    const S = /* @__PURE__ */ new Map(), I = [], t = [], s = new Set(E), N = new X(T);
+    for (const O of T.values())
+      N.buildGraph(O);
+    for (const O of E) {
+      const [C, n] = O.split("."), r = T.get(C);
+      if (r && r.measures && r.measures[n]) {
+        const i = r.measures[n];
+        X.isCalculatedMeasure(i) ? (t.push(O), CE(i.calculatedSql, C).forEach((P) => s.add(P)), N.getAllDependencies(O).forEach((P) => {
           const [U, M] = P.split("."), G = T.get(U);
           if (G && G.measures[M]) {
             const H = G.measures[M];
             X.isCalculatedMeasure(H) && CE(H.calculatedSql, U).forEach((Y) => s.add(Y));
           }
-        })) : I.push(N);
+        })) : I.push(O);
       }
     }
-    for (const N of s) {
-      const [C, n] = N.split("."), L = T.get(C);
-      if (L && L.measures && L.measures[n]) {
-        const i = L.measures[n];
-        X.isCalculatedMeasure(i) ? t.includes(N) || t.push(N) : I.includes(N) || I.push(N);
+    for (const O of s) {
+      const [C, n] = O.split("."), r = T.get(C);
+      if (r && r.measures && r.measures[n]) {
+        const i = r.measures[n];
+        X.isCalculatedMeasure(i) ? t.includes(O) || t.push(O) : I.includes(O) || I.push(O);
       }
     }
-    for (const N of I) {
-      const [C, n] = N.split("."), L = T.get(C), i = L.measures[n];
+    for (const O of I) {
+      const [C, n] = O.split("."), r = T.get(C), i = r.measures[n];
       if (A) {
-        const a = A(N, i, L);
-        S.set(N, () => a);
+        const a = A(O, i, r);
+        S.set(O, () => a);
       } else
-        S.set(N, () => this.buildMeasureExpression(i, R));
+        S.set(O, () => this.buildMeasureExpression(i, R));
     }
     if (t.length > 0) {
-      const N = O.topologicalSort(t);
-      for (const C of N) {
-        const [n, L] = C.split("."), i = T.get(n), a = i.measures[L];
+      const O = N.topologicalSort(t);
+      for (const C of O) {
+        const [n, r] = C.split("."), i = T.get(n), a = i.measures[r];
         S.set(C, () => this.buildCalculatedMeasure(
           a,
           i,
@@ -1094,9 +1094,9 @@ class ne {
     const A = {}, S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (T.dimensions)
       for (const I of T.dimensions) {
-        const [t, s] = I.split("."), O = S.get(t);
-        if (O && O.dimensions && O.dimensions[s]) {
-          const N = O.dimensions[s], C = b(N.sql, R);
+        const [t, s] = I.split("."), N = S.get(t);
+        if (N && N.dimensions && N.dimensions[s]) {
+          const O = N.dimensions[s], C = b(O.sql, R);
           A[I] = _`${C}`.as(I);
         }
       }
@@ -1109,24 +1109,24 @@ class ne {
       for (const t of T.measures) {
         const s = I.get(t);
         if (s) {
-          const O = s();
-          A[t] = _`${O}`.as(t);
+          const N = s();
+          A[t] = _`${N}`.as(t);
         }
       }
     }
     if (T.timeDimensions)
       for (const I of T.timeDimensions) {
-        const [t, s] = I.dimension.split("."), O = S.get(t);
-        if (O && O.dimensions && O.dimensions[s]) {
-          const N = O.dimensions[s], C = this.buildTimeDimensionExpression(
-            N.sql,
+        const [t, s] = I.dimension.split("."), N = S.get(t);
+        if (N && N.dimensions && N.dimensions[s]) {
+          const O = N.dimensions[s], C = this.buildTimeDimensionExpression(
+            O.sql,
             I.granularity,
             R
           );
           A[I.dimension] = _`${C}`.as(I.dimension);
         }
       }
-    return Object.keys(A).length === 0 && (A.count = SE()), A;
+    return Object.keys(A).length === 0 && (A.count = IE()), A;
   }
   /**
    * Build calculated measure expression by substituting {member} references
@@ -1165,32 +1165,32 @@ class ne {
       );
     const I = /* @__PURE__ */ new Map(), t = CE(E.calculatedSql, T.name);
     for (const s of t) {
-      const [O, N] = s.split("."), C = A.get(O);
-      if (C && C.measures[N]) {
-        const n = C.measures[N];
+      const [N, O] = s.split("."), C = A.get(N);
+      if (C && C.measures[O]) {
+        const n = C.measures[O];
         if (R.measures.includes(s)) {
-          const L = _`${_.identifier(R.cteAlias)}.${_.identifier(N)}`;
+          const r = _`${_.identifier(R.cteAlias)}.${_.identifier(O)}`;
           let i;
           switch (n.type) {
             case "count":
             case "countDistinct":
             case "sum":
-              i = f(L);
+              i = f(r);
               break;
             case "avg":
-              i = this.databaseAdapter.buildAvg(L);
+              i = this.databaseAdapter.buildAvg(r);
               break;
             case "min":
-              i = q(L);
+              i = k(r);
               break;
             case "max":
-              i = j(L);
+              i = q(r);
               break;
             case "number":
-              i = f(L);
+              i = f(r);
               break;
             default:
-              i = f(L);
+              i = f(r);
           }
           I.set(s, () => i);
         }
@@ -1212,13 +1212,13 @@ class ne {
       const I = S.preAggregationCTEs.find((t) => t.cube.name === E);
       if (I && I.measures.includes(`${E}.${T}`))
         if (R.type === "calculated" && R.calculatedSql) {
-          const t = S.primaryCube.name === E ? S.primaryCube : S.joinCubes?.find((O) => O.cube.name === E)?.cube;
+          const t = S.primaryCube.name === E ? S.primaryCube : S.joinCubes?.find((N) => N.cube.name === E)?.cube;
           if (!t)
             throw new Error(`Cube ${E} not found in query plan`);
           const s = /* @__PURE__ */ new Map([[S.primaryCube.name, S.primaryCube]]);
           if (S.joinCubes)
-            for (const O of S.joinCubes)
-              s.set(O.cube.name, O.cube);
+            for (const N of S.joinCubes)
+              s.set(N.cube.name, N.cube);
           return this.buildCTECalculatedMeasure(
             R,
             t,
@@ -1236,9 +1236,9 @@ class ne {
             case "avg":
               return this.databaseAdapter.buildAvg(t);
             case "min":
-              return q(t);
+              return k(t);
             case "max":
-              return j(t);
+              return q(t);
             case "number":
               return f(t);
             default:
@@ -1276,7 +1276,7 @@ class ne {
     }
     switch (E.type) {
       case "count":
-        return SE(R);
+        return IE(R);
       case "countDistinct":
         return QT(R);
       case "sum":
@@ -1284,13 +1284,13 @@ class ne {
       case "avg":
         return this.databaseAdapter.buildAvg(R);
       case "min":
-        return q(R);
+        return k(R);
       case "max":
-        return j(R);
+        return q(R);
       case "number":
         return R;
       default:
-        return SE(R);
+        return IE(R);
     }
   }
   /**
@@ -1313,12 +1313,12 @@ class ne {
       }
     if (T.timeDimensions)
       for (const t of T.timeDimensions) {
-        const [s, O] = t.dimension.split("."), N = I.get(s);
-        if (N && N.dimensions[O] && t.dateRange) {
+        const [s, N] = t.dimension.split("."), O = I.get(s);
+        if (O && O.dimensions[N] && t.dateRange) {
           if (A?.preAggregationCTEs && A.preAggregationCTEs.some((a) => a.cube.name === s))
             continue;
-          const C = N.dimensions[O], n = b(C.sql, R), L = this.buildDateRangeCondition(n, t.dateRange);
-          L && S.push(L);
+          const C = O.dimensions[N], n = b(C.sql, R), r = this.buildDateRangeCondition(n, t.dateRange);
+          r && S.push(r);
         }
       }
     return S;
@@ -1342,24 +1342,24 @@ class ne {
    */
   processFilter(E, T, R, A, S) {
     if ("and" in E || "or" in E) {
-      const L = E;
-      if (L.and) {
-        const i = L.and.map((a) => this.processFilter(a, T, R, A, S)).filter((a) => a !== null);
+      const r = E;
+      if (r.and) {
+        const i = r.and.map((a) => this.processFilter(a, T, R, A, S)).filter((a) => a !== null);
         return i.length > 0 ? F(...i) : null;
       }
-      if (L.or) {
-        const i = L.or.map((a) => this.processFilter(a, T, R, A, S)).filter((a) => a !== null);
-        return i.length > 0 ? IE(...i) : null;
+      if (r.or) {
+        const i = r.or.map((a) => this.processFilter(a, T, R, A, S)).filter((a) => a !== null);
+        return i.length > 0 ? NE(...i) : null;
       }
     }
-    const I = E, [t, s] = I.member.split("."), O = T.get(t);
-    if (!O) return null;
-    const N = O.dimensions[s], C = O.measures[s], n = N || C;
+    const I = E, [t, s] = I.member.split("."), N = T.get(t);
+    if (!N) return null;
+    const O = N.dimensions[s], C = N.measures[s], n = O || C;
     if (!n) return null;
-    if (A === "where" && N) {
+    if (A === "where" && O) {
       if (S?.preAggregationCTEs && S.preAggregationCTEs.some((l) => l.cube.name === t))
         return null;
-      const i = ["arrayContains", "arrayOverlaps", "arrayContained"].includes(I.operator) ? typeof N.sql == "function" ? N.sql(R) : N.sql : b(N.sql, R);
+      const i = ["arrayContains", "arrayOverlaps", "arrayContained"].includes(I.operator) ? typeof O.sql == "function" ? O.sql(R) : O.sql : b(O.sql, R);
       return this.buildFilterCondition(
         i,
         I.operator,
@@ -1371,9 +1371,9 @@ class ne {
       if (A === "where" && C)
         return null;
       if (A === "having" && C) {
-        const L = this.buildHavingMeasureExpression(t, s, C, R, S);
+        const r = this.buildHavingMeasureExpression(t, s, C, R, S);
         return this.buildFilterCondition(
-          L,
+          r,
           I.operator,
           I.values,
           n,
@@ -1408,7 +1408,7 @@ class ne {
       case "equals":
         if (I.length > 1) {
           if (A?.type === "time") {
-            const s = I.map((O) => this.normalizeDate(O) || O);
+            const s = I.map((N) => this.normalizeDate(N) || N);
             return OE(E, s);
           }
           return OE(E, I);
@@ -1428,11 +1428,11 @@ class ne {
       case "endsWith":
         return this.databaseAdapter.buildStringCondition(E, "endsWith", t);
       case "gt":
-        return tE(E, t);
+        return sE(E, t);
       case "gte":
         return K(E, t);
       case "lt":
-        return NE(E, t);
+        return tE(E, t);
       case "lte":
         return $(E, t);
       case "set":
@@ -1442,27 +1442,27 @@ class ne {
       case "inDateRange":
         if (I.length >= 2) {
           const s = this.normalizeDate(I[0]);
-          let O = this.normalizeDate(I[1]);
-          if (s && O) {
-            const N = R[1];
-            if (typeof N == "string" && /^\d{4}-\d{2}-\d{2}$/.test(N.trim())) {
-              const C = typeof O == "number" ? new Date(O * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(O), n = new Date(C);
-              n.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? O = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(n.getTime() / 1e3) : n.getTime() : O = n.toISOString();
+          let N = this.normalizeDate(I[1]);
+          if (s && N) {
+            const O = R[1];
+            if (typeof O == "string" && /^\d{4}-\d{2}-\d{2}$/.test(O.trim())) {
+              const C = typeof N == "number" ? new Date(N * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(N), n = new Date(C);
+              n.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? N = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(n.getTime() / 1e3) : n.getTime() : N = n.toISOString();
             }
             return F(
               K(E, s),
-              $(E, O)
+              $(E, N)
             );
           }
         }
         return null;
       case "beforeDate": {
         const s = this.normalizeDate(t);
-        return s ? NE(E, s) : null;
+        return s ? tE(E, s) : null;
       }
       case "afterDate": {
         const s = this.normalizeDate(t);
-        return s ? tE(E, s) : null;
+        return s ? sE(E, s) : null;
       }
       case "between":
         return I.length >= 2 ? F(
@@ -1470,9 +1470,9 @@ class ne {
           $(E, I[1])
         ) : null;
       case "notBetween":
-        return I.length >= 2 ? IE(
-          NE(E, I[0]),
-          tE(E, I[1])
+        return I.length >= 2 ? NE(
+          tE(E, I[0]),
+          sE(E, I[1])
         ) : null;
       case "in":
         return I.length > 0 ? OE(E, I) : null;
@@ -1489,7 +1489,7 @@ class ne {
       case "notRegex":
         return this.databaseAdapter.buildStringCondition(E, "notRegex", t);
       case "isEmpty":
-        return IE(
+        return NE(
           $E(E),
           x(E, "")
         );
@@ -1531,9 +1531,9 @@ class ne {
     if (typeof T == "string") {
       const R = this.parseRelativeDateRange(T);
       if (R) {
-        let N, C;
-        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (N = Math.floor(R.start.getTime() / 1e3), C = Math.floor(R.end.getTime() / 1e3)) : (N = R.start.getTime(), C = R.end.getTime()) : (N = R.start.toISOString(), C = R.end.toISOString()), F(
-          K(E, N),
+        let O, C;
+        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (O = Math.floor(R.start.getTime() / 1e3), C = Math.floor(R.end.getTime() / 1e3)) : (O = R.start.getTime(), C = R.end.getTime()) : (O = R.start.toISOString(), C = R.end.toISOString()), F(
+          K(E, O),
           $(E, C)
         );
       }
@@ -1543,10 +1543,10 @@ class ne {
       I.setUTCHours(0, 0, 0, 0);
       const t = new Date(S);
       t.setUTCHours(23, 59, 59, 999);
-      let s, O;
-      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (s = Math.floor(I.getTime() / 1e3), O = Math.floor(t.getTime() / 1e3)) : (s = I.getTime(), O = t.getTime()) : (s = I.toISOString(), O = t.toISOString()), F(
+      let s, N;
+      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (s = Math.floor(I.getTime() / 1e3), N = Math.floor(t.getTime() / 1e3)) : (s = I.getTime(), N = t.getTime()) : (s = I.toISOString(), N = t.toISOString()), F(
         K(E, s),
-        $(E, O)
+        $(E, N)
       );
     }
     return null;
@@ -1560,78 +1560,78 @@ class ne {
     if (R === "today") {
       const n = new Date(T);
       n.setUTCHours(0, 0, 0, 0);
-      const L = new Date(T);
-      return L.setUTCHours(23, 59, 59, 999), { start: n, end: L };
+      const r = new Date(T);
+      return r.setUTCHours(23, 59, 59, 999), { start: n, end: r };
     }
     if (R === "yesterday") {
       const n = new Date(T);
       n.setUTCDate(I - 1), n.setUTCHours(0, 0, 0, 0);
-      const L = new Date(T);
-      return L.setUTCDate(I - 1), L.setUTCHours(23, 59, 59, 999), { start: n, end: L };
+      const r = new Date(T);
+      return r.setUTCDate(I - 1), r.setUTCHours(23, 59, 59, 999), { start: n, end: r };
     }
     if (R === "this week") {
-      const n = t === 0 ? -6 : 1 - t, L = new Date(T);
-      L.setUTCDate(I + n), L.setUTCHours(0, 0, 0, 0);
-      const i = new Date(L);
-      return i.setUTCDate(L.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
+      const n = t === 0 ? -6 : 1 - t, r = new Date(T);
+      r.setUTCDate(I + n), r.setUTCHours(0, 0, 0, 0);
+      const i = new Date(r);
+      return i.setUTCDate(r.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: r, end: i };
     }
     if (R === "this month") {
-      const n = new Date(Date.UTC(A, S, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A, S + 1, 0, 23, 59, 59, 999));
-      return { start: n, end: L };
+      const n = new Date(Date.UTC(A, S, 1, 0, 0, 0, 0)), r = new Date(Date.UTC(A, S + 1, 0, 23, 59, 59, 999));
+      return { start: n, end: r };
     }
     if (R === "this quarter") {
-      const n = Math.floor(S / 3), L = new Date(Date.UTC(A, n * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(A, n * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: L, end: i };
+      const n = Math.floor(S / 3), r = new Date(Date.UTC(A, n * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(A, n * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: r, end: i };
     }
     if (R === "this year") {
-      const n = new Date(Date.UTC(A, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A, 11, 31, 23, 59, 59, 999));
-      return { start: n, end: L };
+      const n = new Date(Date.UTC(A, 0, 1, 0, 0, 0, 0)), r = new Date(Date.UTC(A, 11, 31, 23, 59, 59, 999));
+      return { start: n, end: r };
     }
     const s = R.match(/^last\s+(\d+)\s+days?$/);
     if (s) {
-      const n = parseInt(s[1], 10), L = new Date(T);
-      L.setUTCDate(I - n + 1), L.setUTCHours(0, 0, 0, 0);
+      const n = parseInt(s[1], 10), r = new Date(T);
+      r.setUTCDate(I - n + 1), r.setUTCHours(0, 0, 0, 0);
       const i = new Date(T);
-      return i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
+      return i.setUTCHours(23, 59, 59, 999), { start: r, end: i };
     }
-    const O = R.match(/^last\s+(\d+)\s+weeks?$/);
-    if (O) {
-      const L = parseInt(O[1], 10) * 7, i = new Date(T);
-      i.setUTCDate(I - L + 1), i.setUTCHours(0, 0, 0, 0);
+    const N = R.match(/^last\s+(\d+)\s+weeks?$/);
+    if (N) {
+      const r = parseInt(N[1], 10) * 7, i = new Date(T);
+      i.setUTCDate(I - r + 1), i.setUTCHours(0, 0, 0, 0);
       const a = new Date(T);
       return a.setUTCHours(23, 59, 59, 999), { start: i, end: a };
     }
     if (R === "last week") {
-      const n = t === 0 ? -13 : -6 - t, L = new Date(T);
-      L.setUTCDate(I + n), L.setUTCHours(0, 0, 0, 0);
-      const i = new Date(L);
-      return i.setUTCDate(L.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
+      const n = t === 0 ? -13 : -6 - t, r = new Date(T);
+      r.setUTCDate(I + n), r.setUTCHours(0, 0, 0, 0);
+      const i = new Date(r);
+      return i.setUTCDate(r.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: r, end: i };
     }
     if (R === "last month") {
-      const n = new Date(Date.UTC(A, S - 1, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A, S, 0, 23, 59, 59, 999));
-      return { start: n, end: L };
+      const n = new Date(Date.UTC(A, S - 1, 1, 0, 0, 0, 0)), r = new Date(Date.UTC(A, S, 0, 23, 59, 59, 999));
+      return { start: n, end: r };
     }
     if (R === "last quarter") {
-      const n = Math.floor(S / 3), L = n === 0 ? 3 : n - 1, i = n === 0 ? A - 1 : A, a = new Date(Date.UTC(i, L * 3, 1, 0, 0, 0, 0)), l = new Date(Date.UTC(i, L * 3 + 3, 0, 23, 59, 59, 999));
+      const n = Math.floor(S / 3), r = n === 0 ? 3 : n - 1, i = n === 0 ? A - 1 : A, a = new Date(Date.UTC(i, r * 3, 1, 0, 0, 0, 0)), l = new Date(Date.UTC(i, r * 3 + 3, 0, 23, 59, 59, 999));
       return { start: a, end: l };
     }
     if (R === "last year") {
-      const n = new Date(Date.UTC(A - 1, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A - 1, 11, 31, 23, 59, 59, 999));
-      return { start: n, end: L };
+      const n = new Date(Date.UTC(A - 1, 0, 1, 0, 0, 0, 0)), r = new Date(Date.UTC(A - 1, 11, 31, 23, 59, 59, 999));
+      return { start: n, end: r };
     }
     if (R === "last 12 months") {
-      const n = new Date(Date.UTC(A, S - 11, 1, 0, 0, 0, 0)), L = new Date(T);
-      return L.setUTCHours(23, 59, 59, 999), { start: n, end: L };
+      const n = new Date(Date.UTC(A, S - 11, 1, 0, 0, 0, 0)), r = new Date(T);
+      return r.setUTCHours(23, 59, 59, 999), { start: n, end: r };
     }
-    const N = R.match(/^last\s+(\d+)\s+months?$/);
-    if (N) {
-      const n = parseInt(N[1], 10), L = new Date(Date.UTC(A, S - n + 1, 1, 0, 0, 0, 0)), i = new Date(T);
-      return i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
+    const O = R.match(/^last\s+(\d+)\s+months?$/);
+    if (O) {
+      const n = parseInt(O[1], 10), r = new Date(Date.UTC(A, S - n + 1, 1, 0, 0, 0, 0)), i = new Date(T);
+      return i.setUTCHours(23, 59, 59, 999), { start: r, end: i };
     }
     const C = R.match(/^last\s+(\d+)\s+years?$/);
     if (C) {
-      const n = parseInt(C[1], 10), L = new Date(Date.UTC(A - n, 0, 1, 0, 0, 0, 0)), i = new Date(T);
-      return i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
+      const n = parseInt(C[1], 10), r = new Date(Date.UTC(A - n, 0, 1, 0, 0, 0, 0)), i = new Date(T);
+      return i.setUTCHours(23, 59, 59, 999), { start: r, end: i };
     }
     return null;
   }
@@ -1670,27 +1670,27 @@ class ne {
     const t = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (T.dimensions)
       for (const s of T.dimensions) {
-        const [O, N] = s.split("."), C = t.get(O);
-        if (C && C.dimensions && C.dimensions[N])
-          if (A?.preAggregationCTEs?.some((L) => L.cube.name === O)) {
-            const L = A.preAggregationCTEs.find((a) => a.cube.name === O), i = L.joinKeys.find((a) => a.targetColumn === N);
+        const [N, O] = s.split("."), C = t.get(N);
+        if (C && C.dimensions && C.dimensions[O])
+          if (A?.preAggregationCTEs?.some((r) => r.cube.name === N)) {
+            const r = A.preAggregationCTEs.find((a) => a.cube.name === N), i = r.joinKeys.find((a) => a.targetColumn === O);
             if (i && i.sourceColumnObj)
               S.push(i.sourceColumnObj);
             else {
-              const a = _`${_.identifier(L.cteAlias)}.${_.identifier(N)}`;
+              const a = _`${_.identifier(r.cteAlias)}.${_.identifier(O)}`;
               S.push(a);
             }
           } else {
-            const L = C.dimensions[N], i = b(L.sql, R);
+            const r = C.dimensions[O], i = b(r.sql, R);
             S.push(i);
           }
       }
     if (T.timeDimensions)
       for (const s of T.timeDimensions) {
-        const [O, N] = s.dimension.split("."), C = t.get(O);
-        if (C && C.dimensions && C.dimensions[N])
-          if (A?.preAggregationCTEs?.some((L) => L.cube.name === O)) {
-            const L = A.preAggregationCTEs.find((a) => a.cube.name === O), i = L.joinKeys.find((a) => a.targetColumn === N);
+        const [N, O] = s.dimension.split("."), C = t.get(N);
+        if (C && C.dimensions && C.dimensions[O])
+          if (A?.preAggregationCTEs?.some((r) => r.cube.name === N)) {
+            const r = A.preAggregationCTEs.find((a) => a.cube.name === N), i = r.joinKeys.find((a) => a.targetColumn === O);
             if (i && i.sourceColumnObj) {
               const a = this.buildTimeDimensionExpression(
                 i.sourceColumnObj,
@@ -1699,12 +1699,12 @@ class ne {
               );
               S.push(a);
             } else {
-              const a = _`${_.identifier(L.cteAlias)}.${_.identifier(N)}`;
+              const a = _`${_.identifier(r.cteAlias)}.${_.identifier(O)}`;
               S.push(a);
             }
           } else {
-            const L = C.dimensions[N], i = this.buildTimeDimensionExpression(
-              L.sql,
+            const r = C.dimensions[O], i = this.buildTimeDimensionExpression(
+              r.sql,
               s.granularity,
               R
             );
@@ -1748,8 +1748,8 @@ class ne {
       for (const S of T.dimensions) {
         const [I, t] = S.split("."), s = A.get(I);
         if (s) {
-          const O = s.dimensions[t];
-          O && O.type === "number" && R.push(S);
+          const N = s.dimensions[t];
+          N && N.type === "number" && R.push(S);
         }
       }
     return R;
@@ -1864,7 +1864,7 @@ class dT {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const s = this.buildJoinPlan(E, t, S, R), O = this.planPreAggregationCTEs(E, t, s, T);
+    const s = this.buildJoinPlan(E, t, S, R), N = this.planPreAggregationCTEs(E, t, s, T);
     return {
       primaryCube: t,
       joinCubes: s,
@@ -1874,7 +1874,7 @@ class dT {
       // Will be built by QueryBuilder
       groupByFields: [],
       // Will be built by QueryBuilder
-      preAggregationCTEs: O
+      preAggregationCTEs: N
     };
   }
   /**
@@ -1928,34 +1928,34 @@ class dT {
     for (const s of t) {
       if (I.has(s))
         continue;
-      const O = this.findJoinPath(E, T.name, s, I);
-      if (!O || O.length === 0)
+      const N = this.findJoinPath(E, T.name, s, I);
+      if (!N || N.length === 0)
         throw new Error(`No join path found from '${T.name}' to '${s}'`);
-      for (const { toCube: N, joinDef: C } of O) {
-        if (I.has(N))
+      for (const { toCube: O, joinDef: C } of N) {
+        if (I.has(O))
           continue;
-        const n = E.get(N);
+        const n = E.get(O);
         if (!n)
-          throw new Error(`Cube '${N}' not found`);
+          throw new Error(`Cube '${O}' not found`);
         if (C.relationship === "belongsToMany" && C.through) {
-          const L = se(C, A.securityContext);
+          const r = se(C, A.securityContext);
           S.push({
             cube: n,
-            alias: `${N.toLowerCase()}_cube`,
-            joinType: L.junctionJoins[1].joinType,
+            alias: `${O.toLowerCase()}_cube`,
+            joinType: r.junctionJoins[1].joinType,
             // Use the target join type
-            joinCondition: L.junctionJoins[1].condition,
+            joinCondition: r.junctionJoins[1].condition,
             // Target join condition
             junctionTable: {
               table: C.through.table,
-              alias: `junction_${N.toLowerCase()}`,
-              joinType: L.junctionJoins[0].joinType,
-              joinCondition: L.junctionJoins[0].condition,
+              alias: `junction_${O.toLowerCase()}`,
+              joinType: r.junctionJoins[0].joinType,
+              joinCondition: r.junctionJoins[0].condition,
               securitySql: C.through.securitySql
             }
           });
         } else {
-          const L = this.buildJoinCondition(
+          const r = this.buildJoinCondition(
             C,
             null,
             // No source alias needed - use the actual column
@@ -1964,12 +1964,12 @@ class dT {
           ), i = fE(C.relationship, C.sqlJoinType);
           S.push({
             cube: n,
-            alias: `${N.toLowerCase()}_cube`,
+            alias: `${O.toLowerCase()}_cube`,
             joinType: i,
-            joinCondition: L
+            joinCondition: r
           });
         }
-        I.add(N);
+        I.add(O);
       }
     }
     return S;
@@ -1996,20 +1996,20 @@ class dT {
       { cube: T, path: [] }
     ], I = /* @__PURE__ */ new Set([T, ...A]);
     for (; S.length > 0; ) {
-      const { cube: t, path: s } = S.shift(), O = E.get(t);
-      if (O?.joins)
-        for (const [, N] of Object.entries(O.joins)) {
-          const n = sE(N.targetCube).name;
+      const { cube: t, path: s } = S.shift(), N = E.get(t);
+      if (N?.joins)
+        for (const [, O] of Object.entries(N.joins)) {
+          const n = j(O.targetCube).name;
           if (I.has(n))
             continue;
-          const L = [...s, {
+          const r = [...s, {
             fromCube: t,
             toCube: n,
-            joinDef: N
+            joinDef: O
           }];
           if (n === R)
-            return L;
-          I.add(n), S.push({ cube: n, path: L });
+            return r;
+          I.add(n), S.push({ cube: n, path: r });
         }
     }
     return null;
@@ -2028,25 +2028,26 @@ class dT {
       if (!t)
         continue;
       const s = A.measures ? A.measures.filter(
-        (L) => L.startsWith(I.cube.name + ".")
-      ) : [], O = this.extractMeasuresFromFilters(A, I.cube.name), N = [.../* @__PURE__ */ new Set([...s, ...O])];
-      if (N.length === 0)
+        (i) => i.startsWith(I.cube.name + ".")
+      ) : [], N = this.extractMeasuresFromFilters(A, I.cube.name), O = [.../* @__PURE__ */ new Set([...s, ...N])];
+      if (O.length === 0)
         continue;
       const C = this.expandCalculatedMeasureDependencies(
         I.cube,
-        N
-      ), n = t.on.map((L) => ({
-        sourceColumn: L.source.name,
-        targetColumn: L.target.name,
-        sourceColumnObj: L.source,
-        targetColumnObj: L.target
-      }));
+        O
+      ), n = t.on.map((i) => ({
+        sourceColumn: i.source.name,
+        targetColumn: i.target.name,
+        sourceColumnObj: i.source,
+        targetColumnObj: i.target
+      })), r = this.findPropagatingFilters(A, I.cube, E);
       S.push({
         cube: I.cube,
         alias: I.alias,
         cteAlias: `${I.cube.name.toLowerCase()}_agg`,
         joinKeys: n,
-        measures: C
+        measures: C,
+        propagatingFilters: r.length > 0 ? r : void 0
       });
     }
     return S;
@@ -2067,8 +2068,8 @@ class dT {
       const t = E.measures[I];
       if (t.type === "calculated" && t.calculatedSql) {
         const s = this.extractDependenciesFromTemplate(t.calculatedSql, E.name);
-        for (const O of s)
-          R.has(O) || A.push(O);
+        for (const N of s)
+          R.has(N) || A.push(N);
       }
     }
     return Array.from(R);
@@ -2091,10 +2092,106 @@ class dT {
     if (!E.joins)
       return null;
     for (const [, R] of Object.entries(E.joins))
-      if (sE(R.targetCube).name === T && R.relationship === "hasMany")
+      if (j(R.targetCube).name === T && R.relationship === "hasMany")
         return R;
     return null;
   }
+  /**
+   * Find filters that need to propagate from related cubes to a CTE cube.
+   * When cube A has filters and a hasMany relationship to cube B (the CTE cube),
+   * A's filters should propagate into B's CTE via a subquery.
+   *
+   * Example: Employees.createdAt filter should propagate to Productivity CTE
+   * via: employee_id IN (SELECT id FROM employees WHERE created_at >= $date)
+   */
+  findPropagatingFilters(E, T, R) {
+    const A = [];
+    if (!E.filters) return A;
+    const S = /* @__PURE__ */ new Set();
+    if (this.extractFilterCubeNamesToSet(E.filters, S), E.timeDimensions) {
+      for (const I of E.timeDimensions)
+        if (I.dateRange) {
+          const [t] = I.dimension.split(".");
+          t && S.add(t);
+        }
+    }
+    for (const I of S) {
+      if (I === T.name) continue;
+      const t = R.get(I);
+      if (t?.joins) {
+        for (const [, s] of Object.entries(t.joins))
+          if (j(s.targetCube).name === T.name && s.relationship === "hasMany") {
+            const O = this.extractFiltersForCube(E.filters, I), C = this.extractTimeDimensionFiltersForCube(E, I), n = [...O, ...C];
+            n.length > 0 && s.on.length > 0 && A.push({
+              sourceCube: t,
+              filters: n,
+              // source = filterCube PK (e.g., employees.id)
+              // target = cteCube FK (e.g., productivity.employeeId)
+              joinCondition: {
+                source: s.on[0].source,
+                target: s.on[0].target
+              }
+            });
+          }
+      }
+    }
+    return A;
+  }
+  /**
+   * Extract cube names from filters into a Set (helper for findPropagatingFilters)
+   */
+  extractFilterCubeNamesToSet(E, T) {
+    for (const R of E) {
+      if ("and" in R || "or" in R) {
+        const A = R.and || R.or || [];
+        this.extractFilterCubeNamesToSet(A, T);
+        continue;
+      }
+      if ("member" in R) {
+        const [A] = R.member.split(".");
+        A && T.add(A);
+      }
+    }
+  }
+  /**
+   * Extract filters for a specific cube from the filter array
+   */
+  extractFiltersForCube(E, T) {
+    const R = [];
+    for (const A of E) {
+      if ("and" in A) {
+        const S = this.extractFiltersForCube(A.and || [], T);
+        S.length > 0 && R.push({ and: S });
+        continue;
+      }
+      if ("or" in A) {
+        const S = this.extractFiltersForCube(A.or || [], T);
+        S.length > 0 && R.push({ or: S });
+        continue;
+      }
+      if ("member" in A) {
+        const [S] = A.member.split(".");
+        S === T && R.push(A);
+      }
+    }
+    return R;
+  }
+  /**
+   * Extract time dimension date range filters as regular filters for a specific cube
+   */
+  extractTimeDimensionFiltersForCube(E, T) {
+    const R = [];
+    if (!E.timeDimensions) return R;
+    for (const A of E.timeDimensions) {
+      const [S] = A.dimension.split(".");
+      S === T && A.dateRange && R.push({
+        member: A.dimension,
+        operator: "inDateRange",
+        values: Array.isArray(A.dateRange) ? A.dateRange : [A.dateRange]
+      });
+    }
+    return R;
+  }
   /**
    * Analyze query planning decisions without building the full query
    * Returns detailed metadata about how the query plan would be constructed
@@ -2138,23 +2235,23 @@ class dT {
       warnings: []
     };
     if (S.length > 1) {
-      const O = S.filter((L) => L !== t);
-      for (const L of O)
+      const N = S.filter((r) => r !== t);
+      for (const r of N)
         s.joinPaths.push(
-          this.analyzeJoinPath(E, t, L)
+          this.analyzeJoinPath(E, t, r)
         );
-      const N = E.get(t);
-      N && (s.preAggregations = this.analyzePreAggregations(
+      const O = E.get(t);
+      O && (s.preAggregations = this.analyzePreAggregations(
         E,
-        N,
         O,
+        N,
         T
       ));
-      const C = s.joinPaths.filter((L) => L.pathFound), n = s.joinPaths.filter((L) => !L.pathFound);
+      const C = s.joinPaths.filter((r) => r.pathFound), n = s.joinPaths.filter((r) => !r.pathFound);
       s.querySummary.joinCount = C.length, s.querySummary.cteCount = s.preAggregations.length, s.querySummary.hasPreAggregation = s.preAggregations.length > 0, s.preAggregations.length > 0 ? s.querySummary.queryType = "multi_cube_cte" : s.querySummary.queryType = "multi_cube_join";
-      for (const L of n)
+      for (const r of n)
         s.warnings.push(
-          `No join path found to cube '${L.targetCube}'. Check that joins are defined correctly.`
+          `No join path found to cube '${r.targetCube}'. Check that joins are defined correctly.`
         );
     }
     return s;
@@ -2169,23 +2266,23 @@ class dT {
         reason: "single_cube",
         explanation: "Only one cube is used in this query"
       };
-    const A = [], S = (T.dimensions || []).map((O) => O.split(".")[0]), I = /* @__PURE__ */ new Map();
-    for (const O of S)
-      I.set(O, (I.get(O) || 0) + 1);
-    for (const O of E) {
-      const N = R.get(O), C = I.get(O) || 0, n = N?.joins ? Object.keys(N.joins).length : 0, L = this.canReachAllCubes(O, E, R);
+    const A = [], S = (T.dimensions || []).map((N) => N.split(".")[0]), I = /* @__PURE__ */ new Map();
+    for (const N of S)
+      I.set(N, (I.get(N) || 0) + 1);
+    for (const N of E) {
+      const O = R.get(N), C = I.get(N) || 0, n = O?.joins ? Object.keys(O.joins).length : 0, r = this.canReachAllCubes(N, E, R);
       A.push({
-        cubeName: O,
+        cubeName: N,
         dimensionCount: C,
         joinCount: n,
-        canReachAll: L
+        canReachAll: r
       });
     }
     if (T.dimensions && T.dimensions.length > 0) {
-      const O = Math.max(...A.map((N) => N.dimensionCount));
-      if (O > 0) {
-        const N = A.filter((C) => C.dimensionCount === O).sort((C, n) => C.cubeName.localeCompare(n.cubeName));
-        for (const C of N)
+      const N = Math.max(...A.map((O) => O.dimensionCount));
+      if (N > 0) {
+        const O = A.filter((C) => C.dimensionCount === N).sort((C, n) => C.cubeName.localeCompare(n.cubeName));
+        for (const C of O)
           if (C.canReachAll)
             return {
               selectedCube: C.cubeName,
@@ -2195,13 +2292,13 @@ class dT {
             };
       }
     }
-    const t = A.filter((O) => O.canReachAll);
+    const t = A.filter((N) => N.canReachAll);
     if (t.length > 0) {
-      const O = Math.max(...t.map((C) => C.joinCount)), N = t.filter((C) => C.joinCount === O).sort((C, n) => C.cubeName.localeCompare(n.cubeName))[0];
+      const N = Math.max(...t.map((C) => C.joinCount)), O = t.filter((C) => C.joinCount === N).sort((C, n) => C.cubeName.localeCompare(n.cubeName))[0];
       return {
-        selectedCube: N.cubeName,
+        selectedCube: O.cubeName,
         reason: "most_connected",
-        explanation: `Selected because it has ${N.joinCount} join relationship${N.joinCount !== 1 ? "s" : ""} and can reach all other cubes`,
+        explanation: `Selected because it has ${O.joinCount} join relationship${O.joinCount !== 1 ? "s" : ""} and can reach all other cubes`,
         candidates: A
       };
     }
@@ -2218,20 +2315,20 @@ class dT {
   analyzeJoinPath(E, T, R) {
     const A = [T], S = [{ cube: T, path: [] }], I = /* @__PURE__ */ new Set([T]);
     for (; S.length > 0; ) {
-      const { cube: t, path: s } = S.shift(), O = E.get(t);
-      if (O?.joins)
-        for (const [, N] of Object.entries(O.joins)) {
-          const n = sE(N.targetCube).name;
+      const { cube: t, path: s } = S.shift(), N = E.get(t);
+      if (N?.joins)
+        for (const [, O] of Object.entries(N.joins)) {
+          const n = j(O.targetCube).name;
           if (I.has(n))
             continue;
           A.push(n), I.add(n);
-          const L = [...s, {
+          const r = [...s, {
             fromCube: t,
             toCube: n,
-            joinDef: N
+            joinDef: O
           }];
           if (n === R) {
-            const i = L.map((a) => {
+            const i = r.map((a) => {
               const l = fE(a.joinDef.relationship, a.joinDef.sqlJoinType), P = a.joinDef.on.map((M) => ({
                 sourceColumn: M.source.name,
                 targetColumn: M.target.name
@@ -2260,7 +2357,7 @@ class dT {
               visitedCubes: A
             };
           }
-          S.push({ cube: n, path: L });
+          S.push({ cube: n, path: r });
         }
     }
     return {
@@ -2282,26 +2379,26 @@ class dT {
       if (!t)
         continue;
       const s = A.measures.filter(
-        (N) => N.startsWith(I + ".")
+        (O) => O.startsWith(I + ".")
       );
       if (s.length === 0)
         continue;
-      const O = t.on.map((N) => ({
-        sourceColumn: N.source.name,
-        targetColumn: N.target.name
+      const N = t.on.map((O) => ({
+        sourceColumn: O.source.name,
+        targetColumn: O.target.name
       }));
       S.push({
         cubeName: I,
         cteAlias: `${I.toLowerCase()}_agg`,
         reason: `hasMany relationship from ${T.name} - requires pre-aggregation to prevent row duplication (fan-out)`,
         measures: s,
-        joinKeys: O
+        joinKeys: N
       });
     }
     return S;
   }
 }
-function re(e, E, T) {
+function Le(e, E, T) {
   const R = [];
   let A = ZE(new Date(e), T);
   const S = ZE(new Date(E), T), I = 1e4;
@@ -2387,36 +2484,36 @@ function ae(e, E) {
   return E.length === 0 ? "__all__" : E.map((T) => String(e[T] ?? "")).join("|||");
 }
 function oe(e, E) {
-  const { timeDimensionKey: T, granularity: R, dateRange: A, fillValue: S, measures: I, dimensions: t } = E, s = re(A[0], A[1], R);
+  const { timeDimensionKey: T, granularity: R, dateRange: A, fillValue: S, measures: I, dimensions: t } = E, s = Le(A[0], A[1], R);
   if (s.length === 0)
     return e;
-  const O = /* @__PURE__ */ new Map();
+  const N = /* @__PURE__ */ new Map();
   for (const C of e) {
-    const n = ae(C, t), L = ie(C[T]);
-    O.has(n) || O.set(n, /* @__PURE__ */ new Map()), O.get(n).set(L, C);
+    const n = ae(C, t), r = ie(C[T]);
+    N.has(n) || N.set(n, /* @__PURE__ */ new Map()), N.get(n).set(r, C);
   }
-  O.size === 0 && t.length === 0 && O.set("__all__", /* @__PURE__ */ new Map());
-  const N = [];
-  for (const [C, n] of O) {
-    const L = n.size > 0 ? n.values().next().value : null;
+  N.size === 0 && t.length === 0 && N.set("__all__", /* @__PURE__ */ new Map());
+  const O = [];
+  for (const [C, n] of N) {
+    const r = n.size > 0 ? n.values().next().value : null;
     for (const i of s) {
       const a = i.toISOString(), l = n.get(a);
       if (l)
-        N.push(l);
+        O.push(l);
       else {
         const P = {
           [T]: a
         };
-        if (L)
+        if (r)
           for (const U of t)
-            P[U] = L[U];
+            P[U] = r[U];
         for (const U of I)
           P[U] = S;
-        N.push(P);
+        O.push(P);
       }
     }
   }
-  return N;
+  return O;
 }
 function De(e) {
   if (!e)
@@ -2434,34 +2531,34 @@ function Pe(e, E, T) {
   if (!E.timeDimensions || E.timeDimensions.length === 0)
     return e;
   const R = E.timeDimensions.filter((s) => {
-    const O = s.fillMissingDates !== !1, N = s.granularity && s.dateRange;
-    return O && N;
+    const N = s.fillMissingDates !== !1, O = s.granularity && s.dateRange;
+    return N && O;
   });
   if (R.length === 0)
     return e;
   const A = E.fillMissingDatesValue === void 0 ? 0 : E.fillMissingDatesValue, S = new Set(E.timeDimensions.map((s) => s.dimension)), I = (E.dimensions || []).filter((s) => !S.has(s));
   let t = e;
   for (const s of R) {
-    const O = De(s.dateRange);
-    if (!O)
+    const N = De(s.dateRange);
+    if (!N)
       continue;
-    const N = {
+    const O = {
       timeDimensionKey: s.dimension,
       granularity: s.granularity,
-      dateRange: O,
+      dateRange: N,
       fillValue: A,
       measures: T,
       dimensions: I
     };
-    t = oe(t, N);
+    t = oe(t, O);
   }
   return t;
 }
-class LE {
+class nE {
   constructor(E) {
     if (this.dbExecutor = E, this.databaseAdapter = E.databaseAdapter, !this.databaseAdapter)
       throw new Error("DatabaseExecutor must have a databaseAdapter property");
-    this.queryBuilder = new ne(this.databaseAdapter), this.queryPlanner = new dT();
+    this.queryBuilder = new re(this.databaseAdapter), this.queryPlanner = new dT();
   }
   queryBuilder;
   queryPlanner;
@@ -2478,7 +2575,7 @@ class LE {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: R
-      }, I = this.queryPlanner.createQueryPlan(E, T, S), t = this.buildUnifiedQuery(I, T, S), s = this.queryBuilder.collectNumericFields(E, T), O = await this.dbExecutor.execute(t, s), N = Array.isArray(O) ? O.map((i) => {
+      }, I = this.queryPlanner.createQueryPlan(E, T, S), t = this.buildUnifiedQuery(I, T, S), s = this.queryBuilder.collectNumericFields(E, T), N = await this.dbExecutor.execute(t, s), O = Array.isArray(N) ? N.map((i) => {
         const a = { ...i };
         if (T.timeDimensions) {
           for (const l of T.timeDimensions)
@@ -2492,10 +2589,10 @@ class LE {
             }
         }
         return a;
-      }) : [O], C = T.measures || [], n = Pe(N, T, C), L = this.generateAnnotations(I, T);
+      }) : [N], C = T.measures || [], n = Pe(O, T, C), r = this.generateAnnotations(I, T);
       return {
         data: n,
-        annotation: L
+        annotation: r
       };
     } catch (A) {
       throw new Error(`Query execution failed: ${A instanceof Error ? A.message : "Unknown error"}`);
@@ -2519,13 +2616,13 @@ class LE {
         for (const [U, M] of Object.entries(S.dimensions || {}))
           M.sql === P.targetColumnObj && U !== P.targetColumn && (t[U] = _`${P.targetColumnObj}`.as(U));
       }
-    const s = S.name, O = /* @__PURE__ */ new Map([[s, S]]), N = this.queryBuilder.buildResolvedMeasures(
+    const s = S.name, N = /* @__PURE__ */ new Map([[s, S]]), O = this.queryBuilder.buildResolvedMeasures(
       E.measures,
-      O,
+      N,
       R
     );
     for (const P of E.measures) {
-      const [, U] = P.split("."), M = N.get(P);
+      const [, U] = P.split("."), M = O.get(P);
       if (M) {
         const G = M();
         t[U] = _`${G}`.as(U);
@@ -2553,13 +2650,13 @@ class LE {
     const n = A ? {
       ...A,
       preAggregationCTEs: A.preAggregationCTEs?.filter((P) => P.cube.name !== S.name)
-    } : void 0, L = this.queryBuilder.buildWhereConditions(S, T, R, n), i = [];
+    } : void 0, r = this.queryBuilder.buildWhereConditions(S, T, R, n), i = [];
     if (T.timeDimensions)
       for (const P of T.timeDimensions) {
         const [U, M] = P.dimension.split(".");
         if (U === s && S.dimensions && S.dimensions[M] && P.dateRange) {
-          const G = S.dimensions[M], H = this.queryBuilder.buildMeasureExpression({ sql: G.sql, type: "number" }, R), B = this.queryBuilder.buildDateRangeCondition(H, P.dateRange);
-          B && i.push(B);
+          const G = S.dimensions[M], H = this.queryBuilder.buildMeasureExpression({ sql: G.sql, type: "number" }, R), m = this.queryBuilder.buildDateRangeCondition(H, P.dateRange);
+          m && i.push(m);
         }
       }
     if (T.filters) {
@@ -2569,14 +2666,23 @@ class LE {
           if (M === s && S.dimensions && S.dimensions[G]) {
             const H = S.dimensions[G];
             if (U.operator === "inDateRange") {
-              const B = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, R), Y = this.queryBuilder.buildDateRangeCondition(B, U.values);
+              const m = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, R), Y = this.queryBuilder.buildDateRangeCondition(m, U.values);
               Y && i.push(Y);
             }
           }
         }
     }
+    if (E.propagatingFilters && E.propagatingFilters.length > 0)
+      for (const P of E.propagatingFilters) {
+        const U = this.buildPropagatingFilterSubquery(
+          P,
+          R,
+          T
+        );
+        U && i.push(U);
+      }
     const a = [];
-    if (I.where && a.push(I.where), a.push(...L, ...i), a.length > 0) {
+    if (I.where && a.push(I.where), a.push(...r, ...i), a.length > 0) {
       const P = a.length === 1 ? a[0] : F(...a);
       C = C.where(P);
     }
@@ -2616,6 +2722,28 @@ class LE {
     }
     return S.length === 1 ? S[0] : F(...S);
   }
+  /**
+   * Build a subquery filter for propagating filters from related cubes.
+   * This generates: cteCube.FK IN (SELECT sourceCube.PK FROM sourceCube WHERE filters...)
+   *
+   * Example: For Productivity CTE with Employees.createdAt filter:
+   * employee_id IN (SELECT id FROM employees WHERE organisation_id = $1 AND created_at >= $date)
+   */
+  buildPropagatingFilterSubquery(E, T, R) {
+    const A = E.sourceCube, S = A.sql(T), I = [];
+    S.where && I.push(S.where);
+    const t = {
+      filters: E.filters
+    }, s = /* @__PURE__ */ new Map([[A.name, A]]), N = this.queryBuilder.buildWhereConditions(
+      s,
+      t,
+      T
+    );
+    if (I.push(...N), I.length === 0)
+      return null;
+    const { source: O, target: C } = E.joinCondition, n = I.length === 1 ? I[0] : F(...I), r = T.db.select({ pk: O }).from(S.from).where(n);
+    return _`${C} IN ${r}`;
+  }
   /**
    * Build unified query that works for both single and multi-cube queries
    */
@@ -2642,36 +2770,36 @@ class LE {
               const G = M.measures[U];
               let H;
               if (G.type === "calculated" && G.calculatedSql) {
-                const B = this.getCubesFromPlan(E);
+                const m = this.getCubesFromPlan(E);
                 H = this.queryBuilder.buildCTECalculatedMeasure(
                   G,
                   M,
                   a,
-                  B,
+                  m,
                   R
                 );
               } else {
-                const B = _`${_.identifier(a.cteAlias)}.${_.identifier(U)}`;
+                const m = _`${_.identifier(a.cteAlias)}.${_.identifier(U)}`;
                 switch (G.type) {
                   case "count":
                   case "countDistinct":
                   case "sum":
-                    H = f(B);
+                    H = f(m);
                     break;
                   case "avg":
-                    H = this.databaseAdapter.buildAvg(B);
+                    H = this.databaseAdapter.buildAvg(m);
                     break;
                   case "min":
-                    H = q(B);
+                    H = k(m);
                     break;
                   case "max":
-                    H = j(B);
+                    H = q(m);
                     break;
                   case "number":
-                    H = f(B);
+                    H = f(m);
                     break;
                   default:
-                    H = f(B);
+                    H = f(m);
                 }
               }
               s[P] = _`${H}`.as(P);
@@ -2680,34 +2808,34 @@ class LE {
         for (const P in s) {
           const [U, M] = P.split(".");
           if (U === l) {
-            const G = this.getCubesFromPlan(E).get(l), H = G && G.dimensions?.[M], B = P.startsWith(l + ".");
-            if (H || B) {
-              let Y = a.joinKeys.find((AE) => AE.targetColumn === M);
+            const G = this.getCubesFromPlan(E).get(l), H = G && G.dimensions?.[M], m = P.startsWith(l + ".");
+            if (H || m) {
+              let Y = a.joinKeys.find((SE) => SE.targetColumn === M);
               if (!Y && G?.dimensions?.[M]) {
-                const AE = G.dimensions[M].sql;
-                Y = a.joinKeys.find((xT) => xT.targetColumnObj === AE);
+                const SE = G.dimensions[M].sql;
+                Y = a.joinKeys.find((xT) => xT.targetColumnObj === SE);
               }
-              Y ? s[P] = _`${_.identifier(a.cteAlias)}.${_.identifier(M)}`.as(P) : B && G?.dimensions?.[M] && (s[P] = _`${_.identifier(a.cteAlias)}.${_.identifier(M)}`.as(P));
+              Y ? s[P] = _`${_.identifier(a.cteAlias)}.${_.identifier(M)}`.as(P) : m && G?.dimensions?.[M] && (s[P] = _`${_.identifier(a.cteAlias)}.${_.identifier(M)}`.as(P));
             }
           }
         }
       }
-    const O = [];
-    let N = R.db.select(s).from(I.from);
-    if (A.length > 0 && (N = R.db.with(...A).select(s).from(I.from)), I.joins)
+    const N = [];
+    let O = R.db.select(s).from(I.from);
+    if (A.length > 0 && (O = R.db.with(...A).select(s).from(I.from)), I.joins)
       for (const a of I.joins)
         switch (a.type || "left") {
           case "left":
-            N = N.leftJoin(a.table, a.on);
+            O = O.leftJoin(a.table, a.on);
             break;
           case "inner":
-            N = N.innerJoin(a.table, a.on);
+            O = O.innerJoin(a.table, a.on);
             break;
           case "right":
-            N = N.rightJoin(a.table, a.on);
+            O = O.rightJoin(a.table, a.on);
             break;
           case "full":
-            N = N.fullJoin(a.table, a.on);
+            O = O.fullJoin(a.table, a.on);
             break;
         }
     if (E.joinCubes && E.joinCubes.length > 0)
@@ -2722,19 +2850,19 @@ class LE {
           try {
             switch (M.joinType || "left") {
               case "left":
-                N = N.leftJoin(M.table, M.joinCondition);
+                O = O.leftJoin(M.table, M.joinCondition);
                 break;
               case "inner":
-                N = N.innerJoin(M.table, M.joinCondition);
+                O = O.innerJoin(M.table, M.joinCondition);
                 break;
               case "right":
-                N = N.rightJoin(M.table, M.joinCondition);
+                O = O.rightJoin(M.table, M.joinCondition);
                 break;
               case "full":
-                N = N.fullJoin(M.table, M.joinCondition);
+                O = O.fullJoin(M.table, M.joinCondition);
                 break;
             }
-            G.length > 0 && O.push(...G);
+            G.length > 0 && N.push(...G);
           } catch {
           }
         }
@@ -2743,27 +2871,27 @@ class LE {
         try {
           switch (a.joinType || "left") {
             case "left":
-              N = N.leftJoin(P, U);
+              O = O.leftJoin(P, U);
               break;
             case "inner":
-              N = N.innerJoin(P, U);
+              O = O.innerJoin(P, U);
               break;
             case "right":
-              N = N.rightJoin(P, U);
+              O = O.rightJoin(P, U);
               break;
             case "full":
-              N = N.fullJoin(P, U);
+              O = O.fullJoin(P, U);
               break;
           }
         } catch {
         }
       }
-    if (I.where && O.push(I.where), E.joinCubes && E.joinCubes.length > 0)
+    if (I.where && N.push(I.where), E.joinCubes && E.joinCubes.length > 0)
       for (const a of E.joinCubes) {
         if (S.get(a.cube.name))
           continue;
         const P = a.cube.sql(R);
-        P.where && O.push(P.where);
+        P.where && N.push(P.where);
       }
     const C = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -2773,9 +2901,9 @@ class LE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (C.length > 0 && O.push(...C), O.length > 0) {
-      const a = O.length === 1 ? O[0] : F(...O);
-      N = N.where(a);
+    if (C.length > 0 && N.push(...C), N.length > 0) {
+      const a = N.length === 1 ? N[0] : F(...N);
+      O = O.where(a);
     }
     const n = this.queryBuilder.buildGroupByFields(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -2785,8 +2913,8 @@ class LE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    n.length > 0 && (N = N.groupBy(...n));
-    const L = this.queryBuilder.buildHavingConditions(
+    n.length > 0 && (O = O.groupBy(...n));
+    const r = this.queryBuilder.buildHavingConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       T,
@@ -2794,12 +2922,12 @@ class LE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (L.length > 0) {
-      const a = L.length === 1 ? L[0] : F(...L);
-      N = N.having(a);
+    if (r.length > 0) {
+      const a = r.length === 1 ? r[0] : F(...r);
+      O = O.having(a);
     }
     const i = this.queryBuilder.buildOrderBy(T);
-    return i.length > 0 && (N = N.orderBy(...i)), N = this.queryBuilder.applyLimitAndOffset(N, T), N;
+    return i.length > 0 && (O = O.orderBy(...i)), O = this.queryBuilder.applyLimitAndOffset(O, T), O;
   }
   /**
    * Convert query plan to cube map for QueryBuilder methods
@@ -2845,36 +2973,36 @@ class LE {
     const R = {}, A = {}, S = {}, I = [E.primaryCube];
     if (E.joinCubes && E.joinCubes.length > 0 && I.push(...E.joinCubes.map((t) => t.cube)), T.measures)
       for (const t of T.measures) {
-        const [s, O] = t.split("."), N = I.find((C) => C.name === s);
-        if (N && N.measures[O]) {
-          const C = N.measures[O];
+        const [s, N] = t.split("."), O = I.find((C) => C.name === s);
+        if (O && O.measures[N]) {
+          const C = O.measures[N];
           R[t] = {
-            title: C.title || O,
-            shortTitle: C.title || O,
+            title: C.title || N,
+            shortTitle: C.title || N,
             type: C.type
           };
         }
       }
     if (T.dimensions)
       for (const t of T.dimensions) {
-        const [s, O] = t.split("."), N = I.find((C) => C.name === s);
-        if (N && N.dimensions[O]) {
-          const C = N.dimensions[O];
+        const [s, N] = t.split("."), O = I.find((C) => C.name === s);
+        if (O && O.dimensions[N]) {
+          const C = O.dimensions[N];
           A[t] = {
-            title: C.title || O,
-            shortTitle: C.title || O,
+            title: C.title || N,
+            shortTitle: C.title || N,
             type: C.type
           };
         }
       }
     if (T.timeDimensions)
       for (const t of T.timeDimensions) {
-        const [s, O] = t.dimension.split("."), N = I.find((C) => C.name === s);
-        if (N && N.dimensions && N.dimensions[O]) {
-          const C = N.dimensions[O];
+        const [s, N] = t.dimension.split("."), O = I.find((C) => C.name === s);
+        if (O && O.dimensions && O.dimensions[N]) {
+          const C = O.dimensions[N];
           S[t.dimension] = {
-            title: C.title || O,
-            shortTitle: C.title || O,
+            title: C.title || N,
+            shortTitle: C.title || N,
             type: C.type,
             granularity: t.granularity
           };
@@ -2888,7 +3016,7 @@ class LE {
     };
   }
 }
-const r = (e) => e.flatMap(Me), Me = (e) => k(ce(e)).map(Ue), Ue = (e) => e.replace(/ +/g, " ").trim(), ce = (e) => ({
+const L = (e) => e.flatMap(Me), Me = (e) => z(ce(e)).map(Ue), Ue = (e) => e.replace(/ +/g, " ").trim(), ce = (e) => ({
   type: "mandatory_block",
   items: yE(e, 0)[0]
 }), yE = (e, E, T) => {
@@ -2936,17 +3064,17 @@ const r = (e) => e.flatMap(Me), Me = (e) => k(ce(e)).map(Ue), Ue = (e) => e.repl
 }, He = (e, E) => {
   const [T, R] = yE(e, E, "]");
   return [{ type: "optional_block", items: T }, R];
-}, k = (e) => {
+}, z = (e) => {
   if (typeof e == "string")
     return [e];
   if (e.type === "concatenation")
-    return e.items.map(k).reduce(Be, [""]);
+    return e.items.map(z).reduce(me, [""]);
   if (e.type === "mandatory_block")
-    return e.items.flatMap(k);
+    return e.items.flatMap(z);
   if (e.type === "optional_block")
-    return ["", ...e.items.flatMap(k)];
+    return ["", ...e.items.flatMap(z)];
   throw new Error(`Unknown node type: ${e}`);
-}, Be = (e, E) => {
+}, me = (e, E) => {
   const T = [];
   for (const R of e)
     for (const A of E)
@@ -2969,7 +3097,7 @@ const pT = (e) => ({
   STRUCT: w({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
   WINDOW: w({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
   VALUES: w({ text: "VALUES", type: D.RESERVED_CLAUSE })
-}, FT = (e) => e === D.RESERVED_DATA_TYPE || e === D.RESERVED_KEYWORD || e === D.RESERVED_FUNCTION_NAME || e === D.RESERVED_KEYWORD_PHRASE || e === D.RESERVED_DATA_TYPE_PHRASE || e === D.RESERVED_CLAUSE || e === D.RESERVED_SELECT || e === D.RESERVED_SET_OPERATION || e === D.RESERVED_JOIN || e === D.ARRAY_KEYWORD || e === D.CASE || e === D.END || e === D.WHEN || e === D.ELSE || e === D.THEN || e === D.LIMIT || e === D.BETWEEN || e === D.AND || e === D.OR || e === D.XOR, me = (e) => e === D.AND || e === D.OR || e === D.XOR, de = [
+}, FT = (e) => e === D.RESERVED_DATA_TYPE || e === D.RESERVED_KEYWORD || e === D.RESERVED_FUNCTION_NAME || e === D.RESERVED_KEYWORD_PHRASE || e === D.RESERVED_DATA_TYPE_PHRASE || e === D.RESERVED_CLAUSE || e === D.RESERVED_SELECT || e === D.RESERVED_SET_OPERATION || e === D.RESERVED_JOIN || e === D.ARRAY_KEYWORD || e === D.CASE || e === D.END || e === D.WHEN || e === D.ELSE || e === D.THEN || e === D.LIMIT || e === D.BETWEEN || e === D.AND || e === D.OR || e === D.XOR, Be = (e) => e === D.AND || e === D.OR || e === D.XOR, de = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -3646,7 +3774,7 @@ const pT = (e) => ({
   "STRUCT",
   "TIME",
   "TIMEZONE"
-], Ye = r(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), he = r([
+], Ye = L(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), he = L([
   // Queries: https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax
   "WITH [RECURSIVE]",
   "FROM",
@@ -3675,9 +3803,9 @@ const pT = (e) => ({
   "WITH CONNECTION",
   "WITH PARTITION COLUMNS",
   "REMOTE WITH CONNECTION"
-]), jE = r([
+]), jE = L([
   "CREATE [OR REPLACE] [TEMP|TEMPORARY|SNAPSHOT|EXTERNAL] TABLE [IF NOT EXISTS]"
-]), nE = r([
+]), rE = L([
   // - create:
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -3765,15 +3893,15 @@ const pT = (e) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), fe = r([
+]), fe = L([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), Ve = r([
+]), Ve = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), We = r([
+]), We = L([
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax#tablesample_operator
   "TABLESAMPLE SYSTEM",
   // From DDL: https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
@@ -3784,11 +3912,11 @@ const pT = (e) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), be = r([]), Xe = {
+]), be = L([]), Xe = {
   name: "bigquery",
   tokenizerOptions: {
     reservedSelect: Ye,
-    reservedClauses: [...he, ...nE, ...jE],
+    reservedClauses: [...he, ...rE, ...jE],
     reservedSetOperations: fe,
     reservedJoins: Ve,
     reservedKeywordPhrases: We,
@@ -3816,8 +3944,8 @@ const pT = (e) => ({
     postProcess: ye
   },
   formatOptions: {
-    onelineClauses: [...jE, ...nE],
-    tabularOnelineClauses: nE
+    onelineClauses: [...jE, ...rE],
+    tabularOnelineClauses: rE
   }
 };
 function ye(e) {
@@ -4618,7 +4746,7 @@ const we = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], ve = r(["SELECT [ALL | DISTINCT]"]), Qe = r([
+], ve = L(["SELECT [ALL | DISTINCT]"]), Qe = L([
   // queries
   "WITH",
   "FROM",
@@ -4647,9 +4775,9 @@ const we = [
   "WHEN [NOT] MATCHED [THEN]",
   "UPDATE SET",
   "INSERT"
-]), kE = r([
+]), kE = L([
   "CREATE [GLOBAL TEMPORARY | EXTERNAL] TABLE [IF NOT EXISTS]"
-]), rE = r([
+]), LE = L([
   // - create:
   "CREATE [OR REPLACE] VIEW",
   // - update:
@@ -4852,20 +4980,20 @@ const we = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), Ze = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), je = r([
+]), Ze = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), je = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), qe = r([
+]), qe = L([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), ke = r([]), ze = {
+]), ke = L([]), ze = {
   name: "db2",
   tokenizerOptions: {
     reservedSelect: ve,
-    reservedClauses: [...Qe, ...kE, ...rE],
+    reservedClauses: [...Qe, ...kE, ...LE],
     reservedSetOperations: Ze,
     reservedJoins: je,
     reservedKeywordPhrases: qe,
@@ -4903,8 +5031,8 @@ const we = [
     ]
   },
   formatOptions: {
-    onelineClauses: [...kE, ...rE],
-    tabularOnelineClauses: rE
+    onelineClauses: [...kE, ...LE],
+    tabularOnelineClauses: LE
   }
 }, ER = [
   // https://www.ibm.com/docs/en/i/7.5?topic=functions-aggregate
@@ -5772,7 +5900,7 @@ const we = [
   "VARCHAR",
   "VARGRAPHIC",
   "XML"
-], RR = r(["SELECT [ALL | DISTINCT]"]), AR = r([
+], RR = L(["SELECT [ALL | DISTINCT]"]), AR = L([
   // queries
   "WITH [RECURSIVE]",
   "INTO",
@@ -5802,7 +5930,7 @@ const we = [
   "INSERT",
   // Data definition - table
   "FOR SYSTEM NAME"
-]), zE = r(["CREATE [OR REPLACE] TABLE"]), _E = r([
+]), zE = L(["CREATE [OR REPLACE] TABLE"]), _E = L([
   // - create:
   "CREATE [OR REPLACE] [RECURSIVE] VIEW",
   // - update:
@@ -5898,17 +6026,17 @@ const we = [
   "TAG",
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}"
-]), SR = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), IR = r([
+]), SR = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), IR = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "[LEFT | RIGHT] EXCEPTION JOIN",
   "{INNER | CROSS} JOIN"
-]), NR = r([
+]), NR = L([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), tR = r([]), sR = {
+]), tR = L([]), sR = {
   name: "db2i",
   tokenizerOptions: {
     reservedSelect: RR,
@@ -6599,7 +6727,7 @@ const we = [
   // 'NULL', we really prefer treating it as keyword
   "RANK",
   "ROW_NUMBER"
-], LR = [
+], nR = [
   // Keywords from DuckDB:
   // SELECT upper(keyword_name)
   // FROM duckdb_keywords()
@@ -6681,7 +6809,7 @@ const we = [
   "WHERE",
   "WINDOW",
   "WITH"
-], nR = [
+], rR = [
   // Types from DuckDB:
   // SELECT DISTINCT upper(type_name)
   // FROM duckdb_types()
@@ -6761,7 +6889,7 @@ const we = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], rR = r(["SELECT [ALL | DISTINCT]"]), _R = r([
+], LR = L(["SELECT [ALL | DISTINCT]"]), _R = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -6785,9 +6913,9 @@ const we = [
   "SET",
   // other:
   "RETURNING"
-]), ET = r([
+]), ET = L([
   "CREATE [OR REPLACE] [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"
-]), iE = r([
+]), iE = L([
   // TABLE
   // - update:
   "UPDATE",
@@ -6865,11 +6993,11 @@ const we = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), iR = r([
+]), iR = L([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
-]), aR = r([
+]), aR = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -6878,22 +7006,22 @@ const we = [
   "POSITIONAL JOIN",
   "ANTI JOIN",
   "SEMI JOIN"
-]), oR = r([
+]), oR = L([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "SIMILAR TO",
   "IS [NOT] DISTINCT FROM"
-]), DR = r(["TIMESTAMP WITH TIME ZONE"]), PR = {
+]), DR = L(["TIMESTAMP WITH TIME ZONE"]), PR = {
   name: "duckdb",
   tokenizerOptions: {
-    reservedSelect: rR,
+    reservedSelect: LR,
     reservedClauses: [..._R, ...ET, ...iE],
     reservedSetOperations: iR,
     reservedJoins: aR,
     reservedKeywordPhrases: oR,
     reservedDataTypePhrases: DR,
     supportsXor: !0,
-    reservedKeywords: LR,
-    reservedDataTypes: nR,
+    reservedKeywords: nR,
+    reservedDataTypes: rR,
     reservedFunctionNames: CR,
     nestedBlockComments: !0,
     extraParens: ["[]", "{}"],
@@ -7502,7 +7630,7 @@ const we = [
   "STRUCT",
   "TIMESTAMP",
   "VARCHAR"
-], lR = r(["SELECT [ALL | DISTINCT]"]), uR = r([
+], lR = L(["SELECT [ALL | DISTINCT]"]), uR = L([
   // queries
   "WITH",
   "FROM",
@@ -7536,9 +7664,9 @@ const we = [
   //   https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML#LanguageManualDML-Loadingfilesintotables
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), TT = r([
+]), TT = L([
   "CREATE [TEMPORARY] [EXTERNAL] TABLE [IF NOT EXISTS]"
-]), aE = r([
+]), aE = L([
   // - create:
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
   // - update:
@@ -7563,21 +7691,21 @@ const we = [
   "STORED AS",
   "STORED BY",
   "ROW FORMAT"
-]), GR = r(["UNION [ALL | DISTINCT]"]), HR = r([
+]), GR = L(["UNION [ALL | DISTINCT]"]), HR = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "LEFT SEMI JOIN"
-]), BR = r(["{ROWS | RANGE} BETWEEN"]), mR = r([]), dR = {
+]), mR = L(["{ROWS | RANGE} BETWEEN"]), BR = L([]), dR = {
   name: "hive",
   tokenizerOptions: {
     reservedSelect: lR,
     reservedClauses: [...uR, ...TT, ...aE],
     reservedSetOperations: GR,
     reservedJoins: HR,
-    reservedKeywordPhrases: BR,
-    reservedDataTypePhrases: mR,
+    reservedKeywordPhrases: mR,
+    reservedDataTypePhrases: BR,
     reservedKeywords: UR,
     reservedDataTypes: cR,
     reservedFunctionNames: MR,
@@ -7592,7 +7720,7 @@ const we = [
     tabularOnelineClauses: aE
   }
 };
-function RE(e) {
+function AE(e) {
   return e.map((E, T) => {
     const R = e[T + 1] || v;
     if (y.SET(E) && R.text === "(")
@@ -8107,7 +8235,7 @@ const pR = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], hR = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), fR = r([
+], hR = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), fR = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8129,9 +8257,9 @@ const pR = [
   "SET",
   // other
   "RETURNING"
-]), eT = r([
+]), eT = L([
   "CREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]"
-]), oE = r([
+]), oE = L([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -8338,12 +8466,12 @@ const pR = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), VR = r([
+]), VR = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]",
   "MINUS [ALL | DISTINCT]"
-]), WR = r([
+]), WR = L([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8351,12 +8479,12 @@ const pR = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), bR = r([
+]), bR = L([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), XR = r([]), yR = {
+]), XR = L([]), yR = {
   name: "mariadb",
   tokenizerOptions: {
     reservedSelect: hR,
@@ -8401,7 +8529,7 @@ const pR = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: RE
+    postProcess: AE
   },
   formatOptions: {
     onelineClauses: [...eT, ...oE],
@@ -9113,7 +9241,7 @@ const pR = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], wR = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), JR = r([
+], wR = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), JR = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -9133,7 +9261,7 @@ const pR = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), RT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), DE = r([
+]), RT = L(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), DE = L([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -9314,7 +9442,7 @@ const pR = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), xR = r(["UNION [ALL | DISTINCT]"]), vR = r([
+]), xR = L(["UNION [ALL | DISTINCT]"]), vR = L([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -9322,12 +9450,12 @@ const pR = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), QR = r([
+]), QR = L([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), ZR = r([]), jR = {
+]), ZR = L([]), jR = {
   name: "mysql",
   tokenizerOptions: {
     reservedSelect: wR,
@@ -9374,7 +9502,7 @@ const pR = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: RE
+    postProcess: AE
   },
   formatOptions: {
     onelineClauses: [...RT, ...DE],
@@ -9945,7 +10073,7 @@ const pR = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], EA = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), TA = r([
+], EA = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), TA = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -9965,7 +10093,7 @@ const pR = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), AT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), PE = r([
+]), AT = L(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), PE = L([
   // https://docs.pingcap.com/tidb/stable/sql-statement-create-view
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // https://docs.pingcap.com/tidb/stable/sql-statement-update
@@ -10080,7 +10208,7 @@ const pR = [
   "UNLOCK TABLES",
   // https://docs.pingcap.com/tidb/stable/sql-statement-use
   "USE"
-]), eA = r(["UNION [ALL | DISTINCT]"]), RA = r([
+]), eA = L(["UNION [ALL | DISTINCT]"]), RA = L([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10088,12 +10216,12 @@ const pR = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), AA = r([
+]), AA = L([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), SA = r([]), IA = {
+]), SA = L([]), IA = {
   name: "tidb",
   tokenizerOptions: {
     reservedSelect: EA,
@@ -10140,13 +10268,13 @@ const pR = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: RE
+    postProcess: AE
   },
   formatOptions: {
     onelineClauses: [...AT, ...PE],
     tabularOnelineClauses: PE
   }
-}, OA = [
+}, NA = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/functions.html
   "ABORT",
   "ABS",
@@ -10376,7 +10504,7 @@ const pR = [
   // not implemented in N1QL, but added here now for the sake of tests
   // https://docs.couchbase.com/server/current/analytics/3_query.html#Vs_SQL-92
   "CAST"
-], NA = [
+], OA = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/reservedwords.html
   "ADVISE",
   "ALL",
@@ -10591,7 +10719,7 @@ const pR = [
   // which it actually doesn't use.
   //
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/datatypes.html
-], sA = r(["SELECT [ALL | DISTINCT]"]), CA = r([
+], sA = L(["SELECT [ALL | DISTINCT]"]), CA = L([
   // queries
   "WITH",
   "FROM",
@@ -10618,7 +10746,7 @@ const pR = [
   "NEST",
   "UNNEST",
   "RETURNING"
-]), ST = r([
+]), ST = L([
   // - update:
   "UPDATE",
   // - delete:
@@ -10658,19 +10786,19 @@ const pR = [
   "SET CURRENT SCHEMA",
   "SHOW",
   "USE [PRIMARY] KEYS"
-]), LA = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), nA = r(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), rA = r(["{ROWS | RANGE | GROUPS} BETWEEN"]), _A = r([]), iA = {
+]), nA = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), rA = L(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), LA = L(["{ROWS | RANGE | GROUPS} BETWEEN"]), _A = L([]), iA = {
   name: "n1ql",
   tokenizerOptions: {
     reservedSelect: sA,
     reservedClauses: [...CA, ...ST],
-    reservedSetOperations: LA,
-    reservedJoins: nA,
-    reservedKeywordPhrases: rA,
+    reservedSetOperations: nA,
+    reservedJoins: rA,
+    reservedKeywordPhrases: LA,
     reservedDataTypePhrases: _A,
     supportsXor: !0,
-    reservedKeywords: NA,
+    reservedKeywords: OA,
     reservedDataTypes: tA,
-    reservedFunctionNames: OA,
+    reservedFunctionNames: NA,
     // NOTE: single quotes are actually not supported in N1QL,
     // but we support them anyway as all other SQL dialects do,
     // which simplifies writing tests that are shared between all dialects.
@@ -11292,7 +11420,7 @@ const pR = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], PA = r(["SELECT [ALL | DISTINCT | UNIQUE]"]), MA = r([
+], PA = L(["SELECT [ALL | DISTINCT | UNIQUE]"]), MA = L([
   // queries
   "WITH",
   "FROM",
@@ -11316,9 +11444,9 @@ const pR = [
   "UPDATE SET",
   // other
   "RETURNING"
-]), IT = r([
+]), IT = L([
   "CREATE [GLOBAL TEMPORARY | PRIVATE TEMPORARY | SHARDED | DUPLICATED | IMMUTABLE BLOCKCHAIN | BLOCKCHAIN | IMMUTABLE] TABLE"
-]), ME = r([
+]), ME = L([
   // - create:
   "CREATE [OR REPLACE] [NO FORCE | FORCE] [EDITIONING | EDITIONABLE | EDITIONABLE EDITIONING | NONEDITIONABLE] VIEW",
   "CREATE MATERIALIZED VIEW",
@@ -11346,7 +11474,7 @@ const pR = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), UA = r(["UNION [ALL]", "MINUS", "INTERSECT"]), cA = r([
+]), UA = L(["UNION [ALL]", "MINUS", "INTERSECT"]), cA = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -11354,11 +11482,11 @@ const pR = [
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), lA = r([
+]), lA = L([
   "ON {UPDATE | DELETE} [SET NULL]",
   "ON COMMIT",
   "{ROWS | RANGE} BETWEEN"
-]), uA = r([]), GA = {
+]), uA = L([]), GA = {
   name: "plsql",
   tokenizerOptions: {
     reservedSelect: PA,
@@ -11407,7 +11535,7 @@ function HA(e) {
   let E = v;
   return e.map((T) => y.SET(T) && y.BY(E) ? Object.assign(Object.assign({}, T), { type: D.RESERVED_KEYWORD }) : (FT(T.type) && (E = T), T));
 }
-const BA = [
+const mA = [
   // https://www.postgresql.org/docs/14/functions.html
   //
   // https://www.postgresql.org/docs/14/functions-math.html
@@ -12095,7 +12223,7 @@ const BA = [
   "PG_MCV_LIST_ITEMS",
   // cast
   "CAST"
-], mA = [
+], BA = [
   // https://www.postgresql.org/docs/14/sql-keywords-appendix.html
   "ALL",
   "ANALYSE",
@@ -12248,7 +12376,7 @@ const BA = [
   "VARCHAR",
   "XML",
   "ZONE"
-], pA = r(["SELECT [ALL | DISTINCT]"]), FA = r([
+], pA = L(["SELECT [ALL | DISTINCT]"]), FA = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12271,9 +12399,9 @@ const BA = [
   "SET",
   // other
   "RETURNING"
-]), OT = r([
+]), NT = L([
   "CREATE [GLOBAL | LOCAL] [TEMPORARY | TEMP | UNLOGGED] TABLE [IF NOT EXISTS]"
-]), UE = r([
+]), UE = L([
   // - create
   "CREATE [OR REPLACE] [TEMP | TEMPORARY] [RECURSIVE] VIEW",
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -12472,17 +12600,17 @@ const BA = [
   "START TRANSACTION",
   "UNLISTEN",
   "VACUUM"
-]), YA = r([
+]), YA = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), hA = r([
+]), hA = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), fA = r([
+]), fA = L([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
@@ -12493,21 +12621,21 @@ const BA = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), VA = r([
+]), VA = L([
   // https://www.postgresql.org/docs/current/datatype-datetime.html
   "[TIMESTAMP | TIME] {WITH | WITHOUT} TIME ZONE"
 ]), WA = {
   name: "postgresql",
   tokenizerOptions: {
     reservedSelect: pA,
-    reservedClauses: [...FA, ...OT, ...UE],
+    reservedClauses: [...FA, ...NT, ...UE],
     reservedSetOperations: YA,
     reservedJoins: hA,
     reservedKeywordPhrases: fA,
     reservedDataTypePhrases: VA,
-    reservedKeywords: mA,
+    reservedKeywords: BA,
     reservedDataTypes: dA,
-    reservedFunctionNames: BA,
+    reservedFunctionNames: mA,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     underscoresInNumbers: !0,
@@ -12619,7 +12747,7 @@ const BA = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::", ":"],
-    onelineClauses: [...OT, ...UE],
+    onelineClauses: [...NT, ...UE],
     tabularOnelineClauses: UE
   }
 }, bA = [
@@ -13178,7 +13306,7 @@ const BA = [
   "TEXT",
   "VARBYTE",
   "VARCHAR"
-], gA = r(["SELECT [ALL | DISTINCT]"]), KA = r([
+], gA = L(["SELECT [ALL | DISTINCT]"]), KA = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13196,9 +13324,9 @@ const BA = [
   "VALUES",
   // - update:
   "SET"
-]), NT = r([
+]), OT = L([
   "CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]"
-]), cE = r([
+]), cE = L([
   // - create:
   "CREATE [OR REPLACE | MATERIALIZED] VIEW",
   // - update:
@@ -13289,13 +13417,13 @@ const BA = [
   "START TRANSACTION",
   "UNLOAD",
   "VACUUM"
-]), $A = r(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), wA = r([
+]), $A = L(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), wA = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), JA = r([
+]), JA = L([
   // https://docs.aws.amazon.com/redshift/latest/dg/copy-parameters-data-conversion.html
   "NULL AS",
   // https://docs.aws.amazon.com/redshift/latest/dg/r_CREATE_EXTERNAL_SCHEMA.html
@@ -13303,11 +13431,11 @@ const BA = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), xA = r([]), vA = {
+]), xA = L([]), vA = {
   name: "redshift",
   tokenizerOptions: {
     reservedSelect: gA,
-    reservedClauses: [...KA, ...NT, ...cE],
+    reservedClauses: [...KA, ...OT, ...cE],
     reservedSetOperations: $A,
     reservedJoins: wA,
     reservedKeywordPhrases: JA,
@@ -13338,7 +13466,7 @@ const BA = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...NT, ...cE],
+    onelineClauses: [...OT, ...cE],
     tabularOnelineClauses: cE
   }
 }, QA = [
@@ -13959,7 +14087,7 @@ const BA = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], qA = r(["SELECT [ALL | DISTINCT]"]), kA = r([
+], qA = L(["SELECT [ALL | DISTINCT]"]), kA = L([
   // queries
   "WITH",
   "FROM",
@@ -13984,7 +14112,7 @@ const BA = [
   //   https://spark.apache.org/docs/latest/sql-ref-syntax-dml-load.html
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), tT = r(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), lE = r([
+]), tT = L(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), lE = L([
   // - create:
   "CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]",
   // - drop table:
@@ -14040,11 +14168,11 @@ const BA = [
   "SHOW TBLPROPERTIES",
   "SHOW VIEWS",
   "UNCACHE TABLE"
-]), zA = r([
+]), zA = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), ES = r([
+]), ES = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -14053,12 +14181,12 @@ const BA = [
   // non-standard-joins
   "[LEFT] {ANTI | SEMI} JOIN",
   "NATURAL [LEFT] {ANTI | SEMI} JOIN"
-]), TS = r([
+]), TS = L([
   "ON DELETE",
   "ON UPDATE",
   "CURRENT ROW",
   "{ROWS | RANGE} BETWEEN"
-]), eS = r([]), RS = {
+]), eS = L([]), RS = {
   name: "spark",
   tokenizerOptions: {
     reservedSelect: qA,
@@ -14372,7 +14500,7 @@ const SS = [
   "WINDOW",
   "WITH",
   "WITHOUT"
-], OS = [
+], NS = [
   // SQLite allows any word as a data type, e.g. CREATE TABLE foo (col1 madeupname(123));
   // Here we just list some common ones as SQL Formatter
   // is only able to detect a predefined list of data types.
@@ -14393,7 +14521,7 @@ const SS = [
   "TEXT",
   "VARCHAR",
   "VARYING CHARACTER"
-], NS = r(["SELECT [ALL | DISTINCT]"]), tS = r([
+], OS = L(["SELECT [ALL | DISTINCT]"]), tS = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14414,7 +14542,7 @@ const SS = [
   "SET",
   // other:
   "RETURNING"
-]), sT = r(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), uE = r([
+]), sT = L(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), uE = L([
   // - create:
   "CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]",
   // - update:
@@ -14433,27 +14561,27 @@ const SS = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), sS = r(["UNION [ALL]", "EXCEPT", "INTERSECT"]), CS = r([
+]), sS = L(["UNION [ALL]", "EXCEPT", "INTERSECT"]), CS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), LS = r([
+]), nS = L([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
-]), nS = r([]), rS = {
+]), rS = L([]), LS = {
   name: "sqlite",
   tokenizerOptions: {
-    reservedSelect: NS,
+    reservedSelect: OS,
     reservedClauses: [...tS, ...sT, ...uE],
     reservedSetOperations: sS,
     reservedJoins: CS,
-    reservedKeywordPhrases: LS,
-    reservedDataTypePhrases: nS,
+    reservedKeywordPhrases: nS,
+    reservedDataTypePhrases: rS,
     reservedKeywords: IS,
-    reservedDataTypes: OS,
+    reservedDataTypes: NS,
     reservedFunctionNames: SS,
     stringTypes: [
       "''-qq",
@@ -14805,7 +14933,7 @@ const SS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], oS = r(["SELECT [ALL | DISTINCT]"]), DS = r([
+], oS = L(["SELECT [ALL | DISTINCT]"]), DS = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14824,7 +14952,7 @@ const SS = [
   "VALUES",
   // - update:
   "SET"
-]), CT = r(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), GE = r([
+]), CT = L(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), GE = L([
   // - create:
   "CREATE [RECURSIVE] VIEW",
   // - update:
@@ -14849,20 +14977,20 @@ const SS = [
   "TRUNCATE TABLE",
   // other
   "SET SCHEMA"
-]), PS = r([
+]), PS = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), MS = r([
+]), MS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), US = r([
+]), US = L([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), cS = r([]), lS = {
+]), cS = L([]), lS = {
   name: "sql",
   tokenizerOptions: {
     reservedSelect: oS,
@@ -15596,7 +15724,7 @@ const SS = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], BS = r(["SELECT [ALL | DISTINCT]"]), mS = r([
+], mS = L(["SELECT [ALL | DISTINCT]"]), BS = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -15624,7 +15752,7 @@ const SS = [
   "PATTERN",
   "SUBSET",
   "DEFINE"
-]), LT = r(["CREATE TABLE [IF NOT EXISTS]"]), HE = r([
+]), nT = L(["CREATE TABLE [IF NOT EXISTS]"]), HE = L([
   // - create:
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW",
   // - update:
@@ -15682,25 +15810,25 @@ const SS = [
   "SHOW ROLE GRANTS",
   "SHOW FUNCTIONS",
   "SHOW SESSION"
-]), dS = r([
+]), dS = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), pS = r([
+]), pS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), FS = r([
+]), FS = L([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), YS = r([]), hS = {
+]), YS = L([]), hS = {
   name: "trino",
   tokenizerOptions: {
-    reservedSelect: BS,
-    reservedClauses: [...mS, ...LT, ...HE],
+    reservedSelect: mS,
+    reservedClauses: [...BS, ...nT, ...HE],
     reservedSetOperations: dS,
     reservedJoins: pS,
     reservedKeywordPhrases: FS,
@@ -15736,7 +15864,7 @@ const SS = [
     ]
   },
   formatOptions: {
-    onelineClauses: [...LT, ...HE],
+    onelineClauses: [...nT, ...HE],
     tabularOnelineClauses: HE
   }
 }, fS = [
@@ -16252,7 +16380,7 @@ const SS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], bS = r(["SELECT [ALL | DISTINCT]"]), XS = r([
+], bS = L(["SELECT [ALL | DISTINCT]"]), XS = L([
   // queries
   "WITH",
   "INTO",
@@ -16277,7 +16405,7 @@ const SS = [
   "MERGE [INTO]",
   "WHEN [NOT] MATCHED [BY TARGET | BY SOURCE] [THEN]",
   "UPDATE SET"
-]), nT = r(["CREATE TABLE"]), BE = r([
+]), rT = L(["CREATE TABLE"]), mE = L([
   // - create:
   "CREATE [OR ALTER] [MATERIALIZED] VIEW",
   // - update:
@@ -16457,20 +16585,20 @@ const SS = [
   "XACT_ABORT",
   "XML INDEX",
   "XML SCHEMA COLLECTION"
-]), yS = r(["UNION [ALL]", "EXCEPT", "INTERSECT"]), gS = r([
+]), yS = L(["UNION [ALL]", "EXCEPT", "INTERSECT"]), gS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), KS = r([
+]), KS = L([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), $S = r([]), wS = {
+]), $S = L([]), wS = {
   name: "transactsql",
   tokenizerOptions: {
     reservedSelect: bS,
-    reservedClauses: [...XS, ...nT, ...BE],
+    reservedClauses: [...XS, ...rT, ...mE],
     reservedSetOperations: yS,
     reservedJoins: gS,
     reservedKeywordPhrases: KS,
@@ -16507,8 +16635,8 @@ const SS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...nT, ...BE],
-    tabularOnelineClauses: BE
+    onelineClauses: [...rT, ...mE],
+    tabularOnelineClauses: mE
   }
 }, JS = [
   // List of all keywords taken from:
@@ -17052,7 +17180,7 @@ const SS = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], QS = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), ZS = r([
+], QS = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), ZS = L([
   // queries
   "WITH",
   "FROM",
@@ -17074,9 +17202,9 @@ const SS = [
   // Data definition
   "CREATE [OR REPLACE] [TEMPORARY] PROCEDURE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [EXTERNAL] FUNCTION"
-]), rT = r([
+]), LT = L([
   "CREATE [ROWSTORE] [REFERENCE | TEMPORARY | GLOBAL TEMPORARY] TABLE [IF NOT EXISTS]"
-]), mE = r([
+]), BE = L([
   // - create:
   "CREATE VIEW",
   // - update:
@@ -17253,29 +17381,29 @@ const SS = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), jS = r([
+]), jS = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
   "MINUS"
-]), qS = r([
+]), qS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), kS = r([
+]), kS = L([
   "ON DELETE",
   "ON UPDATE",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), zS = r([]), EI = {
+]), zS = L([]), EI = {
   name: "singlestoredb",
   tokenizerOptions: {
     reservedSelect: QS,
-    reservedClauses: [...ZS, ...rT, ...mE],
+    reservedClauses: [...ZS, ...LT, ...BE],
     reservedSetOperations: jS,
     reservedJoins: qS,
     reservedKeywordPhrases: kS,
@@ -17315,12 +17443,12 @@ const SS = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: RE
+    postProcess: AE
   },
   formatOptions: {
     alwaysDenseOperators: ["::", "::$", "::%"],
-    onelineClauses: [...rT, ...mE],
-    tabularOnelineClauses: mE
+    onelineClauses: [...LT, ...BE],
+    tabularOnelineClauses: BE
   }
 }, TI = [
   // https://docs.snowflake.com/en/sql-reference-functions.html
@@ -18064,7 +18192,7 @@ const SS = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], AI = r(["SELECT [ALL | DISTINCT]"]), SI = r([
+], AI = L(["SELECT [ALL | DISTINCT]"]), SI = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -18092,10 +18220,10 @@ const SS = [
   "WHEN MATCHED [AND]",
   "THEN {UPDATE SET | DELETE}",
   "WHEN NOT MATCHED THEN INSERT"
-]), _T = r([
+]), _T = L([
   "CREATE [OR REPLACE] [VOLATILE] TABLE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [LOCAL | GLOBAL] {TEMP|TEMPORARY} TABLE [IF NOT EXISTS]"
-]), dE = r([
+]), dE = L([
   // - create:
   "CREATE [OR REPLACE] [SECURE] [RECURSIVE] VIEW [IF NOT EXISTS]",
   // - update:
@@ -18336,21 +18464,21 @@ const SS = [
   "USE SCHEMA",
   "USE SECONDARY ROLES",
   "USE WAREHOUSE"
-]), II = r(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), OI = r([
+]), II = L(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), NI = L([
   "[INNER] JOIN",
   "[NATURAL] {LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{CROSS | NATURAL} JOIN"
-]), NI = r([
+]), OI = L([
   "{ROWS | RANGE} BETWEEN",
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]"
-]), tI = r([]), sI = {
+]), tI = L([]), sI = {
   name: "snowflake",
   tokenizerOptions: {
     reservedSelect: AI,
     reservedClauses: [...SI, ..._T, ...dE],
     reservedSetOperations: II,
-    reservedJoins: OI,
-    reservedKeywordPhrases: NI,
+    reservedJoins: NI,
+    reservedKeywordPhrases: OI,
     reservedDataTypePhrases: tI,
     reservedKeywords: eI,
     reservedDataTypes: RI,
@@ -18404,11 +18532,11 @@ const SS = [
   snowflake: sI,
   spark: RS,
   sql: lS,
-  sqlite: rS,
+  sqlite: LS,
   tidb: IA,
   transactsql: wS,
   trino: hS
-}, Symbol.toStringTag, { value: "Module" })), Z = (e) => e[e.length - 1], YT = (e) => e.sort((E, T) => T.length - E.length || E.localeCompare(T)), z = (e) => e.replace(/\s+/gu, " "), pE = (e) => /\n/.test(e), h = (e) => e.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), iT = /\s+/uy, g = (e) => new RegExp(`(?:${e})`, "uy"), LI = (e) => e.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), nI = (e) => e + "(?:-" + e + ")*", rI = ({ prefixes: e, requirePrefix: E }) => `(?:${e.map(LI).join("|")}${E ? "" : "|"})`, _I = (e) => new RegExp(`(?:${e.map(h).join("|")}).*?(?=\r
+}, Symbol.toStringTag, { value: "Module" })), Z = (e) => e[e.length - 1], YT = (e) => e.sort((E, T) => T.length - E.length || E.localeCompare(T)), EE = (e) => e.replace(/\s+/gu, " "), pE = (e) => /\n/.test(e), h = (e) => e.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), iT = /\s+/uy, g = (e) => new RegExp(`(?:${e})`, "uy"), nI = (e) => e.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), rI = (e) => e + "(?:-" + e + ")*", LI = ({ prefixes: e, requirePrefix: E }) => `(?:${e.map(nI).join("|")}${E ? "" : "|"})`, _I = (e) => new RegExp(`(?:${e.map(h).join("|")}).*?(?=\r
 |\r|
 |$)`, "uy"), aT = (e, E = []) => {
   const T = e === "open" ? 0 : 1, R = ["()", ...E].map((A) => A[T]);
@@ -18456,9 +18584,9 @@ const SS = [
   "{}": String.raw`(?:\{[^\}]*\})`,
   // Oracle q'' strings: q'<text>' q'|text|' ...
   "q''": aI()
-}, hT = (e) => typeof e == "string" ? DT[e] : "regex" in e ? e.regex : rI(e) + DT[e.quote], oI = (e) => g(e.map((E) => "regex" in E ? E.regex : hT(E)).join("|")), fT = (e) => e.map(hT).join("|"), PT = (e) => g(fT(e)), DI = (e = {}) => g(VT(e)), VT = ({ first: e, rest: E, dashes: T, allowFirstCharNumber: R } = {}) => {
+}, hT = (e) => typeof e == "string" ? DT[e] : "regex" in e ? e.regex : LI(e) + DT[e.quote], oI = (e) => g(e.map((E) => "regex" in E ? E.regex : hT(E)).join("|")), fT = (e) => e.map(hT).join("|"), PT = (e) => g(fT(e)), DI = (e = {}) => g(VT(e)), VT = ({ first: e, rest: E, dashes: T, allowFirstCharNumber: R } = {}) => {
   const A = "\\p{Alphabetic}\\p{Mark}_", S = "\\p{Decimal_Number}", I = h(e ?? ""), t = h(E ?? ""), s = R ? `[${A}${S}${I}][${A}${S}${t}]*` : `[${A}${I}][${A}${S}${t}]*`;
-  return T ? nI(s) : s;
+  return T ? rI(s) : s;
 };
 function WT(e, E) {
   const T = e.slice(0, E).split(/\n/);
@@ -18596,82 +18724,82 @@ class lI {
       {
         type: D.RESERVED_KEYWORD_PHRASE,
         regex: V((R = E.reservedKeywordPhrases) !== null && R !== void 0 ? R : [], E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_DATA_TYPE_PHRASE,
         regex: V((A = E.reservedDataTypePhrases) !== null && A !== void 0 ? A : [], E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.CASE,
         regex: /CASE\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.END,
         regex: /END\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.BETWEEN,
         regex: /BETWEEN\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.LIMIT,
         regex: E.reservedClauses.includes("LIMIT") ? /LIMIT\b/iuy : void 0,
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_CLAUSE,
         regex: V(E.reservedClauses, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_SELECT,
         regex: V(E.reservedSelect, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_SET_OPERATION,
         regex: V(E.reservedSetOperations, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.WHEN,
         regex: /WHEN\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.ELSE,
         regex: /ELSE\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.THEN,
         regex: /THEN\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_JOIN,
         regex: V(E.reservedJoins, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.AND,
         regex: /AND\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.OR,
         regex: /OR\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.XOR,
         regex: E.supportsXor ? /XOR\b/iuy : void 0,
-        text: m
+        text: B
       },
       ...E.operatorKeyword ? [
         {
@@ -18682,17 +18810,17 @@ class lI {
       {
         type: D.RESERVED_FUNCTION_NAME,
         regex: V(E.reservedFunctionNames, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_DATA_TYPE,
         regex: V(E.reservedDataTypes, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_KEYWORD,
         regex: V(E.reservedKeywords, E.identChars),
-        text: m
+        text: B
       }
     ]);
   }
@@ -18759,31 +18887,31 @@ class lI {
       {
         type: D.NAMED_PARAMETER,
         regex: FE(s.named, VT(E.paramChars || E.identChars)),
-        key: (O) => O.slice(1)
+        key: (N) => N.slice(1)
       },
       {
         type: D.QUOTED_PARAMETER,
         regex: FE(s.quoted, fT(E.identTypes)),
-        key: (O) => (({ tokenKey: N, quoteChar: C }) => N.replace(new RegExp(h("\\" + C), "gu"), C))({
-          tokenKey: O.slice(2, -1),
-          quoteChar: O.slice(-1)
+        key: (N) => (({ tokenKey: O, quoteChar: C }) => O.replace(new RegExp(h("\\" + C), "gu"), C))({
+          tokenKey: N.slice(2, -1),
+          quoteChar: N.slice(-1)
         })
       },
       {
         type: D.NUMBERED_PARAMETER,
         regex: FE(s.numbered, "[0-9]+"),
-        key: (O) => O.slice(1)
+        key: (N) => N.slice(1)
       },
       {
         type: D.POSITIONAL_PARAMETER,
         regex: s.positional ? /[?]/y : void 0
       },
-      ...s.custom.map((O) => {
-        var N;
+      ...s.custom.map((N) => {
+        var O;
         return {
           type: D.CUSTOM_PARAMETER,
-          regex: g(O.regex),
-          key: (N = O.key) !== null && N !== void 0 ? N : ((C) => C)
+          regex: g(N.regex),
+          key: (O = N.key) !== null && O !== void 0 ? O : ((C) => C)
         };
       })
     ]);
@@ -18793,7 +18921,7 @@ class lI {
     return E.filter((T) => !!T.regex);
   }
 }
-const m = (e) => z(e.toUpperCase()), UT = /* @__PURE__ */ new Map(), uI = (e) => {
+const B = (e) => EE(e.toUpperCase()), UT = /* @__PURE__ */ new Map(), uI = (e) => {
   let E = UT.get(e);
   return E || (E = GI(e), UT.set(e, E)), E;
 }, GI = (e) => ({
@@ -18807,13 +18935,13 @@ const m = (e) => z(e.toUpperCase()), UT = /* @__PURE__ */ new Map(), uI = (e) =>
     tabularOnelineClauses: Object.fromEntries(((E = e.tabularOnelineClauses) !== null && E !== void 0 ? E : e.onelineClauses).map((T) => [T, !0]))
   };
 };
-function BI(e) {
+function mI(e) {
   return e.indentStyle === "tabularLeft" || e.indentStyle === "tabularRight" ? " ".repeat(10) : e.useTabs ? "	" : " ".repeat(e.tabWidth);
 }
 function J(e) {
   return e.indentStyle === "tabularLeft" || e.indentStyle === "tabularRight";
 }
-class mI {
+class BI {
   constructor(E) {
     this.params = E, this.index = 0;
   }
@@ -18839,42 +18967,42 @@ class mI {
 function dI(e) {
   return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
 }
-var EE = { exports: {} }, pI = EE.exports, cT;
+var TE = { exports: {} }, pI = TE.exports, cT;
 function FI() {
   return cT || (cT = 1, (function(e) {
     (function(E, T) {
       e.exports ? e.exports = T() : E.nearley = T();
     })(pI, function() {
-      function E(O, N, C) {
-        return this.id = ++E.highestId, this.name = O, this.symbols = N, this.postprocess = C, this;
+      function E(N, O, C) {
+        return this.id = ++E.highestId, this.name = N, this.symbols = O, this.postprocess = C, this;
       }
-      E.highestId = 0, E.prototype.toString = function(O) {
-        var N = typeof O > "u" ? this.symbols.map(s).join(" ") : this.symbols.slice(0, O).map(s).join(" ") + " ● " + this.symbols.slice(O).map(s).join(" ");
-        return this.name + " → " + N;
+      E.highestId = 0, E.prototype.toString = function(N) {
+        var O = typeof N > "u" ? this.symbols.map(s).join(" ") : this.symbols.slice(0, N).map(s).join(" ") + " ● " + this.symbols.slice(N).map(s).join(" ");
+        return this.name + " → " + O;
       };
-      function T(O, N, C, n) {
-        this.rule = O, this.dot = N, this.reference = C, this.data = [], this.wantedBy = n, this.isComplete = this.dot === O.symbols.length;
+      function T(N, O, C, n) {
+        this.rule = N, this.dot = O, this.reference = C, this.data = [], this.wantedBy = n, this.isComplete = this.dot === N.symbols.length;
       }
       T.prototype.toString = function() {
         return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
-      }, T.prototype.nextState = function(O) {
-        var N = new T(this.rule, this.dot + 1, this.reference, this.wantedBy);
-        return N.left = this, N.right = O, N.isComplete && (N.data = N.build(), N.right = void 0), N;
+      }, T.prototype.nextState = function(N) {
+        var O = new T(this.rule, this.dot + 1, this.reference, this.wantedBy);
+        return O.left = this, O.right = N, O.isComplete && (O.data = O.build(), O.right = void 0), O;
       }, T.prototype.build = function() {
-        var O = [], N = this;
+        var N = [], O = this;
         do
-          O.push(N.right.data), N = N.left;
-        while (N.left);
-        return O.reverse(), O;
+          N.push(O.right.data), O = O.left;
+        while (O.left);
+        return N.reverse(), N;
       }, T.prototype.finish = function() {
         this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, I.fail));
       };
-      function R(O, N) {
-        this.grammar = O, this.index = N, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
+      function R(N, O) {
+        this.grammar = N, this.index = O, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
       }
-      R.prototype.process = function(O) {
-        for (var N = this.states, C = this.wants, n = this.completed, L = 0; L < N.length; L++) {
-          var i = N[L];
+      R.prototype.process = function(N) {
+        for (var O = this.states, C = this.wants, n = this.completed, r = 0; r < O.length; r++) {
+          var i = O[r];
           if (i.isComplete) {
             if (i.finish(), i.data !== I.fail) {
               for (var a = i.wantedBy, l = a.length; l--; ) {
@@ -18902,93 +19030,93 @@ function FI() {
               C[U] = [i], this.predict(U);
           }
         }
-      }, R.prototype.predict = function(O) {
-        for (var N = this.grammar.byName[O] || [], C = 0; C < N.length; C++) {
-          var n = N[C], L = this.wants[O], i = new T(n, 0, this.index, L);
+      }, R.prototype.predict = function(N) {
+        for (var O = this.grammar.byName[N] || [], C = 0; C < O.length; C++) {
+          var n = O[C], r = this.wants[N], i = new T(n, 0, this.index, r);
           this.states.push(i);
         }
-      }, R.prototype.complete = function(O, N) {
-        var C = O.nextState(N);
+      }, R.prototype.complete = function(N, O) {
+        var C = N.nextState(O);
         this.states.push(C);
       };
-      function A(O, N) {
-        this.rules = O, this.start = N || this.rules[0].name;
+      function A(N, O) {
+        this.rules = N, this.start = O || this.rules[0].name;
         var C = this.byName = {};
         this.rules.forEach(function(n) {
           C.hasOwnProperty(n.name) || (C[n.name] = []), C[n.name].push(n);
         });
       }
-      A.fromCompiled = function(n, N) {
+      A.fromCompiled = function(n, O) {
         var C = n.Lexer;
-        n.ParserStart && (N = n.ParserStart, n = n.ParserRules);
+        n.ParserStart && (O = n.ParserStart, n = n.ParserRules);
         var n = n.map(function(i) {
           return new E(i.name, i.symbols, i.postprocess);
-        }), L = new A(n, N);
-        return L.lexer = C, L;
+        }), r = new A(n, O);
+        return r.lexer = C, r;
       };
       function S() {
         this.reset("");
       }
-      S.prototype.reset = function(O, N) {
-        this.buffer = O, this.index = 0, this.line = N ? N.line : 1, this.lastLineBreak = N ? -N.col : 0;
+      S.prototype.reset = function(N, O) {
+        this.buffer = N, this.index = 0, this.line = O ? O.line : 1, this.lastLineBreak = O ? -O.col : 0;
       }, S.prototype.next = function() {
         if (this.index < this.buffer.length) {
-          var O = this.buffer[this.index++];
-          return O === `
-` && (this.line += 1, this.lastLineBreak = this.index), { value: O };
+          var N = this.buffer[this.index++];
+          return N === `
+` && (this.line += 1, this.lastLineBreak = this.index), { value: N };
         }
       }, S.prototype.save = function() {
         return {
           line: this.line,
           col: this.index - this.lastLineBreak
         };
-      }, S.prototype.formatError = function(O, N) {
+      }, S.prototype.formatError = function(N, O) {
         var C = this.buffer;
         if (typeof C == "string") {
           var n = C.split(`
 `).slice(
             Math.max(0, this.line - 5),
             this.line
-          ), L = C.indexOf(`
+          ), r = C.indexOf(`
 `, this.index);
-          L === -1 && (L = C.length);
+          r === -1 && (r = C.length);
           var i = this.index - this.lastLineBreak, a = String(this.line).length;
-          return N += " at line " + this.line + " col " + i + `:
+          return O += " at line " + this.line + " col " + i + `:
 
-`, N += n.map(function(P, U) {
+`, O += n.map(function(P, U) {
             return l(this.line - n.length + U + 1, a) + " " + P;
           }, this).join(`
-`), N += `
+`), O += `
 ` + l("", a + i) + `^
-`, N;
+`, O;
         } else
-          return N + " at index " + (this.index - 1);
+          return O + " at index " + (this.index - 1);
         function l(P, U) {
           var M = String(P);
           return Array(U - M.length + 1).join(" ") + M;
         }
       };
-      function I(O, N, C) {
-        if (O instanceof A)
-          var n = O, C = N;
+      function I(N, O, C) {
+        if (N instanceof A)
+          var n = N, C = O;
         else
-          var n = A.fromCompiled(O, N);
+          var n = A.fromCompiled(N, O);
         this.grammar = n, this.options = {
           keepHistory: !1,
           lexer: n.lexer || new S()
         };
-        for (var L in C || {})
-          this.options[L] = C[L];
+        for (var r in C || {})
+          this.options[r] = C[r];
         this.lexer = this.options.lexer, this.lexerState = void 0;
         var i = new R(n, 0);
         this.table = [i], i.wants[n.start] = [], i.predict(n.start), i.process(), this.current = 0;
       }
-      I.fail = {}, I.prototype.feed = function(O) {
-        var N = this.lexer;
-        N.reset(O, this.lexerState);
+      I.fail = {}, I.prototype.feed = function(N) {
+        var O = this.lexer;
+        O.reset(N, this.lexerState);
         for (var C; ; ) {
           try {
-            if (C = N.next(), !C)
+            if (C = O.next(), !C)
               break;
           } catch (Y) {
             var a = new R(this.grammar, this.current + 1);
@@ -18996,42 +19124,42 @@ function FI() {
             var n = new Error(this.reportLexerError(Y));
             throw n.offset = this.current, n.token = Y.token, n;
           }
-          var L = this.table[this.current];
+          var r = this.table[this.current];
           this.options.keepHistory || delete this.table[this.current - 1];
           var i = this.current + 1, a = new R(this.grammar, i);
           this.table.push(a);
-          for (var l = C.text !== void 0 ? C.text : C.value, P = N.constructor === S ? C.value : C, U = L.scannable, M = U.length; M--; ) {
+          for (var l = C.text !== void 0 ? C.text : C.value, P = O.constructor === S ? C.value : C, U = r.scannable, M = U.length; M--; ) {
             var G = U[M], H = G.rule.symbols[G.dot];
             if (H.test ? H.test(P) : H.type ? H.type === C.type : H.literal === l) {
-              var B = G.nextState({ data: P, token: C, isToken: !0, reference: i - 1 });
-              a.states.push(B);
+              var m = G.nextState({ data: P, token: C, isToken: !0, reference: i - 1 });
+              a.states.push(m);
             }
           }
           if (a.process(), a.states.length === 0) {
             var n = new Error(this.reportError(C));
             throw n.offset = this.current, n.token = C, n;
           }
-          this.options.keepHistory && (L.lexerState = N.save()), this.current++;
+          this.options.keepHistory && (r.lexerState = O.save()), this.current++;
         }
-        return L && (this.lexerState = N.save()), this.results = this.finish(), this;
-      }, I.prototype.reportLexerError = function(O) {
-        var N, C, n = O.token;
-        return n ? (N = "input " + JSON.stringify(n.text[0]) + " (lexer error)", C = this.lexer.formatError(n, "Syntax error")) : (N = "input (lexer error)", C = O.message), this.reportErrorCommon(C, N);
-      }, I.prototype.reportError = function(O) {
-        var N = (O.type ? O.type + " token: " : "") + JSON.stringify(O.value !== void 0 ? O.value : O), C = this.lexer.formatError(O, "Syntax error");
-        return this.reportErrorCommon(C, N);
-      }, I.prototype.reportErrorCommon = function(O, N) {
+        return r && (this.lexerState = O.save()), this.results = this.finish(), this;
+      }, I.prototype.reportLexerError = function(N) {
+        var O, C, n = N.token;
+        return n ? (O = "input " + JSON.stringify(n.text[0]) + " (lexer error)", C = this.lexer.formatError(n, "Syntax error")) : (O = "input (lexer error)", C = N.message), this.reportErrorCommon(C, O);
+      }, I.prototype.reportError = function(N) {
+        var O = (N.type ? N.type + " token: " : "") + JSON.stringify(N.value !== void 0 ? N.value : N), C = this.lexer.formatError(N, "Syntax error");
+        return this.reportErrorCommon(C, O);
+      }, I.prototype.reportErrorCommon = function(N, O) {
         var C = [];
-        C.push(O);
-        var n = this.table.length - 2, L = this.table[n], i = L.states.filter(function(l) {
+        C.push(N);
+        var n = this.table.length - 2, r = this.table[n], i = r.states.filter(function(l) {
           var P = l.rule.symbols[l.dot];
           return P && typeof P != "string";
         });
         if (i.length === 0)
-          C.push("Unexpected " + N + `. I did not expect any more input. Here is the state of my parse table:
-`), this.displayStateStack(L.states, C);
+          C.push("Unexpected " + O + `. I did not expect any more input. Here is the state of my parse table:
+`), this.displayStateStack(r.states, C);
         else {
-          C.push("Unexpected " + N + `. Instead, I was expecting to see one of the following:
+          C.push("Unexpected " + O + `. Instead, I was expecting to see one of the following:
 `);
           var a = i.map(function(l) {
             return this.buildFirstStateStack(l, []) || [l];
@@ -19043,68 +19171,68 @@ function FI() {
         }
         return C.push(""), C.join(`
 `);
-      }, I.prototype.displayStateStack = function(O, N) {
-        for (var C, n = 0, L = 0; L < O.length; L++) {
-          var i = O[L], a = i.rule.toString(i.dot);
-          a === C ? n++ : (n > 0 && N.push("    ^ " + n + " more lines identical to this"), n = 0, N.push("    " + a)), C = a;
+      }, I.prototype.displayStateStack = function(N, O) {
+        for (var C, n = 0, r = 0; r < N.length; r++) {
+          var i = N[r], a = i.rule.toString(i.dot);
+          a === C ? n++ : (n > 0 && O.push("    ^ " + n + " more lines identical to this"), n = 0, O.push("    " + a)), C = a;
         }
-      }, I.prototype.getSymbolDisplay = function(O) {
-        return t(O);
-      }, I.prototype.buildFirstStateStack = function(O, N) {
-        if (N.indexOf(O) !== -1)
+      }, I.prototype.getSymbolDisplay = function(N) {
+        return t(N);
+      }, I.prototype.buildFirstStateStack = function(N, O) {
+        if (O.indexOf(N) !== -1)
           return null;
-        if (O.wantedBy.length === 0)
-          return [O];
-        var C = O.wantedBy[0], n = [O].concat(N), L = this.buildFirstStateStack(C, n);
-        return L === null ? null : [O].concat(L);
+        if (N.wantedBy.length === 0)
+          return [N];
+        var C = N.wantedBy[0], n = [N].concat(O), r = this.buildFirstStateStack(C, n);
+        return r === null ? null : [N].concat(r);
       }, I.prototype.save = function() {
-        var O = this.table[this.current];
-        return O.lexerState = this.lexerState, O;
-      }, I.prototype.restore = function(O) {
-        var N = O.index;
-        this.current = N, this.table[N] = O, this.table.splice(N + 1), this.lexerState = O.lexerState, this.results = this.finish();
-      }, I.prototype.rewind = function(O) {
+        var N = this.table[this.current];
+        return N.lexerState = this.lexerState, N;
+      }, I.prototype.restore = function(N) {
+        var O = N.index;
+        this.current = O, this.table[O] = N, this.table.splice(O + 1), this.lexerState = N.lexerState, this.results = this.finish();
+      }, I.prototype.rewind = function(N) {
         if (!this.options.keepHistory)
           throw new Error("set option `keepHistory` to enable rewinding");
-        this.restore(this.table[O]);
+        this.restore(this.table[N]);
       }, I.prototype.finish = function() {
-        var O = [], N = this.grammar.start, C = this.table[this.table.length - 1];
+        var N = [], O = this.grammar.start, C = this.table[this.table.length - 1];
         return C.states.forEach(function(n) {
-          n.rule.name === N && n.dot === n.rule.symbols.length && n.reference === 0 && n.data !== I.fail && O.push(n);
-        }), O.map(function(n) {
+          n.rule.name === O && n.dot === n.rule.symbols.length && n.reference === 0 && n.data !== I.fail && N.push(n);
+        }), N.map(function(n) {
           return n.data;
         });
       };
-      function t(O) {
-        var N = typeof O;
-        if (N === "string")
-          return O;
-        if (N === "object") {
-          if (O.literal)
-            return JSON.stringify(O.literal);
-          if (O instanceof RegExp)
-            return "character matching " + O;
-          if (O.type)
-            return O.type + " token";
-          if (O.test)
-            return "token matching " + String(O.test);
-          throw new Error("Unknown symbol type: " + O);
+      function t(N) {
+        var O = typeof N;
+        if (O === "string")
+          return N;
+        if (O === "object") {
+          if (N.literal)
+            return JSON.stringify(N.literal);
+          if (N instanceof RegExp)
+            return "character matching " + N;
+          if (N.type)
+            return N.type + " token";
+          if (N.test)
+            return "token matching " + String(N.test);
+          throw new Error("Unknown symbol type: " + N);
         }
       }
-      function s(O) {
-        var N = typeof O;
-        if (N === "string")
-          return O;
-        if (N === "object") {
-          if (O.literal)
-            return JSON.stringify(O.literal);
-          if (O instanceof RegExp)
-            return O.toString();
-          if (O.type)
-            return "%" + O.type;
-          if (O.test)
-            return "<" + String(O.test) + ">";
-          throw new Error("Unknown symbol type: " + O);
+      function s(N) {
+        var O = typeof N;
+        if (O === "string")
+          return N;
+        if (O === "object") {
+          if (N.literal)
+            return JSON.stringify(N.literal);
+          if (N instanceof RegExp)
+            return N.toString();
+          if (N.type)
+            return "%" + N.type;
+          if (N.test)
+            return "<" + String(N.test) + ">";
+          throw new Error("Unknown symbol type: " + N);
         }
       }
       return {
@@ -19113,7 +19241,7 @@ function FI() {
         Rule: E
       };
     });
-  })(EE)), EE.exports;
+  })(TE)), TE.exports;
 }
 var YI = FI();
 const hI = /* @__PURE__ */ dI(YI);
@@ -19724,7 +19852,7 @@ function uT(e, E) {
   return e.length >= 10 && e.includes(" ") && ([e, ...T] = e.split(" ")), E === "tabularLeft" ? e = e.padEnd(9, " ") : e = e.padStart(9, " "), e + ["", ...T].join(" ");
 }
 function GT(e) {
-  return me(e) || e === D.RESERVED_CLAUSE || e === D.RESERVED_SELECT || e === D.RESERVED_SET_OPERATION || e === D.RESERVED_JOIN || e === D.LIMIT;
+  return Be(e) || e === D.RESERVED_CLAUSE || e === D.RESERVED_SELECT || e === D.RESERVED_SET_OPERATION || e === D.RESERVED_JOIN || e === D.LIMIT;
 }
 const hE = "top-level", jI = "block-level";
 class KT {
@@ -19796,7 +19924,7 @@ class qI extends gT {
 }
 class VE extends Error {
 }
-class eE {
+class RE {
   constructor({ cfg: E, dialectCfg: T, params: R, layout: A, inline: S = !1 }) {
     this.inline = !1, this.nodes = [], this.index = -1, this.cfg = E, this.dialectCfg = T, this.inline = S, this.params = R, this.layout = A;
   }
@@ -20004,7 +20132,7 @@ class eE {
     return this.isDocComment(E) ? E.split(/\n/).map((T) => /^\s*\*/.test(T) ? " " + T.replace(/^\s*/, "") : T) : E.split(/\n/).map((T) => T.replace(/^\s*/, ""));
   }
   formatSubExpression(E) {
-    return new eE({
+    return new RE({
       cfg: this.cfg,
       dialectCfg: this.dialectCfg,
       params: this.params,
@@ -20015,7 +20143,7 @@ class eE {
   formatInlineExpression(E) {
     const T = this.params.getPositionalParameterIndex();
     try {
-      return new eE({
+      return new RE({
         cfg: this.cfg,
         dialectCfg: this.dialectCfg,
         params: this.params,
@@ -20061,7 +20189,7 @@ class eE {
   showNonTabularKw(E) {
     switch (this.cfg.keywordCase) {
       case "preserve":
-        return z(E.raw);
+        return EE(E.raw);
       case "upper":
         return E.text;
       case "lower":
@@ -20075,7 +20203,7 @@ class eE {
   showNonTabularFunctionKw(E) {
     switch (this.cfg.functionCase) {
       case "preserve":
-        return z(E.raw);
+        return EE(E.raw);
       case "upper":
         return E.text;
       case "lower":
@@ -20097,7 +20225,7 @@ class eE {
   showDataType(E) {
     switch (this.cfg.dataTypeCase) {
       case "preserve":
-        return z(E.raw);
+        return EE(E.raw);
       case "upper":
         return E.text;
       case "lower":
@@ -20107,7 +20235,7 @@ class eE {
 }
 class kI {
   constructor(E, T) {
-    this.dialect = E, this.cfg = T, this.params = new mI(this.cfg.params);
+    this.dialect = E, this.cfg = T, this.params = new BI(this.cfg.params);
   }
   /**
    * Formats an SQL query.
@@ -20126,16 +20254,16 @@ class kI {
 `.repeat(this.cfg.linesBetweenQueries + 1));
   }
   formatStatement(E) {
-    const T = new eE({
+    const T = new RE({
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new gT(new KT(BI(this.cfg)))
+      layout: new gT(new KT(mI(this.cfg)))
     }).format(E.children);
     return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? T.add(o.NEWLINE, ";") : T.add(o.NO_NEWLINE, ";")), T.toString();
   }
 }
-class TE extends Error {
+class eE extends Error {
 }
 function zI(e) {
   const E = [
@@ -20148,20 +20276,20 @@ function zI(e) {
   ];
   for (const T of E)
     if (T in e)
-      throw new TE(`${T} config is no more supported.`);
+      throw new eE(`${T} config is no more supported.`);
   if (e.expressionWidth <= 0)
-    throw new TE(`expressionWidth config must be positive number. Received ${e.expressionWidth} instead.`);
-  if (e.params && !EO(e.params) && console.warn('WARNING: All "params" option values should be strings.'), e.paramTypes && !TO(e.paramTypes))
-    throw new TE("Empty regex given in custom paramTypes. That would result in matching infinite amount of parameters.");
+    throw new eE(`expressionWidth config must be positive number. Received ${e.expressionWidth} instead.`);
+  if (e.params && !EN(e.params) && console.warn('WARNING: All "params" option values should be strings.'), e.paramTypes && !TN(e.paramTypes))
+    throw new eE("Empty regex given in custom paramTypes. That would result in matching infinite amount of parameters.");
   return e;
 }
-function EO(e) {
+function EN(e) {
   return (e instanceof Array ? e : Object.values(e)).every((T) => typeof T == "string");
 }
-function TO(e) {
+function TN(e) {
   return e.custom && Array.isArray(e.custom) ? e.custom.every((E) => E.regex !== "") : !0;
 }
-var eO = function(e, E) {
+var eN = function(e, E) {
   var T = {};
   for (var R in e) Object.prototype.hasOwnProperty.call(e, R) && E.indexOf(R) < 0 && (T[R] = e[R]);
   if (e != null && typeof Object.getOwnPropertySymbols == "function")
@@ -20190,7 +20318,7 @@ const $T = {
   tsql: "transactsql",
   singlestoredb: "singlestoredb",
   snowflake: "snowflake"
-}, RO = Object.keys($T), AO = {
+}, RN = Object.keys($T), AN = {
   tabWidth: 2,
   useTabs: !1,
   keywordCase: "preserve",
@@ -20203,21 +20331,21 @@ const $T = {
   linesBetweenQueries: 1,
   denseOperators: !1,
   newlineBeforeSemicolon: !1
-}, SO = (e, E = {}) => {
-  if (typeof E.language == "string" && !RO.includes(E.language))
-    throw new TE(`Unsupported SQL dialect: ${E.language}`);
+}, SN = (e, E = {}) => {
+  if (typeof E.language == "string" && !RN.includes(E.language))
+    throw new eE(`Unsupported SQL dialect: ${E.language}`);
   const T = $T[E.language || "sql"];
-  return IO(e, Object.assign(Object.assign({}, E), { dialect: CI[T] }));
-}, IO = (e, E) => {
-  var { dialect: T } = E, R = eO(E, ["dialect"]);
+  return IN(e, Object.assign(Object.assign({}, E), { dialect: CI[T] }));
+}, IN = (e, E) => {
+  var { dialect: T } = E, R = eN(E, ["dialect"]);
   if (typeof e != "string")
     throw new Error("Invalid query argument. Expected string, instead got " + typeof e);
-  const A = zI(Object.assign(Object.assign({}, AO), R));
+  const A = zI(Object.assign(Object.assign({}, AN), R));
   return new kI(uI(T), A).format(e);
 };
 function HT(e, E) {
   try {
-    return SO(e, {
+    return SN(e, {
       language: {
         postgres: "postgresql",
         mysql: "mysql",
@@ -20233,7 +20361,7 @@ function HT(e, E) {
     return console.warn("SQL formatting failed:", T), e;
   }
 }
-class OO {
+class NN {
   cubes = /* @__PURE__ */ new Map();
   dbExecutor;
   metadataCache;
@@ -20292,7 +20420,7 @@ class OO {
           );
           continue;
         }
-        const S = Le(A.calculatedSql);
+        const S = ne(A.calculatedSql);
         if (!S.isValid) {
           T.push(
             `Invalid calculatedSql syntax in '${E.name}.${R}': ${S.errors.join(", ")}`
@@ -20349,7 +20477,7 @@ ${T.join(`
   async execute(E, T) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new LE(this.dbExecutor).execute(this.cubes, E, T);
+    return new nE(this.dbExecutor).execute(this.cubes, E, T);
   }
   /**
    * Execute a multi-cube query
@@ -20399,27 +20527,27 @@ ${T.join(`
   generateCubeMetadata(E) {
     const T = Object.keys(E.measures), R = Object.keys(E.dimensions), A = new Array(T.length), S = new Array(R.length);
     for (let t = 0; t < T.length; t++) {
-      const s = T[t], O = E.measures[s];
+      const s = T[t], N = E.measures[s];
       A[t] = {
         name: `${E.name}.${s}`,
-        title: O.title || s,
-        shortTitle: O.title || s,
-        type: O.type,
+        title: N.title || s,
+        shortTitle: N.title || s,
+        type: N.type,
         format: void 0,
         // Measure doesn't have format field
-        description: O.description
+        description: N.description
       };
     }
     for (let t = 0; t < R.length; t++) {
-      const s = R[t], O = E.dimensions[s];
+      const s = R[t], N = E.dimensions[s];
       S[t] = {
         name: `${E.name}.${s}`,
-        title: O.title || s,
-        shortTitle: O.title || s,
-        type: O.type,
+        title: N.title || s,
+        shortTitle: N.title || s,
+        type: N.type,
         format: void 0,
         // Dimension doesn't have format field
-        description: O.description
+        description: N.description
       };
     }
     const I = [];
@@ -20429,9 +20557,9 @@ ${T.join(`
         I.push({
           targetCube: s.name,
           relationship: t.relationship,
-          joinFields: t.on.map((O) => ({
-            sourceField: this.getColumnName(O.source),
-            targetField: this.getColumnName(O.target)
+          joinFields: t.on.map((N) => ({
+            sourceField: this.getColumnName(N.source),
+            targetField: this.getColumnName(N.target)
           }))
         });
       }
@@ -20455,7 +20583,7 @@ ${T.join(`
       throw new Error(`Cube '${E}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const I = await new LE(this.dbExecutor).generateSQL(A, T, R), t = this.dbExecutor.getEngineType();
+    const I = await new nE(this.dbExecutor).generateSQL(A, T, R), t = this.dbExecutor.getEngineType();
     return {
       sql: HT(I.sql, t),
       params: I.params
@@ -20467,7 +20595,7 @@ ${T.join(`
   async generateMultiCubeSQL(E, T) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const A = await new LE(this.dbExecutor).generateMultiCubeSQL(this.cubes, E, T), S = this.dbExecutor.getEngineType();
+    const A = await new nE(this.dbExecutor).generateMultiCubeSQL(this.cubes, E, T), S = this.dbExecutor.getEngineType();
     return {
       sql: HT(A.sql, S),
       params: A.params
@@ -20607,29 +20735,29 @@ function JT(e, E, T, R) {
   }
   !I.dimensions[S] && !I.measures[S] && T.push(`Filter field '${S}' not found on cube '${A}' (must be a dimension or measure)`);
 }
-function CO(e) {
-  return new OO({
+function CN(e) {
+  return new NN({
     drizzle: e.drizzle,
     schema: e.schema
   });
 }
 export {
   bE as BaseDatabaseExecutor,
-  mT as MySQLExecutor,
+  BT as MySQLExecutor,
   Ae as PostgresExecutor,
-  ne as QueryBuilder,
-  LE as QueryExecutor,
+  re as QueryBuilder,
+  nE as QueryExecutor,
   dT as QueryPlanner,
   Ie as SQLiteExecutor,
-  OO as SemanticLayerCompiler,
+  NN as SemanticLayerCompiler,
   QE as createDatabaseExecutor,
-  CO as createDrizzleSemanticLayer,
-  tO as createMultiCubeContext,
+  CN as createDrizzleSemanticLayer,
+  tN as createMultiCubeContext,
   Se as createMySQLExecutor,
   xE as createPostgresExecutor,
   vE as createSQLiteExecutor,
-  sO as defineCube,
+  sN as defineCube,
   fE as getJoinType,
-  sE as resolveCubeReference,
+  j as resolveCubeReference,
   b as resolveSqlExpression
 };