drizzle-cube 0.1.35 → 0.1.37

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 _, eq as w, and as m, count as RE, sum as W, max as YE, min as mE, countDistinct as gT, SQL as JT, or as AE, isNotNull as WE, ne as XE, isNull as bE, notInArray as yE, inArray as SE, lt as eE, gt as IE, gte as K, lte as $, desc as wT, asc as KE } from "drizzle-orm";
 class dE {
   /**
    * Helper method to build pattern for string matching
@@ -18,7 +18,7 @@ class dE {
     }
   }
 }
-class wT extends dE {
+class xT extends dE {
   getEngineType() {
     return "postgres";
   }
@@ -267,7 +267,7 @@ class cT extends dE {
     return E;
   }
 }
-class xT extends dE {
+class vT extends dE {
   getEngineType() {
     return "sqlite";
   }
@@ -403,7 +403,7 @@ class xT extends dE {
     return E;
   }
 }
-class vT extends cT {
+class QT extends cT {
   getEngineType() {
     return "singlestore";
   }
@@ -416,29 +416,29 @@ class vT extends cT {
   // These limitations are typically handled at the query building level
   // rather than in the adapter, but can be addressed here if needed
 }
-function QT(T) {
+function ZT(T) {
   switch (T) {
     case "postgres":
-      return new wT();
+      return new xT();
     case "mysql":
       return new cT();
     case "sqlite":
-      return new xT();
-    case "singlestore":
       return new vT();
+    case "singlestore":
+      return new QT();
     default:
       throw new Error(`Unsupported database engine: ${T}`);
   }
 }
-class VE {
+class hE {
   constructor(E, R, A) {
     this.db = E, this.schema = R;
     const S = A || this.getEngineType();
-    this.databaseAdapter = QT(S);
+    this.databaseAdapter = ZT(S);
   }
   databaseAdapter;
 }
-class ZT extends VE {
+class qT extends hE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const S = await E.execute();
@@ -490,9 +490,9 @@ class ZT extends VE {
   }
 }
 function $E(T, E) {
-  return new ZT(T, E, "postgres");
+  return new qT(T, E, "postgres");
 }
-class lT extends VE {
+class lT extends hE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const S = await E.execute();
@@ -530,10 +530,10 @@ class lT extends VE {
     return "mysql";
   }
 }
-function qT(T, E) {
+function jT(T, E) {
   return new lT(T, E, "mysql");
 }
-class kT extends VE {
+class kT extends hE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const A = await E.execute();
@@ -582,7 +582,7 @@ class kT extends VE {
 function gE(T, E) {
   return new kT(T, E, "sqlite");
 }
-class jT extends lT {
+class zT extends lT {
   getEngineType() {
     return "singlestore";
   }
@@ -590,8 +590,8 @@ class jT extends lT {
   // For now, we inherit all behavior from MySQLExecutor since
   // SingleStore is largely MySQL-compatible
 }
-function zT(T, E) {
-  return new jT(T, E);
+function ER(T, E) {
+  return new zT(T, E);
 }
 function JE(T, E, R) {
   if (R)
@@ -599,11 +599,11 @@ function JE(T, E, R) {
       case "postgres":
         return $E(T, E);
       case "mysql":
-        return qT(T, E);
+        return jT(T, E);
       case "sqlite":
         return gE(T, E);
       case "singlestore":
-        return zT(T, E);
+        return ER(T, E);
     }
   if (T.all && T.run)
     return gE(T, E);
@@ -614,7 +614,7 @@ function JE(T, E, R) {
 function wE(T) {
   return typeof T == "function" ? T() : T;
 }
-function ER(T, E) {
+function HT(T, E) {
   if (E) return E;
   switch (T) {
     case "belongsTo":
@@ -626,27 +626,66 @@ 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) {
+function xI(T, E, R) {
   return {
     ...T,
     cubes: E,
     currentCube: R
   };
 }
-function xI(T, E) {
+function vI(T, E) {
   return {
     name: T,
     ...E
   };
 }
-class TR {
+function TR(T, E) {
+  if (T.relationship !== "belongsToMany" || !T.through)
+    throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
+  const { table: R, sourceKey: A, targetKey: S, securitySql: e } = T.through, O = [];
+  for (const N of A) {
+    const s = N.as || w;
+    O.push(s(N.source, N.target));
+  }
+  const t = [];
+  for (const N of S) {
+    const s = N.as || w;
+    t.push(s(N.source, N.target));
+  }
+  let D;
+  if (e) {
+    const N = e(E);
+    D = Array.isArray(N) ? N : [N];
+  }
+  const I = HT("belongsToMany", T.sqlJoinType);
+  return {
+    junctionJoins: [
+      {
+        joinType: I,
+        table: R,
+        condition: m(...O)
+      },
+      {
+        joinType: I,
+        table: R,
+        // This will be replaced with target cube table in query planner
+        condition: m(...t)
+      }
+    ],
+    junctionSecurityConditions: D
+  };
+}
+class RR {
   constructor(E) {
     this.databaseAdapter = E;
   }
@@ -658,26 +697,26 @@ 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 [t, D] = O.split("."), I = e.get(t);
         if (I && I.dimensions && I.dimensions[D]) {
-          const C = I.dimensions[D], s = W(C.sql, A);
+          const N = I.dimensions[D], s = f(N.sql, A);
           S[O] = _`${s}`.as(O);
         }
       }
     if (R.measures)
       for (const O of R.measures) {
-        const [N, D] = O.split("."), I = e.get(N);
+        const [t, D] = O.split("."), I = e.get(t);
         if (I && I.measures && I.measures[D]) {
-          const C = I.measures[D], s = this.buildMeasureExpression(C, A);
+          const N = I.measures[D], s = this.buildMeasureExpression(N, A);
           S[O] = _`${s}`.as(O);
         }
       }
     if (R.timeDimensions)
       for (const O of R.timeDimensions) {
-        const [N, D] = O.dimension.split("."), I = e.get(N);
+        const [t, D] = O.dimension.split("."), I = e.get(t);
         if (I && I.dimensions && I.dimensions[D]) {
-          const C = I.dimensions[D], s = this.buildTimeDimensionExpression(
-            C.sql,
+          const N = I.dimensions[D], s = this.buildTimeDimensionExpression(
+            N.sql,
             O.granularity,
             A
           );
@@ -691,24 +730,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((t) => t.cube.name === E);
       if (O && O.measures.includes(`${E}.${R}`)) {
-        const N = _`${_.identifier(O.cteAlias)}.${_.identifier(R)}`;
+        const t = _`${_.identifier(O.cteAlias)}.${_.identifier(R)}`;
         switch (A.type) {
           case "count":
           case "countDistinct":
           case "sum":
-            return f(N);
+            return W(t);
           case "avg":
-            return this.databaseAdapter.buildAvg(N);
+            return this.databaseAdapter.buildAvg(t);
           case "min":
-            return mE(N);
+            return mE(t);
           case "max":
-            return YE(N);
+            return YE(t);
           case "number":
-            return f(N);
+            return W(t);
           default:
-            return f(N);
+            return W(t);
         }
       }
     }
@@ -718,7 +757,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) {
@@ -732,9 +771,9 @@ class TR {
       case "count":
         return RE(A);
       case "countDistinct":
-        return $T(A);
+        return gT(A);
       case "sum":
-        return f(A);
+        return W(A);
       case "avg":
         return this.databaseAdapter.buildAvg(A);
       case "min":
@@ -751,8 +790,8 @@ class TR {
    * Build time dimension expression with granularity using database adapter
    */
   buildTimeDimensionExpression(E, R, A) {
-    const S = W(E, A);
-    return R ? this.databaseAdapter.buildTimeDimension(R, S) : S instanceof gT ? S : _`${S}`;
+    const S = f(E, A);
+    return R ? this.databaseAdapter.buildTimeDimension(R, S) : S instanceof JT ? S : _`${S}`;
   }
   /**
    * Build WHERE conditions from semantic query filters (dimensions only)
@@ -761,17 +800,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 t of R.filters) {
+        const D = this.processFilter(t, 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 t of R.timeDimensions) {
+        const [D, I] = t.dimension.split("."), N = O.get(D);
+        if (N && N.dimensions[I] && t.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 s = N.dimensions[I], L = f(s.sql, A), P = this.buildDateRangeCondition(L, t.dateRange);
           P && e.push(P);
         }
       }
@@ -784,8 +823,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 t of R.filters) {
+        const D = this.processFilter(t, O, A, "having", S);
         D && e.push(D);
       }
     return e;
@@ -798,28 +837,28 @@ class TR {
     if ("and" in E || "or" in E) {
       const P = E;
       if (P.and) {
-        const a = P.and.map((r) => this.processFilter(r, R, A, S, e)).filter((r) => r !== null);
-        return a.length > 0 ? m(...a) : null;
+        const o = P.and.map((r) => this.processFilter(r, R, A, S, e)).filter((r) => r !== null);
+        return o.length > 0 ? m(...o) : null;
       }
       if (P.or) {
-        const a = P.or.map((r) => this.processFilter(r, R, A, S, e)).filter((r) => r !== null);
-        return a.length > 0 ? AE(...a) : null;
+        const o = P.or.map((r) => this.processFilter(r, R, A, S, e)).filter((r) => r !== null);
+        return o.length > 0 ? AE(...o) : null;
       }
     }
-    const O = E, [N, D] = O.member.split("."), I = R.get(N);
+    const O = E, [t, D] = O.member.split("."), I = R.get(t);
     if (!I) return null;
-    const C = I.dimensions[D], s = I.measures[D], L = C || s;
+    const N = I.dimensions[D], s = I.measures[D], L = N || s;
     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 === t))
         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)
         return null;
       if (S === "having" && s) {
-        const P = this.buildHavingMeasureExpression(N, D, s, A, e);
+        const P = this.buildHavingMeasureExpression(t, D, s, A, e);
         return this.buildFilterCondition(P, O.operator, O.values, L);
       }
     }
@@ -831,7 +870,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((t) => !(t == null || t === "" || typeof t == "string" && t.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,17 +878,17 @@ 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 t = e.map((D) => this.normalizeDate(D) || D);
+            return SE(E, t);
           }
           return SE(E, e);
         } else if (e.length === 1) {
-          const N = S?.type === "time" && this.normalizeDate(O) || O;
-          return j(E, N);
+          const t = S?.type === "time" && this.normalizeDate(O) || O;
+          return w(E, t);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return e.length > 1 ? KE(E, e) : e.length === 1 ? XE(E, O) : null;
+        return e.length > 1 ? yE(E, e) : e.length === 1 ? XE(E, O) : null;
       case "contains":
         return this.databaseAdapter.buildStringCondition(E, "contains", O);
       case "notContains":
@@ -861,36 +900,36 @@ class TR {
       case "gt":
         return IE(E, O);
       case "gte":
-        return y(E, O);
+        return K(E, O);
       case "lt":
         return eE(E, O);
       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 t = this.normalizeDate(e[0]), D = this.normalizeDate(e[1]);
+          if (t && D)
             return m(
-              y(E, N),
+              K(E, t),
               $(E, D)
             );
         }
         return null;
       case "beforeDate": {
-        const N = this.normalizeDate(O);
-        return N ? eE(E, N) : null;
+        const t = this.normalizeDate(O);
+        return t ? eE(E, t) : null;
       }
       case "afterDate": {
-        const N = this.normalizeDate(O);
-        return N ? IE(E, N) : null;
+        const t = this.normalizeDate(O);
+        return t ? IE(E, t) : null;
       }
       case "between":
         return e.length >= 2 ? m(
-          y(E, e[0]),
+          K(E, e[0]),
           $(E, e[1])
         ) : null;
       case "notBetween":
@@ -901,7 +940,7 @@ class TR {
       case "in":
         return e.length > 0 ? SE(E, e) : null;
       case "notIn":
-        return e.length > 0 ? KE(E, e) : null;
+        return e.length > 0 ? yE(E, e) : null;
       case "like":
         return this.databaseAdapter.buildStringCondition(E, "like", O);
       case "notLike":
@@ -915,11 +954,11 @@ class TR {
       case "isEmpty":
         return AE(
           bE(E),
-          j(E, "")
+          w(E, "")
         );
       case "isNotEmpty":
         return m(
-          fE(E),
+          WE(E),
           XE(E, "")
         );
       default:
@@ -934,7 +973,7 @@ class TR {
     if (Array.isArray(R) && R.length >= 2) {
       const A = this.normalizeDate(R[0]), S = this.normalizeDate(R[1]);
       return !A || !S ? null : m(
-        y(E, A),
+        K(E, A),
         $(E, S)
       );
     }
@@ -942,7 +981,7 @@ class TR {
       const A = this.parseRelativeDateRange(R);
       if (A)
         return m(
-          y(E, A.start),
+          K(E, A.start),
           $(E, A.end)
         );
       const S = this.normalizeDate(R);
@@ -951,7 +990,7 @@ class TR {
       e.setUTCHours(0, 0, 0, 0);
       const O = new Date(S);
       return O.setUTCHours(23, 59, 59, 999), m(
-        y(E, e),
+        K(E, e),
         $(E, O)
       );
     }
@@ -962,7 +1001,7 @@ 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(), t = R.getUTCDay();
     if (A === "today") {
       const s = new Date(R);
       s.setUTCHours(0, 0, 0, 0);
@@ -976,7 +1015,7 @@ class TR {
       return L.setUTCDate(O - 1), L.setUTCHours(23, 59, 59, 999), { start: s, end: L };
     }
     if (A === "this week") {
-      const s = N === 0 ? -6 : 1 - N, L = new Date(R);
+      const s = t === 0 ? -6 : 1 - t, L = new Date(R);
       L.setUTCDate(O + s), 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 };
@@ -1001,7 +1040,7 @@ class TR {
       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);
+      const s = t === 0 ? -13 : -6 - t, L = new Date(R);
       L.setUTCDate(O + s), 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 };
@@ -1011,8 +1050,8 @@ class TR {
       return { start: s, 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));
-      return { start: a, end: r };
+      const s = Math.floor(e / 3), L = s === 0 ? 3 : s - 1, P = s === 0 ? S - 1 : S, o = 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: o, 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));
@@ -1027,9 +1066,9 @@ class TR {
       const s = parseInt(I[1], 10), L = new Date(Date.UTC(S, e - s + 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 s = parseInt(N[1], 10), L = new Date(Date.UTC(S - s, 0, 1, 0, 0, 0, 0)), P = new Date(R);
       return P.setUTCHours(23, 59, 59, 999), { start: L, end: P };
     }
     return null;
@@ -1062,48 +1101,48 @@ 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 t = 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("."), s = t.get(I);
+        if (s && s.dimensions && s.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);
-            if (a && a.sourceColumnObj)
-              e.push(a.sourceColumnObj);
+            const P = S.preAggregationCTEs.find((r) => r.cube.name === I), o = P.joinKeys.find((r) => r.targetColumn === N);
+            if (o && o.sourceColumnObj)
+              e.push(o.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);
-            e.push(a);
+            const P = s.dimensions[N], o = f(P.sql, A);
+            e.push(o);
           }
       }
     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("."), s = t.get(I);
+        if (s && s.dimensions && s.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);
-            if (a && a.sourceColumnObj) {
+            const P = S.preAggregationCTEs.find((r) => r.cube.name === I), o = P.joinKeys.find((r) => r.targetColumn === N);
+            if (o && o.sourceColumnObj) {
               const r = this.buildTimeDimensionExpression(
-                a.sourceColumnObj,
+                o.sourceColumnObj,
                 D.granularity,
                 A
               );
               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 = s.dimensions[N], o = this.buildTimeDimensionExpression(
               P.sql,
               D.granularity,
               A
             );
-            e.push(a);
+            e.push(o);
           }
       }
     return e;
@@ -1121,15 +1160,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 t = O === "desc" ? wT(_.identifier(e)) : KE(_.identifier(e));
+        A.push(t);
       }
     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)
+        (t, D) => t.dimension.localeCompare(D.dimension)
       );
-      for (const N of O)
-        e.has(N.dimension) || A.push(yE(_.identifier(N.dimension)));
+      for (const t of O)
+        e.has(t.dimension) || A.push(KE(_.identifier(t.dimension)));
     }
     return A;
   }
@@ -1141,9 +1180,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, t] = e.split("."), D = S.get(O);
         if (D) {
-          const I = D.dimensions[N];
+          const I = D.dimensions[t];
           I && I.type === "number" && A.push(e);
         }
       }
@@ -1170,7 +1209,7 @@ class TR {
     return S;
   }
 }
-class RR {
+class AR {
   /**
    * Analyze a semantic query to determine which cubes are involved
    */
@@ -1244,12 +1283,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), t = E.get(O);
+    if (!t)
       throw new Error(`Primary cube '${O}' not found`);
     if (e.length === 1)
       return {
-        primaryCube: N,
+        primaryCube: t,
         joinCubes: [],
         // Empty for single cube
         selections: {},
@@ -1259,9 +1298,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, t, e, A), I = this.planPreAggregationCTEs(E, t, D, R);
     return {
-      primaryCube: N,
+      primaryCube: t,
       joinCubes: D,
       selections: {},
       // Will be built by QueryBuilder
@@ -1282,8 +1321,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()), t = [...e.entries()].filter(([, D]) => D === O).map(([D]) => D).sort();
+        for (const D of t)
           if (this.canReachAllCubes(D, E, A))
             return D;
       }
@@ -1292,12 +1331,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), t = O?.joins ? Object.keys(O.joins).length : 0;
+          S.set(e, t);
         }
       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(([, t]) => t === e).map(([t]) => t).sort()[0];
       }
     }
     return [...E].sort()[0];
@@ -1318,36 +1357,56 @@ class RR {
    * Build join plan for multi-cube query
    * 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))
+  buildJoinPlan(E, R, A, S) {
+    const e = [], O = /* @__PURE__ */ new Set([R.name]), t = A.filter((D) => D !== R.name);
+    for (const D of t) {
+      if (O.has(D))
         continue;
-      const D = this.findJoinPath(E, R.name, N, 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) {
-        if (e.has(I))
+      const I = this.findJoinPath(E, R.name, D, O);
+      if (!I || I.length === 0)
+        throw new Error(`No join path found from '${R.name}' to '${D}'`);
+      for (const { toCube: N, joinDef: s } of I) {
+        if (O.has(N))
           continue;
-        const s = E.get(I);
-        if (!s)
-          throw new Error(`Cube '${I}' not found`);
-        const L = this.buildJoinCondition(
-          C,
-          null,
-          // No source alias needed - use the actual column
-          null
-          // No target alias needed - use the actual column 
-        ), P = ER(C.relationship, C.sqlJoinType);
-        S.push({
-          cube: s,
-          alias: `${I.toLowerCase()}_cube`,
-          joinType: P,
-          joinCondition: L
-        }), e.add(I);
+        const L = E.get(N);
+        if (!L)
+          throw new Error(`Cube '${N}' not found`);
+        if (s.relationship === "belongsToMany" && s.through) {
+          const P = TR(s, S.securityContext);
+          e.push({
+            cube: L,
+            alias: `${N.toLowerCase()}_cube`,
+            joinType: P.junctionJoins[1].joinType,
+            // Use the target join type
+            joinCondition: P.junctionJoins[1].condition,
+            // Target join condition
+            junctionTable: {
+              table: s.through.table,
+              alias: `junction_${N.toLowerCase()}`,
+              joinType: P.junctionJoins[0].joinType,
+              joinCondition: P.junctionJoins[0].condition,
+              securitySql: s.through.securitySql
+            }
+          });
+        } else {
+          const P = this.buildJoinCondition(
+            s,
+            null,
+            // No source alias needed - use the actual column
+            null
+            // No target alias needed - use the actual column
+          ), o = HT(s.relationship, s.sqlJoinType);
+          e.push({
+            cube: L,
+            alias: `${N.toLowerCase()}_cube`,
+            joinType: o,
+            joinCondition: P
+          });
+        }
+        O.add(N);
       }
     }
-    return S;
+    return e;
   }
   /**
    * Build join condition from new array-based join definition
@@ -1355,8 +1414,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, t = A ? _`${_.identifier(A)}.${_.identifier(e.target.name)}` : e.target, D = e.as || w;
+      S.push(D(O, t));
     }
     return m(...S);
   }
@@ -1371,16 +1430,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: t, path: D } = e.shift(), I = E.get(t);
       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: t,
             toCube: L,
-            joinDef: C
+            joinDef: N
           }];
           if (L === A)
             return P;
@@ -1391,21 +1450,23 @@ class RR {
   }
   /**
    * Plan pre-aggregation CTEs for hasMany relationships to prevent fan-out
+   * Note: belongsToMany relationships handle fan-out differently through their junction table structure
+   * and don't require CTEs - the two-hop join with the junction table provides natural grouping
    */
   planPreAggregationCTEs(E, R, A, S) {
     const e = [];
     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 t = this.findHasManyJoinDef(R, O.cube.name);
+      if (!t)
         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 s = t.on.map((L) => ({
         sourceColumn: L.source.name,
         targetColumn: L.target.name,
         sourceColumnObj: L.source,
@@ -1416,7 +1477,7 @@ class RR {
         alias: O.alias,
         cteAlias: `${O.cube.name.toLowerCase()}_agg`,
         joinKeys: s,
-        measures: C
+        measures: N
       });
     }
     return e;
@@ -1437,7 +1498,7 @@ class OE {
   constructor(E) {
     if (this.dbExecutor = E, this.databaseAdapter = E.databaseAdapter, !this.databaseAdapter)
       throw new Error("DatabaseExecutor must have a databaseAdapter property");
-    this.queryBuilder = new TR(this.databaseAdapter), this.queryPlanner = new RR();
+    this.queryBuilder = new RR(this.databaseAdapter), this.queryPlanner = new AR();
   }
   queryBuilder;
   queryPlanner;
@@ -1447,30 +1508,30 @@ class OE {
    */
   async execute(E, R, A) {
     try {
-      const S = bT(E, R);
+      const S = yT(E, R);
       if (!S.isValid)
         throw new Error(`Query validation failed: ${S.errors.join(", ")}`);
       const e = {
         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), t = this.buildUnifiedQuery(O, R, e), D = this.queryBuilder.collectNumericFields(E, R), I = await this.dbExecutor.execute(t, D), N = Array.isArray(I) ? I.map((L) => {
         const P = { ...L };
         if (R.timeDimensions) {
-          for (const a of R.timeDimensions)
-            if (a.dimension in P) {
-              let r = P[a.dimension];
+          for (const o of R.timeDimensions)
+            if (o.dimension in P) {
+              let r = P[o.dimension];
               if (typeof r == "string" && r.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-                const U = r.replace(" ", "T"), o = !U.endsWith("Z") && !U.includes("+") ? U + "Z" : U;
-                r = new Date(o);
+                const U = r.replace(" ", "T"), a = !U.endsWith("Z") && !U.includes("+") ? U + "Z" : U;
+                r = new Date(a);
               }
-              r = this.databaseAdapter.convertTimeDimensionResult(r), P[a.dimension] = r;
+              r = this.databaseAdapter.convertTimeDimensionResult(r), P[o.dimension] = r;
             }
         }
         return P;
       }) : [I], s = this.generateAnnotations(O, R);
       return {
-        data: C,
+        data: N,
         annotation: s
       };
     } catch (S) {
@@ -1488,61 +1549,61 @@ 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), t = {};
     for (const r of E.joinKeys)
       if (r.targetColumnObj) {
-        N[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));
+        t[r.targetColumn] = r.targetColumnObj;
+        for (const [U, a] of Object.entries(e.dimensions || {}))
+          a.sql === r.targetColumnObj && U !== r.targetColumn && (t[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 a = e.measures[U], l = this.queryBuilder.buildMeasureExpression(a, A);
+        t[U] = _`${l}`.as(U);
       }
     }
     const D = e.name;
     if (R.dimensions)
       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 [U, a] = r.split(".");
+        if (U === D && e.dimensions && e.dimensions[a]) {
+          const l = e.dimensions[a], c = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A);
+          t[a] = _`${c}`.as(a);
         }
       }
     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 [U, a] = r.dimension.split(".");
+        if (U === D && e.dimensions && e.dimensions[a]) {
+          const l = e.dimensions[a], c = this.queryBuilder.buildTimeDimensionExpression(l.sql, r.granularity, A);
+          t[a] = _`${c}`.as(a);
         }
       }
-    if (Object.keys(N).length === 0)
+    if (Object.keys(t).length === 0)
       return null;
-    let I = A.db.select(N).from(O.from);
-    const C = S ? {
+    let I = A.db.select(t).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, s = 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 [U, a] = r.dimension.split(".");
+        if (U === D && e.dimensions && e.dimensions[a] && r.dateRange) {
+          const l = e.dimensions[a], 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, [a, l] = U.member.split(".");
+          if (a === 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);
             }
           }
         }
@@ -1552,26 +1613,26 @@ class OE {
       const r = P.length === 1 ? P[0] : m(...P);
       I = I.where(r);
     }
-    const a = [];
+    const o = [];
     for (const r of E.joinKeys)
-      r.targetColumnObj && a.push(r.targetColumnObj);
+      r.targetColumnObj && o.push(r.targetColumnObj);
     if (R.dimensions)
       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 [U, a] = r.split(".");
+        if (U === D && e.dimensions && e.dimensions[a]) {
+          const l = e.dimensions[a], c = f(l.sql, A);
+          o.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 [U, a] = r.dimension.split(".");
+        if (U === D && e.dimensions && e.dimensions[a]) {
+          const l = e.dimensions[a], c = this.queryBuilder.buildTimeDimensionExpression(l.sql, r.granularity, A);
+          o.push(c);
         }
       }
-    return a.length > 0 && (I = I.groupBy(...a)), A.db.$with(E.cteAlias).as(I);
+    return o.length > 0 && (I = I.groupBy(...o)), A.db.$with(E.cteAlias).as(I);
   }
   // Removed unused getActualJoinTargetColumn method
   /**
@@ -1583,8 +1644,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 t = O.sourceColumnObj || _.identifier(O.sourceColumn), D = _`${_.identifier(R)}.${_.identifier(O.targetColumn)}`;
+      e.push(w(t, D));
     }
     return e.length === 1 ? e[0] : m(...e);
   }
@@ -1607,98 +1668,123 @@ class OE {
     if (E.preAggregationCTEs)
       for (const r of E.preAggregationCTEs) {
         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)}`;
+        for (const a of r.measures)
+          if (D[a]) {
+            const [, l] = a.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);
+              D[a] = _`${p}`.as(a);
             }
           }
-        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;
-                K = r.joinKeys.find((yT) => yT.targetColumnObj === TE);
+        for (const a in D) {
+          const [l, c] = a.split(".");
+          if (l === U) {
+            const H = this.getCubesFromPlan(E).get(U), u = H && H.dimensions?.[c], p = a.startsWith(U + ".");
+            if (u || p) {
+              let y = r.joinKeys.find((TE) => TE.targetColumn === c);
+              if (!y && H?.dimensions?.[c]) {
+                const TE = H.dimensions[c].sql;
+                y = r.joinKeys.find(($T) => $T.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));
+              y ? D[a] = _`${_.identifier(r.cteAlias)}.${_.identifier(c)}`.as(a) : p && H?.dimensions?.[c] && (D[a] = _`${_.identifier(r.cteAlias)}.${_.identifier(c)}`.as(a));
             }
           }
         }
       }
-    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 a, l;
+        U ? (a = _`${_.identifier(U)}`, l = this.buildCTEJoinCondition(r, U, E)) : (a = r.cube.sql(A).from, l = r.joinCondition);
         try {
           switch (r.joinType || "left") {
             case "left":
-              I = I.leftJoin(o, c);
+              N = N.leftJoin(a, l);
               break;
             case "inner":
-              I = I.innerJoin(o, c);
+              N = N.innerJoin(a, l);
               break;
             case "right":
-              I = I.rightJoin(o, c);
+              N = N.rightJoin(a, l);
               break;
             case "full":
-              I = I.fullJoin(o, c);
+              N = N.fullJoin(a, 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);
+        const a = r.cube.sql(A);
+        a.where && I.push(a.where);
       }
     const s = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -1708,9 +1794,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 (s.length > 0 && I.push(...s), 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 +1806,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 +1817,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;
+    const o = this.queryBuilder.buildOrderBy(R);
+    return o.length > 0 && (N = N.orderBy(...o)), N = this.queryBuilder.applyLimitAndOffset(N, R), N;
   }
   /**
    * Convert query plan to cube map for QueryBuilder methods
@@ -1767,10 +1853,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), t = this.buildUnifiedQuery(e, R, S).toSQL();
     return {
-      sql: N.sql,
-      params: N.params
+      sql: t.sql,
+      params: t.params
     };
   }
   /**
@@ -1778,12 +1864,12 @@ 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] = {
+    if (E.joinCubes && E.joinCubes.length > 0 && O.push(...E.joinCubes.map((t) => t.cube)), R.measures)
+      for (const t of R.measures) {
+        const [D, I] = t.split("."), N = O.find((s) => s.name === D);
+        if (N && N.measures[I]) {
+          const s = N.measures[I];
+          A[t] = {
             title: s.title || I,
             shortTitle: s.title || I,
             type: s.type
@@ -1791,11 +1877,11 @@ class OE {
         }
       }
     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] = {
+      for (const t of R.dimensions) {
+        const [D, I] = t.split("."), N = O.find((s) => s.name === D);
+        if (N && N.dimensions[I]) {
+          const s = N.dimensions[I];
+          S[t] = {
             title: s.title || I,
             shortTitle: s.title || I,
             type: s.type
@@ -1803,15 +1889,15 @@ class OE {
         }
       }
     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] = {
+      for (const t of R.timeDimensions) {
+        const [D, I] = t.dimension.split("."), N = O.find((s) => s.name === D);
+        if (N && N.dimensions && N.dimensions[I]) {
+          const s = N.dimensions[I];
+          e[t.dimension] = {
             title: s.title || I,
             shortTitle: s.title || I,
             type: s.type,
-            granularity: N.granularity
+            granularity: t.granularity
           };
         }
       }
@@ -1823,13 +1909,13 @@ 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(SR), SR = (T) => Z(IR(T)).map(eR), eR = (T) => T.replace(/ +/g, " ").trim(), IR = (T) => ({
   type: "mandatory_block",
-  items: hE(T, 0)[0]
-}), hE = (T, E, R) => {
+  items: VE(T, 0)[0]
+}), VE = (T, E, R) => {
   const A = [];
   for (; T[E]; ) {
-    const [S, e] = IR(T, E);
+    const [S, e] = NR(T, E);
     if (A.push(S), E = e, T[E] === "|")
       E++;
     else if (T[E] === "}" || T[E] === "]") {
@@ -1844,44 +1930,44 @@ const t = (T) => T.flatMap(AR), AR = (T) => Q(eR(T)).map(SR), SR = (T) => T.repl
       throw new Error(`Unexpected "${T[E]}"`);
   }
   return [A, E];
-}, IR = (T, E) => {
+}, NR = (T, E) => {
   const R = [];
   for (; ; ) {
-    const [A, S] = NR(T, E);
+    const [A, S] = sR(T, E);
     if (A)
       R.push(A), E = S;
     else
       break;
   }
   return R.length === 1 ? [R[0], E] : [{ type: "concatenation", items: R }, E];
-}, NR = (T, E) => {
+}, sR = (T, E) => {
   if (T[E] === "{")
-    return sR(T, E + 1);
-  if (T[E] === "[")
     return tR(T, E + 1);
+  if (T[E] === "[")
+    return CR(T, E + 1);
   {
     let R = "";
     for (; T[E] && /[A-Za-z0-9_ ]/.test(T[E]); )
       R += T[E], E++;
     return [R, E];
   }
-}, sR = (T, E) => {
-  const [R, A] = hE(T, E, "}");
-  return [{ type: "mandatory_block", items: R }, A];
 }, tR = (T, E) => {
-  const [R, A] = hE(T, E, "]");
+  const [R, A] = VE(T, E, "}");
+  return [{ type: "mandatory_block", items: R }, A];
+}, CR = (T, E) => {
+  const [R, A] = VE(T, E, "]");
   return [{ type: "optional_block", items: R }, A];
-}, Q = (T) => {
+}, Z = (T) => {
   if (typeof T == "string")
     return [T];
   if (T.type === "concatenation")
-    return T.items.map(Q).reduce(CR, [""]);
+    return T.items.map(Z).reduce(LR, [""]);
   if (T.type === "mandatory_block")
-    return T.items.flatMap(Q);
+    return T.items.flatMap(Z);
   if (T.type === "optional_block")
-    return ["", ...T.items.flatMap(Q)];
+    return ["", ...T.items.flatMap(Z)];
   throw new Error(`Unknown node type: ${T}`);
-}, CR = (T, E) => {
+}, LR = (T, E) => {
   const R = [];
   for (const A of T)
     for (const S of E)
@@ -1892,19 +1978,19 @@ var i;
 (function(T) {
   T.QUOTED_IDENTIFIER = "QUOTED_IDENTIFIER", T.IDENTIFIER = "IDENTIFIER", T.STRING = "STRING", T.VARIABLE = "VARIABLE", T.RESERVED_DATA_TYPE = "RESERVED_DATA_TYPE", T.RESERVED_PARAMETERIZED_DATA_TYPE = "RESERVED_PARAMETERIZED_DATA_TYPE", T.RESERVED_KEYWORD = "RESERVED_KEYWORD", T.RESERVED_FUNCTION_NAME = "RESERVED_FUNCTION_NAME", T.RESERVED_KEYWORD_PHRASE = "RESERVED_KEYWORD_PHRASE", T.RESERVED_DATA_TYPE_PHRASE = "RESERVED_DATA_TYPE_PHRASE", T.RESERVED_SET_OPERATION = "RESERVED_SET_OPERATION", T.RESERVED_CLAUSE = "RESERVED_CLAUSE", T.RESERVED_SELECT = "RESERVED_SELECT", T.RESERVED_JOIN = "RESERVED_JOIN", T.ARRAY_IDENTIFIER = "ARRAY_IDENTIFIER", T.ARRAY_KEYWORD = "ARRAY_KEYWORD", T.CASE = "CASE", T.END = "END", T.WHEN = "WHEN", T.ELSE = "ELSE", T.THEN = "THEN", T.LIMIT = "LIMIT", T.BETWEEN = "BETWEEN", T.AND = "AND", T.OR = "OR", T.XOR = "XOR", T.OPERATOR = "OPERATOR", T.COMMA = "COMMA", T.ASTERISK = "ASTERISK", T.PROPERTY_ACCESS_OPERATOR = "PROPERTY_ACCESS_OPERATOR", T.OPEN_PAREN = "OPEN_PAREN", T.CLOSE_PAREN = "CLOSE_PAREN", T.LINE_COMMENT = "LINE_COMMENT", T.BLOCK_COMMENT = "BLOCK_COMMENT", T.DISABLE_COMMENT = "DISABLE_COMMENT", T.NUMBER = "NUMBER", T.NAMED_PARAMETER = "NAMED_PARAMETER", T.QUOTED_PARAMETER = "QUOTED_PARAMETER", T.NUMBERED_PARAMETER = "NUMBERED_PARAMETER", T.POSITIONAL_PARAMETER = "POSITIONAL_PARAMETER", T.CUSTOM_PARAMETER = "CUSTOM_PARAMETER", T.DELIMITER = "DELIMITER", T.EOF = "EOF";
 })(i = i || (i = {}));
-const HT = (T) => ({
+const uT = (T) => ({
   type: i.EOF,
   raw: "«EOF»",
   text: "«EOF»",
   start: T
-}), w = HT(1 / 0), g = (T) => (E) => E.type === T.type && E.text === T.text, X = {
+}), x = uT(1 / 0), g = (T) => (E) => E.type === T.type && E.text === T.text, X = {
   ARRAY: g({ text: "ARRAY", type: i.RESERVED_DATA_TYPE }),
   BY: g({ text: "BY", type: i.RESERVED_KEYWORD }),
   SET: g({ text: "SET", type: i.RESERVED_CLAUSE }),
   STRUCT: g({ text: "STRUCT", type: i.RESERVED_DATA_TYPE }),
   WINDOW: g({ text: "WINDOW", type: i.RESERVED_CLAUSE }),
   VALUES: g({ text: "VALUES", type: i.RESERVED_CLAUSE })
-}, uT = (T) => T === i.RESERVED_DATA_TYPE || T === i.RESERVED_KEYWORD || T === i.RESERVED_FUNCTION_NAME || T === i.RESERVED_KEYWORD_PHRASE || T === i.RESERVED_DATA_TYPE_PHRASE || T === i.RESERVED_CLAUSE || T === i.RESERVED_SELECT || T === i.RESERVED_SET_OPERATION || T === i.RESERVED_JOIN || T === i.ARRAY_KEYWORD || T === i.CASE || T === i.END || T === i.WHEN || T === i.ELSE || T === i.THEN || T === i.LIMIT || T === i.BETWEEN || T === i.AND || T === i.OR || T === i.XOR, LR = (T) => T === i.AND || T === i.OR || T === i.XOR, _R = [
+}, BT = (T) => T === i.RESERVED_DATA_TYPE || T === i.RESERVED_KEYWORD || T === i.RESERVED_FUNCTION_NAME || T === i.RESERVED_KEYWORD_PHRASE || T === i.RESERVED_DATA_TYPE_PHRASE || T === i.RESERVED_CLAUSE || T === i.RESERVED_SELECT || T === i.RESERVED_SET_OPERATION || T === i.RESERVED_JOIN || T === i.ARRAY_KEYWORD || T === i.CASE || T === i.END || T === i.WHEN || T === i.ELSE || T === i.THEN || T === i.LIMIT || T === i.BETWEEN || T === i.AND || T === i.OR || T === i.XOR, _R = (T) => T === i.AND || T === i.OR || T === i.XOR, rR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -2448,7 +2534,7 @@ const HT = (T) => ({
   // pivot
   "PIVOT",
   "UNPIVOT"
-], rR = [
+], nR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/lexical#reserved_keywords
   "ALL",
   "AND",
@@ -2556,7 +2642,7 @@ const HT = (T) => ({
   "CASCADE",
   "RESTRICT",
   "DETERMINISTIC"
-], nR = [
+], DR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types
   "ARRAY",
   "BOOL",
@@ -2581,7 +2667,7 @@ const HT = (T) => ({
   "STRUCT",
   "TIME",
   "TIMEZONE"
-], DR = t(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), iR = t([
+], iR = C(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), PR = C([
   // Queries: https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax
   "WITH [RECURSIVE]",
   "FROM",
@@ -2610,9 +2696,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 +2786,15 @@ const HT = (T) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), PR = t([
+]), oR = C([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), aR = t([
+]), aR = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), oR = t([
+]), MR = 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,18 +2805,18 @@ const HT = (T) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), MR = t([]), UR = {
+]), UR = C([]), GR = {
   name: "bigquery",
   tokenizerOptions: {
-    reservedSelect: DR,
-    reservedClauses: [...iR, ...NE, ...xE],
-    reservedSetOperations: PR,
+    reservedSelect: iR,
+    reservedClauses: [...PR, ...NE, ...xE],
+    reservedSetOperations: oR,
     reservedJoins: aR,
-    reservedKeywordPhrases: oR,
-    reservedDataTypePhrases: MR,
-    reservedKeywords: rR,
-    reservedDataTypes: nR,
-    reservedFunctionNames: _R,
+    reservedKeywordPhrases: MR,
+    reservedDataTypePhrases: UR,
+    reservedKeywords: nR,
+    reservedDataTypes: DR,
+    reservedFunctionNames: rR,
     extraParens: ["[]"],
     stringTypes: [
       // The triple-quoted strings are listed first, so they get matched first.
@@ -2748,27 +2834,27 @@ const HT = (T) => ({
     variableTypes: [{ regex: String.raw`@@\w+` }],
     lineCommentTypes: ["--", "#"],
     operators: ["&", "|", "^", "~", ">>", "<<", "||", "=>"],
-    postProcess: GR
+    postProcess: cR
   },
   formatOptions: {
     onelineClauses: [...xE, ...NE],
     tabularOnelineClauses: NE
   }
 };
-function GR(T) {
-  return cR(lR(T));
-}
 function cR(T) {
-  let E = w;
-  return T.map((R) => R.text === "OFFSET" && E.text === "[" ? (E = R, Object.assign(Object.assign({}, R), { type: i.RESERVED_FUNCTION_NAME })) : (E = R, R));
+  return lR(HR(T));
 }
 function lR(T) {
+  let E = x;
+  return T.map((R) => R.text === "OFFSET" && E.text === "[" ? (E = R, Object.assign(Object.assign({}, R), { type: i.RESERVED_FUNCTION_NAME })) : (E = R, R));
+}
+function HR(T) {
   var E;
   const R = [];
   for (let A = 0; A < T.length; A++) {
     const S = T[A];
     if ((X.ARRAY(S) || X.STRUCT(S)) && ((E = T[A + 1]) === null || E === void 0 ? void 0 : E.text) === "<") {
-      const e = HR(T, A + 1), O = T.slice(A, e + 1);
+      const e = uR(T, A + 1), O = T.slice(A, e + 1);
       R.push({
         type: i.IDENTIFIER,
         raw: O.map(vE("raw")).join(""),
@@ -2781,7 +2867,7 @@ function lR(T) {
   return R;
 }
 const vE = (T) => (E) => E.type === i.IDENTIFIER || E.type === i.COMMA ? E[T] + " " : E[T];
-function HR(T, E) {
+function uR(T, E) {
   let R = 0;
   for (let A = E; A < T.length; A++) {
     const S = T[A];
@@ -2790,7 +2876,7 @@ function HR(T, E) {
   }
   return T.length - 1;
 }
-const uR = [
+const BR = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=bif-aggregate-functions
   "ARRAY_AGG",
   "AVG",
@@ -3110,7 +3196,7 @@ const uR = [
   "RATIO_TO_REPORT",
   // Type casting
   "CAST"
-], BR = [
+], FR = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=sql-reserved-schema-names-reserved-words
   "ACTIVATE",
   "ADD",
@@ -3511,7 +3597,7 @@ const uR = [
   "XMLNAMESPACES",
   "YEAR",
   "YEARS"
-], FR = [
+], YR = [
   // https://www.ibm.com/docs/en/db2-for-zos/12?topic=columns-data-types
   "ARRAY",
   "BIGINT",
@@ -3553,7 +3639,7 @@ const uR = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], YR = t(["SELECT [ALL | DISTINCT]"]), mR = t([
+], mR = C(["SELECT [ALL | DISTINCT]"]), pR = C([
   // queries
   "WITH",
   "FROM",
@@ -3582,9 +3668,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,27 +3873,27 @@ const uR = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), pR = t(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), dR = t([
+]), dR = C(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), hR = 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 = {
+]), fR = C([]), WR = {
   name: "db2",
   tokenizerOptions: {
-    reservedSelect: YR,
-    reservedClauses: [...mR, ...QE, ...sE],
-    reservedSetOperations: pR,
-    reservedJoins: dR,
+    reservedSelect: mR,
+    reservedClauses: [...pR, ...QE, ...sE],
+    reservedSetOperations: dR,
+    reservedJoins: hR,
     reservedKeywordPhrases: VR,
-    reservedDataTypePhrases: hR,
-    reservedKeywords: BR,
-    reservedDataTypes: FR,
-    reservedFunctionNames: uR,
+    reservedDataTypePhrases: fR,
+    reservedKeywords: FR,
+    reservedDataTypes: YR,
+    reservedFunctionNames: BR,
     extraParens: ["[]"],
     stringTypes: [
       { quote: "''-qq", prefixes: ["G", "N", "U&"] },
@@ -3841,7 +3927,7 @@ const uR = [
     onelineClauses: [...QE, ...sE],
     tabularOnelineClauses: sE
   }
-}, fR = [
+}, XR = [
   // 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",
@@ -4175,7 +4261,7 @@ const uR = [
   "ROW_NUMBER",
   // Type casting
   "CAST"
-], XR = [
+], bR = [
   // https://www.ibm.com/docs/en/i/7.5?topic=words-reserved
   // TODO: This list likely contains all keywords, not only the reserved ones,
   // try to filter it down to just the reserved keywords.
@@ -4671,7 +4757,7 @@ const uR = [
   "YEARS",
   "YES",
   "ZONE"
-], bR = [
+], yR = [
   // https://www.ibm.com/docs/en/i/7.2?topic=iaodsd-odbc-data-types-how-they-correspond-db2-i-database-types
   "ARRAY",
   "BIGINT",
@@ -4707,7 +4793,7 @@ const uR = [
   "VARCHAR",
   "VARGRAPHIC",
   "XML"
-], KR = t(["SELECT [ALL | DISTINCT]"]), yR = t([
+], KR = C(["SELECT [ALL | DISTINCT]"]), $R = C([
   // queries
   "WITH [RECURSIVE]",
   "INTO",
@@ -4737,7 +4823,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,28 +4919,28 @@ const uR = [
   "TAG",
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}"
-]), $R = t(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), gR = t([
+]), gR = C(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), JR = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "[LEFT | RIGHT] EXCEPTION JOIN",
   "{INNER | CROSS} JOIN"
-]), JR = t([
+]), wR = C([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), wR = t([]), xR = {
+]), xR = C([]), vR = {
   name: "db2i",
   tokenizerOptions: {
     reservedSelect: KR,
-    reservedClauses: [...yR, ...ZE, ...tE],
-    reservedSetOperations: $R,
-    reservedJoins: gR,
-    reservedKeywordPhrases: JR,
-    reservedDataTypePhrases: wR,
-    reservedKeywords: XR,
-    reservedDataTypes: bR,
-    reservedFunctionNames: fR,
+    reservedClauses: [...$R, ...ZE, ...tE],
+    reservedSetOperations: gR,
+    reservedJoins: JR,
+    reservedKeywordPhrases: wR,
+    reservedDataTypePhrases: xR,
+    reservedKeywords: bR,
+    reservedDataTypes: yR,
+    reservedFunctionNames: XR,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     stringTypes: [
@@ -4871,7 +4957,7 @@ const uR = [
     onelineClauses: [...ZE, ...tE],
     tabularOnelineClauses: tE
   }
-}, vR = [
+}, QR = [
   // Functions from DuckDB (excluding those that start with an underscore):
   // SELECT DISTINCT upper(function_name) AS function_name
   // FROM duckdb_functions()
@@ -5534,7 +5620,7 @@ const uR = [
   // 'NULL', we really prefer treating it as keyword
   "RANK",
   "ROW_NUMBER"
-], QR = [
+], ZR = [
   // Keywords from DuckDB:
   // SELECT upper(keyword_name)
   // FROM duckdb_keywords()
@@ -5616,7 +5702,7 @@ const uR = [
   "WHERE",
   "WINDOW",
   "WITH"
-], ZR = [
+], qR = [
   // Types from DuckDB:
   // SELECT DISTINCT upper(type_name)
   // FROM duckdb_types()
@@ -5696,7 +5782,7 @@ const uR = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], qR = t(["SELECT [ALL | DISTINCT]"]), kR = t([
+], jR = C(["SELECT [ALL | DISTINCT]"]), kR = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -5720,9 +5806,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 +5886,11 @@ const uR = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), jR = t([
+]), zR = C([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
-]), zR = t([
+]), EA = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -5813,23 +5899,23 @@ const uR = [
   "POSITIONAL JOIN",
   "ANTI JOIN",
   "SEMI JOIN"
-]), EA = t([
+]), TA = C([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "SIMILAR TO",
   "IS [NOT] DISTINCT FROM"
-]), TA = t(["TIMESTAMP WITH TIME ZONE"]), RA = {
+]), RA = C(["TIMESTAMP WITH TIME ZONE"]), AA = {
   name: "duckdb",
   tokenizerOptions: {
-    reservedSelect: qR,
+    reservedSelect: jR,
     reservedClauses: [...kR, ...qE, ...CE],
-    reservedSetOperations: jR,
-    reservedJoins: zR,
-    reservedKeywordPhrases: EA,
-    reservedDataTypePhrases: TA,
+    reservedSetOperations: zR,
+    reservedJoins: EA,
+    reservedKeywordPhrases: TA,
+    reservedDataTypePhrases: RA,
     supportsXor: !0,
-    reservedKeywords: QR,
-    reservedDataTypes: ZR,
-    reservedFunctionNames: vR,
+    reservedKeywords: ZR,
+    reservedDataTypes: qR,
+    reservedFunctionNames: QR,
     nestedBlockComments: !0,
     extraParens: ["[]", "{}"],
     underscoresInNumbers: !0,
@@ -5893,7 +5979,7 @@ const uR = [
     onelineClauses: [...qE, ...CE],
     tabularOnelineClauses: CE
   }
-}, AA = [
+}, SA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF
   // math
   "ABS",
@@ -6101,7 +6187,7 @@ const uR = [
   "CUME_DIST",
   "PERCENT_RANK",
   "NTILE"
-], SA = [
+], eA = [
   // https://cwiki.apache.org/confluence/display/hive/languagemanual+ddl
   // Non-reserved keywords have proscribed meanings in. HiveQL, but can still be used as table or column names
   "ADD",
@@ -6416,7 +6502,7 @@ const uR = [
   "JSONFILE",
   "INPUTFORMAT",
   "OUTPUTFORMAT"
-], eA = [
+], IA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types
   "ARRAY",
   "BIGINT",
@@ -6437,7 +6523,7 @@ const uR = [
   "STRUCT",
   "TIMESTAMP",
   "VARCHAR"
-], IA = t(["SELECT [ALL | DISTINCT]"]), OA = t([
+], OA = C(["SELECT [ALL | DISTINCT]"]), NA = C([
   // queries
   "WITH",
   "FROM",
@@ -6471,9 +6557,9 @@ const uR = [
   //   https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML#LanguageManualDML-Loadingfilesintotables
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), kE = t([
+]), jE = C([
   "CREATE [TEMPORARY] [EXTERNAL] TABLE [IF NOT EXISTS]"
-]), LE = t([
+]), LE = C([
   // - create:
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
   // - update:
@@ -6498,24 +6584,24 @@ const uR = [
   "STORED AS",
   "STORED BY",
   "ROW FORMAT"
-]), NA = t(["UNION [ALL | DISTINCT]"]), sA = t([
+]), sA = C(["UNION [ALL | DISTINCT]"]), tA = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "LEFT SEMI JOIN"
-]), tA = t(["{ROWS | RANGE} BETWEEN"]), CA = t([]), LA = {
+]), CA = C(["{ROWS | RANGE} BETWEEN"]), LA = C([]), _A = {
   name: "hive",
   tokenizerOptions: {
-    reservedSelect: IA,
-    reservedClauses: [...OA, ...kE, ...LE],
-    reservedSetOperations: NA,
-    reservedJoins: sA,
-    reservedKeywordPhrases: tA,
-    reservedDataTypePhrases: CA,
-    reservedKeywords: SA,
-    reservedDataTypes: eA,
-    reservedFunctionNames: AA,
+    reservedSelect: OA,
+    reservedClauses: [...NA, ...jE, ...LE],
+    reservedSetOperations: sA,
+    reservedJoins: tA,
+    reservedKeywordPhrases: CA,
+    reservedDataTypePhrases: LA,
+    reservedKeywords: eA,
+    reservedDataTypes: IA,
+    reservedFunctionNames: SA,
     extraParens: ["[]"],
     stringTypes: ['""-bs', "''-bs"],
     identTypes: ["``"],
@@ -6523,20 +6609,20 @@ const uR = [
     operators: ["%", "~", "^", "|", "&", "<=>", "==", "!", "||"]
   },
   formatOptions: {
-    onelineClauses: [...kE, ...LE],
+    onelineClauses: [...jE, ...LE],
     tabularOnelineClauses: LE
   }
 };
 function EE(T) {
   return T.map((E, R) => {
-    const A = T[R + 1] || w;
+    const A = T[R + 1] || x;
     if (X.SET(E) && A.text === "(")
       return Object.assign(Object.assign({}, E), { type: i.RESERVED_FUNCTION_NAME });
-    const S = T[R - 1] || w;
+    const S = T[R - 1] || x;
     return X.VALUES(E) && S.text === "=" ? Object.assign(Object.assign({}, E), { type: i.RESERVED_FUNCTION_NAME }) : E;
   });
 }
-const _A = [
+const rA = [
   // https://mariadb.com/kb/en/reserved-words/
   "ACCESSIBLE",
   "ADD",
@@ -6753,7 +6839,7 @@ const _A = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], rA = [
+], nA = [
   // https://mariadb.com/kb/en/data-types/
   "BIGINT",
   "BINARY",
@@ -6804,7 +6890,7 @@ const _A = [
   "YEAR"
   // 'NUMBER', // ?? In oracle mode only
   // 'SET' // handled as special-case in postProcess
-], nA = [
+], DA = [
   // https://mariadb.com/kb/en/information-schema-sql_functions-table/
   "ADDDATE",
   "ADD_MONTHS",
@@ -7042,7 +7128,7 @@ const _A = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], DA = t(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), iA = t([
+], iA = C(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), PA = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -7064,9 +7150,9 @@ const _A = [
   "SET",
   // other
   "RETURNING"
-]), jE = t([
+]), kE = 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 +7359,12 @@ const _A = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), PA = t([
+]), oA = 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,24 +7372,24 @@ const _A = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), oA = t([
+]), MA = C([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), MA = t([]), UA = {
+]), UA = C([]), GA = {
   name: "mariadb",
   tokenizerOptions: {
-    reservedSelect: DA,
-    reservedClauses: [...iA, ...jE, ..._E],
-    reservedSetOperations: PA,
+    reservedSelect: iA,
+    reservedClauses: [...PA, ...kE, ..._E],
+    reservedSetOperations: oA,
     reservedJoins: aA,
-    reservedKeywordPhrases: oA,
-    reservedDataTypePhrases: MA,
+    reservedKeywordPhrases: MA,
+    reservedDataTypePhrases: UA,
     supportsXor: !0,
-    reservedKeywords: _A,
-    reservedDataTypes: rA,
-    reservedFunctionNames: nA,
+    reservedKeywords: rA,
+    reservedDataTypes: nA,
+    reservedFunctionNames: DA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -7339,10 +7425,10 @@ const _A = [
     postProcess: EE
   },
   formatOptions: {
-    onelineClauses: [...jE, ..._E],
+    onelineClauses: [...kE, ..._E],
     tabularOnelineClauses: _E
   }
-}, GA = [
+}, cA = [
   // https://dev.mysql.com/doc/refman/8.0/en/keywords.html
   "ACCESSIBLE",
   "ADD",
@@ -7573,7 +7659,7 @@ const _A = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], cA = [
+], lA = [
   // https://dev.mysql.com/doc/refman/8.0/en/data-types.html
   "BIGINT",
   "BINARY",
@@ -7625,7 +7711,7 @@ const _A = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], lA = [
+], HA = [
   // https://dev.mysql.com/doc/refman/8.0/en/built-in-function-reference.html
   "ABS",
   "ACOS",
@@ -8048,7 +8134,7 @@ const _A = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], HA = t(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), uA = t([
+], uA = C(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), BA = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8068,7 +8154,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 +8335,7 @@ const _A = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), BA = t(["UNION [ALL | DISTINCT]"]), FA = t([
+]), FA = C(["UNION [ALL | DISTINCT]"]), YA = C([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8257,24 +8343,24 @@ const _A = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), YA = t([
+]), mA = C([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), mA = t([]), pA = {
+]), pA = C([]), dA = {
   name: "mysql",
   tokenizerOptions: {
-    reservedSelect: HA,
-    reservedClauses: [...uA, ...zE, ...rE],
-    reservedSetOperations: BA,
-    reservedJoins: FA,
-    reservedKeywordPhrases: YA,
-    reservedDataTypePhrases: mA,
+    reservedSelect: uA,
+    reservedClauses: [...BA, ...zE, ...rE],
+    reservedSetOperations: FA,
+    reservedJoins: YA,
+    reservedKeywordPhrases: mA,
+    reservedDataTypePhrases: pA,
     supportsXor: !0,
-    reservedKeywords: GA,
-    reservedDataTypes: cA,
-    reservedFunctionNames: lA,
+    reservedKeywords: cA,
+    reservedDataTypes: lA,
+    reservedFunctionNames: HA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -8315,7 +8401,7 @@ const _A = [
     onelineClauses: [...zE, ...rE],
     tabularOnelineClauses: rE
   }
-}, dA = [
+}, hA = [
   // https://docs.pingcap.com/tidb/stable/keywords
   "ADD",
   "ALL",
@@ -8554,7 +8640,7 @@ const _A = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], hA = [
+], fA = [
   // https://docs.pingcap.com/tidb/stable/sql-statement-show-builtins
   // https://docs.pingcap.com/tidb/stable/functions-and-operators-overview
   // + MySQL aggregate functions: https://dev.mysql.com/doc/refman/8.0/en/aggregate-functions.html
@@ -8880,7 +8966,7 @@ const _A = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], WA = t(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), fA = t([
+], WA = C(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), XA = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8900,7 +8986,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 +9101,7 @@ const _A = [
   "UNLOCK TABLES",
   // https://docs.pingcap.com/tidb/stable/sql-statement-use
   "USE"
-]), XA = t(["UNION [ALL | DISTINCT]"]), bA = t([
+]), bA = C(["UNION [ALL | DISTINCT]"]), yA = C([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -9023,24 +9109,24 @@ 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 = {
+]), $A = C([]), gA = {
   name: "tidb",
   tokenizerOptions: {
     reservedSelect: WA,
-    reservedClauses: [...fA, ...ET, ...nE],
-    reservedSetOperations: XA,
-    reservedJoins: bA,
+    reservedClauses: [...XA, ...ET, ...nE],
+    reservedSetOperations: bA,
+    reservedJoins: yA,
     reservedKeywordPhrases: KA,
-    reservedDataTypePhrases: yA,
+    reservedDataTypePhrases: $A,
     supportsXor: !0,
-    reservedKeywords: dA,
+    reservedKeywords: hA,
     reservedDataTypes: VA,
-    reservedFunctionNames: hA,
+    reservedFunctionNames: fA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -9081,7 +9167,7 @@ const _A = [
     onelineClauses: [...ET, ...nE],
     tabularOnelineClauses: nE
   }
-}, gA = [
+}, JA = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/functions.html
   "ABORT",
   "ABS",
@@ -9311,7 +9397,7 @@ const _A = [
   // not implemented in N1QL, but added here now for the sake of tests
   // https://docs.couchbase.com/server/current/analytics/3_query.html#Vs_SQL-92
   "CAST"
-], JA = [
+], wA = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/reservedwords.html
   "ADVISE",
   "ALL",
@@ -9517,7 +9603,7 @@ const _A = [
   "WITHIN",
   "WORK",
   "XOR"
-], wA = [
+], xA = [
   // N1QL does not support any way of declaring types for columns.
   // It does not support the CREATE TABLE statement nor the CAST() expression.
   //
@@ -9526,7 +9612,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([
+], vA = C(["SELECT [ALL | DISTINCT]"]), QA = C([
   // queries
   "WITH",
   "FROM",
@@ -9553,7 +9639,7 @@ const _A = [
   "NEST",
   "UNNEST",
   "RETURNING"
-]), TT = t([
+]), TT = C([
   // - update:
   "UPDATE",
   // - delete:
@@ -9593,19 +9679,19 @@ 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 = {
+]), ZA = C(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), qA = C(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), jA = C(["{ROWS | RANGE | GROUPS} BETWEEN"]), kA = C([]), zA = {
   name: "n1ql",
   tokenizerOptions: {
-    reservedSelect: xA,
-    reservedClauses: [...vA, ...TT],
-    reservedSetOperations: QA,
-    reservedJoins: ZA,
-    reservedKeywordPhrases: qA,
+    reservedSelect: vA,
+    reservedClauses: [...QA, ...TT],
+    reservedSetOperations: ZA,
+    reservedJoins: qA,
+    reservedKeywordPhrases: jA,
     reservedDataTypePhrases: kA,
     supportsXor: !0,
-    reservedKeywords: JA,
-    reservedDataTypes: wA,
-    reservedFunctionNames: gA,
+    reservedKeywords: wA,
+    reservedDataTypes: xA,
+    reservedFunctionNames: JA,
     // NOTE: single quotes are actually not supported in N1QL,
     // but we support them anyway as all other SQL dialects do,
     // which simplifies writing tests that are shared between all dialects.
@@ -9619,7 +9705,7 @@ const _A = [
   formatOptions: {
     onelineClauses: TT
   }
-}, zA = [
+}, ES = [
   // https://docs.oracle.com/cd/B19306_01/appdev.102/b14261/reservewords.htm
   // 'A',
   "ADD",
@@ -9924,7 +10010,7 @@ const _A = [
   "WRITE",
   "YEAR",
   "ZONE"
-], ES = [
+], TS = [
   // https://www.ibm.com/docs/en/db2/10.5?topic=plsql-data-types
   "ARRAY",
   "BFILE_BASE",
@@ -9962,7 +10048,7 @@ const _A = [
   "UROWID",
   "VARCHAR",
   "VARCHAR2"
-], TS = [
+], RS = [
   // https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions001.htm
   // numeric
   "ABS",
@@ -10227,7 +10313,7 @@ const _A = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], RS = t(["SELECT [ALL | DISTINCT | UNIQUE]"]), AS = t([
+], AS = C(["SELECT [ALL | DISTINCT | UNIQUE]"]), SS = C([
   // queries
   "WITH",
   "FROM",
@@ -10251,9 +10337,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 +10367,7 @@ const _A = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), SS = t(["UNION [ALL]", "MINUS", "INTERSECT"]), eS = t([
+]), eS = C(["UNION [ALL]", "MINUS", "INTERSECT"]), IS = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10289,23 +10375,23 @@ const _A = [
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), IS = t([
+]), OS = C([
   "ON {UPDATE | DELETE} [SET NULL]",
   "ON COMMIT",
   "{ROWS | RANGE} BETWEEN"
-]), OS = t([]), NS = {
+]), NS = C([]), sS = {
   name: "plsql",
   tokenizerOptions: {
-    reservedSelect: RS,
-    reservedClauses: [...AS, ...RT, ...DE],
-    reservedSetOperations: SS,
-    reservedJoins: eS,
-    reservedKeywordPhrases: IS,
-    reservedDataTypePhrases: OS,
+    reservedSelect: AS,
+    reservedClauses: [...SS, ...RT, ...DE],
+    reservedSetOperations: eS,
+    reservedJoins: IS,
+    reservedKeywordPhrases: OS,
+    reservedDataTypePhrases: NS,
     supportsXor: !0,
-    reservedKeywords: zA,
-    reservedDataTypes: ES,
-    reservedFunctionNames: TS,
+    reservedKeywords: ES,
+    reservedDataTypes: TS,
+    reservedFunctionNames: RS,
     stringTypes: [
       { quote: "''-qq", prefixes: ["N"] },
       { quote: "q''", prefixes: ["N"] }
@@ -10330,7 +10416,7 @@ const _A = [
       "@",
       "||"
     ],
-    postProcess: sS
+    postProcess: tS
   },
   formatOptions: {
     alwaysDenseOperators: ["@"],
@@ -10338,11 +10424,11 @@ const _A = [
     tabularOnelineClauses: DE
   }
 };
-function sS(T) {
-  let E = w;
-  return T.map((R) => X.SET(R) && X.BY(E) ? Object.assign(Object.assign({}, R), { type: i.RESERVED_KEYWORD }) : (uT(R.type) && (E = R), R));
+function tS(T) {
+  let E = x;
+  return T.map((R) => X.SET(R) && X.BY(E) ? Object.assign(Object.assign({}, R), { type: i.RESERVED_KEYWORD }) : (BT(R.type) && (E = R), R));
 }
-const tS = [
+const CS = [
   // https://www.postgresql.org/docs/14/functions.html
   //
   // https://www.postgresql.org/docs/14/functions-math.html
@@ -11026,7 +11112,7 @@ const tS = [
   "PG_MCV_LIST_ITEMS",
   // cast
   "CAST"
-], CS = [
+], LS = [
   // https://www.postgresql.org/docs/14/sql-keywords-appendix.html
   "ALL",
   "ANALYSE",
@@ -11145,7 +11231,7 @@ const tS = [
   "WITHOUT",
   "YEAR"
   // requires AS
-], LS = [
+], _S = [
   // https://www.postgresql.org/docs/current/datatype.html
   "ARRAY",
   "BIGINT",
@@ -11179,7 +11265,7 @@ const tS = [
   "VARCHAR",
   "XML",
   "ZONE"
-], _S = t(["SELECT [ALL | DISTINCT]"]), rS = t([
+], rS = C(["SELECT [ALL | DISTINCT]"]), nS = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -11202,9 +11288,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 +11488,17 @@ const tS = [
   "START TRANSACTION",
   "UNLISTEN",
   "VACUUM"
-]), nS = t([
+]), DS = C([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), DS = t([
+]), iS = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), iS = t([
+]), PS = C([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
@@ -11423,21 +11509,21 @@ const tS = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), PS = t([
+]), oS = C([
   // https://www.postgresql.org/docs/current/datatype-datetime.html
   "[TIMESTAMP | TIME] {WITH | WITHOUT} TIME ZONE"
 ]), aS = {
   name: "postgresql",
   tokenizerOptions: {
-    reservedSelect: _S,
-    reservedClauses: [...rS, ...AT, ...iE],
-    reservedSetOperations: nS,
-    reservedJoins: DS,
-    reservedKeywordPhrases: iS,
-    reservedDataTypePhrases: PS,
-    reservedKeywords: CS,
-    reservedDataTypes: LS,
-    reservedFunctionNames: tS,
+    reservedSelect: rS,
+    reservedClauses: [...nS, ...AT, ...iE],
+    reservedSetOperations: DS,
+    reservedJoins: iS,
+    reservedKeywordPhrases: PS,
+    reservedDataTypePhrases: oS,
+    reservedKeywords: LS,
+    reservedDataTypes: _S,
+    reservedFunctionNames: CS,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     underscoresInNumbers: !0,
@@ -11552,7 +11638,7 @@ const tS = [
     onelineClauses: [...AT, ...iE],
     tabularOnelineClauses: iE
   }
-}, oS = [
+}, MS = [
   // https://docs.aws.amazon.com/redshift/latest/dg/c_Aggregate_Functions.html
   "ANY_VALUE",
   "APPROXIMATE PERCENTILE_DISC",
@@ -11898,7 +11984,7 @@ const tS = [
   "SLICE_NUM",
   "USER",
   "VERSION"
-], MS = [
+], US = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_pg_keywords.html
   "AES128",
   "AES256",
@@ -12087,7 +12173,7 @@ const tS = [
    * SVL: https://docs.aws.amazon.com/redshift/latest/dg/svl_views.html
    * SVV: https://docs.aws.amazon.com/redshift/latest/dg/svv_views.html
    */
-], US = [
+], GS = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_Character_types.html#r_Character_types-text-and-bpchar-types
   "ARRAY",
   "BIGINT",
@@ -12108,7 +12194,7 @@ const tS = [
   "TEXT",
   "VARBYTE",
   "VARCHAR"
-], GS = t(["SELECT [ALL | DISTINCT]"]), cS = t([
+], cS = C(["SELECT [ALL | DISTINCT]"]), lS = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12126,9 +12212,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 +12305,13 @@ const tS = [
   "START TRANSACTION",
   "UNLOAD",
   "VACUUM"
-]), lS = t(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), HS = t([
+]), HS = C(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), uS = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), uS = t([
+]), BS = 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,18 +12319,18 @@ const tS = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), BS = t([]), FS = {
+]), FS = C([]), YS = {
   name: "redshift",
   tokenizerOptions: {
-    reservedSelect: GS,
-    reservedClauses: [...cS, ...ST, ...PE],
-    reservedSetOperations: lS,
-    reservedJoins: HS,
-    reservedKeywordPhrases: uS,
-    reservedDataTypePhrases: BS,
-    reservedKeywords: MS,
-    reservedDataTypes: US,
-    reservedFunctionNames: oS,
+    reservedSelect: cS,
+    reservedClauses: [...lS, ...ST, ...PE],
+    reservedSetOperations: HS,
+    reservedJoins: uS,
+    reservedKeywordPhrases: BS,
+    reservedDataTypePhrases: FS,
+    reservedKeywords: US,
+    reservedDataTypes: GS,
+    reservedFunctionNames: MS,
     extraParens: ["[]"],
     stringTypes: ["''-qq"],
     identTypes: ['""-qq'],
@@ -12271,7 +12357,7 @@ const tS = [
     onelineClauses: [...ST, ...PE],
     tabularOnelineClauses: PE
   }
-}, YS = [
+}, mS = [
   // https://deepkb.com/CO_000013/en/kb/IMPORT-fbfa59f0-2bf1-31fe-bb7b-0f9efe9932c6/spark-sql-keywords
   "ADD",
   "AFTER",
@@ -12538,7 +12624,7 @@ const tS = [
   "UNSIGNED",
   "VARIABLES",
   "YEAR_MONTH"
-], mS = [
+], pS = [
   // https://spark.apache.org/docs/latest/sql-ref-datatypes.html
   "ARRAY",
   "BIGINT",
@@ -12568,7 +12654,7 @@ const tS = [
   "TINYINT",
   "VARCHAR"
   // No varchar type in Spark, only STRING. Added for the sake of tests
-], pS = [
+], dS = [
   // http://spark.apache.org/docs/latest/sql-ref-functions.html
   //
   // http://spark.apache.org/docs/latest/sql-ref-functions-builtin.html#aggregate-functions
@@ -12889,7 +12975,7 @@ const tS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], dS = t(["SELECT [ALL | DISTINCT]"]), VS = t([
+], hS = C(["SELECT [ALL | DISTINCT]"]), VS = C([
   // queries
   "WITH",
   "FROM",
@@ -12914,7 +13000,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]"]), oE = C([
   // - create:
   "CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]",
   // - drop table:
@@ -12970,11 +13056,11 @@ const tS = [
   "SHOW TBLPROPERTIES",
   "SHOW VIEWS",
   "UNCACHE TABLE"
-]), hS = t([
+]), fS = C([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), WS = t([
+]), WS = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -12983,24 +13069,24 @@ const tS = [
   // non-standard-joins
   "[LEFT] {ANTI | SEMI} JOIN",
   "NATURAL [LEFT] {ANTI | SEMI} JOIN"
-]), fS = t([
+]), XS = C([
   "ON DELETE",
   "ON UPDATE",
   "CURRENT ROW",
   "{ROWS | RANGE} BETWEEN"
-]), XS = t([]), bS = {
+]), bS = C([]), yS = {
   name: "spark",
   tokenizerOptions: {
-    reservedSelect: dS,
-    reservedClauses: [...VS, ...eT, ...aE],
-    reservedSetOperations: hS,
+    reservedSelect: hS,
+    reservedClauses: [...VS, ...eT, ...oE],
+    reservedSetOperations: fS,
     reservedJoins: WS,
-    reservedKeywordPhrases: fS,
-    reservedDataTypePhrases: XS,
+    reservedKeywordPhrases: XS,
+    reservedDataTypePhrases: bS,
     supportsXor: !0,
-    reservedKeywords: YS,
-    reservedDataTypes: mS,
-    reservedFunctionNames: pS,
+    reservedKeywords: mS,
+    reservedDataTypes: pS,
+    reservedFunctionNames: dS,
     extraParens: ["[]"],
     stringTypes: [
       "''-bs",
@@ -13015,17 +13101,17 @@ const tS = [
     postProcess: KS
   },
   formatOptions: {
-    onelineClauses: [...eT, ...aE],
-    tabularOnelineClauses: aE
+    onelineClauses: [...eT, ...oE],
+    tabularOnelineClauses: oE
   }
 };
 function KS(T) {
   return T.map((E, R) => {
-    const A = T[R - 1] || w, S = T[R + 1] || w;
+    const A = T[R - 1] || x, S = T[R + 1] || x;
     return X.WINDOW(E) && S.type === i.OPEN_PAREN ? Object.assign(Object.assign({}, E), { type: i.RESERVED_FUNCTION_NAME }) : E.text === "ITEMS" && E.type === i.RESERVED_KEYWORD && !(A.text === "COLLECTION" && S.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: i.IDENTIFIER, text: E.raw }) : E;
   });
 }
-const yS = [
+const $S = [
   // https://www.sqlite.org/lang_corefunc.html
   "ABS",
   "CHANGES",
@@ -13149,7 +13235,7 @@ const yS = [
   "JSON_TREE",
   // cast
   "CAST"
-], $S = [
+], gS = [
   // https://www.sqlite.org/lang_keywords.html
   // Note: The keywords listed on that URL are not all reserved keywords.
   // We'll need to clean up this list to only include reserved keywords.
@@ -13302,7 +13388,7 @@ const yS = [
   "WINDOW",
   "WITH",
   "WITHOUT"
-], gS = [
+], JS = [
   // SQLite allows any word as a data type, e.g. CREATE TABLE foo (col1 madeupname(123));
   // Here we just list some common ones as SQL Formatter
   // is only able to detect a predefined list of data types.
@@ -13323,7 +13409,7 @@ const yS = [
   "TEXT",
   "VARCHAR",
   "VARYING CHARACTER"
-], JS = t(["SELECT [ALL | DISTINCT]"]), wS = t([
+], wS = C(["SELECT [ALL | DISTINCT]"]), xS = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13344,7 +13430,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]"]), aE = C([
   // - create:
   "CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]",
   // - update:
@@ -13363,28 +13449,28 @@ const yS = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), xS = t(["UNION [ALL]", "EXCEPT", "INTERSECT"]), vS = t([
+]), vS = C(["UNION [ALL]", "EXCEPT", "INTERSECT"]), QS = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), QS = t([
+]), ZS = C([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
-]), ZS = t([]), qS = {
+]), qS = C([]), jS = {
   name: "sqlite",
   tokenizerOptions: {
-    reservedSelect: JS,
-    reservedClauses: [...wS, ...IT, ...oE],
-    reservedSetOperations: xS,
-    reservedJoins: vS,
-    reservedKeywordPhrases: QS,
-    reservedDataTypePhrases: ZS,
-    reservedKeywords: $S,
-    reservedDataTypes: gS,
-    reservedFunctionNames: yS,
+    reservedSelect: wS,
+    reservedClauses: [...xS, ...IT, ...aE],
+    reservedSetOperations: vS,
+    reservedJoins: QS,
+    reservedKeywordPhrases: ZS,
+    reservedDataTypePhrases: qS,
+    reservedKeywords: gS,
+    reservedDataTypes: JS,
+    reservedFunctionNames: $S,
     stringTypes: [
       "''-qq",
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -13397,8 +13483,8 @@ const yS = [
     operators: ["%", "~", "&", "|", "<<", ">>", "==", "->", "->>", "||"]
   },
   formatOptions: {
-    onelineClauses: [...IT, ...oE],
-    tabularOnelineClauses: oE
+    onelineClauses: [...IT, ...aE],
+    tabularOnelineClauses: aE
   }
 }, kS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_9_set_function_specification
@@ -13497,7 +13583,7 @@ const yS = [
   "ASIN",
   "ACOS",
   "ATAN"
-], jS = [
+], zS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#reserved-word
   "ALL",
   "ALLOCATE",
@@ -13695,7 +13781,7 @@ const yS = [
   "WITHIN",
   "WITHOUT",
   "YEAR"
-], zS = [
+], Ee = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_1_data_type
   "ARRAY",
   "BIGINT",
@@ -13735,7 +13821,7 @@ const yS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], Ee = t(["SELECT [ALL | DISTINCT]"]), Te = t([
+], Te = C(["SELECT [ALL | DISTINCT]"]), Re = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13754,7 +13840,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,30 +13865,30 @@ const yS = [
   "TRUNCATE TABLE",
   // other
   "SET SCHEMA"
-]), Re = t([
+]), Ae = C([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), Ae = t([
+]), Se = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), Se = t([
+]), ee = C([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), ee = t([]), Ie = {
+]), Ie = C([]), Oe = {
   name: "sql",
   tokenizerOptions: {
-    reservedSelect: Ee,
-    reservedClauses: [...Te, ...OT, ...ME],
-    reservedSetOperations: Re,
-    reservedJoins: Ae,
-    reservedKeywordPhrases: Se,
-    reservedDataTypePhrases: ee,
-    reservedKeywords: jS,
-    reservedDataTypes: zS,
+    reservedSelect: Te,
+    reservedClauses: [...Re, ...OT, ...ME],
+    reservedSetOperations: Ae,
+    reservedJoins: Se,
+    reservedKeywordPhrases: ee,
+    reservedDataTypePhrases: Ie,
+    reservedKeywords: zS,
+    reservedDataTypes: Ee,
     reservedFunctionNames: kS,
     stringTypes: [
       { quote: "''-qq-bs", prefixes: ["N", "U&"] },
@@ -13816,7 +13902,7 @@ const yS = [
     onelineClauses: [...OT, ...ME],
     tabularOnelineClauses: ME
   }
-}, Oe = [
+}, Ne = [
   // https://github.com/trinodb/trino/tree/432d2897bdef99388c1a47188743a061c4ac1f34/docs/src/main/sphinx/functions
   // rg '^\.\. function::' ./docs/src/main/sphinx/functions | cut -d' ' -f 3 | cut -d '(' -f 1 | sort | uniq
   // rg '\* ' ./docs/src/main/sphinx/functions/list-by-topic.rst | grep    '\* :func:' | cut -d'`' -f 2
@@ -14250,7 +14336,7 @@ const yS = [
   "NEXT",
   "PERMUTE",
   "PREV"
-], Ne = [
+], se = [
   // https://github.com/trinodb/trino/blob/432d2897bdef99388c1a47188743a061c4ac1f34/core/trino-parser/src/main/antlr4/io/trino/sql/parser/SqlBase.g4#L858-L1128
   "ABSENT",
   "ADD",
@@ -14487,7 +14573,7 @@ const yS = [
   "WRAPPER",
   "WRITE",
   "ZONE"
-], se = [
+], te = [
   // https://github.com/trinodb/trino/blob/432d2897bdef99388c1a47188743a061c4ac1f34/core/trino-main/src/main/java/io/trino/metadata/TypeRegistry.java#L131-L168
   // or https://trino.io/docs/current/language/types.html
   "BIGINT",
@@ -14526,7 +14612,7 @@ const yS = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], te = t(["SELECT [ALL | DISTINCT]"]), Ce = t([
+], Ce = C(["SELECT [ALL | DISTINCT]"]), Le = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14554,7 +14640,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,32 +14698,32 @@ const yS = [
   "SHOW ROLE GRANTS",
   "SHOW FUNCTIONS",
   "SHOW SESSION"
-]), Le = t([
+]), _e = C([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), _e = t([
+]), re = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), re = t([
+]), ne = C([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), ne = t([]), De = {
+]), De = C([]), ie = {
   name: "trino",
   tokenizerOptions: {
-    reservedSelect: te,
-    reservedClauses: [...Ce, ...NT, ...UE],
-    reservedSetOperations: Le,
-    reservedJoins: _e,
-    reservedKeywordPhrases: re,
-    reservedDataTypePhrases: ne,
-    reservedKeywords: Ne,
-    reservedDataTypes: se,
-    reservedFunctionNames: Oe,
+    reservedSelect: Ce,
+    reservedClauses: [...Le, ...NT, ...UE],
+    reservedSetOperations: _e,
+    reservedJoins: re,
+    reservedKeywordPhrases: ne,
+    reservedDataTypePhrases: De,
+    reservedKeywords: se,
+    reservedDataTypes: te,
+    reservedFunctionNames: Ne,
     // Trino also supports {- ... -} parenthesis.
     // The formatting of these currently works out as a result of { and -
     // not getting a space added in-between.
@@ -14669,7 +14755,7 @@ const yS = [
     onelineClauses: [...NT, ...UE],
     tabularOnelineClauses: UE
   }
-}, ie = [
+}, Pe = [
   // https://docs.microsoft.com/en-us/sql/t-sql/functions/functions?view=sql-server-ver15
   // aggregate
   "APPROX_COUNT_DISTINCT",
@@ -14974,7 +15060,7 @@ const yS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], Pe = [
+], oe = [
   // https://docs.microsoft.com/en-us/sql/t-sql/language-elements/reserved-keywords-transact-sql?view=sql-server-ver15
   // standard
   "ADD",
@@ -15182,7 +15268,7 @@ const yS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], oe = t(["SELECT [ALL | DISTINCT]"]), Me = t([
+], Me = C(["SELECT [ALL | DISTINCT]"]), Ue = C([
   // queries
   "WITH",
   "INTO",
@@ -15207,7 +15293,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,27 +15473,27 @@ const yS = [
   "XACT_ABORT",
   "XML INDEX",
   "XML SCHEMA COLLECTION"
-]), Ue = t(["UNION [ALL]", "EXCEPT", "INTERSECT"]), Ge = t([
+]), Ge = C(["UNION [ALL]", "EXCEPT", "INTERSECT"]), ce = C([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), ce = t([
+]), le = C([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), le = t([]), He = {
+]), He = C([]), ue = {
   name: "transactsql",
   tokenizerOptions: {
-    reservedSelect: oe,
-    reservedClauses: [...Me, ...sT, ...GE],
-    reservedSetOperations: Ue,
-    reservedJoins: Ge,
-    reservedKeywordPhrases: ce,
-    reservedDataTypePhrases: le,
-    reservedKeywords: Pe,
+    reservedSelect: Me,
+    reservedClauses: [...Ue, ...sT, ...GE],
+    reservedSetOperations: Ge,
+    reservedJoins: ce,
+    reservedKeywordPhrases: le,
+    reservedDataTypePhrases: He,
+    reservedKeywords: oe,
     reservedDataTypes: ae,
-    reservedFunctionNames: ie,
+    reservedFunctionNames: Pe,
     nestedBlockComments: !0,
     stringTypes: [{ quote: "''-qq", prefixes: ["N"] }, "{}"],
     identTypes: ['""-qq', "[]"],
@@ -15440,7 +15526,7 @@ const yS = [
     onelineClauses: [...sT, ...GE],
     tabularOnelineClauses: GE
   }
-}, ue = [
+}, Be = [
   // List of all keywords taken from:
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/restricted-keywords/list-of-restricted-keywords.html
   // Then filtered down to reserved keywords by running
@@ -15653,7 +15739,7 @@ const yS = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], Be = [
+], Fe = [
   // https://docs.singlestore.com/cloud/reference/sql-reference/data-types/
   "BIGINT",
   "BINARY",
@@ -15702,7 +15788,7 @@ const yS = [
   "VARCHAR",
   "VARCHARACTER",
   "YEAR"
-], Fe = [
+], Ye = [
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/vector-functions/vector-functions.html
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/window-functions/window-functions.html
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/string-functions/string-functions.html
@@ -15982,7 +16068,7 @@ const yS = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], Ye = t(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), me = t([
+], me = C(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), pe = C([
   // queries
   "WITH",
   "FROM",
@@ -16004,9 +16090,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,36 +16269,36 @@ const yS = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), pe = t([
+]), de = C([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
   "MINUS"
-]), de = t([
+]), he = 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 = {
+]), fe = C([]), We = {
   name: "singlestoredb",
   tokenizerOptions: {
-    reservedSelect: Ye,
-    reservedClauses: [...me, ...tT, ...cE],
-    reservedSetOperations: pe,
-    reservedJoins: de,
+    reservedSelect: me,
+    reservedClauses: [...pe, ...tT, ...cE],
+    reservedSetOperations: de,
+    reservedJoins: he,
     reservedKeywordPhrases: Ve,
-    reservedDataTypePhrases: he,
-    reservedKeywords: ue,
-    reservedDataTypes: Be,
-    reservedFunctionNames: Fe,
+    reservedDataTypePhrases: fe,
+    reservedKeywords: Be,
+    reservedDataTypes: Fe,
+    reservedFunctionNames: Ye,
     // TODO: support _binary"some string" prefix
     stringTypes: [
       '""-qq-bs',
@@ -16252,7 +16338,7 @@ const yS = [
     onelineClauses: [...tT, ...cE],
     tabularOnelineClauses: cE
   }
-}, fe = [
+}, Xe = [
   // https://docs.snowflake.com/en/sql-reference-functions.html
   //
   // https://docs.snowflake.com/en/sql-reference/functions-all.html
@@ -16860,7 +16946,7 @@ const yS = [
   "QUARTER",
   "ZEROIFNULL",
   "ZIPF"
-], Xe = [
+], be = [
   // https://docs.snowflake.com/en/sql-reference/reserved-keywords.html
   //
   // run in console on this page: $x('//tbody/tr/*[1]/p/text()').map(x => x.nodeValue)
@@ -16957,7 +17043,7 @@ const yS = [
   "WITH",
   // These are definitely keywords, but haven't found a definite list in the docs
   "COMMENT"
-], be = [
+], ye = [
   "NUMBER",
   "DECIMAL",
   "NUMERIC",
@@ -16994,7 +17080,7 @@ const yS = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], Ke = t(["SELECT [ALL | DISTINCT]"]), ye = t([
+], Ke = C(["SELECT [ALL | DISTINCT]"]), $e = C([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -17022,10 +17108,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,25 +17352,25 @@ const yS = [
   "USE SCHEMA",
   "USE SECONDARY ROLES",
   "USE WAREHOUSE"
-]), $e = t(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), ge = t([
+]), ge = C(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), Je = C([
   "[INNER] JOIN",
   "[NATURAL] {LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{CROSS | NATURAL} JOIN"
-]), Je = t([
+]), we = C([
   "{ROWS | RANGE} BETWEEN",
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]"
-]), we = t([]), xe = {
+]), xe = C([]), ve = {
   name: "snowflake",
   tokenizerOptions: {
     reservedSelect: Ke,
-    reservedClauses: [...ye, ...CT, ...lE],
-    reservedSetOperations: $e,
-    reservedJoins: ge,
-    reservedKeywordPhrases: Je,
-    reservedDataTypePhrases: we,
-    reservedKeywords: Xe,
-    reservedDataTypes: be,
-    reservedFunctionNames: fe,
+    reservedClauses: [...$e, ...CT, ...lE],
+    reservedSetOperations: ge,
+    reservedJoins: Je,
+    reservedKeywordPhrases: we,
+    reservedDataTypePhrases: xe,
+    reservedKeywords: be,
+    reservedDataTypes: ye,
+    reservedFunctionNames: Xe,
     stringTypes: ["$$", "''-qq-bs"],
     identTypes: ['""-qq'],
     variableTypes: [
@@ -17317,49 +17403,49 @@ const yS = [
     onelineClauses: [...CT, ...lE],
     tabularOnelineClauses: lE
   }
-}, ve = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Qe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  bigquery: UR,
+  bigquery: GR,
   db2: WR,
-  db2i: xR,
-  duckdb: RA,
-  hive: LA,
-  mariadb: UA,
-  mysql: pA,
-  n1ql: jA,
-  plsql: NS,
+  db2i: vR,
+  duckdb: AA,
+  hive: _A,
+  mariadb: GA,
+  mysql: dA,
+  n1ql: zA,
+  plsql: sS,
   postgresql: aS,
-  redshift: FS,
+  redshift: YS,
   singlestoredb: We,
-  snowflake: xe,
-  spark: bS,
-  sql: Ie,
-  sqlite: qS,
-  tidb: $A,
-  transactsql: He,
-  trino: De
-}, Symbol.toStringTag, { value: "Module" })), v = (T) => T[T.length - 1], BT = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), Z = (T) => T.replace(/\s+/gu, " "), HE = (T) => /\n/.test(T), d = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), LT = /\s+/uy, b = (T) => new RegExp(`(?:${T})`, "uy"), Qe = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), Ze = (T) => T + "(?:-" + T + ")*", qe = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(Qe).join("|")}${E ? "" : "|"})`, ke = (T) => new RegExp(`(?:${T.map(d).join("|")}).*?(?=\r
+  snowflake: ve,
+  spark: yS,
+  sql: Oe,
+  sqlite: jS,
+  tidb: gA,
+  transactsql: ue,
+  trino: ie
+}, Symbol.toStringTag, { value: "Module" })), Q = (T) => T[T.length - 1], FT = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), q = (T) => T.replace(/\s+/gu, " "), HE = (T) => /\n/.test(T), d = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), LT = /\s+/uy, b = (T) => new RegExp(`(?:${T})`, "uy"), Ze = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), qe = (T) => T + "(?:-" + T + ")*", je = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(Ze).join("|")}${E ? "" : "|"})`, ke = (T) => new RegExp(`(?:${T.map(d).join("|")}).*?(?=\r
 |\r|
 |$)`, "uy"), _T = (T, E = []) => {
   const R = T === "open" ? 0 : 1, A = ["()", ...E].map((S) => S[R]);
   return b(A.map(d).join("|"));
-}, rT = (T) => b(`${BT(T).map(d).join("|")}`), je = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", V = (T, E = {}) => {
+}, rT = (T) => b(`${FT(T).map(d).join("|")}`), ze = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", h = (T, E = {}) => {
   if (T.length === 0)
     return /^\b$/u;
-  const R = je(E), A = BT(T).map(d).join("|").replace(/ /gu, "\\s+");
+  const R = ze(E), A = FT(T).map(d).join("|").replace(/ /gu, "\\s+");
   return new RegExp(`(?:${A})${R}\\b`, "iuy");
 }, uE = (T, E) => {
   if (!T.length)
     return;
   const R = T.map(d).join("|");
   return b(`(?:${R})(?:${E})`);
-}, ze = () => {
+}, EI = () => {
   const T = {
     "<": ">",
     "[": "]",
     "(": ")",
     "{": "}"
-  }, 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, t]) => E.replace(/{left}/g, d(O)).replace(/{right}/g, d(t))), 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)
@@ -17385,16 +17471,16 @@ const yS = [
   // Hive and Spark variables: ${name}
   "{}": String.raw`(?:\{[^\}]*\})`,
   // 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}]*`;
-  return R ? Ze(D) : D;
+  "q''": EI()
+}, YT = (T) => typeof T == "string" ? nT[T] : "regex" in T ? T.regex : je(T) + nT[T.quote], TI = (T) => b(T.map((E) => "regex" in E ? E.regex : YT(E)).join("|")), mT = (T) => T.map(YT).join("|"), DT = (T) => b(mT(T)), RI = (T = {}) => b(pT(T)), pT = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
+  const S = "\\p{Alphabetic}\\p{Mark}_", e = "\\p{Decimal_Number}", O = d(T ?? ""), t = d(E ?? ""), D = A ? `[${S}${e}${O}][${S}${e}${t}]*` : `[${S}${O}][${S}${e}${t}]*`;
+  return R ? qe(D) : D;
 };
-function pT(T, E) {
+function dT(T, E) {
   const R = T.slice(0, E).split(/\n/);
   return { line: R.length, col: R[R.length - 1].length + 1 };
 }
-class RI {
+class AI {
   constructor(E, R) {
     this.rules = E, this.dialectName = R, this.input = "", this.index = 0;
   }
@@ -17420,7 +17506,7 @@ class RI {
     return R;
   }
   createParseError() {
-    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = pT(this.input, this.index);
+    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = dT(this.input, this.index);
     return new Error(`Parse error: Unexpected "${E}" at line ${R} column ${A}.
 ${this.dialectInfo()}`);
   }
@@ -17456,8 +17542,8 @@ If possible, please select a more specific dialect (like sqlite, postgresql, etc
     }
   }
 }
-const iT = /\/\*/uy, AI = /[\s\S]/uy, SI = /\*\//uy;
-class eI {
+const iT = /\/\*/uy, SI = /[\s\S]/uy, eI = /\*\//uy;
+class II {
   constructor() {
     this.lastIndex = 0;
   }
@@ -17470,9 +17556,9 @@ class eI {
     for (; S > 0; )
       if (A = this.matchSection(iT, E))
         R += A, S++;
-      else if (A = this.matchSection(SI, E))
+      else if (A = this.matchSection(eI, E))
         R += A, S--;
-      else if (A = this.matchSection(AI, E))
+      else if (A = this.matchSection(SI, E))
         R += A;
       else
         return null;
@@ -17484,7 +17570,7 @@ class eI {
     return A && (this.lastIndex += A[0].length), A ? A[0] : null;
   }
 }
-class II {
+class OI {
   constructor(E, R) {
     this.cfg = E, this.dialectName = R, this.rulesBeforeParams = this.buildRulesBeforeParams(E), this.rulesAfterParams = this.buildRulesAfterParams(E);
   }
@@ -17493,7 +17579,7 @@ class II {
       ...this.rulesBeforeParams,
       ...this.buildParamRules(this.cfg, R),
       ...this.rulesAfterParams
-    ], S = new RI(A, this.dialectName).tokenize(E);
+    ], S = new AI(A, this.dialectName).tokenize(E);
     return this.cfg.postProcess ? this.cfg.postProcess(S) : S;
   }
   // These rules can be cached as they only depend on
@@ -17507,7 +17593,7 @@ class II {
       },
       {
         type: i.BLOCK_COMMENT,
-        regex: E.nestedBlockComments ? new eI() : /(\/\*[^]*?\*\/)/uy
+        regex: E.nestedBlockComments ? new II() : /(\/\*[^]*?\*\/)/uy
       },
       {
         type: i.LINE_COMMENT,
@@ -17525,83 +17611,83 @@ class II {
       // to e.g. prioritize matching "TIMESTAMP WITH TIME ZONE" phrase over "WITH" clause.
       {
         type: i.RESERVED_KEYWORD_PHRASE,
-        regex: V((A = E.reservedKeywordPhrases) !== null && A !== void 0 ? A : [], E.identChars),
-        text: H
+        regex: h((A = E.reservedKeywordPhrases) !== null && A !== void 0 ? A : [], E.identChars),
+        text: B
       },
       {
         type: i.RESERVED_DATA_TYPE_PHRASE,
-        regex: V((S = E.reservedDataTypePhrases) !== null && S !== void 0 ? S : [], E.identChars),
-        text: H
+        regex: h((S = E.reservedDataTypePhrases) !== null && S !== void 0 ? S : [], E.identChars),
+        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
+        regex: h(E.reservedClauses, E.identChars),
+        text: B
       },
       {
         type: i.RESERVED_SELECT,
-        regex: V(E.reservedSelect, E.identChars),
-        text: H
+        regex: h(E.reservedSelect, E.identChars),
+        text: B
       },
       {
         type: i.RESERVED_SET_OPERATION,
-        regex: V(E.reservedSetOperations, E.identChars),
-        text: H
+        regex: h(E.reservedSetOperations, E.identChars),
+        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
+        regex: h(E.reservedJoins, E.identChars),
+        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 ? [
         {
@@ -17611,18 +17697,18 @@ class II {
       ] : [],
       {
         type: i.RESERVED_FUNCTION_NAME,
-        regex: V(E.reservedFunctionNames, E.identChars),
-        text: H
+        regex: h(E.reservedFunctionNames, E.identChars),
+        text: B
       },
       {
         type: i.RESERVED_DATA_TYPE,
-        regex: V(E.reservedDataTypes, E.identChars),
-        text: H
+        regex: h(E.reservedDataTypes, E.identChars),
+        text: B
       },
       {
         type: i.RESERVED_KEYWORD,
-        regex: V(E.reservedKeywords, E.identChars),
-        text: H
+        regex: h(E.reservedKeywords, E.identChars),
+        text: B
       }
     ]);
   }
@@ -17633,12 +17719,12 @@ class II {
     return this.validRules([
       {
         type: i.VARIABLE,
-        regex: E.variableTypes ? EI(E.variableTypes) : void 0
+        regex: E.variableTypes ? TI(E.variableTypes) : void 0
       },
       { type: i.STRING, regex: DT(E.stringTypes) },
       {
         type: i.IDENTIFIER,
-        regex: TI(E.identChars)
+        regex: RI(E.identChars)
       },
       { type: i.DELIMITER, regex: /[;]/uy },
       { type: i.COMMA, regex: /[,]/y },
@@ -17677,24 +17763,24 @@ 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, t;
     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 || ((t = E.paramTypes) === null || t === void 0 ? void 0 : t.custom) || []
     };
     return this.validRules([
       {
         type: i.NAMED_PARAMETER,
-        regex: uE(D.named, mT(E.paramChars || E.identChars)),
+        regex: uE(D.named, pT(E.paramChars || E.identChars)),
         key: (I) => I.slice(1)
       },
       {
         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))({
+        regex: uE(D.quoted, mT(E.identTypes)),
+        key: (I) => (({ tokenKey: N, quoteChar: s }) => N.replace(new RegExp(d("\\" + s), "gu"), s))({
           tokenKey: I.slice(2, -1),
           quoteChar: I.slice(-1)
         })
@@ -17709,11 +17795,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 : ((s) => s)
         };
       })
     ]);
@@ -17723,13 +17809,13 @@ class II {
     return E.filter((R) => !!R.regex);
   }
 }
-const H = (T) => Z(T.toUpperCase()), PT = /* @__PURE__ */ new Map(), OI = (T) => {
+const B = (T) => q(T.toUpperCase()), PT = /* @__PURE__ */ new Map(), NI = (T) => {
   let E = PT.get(T);
-  return E || (E = NI(T), PT.set(T, E)), E;
-}, NI = (T) => ({
-  tokenizer: new II(T.tokenizerOptions, T.name),
-  formatOptions: sI(T.formatOptions)
-}), sI = (T) => {
+  return E || (E = sI(T), PT.set(T, E)), E;
+}, sI = (T) => ({
+  tokenizer: new OI(T.tokenizerOptions, T.name),
+  formatOptions: tI(T.formatOptions)
+}), tI = (T) => {
   var E;
   return {
     alwaysDenseOperators: T.alwaysDenseOperators || [],
@@ -17737,13 +17823,13 @@ const H = (T) => Z(T.toUpperCase()), PT = /* @__PURE__ */ new Map(), OI = (T) =>
     tabularOnelineClauses: Object.fromEntries(((E = T.tabularOnelineClauses) !== null && E !== void 0 ? E : T.onelineClauses).map((R) => [R, !0]))
   };
 };
-function tI(T) {
+function CI(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight" ? " ".repeat(10) : T.useTabs ? "	" : " ".repeat(T.tabWidth);
 }
 function J(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight";
 }
-class CI {
+class LI {
   constructor(E) {
     this.params = E, this.index = 0;
   }
@@ -17766,101 +17852,101 @@ class CI {
     this.index = E;
   }
 }
-function LI(T) {
+function _I(T) {
   return T && T.__esModule && Object.prototype.hasOwnProperty.call(T, "default") ? T.default : T;
 }
-var q = { exports: {} }, _I = q.exports, aT;
-function rI() {
-  return aT || (aT = 1, (function(T) {
+var j = { exports: {} }, rI = j.exports, oT;
+function nI() {
+  return oT || (oT = 1, (function(T) {
     (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;
+    })(rI, function() {
+      function E(I, N, s) {
+        return this.id = ++E.highestId, this.name = I, this.symbols = N, this.postprocess = s, 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, s, L) {
+        this.rule = I, this.dot = N, this.reference = s, 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];
-          if (a.isComplete) {
-            if (a.finish(), a.data !== O.fail) {
-              for (var r = a.wantedBy, U = r.length; U--; ) {
-                var o = r[U];
-                this.complete(o, a);
+        for (var N = this.states, s = this.wants, L = this.completed, P = 0; P < N.length; P++) {
+          var o = N[P];
+          if (o.isComplete) {
+            if (o.finish(), o.data !== O.fail) {
+              for (var r = o.wantedBy, U = r.length; U--; ) {
+                var a = r[U];
+                this.complete(a, o);
               }
-              if (a.reference === this.index) {
-                var c = a.rule.name;
-                (this.completed[c] = this.completed[c] || []).push(a);
+              if (o.reference === this.index) {
+                var l = o.rule.name;
+                (this.completed[l] = this.completed[l] || []).push(o);
               }
             }
           } else {
-            var c = a.rule.symbols[a.dot];
-            if (typeof c != "string") {
-              this.scannable.push(a);
+            var l = o.rule.symbols[o.dot];
+            if (typeof l != "string") {
+              this.scannable.push(o);
               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 (s[l]) {
+              if (s[l].push(o), L.hasOwnProperty(l))
+                for (var c = L[l], U = 0; U < c.length; U++) {
+                  var H = c[U];
+                  this.complete(o, H);
                 }
             } else
-              s[c] = [a], this.predict(c);
+              s[l] = [o], 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);
-          this.states.push(a);
+        for (var N = this.grammar.byName[I] || [], s = 0; s < N.length; s++) {
+          var L = N[s], P = this.wants[I], o = new R(L, 0, this.index, P);
+          this.states.push(o);
         }
-      }, A.prototype.complete = function(I, C) {
-        var s = I.nextState(C);
+      }, A.prototype.complete = function(I, N) {
+        var s = I.nextState(N);
         this.states.push(s);
       };
-      function S(I, C) {
-        this.rules = I, this.start = C || this.rules[0].name;
+      function S(I, N) {
+        this.rules = I, this.start = N || this.rules[0].name;
         var s = this.byName = {};
         this.rules.forEach(function(L) {
           s.hasOwnProperty(L.name) || (s[L.name] = []), s[L.name].push(L);
         });
       }
-      S.fromCompiled = function(L, C) {
+      S.fromCompiled = function(L, N) {
         var s = L.Lexer;
-        L.ParserStart && (C = 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);
+        L.ParserStart && (N = L.ParserStart, L = L.ParserRules);
+        var L = L.map(function(o) {
+          return new E(o.name, o.symbols, o.postprocess);
+        }), P = new S(L, N);
         return P.lexer = s, 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,7 +17958,7 @@ function rI() {
           line: this.line,
           col: this.index - this.lastLineBreak
         };
-      }, e.prototype.formatError = function(I, C) {
+      }, e.prototype.formatError = function(I, N) {
         var s = this.buffer;
         if (typeof s == "string") {
           var L = s.split(`
@@ -17882,27 +17968,27 @@ function rI() {
           ), P = s.indexOf(`
 `, this.index);
           P === -1 && (P = s.length);
-          var a = this.index - this.lastLineBreak, r = String(this.line).length;
-          return C += " at line " + this.line + " col " + a + `:
+          var o = this.index - this.lastLineBreak, r = String(this.line).length;
+          return N += " at line " + this.line + " col " + o + `:
 
-`, C += L.map(function(o, c) {
-            return U(this.line - L.length + c + 1, r) + " " + o;
+`, N += L.map(function(a, l) {
+            return U(this.line - L.length + l + 1, r) + " " + a;
           }, this).join(`
-`), C += `
-` + U("", r + a) + `^
-`, C;
+`), N += `
+` + U("", r + o) + `^
+`, 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(a, l) {
+          var c = String(a);
+          return Array(l - c.length + 1).join(" ") + c;
         }
       };
-      function O(I, C, s) {
+      function O(I, N, s) {
         if (I instanceof S)
-          var L = I, s = C;
+          var L = I, s = 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()
@@ -17910,30 +17996,30 @@ function rI() {
         for (var P in s || {})
           this.options[P] = s[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;
+        var o = new A(L, 0);
+        this.table = [o], o.wants[L.start] = [], o.predict(L.start), o.process(), this.current = 0;
       }
       O.fail = {}, O.prototype.feed = function(I) {
-        var C = this.lexer;
-        C.reset(I, this.lexerState);
+        var N = this.lexer;
+        N.reset(I, this.lexerState);
         for (var s; ; ) {
           try {
-            if (s = C.next(), !s)
+            if (s = N.next(), !s)
               break;
-          } catch (K) {
+          } catch (y) {
             var r = new A(this.grammar, this.current + 1);
             this.table.push(r);
-            var L = new Error(this.reportLexerError(K));
-            throw L.offset = this.current, L.token = K.token, L;
+            var L = new Error(this.reportLexerError(y));
+            throw L.offset = this.current, L.token = y.token, L;
           }
           var P = this.table[this.current];
           this.options.keepHistory || delete this.table[this.current - 1];
-          var a = this.current + 1, r = new A(this.grammar, a);
+          var o = this.current + 1, r = new A(this.grammar, o);
           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 = s.text !== void 0 ? s.text : s.value, a = N.constructor === e ? s.value : s, l = P.scannable, c = l.length; c--; ) {
+            var H = l[c], u = H.rule.symbols[H.dot];
+            if (u.test ? u.test(a) : u.type ? u.type === s.type : u.literal === U) {
+              var p = H.nextState({ data: a, token: s, isToken: !0, reference: o - 1 });
               r.states.push(p);
             }
           }
@@ -17941,75 +18027,75 @@ function rI() {
             var L = new Error(this.reportError(s));
             throw L.offset = this.current, L.token = s, 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, s, L = I.token;
+        return L ? (N = "input " + JSON.stringify(L.text[0]) + " (lexer error)", s = this.lexer.formatError(L, "Syntax error")) : (N = "input (lexer error)", s = I.message), this.reportErrorCommon(s, 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 N = (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, N);
+      }, O.prototype.reportErrorCommon = function(I, N) {
         var s = [];
         s.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";
+        var L = this.table.length - 2, P = this.table[L], o = P.states.filter(function(U) {
+          var a = U.rule.symbols[U.dot];
+          return a && typeof a != "string";
         });
-        if (a.length === 0)
-          s.push("Unexpected " + C + `. I did not expect any more input. Here is the state of my parse table:
+        if (o.length === 0)
+          s.push("Unexpected " + N + `. I did not expect any more input. Here is the state of my parse table:
 `), this.displayStateStack(P.states, s);
         else {
-          s.push("Unexpected " + C + `. Instead, I was expecting to see one of the following:
+          s.push("Unexpected " + N + `. Instead, I was expecting to see one of the following:
 `);
-          var r = a.map(function(U) {
+          var r = o.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 a = U[0], l = a.rule.symbols[a.dot], c = this.getSymbolDisplay(l);
+            s.push("A " + c + " based on:"), this.displayStateStack(U, s);
           }, this);
         }
         return s.push(""), s.join(`
 `);
-      }, O.prototype.displayStateStack = function(I, C) {
+      }, O.prototype.displayStateStack = function(I, N) {
         for (var s, 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;
+          var o = I[P], r = o.rule.toString(o.dot);
+          r === s ? L++ : (L > 0 && N.push("    ^ " + L + " more lines identical to this"), L = 0, N.push("    " + r)), s = r;
         }
       }, O.prototype.getSymbolDisplay = function(I) {
-        return N(I);
-      }, O.prototype.buildFirstStateStack = function(I, C) {
-        if (C.indexOf(I) !== -1)
+        return t(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 s = I.wantedBy[0], L = [I].concat(N), P = this.buildFirstStateStack(s, 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];
+        var I = [], N = 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);
+          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 t(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 +18108,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)
@@ -18043,58 +18129,58 @@ function rI() {
         Rule: E
       };
     });
-  })(q)), q.exports;
+  })(j)), j.exports;
 }
-var nI = rI();
-const DI = /* @__PURE__ */ LI(nI);
-function iI(T) {
-  return T.map(PI).map(aI).map(oI).map(MI).map(UI);
+var DI = nI();
+const iI = /* @__PURE__ */ _I(DI);
+function PI(T) {
+  return T.map(oI).map(aI).map(MI).map(UI).map(GI);
 }
-const PI = (T, E, R) => {
-  if (uT(T.type)) {
-    const A = GI(R, E);
+const oI = (T, E, R) => {
+  if (BT(T.type)) {
+    const A = cI(R, E);
     if (A && A.type === i.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, T), { type: i.IDENTIFIER, text: T.raw });
-    const S = x(R, E);
+    const S = v(R, E);
     if (S && S.type === i.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, T), { type: i.IDENTIFIER, text: T.raw });
   }
   return T;
 }, aI = (T, E, R) => {
   if (T.type === i.RESERVED_FUNCTION_NAME) {
-    const A = x(R, E);
-    if (!A || !dT(A))
+    const A = v(R, E);
+    if (!A || !hT(A))
       return Object.assign(Object.assign({}, T), { type: i.IDENTIFIER, text: T.raw });
   }
   return T;
-}, oI = (T, E, R) => {
+}, MI = (T, E, R) => {
   if (T.type === i.RESERVED_DATA_TYPE) {
-    const A = x(R, E);
-    if (A && dT(A))
+    const A = v(R, E);
+    if (A && hT(A))
       return Object.assign(Object.assign({}, T), { type: i.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return T;
-}, MI = (T, E, R) => {
+}, UI = (T, E, R) => {
   if (T.type === i.IDENTIFIER) {
-    const A = x(R, E);
+    const A = v(R, E);
     if (A && VT(A))
       return Object.assign(Object.assign({}, T), { type: i.ARRAY_IDENTIFIER });
   }
   return T;
-}, UI = (T, E, R) => {
+}, GI = (T, E, R) => {
   if (T.type === i.RESERVED_DATA_TYPE) {
-    const A = x(R, E);
+    const A = v(R, E);
     if (A && VT(A))
       return Object.assign(Object.assign({}, T), { type: i.ARRAY_KEYWORD });
   }
   return T;
-}, GI = (T, E) => x(T, E, -1), x = (T, E, R = 1) => {
+}, cI = (T, E) => v(T, E, -1), v = (T, E, R = 1) => {
   let A = 1;
-  for (; T[E + A * R] && cI(T[E + A * R]); )
+  for (; T[E + A * R] && lI(T[E + A * R]); )
     A++;
   return T[E + A * R];
-}, dT = (T) => T.type === i.OPEN_PAREN && T.text === "(", VT = (T) => T.type === i.OPEN_PAREN && T.text === "[", cI = (T) => T.type === i.BLOCK_COMMENT || T.type === i.LINE_COMMENT;
-class hT {
+}, hT = (T) => T.type === i.OPEN_PAREN && T.text === "(", VT = (T) => T.type === i.OPEN_PAREN && T.text === "[", lI = (T) => T.type === i.BLOCK_COMMENT || T.type === i.LINE_COMMENT;
+class fT {
   constructor(E) {
     this.tokenize = E, this.index = 0, this.tokens = [], this.input = "";
   }
@@ -18107,7 +18193,7 @@ class hT {
   save() {
   }
   formatError(E) {
-    const { line: R, col: A } = pT(this.input, E.start);
+    const { line: R, col: A } = dT(this.input, E.start);
     return `Parse error at token: ${E.text} at line ${R} column ${A}`;
   }
   has(E) {
@@ -18121,26 +18207,26 @@ var M;
 function BE(T) {
   return T[0];
 }
-const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
+const G = new fT((T) => []), V = ([[T]]) => T, F = (T) => ({
   type: M.keyword,
   tokenType: T.type,
   text: T.text,
   raw: T.raw
-}), oT = (T) => ({
+}), aT = (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), HI = (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 = {
+}, uI = {
   Lexer: G,
   ParserRules: [
     { name: "main$ebnf$1", symbols: [] },
@@ -18177,7 +18263,7 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
     { name: "clause$subexpression$1", symbols: ["select_clause"] },
     { name: "clause$subexpression$1", symbols: ["other_clause"] },
     { name: "clause$subexpression$1", symbols: ["set_operation"] },
-    { name: "clause", symbols: ["clause$subexpression$1"], postprocess: h },
+    { name: "clause", symbols: ["clause$subexpression$1"], postprocess: V },
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["free_form_sql"] },
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1$ebnf$1", "free_form_sql"], postprocess: (T) => T[0].concat([T[1]]) },
     { name: "limit_clause$ebnf$1$subexpression$1", symbols: [G.has("COMMA") ? { type: "COMMA" } : COMMA, "limit_clause$ebnf$1$subexpression$1$ebnf$1"] },
@@ -18191,14 +18277,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 +18300,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 +18309,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 +18325,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 +18336,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,37 +18360,37 @@ 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"] },
-    { name: "free_form_sql", symbols: ["free_form_sql$subexpression$1"], postprocess: h },
+    { name: "free_form_sql", symbols: ["free_form_sql$subexpression$1"], postprocess: V },
     { name: "asteriskless_free_form_sql$subexpression$1", symbols: ["asteriskless_andless_expression"] },
     { name: "asteriskless_free_form_sql$subexpression$1", symbols: ["logic_operator"] },
     { name: "asteriskless_free_form_sql$subexpression$1", symbols: ["comma"] },
     { name: "asteriskless_free_form_sql$subexpression$1", symbols: ["comment"] },
     { name: "asteriskless_free_form_sql$subexpression$1", symbols: ["other_keyword"] },
-    { name: "asteriskless_free_form_sql", symbols: ["asteriskless_free_form_sql$subexpression$1"], postprocess: h },
+    { name: "asteriskless_free_form_sql", symbols: ["asteriskless_free_form_sql$subexpression$1"], postprocess: V },
     { name: "expression$subexpression$1", symbols: ["andless_expression"] },
     { name: "expression$subexpression$1", symbols: ["logic_operator"] },
-    { name: "expression", symbols: ["expression$subexpression$1"], postprocess: h },
+    { name: "expression", symbols: ["expression$subexpression$1"], postprocess: V },
     { name: "andless_expression$subexpression$1", symbols: ["asteriskless_andless_expression"] },
     { name: "andless_expression$subexpression$1", symbols: ["asterisk"] },
-    { name: "andless_expression", symbols: ["andless_expression$subexpression$1"], postprocess: h },
+    { name: "andless_expression", symbols: ["andless_expression$subexpression$1"], postprocess: V },
     { name: "asteriskless_andless_expression$subexpression$1", symbols: ["atomic_expression"] },
     { name: "asteriskless_andless_expression$subexpression$1", symbols: ["between_predicate"] },
     { name: "asteriskless_andless_expression$subexpression$1", symbols: ["case_expression"] },
-    { name: "asteriskless_andless_expression", symbols: ["asteriskless_andless_expression$subexpression$1"], postprocess: h },
+    { name: "asteriskless_andless_expression", symbols: ["asteriskless_andless_expression$subexpression$1"], postprocess: V },
     { name: "atomic_expression$subexpression$1", symbols: ["array_subscript"] },
     { name: "atomic_expression$subexpression$1", symbols: ["function_call"] },
     { name: "atomic_expression$subexpression$1", symbols: ["property_access"] },
@@ -18317,13 +18403,13 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
     { name: "atomic_expression$subexpression$1", symbols: ["literal"] },
     { name: "atomic_expression$subexpression$1", symbols: ["data_type"] },
     { name: "atomic_expression$subexpression$1", symbols: ["keyword"] },
-    { name: "atomic_expression", symbols: ["atomic_expression$subexpression$1"], postprocess: h },
+    { name: "atomic_expression", symbols: ["atomic_expression$subexpression$1"], postprocess: V },
     {
       name: "array_subscript",
       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 +18418,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 +18427,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 +18479,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 +18490,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),
-        expr1: lI(R, { leading: E, trailing: A }),
-        andKw: B(S),
-        expr2: [F(O, { leading: e })]
+        betweenKw: F(T),
+        expr1: HI(R, { leading: E, trailing: A }),
+        andKw: F(S),
+        expr2: [Y(O, { leading: e })]
       })
     },
     { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: BE },
@@ -18419,8 +18505,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 +18516,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 +18527,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,21 +18556,21 @@ 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] },
     {
       name: "data_type",
       symbols: ["data_type$subexpression$1"],
-      postprocess: ([[T]]) => oT(T)
+      postprocess: ([[T]]) => aT(T)
     },
     {
       name: "data_type",
       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(aT(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18494,7 +18580,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 +18589,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]]) },
@@ -18537,13 +18623,13 @@ const G = new hT((T) => []), h = ([[T]]) => T, B = (T) => ({
     }
   ],
   ParserStart: "main"
-}, { Parser: uI, Grammar: BI } = DI;
-function FI(T) {
+}, { Parser: BI, Grammar: FI } = iI;
+function YI(T) {
   let E = {};
-  const R = new hT((S) => [
-    ...iI(T.tokenize(S, E)),
-    HT(S.length)
-  ]), A = new uI(BI.fromCompiled(HI), { lexer: R });
+  const R = new fT((S) => [
+    ...PI(T.tokenize(S, E)),
+    uT(S.length)
+  ]), A = new BI(FI.fromCompiled(uI), { lexer: R });
   return {
     parse: (S, e) => {
       E = e;
@@ -18595,16 +18681,16 @@ class WT {
       }
   }
   trimHorizontalWhitespace() {
-    for (; YI(v(this.items)); )
+    for (; mI(Q(this.items)); )
       this.items.pop();
   }
   trimWhitespace() {
-    for (; mI(v(this.items)); )
+    for (; pI(Q(this.items)); )
       this.items.pop();
   }
   addNewline(E) {
     if (this.items.length > 0)
-      switch (v(this.items)) {
+      switch (Q(this.items)) {
         case n.NEWLINE:
           this.items.pop(), this.items.push(E);
           break;
@@ -18646,7 +18732,7 @@ class WT {
     }
   }
 }
-const YI = (T) => T === n.SPACE || T === n.SINGLE_INDENT, mI = (T) => T === n.SPACE || T === n.SINGLE_INDENT || T === n.NEWLINE;
+const mI = (T) => T === n.SPACE || T === n.SINGLE_INDENT, pI = (T) => T === n.SPACE || T === n.SINGLE_INDENT || T === n.NEWLINE;
 function MT(T, E) {
   if (E === "standard")
     return T;
@@ -18654,10 +18740,10 @@ function MT(T, E) {
   return T.length >= 10 && T.includes(" ") && ([T, ...R] = T.split(" ")), E === "tabularLeft" ? T = T.padEnd(9, " ") : T = T.padStart(9, " "), T + ["", ...R].join(" ");
 }
 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;
+  return _R(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 {
+const FE = "top-level", dI = "block-level";
+class XT {
   /**
    * @param {string} indent A string to indent with
    */
@@ -18686,14 +18772,14 @@ class fT {
    * Increases indentation by one block-level indent.
    */
   increaseBlockLevel() {
-    this.indentTypes.push(pI);
+    this.indentTypes.push(dI);
   }
   /**
    * Decreases indentation by one top-level indent.
    * Does nothing when the previous indent is not top-level.
    */
   decreaseTopLevel() {
-    this.indentTypes.length > 0 && v(this.indentTypes) === FE && this.indentTypes.pop();
+    this.indentTypes.length > 0 && Q(this.indentTypes) === FE && this.indentTypes.pop();
   }
   /**
    * Decreases indentation by one block-level indent.
@@ -18705,9 +18791,9 @@ class fT {
       ;
   }
 }
-class dI extends WT {
+class hI extends WT {
   constructor(E) {
-    super(new fT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
+    super(new XT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
   }
   add(...E) {
     if (E.forEach((R) => this.addToLength(R)), this.length > this.expressionWidth)
@@ -18900,7 +18986,7 @@ class z {
       // first line starts with /* or /**
       /^\/\*\*?$/.test(R[0]) && // intermediate lines start with *
       R.slice(1, R.length - 1).every((A) => /^\s*\*/.test(A)) && // last line ends with */
-      /^\s*\*\/$/.test(v(R))
+      /^\s*\*\/$/.test(Q(R))
     );
   }
   // Breaks up block comment to multiple lines.
@@ -18949,7 +19035,7 @@ class z {
         cfg: this.cfg,
         dialectCfg: this.dialectCfg,
         params: this.params,
-        layout: new dI(this.cfg.expressionWidth),
+        layout: new hI(this.cfg.expressionWidth),
         inline: !0
       }).format(E);
     } catch (A) {
@@ -18991,7 +19077,7 @@ class z {
   showNonTabularKw(E) {
     switch (this.cfg.keywordCase) {
       case "preserve":
-        return Z(E.raw);
+        return q(E.raw);
       case "upper":
         return E.text;
       case "lower":
@@ -19005,7 +19091,7 @@ class z {
   showNonTabularFunctionKw(E) {
     switch (this.cfg.functionCase) {
       case "preserve":
-        return Z(E.raw);
+        return q(E.raw);
       case "upper":
         return E.text;
       case "lower":
@@ -19027,7 +19113,7 @@ class z {
   showDataType(E) {
     switch (this.cfg.dataTypeCase) {
       case "preserve":
-        return Z(E.raw);
+        return q(E.raw);
       case "upper":
         return E.text;
       case "lower":
@@ -19037,7 +19123,7 @@ class z {
 }
 class VI {
   constructor(E, R) {
-    this.dialect = E, this.cfg = R, this.params = new CI(this.cfg.params);
+    this.dialect = E, this.cfg = R, this.params = new LI(this.cfg.params);
   }
   /**
    * Formats an SQL query.
@@ -19049,7 +19135,7 @@ class VI {
     return this.formatAst(R).trimEnd();
   }
   parse(E) {
-    return FI(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
+    return YI(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
   }
   formatAst(E) {
     return E.map((R) => this.formatStatement(R)).join(`
@@ -19060,14 +19146,14 @@ class VI {
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new WT(new fT(tI(this.cfg)))
+      layout: new WT(new XT(CI(this.cfg)))
     }).format(E.children);
     return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? R.add(n.NEWLINE, ";") : R.add(n.NO_NEWLINE, ";")), R.toString();
   }
 }
 class k extends Error {
 }
-function hI(T) {
+function fI(T) {
   const E = [
     "multilineLists",
     "newlineBeforeOpenParen",
@@ -19081,17 +19167,17 @@ 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 && !WI(T.params) && console.warn('WARNING: All "params" option values should be strings.'), T.paramTypes && !XI(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) {
   return (T instanceof Array ? T : Object.values(T)).every((R) => typeof R == "string");
 }
-function fI(T) {
+function XI(T) {
   return T.custom && Array.isArray(T.custom) ? T.custom.every((E) => E.regex !== "") : !0;
 }
-var XI = function(T, E) {
+var bI = function(T, E) {
   var R = {};
   for (var A in T) Object.prototype.hasOwnProperty.call(T, A) && E.indexOf(A) < 0 && (R[A] = T[A]);
   if (T != null && typeof Object.getOwnPropertySymbols == "function")
@@ -19099,7 +19185,7 @@ var XI = function(T, E) {
       E.indexOf(A[S]) < 0 && Object.prototype.propertyIsEnumerable.call(T, A[S]) && (R[A[S]] = T[A[S]]);
   return R;
 };
-const XT = {
+const bT = {
   bigquery: "bigquery",
   db2: "db2",
   db2i: "db2i",
@@ -19120,7 +19206,7 @@ const XT = {
   tsql: "transactsql",
   singlestoredb: "singlestoredb",
   snowflake: "snowflake"
-}, bI = Object.keys(XT), KI = {
+}, yI = Object.keys(bT), KI = {
   tabWidth: 2,
   useTabs: !1,
   keywordCase: "preserve",
@@ -19133,21 +19219,21 @@ const XT = {
   linesBetweenQueries: 1,
   denseOperators: !1,
   newlineBeforeSemicolon: !1
-}, yI = (T, E = {}) => {
-  if (typeof E.language == "string" && !bI.includes(E.language))
+}, $I = (T, E = {}) => {
+  if (typeof E.language == "string" && !yI.includes(E.language))
     throw new k(`Unsupported SQL dialect: ${E.language}`);
-  const R = XT[E.language || "sql"];
-  return $I(T, Object.assign(Object.assign({}, E), { dialect: ve[R] }));
-}, $I = (T, E) => {
-  var { dialect: R } = E, A = XI(E, ["dialect"]);
+  const R = bT[E.language || "sql"];
+  return gI(T, Object.assign(Object.assign({}, E), { dialect: Qe[R] }));
+}, gI = (T, E) => {
+  var { dialect: R } = E, A = bI(E, ["dialect"]);
   if (typeof T != "string")
     throw new Error("Invalid query argument. Expected string, instead got " + typeof T);
-  const S = hI(Object.assign(Object.assign({}, KI), A));
-  return new VI(OI(R), S).format(T);
+  const S = fI(Object.assign(Object.assign({}, KI), A));
+  return new VI(NI(R), S).format(T);
 };
 function GT(T, E) {
   try {
-    return yI(T, {
+    return $I(T, {
       language: {
         postgres: "postgresql",
         mysql: "mysql",
@@ -19163,7 +19249,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 +19366,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 t = 0; t < R.length; t++) {
+      const D = R[t], I = E.measures[D];
+      S[t] = {
         name: `${E.name}.${D}`,
         title: I.title || D,
         shortTitle: I.title || D,
@@ -19292,9 +19378,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 t = 0; t < A.length; t++) {
+      const D = A[t], I = E.dimensions[D];
+      e[t] = {
         name: `${E.name}.${D}`,
         title: I.title || D,
         shortTitle: I.title || D,
@@ -19306,12 +19392,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 [, t] of Object.entries(E.joins)) {
+        const D = typeof t.targetCube == "function" ? t.targetCube() : t.targetCube;
         O.push({
           targetCube: D.name,
-          relationship: N.relationship,
-          joinFields: N.on.map((I) => ({
+          relationship: t.relationship,
+          joinFields: t.on.map((I) => ({
             sourceField: this.getColumnName(I.source),
             targetField: this.getColumnName(I.target)
           }))
@@ -19337,9 +19423,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), t = this.dbExecutor.getEngineType();
     return {
-      sql: GT(O.sql, N),
+      sql: GT(O.sql, t),
       params: O.params
     };
   }
@@ -19392,10 +19478,10 @@ class WE {
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(E) {
-    return bT(this.cubes, E);
+    return yT(this.cubes, E);
   }
 }
-function bT(T, E) {
+function yT(T, E) {
   const R = [], A = /* @__PURE__ */ new Set();
   if (E.measures)
     for (const S of E.measures) {
@@ -19405,12 +19491,12 @@ function bT(T, E) {
         continue;
       }
       A.add(e);
-      const N = T.get(e);
-      if (!N) {
+      const t = T.get(e);
+      if (!t) {
         R.push(`Cube '${e}' not found (referenced in measure '${S}')`);
         continue;
       }
-      N.measures[O] || R.push(`Measure '${O}' not found on cube '${e}'`);
+      t.measures[O] || R.push(`Measure '${O}' not found on cube '${e}'`);
     }
   if (E.dimensions)
     for (const S of E.dimensions) {
@@ -19420,12 +19506,12 @@ function bT(T, E) {
         continue;
       }
       A.add(e);
-      const N = T.get(e);
-      if (!N) {
+      const t = T.get(e);
+      if (!t) {
         R.push(`Cube '${e}' not found (referenced in dimension '${S}')`);
         continue;
       }
-      N.dimensions[O] || R.push(`Dimension '${O}' not found on cube '${e}'`);
+      t.dimensions[O] || R.push(`Dimension '${O}' not found on cube '${e}'`);
     }
   if (E.timeDimensions)
     for (const S of E.timeDimensions) {
@@ -19435,12 +19521,12 @@ function bT(T, E) {
         continue;
       }
       A.add(e);
-      const N = T.get(e);
-      if (!N) {
+      const t = T.get(e);
+      if (!t) {
         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)`);
+      t.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 +19538,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 t = T.and || T.or || [];
+    for (const D of t)
       KT(D, E, R, A);
     return;
   }
@@ -19474,17 +19560,17 @@ 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);
+function QI(T) {
+  return new fE(T);
 }
-const gI = new WE(), QI = gI;
-function ZI(T) {
-  return new WE({
+const JI = new fE(), ZI = JI;
+function qI(T) {
+  return new fE({
     drizzle: T.drizzle,
     schema: T.schema
   });
 }
-const qI = {
+const jI = {
   /**
    * Create a simple query builder
    */
@@ -19591,26 +19677,26 @@ const qI = {
   }
 };
 export {
-  VE as BaseDatabaseExecutor,
+  hE as BaseDatabaseExecutor,
   lT as MySQLExecutor,
-  ZT as PostgresExecutor,
-  TR as QueryBuilder,
+  qT as PostgresExecutor,
+  RR as QueryBuilder,
   OE as QueryExecutor,
-  RR as QueryPlanner,
+  AR as QueryPlanner,
   kT as SQLiteExecutor,
-  WE as SemanticLayerCompiler,
-  qI as SemanticLayerUtils,
+  fE as SemanticLayerCompiler,
+  jI as SemanticLayerUtils,
   JE as createDatabaseExecutor,
-  ZI as createDrizzleSemanticLayer,
-  wI as createMultiCubeContext,
-  qT as createMySQLExecutor,
+  qI as createDrizzleSemanticLayer,
+  xI as createMultiCubeContext,
+  jT as createMySQLExecutor,
   $E as createPostgresExecutor,
   gE as createSQLiteExecutor,
-  vI as createSemanticLayer,
-  QI as defaultSemanticLayer,
-  xI as defineCube,
-  ER as getJoinType,
+  QI as createSemanticLayer,
+  ZI as defaultSemanticLayer,
+  vI as defineCube,
+  HT as getJoinType,
   wE as resolveCubeReference,
-  W as resolveSqlExpression,
-  gI as semanticLayer
+  f as resolveSqlExpression,
+  JI as semanticLayer
 };