drizzle-cube 0.1.35 → 0.1.36

package/dist/server/index.js

@@ -1,4 +1,4 @@
-import { sql as _, count as RE, sum as f, max as YE, min as mE, and as m, countDistinct as $T, SQL as gT, or as AE, isNotNull as fE, ne as XE, isNull as bE, eq as j, notInArray as KE, inArray as SE, lt as eE, gt as IE, gte as y, lte as $, desc as JT, asc as yE } from "drizzle-orm";
+import { sql as _, count as RE, sum as W, max as YE, min as mE, and as m, countDistinct as $T, SQL as gT, or as AE, isNotNull as WE, ne as XE, isNull as bE, eq as j, notInArray as KE, inArray as SE, lt as eE, gt as IE, gte as y, lte as $, desc as JT, asc as yE } from "drizzle-orm";
 class dE {
   /**
    * Helper method to build pattern for string matching
@@ -626,11 +626,14 @@ function ER(T, E) {
     case "hasMany":
       return "left";
     // Parent may have no children
+    case "belongsToMany":
+      return "left";
+    // Many-to-many through junction table
     default:
       return "left";
   }
 }
-function W(T, E) {
+function f(T, E) {
   return typeof T == "function" ? T(E) : T;
 }
 function wI(T, E, R) {
@@ -658,30 +661,30 @@ class TR {
     const S = {}, e = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
       for (const O of R.dimensions) {
-        const [N, D] = O.split("."), I = e.get(N);
+        const [s, D] = O.split("."), I = e.get(s);
         if (I && I.dimensions && I.dimensions[D]) {
-          const C = I.dimensions[D], s = W(C.sql, A);
-          S[O] = _`${s}`.as(O);
+          const N = I.dimensions[D], t = f(N.sql, A);
+          S[O] = _`${t}`.as(O);
         }
       }
     if (R.measures)
       for (const O of R.measures) {
-        const [N, D] = O.split("."), I = e.get(N);
+        const [s, D] = O.split("."), I = e.get(s);
         if (I && I.measures && I.measures[D]) {
-          const C = I.measures[D], s = this.buildMeasureExpression(C, A);
-          S[O] = _`${s}`.as(O);
+          const N = I.measures[D], t = this.buildMeasureExpression(N, A);
+          S[O] = _`${t}`.as(O);
         }
       }
     if (R.timeDimensions)
       for (const O of R.timeDimensions) {
-        const [N, D] = O.dimension.split("."), I = e.get(N);
+        const [s, D] = O.dimension.split("."), I = e.get(s);
         if (I && I.dimensions && I.dimensions[D]) {
-          const C = I.dimensions[D], s = this.buildTimeDimensionExpression(
-            C.sql,
+          const N = I.dimensions[D], t = this.buildTimeDimensionExpression(
+            N.sql,
             O.granularity,
             A
           );
-          S[O.dimension] = _`${s}`.as(O.dimension);
+          S[O.dimension] = _`${t}`.as(O.dimension);
         }
       }
     return Object.keys(S).length === 0 && (S.count = RE()), S;
@@ -691,24 +694,24 @@ class TR {
    */
   buildHavingMeasureExpression(E, R, A, S, e) {
     if (e && e.preAggregationCTEs) {
-      const O = e.preAggregationCTEs.find((N) => N.cube.name === E);
+      const O = e.preAggregationCTEs.find((s) => s.cube.name === E);
       if (O && O.measures.includes(`${E}.${R}`)) {
-        const N = _`${_.identifier(O.cteAlias)}.${_.identifier(R)}`;
+        const s = _`${_.identifier(O.cteAlias)}.${_.identifier(R)}`;
         switch (A.type) {
           case "count":
           case "countDistinct":
           case "sum":
-            return f(N);
+            return W(s);
           case "avg":
-            return this.databaseAdapter.buildAvg(N);
+            return this.databaseAdapter.buildAvg(s);
           case "min":
-            return mE(N);
+            return mE(s);
           case "max":
-            return YE(N);
+            return YE(s);
           case "number":
-            return f(N);
+            return W(s);
           default:
-            return f(N);
+            return W(s);
         }
       }
     }
@@ -718,7 +721,7 @@ class TR {
    * Build measure expression with aggregation and filters
    */
   buildMeasureExpression(E, R) {
-    let A = W(E.sql, R);
+    let A = f(E.sql, R);
     if (E.filters && E.filters.length > 0) {
       const S = E.filters.map((e) => e(R)).filter(Boolean);
       if (S.length > 0) {
@@ -734,7 +737,7 @@ class TR {
       case "countDistinct":
         return $T(A);
       case "sum":
-        return f(A);
+        return W(A);
       case "avg":
         return this.databaseAdapter.buildAvg(A);
       case "min":
@@ -751,7 +754,7 @@ class TR {
    * Build time dimension expression with granularity using database adapter
    */
   buildTimeDimensionExpression(E, R, A) {
-    const S = W(E, A);
+    const S = f(E, A);
     return R ? this.databaseAdapter.buildTimeDimension(R, S) : S instanceof gT ? S : _`${S}`;
   }
   /**
@@ -761,17 +764,17 @@ class TR {
   buildWhereConditions(E, R, A, S) {
     const e = [], O = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
-      for (const N of R.filters) {
-        const D = this.processFilter(N, O, A, "where", S);
+      for (const s of R.filters) {
+        const D = this.processFilter(s, O, A, "where", S);
         D && e.push(D);
       }
     if (R.timeDimensions)
-      for (const N of R.timeDimensions) {
-        const [D, I] = N.dimension.split("."), C = O.get(D);
-        if (C && C.dimensions[I] && N.dateRange) {
+      for (const s of R.timeDimensions) {
+        const [D, I] = s.dimension.split("."), N = O.get(D);
+        if (N && N.dimensions[I] && s.dateRange) {
           if (S?.preAggregationCTEs && S.preAggregationCTEs.some((r) => r.cube.name === D))
             continue;
-          const s = C.dimensions[I], L = W(s.sql, A), P = this.buildDateRangeCondition(L, N.dateRange);
+          const t = N.dimensions[I], L = f(t.sql, A), P = this.buildDateRangeCondition(L, s.dateRange);
           P && e.push(P);
         }
       }
@@ -784,8 +787,8 @@ class TR {
   buildHavingConditions(E, R, A, S) {
     const e = [], O = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
-      for (const N of R.filters) {
-        const D = this.processFilter(N, O, A, "having", S);
+      for (const s of R.filters) {
+        const D = this.processFilter(s, O, A, "having", S);
         D && e.push(D);
       }
     return e;
@@ -806,20 +809,20 @@ class TR {
         return a.length > 0 ? AE(...a) : null;
       }
     }
-    const O = E, [N, D] = O.member.split("."), I = R.get(N);
+    const O = E, [s, D] = O.member.split("."), I = R.get(s);
     if (!I) return null;
-    const C = I.dimensions[D], s = I.measures[D], L = C || s;
+    const N = I.dimensions[D], t = I.measures[D], L = N || t;
     if (!L) return null;
-    if (S === "where" && C) {
-      if (e?.preAggregationCTEs && e.preAggregationCTEs.some((r) => r.cube.name === N))
+    if (S === "where" && N) {
+      if (e?.preAggregationCTEs && e.preAggregationCTEs.some((r) => r.cube.name === s))
         return null;
-      const P = W(C.sql, A);
+      const P = f(N.sql, A);
       return this.buildFilterCondition(P, O.operator, O.values, L);
     } else {
-      if (S === "where" && s)
+      if (S === "where" && t)
         return null;
-      if (S === "having" && s) {
-        const P = this.buildHavingMeasureExpression(N, D, s, A, e);
+      if (S === "having" && t) {
+        const P = this.buildHavingMeasureExpression(s, D, t, A, e);
         return this.buildFilterCondition(P, O.operator, O.values, L);
       }
     }
@@ -831,7 +834,7 @@ class TR {
   buildFilterCondition(E, R, A, S) {
     if (!A || A.length === 0)
       return R === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const e = A.filter((N) => !(N == null || N === "" || typeof N == "string" && N.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
+    const e = A.filter((s) => !(s == null || s === "" || typeof s == "string" && s.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
     if (e.length === 0 && !["set", "notSet"].includes(R))
       return R === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
     const O = e[0];
@@ -839,13 +842,13 @@ class TR {
       case "equals":
         if (e.length > 1) {
           if (S?.type === "time") {
-            const N = e.map((D) => this.normalizeDate(D) || D);
-            return SE(E, N);
+            const s = e.map((D) => this.normalizeDate(D) || D);
+            return SE(E, s);
           }
           return SE(E, e);
         } else if (e.length === 1) {
-          const N = S?.type === "time" && this.normalizeDate(O) || O;
-          return j(E, N);
+          const s = S?.type === "time" && this.normalizeDate(O) || O;
+          return j(E, s);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
@@ -867,26 +870,26 @@ class TR {
       case "lte":
         return $(E, O);
       case "set":
-        return fE(E);
+        return WE(E);
       case "notSet":
         return bE(E);
       case "inDateRange":
         if (e.length >= 2) {
-          const N = this.normalizeDate(e[0]), D = this.normalizeDate(e[1]);
-          if (N && D)
+          const s = this.normalizeDate(e[0]), D = this.normalizeDate(e[1]);
+          if (s && D)
             return m(
-              y(E, N),
+              y(E, s),
               $(E, D)
             );
         }
         return null;
       case "beforeDate": {
-        const N = this.normalizeDate(O);
-        return N ? eE(E, N) : null;
+        const s = this.normalizeDate(O);
+        return s ? eE(E, s) : null;
       }
       case "afterDate": {
-        const N = this.normalizeDate(O);
-        return N ? IE(E, N) : null;
+        const s = this.normalizeDate(O);
+        return s ? IE(E, s) : null;
       }
       case "between":
         return e.length >= 2 ? m(
@@ -919,7 +922,7 @@ class TR {
         );
       case "isNotEmpty":
         return m(
-          fE(E),
+          WE(E),
           XE(E, "")
         );
       default:
@@ -962,74 +965,74 @@ class TR {
    * Handles all 14 DATE_RANGE_OPTIONS from the client
    */
   parseRelativeDateRange(E) {
-    const R = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), S = R.getUTCFullYear(), e = R.getUTCMonth(), O = R.getUTCDate(), N = R.getUTCDay();
+    const R = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), S = R.getUTCFullYear(), e = R.getUTCMonth(), O = R.getUTCDate(), s = R.getUTCDay();
     if (A === "today") {
-      const s = new Date(R);
-      s.setUTCHours(0, 0, 0, 0);
+      const t = new Date(R);
+      t.setUTCHours(0, 0, 0, 0);
       const L = new Date(R);
-      return L.setUTCHours(23, 59, 59, 999), { start: s, end: L };
+      return L.setUTCHours(23, 59, 59, 999), { start: t, end: L };
     }
     if (A === "yesterday") {
-      const s = new Date(R);
-      s.setUTCDate(O - 1), s.setUTCHours(0, 0, 0, 0);
+      const t = new Date(R);
+      t.setUTCDate(O - 1), t.setUTCHours(0, 0, 0, 0);
       const L = new Date(R);
-      return L.setUTCDate(O - 1), L.setUTCHours(23, 59, 59, 999), { start: s, end: L };
+      return L.setUTCDate(O - 1), L.setUTCHours(23, 59, 59, 999), { start: t, end: L };
     }
     if (A === "this week") {
-      const s = N === 0 ? -6 : 1 - N, L = new Date(R);
-      L.setUTCDate(O + s), L.setUTCHours(0, 0, 0, 0);
+      const t = s === 0 ? -6 : 1 - s, L = new Date(R);
+      L.setUTCDate(O + t), L.setUTCHours(0, 0, 0, 0);
       const P = new Date(L);
       return P.setUTCDate(L.getUTCDate() + 6), P.setUTCHours(23, 59, 59, 999), { start: L, end: P };
     }
     if (A === "this month") {
-      const s = new Date(Date.UTC(S, e, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(S, e + 1, 0, 23, 59, 59, 999));
-      return { start: s, end: L };
+      const t = new Date(Date.UTC(S, e, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(S, e + 1, 0, 23, 59, 59, 999));
+      return { start: t, end: L };
     }
     if (A === "this quarter") {
-      const s = Math.floor(e / 3), L = new Date(Date.UTC(S, s * 3, 1, 0, 0, 0, 0)), P = new Date(Date.UTC(S, s * 3 + 3, 0, 23, 59, 59, 999));
+      const t = Math.floor(e / 3), L = new Date(Date.UTC(S, t * 3, 1, 0, 0, 0, 0)), P = new Date(Date.UTC(S, t * 3 + 3, 0, 23, 59, 59, 999));
       return { start: L, end: P };
     }
     if (A === "this year") {
-      const s = new Date(Date.UTC(S, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(S, 11, 31, 23, 59, 59, 999));
-      return { start: s, end: L };
+      const t = new Date(Date.UTC(S, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(S, 11, 31, 23, 59, 59, 999));
+      return { start: t, end: L };
     }
     const D = A.match(/^last\s+(\d+)\s+days?$/);
     if (D) {
-      const s = parseInt(D[1], 10), L = new Date(R);
-      L.setUTCDate(O - s + 1), L.setUTCHours(0, 0, 0, 0);
+      const t = parseInt(D[1], 10), L = new Date(R);
+      L.setUTCDate(O - t + 1), L.setUTCHours(0, 0, 0, 0);
       const P = new Date(R);
       return P.setUTCHours(23, 59, 59, 999), { start: L, end: P };
     }
     if (A === "last week") {
-      const s = N === 0 ? -13 : -6 - N, L = new Date(R);
-      L.setUTCDate(O + s), L.setUTCHours(0, 0, 0, 0);
+      const t = s === 0 ? -13 : -6 - s, L = new Date(R);
+      L.setUTCDate(O + t), L.setUTCHours(0, 0, 0, 0);
       const P = new Date(L);
       return P.setUTCDate(L.getUTCDate() + 6), P.setUTCHours(23, 59, 59, 999), { start: L, end: P };
     }
     if (A === "last month") {
-      const s = new Date(Date.UTC(S, e - 1, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(S, e, 0, 23, 59, 59, 999));
-      return { start: s, end: L };
+      const t = new Date(Date.UTC(S, e - 1, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(S, e, 0, 23, 59, 59, 999));
+      return { start: t, end: L };
     }
     if (A === "last quarter") {
-      const s = Math.floor(e / 3), L = s === 0 ? 3 : s - 1, P = s === 0 ? S - 1 : S, a = new Date(Date.UTC(P, L * 3, 1, 0, 0, 0, 0)), r = new Date(Date.UTC(P, L * 3 + 3, 0, 23, 59, 59, 999));
+      const t = Math.floor(e / 3), L = t === 0 ? 3 : t - 1, P = t === 0 ? S - 1 : S, a = new Date(Date.UTC(P, L * 3, 1, 0, 0, 0, 0)), r = new Date(Date.UTC(P, L * 3 + 3, 0, 23, 59, 59, 999));
       return { start: a, end: r };
     }
     if (A === "last year") {
-      const s = new Date(Date.UTC(S - 1, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(S - 1, 11, 31, 23, 59, 59, 999));
-      return { start: s, end: L };
+      const t = new Date(Date.UTC(S - 1, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(S - 1, 11, 31, 23, 59, 59, 999));
+      return { start: t, end: L };
     }
     if (A === "last 12 months") {
-      const s = new Date(Date.UTC(S, e - 11, 1, 0, 0, 0, 0)), L = new Date(R);
-      return L.setUTCHours(23, 59, 59, 999), { start: s, end: L };
+      const t = new Date(Date.UTC(S, e - 11, 1, 0, 0, 0, 0)), L = new Date(R);
+      return L.setUTCHours(23, 59, 59, 999), { start: t, end: L };
     }
     const I = A.match(/^last\s+(\d+)\s+months?$/);
     if (I) {
-      const s = parseInt(I[1], 10), L = new Date(Date.UTC(S, e - s + 1, 1, 0, 0, 0, 0)), P = new Date(R);
+      const t = parseInt(I[1], 10), L = new Date(Date.UTC(S, e - t + 1, 1, 0, 0, 0, 0)), P = new Date(R);
       return P.setUTCHours(23, 59, 59, 999), { start: L, end: P };
     }
-    const C = A.match(/^last\s+(\d+)\s+years?$/);
-    if (C) {
-      const s = parseInt(C[1], 10), L = new Date(Date.UTC(S - s, 0, 1, 0, 0, 0, 0)), P = new Date(R);
+    const N = A.match(/^last\s+(\d+)\s+years?$/);
+    if (N) {
+      const t = parseInt(N[1], 10), L = new Date(Date.UTC(S - t, 0, 1, 0, 0, 0, 0)), P = new Date(R);
       return P.setUTCHours(23, 59, 59, 999), { start: L, end: P };
     }
     return null;
@@ -1062,30 +1065,30 @@ class TR {
     const e = [];
     if (!(R.measures && R.measures.length > 0))
       return [];
-    const N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const s = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
       for (const D of R.dimensions) {
-        const [I, C] = D.split("."), s = N.get(I);
-        if (s && s.dimensions && s.dimensions[C])
+        const [I, N] = D.split("."), t = s.get(I);
+        if (t && t.dimensions && t.dimensions[N])
           if (S?.preAggregationCTEs?.some((P) => P.cube.name === I)) {
-            const P = S.preAggregationCTEs.find((r) => r.cube.name === I), a = P.joinKeys.find((r) => r.targetColumn === C);
+            const P = S.preAggregationCTEs.find((r) => r.cube.name === I), a = P.joinKeys.find((r) => r.targetColumn === N);
             if (a && a.sourceColumnObj)
               e.push(a.sourceColumnObj);
             else {
-              const r = _`${_.identifier(P.cteAlias)}.${_.identifier(C)}`;
+              const r = _`${_.identifier(P.cteAlias)}.${_.identifier(N)}`;
               e.push(r);
             }
           } else {
-            const P = s.dimensions[C], a = W(P.sql, A);
+            const P = t.dimensions[N], a = f(P.sql, A);
             e.push(a);
           }
       }
     if (R.timeDimensions)
       for (const D of R.timeDimensions) {
-        const [I, C] = D.dimension.split("."), s = N.get(I);
-        if (s && s.dimensions && s.dimensions[C])
+        const [I, N] = D.dimension.split("."), t = s.get(I);
+        if (t && t.dimensions && t.dimensions[N])
           if (S?.preAggregationCTEs?.some((P) => P.cube.name === I)) {
-            const P = S.preAggregationCTEs.find((r) => r.cube.name === I), a = P.joinKeys.find((r) => r.targetColumn === C);
+            const P = S.preAggregationCTEs.find((r) => r.cube.name === I), a = P.joinKeys.find((r) => r.targetColumn === N);
             if (a && a.sourceColumnObj) {
               const r = this.buildTimeDimensionExpression(
                 a.sourceColumnObj,
@@ -1094,11 +1097,11 @@ class TR {
               );
               e.push(r);
             } else {
-              const r = _`${_.identifier(P.cteAlias)}.${_.identifier(C)}`;
+              const r = _`${_.identifier(P.cteAlias)}.${_.identifier(N)}`;
               e.push(r);
             }
           } else {
-            const P = s.dimensions[C], a = this.buildTimeDimensionExpression(
+            const P = t.dimensions[N], a = this.buildTimeDimensionExpression(
               P.sql,
               D.granularity,
               A
@@ -1121,15 +1124,15 @@ class TR {
       for (const [e, O] of Object.entries(E.order)) {
         if (!S.includes(e))
           throw new Error(`Cannot order by '${e}': field is not selected in the query`);
-        const N = O === "desc" ? JT(_.identifier(e)) : yE(_.identifier(e));
-        A.push(N);
+        const s = O === "desc" ? JT(_.identifier(e)) : yE(_.identifier(e));
+        A.push(s);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
       const e = new Set(Object.keys(E.order || {})), O = [...E.timeDimensions].sort(
-        (N, D) => N.dimension.localeCompare(D.dimension)
+        (s, D) => s.dimension.localeCompare(D.dimension)
       );
-      for (const N of O)
-        e.has(N.dimension) || A.push(yE(_.identifier(N.dimension)));
+      for (const s of O)
+        e.has(s.dimension) || A.push(yE(_.identifier(s.dimension)));
     }
     return A;
   }
@@ -1141,9 +1144,9 @@ class TR {
     const A = [], S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.measures && A.push(...R.measures), R.dimensions)
       for (const e of R.dimensions) {
-        const [O, N] = e.split("."), D = S.get(O);
+        const [O, s] = e.split("."), D = S.get(O);
         if (D) {
-          const I = D.dimensions[N];
+          const I = D.dimensions[s];
           I && I.type === "number" && A.push(e);
         }
       }
@@ -1244,12 +1247,12 @@ class RR {
     const S = this.analyzeCubeUsage(R), e = Array.from(S);
     if (e.length === 0)
       throw new Error("No cubes found in query");
-    const O = this.choosePrimaryCube(e, R, E), N = E.get(O);
-    if (!N)
+    const O = this.choosePrimaryCube(e, R, E), s = E.get(O);
+    if (!s)
       throw new Error(`Primary cube '${O}' not found`);
     if (e.length === 1)
       return {
-        primaryCube: N,
+        primaryCube: s,
         joinCubes: [],
         // Empty for single cube
         selections: {},
@@ -1259,9 +1262,9 @@ class RR {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const D = this.buildJoinPlan(E, N, e), I = this.planPreAggregationCTEs(E, N, D, R);
+    const D = this.buildJoinPlan(E, s, e), I = this.planPreAggregationCTEs(E, s, D, R);
     return {
-      primaryCube: N,
+      primaryCube: s,
       joinCubes: D,
       selections: {},
       // Will be built by QueryBuilder
@@ -1282,8 +1285,8 @@ class RR {
       for (const O of S)
         e.set(O, (e.get(O) || 0) + 1);
       if (e.size > 0) {
-        const O = Math.max(...e.values()), N = [...e.entries()].filter(([, D]) => D === O).map(([D]) => D).sort();
-        for (const D of N)
+        const O = Math.max(...e.values()), s = [...e.entries()].filter(([, D]) => D === O).map(([D]) => D).sort();
+        for (const D of s)
           if (this.canReachAllCubes(D, E, A))
             return D;
       }
@@ -1292,12 +1295,12 @@ class RR {
       const S = /* @__PURE__ */ new Map();
       for (const e of E)
         if (this.canReachAllCubes(e, E, A)) {
-          const O = A.get(e), N = O?.joins ? Object.keys(O.joins).length : 0;
-          S.set(e, N);
+          const O = A.get(e), s = O?.joins ? Object.keys(O.joins).length : 0;
+          S.set(e, s);
         }
       if (S.size > 0) {
         const e = Math.max(...S.values());
-        return [...S.entries()].filter(([, N]) => N === e).map(([N]) => N).sort()[0];
+        return [...S.entries()].filter(([, s]) => s === e).map(([s]) => s).sort()[0];
       }
     }
     return [...E].sort()[0];
@@ -1319,28 +1322,28 @@ class RR {
    * Supports both direct joins and transitive joins through intermediate cubes
    */
   buildJoinPlan(E, R, A) {
-    const S = [], e = /* @__PURE__ */ new Set([R.name]), O = A.filter((N) => N !== R.name);
-    for (const N of O) {
-      if (e.has(N))
+    const S = [], e = /* @__PURE__ */ new Set([R.name]), O = A.filter((s) => s !== R.name);
+    for (const s of O) {
+      if (e.has(s))
         continue;
-      const D = this.findJoinPath(E, R.name, N, e);
+      const D = this.findJoinPath(E, R.name, s, e);
       if (!D || D.length === 0)
-        throw new Error(`No join path found from '${R.name}' to '${N}'`);
-      for (const { toCube: I, joinDef: C } of D) {
+        throw new Error(`No join path found from '${R.name}' to '${s}'`);
+      for (const { toCube: I, joinDef: N } of D) {
         if (e.has(I))
           continue;
-        const s = E.get(I);
-        if (!s)
+        const t = E.get(I);
+        if (!t)
           throw new Error(`Cube '${I}' not found`);
         const L = this.buildJoinCondition(
-          C,
+          N,
           null,
           // No source alias needed - use the actual column
           null
           // No target alias needed - use the actual column 
-        ), P = ER(C.relationship, C.sqlJoinType);
+        ), P = ER(N.relationship, N.sqlJoinType);
         S.push({
-          cube: s,
+          cube: t,
           alias: `${I.toLowerCase()}_cube`,
           joinType: P,
           joinCondition: L
@@ -1355,8 +1358,8 @@ class RR {
   buildJoinCondition(E, R, A) {
     const S = [];
     for (const e of E.on) {
-      const O = R ? _`${_.identifier(R)}.${_.identifier(e.source.name)}` : e.source, N = A ? _`${_.identifier(A)}.${_.identifier(e.target.name)}` : e.target, D = e.as || j;
-      S.push(D(O, N));
+      const O = R ? _`${_.identifier(R)}.${_.identifier(e.source.name)}` : e.source, s = A ? _`${_.identifier(A)}.${_.identifier(e.target.name)}` : e.target, D = e.as || j;
+      S.push(D(O, s));
     }
     return m(...S);
   }
@@ -1371,16 +1374,16 @@ class RR {
       { cube: R, path: [] }
     ], O = /* @__PURE__ */ new Set([R, ...S]);
     for (; e.length > 0; ) {
-      const { cube: N, path: D } = e.shift(), I = E.get(N);
+      const { cube: s, path: D } = e.shift(), I = E.get(s);
       if (I?.joins)
-        for (const [, C] of Object.entries(I.joins)) {
-          const L = wE(C.targetCube).name;
+        for (const [, N] of Object.entries(I.joins)) {
+          const L = wE(N.targetCube).name;
           if (O.has(L))
             continue;
           const P = [...D, {
-            fromCube: N,
+            fromCube: s,
             toCube: L,
-            joinDef: C
+            joinDef: N
           }];
           if (L === A)
             return P;
@@ -1397,15 +1400,15 @@ class RR {
     if (!S.measures || S.measures.length === 0)
       return e;
     for (const O of A) {
-      const N = this.findHasManyJoinDef(R, O.cube.name);
-      if (!N)
+      const s = this.findHasManyJoinDef(R, O.cube.name);
+      if (!s)
         continue;
       const D = S.measures ? S.measures.filter(
         (L) => L.startsWith(O.cube.name + ".")
-      ) : [], I = this.extractMeasuresFromFilters(S, O.cube.name), C = [.../* @__PURE__ */ new Set([...D, ...I])];
-      if (C.length === 0)
+      ) : [], I = this.extractMeasuresFromFilters(S, O.cube.name), N = [.../* @__PURE__ */ new Set([...D, ...I])];
+      if (N.length === 0)
         continue;
-      const s = N.on.map((L) => ({
+      const t = s.on.map((L) => ({
         sourceColumn: L.source.name,
         targetColumn: L.target.name,
         sourceColumnObj: L.source,
@@ -1415,8 +1418,8 @@ class RR {
         cube: O.cube,
         alias: O.alias,
         cteAlias: `${O.cube.name.toLowerCase()}_agg`,
-        joinKeys: s,
-        measures: C
+        joinKeys: t,
+        measures: N
       });
     }
     return e;
@@ -1454,7 +1457,7 @@ class OE {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: A
-      }, O = this.queryPlanner.createQueryPlan(E, R, e), N = this.buildUnifiedQuery(O, R, e), D = this.queryBuilder.collectNumericFields(E, R), I = await this.dbExecutor.execute(N, D), C = Array.isArray(I) ? I.map((L) => {
+      }, O = this.queryPlanner.createQueryPlan(E, R, e), s = this.buildUnifiedQuery(O, R, e), D = this.queryBuilder.collectNumericFields(E, R), I = await this.dbExecutor.execute(s, D), N = Array.isArray(I) ? I.map((L) => {
         const P = { ...L };
         if (R.timeDimensions) {
           for (const a of R.timeDimensions)
@@ -1468,10 +1471,10 @@ class OE {
             }
         }
         return P;
-      }) : [I], s = this.generateAnnotations(O, R);
+      }) : [I], t = this.generateAnnotations(O, R);
       return {
-        data: C,
-        annotation: s
+        data: N,
+        annotation: t
       };
     } catch (S) {
       throw new Error(`Query execution failed: ${S instanceof Error ? S.message : "Unknown error"}`);
@@ -1488,18 +1491,18 @@ class OE {
    * Build pre-aggregation CTE for hasMany relationships
    */
   buildPreAggregationCTE(E, R, A, S) {
-    const e = E.cube, O = e.sql(A), N = {};
+    const e = E.cube, O = e.sql(A), s = {};
     for (const r of E.joinKeys)
       if (r.targetColumnObj) {
-        N[r.targetColumn] = r.targetColumnObj;
+        s[r.targetColumn] = r.targetColumnObj;
         for (const [U, o] of Object.entries(e.dimensions || {}))
-          o.sql === r.targetColumnObj && U !== r.targetColumn && (N[U] = _`${r.targetColumnObj}`.as(U));
+          o.sql === r.targetColumnObj && U !== r.targetColumn && (s[U] = _`${r.targetColumnObj}`.as(U));
       }
     for (const r of E.measures) {
       const [, U] = r.split(".");
       if (e.measures && e.measures[U]) {
-        const o = e.measures[U], c = this.queryBuilder.buildMeasureExpression(o, A);
-        N[U] = _`${c}`.as(U);
+        const o = e.measures[U], l = this.queryBuilder.buildMeasureExpression(o, A);
+        s[U] = _`${l}`.as(U);
       }
     }
     const D = e.name;
@@ -1507,48 +1510,48 @@ class OE {
       for (const r of R.dimensions) {
         const [U, o] = r.split(".");
         if (U === D && e.dimensions && e.dimensions[o]) {
-          const c = e.dimensions[o], l = this.queryBuilder.buildMeasureExpression({ sql: c.sql, type: "number" }, A);
-          N[o] = _`${l}`.as(o);
+          const l = e.dimensions[o], c = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A);
+          s[o] = _`${c}`.as(o);
         }
       }
     if (R.timeDimensions)
       for (const r of R.timeDimensions) {
         const [U, o] = r.dimension.split(".");
         if (U === D && e.dimensions && e.dimensions[o]) {
-          const c = e.dimensions[o], l = this.queryBuilder.buildTimeDimensionExpression(c.sql, r.granularity, A);
-          N[o] = _`${l}`.as(o);
+          const l = e.dimensions[o], c = this.queryBuilder.buildTimeDimensionExpression(l.sql, r.granularity, A);
+          s[o] = _`${c}`.as(o);
         }
       }
-    if (Object.keys(N).length === 0)
+    if (Object.keys(s).length === 0)
       return null;
-    let I = A.db.select(N).from(O.from);
-    const C = S ? {
+    let I = A.db.select(s).from(O.from);
+    const N = S ? {
       ...S,
       preAggregationCTEs: S.preAggregationCTEs?.filter((r) => r.cube.name !== e.name)
-    } : void 0, s = this.queryBuilder.buildWhereConditions(e, R, A, C), L = [];
+    } : void 0, t = this.queryBuilder.buildWhereConditions(e, R, A, N), L = [];
     if (R.timeDimensions)
       for (const r of R.timeDimensions) {
         const [U, o] = r.dimension.split(".");
         if (U === D && e.dimensions && e.dimensions[o] && r.dateRange) {
-          const c = e.dimensions[o], l = this.queryBuilder.buildMeasureExpression({ sql: c.sql, type: "number" }, A), u = this.queryBuilder.buildDateRangeCondition(l, r.dateRange);
-          u && L.push(u);
+          const l = e.dimensions[o], c = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A), H = this.queryBuilder.buildDateRangeCondition(c, r.dateRange);
+          H && L.push(H);
         }
       }
     if (R.filters) {
       for (const r of R.filters)
         if (!("and" in r) && !("or" in r) && "member" in r && "operator" in r) {
-          const U = r, [o, c] = U.member.split(".");
-          if (o === D && e.dimensions && e.dimensions[c]) {
-            const l = e.dimensions[c];
+          const U = r, [o, l] = U.member.split(".");
+          if (o === D && e.dimensions && e.dimensions[l]) {
+            const c = e.dimensions[l];
             if (U.operator === "inDateRange") {
-              const u = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A), Y = this.queryBuilder.buildDateRangeCondition(u, U.values);
-              Y && L.push(Y);
+              const H = this.queryBuilder.buildMeasureExpression({ sql: c.sql, type: "number" }, A), u = this.queryBuilder.buildDateRangeCondition(H, U.values);
+              u && L.push(u);
             }
           }
         }
     }
     const P = [];
-    if (O.where && P.push(O.where), P.push(...s, ...L), P.length > 0) {
+    if (O.where && P.push(O.where), P.push(...t, ...L), P.length > 0) {
       const r = P.length === 1 ? P[0] : m(...P);
       I = I.where(r);
     }
@@ -1559,16 +1562,16 @@ class OE {
       for (const r of R.dimensions) {
         const [U, o] = r.split(".");
         if (U === D && e.dimensions && e.dimensions[o]) {
-          const c = e.dimensions[o], l = W(c.sql, A);
-          a.push(l);
+          const l = e.dimensions[o], c = f(l.sql, A);
+          a.push(c);
         }
       }
     if (R.timeDimensions)
       for (const r of R.timeDimensions) {
         const [U, o] = r.dimension.split(".");
         if (U === D && e.dimensions && e.dimensions[o]) {
-          const c = e.dimensions[o], l = this.queryBuilder.buildTimeDimensionExpression(c.sql, r.granularity, A);
-          a.push(l);
+          const l = e.dimensions[o], c = this.queryBuilder.buildTimeDimensionExpression(l.sql, r.granularity, A);
+          a.push(c);
         }
       }
     return a.length > 0 && (I = I.groupBy(...a)), A.db.$with(E.cteAlias).as(I);
@@ -1583,8 +1586,8 @@ class OE {
       throw new Error(`CTE info not found for cube ${E.cube.name}`);
     const e = [];
     for (const O of S.joinKeys) {
-      const N = O.sourceColumnObj || _.identifier(O.sourceColumn), D = _`${_.identifier(R)}.${_.identifier(O.targetColumn)}`;
-      e.push(j(N, D));
+      const s = O.sourceColumnObj || _.identifier(O.sourceColumn), D = _`${_.identifier(R)}.${_.identifier(O.targetColumn)}`;
+      e.push(j(s, D));
     }
     return e.length === 1 ? e[0] : m(...e);
   }
@@ -1609,98 +1612,123 @@ class OE {
         const U = r.cube.name;
         for (const o of r.measures)
           if (D[o]) {
-            const [, c] = o.split("."), l = this.getCubesFromPlan(E).get(U);
-            if (l && l.measures && l.measures[c]) {
-              const u = l.measures[c], Y = _`${_.identifier(r.cteAlias)}.${_.identifier(c)}`;
+            const [, l] = o.split("."), c = this.getCubesFromPlan(E).get(U);
+            if (c && c.measures && c.measures[l]) {
+              const H = c.measures[l], u = _`${_.identifier(r.cteAlias)}.${_.identifier(l)}`;
               let p;
-              switch (u.type) {
+              switch (H.type) {
                 case "count":
                 case "countDistinct":
                 case "sum":
-                  p = f(Y);
+                  p = W(u);
                   break;
                 case "avg":
-                  p = this.databaseAdapter.buildAvg(Y);
+                  p = this.databaseAdapter.buildAvg(u);
                   break;
                 case "min":
-                  p = mE(Y);
+                  p = mE(u);
                   break;
                 case "max":
-                  p = YE(Y);
+                  p = YE(u);
                   break;
                 case "number":
-                  p = f(Y);
+                  p = W(u);
                   break;
                 default:
-                  p = f(Y);
+                  p = W(u);
               }
               D[o] = _`${p}`.as(o);
             }
           }
         for (const o in D) {
-          const [c, l] = o.split(".");
-          if (c === U) {
-            const u = this.getCubesFromPlan(E).get(U), Y = u && u.dimensions?.[l], p = o.startsWith(U + ".");
-            if (Y || p) {
-              let K = r.joinKeys.find((TE) => TE.targetColumn === l);
-              if (!K && u?.dimensions?.[l]) {
-                const TE = u.dimensions[l].sql;
+          const [l, c] = o.split(".");
+          if (l === U) {
+            const H = this.getCubesFromPlan(E).get(U), u = H && H.dimensions?.[c], p = o.startsWith(U + ".");
+            if (u || p) {
+              let K = r.joinKeys.find((TE) => TE.targetColumn === c);
+              if (!K && H?.dimensions?.[c]) {
+                const TE = H.dimensions[c].sql;
                 K = r.joinKeys.find((yT) => yT.targetColumnObj === TE);
               }
-              K ? D[o] = _`${_.identifier(r.cteAlias)}.${_.identifier(l)}`.as(o) : p && u?.dimensions?.[l] && (D[o] = _`${_.identifier(r.cteAlias)}.${_.identifier(l)}`.as(o));
+              K ? D[o] = _`${_.identifier(r.cteAlias)}.${_.identifier(c)}`.as(o) : p && H?.dimensions?.[c] && (D[o] = _`${_.identifier(r.cteAlias)}.${_.identifier(c)}`.as(o));
             }
           }
         }
       }
-    let I = A.db.select(D).from(O.from);
-    if (S.length > 0 && (I = A.db.with(...S).select(D).from(O.from)), O.joins)
+    const I = [];
+    let N = A.db.select(D).from(O.from);
+    if (S.length > 0 && (N = A.db.with(...S).select(D).from(O.from)), O.joins)
       for (const r of O.joins)
         switch (r.type || "left") {
           case "left":
-            I = I.leftJoin(r.table, r.on);
+            N = N.leftJoin(r.table, r.on);
             break;
           case "inner":
-            I = I.innerJoin(r.table, r.on);
+            N = N.innerJoin(r.table, r.on);
             break;
           case "right":
-            I = I.rightJoin(r.table, r.on);
+            N = N.rightJoin(r.table, r.on);
             break;
           case "full":
-            I = I.fullJoin(r.table, r.on);
+            N = N.fullJoin(r.table, r.on);
             break;
         }
     if (E.joinCubes && E.joinCubes.length > 0)
       for (const r of E.joinCubes) {
         const U = e.get(r.cube.name);
-        let o, c;
-        U ? (o = _`${_.identifier(U)}`, c = this.buildCTEJoinCondition(r, U, E)) : (o = r.cube.sql(A).from, c = r.joinCondition);
+        if (r.junctionTable) {
+          const c = r.junctionTable, H = [];
+          if (c.securitySql) {
+            const u = c.securitySql(A.securityContext);
+            Array.isArray(u) ? H.push(...u) : H.push(u);
+          }
+          try {
+            switch (c.joinType || "left") {
+              case "left":
+                N = N.leftJoin(c.table, c.joinCondition);
+                break;
+              case "inner":
+                N = N.innerJoin(c.table, c.joinCondition);
+                break;
+              case "right":
+                N = N.rightJoin(c.table, c.joinCondition);
+                break;
+              case "full":
+                N = N.fullJoin(c.table, c.joinCondition);
+                break;
+            }
+            H.length > 0 && I.push(...H);
+          } catch {
+          }
+        }
+        let o, l;
+        U ? (o = _`${_.identifier(U)}`, l = this.buildCTEJoinCondition(r, U, E)) : (o = r.cube.sql(A).from, l = r.joinCondition);
         try {
           switch (r.joinType || "left") {
             case "left":
-              I = I.leftJoin(o, c);
+              N = N.leftJoin(o, l);
               break;
             case "inner":
-              I = I.innerJoin(o, c);
+              N = N.innerJoin(o, l);
               break;
             case "right":
-              I = I.rightJoin(o, c);
+              N = N.rightJoin(o, l);
               break;
             case "full":
-              I = I.fullJoin(o, c);
+              N = N.fullJoin(o, l);
               break;
           }
         } catch {
         }
       }
-    const C = [];
-    if (O.where && C.push(O.where), E.joinCubes && E.joinCubes.length > 0)
+    if (O.where && I.push(O.where), E.joinCubes && E.joinCubes.length > 0)
       for (const r of E.joinCubes) {
         if (e.get(r.cube.name))
           continue;
         const o = r.cube.sql(A);
-        o.where && C.push(o.where);
+        o.where && I.push(o.where);
       }
-    const s = this.queryBuilder.buildWhereConditions(
+    const t = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -1708,9 +1736,9 @@ class OE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (s.length > 0 && C.push(...s), C.length > 0) {
-      const r = C.length === 1 ? C[0] : m(...C);
-      I = I.where(r);
+    if (t.length > 0 && I.push(...t), I.length > 0) {
+      const r = I.length === 1 ? I[0] : m(...I);
+      N = N.where(r);
     }
     const L = this.queryBuilder.buildGroupByFields(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -1720,7 +1748,7 @@ class OE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    L.length > 0 && (I = I.groupBy(...L));
+    L.length > 0 && (N = N.groupBy(...L));
     const P = this.queryBuilder.buildHavingConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
@@ -1731,10 +1759,10 @@ class OE {
     );
     if (P.length > 0) {
       const r = P.length === 1 ? P[0] : m(...P);
-      I = I.having(r);
+      N = N.having(r);
     }
     const a = this.queryBuilder.buildOrderBy(R);
-    return a.length > 0 && (I = I.orderBy(...a)), I = this.queryBuilder.applyLimitAndOffset(I, R), I;
+    return a.length > 0 && (N = N.orderBy(...a)), N = this.queryBuilder.applyLimitAndOffset(N, R), N;
   }
   /**
    * Convert query plan to cube map for QueryBuilder methods
@@ -1767,10 +1795,10 @@ class OE {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: A
-    }, e = this.queryPlanner.createQueryPlan(E, R, S), N = this.buildUnifiedQuery(e, R, S).toSQL();
+    }, e = this.queryPlanner.createQueryPlan(E, R, S), s = this.buildUnifiedQuery(e, R, S).toSQL();
     return {
-      sql: N.sql,
-      params: N.params
+      sql: s.sql,
+      params: s.params
     };
   }
   /**
@@ -1778,40 +1806,40 @@ class OE {
    */
   generateAnnotations(E, R) {
     const A = {}, S = {}, e = {}, O = [E.primaryCube];
-    if (E.joinCubes && E.joinCubes.length > 0 && O.push(...E.joinCubes.map((N) => N.cube)), R.measures)
-      for (const N of R.measures) {
-        const [D, I] = N.split("."), C = O.find((s) => s.name === D);
-        if (C && C.measures[I]) {
-          const s = C.measures[I];
-          A[N] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
-            type: s.type
+    if (E.joinCubes && E.joinCubes.length > 0 && O.push(...E.joinCubes.map((s) => s.cube)), R.measures)
+      for (const s of R.measures) {
+        const [D, I] = s.split("."), N = O.find((t) => t.name === D);
+        if (N && N.measures[I]) {
+          const t = N.measures[I];
+          A[s] = {
+            title: t.title || I,
+            shortTitle: t.title || I,
+            type: t.type
           };
         }
       }
     if (R.dimensions)
-      for (const N of R.dimensions) {
-        const [D, I] = N.split("."), C = O.find((s) => s.name === D);
-        if (C && C.dimensions[I]) {
-          const s = C.dimensions[I];
-          S[N] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
-            type: s.type
+      for (const s of R.dimensions) {
+        const [D, I] = s.split("."), N = O.find((t) => t.name === D);
+        if (N && N.dimensions[I]) {
+          const t = N.dimensions[I];
+          S[s] = {
+            title: t.title || I,
+            shortTitle: t.title || I,
+            type: t.type
           };
         }
       }
     if (R.timeDimensions)
-      for (const N of R.timeDimensions) {
-        const [D, I] = N.dimension.split("."), C = O.find((s) => s.name === D);
-        if (C && C.dimensions && C.dimensions[I]) {
-          const s = C.dimensions[I];
-          e[N.dimension] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
-            type: s.type,
-            granularity: N.granularity
+      for (const s of R.timeDimensions) {
+        const [D, I] = s.dimension.split("."), N = O.find((t) => t.name === D);
+        if (N && N.dimensions && N.dimensions[I]) {
+          const t = N.dimensions[I];
+          e[s.dimension] = {
+            title: t.title || I,
+            shortTitle: t.title || I,
+            type: t.type,
+            granularity: s.granularity
           };
         }
       }
@@ -1823,7 +1851,7 @@ class OE {
     };
   }
 }
-const t = (T) => T.flatMap(AR), AR = (T) => Q(eR(T)).map(SR), SR = (T) => T.replace(/ +/g, " ").trim(), eR = (T) => ({
+const C = (T) => T.flatMap(AR), AR = (T) => Q(eR(T)).map(SR), SR = (T) => T.replace(/ +/g, " ").trim(), eR = (T) => ({
   type: "mandatory_block",
   items: hE(T, 0)[0]
 }), hE = (T, E, R) => {
@@ -2581,7 +2609,7 @@ const HT = (T) => ({
   "STRUCT",
   "TIME",
   "TIMEZONE"
-], DR = t(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), iR = t([
+], DR = C(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), iR = C([
   // Queries: https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax
   "WITH [RECURSIVE]",
   "FROM",
@@ -2610,9 +2638,9 @@ const HT = (T) => ({
   "WITH CONNECTION",
   "WITH PARTITION COLUMNS",
   "REMOTE WITH CONNECTION"
-]), xE = t([
+]), xE = C([
   "CREATE [OR REPLACE] [TEMP|TEMPORARY|SNAPSHOT|EXTERNAL] TABLE [IF NOT EXISTS]"
-]), NE = t([
+]), NE = C([
   // - create:
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -2700,15 +2728,15 @@ const HT = (T) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), PR = t([
+]), PR = C([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), aR = t([
+]), aR = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), oR = t([
+]), oR = C([
   // 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
@@ -2719,7 +2747,7 @@ const HT = (T) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), MR = t([]), UR = {
+]), MR = C([]), UR = {
   name: "bigquery",
   tokenizerOptions: {
     reservedSelect: DR,
@@ -3553,7 +3581,7 @@ const uR = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], YR = t(["SELECT [ALL | DISTINCT]"]), mR = t([
+], YR = C(["SELECT [ALL | DISTINCT]"]), mR = C([
   // queries
   "WITH",
   "FROM",
@@ -3582,9 +3610,9 @@ const uR = [
   "WHEN [NOT] MATCHED [THEN]",
   "UPDATE SET",
   "INSERT"
-]), QE = t([
+]), QE = C([
   "CREATE [GLOBAL TEMPORARY | EXTERNAL] TABLE [IF NOT EXISTS]"
-]), sE = t([
+]), sE = C([
   // - create:
   "CREATE [OR REPLACE] VIEW",
   // - update:
@@ -3787,16 +3815,16 @@ const uR = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), pR = t(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), dR = t([
+]), pR = C(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), dR = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), VR = t([
+]), VR = C([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), hR = t([]), WR = {
+]), hR = C([]), fR = {
   name: "db2",
   tokenizerOptions: {
     reservedSelect: YR,
@@ -3841,7 +3869,7 @@ const uR = [
     onelineClauses: [...QE, ...sE],
     tabularOnelineClauses: sE
   }
-}, fR = [
+}, WR = [
   // https://www.ibm.com/docs/en/i/7.5?topic=functions-aggregate
   // TODO: 'ANY', - conflicts with test for ANY predicate in 'operators.ys'!!
   "ARRAY_AGG",
@@ -4707,7 +4735,7 @@ const uR = [
   "VARCHAR",
   "VARGRAPHIC",
   "XML"
-], KR = t(["SELECT [ALL | DISTINCT]"]), yR = t([
+], KR = C(["SELECT [ALL | DISTINCT]"]), yR = C([
   // queries
   "WITH [RECURSIVE]",
   "INTO",
@@ -4737,7 +4765,7 @@ const uR = [
   "INSERT",
   // Data definition - table
   "FOR SYSTEM NAME"
-]), ZE = t(["CREATE [OR REPLACE] TABLE"]), tE = t([
+]), ZE = C(["CREATE [OR REPLACE] TABLE"]), tE = C([
   // - create:
   "CREATE [OR REPLACE] [RECURSIVE] VIEW",
   // - update:
@@ -4833,17 +4861,17 @@ const uR = [
   "TAG",
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}"
-]), $R = t(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), gR = t([
+]), $R = C(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), gR = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "[LEFT | RIGHT] EXCEPTION JOIN",
   "{INNER | CROSS} JOIN"
-]), JR = t([
+]), JR = C([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), wR = t([]), xR = {
+]), wR = C([]), xR = {
   name: "db2i",
   tokenizerOptions: {
     reservedSelect: KR,
@@ -4854,7 +4882,7 @@ const uR = [
     reservedDataTypePhrases: wR,
     reservedKeywords: XR,
     reservedDataTypes: bR,
-    reservedFunctionNames: fR,
+    reservedFunctionNames: WR,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     stringTypes: [
@@ -5696,7 +5724,7 @@ const uR = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], qR = t(["SELECT [ALL | DISTINCT]"]), kR = t([
+], qR = C(["SELECT [ALL | DISTINCT]"]), kR = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -5720,9 +5748,9 @@ const uR = [
   "SET",
   // other:
   "RETURNING"
-]), qE = t([
+]), qE = C([
   "CREATE [OR REPLACE] [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"
-]), CE = t([
+]), CE = C([
   // TABLE
   // - update:
   "UPDATE",
@@ -5800,11 +5828,11 @@ const uR = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), jR = t([
+]), jR = C([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
-]), zR = t([
+]), zR = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -5813,11 +5841,11 @@ const uR = [
   "POSITIONAL JOIN",
   "ANTI JOIN",
   "SEMI JOIN"
-]), EA = t([
+]), EA = C([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "SIMILAR TO",
   "IS [NOT] DISTINCT FROM"
-]), TA = t(["TIMESTAMP WITH TIME ZONE"]), RA = {
+]), TA = C(["TIMESTAMP WITH TIME ZONE"]), RA = {
   name: "duckdb",
   tokenizerOptions: {
     reservedSelect: qR,
@@ -6437,7 +6465,7 @@ const uR = [
   "STRUCT",
   "TIMESTAMP",
   "VARCHAR"
-], IA = t(["SELECT [ALL | DISTINCT]"]), OA = t([
+], IA = C(["SELECT [ALL | DISTINCT]"]), OA = C([
   // queries
   "WITH",
   "FROM",
@@ -6471,9 +6499,9 @@ const uR = [
   //   https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML#LanguageManualDML-Loadingfilesintotables
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), kE = t([
+]), kE = C([
   "CREATE [TEMPORARY] [EXTERNAL] TABLE [IF NOT EXISTS]"
-]), LE = t([
+]), LE = C([
   // - create:
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
   // - update:
@@ -6498,13 +6526,13 @@ const uR = [
   "STORED AS",
   "STORED BY",
   "ROW FORMAT"
-]), NA = t(["UNION [ALL | DISTINCT]"]), sA = t([
+]), NA = C(["UNION [ALL | DISTINCT]"]), sA = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "LEFT SEMI JOIN"
-]), tA = t(["{ROWS | RANGE} BETWEEN"]), CA = t([]), LA = {
+]), tA = C(["{ROWS | RANGE} BETWEEN"]), CA = C([]), LA = {
   name: "hive",
   tokenizerOptions: {
     reservedSelect: IA,
@@ -7042,7 +7070,7 @@ const _A = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], DA = t(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), iA = t([
+], DA = C(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), iA = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -7064,9 +7092,9 @@ const _A = [
   "SET",
   // other
   "RETURNING"
-]), jE = t([
+]), jE = C([
   "CREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]"
-]), _E = t([
+]), _E = C([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -7273,12 +7301,12 @@ const _A = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), PA = t([
+]), PA = C([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]",
   "MINUS [ALL | DISTINCT]"
-]), aA = t([
+]), aA = C([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -7286,12 +7314,12 @@ const _A = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), oA = t([
+]), oA = C([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), MA = t([]), UA = {
+]), MA = C([]), UA = {
   name: "mariadb",
   tokenizerOptions: {
     reservedSelect: DA,
@@ -8048,7 +8076,7 @@ const _A = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], HA = t(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), uA = t([
+], HA = C(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), uA = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8068,7 +8096,7 @@ const _A = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), zE = t(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), rE = t([
+]), zE = C(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), rE = C([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -8249,7 +8277,7 @@ const _A = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), BA = t(["UNION [ALL | DISTINCT]"]), FA = t([
+]), BA = C(["UNION [ALL | DISTINCT]"]), FA = C([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8257,12 +8285,12 @@ const _A = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), YA = t([
+]), YA = C([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), mA = t([]), pA = {
+]), mA = C([]), pA = {
   name: "mysql",
   tokenizerOptions: {
     reservedSelect: HA,
@@ -8880,7 +8908,7 @@ const _A = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], WA = t(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), fA = t([
+], fA = C(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), WA = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8900,7 +8928,7 @@ const _A = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), ET = t(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), nE = t([
+]), ET = C(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), nE = C([
   // 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
@@ -9015,7 +9043,7 @@ const _A = [
   "UNLOCK TABLES",
   // https://docs.pingcap.com/tidb/stable/sql-statement-use
   "USE"
-]), XA = t(["UNION [ALL | DISTINCT]"]), bA = t([
+]), XA = C(["UNION [ALL | DISTINCT]"]), bA = C([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -9023,16 +9051,16 @@ const _A = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), KA = t([
+]), KA = C([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), yA = t([]), $A = {
+]), yA = C([]), $A = {
   name: "tidb",
   tokenizerOptions: {
-    reservedSelect: WA,
-    reservedClauses: [...fA, ...ET, ...nE],
+    reservedSelect: fA,
+    reservedClauses: [...WA, ...ET, ...nE],
     reservedSetOperations: XA,
     reservedJoins: bA,
     reservedKeywordPhrases: KA,
@@ -9526,7 +9554,7 @@ const _A = [
   // which it actually doesn't use.
   //
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/datatypes.html
-], xA = t(["SELECT [ALL | DISTINCT]"]), vA = t([
+], xA = C(["SELECT [ALL | DISTINCT]"]), vA = C([
   // queries
   "WITH",
   "FROM",
@@ -9553,7 +9581,7 @@ const _A = [
   "NEST",
   "UNNEST",
   "RETURNING"
-]), TT = t([
+]), TT = C([
   // - update:
   "UPDATE",
   // - delete:
@@ -9593,7 +9621,7 @@ const _A = [
   "SET CURRENT SCHEMA",
   "SHOW",
   "USE [PRIMARY] KEYS"
-]), QA = t(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), ZA = t(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), qA = t(["{ROWS | RANGE | GROUPS} BETWEEN"]), kA = t([]), jA = {
+]), QA = C(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), ZA = C(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), qA = C(["{ROWS | RANGE | GROUPS} BETWEEN"]), kA = C([]), jA = {
   name: "n1ql",
   tokenizerOptions: {
     reservedSelect: xA,
@@ -10227,7 +10255,7 @@ const _A = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], RS = t(["SELECT [ALL | DISTINCT | UNIQUE]"]), AS = t([
+], RS = C(["SELECT [ALL | DISTINCT | UNIQUE]"]), AS = C([
   // queries
   "WITH",
   "FROM",
@@ -10251,9 +10279,9 @@ const _A = [
   "UPDATE SET",
   // other
   "RETURNING"
-]), RT = t([
+]), RT = C([
   "CREATE [GLOBAL TEMPORARY | PRIVATE TEMPORARY | SHARDED | DUPLICATED | IMMUTABLE BLOCKCHAIN | BLOCKCHAIN | IMMUTABLE] TABLE"
-]), DE = t([
+]), DE = C([
   // - create:
   "CREATE [OR REPLACE] [NO FORCE | FORCE] [EDITIONING | EDITIONABLE | EDITIONABLE EDITIONING | NONEDITIONABLE] VIEW",
   "CREATE MATERIALIZED VIEW",
@@ -10281,7 +10309,7 @@ const _A = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), SS = t(["UNION [ALL]", "MINUS", "INTERSECT"]), eS = t([
+]), SS = C(["UNION [ALL]", "MINUS", "INTERSECT"]), eS = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10289,11 +10317,11 @@ const _A = [
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), IS = t([
+]), IS = C([
   "ON {UPDATE | DELETE} [SET NULL]",
   "ON COMMIT",
   "{ROWS | RANGE} BETWEEN"
-]), OS = t([]), NS = {
+]), OS = C([]), NS = {
   name: "plsql",
   tokenizerOptions: {
     reservedSelect: RS,
@@ -11179,7 +11207,7 @@ const tS = [
   "VARCHAR",
   "XML",
   "ZONE"
-], _S = t(["SELECT [ALL | DISTINCT]"]), rS = t([
+], _S = C(["SELECT [ALL | DISTINCT]"]), rS = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -11202,9 +11230,9 @@ const tS = [
   "SET",
   // other
   "RETURNING"
-]), AT = t([
+]), AT = C([
   "CREATE [GLOBAL | LOCAL] [TEMPORARY | TEMP | UNLOGGED] TABLE [IF NOT EXISTS]"
-]), iE = t([
+]), iE = C([
   // - create
   "CREATE [OR REPLACE] [TEMP | TEMPORARY] [RECURSIVE] VIEW",
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -11402,17 +11430,17 @@ const tS = [
   "START TRANSACTION",
   "UNLISTEN",
   "VACUUM"
-]), nS = t([
+]), nS = C([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), DS = t([
+]), DS = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), iS = t([
+]), iS = C([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
@@ -11423,7 +11451,7 @@ const tS = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), PS = t([
+]), PS = C([
   // https://www.postgresql.org/docs/current/datatype-datetime.html
   "[TIMESTAMP | TIME] {WITH | WITHOUT} TIME ZONE"
 ]), aS = {
@@ -12108,7 +12136,7 @@ const tS = [
   "TEXT",
   "VARBYTE",
   "VARCHAR"
-], GS = t(["SELECT [ALL | DISTINCT]"]), cS = t([
+], GS = C(["SELECT [ALL | DISTINCT]"]), cS = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12126,9 +12154,9 @@ const tS = [
   "VALUES",
   // - update:
   "SET"
-]), ST = t([
+]), ST = C([
   "CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]"
-]), PE = t([
+]), PE = C([
   // - create:
   "CREATE [OR REPLACE | MATERIALIZED] VIEW",
   // - update:
@@ -12219,13 +12247,13 @@ const tS = [
   "START TRANSACTION",
   "UNLOAD",
   "VACUUM"
-]), lS = t(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), HS = t([
+]), lS = C(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), HS = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), uS = t([
+]), uS = C([
   // 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
@@ -12233,7 +12261,7 @@ const tS = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), BS = t([]), FS = {
+]), BS = C([]), FS = {
   name: "redshift",
   tokenizerOptions: {
     reservedSelect: GS,
@@ -12889,7 +12917,7 @@ const tS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], dS = t(["SELECT [ALL | DISTINCT]"]), VS = t([
+], dS = C(["SELECT [ALL | DISTINCT]"]), VS = C([
   // queries
   "WITH",
   "FROM",
@@ -12914,7 +12942,7 @@ const tS = [
   //   https://spark.apache.org/docs/latest/sql-ref-syntax-dml-load.html
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), eT = t(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), aE = t([
+]), eT = C(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), aE = C([
   // - create:
   "CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]",
   // - drop table:
@@ -12970,11 +12998,11 @@ const tS = [
   "SHOW TBLPROPERTIES",
   "SHOW VIEWS",
   "UNCACHE TABLE"
-]), hS = t([
+]), hS = C([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), WS = t([
+]), fS = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -12983,19 +13011,19 @@ const tS = [
   // non-standard-joins
   "[LEFT] {ANTI | SEMI} JOIN",
   "NATURAL [LEFT] {ANTI | SEMI} JOIN"
-]), fS = t([
+]), WS = C([
   "ON DELETE",
   "ON UPDATE",
   "CURRENT ROW",
   "{ROWS | RANGE} BETWEEN"
-]), XS = t([]), bS = {
+]), XS = C([]), bS = {
   name: "spark",
   tokenizerOptions: {
     reservedSelect: dS,
     reservedClauses: [...VS, ...eT, ...aE],
     reservedSetOperations: hS,
-    reservedJoins: WS,
-    reservedKeywordPhrases: fS,
+    reservedJoins: fS,
+    reservedKeywordPhrases: WS,
     reservedDataTypePhrases: XS,
     supportsXor: !0,
     reservedKeywords: YS,
@@ -13323,7 +13351,7 @@ const yS = [
   "TEXT",
   "VARCHAR",
   "VARYING CHARACTER"
-], JS = t(["SELECT [ALL | DISTINCT]"]), wS = t([
+], JS = C(["SELECT [ALL | DISTINCT]"]), wS = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13344,7 +13372,7 @@ const yS = [
   "SET",
   // other:
   "RETURNING"
-]), IT = t(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), oE = t([
+]), IT = C(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), oE = C([
   // - create:
   "CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]",
   // - update:
@@ -13363,17 +13391,17 @@ const yS = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), xS = t(["UNION [ALL]", "EXCEPT", "INTERSECT"]), vS = t([
+]), xS = C(["UNION [ALL]", "EXCEPT", "INTERSECT"]), vS = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), QS = t([
+]), QS = C([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
-]), ZS = t([]), qS = {
+]), ZS = C([]), qS = {
   name: "sqlite",
   tokenizerOptions: {
     reservedSelect: JS,
@@ -13735,7 +13763,7 @@ const yS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], Ee = t(["SELECT [ALL | DISTINCT]"]), Te = t([
+], Ee = C(["SELECT [ALL | DISTINCT]"]), Te = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13754,7 +13782,7 @@ const yS = [
   "VALUES",
   // - update:
   "SET"
-]), OT = t(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), ME = t([
+]), OT = C(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), ME = C([
   // - create:
   "CREATE [RECURSIVE] VIEW",
   // - update:
@@ -13779,20 +13807,20 @@ const yS = [
   "TRUNCATE TABLE",
   // other
   "SET SCHEMA"
-]), Re = t([
+]), Re = C([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), Ae = t([
+]), Ae = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), Se = t([
+]), Se = C([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), ee = t([]), Ie = {
+]), ee = C([]), Ie = {
   name: "sql",
   tokenizerOptions: {
     reservedSelect: Ee,
@@ -14526,7 +14554,7 @@ const yS = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], te = t(["SELECT [ALL | DISTINCT]"]), Ce = t([
+], te = C(["SELECT [ALL | DISTINCT]"]), Ce = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14554,7 +14582,7 @@ const yS = [
   "PATTERN",
   "SUBSET",
   "DEFINE"
-]), NT = t(["CREATE TABLE [IF NOT EXISTS]"]), UE = t([
+]), NT = C(["CREATE TABLE [IF NOT EXISTS]"]), UE = C([
   // - create:
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW",
   // - update:
@@ -14612,21 +14640,21 @@ const yS = [
   "SHOW ROLE GRANTS",
   "SHOW FUNCTIONS",
   "SHOW SESSION"
-]), Le = t([
+]), Le = C([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), _e = t([
+]), _e = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), re = t([
+]), re = C([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), ne = t([]), De = {
+]), ne = C([]), De = {
   name: "trino",
   tokenizerOptions: {
     reservedSelect: te,
@@ -15182,7 +15210,7 @@ const yS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], oe = t(["SELECT [ALL | DISTINCT]"]), Me = t([
+], oe = C(["SELECT [ALL | DISTINCT]"]), Me = C([
   // queries
   "WITH",
   "INTO",
@@ -15207,7 +15235,7 @@ const yS = [
   "MERGE [INTO]",
   "WHEN [NOT] MATCHED [BY TARGET | BY SOURCE] [THEN]",
   "UPDATE SET"
-]), sT = t(["CREATE TABLE"]), GE = t([
+]), sT = C(["CREATE TABLE"]), GE = C([
   // - create:
   "CREATE [OR ALTER] [MATERIALIZED] VIEW",
   // - update:
@@ -15387,16 +15415,16 @@ const yS = [
   "XACT_ABORT",
   "XML INDEX",
   "XML SCHEMA COLLECTION"
-]), Ue = t(["UNION [ALL]", "EXCEPT", "INTERSECT"]), Ge = t([
+]), Ue = C(["UNION [ALL]", "EXCEPT", "INTERSECT"]), Ge = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), ce = t([
+]), ce = C([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), le = t([]), He = {
+]), le = C([]), He = {
   name: "transactsql",
   tokenizerOptions: {
     reservedSelect: oe,
@@ -15982,7 +16010,7 @@ const yS = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], Ye = t(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), me = t([
+], Ye = C(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), me = C([
   // queries
   "WITH",
   "FROM",
@@ -16004,9 +16032,9 @@ const yS = [
   // Data definition
   "CREATE [OR REPLACE] [TEMPORARY] PROCEDURE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [EXTERNAL] FUNCTION"
-]), tT = t([
+]), tT = C([
   "CREATE [ROWSTORE] [REFERENCE | TEMPORARY | GLOBAL TEMPORARY] TABLE [IF NOT EXISTS]"
-]), cE = t([
+]), cE = C([
   // - create:
   "CREATE VIEW",
   // - update:
@@ -16183,25 +16211,25 @@ const yS = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), pe = t([
+]), pe = C([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
   "MINUS"
-]), de = t([
+]), de = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), Ve = t([
+]), Ve = C([
   "ON DELETE",
   "ON UPDATE",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), he = t([]), We = {
+]), he = C([]), fe = {
   name: "singlestoredb",
   tokenizerOptions: {
     reservedSelect: Ye,
@@ -16252,7 +16280,7 @@ const yS = [
     onelineClauses: [...tT, ...cE],
     tabularOnelineClauses: cE
   }
-}, fe = [
+}, We = [
   // https://docs.snowflake.com/en/sql-reference-functions.html
   //
   // https://docs.snowflake.com/en/sql-reference/functions-all.html
@@ -16994,7 +17022,7 @@ const yS = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], Ke = t(["SELECT [ALL | DISTINCT]"]), ye = t([
+], Ke = C(["SELECT [ALL | DISTINCT]"]), ye = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -17022,10 +17050,10 @@ const yS = [
   "WHEN MATCHED [AND]",
   "THEN {UPDATE SET | DELETE}",
   "WHEN NOT MATCHED THEN INSERT"
-]), CT = t([
+]), CT = C([
   "CREATE [OR REPLACE] [VOLATILE] TABLE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [LOCAL | GLOBAL] {TEMP|TEMPORARY} TABLE [IF NOT EXISTS]"
-]), lE = t([
+]), lE = C([
   // - create:
   "CREATE [OR REPLACE] [SECURE] [RECURSIVE] VIEW [IF NOT EXISTS]",
   // - update:
@@ -17266,14 +17294,14 @@ const yS = [
   "USE SCHEMA",
   "USE SECONDARY ROLES",
   "USE WAREHOUSE"
-]), $e = t(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), ge = t([
+]), $e = C(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), ge = C([
   "[INNER] JOIN",
   "[NATURAL] {LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{CROSS | NATURAL} JOIN"
-]), Je = t([
+]), Je = C([
   "{ROWS | RANGE} BETWEEN",
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]"
-]), we = t([]), xe = {
+]), we = C([]), xe = {
   name: "snowflake",
   tokenizerOptions: {
     reservedSelect: Ke,
@@ -17284,7 +17312,7 @@ const yS = [
     reservedDataTypePhrases: we,
     reservedKeywords: Xe,
     reservedDataTypes: be,
-    reservedFunctionNames: fe,
+    reservedFunctionNames: We,
     stringTypes: ["$$", "''-qq-bs"],
     identTypes: ['""-qq'],
     variableTypes: [
@@ -17320,7 +17348,7 @@ const yS = [
 }, ve = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   bigquery: UR,
-  db2: WR,
+  db2: fR,
   db2i: xR,
   duckdb: RA,
   hive: LA,
@@ -17330,7 +17358,7 @@ const yS = [
   plsql: NS,
   postgresql: aS,
   redshift: FS,
-  singlestoredb: We,
+  singlestoredb: fe,
   snowflake: xe,
   spark: bS,
   sql: Ie,
@@ -17359,7 +17387,7 @@ const yS = [
     "[": "]",
     "(": ")",
     "{": "}"
-  }, E = "{left}(?:(?!{right}').)*?{right}", R = Object.entries(T).map(([O, N]) => E.replace(/{left}/g, d(O)).replace(/{right}/g, d(N))), A = d(Object.keys(T).join(""));
+  }, E = "{left}(?:(?!{right}').)*?{right}", R = Object.entries(T).map(([O, s]) => E.replace(/{left}/g, d(O)).replace(/{right}/g, d(s))), A = d(Object.keys(T).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${A}])(?:(?!\k<tag>').)*?\k<tag>`}|${R.join("|")})'`;
 }, nT = {
   // - backtick quoted (using `` to escape)
@@ -17387,7 +17415,7 @@ const yS = [
   // Oracle q'' strings: q'<text>' q'|text|' ...
   "q''": ze()
 }, FT = (T) => typeof T == "string" ? nT[T] : "regex" in T ? T.regex : qe(T) + nT[T.quote], EI = (T) => b(T.map((E) => "regex" in E ? E.regex : FT(E)).join("|")), YT = (T) => T.map(FT).join("|"), DT = (T) => b(YT(T)), TI = (T = {}) => b(mT(T)), mT = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
-  const S = "\\p{Alphabetic}\\p{Mark}_", e = "\\p{Decimal_Number}", O = d(T ?? ""), N = d(E ?? ""), D = A ? `[${S}${e}${O}][${S}${e}${N}]*` : `[${S}${O}][${S}${e}${N}]*`;
+  const S = "\\p{Alphabetic}\\p{Mark}_", e = "\\p{Decimal_Number}", O = d(T ?? ""), s = d(E ?? ""), D = A ? `[${S}${e}${O}][${S}${e}${s}]*` : `[${S}${O}][${S}${e}${s}]*`;
   return R ? Ze(D) : D;
 };
 function pT(T, E) {
@@ -17526,82 +17554,82 @@ class II {
       {
         type: i.RESERVED_KEYWORD_PHRASE,
         regex: V((A = E.reservedKeywordPhrases) !== null && A !== void 0 ? A : [], E.identChars),
-        text: H
+        text: B
       },
       {
         type: i.RESERVED_DATA_TYPE_PHRASE,
         regex: V((S = E.reservedDataTypePhrases) !== null && S !== void 0 ? S : [], E.identChars),
-        text: H
+        text: B
       },
       {
         type: i.CASE,
         regex: /CASE\b/iuy,
-        text: H
+        text: B
       },
       {
         type: i.END,
         regex: /END\b/iuy,
-        text: H
+        text: B
       },
       {
         type: i.BETWEEN,
         regex: /BETWEEN\b/iuy,
-        text: H
+        text: B
       },
       {
         type: i.LIMIT,
         regex: E.reservedClauses.includes("LIMIT") ? /LIMIT\b/iuy : void 0,
-        text: H
+        text: B
       },
       {
         type: i.RESERVED_CLAUSE,
         regex: V(E.reservedClauses, E.identChars),
-        text: H
+        text: B
       },
       {
         type: i.RESERVED_SELECT,
         regex: V(E.reservedSelect, E.identChars),
-        text: H
+        text: B
       },
       {
         type: i.RESERVED_SET_OPERATION,
         regex: V(E.reservedSetOperations, E.identChars),
-        text: H
+        text: B
       },
       {
         type: i.WHEN,
         regex: /WHEN\b/iuy,
-        text: H
+        text: B
       },
       {
         type: i.ELSE,
         regex: /ELSE\b/iuy,
-        text: H
+        text: B
       },
       {
         type: i.THEN,
         regex: /THEN\b/iuy,
-        text: H
+        text: B
       },
       {
         type: i.RESERVED_JOIN,
         regex: V(E.reservedJoins, E.identChars),
-        text: H
+        text: B
       },
       {
         type: i.AND,
         regex: /AND\b/iuy,
-        text: H
+        text: B
       },
       {
         type: i.OR,
         regex: /OR\b/iuy,
-        text: H
+        text: B
       },
       {
         type: i.XOR,
         regex: E.supportsXor ? /XOR\b/iuy : void 0,
-        text: H
+        text: B
       },
       ...E.operatorKeyword ? [
         {
@@ -17612,17 +17640,17 @@ class II {
       {
         type: i.RESERVED_FUNCTION_NAME,
         regex: V(E.reservedFunctionNames, E.identChars),
-        text: H
+        text: B
       },
       {
         type: i.RESERVED_DATA_TYPE,
         regex: V(E.reservedDataTypes, E.identChars),
-        text: H
+        text: B
       },
       {
         type: i.RESERVED_KEYWORD,
         regex: V(E.reservedKeywords, E.identChars),
-        text: H
+        text: B
       }
     ]);
   }
@@ -17677,13 +17705,13 @@ class II {
   // These rules can't be blindly cached as the paramTypesOverrides object
   // can differ on each invocation of the format() function.
   buildParamRules(E, R) {
-    var A, S, e, O, N;
+    var A, S, e, O, s;
     const D = {
       named: R?.named || ((A = E.paramTypes) === null || A === void 0 ? void 0 : A.named) || [],
       quoted: R?.quoted || ((S = E.paramTypes) === null || S === void 0 ? void 0 : S.quoted) || [],
       numbered: R?.numbered || ((e = E.paramTypes) === null || e === void 0 ? void 0 : e.numbered) || [],
       positional: typeof R?.positional == "boolean" ? R.positional : (O = E.paramTypes) === null || O === void 0 ? void 0 : O.positional,
-      custom: R?.custom || ((N = E.paramTypes) === null || N === void 0 ? void 0 : N.custom) || []
+      custom: R?.custom || ((s = E.paramTypes) === null || s === void 0 ? void 0 : s.custom) || []
     };
     return this.validRules([
       {
@@ -17694,7 +17722,7 @@ class II {
       {
         type: i.QUOTED_PARAMETER,
         regex: uE(D.quoted, YT(E.identTypes)),
-        key: (I) => (({ tokenKey: C, quoteChar: s }) => C.replace(new RegExp(d("\\" + s), "gu"), s))({
+        key: (I) => (({ tokenKey: N, quoteChar: t }) => N.replace(new RegExp(d("\\" + t), "gu"), t))({
           tokenKey: I.slice(2, -1),
           quoteChar: I.slice(-1)
         })
@@ -17709,11 +17737,11 @@ class II {
         regex: D.positional ? /[?]/y : void 0
       },
       ...D.custom.map((I) => {
-        var C;
+        var N;
         return {
           type: i.CUSTOM_PARAMETER,
           regex: b(I.regex),
-          key: (C = I.key) !== null && C !== void 0 ? C : ((s) => s)
+          key: (N = I.key) !== null && N !== void 0 ? N : ((t) => t)
         };
       })
     ]);
@@ -17723,7 +17751,7 @@ class II {
     return E.filter((R) => !!R.regex);
   }
 }
-const H = (T) => Z(T.toUpperCase()), PT = /* @__PURE__ */ new Map(), OI = (T) => {
+const B = (T) => Z(T.toUpperCase()), PT = /* @__PURE__ */ new Map(), OI = (T) => {
   let E = PT.get(T);
   return E || (E = NI(T), PT.set(T, E)), E;
 }, NI = (T) => ({
@@ -17775,36 +17803,36 @@ function rI() {
     (function(E, R) {
       T.exports ? T.exports = R() : E.nearley = R();
     })(_I, function() {
-      function E(I, C, s) {
-        return this.id = ++E.highestId, this.name = I, this.symbols = C, this.postprocess = s, this;
+      function E(I, N, t) {
+        return this.id = ++E.highestId, this.name = I, this.symbols = N, this.postprocess = t, this;
       }
       E.highestId = 0, E.prototype.toString = function(I) {
-        var C = typeof I > "u" ? this.symbols.map(D).join(" ") : this.symbols.slice(0, I).map(D).join(" ") + " ● " + this.symbols.slice(I).map(D).join(" ");
-        return this.name + " → " + C;
+        var N = typeof I > "u" ? this.symbols.map(D).join(" ") : this.symbols.slice(0, I).map(D).join(" ") + " ● " + this.symbols.slice(I).map(D).join(" ");
+        return this.name + " → " + N;
       };
-      function R(I, C, s, L) {
-        this.rule = I, this.dot = C, this.reference = s, this.data = [], this.wantedBy = L, this.isComplete = this.dot === I.symbols.length;
+      function R(I, N, t, L) {
+        this.rule = I, this.dot = N, this.reference = t, this.data = [], this.wantedBy = L, this.isComplete = this.dot === I.symbols.length;
       }
       R.prototype.toString = function() {
         return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
       }, R.prototype.nextState = function(I) {
-        var C = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
-        return C.left = this, C.right = I, C.isComplete && (C.data = C.build(), C.right = void 0), C;
+        var N = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
+        return N.left = this, N.right = I, N.isComplete && (N.data = N.build(), N.right = void 0), N;
       }, R.prototype.build = function() {
-        var I = [], C = this;
+        var I = [], N = this;
         do
-          I.push(C.right.data), C = C.left;
-        while (C.left);
+          I.push(N.right.data), N = N.left;
+        while (N.left);
         return I.reverse(), I;
       }, R.prototype.finish = function() {
         this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, O.fail));
       };
-      function A(I, C) {
-        this.grammar = I, this.index = C, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
+      function A(I, N) {
+        this.grammar = I, this.index = N, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
       }
       A.prototype.process = function(I) {
-        for (var C = this.states, s = this.wants, L = this.completed, P = 0; P < C.length; P++) {
-          var a = C[P];
+        for (var N = this.states, t = this.wants, L = this.completed, P = 0; P < N.length; P++) {
+          var a = N[P];
           if (a.isComplete) {
             if (a.finish(), a.data !== O.fail) {
               for (var r = a.wantedBy, U = r.length; U--; ) {
@@ -17812,55 +17840,55 @@ function rI() {
                 this.complete(o, a);
               }
               if (a.reference === this.index) {
-                var c = a.rule.name;
-                (this.completed[c] = this.completed[c] || []).push(a);
+                var l = a.rule.name;
+                (this.completed[l] = this.completed[l] || []).push(a);
               }
             }
           } else {
-            var c = a.rule.symbols[a.dot];
-            if (typeof c != "string") {
+            var l = a.rule.symbols[a.dot];
+            if (typeof l != "string") {
               this.scannable.push(a);
               continue;
             }
-            if (s[c]) {
-              if (s[c].push(a), L.hasOwnProperty(c))
-                for (var l = L[c], U = 0; U < l.length; U++) {
-                  var u = l[U];
-                  this.complete(a, u);
+            if (t[l]) {
+              if (t[l].push(a), L.hasOwnProperty(l))
+                for (var c = L[l], U = 0; U < c.length; U++) {
+                  var H = c[U];
+                  this.complete(a, H);
                 }
             } else
-              s[c] = [a], this.predict(c);
+              t[l] = [a], this.predict(l);
           }
         }
       }, A.prototype.predict = function(I) {
-        for (var C = this.grammar.byName[I] || [], s = 0; s < C.length; s++) {
-          var L = C[s], P = this.wants[I], a = new R(L, 0, this.index, P);
+        for (var N = this.grammar.byName[I] || [], t = 0; t < N.length; t++) {
+          var L = N[t], P = this.wants[I], a = new R(L, 0, this.index, P);
           this.states.push(a);
         }
-      }, A.prototype.complete = function(I, C) {
-        var s = I.nextState(C);
-        this.states.push(s);
+      }, A.prototype.complete = function(I, N) {
+        var t = I.nextState(N);
+        this.states.push(t);
       };
-      function S(I, C) {
-        this.rules = I, this.start = C || this.rules[0].name;
-        var s = this.byName = {};
+      function S(I, N) {
+        this.rules = I, this.start = N || this.rules[0].name;
+        var t = this.byName = {};
         this.rules.forEach(function(L) {
-          s.hasOwnProperty(L.name) || (s[L.name] = []), s[L.name].push(L);
+          t.hasOwnProperty(L.name) || (t[L.name] = []), t[L.name].push(L);
         });
       }
-      S.fromCompiled = function(L, C) {
-        var s = L.Lexer;
-        L.ParserStart && (C = L.ParserStart, L = L.ParserRules);
+      S.fromCompiled = function(L, N) {
+        var t = L.Lexer;
+        L.ParserStart && (N = L.ParserStart, L = L.ParserRules);
         var L = L.map(function(a) {
           return new E(a.name, a.symbols, a.postprocess);
-        }), P = new S(L, C);
-        return P.lexer = s, P;
+        }), P = new S(L, N);
+        return P.lexer = t, P;
       };
       function e() {
         this.reset("");
       }
-      e.prototype.reset = function(I, C) {
-        this.buffer = I, this.index = 0, this.line = C ? C.line : 1, this.lastLineBreak = C ? -C.col : 0;
+      e.prototype.reset = function(I, N) {
+        this.buffer = I, this.index = 0, this.line = N ? N.line : 1, this.lastLineBreak = N ? -N.col : 0;
       }, e.prototype.next = function() {
         if (this.index < this.buffer.length) {
           var I = this.buffer[this.index++];
@@ -17872,53 +17900,53 @@ function rI() {
           line: this.line,
           col: this.index - this.lastLineBreak
         };
-      }, e.prototype.formatError = function(I, C) {
-        var s = this.buffer;
-        if (typeof s == "string") {
-          var L = s.split(`
+      }, e.prototype.formatError = function(I, N) {
+        var t = this.buffer;
+        if (typeof t == "string") {
+          var L = t.split(`
 `).slice(
             Math.max(0, this.line - 5),
             this.line
-          ), P = s.indexOf(`
+          ), P = t.indexOf(`
 `, this.index);
-          P === -1 && (P = s.length);
+          P === -1 && (P = t.length);
           var a = this.index - this.lastLineBreak, r = String(this.line).length;
-          return C += " at line " + this.line + " col " + a + `:
+          return N += " at line " + this.line + " col " + a + `:
 
-`, C += L.map(function(o, c) {
-            return U(this.line - L.length + c + 1, r) + " " + o;
+`, N += L.map(function(o, l) {
+            return U(this.line - L.length + l + 1, r) + " " + o;
           }, this).join(`
-`), C += `
+`), N += `
 ` + U("", r + a) + `^
-`, C;
+`, N;
         } else
-          return C + " at index " + (this.index - 1);
-        function U(o, c) {
-          var l = String(o);
-          return Array(c - l.length + 1).join(" ") + l;
+          return N + " at index " + (this.index - 1);
+        function U(o, l) {
+          var c = String(o);
+          return Array(l - c.length + 1).join(" ") + c;
         }
       };
-      function O(I, C, s) {
+      function O(I, N, t) {
         if (I instanceof S)
-          var L = I, s = C;
+          var L = I, t = N;
         else
-          var L = S.fromCompiled(I, C);
+          var L = S.fromCompiled(I, N);
         this.grammar = L, this.options = {
           keepHistory: !1,
           lexer: L.lexer || new e()
         };
-        for (var P in s || {})
-          this.options[P] = s[P];
+        for (var P in t || {})
+          this.options[P] = t[P];
         this.lexer = this.options.lexer, this.lexerState = void 0;
         var a = new A(L, 0);
         this.table = [a], a.wants[L.start] = [], a.predict(L.start), a.process(), this.current = 0;
       }
       O.fail = {}, O.prototype.feed = function(I) {
-        var C = this.lexer;
-        C.reset(I, this.lexerState);
-        for (var s; ; ) {
+        var N = this.lexer;
+        N.reset(I, this.lexerState);
+        for (var t; ; ) {
           try {
-            if (s = C.next(), !s)
+            if (t = N.next(), !t)
               break;
           } catch (K) {
             var r = new A(this.grammar, this.current + 1);
@@ -17930,86 +17958,86 @@ function rI() {
           this.options.keepHistory || delete this.table[this.current - 1];
           var a = this.current + 1, r = new A(this.grammar, a);
           this.table.push(r);
-          for (var U = s.text !== void 0 ? s.text : s.value, o = C.constructor === e ? s.value : s, c = P.scannable, l = c.length; l--; ) {
-            var u = c[l], Y = u.rule.symbols[u.dot];
-            if (Y.test ? Y.test(o) : Y.type ? Y.type === s.type : Y.literal === U) {
-              var p = u.nextState({ data: o, token: s, isToken: !0, reference: a - 1 });
+          for (var U = t.text !== void 0 ? t.text : t.value, o = N.constructor === e ? t.value : t, l = P.scannable, c = l.length; c--; ) {
+            var H = l[c], u = H.rule.symbols[H.dot];
+            if (u.test ? u.test(o) : u.type ? u.type === t.type : u.literal === U) {
+              var p = H.nextState({ data: o, token: t, isToken: !0, reference: a - 1 });
               r.states.push(p);
             }
           }
           if (r.process(), r.states.length === 0) {
-            var L = new Error(this.reportError(s));
-            throw L.offset = this.current, L.token = s, L;
+            var L = new Error(this.reportError(t));
+            throw L.offset = this.current, L.token = t, L;
           }
-          this.options.keepHistory && (P.lexerState = C.save()), this.current++;
+          this.options.keepHistory && (P.lexerState = N.save()), this.current++;
         }
-        return P && (this.lexerState = C.save()), this.results = this.finish(), this;
+        return P && (this.lexerState = N.save()), this.results = this.finish(), this;
       }, O.prototype.reportLexerError = function(I) {
-        var C, s, L = I.token;
-        return L ? (C = "input " + JSON.stringify(L.text[0]) + " (lexer error)", s = this.lexer.formatError(L, "Syntax error")) : (C = "input (lexer error)", s = I.message), this.reportErrorCommon(s, C);
+        var N, t, L = I.token;
+        return L ? (N = "input " + JSON.stringify(L.text[0]) + " (lexer error)", t = this.lexer.formatError(L, "Syntax error")) : (N = "input (lexer error)", t = I.message), this.reportErrorCommon(t, N);
       }, O.prototype.reportError = function(I) {
-        var C = (I.type ? I.type + " token: " : "") + JSON.stringify(I.value !== void 0 ? I.value : I), s = this.lexer.formatError(I, "Syntax error");
-        return this.reportErrorCommon(s, C);
-      }, O.prototype.reportErrorCommon = function(I, C) {
-        var s = [];
-        s.push(I);
+        var N = (I.type ? I.type + " token: " : "") + JSON.stringify(I.value !== void 0 ? I.value : I), t = this.lexer.formatError(I, "Syntax error");
+        return this.reportErrorCommon(t, N);
+      }, O.prototype.reportErrorCommon = function(I, N) {
+        var t = [];
+        t.push(I);
         var L = this.table.length - 2, P = this.table[L], a = P.states.filter(function(U) {
           var o = U.rule.symbols[U.dot];
           return o && typeof o != "string";
         });
         if (a.length === 0)
-          s.push("Unexpected " + C + `. I did not expect any more input. Here is the state of my parse table:
-`), this.displayStateStack(P.states, s);
+          t.push("Unexpected " + N + `. I did not expect any more input. Here is the state of my parse table:
+`), this.displayStateStack(P.states, t);
         else {
-          s.push("Unexpected " + C + `. Instead, I was expecting to see one of the following:
+          t.push("Unexpected " + N + `. Instead, I was expecting to see one of the following:
 `);
           var r = a.map(function(U) {
             return this.buildFirstStateStack(U, []) || [U];
           }, this);
           r.forEach(function(U) {
-            var o = U[0], c = o.rule.symbols[o.dot], l = this.getSymbolDisplay(c);
-            s.push("A " + l + " based on:"), this.displayStateStack(U, s);
+            var o = U[0], l = o.rule.symbols[o.dot], c = this.getSymbolDisplay(l);
+            t.push("A " + c + " based on:"), this.displayStateStack(U, t);
           }, this);
         }
-        return s.push(""), s.join(`
+        return t.push(""), t.join(`
 `);
-      }, O.prototype.displayStateStack = function(I, C) {
-        for (var s, L = 0, P = 0; P < I.length; P++) {
+      }, O.prototype.displayStateStack = function(I, N) {
+        for (var t, L = 0, P = 0; P < I.length; P++) {
           var a = I[P], r = a.rule.toString(a.dot);
-          r === s ? L++ : (L > 0 && C.push("    ^ " + L + " more lines identical to this"), L = 0, C.push("    " + r)), s = r;
+          r === t ? L++ : (L > 0 && N.push("    ^ " + L + " more lines identical to this"), L = 0, N.push("    " + r)), t = r;
         }
       }, O.prototype.getSymbolDisplay = function(I) {
-        return N(I);
-      }, O.prototype.buildFirstStateStack = function(I, C) {
-        if (C.indexOf(I) !== -1)
+        return s(I);
+      }, O.prototype.buildFirstStateStack = function(I, N) {
+        if (N.indexOf(I) !== -1)
           return null;
         if (I.wantedBy.length === 0)
           return [I];
-        var s = I.wantedBy[0], L = [I].concat(C), P = this.buildFirstStateStack(s, L);
+        var t = I.wantedBy[0], L = [I].concat(N), P = this.buildFirstStateStack(t, L);
         return P === null ? null : [I].concat(P);
       }, O.prototype.save = function() {
         var I = this.table[this.current];
         return I.lexerState = this.lexerState, I;
       }, O.prototype.restore = function(I) {
-        var C = I.index;
-        this.current = C, this.table[C] = I, this.table.splice(C + 1), this.lexerState = I.lexerState, this.results = this.finish();
+        var N = I.index;
+        this.current = N, this.table[N] = I, this.table.splice(N + 1), this.lexerState = I.lexerState, this.results = this.finish();
       }, O.prototype.rewind = function(I) {
         if (!this.options.keepHistory)
           throw new Error("set option `keepHistory` to enable rewinding");
         this.restore(this.table[I]);
       }, O.prototype.finish = function() {
-        var I = [], C = this.grammar.start, s = this.table[this.table.length - 1];
-        return s.states.forEach(function(L) {
-          L.rule.name === C && L.dot === L.rule.symbols.length && L.reference === 0 && L.data !== O.fail && I.push(L);
+        var I = [], N = this.grammar.start, t = this.table[this.table.length - 1];
+        return t.states.forEach(function(L) {
+          L.rule.name === N && L.dot === L.rule.symbols.length && L.reference === 0 && L.data !== O.fail && I.push(L);
         }), I.map(function(L) {
           return L.data;
         });
       };
-      function N(I) {
-        var C = typeof I;
-        if (C === "string")
+      function s(I) {
+        var N = typeof I;
+        if (N === "string")
           return I;
-        if (C === "object") {
+        if (N === "object") {
           if (I.literal)
             return JSON.stringify(I.literal);
           if (I instanceof RegExp)
@@ -18022,10 +18050,10 @@ function rI() {
         }
       }
       function D(I) {
-        var C = typeof I;
-        if (C === "string")
+        var N = typeof I;
+        if (N === "string")
           return I;
-        if (C === "object") {
+        if (N === "object") {
           if (I.literal)
             return JSON.stringify(I.literal);
           if (I instanceof RegExp)
@@ -18121,7 +18149,7 @@ var M;
 function BE(T) {
   return T[0];
 }
-const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
+const G = new hT((T) => []), h = ([[T]]) => T, F = (T) => ({
   type: M.keyword,
   tokenType: T.type,
   text: T.text,
@@ -18130,14 +18158,14 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
   type: M.data_type,
   text: T.text,
   raw: T.raw
-}), F = (T, { leading: E, trailing: R }) => (E?.length && (T = Object.assign(Object.assign({}, T), { leadingComments: E })), R?.length && (T = Object.assign(Object.assign({}, T), { trailingComments: R })), T), lI = (T, { leading: E, trailing: R }) => {
+}), Y = (T, { leading: E, trailing: R }) => (E?.length && (T = Object.assign(Object.assign({}, T), { leadingComments: E })), R?.length && (T = Object.assign(Object.assign({}, T), { trailingComments: R })), T), lI = (T, { leading: E, trailing: R }) => {
   if (E?.length) {
     const [A, ...S] = T;
-    T = [F(A, { leading: E }), ...S];
+    T = [Y(A, { leading: E }), ...S];
   }
   if (R?.length) {
     const A = T.slice(0, -1), S = T[T.length - 1];
-    T = [...A, F(S, { trailing: R })];
+    T = [...A, Y(S, { trailing: R })];
   }
   return T;
 }, HI = {
@@ -18191,14 +18219,14 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
           const [S, e] = A;
           return {
             type: M.limit_clause,
-            limitKw: F(B(T), { trailing: E }),
+            limitKw: Y(F(T), { trailing: E }),
             offset: R,
             count: e
           };
         } else
           return {
             type: M.limit_clause,
-            limitKw: F(B(T), { trailing: E }),
+            limitKw: Y(F(T), { trailing: E }),
             count: R
           };
       }
@@ -18214,7 +18242,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT, "select_clause$subexpression$1"],
       postprocess: ([T, [E, R]]) => ({
         type: M.clause,
-        nameKw: B(T),
+        nameKw: F(T),
         children: [E, ...R]
       })
     },
@@ -18223,7 +18251,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT],
       postprocess: ([T]) => ({
         type: M.clause,
-        nameKw: B(T),
+        nameKw: F(T),
         children: []
       })
     },
@@ -18239,7 +18267,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("RESERVED_CLAUSE") ? { type: "RESERVED_CLAUSE" } : RESERVED_CLAUSE, "other_clause$ebnf$1"],
       postprocess: ([T, E]) => ({
         type: M.clause,
-        nameKw: B(T),
+        nameKw: F(T),
         children: E
       })
     },
@@ -18250,7 +18278,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("RESERVED_SET_OPERATION") ? { type: "RESERVED_SET_OPERATION" } : RESERVED_SET_OPERATION, "set_operation$ebnf$1"],
       postprocess: ([T, E]) => ({
         type: M.set_operation,
-        nameKw: B(T),
+        nameKw: F(T),
         children: E
       })
     },
@@ -18274,17 +18302,17 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
     {
       name: "expression_with_comments_",
       symbols: ["expression", "_"],
-      postprocess: ([T, E]) => F(T, { trailing: E })
+      postprocess: ([T, E]) => Y(T, { trailing: E })
     },
     {
       name: "_expression_with_comments",
       symbols: ["_", "expression"],
-      postprocess: ([T, E]) => F(E, { leading: T })
+      postprocess: ([T, E]) => Y(E, { leading: T })
     },
     {
       name: "_andless_expression_with_comments",
       symbols: ["_", "andless_expression"],
-      postprocess: ([T, E]) => F(E, { leading: T })
+      postprocess: ([T, E]) => Y(E, { leading: T })
     },
     { name: "free_form_sql$subexpression$1", symbols: ["asteriskless_free_form_sql"] },
     { name: "free_form_sql$subexpression$1", symbols: ["asterisk"] },
@@ -18323,7 +18351,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("ARRAY_IDENTIFIER") ? { type: "ARRAY_IDENTIFIER" } : ARRAY_IDENTIFIER, "_", "square_brackets"],
       postprocess: ([T, E, R]) => ({
         type: M.array_subscript,
-        array: F({ type: M.identifier, quoted: !1, text: T.text }, { trailing: E }),
+        array: Y({ type: M.identifier, quoted: !1, text: T.text }, { trailing: E }),
         parenthesis: R
       })
     },
@@ -18332,7 +18360,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("ARRAY_KEYWORD") ? { type: "ARRAY_KEYWORD" } : ARRAY_KEYWORD, "_", "square_brackets"],
       postprocess: ([T, E, R]) => ({
         type: M.array_subscript,
-        array: F(B(T), { trailing: E }),
+        array: Y(F(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18341,7 +18369,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("RESERVED_FUNCTION_NAME") ? { type: "RESERVED_FUNCTION_NAME" } : RESERVED_FUNCTION_NAME, "_", "parenthesis"],
       postprocess: ([T, E, R]) => ({
         type: M.function_call,
-        nameKw: F(B(T), { trailing: E }),
+        nameKw: Y(F(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18393,9 +18421,9 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
         // %ARRAY_IDENTIFIER on the left side of <array_subscript>.
         ([T, E, R, A, [S]]) => ({
           type: M.property_access,
-          object: F(T, { trailing: E }),
+          object: Y(T, { trailing: E }),
           operator: R.text,
-          property: F(S, { leading: A })
+          property: Y(S, { leading: A })
         })
       )
     },
@@ -18404,10 +18432,10 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", G.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
       postprocess: ([T, E, R, A, S, e, O]) => ({
         type: M.between_predicate,
-        betweenKw: B(T),
+        betweenKw: F(T),
         expr1: lI(R, { leading: E, trailing: A }),
-        andKw: B(S),
-        expr2: [F(O, { leading: e })]
+        andKw: F(S),
+        expr2: [Y(O, { leading: e })]
       })
     },
     { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: BE },
@@ -18419,8 +18447,8 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", G.has("END") ? { type: "END" } : END],
       postprocess: ([T, E, R, A, S]) => ({
         type: M.case_expression,
-        caseKw: F(B(T), { trailing: E }),
-        endKw: B(S),
+        caseKw: Y(F(T), { trailing: E }),
+        endKw: F(S),
         expr: R || [],
         clauses: A
       })
@@ -18430,8 +18458,8 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", G.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
       postprocess: ([T, E, R, A, S, e]) => ({
         type: M.case_when,
-        whenKw: F(B(T), { trailing: E }),
-        thenKw: F(B(A), { trailing: S }),
+        whenKw: Y(F(T), { trailing: E }),
+        thenKw: Y(F(A), { trailing: S }),
         condition: R,
         result: e
       })
@@ -18441,7 +18469,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("ELSE") ? { type: "ELSE" } : ELSE, "_", "expression_chain_"],
       postprocess: ([T, E, R]) => ({
         type: M.case_else,
-        elseKw: F(B(T), { trailing: E }),
+        elseKw: Y(F(T), { trailing: E }),
         result: R
       })
     },
@@ -18470,7 +18498,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
     {
       name: "keyword",
       symbols: ["keyword$subexpression$1"],
-      postprocess: ([[T]]) => B(T)
+      postprocess: ([[T]]) => F(T)
     },
     { name: "data_type$subexpression$1", symbols: [G.has("RESERVED_DATA_TYPE") ? { type: "RESERVED_DATA_TYPE" } : RESERVED_DATA_TYPE] },
     { name: "data_type$subexpression$1", symbols: [G.has("RESERVED_DATA_TYPE_PHRASE") ? { type: "RESERVED_DATA_TYPE_PHRASE" } : RESERVED_DATA_TYPE_PHRASE] },
@@ -18484,7 +18512,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
       symbols: [G.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
       postprocess: ([T, E, R]) => ({
         type: M.parameterized_data_type,
-        dataType: F(oT(T), { trailing: E }),
+        dataType: Y(oT(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18494,7 +18522,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
     {
       name: "logic_operator",
       symbols: ["logic_operator$subexpression$1"],
-      postprocess: ([[T]]) => B(T)
+      postprocess: ([[T]]) => F(T)
     },
     { name: "other_keyword$subexpression$1", symbols: [G.has("WHEN") ? { type: "WHEN" } : WHEN] },
     { name: "other_keyword$subexpression$1", symbols: [G.has("THEN") ? { type: "THEN" } : THEN] },
@@ -18503,7 +18531,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
     {
       name: "other_keyword",
       symbols: ["other_keyword$subexpression$1"],
-      postprocess: ([[T]]) => B(T)
+      postprocess: ([[T]]) => F(T)
     },
     { name: "_$ebnf$1", symbols: [] },
     { name: "_$ebnf$1", symbols: ["_$ebnf$1", "comment"], postprocess: (T) => T[0].concat([T[1]]) },
@@ -18559,7 +18587,7 @@ var n;
 (function(T) {
   T[T.SPACE = 0] = "SPACE", T[T.NO_SPACE = 1] = "NO_SPACE", T[T.NO_NEWLINE = 2] = "NO_NEWLINE", T[T.NEWLINE = 3] = "NEWLINE", T[T.MANDATORY_NEWLINE = 4] = "MANDATORY_NEWLINE", T[T.INDENT = 5] = "INDENT", T[T.SINGLE_INDENT = 6] = "SINGLE_INDENT";
 })(n = n || (n = {}));
-class WT {
+class fT {
   constructor(E) {
     this.indentation = E, this.items = [];
   }
@@ -18657,7 +18685,7 @@ function UT(T) {
   return LR(T) || T === i.RESERVED_CLAUSE || T === i.RESERVED_SELECT || T === i.RESERVED_SET_OPERATION || T === i.RESERVED_JOIN || T === i.LIMIT;
 }
 const FE = "top-level", pI = "block-level";
-class fT {
+class WT {
   /**
    * @param {string} indent A string to indent with
    */
@@ -18705,9 +18733,9 @@ class fT {
       ;
   }
 }
-class dI extends WT {
+class dI extends fT {
   constructor(E) {
-    super(new fT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
+    super(new WT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
   }
   add(...E) {
     if (E.forEach((R) => this.addToLength(R)), this.length > this.expressionWidth)
@@ -19060,7 +19088,7 @@ class VI {
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new WT(new fT(tI(this.cfg)))
+      layout: new fT(new WT(tI(this.cfg)))
     }).format(E.children);
     return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? R.add(n.NEWLINE, ";") : R.add(n.NO_NEWLINE, ";")), R.toString();
   }
@@ -19081,14 +19109,14 @@ function hI(T) {
       throw new k(`${R} config is no more supported.`);
   if (T.expressionWidth <= 0)
     throw new k(`expressionWidth config must be positive number. Received ${T.expressionWidth} instead.`);
-  if (T.params && !WI(T.params) && console.warn('WARNING: All "params" option values should be strings.'), T.paramTypes && !fI(T.paramTypes))
+  if (T.params && !fI(T.params) && console.warn('WARNING: All "params" option values should be strings.'), T.paramTypes && !WI(T.paramTypes))
     throw new k("Empty regex given in custom paramTypes. That would result in matching infinite amount of parameters.");
   return T;
 }
-function WI(T) {
+function fI(T) {
   return (T instanceof Array ? T : Object.values(T)).every((R) => typeof R == "string");
 }
-function fI(T) {
+function WI(T) {
   return T.custom && Array.isArray(T.custom) ? T.custom.every((E) => E.regex !== "") : !0;
 }
 var XI = function(T, E) {
@@ -19163,7 +19191,7 @@ function GT(T, E) {
     return console.warn("SQL formatting failed:", R), T;
   }
 }
-class WE {
+class fE {
   cubes = /* @__PURE__ */ new Map();
   dbExecutor;
   metadataCache;
@@ -19280,9 +19308,9 @@ class WE {
    */
   generateCubeMetadata(E) {
     const R = Object.keys(E.measures), A = Object.keys(E.dimensions), S = new Array(R.length), e = new Array(A.length);
-    for (let N = 0; N < R.length; N++) {
-      const D = R[N], I = E.measures[D];
-      S[N] = {
+    for (let s = 0; s < R.length; s++) {
+      const D = R[s], I = E.measures[D];
+      S[s] = {
         name: `${E.name}.${D}`,
         title: I.title || D,
         shortTitle: I.title || D,
@@ -19292,9 +19320,9 @@ class WE {
         description: I.description
       };
     }
-    for (let N = 0; N < A.length; N++) {
-      const D = A[N], I = E.dimensions[D];
-      e[N] = {
+    for (let s = 0; s < A.length; s++) {
+      const D = A[s], I = E.dimensions[D];
+      e[s] = {
         name: `${E.name}.${D}`,
         title: I.title || D,
         shortTitle: I.title || D,
@@ -19306,12 +19334,12 @@ class WE {
     }
     const O = [];
     if (E.joins)
-      for (const [, N] of Object.entries(E.joins)) {
-        const D = typeof N.targetCube == "function" ? N.targetCube() : N.targetCube;
+      for (const [, s] of Object.entries(E.joins)) {
+        const D = typeof s.targetCube == "function" ? s.targetCube() : s.targetCube;
         O.push({
           targetCube: D.name,
-          relationship: N.relationship,
-          joinFields: N.on.map((I) => ({
+          relationship: s.relationship,
+          joinFields: s.on.map((I) => ({
             sourceField: this.getColumnName(I.source),
             targetField: this.getColumnName(I.target)
           }))
@@ -19337,9 +19365,9 @@ class WE {
       throw new Error(`Cube '${E}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const O = await new OE(this.dbExecutor).generateSQL(S, R, A), N = this.dbExecutor.getEngineType();
+    const O = await new OE(this.dbExecutor).generateSQL(S, R, A), s = this.dbExecutor.getEngineType();
     return {
-      sql: GT(O.sql, N),
+      sql: GT(O.sql, s),
       params: O.params
     };
   }
@@ -19405,12 +19433,12 @@ function bT(T, E) {
         continue;
       }
       A.add(e);
-      const N = T.get(e);
-      if (!N) {
+      const s = T.get(e);
+      if (!s) {
         R.push(`Cube '${e}' not found (referenced in measure '${S}')`);
         continue;
       }
-      N.measures[O] || R.push(`Measure '${O}' not found on cube '${e}'`);
+      s.measures[O] || R.push(`Measure '${O}' not found on cube '${e}'`);
     }
   if (E.dimensions)
     for (const S of E.dimensions) {
@@ -19420,12 +19448,12 @@ function bT(T, E) {
         continue;
       }
       A.add(e);
-      const N = T.get(e);
-      if (!N) {
+      const s = T.get(e);
+      if (!s) {
         R.push(`Cube '${e}' not found (referenced in dimension '${S}')`);
         continue;
       }
-      N.dimensions[O] || R.push(`Dimension '${O}' not found on cube '${e}'`);
+      s.dimensions[O] || R.push(`Dimension '${O}' not found on cube '${e}'`);
     }
   if (E.timeDimensions)
     for (const S of E.timeDimensions) {
@@ -19435,12 +19463,12 @@ function bT(T, E) {
         continue;
       }
       A.add(e);
-      const N = T.get(e);
-      if (!N) {
+      const s = T.get(e);
+      if (!s) {
         R.push(`Cube '${e}' not found (referenced in timeDimension '${S.dimension}')`);
         continue;
       }
-      N.dimensions[O] || R.push(`TimeDimension '${O}' not found on cube '${e}' (must be a dimension with time type)`);
+      s.dimensions[O] || R.push(`TimeDimension '${O}' not found on cube '${e}' (must be a dimension with time type)`);
     }
   if (E.filters)
     for (const S of E.filters)
@@ -19452,8 +19480,8 @@ function bT(T, E) {
 }
 function KT(T, E, R, A) {
   if ("and" in T || "or" in T) {
-    const N = T.and || T.or || [];
-    for (const D of N)
+    const s = T.and || T.or || [];
+    for (const D of s)
       KT(D, E, R, A);
     return;
   }
@@ -19475,11 +19503,11 @@ function KT(T, E, R, A) {
   !O.dimensions[e] && !O.measures[e] && R.push(`Filter field '${e}' not found on cube '${S}' (must be a dimension or measure)`);
 }
 function vI(T) {
-  return new WE(T);
+  return new fE(T);
 }
-const gI = new WE(), QI = gI;
+const gI = new fE(), QI = gI;
 function ZI(T) {
-  return new WE({
+  return new fE({
     drizzle: T.drizzle,
     schema: T.schema
   });
@@ -19598,7 +19626,7 @@ export {
   OE as QueryExecutor,
   RR as QueryPlanner,
   kT as SQLiteExecutor,
-  WE as SemanticLayerCompiler,
+  fE as SemanticLayerCompiler,
   qI as SemanticLayerUtils,
   JE as createDatabaseExecutor,
   ZI as createDrizzleSemanticLayer,
@@ -19611,6 +19639,6 @@ export {
   xI as defineCube,
   ER as getJoinType,
   wE as resolveCubeReference,
-  W as resolveSqlExpression,
+  f as resolveSqlExpression,
   gI as semanticLayer
 };