drizzle-cube 0.1.69 → 0.2.0

package/dist/server/index.js

@@ -1,4 +1,4 @@
-import { sql as _, eq as x, and as F, StringChunk as QT, count as SE, sum as f, max as j, min as q, countDistinct as ZT, SQL as jT, or as IE, arrayContained as qT, arrayOverlaps as kT, arrayContains as zT, isNotNull as KE, ne as $E, isNull as wE, notInArray as JE, inArray as OE, lt as NE, gt as tE, gte as K, lte as $, desc as Ee, asc as xE } from "drizzle-orm";
+import { sql as _, eq as x, and as F, StringChunk as vT, count as SE, sum as f, max as j, min as q, countDistinct as QT, SQL as ZT, or as IE, arrayContained as jT, arrayOverlaps as qT, arrayContains as kT, isNotNull as gE, ne as KE, isNull as $E, notInArray as wE, inArray as OE, lt as NE, gt as tE, gte as K, lte as $, desc as zT, asc as JE } from "drizzle-orm";
 class WE {
   /**
    * Default implementation returns template unchanged
@@ -25,7 +25,7 @@ class WE {
     }
   }
 }
-class Te extends WE {
+class Ee extends WE {
   getEngineType() {
     return "postgres";
   }
@@ -149,7 +149,7 @@ class Te extends WE {
     return E;
   }
 }
-class dT extends WE {
+class BT extends WE {
   getEngineType() {
     return "mysql";
   }
@@ -274,7 +274,7 @@ class dT extends WE {
     return E;
   }
 }
-class ee extends WE {
+class Te extends WE {
   getEngineType() {
     return "sqlite";
   }
@@ -426,7 +426,7 @@ class ee extends WE {
     return E;
   }
 }
-class Re extends dT {
+class ee extends BT {
   getEngineType() {
     return "singlestore";
   }
@@ -439,16 +439,16 @@ class Re extends dT {
   // These limitations are typically handled at the query building level
   // rather than in the adapter, but can be addressed here if needed
 }
-function Ae(e) {
+function Re(e) {
   switch (e) {
     case "postgres":
-      return new Te();
+      return new Ee();
     case "mysql":
-      return new dT();
+      return new BT();
     case "sqlite":
-      return new ee();
+      return new Te();
     case "singlestore":
-      return new Re();
+      return new ee();
     default:
       throw new Error(`Unsupported database engine: ${e}`);
   }
@@ -457,11 +457,11 @@ class bE {
   constructor(E, T, R) {
     this.db = E, this.schema = T;
     const A = R || this.getEngineType();
-    this.databaseAdapter = Ae(A);
+    this.databaseAdapter = Re(A);
   }
   databaseAdapter;
 }
-class Se extends bE {
+class Ae extends bE {
   async execute(E, T) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const A = await E.execute();
@@ -512,8 +512,8 @@ class Se extends bE {
     return "postgres";
   }
 }
-function vE(e, E) {
-  return new Se(e, E, "postgres");
+function xE(e, E) {
+  return new Ae(e, E, "postgres");
 }
 class mT extends bE {
   async execute(E, T) {
@@ -553,10 +553,10 @@ class mT extends bE {
     return "mysql";
   }
 }
-function Ie(e, E) {
+function Se(e, E) {
   return new mT(e, E, "mysql");
 }
-class Oe extends bE {
+class Ie extends bE {
   async execute(E, T) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const R = await E.execute();
@@ -602,10 +602,10 @@ class Oe extends bE {
     return "sqlite";
   }
 }
-function QE(e, E) {
-  return new Oe(e, E, "sqlite");
+function vE(e, E) {
+  return new Ie(e, E, "sqlite");
 }
-class Ne extends mT {
+class Oe extends mT {
   getEngineType() {
     return "singlestore";
   }
@@ -613,25 +613,25 @@ class Ne extends mT {
   // For now, we inherit all behavior from MySQLExecutor since
   // SingleStore is largely MySQL-compatible
 }
-function te(e, E) {
-  return new Ne(e, E);
+function Ne(e, E) {
+  return new Oe(e, E);
 }
-function ZE(e, E, T) {
+function QE(e, E, T) {
   if (T)
     switch (T) {
       case "postgres":
-        return vE(e, E);
+        return xE(e, E);
       case "mysql":
-        return Ie(e, E);
+        return Se(e, E);
       case "sqlite":
-        return QE(e, E);
+        return vE(e, E);
       case "singlestore":
-        return te(e, E);
+        return Ne(e, E);
     }
   if (e.all && e.run)
-    return QE(e, E);
-  if (e.execute)
     return vE(e, E);
+  if (e.execute)
+    return xE(e, E);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
 function sE(e) {
@@ -656,27 +656,27 @@ function fE(e, E) {
       return "left";
   }
 }
-function se(e) {
+function te(e) {
   return e && typeof e == "object" ? _`${_`${e}`}` : e;
 }
 function b(e, E) {
   const T = typeof e == "function" ? e(E) : e;
-  return se(T);
+  return te(T);
 }
-function sO(e, E, T) {
+function tO(e, E, T) {
   return {
     ...e,
     cubes: E,
     currentCube: T
   };
 }
-function CO(e, E) {
+function sO(e, E) {
   return {
     name: e,
     ...E
   };
 }
-function Ce(e, E) {
+function se(e, E) {
   if (e.relationship !== "belongsToMany" || !e.through)
     throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
   const { table: T, sourceKey: R, targetKey: A, securitySql: S } = e.through, I = [];
@@ -932,37 +932,37 @@ class X {
     return E.type === "calculated" && !!E.calculatedSql;
   }
 }
-function Le(e, E) {
+function Ce(e, E) {
   const { cube: T, allCubes: R, resolvedMeasures: A } = E, S = XE(e), I = /* @__PURE__ */ new Map();
   for (const C of S) {
-    const { originalRef: r, cubeName: L, fieldName: i } = C, a = L || T.name;
+    const { originalRef: n, cubeName: L, fieldName: i } = C, a = L || T.name;
     if (!R.get(a))
       throw new Error(
-        `Cannot substitute {${r}}: cube '${a}' not found`
+        `Cannot substitute {${n}}: cube '${a}' not found`
       );
     const P = `${a}.${i}`, U = A.get(P);
     if (!U)
       throw new Error(
-        `Cannot substitute {${r}}: measure '${P}' not resolved yet. Ensure measures are resolved in dependency order.`
+        `Cannot substitute {${n}}: measure '${P}' not resolved yet. Ensure measures are resolved in dependency order.`
       );
     const M = U(), G = _`${M}`;
-    I.set(r, G);
+    I.set(n, G);
   }
   const t = [], s = [];
   let O = 0;
   for (const C of S) {
-    const r = `{${C.originalRef}}`, L = e.indexOf(r, O);
+    const n = `{${C.originalRef}}`, L = e.indexOf(n, O);
     if (L >= 0) {
       t.push(e.substring(O, L));
       const i = I.get(C.originalRef);
-      i && s.push(i), O = L + r.length;
+      i && s.push(i), O = L + n.length;
     }
   }
   if (t.push(e.substring(O)), s.length === 0)
     return _.raw(e);
   const N = [];
   for (let C = 0; C < t.length; C++)
-    t[C] && N.push(new QT(t[C])), C < s.length && N.push(s[C]);
+    t[C] && N.push(new vT(t[C])), C < s.length && N.push(s[C]);
   return _.join(N, _.raw(""));
 }
 function XE(e) {
@@ -985,7 +985,7 @@ function XE(e) {
   }
   return R;
 }
-function re(e) {
+function Le(e) {
   const E = [];
   let T = 0;
   for (let I = 0; I < e.length; I++)
@@ -1038,9 +1038,9 @@ class ne {
     for (const N of T.values())
       O.buildGraph(N);
     for (const N of E) {
-      const [C, r] = N.split("."), L = T.get(C);
-      if (L && L.measures && L.measures[r]) {
-        const i = L.measures[r];
+      const [C, n] = N.split("."), L = T.get(C);
+      if (L && L.measures && L.measures[n]) {
+        const i = L.measures[n];
         X.isCalculatedMeasure(i) ? (t.push(N), CE(i.calculatedSql, C).forEach((P) => s.add(P)), O.getAllDependencies(N).forEach((P) => {
           const [U, M] = P.split("."), G = T.get(U);
           if (G && G.measures[M]) {
@@ -1051,14 +1051,14 @@ class ne {
       }
     }
     for (const N of s) {
-      const [C, r] = N.split("."), L = T.get(C);
-      if (L && L.measures && L.measures[r]) {
-        const i = L.measures[r];
+      const [C, n] = N.split("."), L = T.get(C);
+      if (L && L.measures && L.measures[n]) {
+        const i = L.measures[n];
         X.isCalculatedMeasure(i) ? t.includes(N) || t.push(N) : I.includes(N) || I.push(N);
       }
     }
     for (const N of I) {
-      const [C, r] = N.split("."), L = T.get(C), i = L.measures[r];
+      const [C, n] = N.split("."), L = T.get(C), i = L.measures[n];
       if (A) {
         const a = A(N, i, L);
         S.set(N, () => a);
@@ -1068,7 +1068,7 @@ class ne {
     if (t.length > 0) {
       const N = O.topologicalSort(t);
       for (const C of N) {
-        const [r, L] = C.split("."), i = T.get(r), a = i.measures[L];
+        const [n, L] = C.split("."), i = T.get(n), a = i.measures[L];
         S.set(C, () => this.buildCalculatedMeasure(
           a,
           i,
@@ -1133,7 +1133,7 @@ class ne {
         `Calculated measure '${T.name}.${E.name}' missing calculatedSql property`
       );
     const I = this.databaseAdapter.preprocessCalculatedTemplate(E.calculatedSql);
-    return Le(I, {
+    return Ce(I, {
       cube: T,
       allCubes: R,
       resolvedMeasures: A
@@ -1162,11 +1162,11 @@ class ne {
     for (const s of t) {
       const [O, N] = s.split("."), C = A.get(O);
       if (C && C.measures[N]) {
-        const r = C.measures[N];
+        const n = C.measures[N];
         if (R.measures.includes(s)) {
           const L = _`${_.identifier(R.cteAlias)}.${_.identifier(N)}`;
           let i;
-          switch (r.type) {
+          switch (n.type) {
             case "count":
             case "countDistinct":
             case "sum":
@@ -1273,7 +1273,7 @@ class ne {
       case "count":
         return SE(R);
       case "countDistinct":
-        return ZT(R);
+        return QT(R);
       case "sum":
         return f(R);
       case "avg":
@@ -1293,7 +1293,7 @@ class ne {
    */
   buildTimeDimensionExpression(E, T, R) {
     const A = b(E, R);
-    return T ? this.databaseAdapter.buildTimeDimension(T, A) : A instanceof jT ? A : _`${A}`;
+    return T ? this.databaseAdapter.buildTimeDimension(T, A) : A instanceof ZT ? A : _`${A}`;
   }
   /**
    * Build WHERE conditions from semantic query filters (dimensions only)
@@ -1312,7 +1312,7 @@ class ne {
         if (N && N.dimensions[O] && t.dateRange) {
           if (A?.preAggregationCTEs && A.preAggregationCTEs.some((a) => a.cube.name === s))
             continue;
-          const C = N.dimensions[O], r = b(C.sql, R), L = this.buildDateRangeCondition(r, t.dateRange);
+          const C = N.dimensions[O], n = b(C.sql, R), L = this.buildDateRangeCondition(n, t.dateRange);
           L && S.push(L);
         }
       }
@@ -1349,8 +1349,8 @@ class ne {
     }
     const I = E, [t, s] = I.member.split("."), O = T.get(t);
     if (!O) return null;
-    const N = O.dimensions[s], C = O.measures[s], r = N || C;
-    if (!r) return null;
+    const N = O.dimensions[s], C = O.measures[s], n = N || C;
+    if (!n) return null;
     if (A === "where" && N) {
       if (S?.preAggregationCTEs && S.preAggregationCTEs.some((l) => l.cube.name === t))
         return null;
@@ -1359,7 +1359,7 @@ class ne {
         i,
         I.operator,
         I.values,
-        r,
+        n,
         I.dateRange
       );
     } else {
@@ -1371,7 +1371,7 @@ class ne {
           L,
           I.operator,
           I.values,
-          r,
+          n,
           I.dateRange
         );
       }
@@ -1413,7 +1413,7 @@ class ne {
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return I.length > 1 ? JE(E, I) : I.length === 1 ? $E(E, t) : null;
+        return I.length > 1 ? wE(E, I) : I.length === 1 ? KE(E, t) : null;
       case "contains":
         return this.databaseAdapter.buildStringCondition(E, "contains", t);
       case "notContains":
@@ -1431,9 +1431,9 @@ class ne {
       case "lte":
         return $(E, t);
       case "set":
-        return KE(E);
+        return gE(E);
       case "notSet":
-        return wE(E);
+        return $E(E);
       case "inDateRange":
         if (I.length >= 2) {
           const s = this.normalizeDate(I[0]);
@@ -1441,8 +1441,8 @@ class ne {
           if (s && O) {
             const N = R[1];
             if (typeof N == "string" && /^\d{4}-\d{2}-\d{2}$/.test(N.trim())) {
-              const C = typeof O == "number" ? new Date(O * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(O), r = new Date(C);
-              r.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? O = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(r.getTime() / 1e3) : r.getTime() : O = r.toISOString();
+              const C = typeof O == "number" ? new Date(O * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(O), n = new Date(C);
+              n.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? O = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(n.getTime() / 1e3) : n.getTime() : O = n.toISOString();
             }
             return F(
               K(E, s),
@@ -1472,7 +1472,7 @@ class ne {
       case "in":
         return I.length > 0 ? OE(E, I) : null;
       case "notIn":
-        return I.length > 0 ? JE(E, I) : null;
+        return I.length > 0 ? wE(E, I) : null;
       case "like":
         return this.databaseAdapter.buildStringCondition(E, "like", t);
       case "notLike":
@@ -1485,22 +1485,22 @@ class ne {
         return this.databaseAdapter.buildStringCondition(E, "notRegex", t);
       case "isEmpty":
         return IE(
-          wE(E),
+          $E(E),
           x(E, "")
         );
       case "isNotEmpty":
         return F(
-          KE(E),
-          $E(E, "")
+          gE(E),
+          KE(E, "")
         );
       // PostgreSQL array operators - silent no-op for other databases
       // These use Drizzle's built-in array operator functions
       case "arrayContains":
-        return this.databaseAdapter.getEngineType() === "postgres" ? zT(E, I) : null;
-      case "arrayOverlaps":
         return this.databaseAdapter.getEngineType() === "postgres" ? kT(E, I) : null;
-      case "arrayContained":
+      case "arrayOverlaps":
         return this.databaseAdapter.getEngineType() === "postgres" ? qT(E, I) : null;
+      case "arrayContained":
+        return this.databaseAdapter.getEngineType() === "postgres" ? jT(E, I) : null;
       default:
         return null;
     }
@@ -1553,39 +1553,39 @@ class ne {
   parseRelativeDateRange(E) {
     const T = /* @__PURE__ */ new Date(), R = E.toLowerCase().trim(), A = T.getUTCFullYear(), S = T.getUTCMonth(), I = T.getUTCDate(), t = T.getUTCDay();
     if (R === "today") {
-      const r = new Date(T);
-      r.setUTCHours(0, 0, 0, 0);
+      const n = new Date(T);
+      n.setUTCHours(0, 0, 0, 0);
       const L = new Date(T);
-      return L.setUTCHours(23, 59, 59, 999), { start: r, end: L };
+      return L.setUTCHours(23, 59, 59, 999), { start: n, end: L };
     }
     if (R === "yesterday") {
-      const r = new Date(T);
-      r.setUTCDate(I - 1), r.setUTCHours(0, 0, 0, 0);
+      const n = new Date(T);
+      n.setUTCDate(I - 1), n.setUTCHours(0, 0, 0, 0);
       const L = new Date(T);
-      return L.setUTCDate(I - 1), L.setUTCHours(23, 59, 59, 999), { start: r, end: L };
+      return L.setUTCDate(I - 1), L.setUTCHours(23, 59, 59, 999), { start: n, end: L };
     }
     if (R === "this week") {
-      const r = t === 0 ? -6 : 1 - t, L = new Date(T);
-      L.setUTCDate(I + r), L.setUTCHours(0, 0, 0, 0);
+      const n = t === 0 ? -6 : 1 - t, L = new Date(T);
+      L.setUTCDate(I + n), L.setUTCHours(0, 0, 0, 0);
       const i = new Date(L);
       return i.setUTCDate(L.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
     }
     if (R === "this month") {
-      const r = new Date(Date.UTC(A, S, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A, S + 1, 0, 23, 59, 59, 999));
-      return { start: r, end: L };
+      const n = new Date(Date.UTC(A, S, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A, S + 1, 0, 23, 59, 59, 999));
+      return { start: n, end: L };
     }
     if (R === "this quarter") {
-      const r = Math.floor(S / 3), L = new Date(Date.UTC(A, r * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(A, r * 3 + 3, 0, 23, 59, 59, 999));
+      const n = Math.floor(S / 3), L = new Date(Date.UTC(A, n * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(A, n * 3 + 3, 0, 23, 59, 59, 999));
       return { start: L, end: i };
     }
     if (R === "this year") {
-      const r = new Date(Date.UTC(A, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A, 11, 31, 23, 59, 59, 999));
-      return { start: r, end: L };
+      const n = new Date(Date.UTC(A, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A, 11, 31, 23, 59, 59, 999));
+      return { start: n, end: L };
     }
     const s = R.match(/^last\s+(\d+)\s+days?$/);
     if (s) {
-      const r = parseInt(s[1], 10), L = new Date(T);
-      L.setUTCDate(I - r + 1), L.setUTCHours(0, 0, 0, 0);
+      const n = parseInt(s[1], 10), L = new Date(T);
+      L.setUTCDate(I - n + 1), L.setUTCHours(0, 0, 0, 0);
       const i = new Date(T);
       return i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
     }
@@ -1597,35 +1597,35 @@ class ne {
       return a.setUTCHours(23, 59, 59, 999), { start: i, end: a };
     }
     if (R === "last week") {
-      const r = t === 0 ? -13 : -6 - t, L = new Date(T);
-      L.setUTCDate(I + r), L.setUTCHours(0, 0, 0, 0);
+      const n = t === 0 ? -13 : -6 - t, L = new Date(T);
+      L.setUTCDate(I + n), L.setUTCHours(0, 0, 0, 0);
       const i = new Date(L);
       return i.setUTCDate(L.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
     }
     if (R === "last month") {
-      const r = new Date(Date.UTC(A, S - 1, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A, S, 0, 23, 59, 59, 999));
-      return { start: r, end: L };
+      const n = new Date(Date.UTC(A, S - 1, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A, S, 0, 23, 59, 59, 999));
+      return { start: n, end: L };
     }
     if (R === "last quarter") {
-      const r = Math.floor(S / 3), L = r === 0 ? 3 : r - 1, i = r === 0 ? A - 1 : A, a = new Date(Date.UTC(i, L * 3, 1, 0, 0, 0, 0)), l = new Date(Date.UTC(i, L * 3 + 3, 0, 23, 59, 59, 999));
+      const n = Math.floor(S / 3), L = n === 0 ? 3 : n - 1, i = n === 0 ? A - 1 : A, a = new Date(Date.UTC(i, L * 3, 1, 0, 0, 0, 0)), l = new Date(Date.UTC(i, L * 3 + 3, 0, 23, 59, 59, 999));
       return { start: a, end: l };
     }
     if (R === "last year") {
-      const r = new Date(Date.UTC(A - 1, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A - 1, 11, 31, 23, 59, 59, 999));
-      return { start: r, end: L };
+      const n = new Date(Date.UTC(A - 1, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(A - 1, 11, 31, 23, 59, 59, 999));
+      return { start: n, end: L };
     }
     if (R === "last 12 months") {
-      const r = new Date(Date.UTC(A, S - 11, 1, 0, 0, 0, 0)), L = new Date(T);
-      return L.setUTCHours(23, 59, 59, 999), { start: r, end: L };
+      const n = new Date(Date.UTC(A, S - 11, 1, 0, 0, 0, 0)), L = new Date(T);
+      return L.setUTCHours(23, 59, 59, 999), { start: n, end: L };
     }
     const N = R.match(/^last\s+(\d+)\s+months?$/);
     if (N) {
-      const r = parseInt(N[1], 10), L = new Date(Date.UTC(A, S - r + 1, 1, 0, 0, 0, 0)), i = new Date(T);
+      const n = parseInt(N[1], 10), L = new Date(Date.UTC(A, S - n + 1, 1, 0, 0, 0, 0)), i = new Date(T);
       return i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
     }
     const C = R.match(/^last\s+(\d+)\s+years?$/);
     if (C) {
-      const r = parseInt(C[1], 10), L = new Date(Date.UTC(A - r, 0, 1, 0, 0, 0, 0)), i = new Date(T);
+      const n = parseInt(C[1], 10), L = new Date(Date.UTC(A - n, 0, 1, 0, 0, 0, 0)), i = new Date(T);
       return i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
     }
     return null;
@@ -1721,7 +1721,7 @@ class ne {
       for (const [S, I] of Object.entries(E.order)) {
         if (!A.includes(S))
           throw new Error(`Cannot order by '${S}': field is not selected in the query`);
-        const t = I === "desc" ? Ee(_.identifier(S)) : xE(_.identifier(S));
+        const t = I === "desc" ? zT(_.identifier(S)) : JE(_.identifier(S));
         R.push(t);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
@@ -1729,7 +1729,7 @@ class ne {
         (t, s) => t.dimension.localeCompare(s.dimension)
       );
       for (const t of I)
-        S.has(t.dimension) || R.push(xE(_.identifier(t.dimension)));
+        S.has(t.dimension) || R.push(JE(_.identifier(t.dimension)));
     }
     return R;
   }
@@ -1770,7 +1770,7 @@ class ne {
     return A;
   }
 }
-class pT {
+class dT {
   /**
    * Analyze a semantic query to determine which cubes are involved
    */
@@ -1929,13 +1929,13 @@ class pT {
       for (const { toCube: N, joinDef: C } of O) {
         if (I.has(N))
           continue;
-        const r = E.get(N);
-        if (!r)
+        const n = E.get(N);
+        if (!n)
           throw new Error(`Cube '${N}' not found`);
         if (C.relationship === "belongsToMany" && C.through) {
-          const L = Ce(C, A.securityContext);
+          const L = se(C, A.securityContext);
           S.push({
-            cube: r,
+            cube: n,
             alias: `${N.toLowerCase()}_cube`,
             joinType: L.junctionJoins[1].joinType,
             // Use the target join type
@@ -1958,7 +1958,7 @@ class pT {
             // No target alias needed - use the actual column
           ), i = fE(C.relationship, C.sqlJoinType);
           S.push({
-            cube: r,
+            cube: n,
             alias: `${N.toLowerCase()}_cube`,
             joinType: i,
             joinCondition: L
@@ -1994,17 +1994,17 @@ class pT {
       const { cube: t, path: s } = S.shift(), O = E.get(t);
       if (O?.joins)
         for (const [, N] of Object.entries(O.joins)) {
-          const r = sE(N.targetCube).name;
-          if (I.has(r))
+          const n = sE(N.targetCube).name;
+          if (I.has(n))
             continue;
           const L = [...s, {
             fromCube: t,
-            toCube: r,
+            toCube: n,
             joinDef: N
           }];
-          if (r === R)
+          if (n === R)
             return L;
-          I.add(r), S.push({ cube: r, path: L });
+          I.add(n), S.push({ cube: n, path: L });
         }
     }
     return null;
@@ -2030,7 +2030,7 @@ class pT {
       const C = this.expandCalculatedMeasureDependencies(
         I.cube,
         N
-      ), r = t.on.map((L) => ({
+      ), n = t.on.map((L) => ({
         sourceColumn: L.source.name,
         targetColumn: L.target.name,
         sourceColumnObj: L.source,
@@ -2040,7 +2040,7 @@ class pT {
         cube: I.cube,
         alias: I.alias,
         cteAlias: `${I.cube.name.toLowerCase()}_agg`,
-        joinKeys: r,
+        joinKeys: n,
         measures: C
       });
     }
@@ -2145,9 +2145,9 @@ class pT {
         O,
         T
       ));
-      const C = s.joinPaths.filter((L) => L.pathFound), r = s.joinPaths.filter((L) => !L.pathFound);
+      const C = s.joinPaths.filter((L) => L.pathFound), n = s.joinPaths.filter((L) => !L.pathFound);
       s.querySummary.joinCount = C.length, s.querySummary.cteCount = s.preAggregations.length, s.querySummary.hasPreAggregation = s.preAggregations.length > 0, s.preAggregations.length > 0 ? s.querySummary.queryType = "multi_cube_cte" : s.querySummary.queryType = "multi_cube_join";
-      for (const L of r)
+      for (const L of n)
         s.warnings.push(
           `No join path found to cube '${L.targetCube}'. Check that joins are defined correctly.`
         );
@@ -2168,18 +2168,18 @@ class pT {
     for (const O of S)
       I.set(O, (I.get(O) || 0) + 1);
     for (const O of E) {
-      const N = R.get(O), C = I.get(O) || 0, r = N?.joins ? Object.keys(N.joins).length : 0, L = this.canReachAllCubes(O, E, R);
+      const N = R.get(O), C = I.get(O) || 0, n = N?.joins ? Object.keys(N.joins).length : 0, L = this.canReachAllCubes(O, E, R);
       A.push({
         cubeName: O,
         dimensionCount: C,
-        joinCount: r,
+        joinCount: n,
         canReachAll: L
       });
     }
     if (T.dimensions && T.dimensions.length > 0) {
       const O = Math.max(...A.map((N) => N.dimensionCount));
       if (O > 0) {
-        const N = A.filter((C) => C.dimensionCount === O).sort((C, r) => C.cubeName.localeCompare(r.cubeName));
+        const N = A.filter((C) => C.dimensionCount === O).sort((C, n) => C.cubeName.localeCompare(n.cubeName));
         for (const C of N)
           if (C.canReachAll)
             return {
@@ -2192,7 +2192,7 @@ class pT {
     }
     const t = A.filter((O) => O.canReachAll);
     if (t.length > 0) {
-      const O = Math.max(...t.map((C) => C.joinCount)), N = t.filter((C) => C.joinCount === O).sort((C, r) => C.cubeName.localeCompare(r.cubeName))[0];
+      const O = Math.max(...t.map((C) => C.joinCount)), N = t.filter((C) => C.joinCount === O).sort((C, n) => C.cubeName.localeCompare(n.cubeName))[0];
       return {
         selectedCube: N.cubeName,
         reason: "most_connected",
@@ -2216,16 +2216,16 @@ class pT {
       const { cube: t, path: s } = S.shift(), O = E.get(t);
       if (O?.joins)
         for (const [, N] of Object.entries(O.joins)) {
-          const r = sE(N.targetCube).name;
-          if (I.has(r))
+          const n = sE(N.targetCube).name;
+          if (I.has(n))
             continue;
-          A.push(r), I.add(r);
+          A.push(n), I.add(n);
           const L = [...s, {
             fromCube: t,
-            toCube: r,
+            toCube: n,
             joinDef: N
           }];
-          if (r === R) {
+          if (n === R) {
             const i = L.map((a) => {
               const l = fE(a.joinDef.relationship, a.joinDef.sqlJoinType), P = a.joinDef.on.map((M) => ({
                 sourceColumn: M.source.name,
@@ -2255,7 +2255,7 @@ class pT {
               visitedCubes: A
             };
           }
-          S.push({ cube: r, path: L });
+          S.push({ cube: n, path: L });
         }
     }
     return {
@@ -2296,15 +2296,15 @@ class pT {
     return S;
   }
 }
-function _e(e, E, T) {
+function re(e, E, T) {
   const R = [];
-  let A = jE(new Date(e), T);
-  const S = jE(new Date(E), T), I = 1e4;
+  let A = ZE(new Date(e), T);
+  const S = ZE(new Date(E), T), I = 1e4;
   for (; A <= S && R.length < I; )
-    R.push(new Date(A)), A = ie(A, T);
+    R.push(new Date(A)), A = _e(A, T);
   return R;
 }
-function jE(e, E) {
+function ZE(e, E) {
   const T = new Date(e);
   switch (E) {
     case "second":
@@ -2338,7 +2338,7 @@ function jE(e, E) {
   }
   return T;
 }
-function ie(e, E) {
+function _e(e, E) {
   const T = new Date(e);
   switch (E) {
     case "second":
@@ -2368,7 +2368,7 @@ function ie(e, E) {
   }
   return T;
 }
-function ae(e) {
+function ie(e) {
   if (e instanceof Date)
     return e.toISOString();
   if (typeof e == "string") {
@@ -2378,24 +2378,24 @@ function ae(e) {
   }
   return String(e);
 }
-function oe(e, E) {
+function ae(e, E) {
   return E.length === 0 ? "__all__" : E.map((T) => String(e[T] ?? "")).join("|||");
 }
-function De(e, E) {
-  const { timeDimensionKey: T, granularity: R, dateRange: A, fillValue: S, measures: I, dimensions: t } = E, s = _e(A[0], A[1], R);
+function oe(e, E) {
+  const { timeDimensionKey: T, granularity: R, dateRange: A, fillValue: S, measures: I, dimensions: t } = E, s = re(A[0], A[1], R);
   if (s.length === 0)
     return e;
   const O = /* @__PURE__ */ new Map();
   for (const C of e) {
-    const r = oe(C, t), L = ae(C[T]);
-    O.has(r) || O.set(r, /* @__PURE__ */ new Map()), O.get(r).set(L, C);
+    const n = ae(C, t), L = ie(C[T]);
+    O.has(n) || O.set(n, /* @__PURE__ */ new Map()), O.get(n).set(L, C);
   }
   O.size === 0 && t.length === 0 && O.set("__all__", /* @__PURE__ */ new Map());
   const N = [];
-  for (const [C, r] of O) {
-    const L = r.size > 0 ? r.values().next().value : null;
+  for (const [C, n] of O) {
+    const L = n.size > 0 ? n.values().next().value : null;
     for (const i of s) {
-      const a = i.toISOString(), l = r.get(a);
+      const a = i.toISOString(), l = n.get(a);
       if (l)
         N.push(l);
       else {
@@ -2413,7 +2413,7 @@ function De(e, E) {
   }
   return N;
 }
-function Pe(e) {
+function De(e) {
   if (!e)
     return null;
   if (Array.isArray(e)) {
@@ -2425,7 +2425,7 @@ function Pe(e) {
   const E = new Date(e);
   return isNaN(E.getTime()) ? null : [E, E];
 }
-function Me(e, E, T) {
+function Pe(e, E, T) {
   if (!E.timeDimensions || E.timeDimensions.length === 0)
     return e;
   const R = E.timeDimensions.filter((s) => {
@@ -2437,7 +2437,7 @@ function Me(e, E, T) {
   const A = E.fillMissingDatesValue === void 0 ? 0 : E.fillMissingDatesValue, S = new Set(E.timeDimensions.map((s) => s.dimension)), I = (E.dimensions || []).filter((s) => !S.has(s));
   let t = e;
   for (const s of R) {
-    const O = Pe(s.dateRange);
+    const O = De(s.dateRange);
     if (!O)
       continue;
     const N = {
@@ -2448,7 +2448,7 @@ function Me(e, E, T) {
       measures: T,
       dimensions: I
     };
-    t = De(t, N);
+    t = oe(t, N);
   }
   return t;
 }
@@ -2456,7 +2456,7 @@ class LE {
   constructor(E) {
     if (this.dbExecutor = E, this.databaseAdapter = E.databaseAdapter, !this.databaseAdapter)
       throw new Error("DatabaseExecutor must have a databaseAdapter property");
-    this.queryBuilder = new ne(this.databaseAdapter), this.queryPlanner = new pT();
+    this.queryBuilder = new ne(this.databaseAdapter), this.queryPlanner = new dT();
   }
   queryBuilder;
   queryPlanner;
@@ -2466,7 +2466,7 @@ class LE {
    */
   async execute(E, T, R) {
     try {
-      const A = JT(E, T);
+      const A = wT(E, T);
       if (!A.isValid)
         throw new Error(`Query validation failed: ${A.errors.join(", ")}`);
       const S = {
@@ -2487,9 +2487,9 @@ class LE {
             }
         }
         return a;
-      }) : [O], C = T.measures || [], r = Me(N, T, C), L = this.generateAnnotations(I, T);
+      }) : [O], C = T.measures || [], n = Pe(N, T, C), L = this.generateAnnotations(I, T);
       return {
-        data: r,
+        data: n,
         annotation: L
       };
     } catch (A) {
@@ -2545,10 +2545,10 @@ class LE {
     if (Object.keys(t).length === 0)
       return null;
     let C = R.db.select(t).from(I.from);
-    const r = A ? {
+    const n = A ? {
       ...A,
       preAggregationCTEs: A.preAggregationCTEs?.filter((P) => P.cube.name !== S.name)
-    } : void 0, L = this.queryBuilder.buildWhereConditions(S, T, R, r), i = [];
+    } : void 0, L = this.queryBuilder.buildWhereConditions(S, T, R, n), i = [];
     if (T.timeDimensions)
       for (const P of T.timeDimensions) {
         const [U, M] = P.dimension.split(".");
@@ -2680,7 +2680,7 @@ class LE {
               let Y = a.joinKeys.find((AE) => AE.targetColumn === M);
               if (!Y && G?.dimensions?.[M]) {
                 const AE = G.dimensions[M].sql;
-                Y = a.joinKeys.find((vT) => vT.targetColumnObj === AE);
+                Y = a.joinKeys.find((xT) => xT.targetColumnObj === AE);
               }
               Y ? s[P] = _`${_.identifier(a.cteAlias)}.${_.identifier(M)}`.as(P) : B && G?.dimensions?.[M] && (s[P] = _`${_.identifier(a.cteAlias)}.${_.identifier(M)}`.as(P));
             }
@@ -2772,7 +2772,7 @@ class LE {
       const a = O.length === 1 ? O[0] : F(...O);
       N = N.where(a);
     }
-    const r = this.queryBuilder.buildGroupByFields(
+    const n = this.queryBuilder.buildGroupByFields(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       T,
@@ -2780,7 +2780,7 @@ class LE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    r.length > 0 && (N = N.groupBy(...r));
+    n.length > 0 && (N = N.groupBy(...n));
     const L = this.queryBuilder.buildHavingConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
@@ -2883,13 +2883,13 @@ class LE {
     };
   }
 }
-const n = (e) => e.flatMap(Ue), Ue = (e) => k(le(e)).map(ce), ce = (e) => e.replace(/ +/g, " ").trim(), le = (e) => ({
+const r = (e) => e.flatMap(Me), Me = (e) => k(ce(e)).map(Ue), Ue = (e) => e.replace(/ +/g, " ").trim(), ce = (e) => ({
   type: "mandatory_block",
   items: yE(e, 0)[0]
 }), yE = (e, E, T) => {
   const R = [];
   for (; e[E]; ) {
-    const [A, S] = ue(e, E);
+    const [A, S] = le(e, E);
     if (R.push(A), E = S, e[E] === "|")
       E++;
     else if (e[E] === "}" || e[E] === "]") {
@@ -2904,44 +2904,44 @@ const n = (e) => e.flatMap(Ue), Ue = (e) => k(le(e)).map(ce), ce = (e) => e.repl
       throw new Error(`Unexpected "${e[E]}"`);
   }
   return [R, E];
-}, ue = (e, E) => {
+}, le = (e, E) => {
   const T = [];
   for (; ; ) {
-    const [R, A] = Ge(e, E);
+    const [R, A] = ue(e, E);
     if (R)
       T.push(R), E = A;
     else
       break;
   }
   return T.length === 1 ? [T[0], E] : [{ type: "concatenation", items: T }, E];
-}, Ge = (e, E) => {
+}, ue = (e, E) => {
   if (e[E] === "{")
-    return He(e, E + 1);
+    return Ge(e, E + 1);
   if (e[E] === "[")
-    return Be(e, E + 1);
+    return He(e, E + 1);
   {
     let T = "";
     for (; e[E] && /[A-Za-z0-9_ ]/.test(e[E]); )
       T += e[E], E++;
     return [T, E];
   }
-}, He = (e, E) => {
+}, Ge = (e, E) => {
   const [T, R] = yE(e, E, "}");
   return [{ type: "mandatory_block", items: T }, R];
-}, Be = (e, E) => {
+}, He = (e, E) => {
   const [T, R] = yE(e, E, "]");
   return [{ type: "optional_block", items: T }, R];
 }, k = (e) => {
   if (typeof e == "string")
     return [e];
   if (e.type === "concatenation")
-    return e.items.map(k).reduce(de, [""]);
+    return e.items.map(k).reduce(Be, [""]);
   if (e.type === "mandatory_block")
     return e.items.flatMap(k);
   if (e.type === "optional_block")
     return ["", ...e.items.flatMap(k)];
   throw new Error(`Unknown node type: ${e}`);
-}, de = (e, E) => {
+}, Be = (e, E) => {
   const T = [];
   for (const R of e)
     for (const A of E)
@@ -2952,19 +2952,19 @@ var D;
 (function(e) {
   e.QUOTED_IDENTIFIER = "QUOTED_IDENTIFIER", e.IDENTIFIER = "IDENTIFIER", e.STRING = "STRING", e.VARIABLE = "VARIABLE", e.RESERVED_DATA_TYPE = "RESERVED_DATA_TYPE", e.RESERVED_PARAMETERIZED_DATA_TYPE = "RESERVED_PARAMETERIZED_DATA_TYPE", e.RESERVED_KEYWORD = "RESERVED_KEYWORD", e.RESERVED_FUNCTION_NAME = "RESERVED_FUNCTION_NAME", e.RESERVED_KEYWORD_PHRASE = "RESERVED_KEYWORD_PHRASE", e.RESERVED_DATA_TYPE_PHRASE = "RESERVED_DATA_TYPE_PHRASE", e.RESERVED_SET_OPERATION = "RESERVED_SET_OPERATION", e.RESERVED_CLAUSE = "RESERVED_CLAUSE", e.RESERVED_SELECT = "RESERVED_SELECT", e.RESERVED_JOIN = "RESERVED_JOIN", e.ARRAY_IDENTIFIER = "ARRAY_IDENTIFIER", e.ARRAY_KEYWORD = "ARRAY_KEYWORD", e.CASE = "CASE", e.END = "END", e.WHEN = "WHEN", e.ELSE = "ELSE", e.THEN = "THEN", e.LIMIT = "LIMIT", e.BETWEEN = "BETWEEN", e.AND = "AND", e.OR = "OR", e.XOR = "XOR", e.OPERATOR = "OPERATOR", e.COMMA = "COMMA", e.ASTERISK = "ASTERISK", e.PROPERTY_ACCESS_OPERATOR = "PROPERTY_ACCESS_OPERATOR", e.OPEN_PAREN = "OPEN_PAREN", e.CLOSE_PAREN = "CLOSE_PAREN", e.LINE_COMMENT = "LINE_COMMENT", e.BLOCK_COMMENT = "BLOCK_COMMENT", e.DISABLE_COMMENT = "DISABLE_COMMENT", e.NUMBER = "NUMBER", e.NAMED_PARAMETER = "NAMED_PARAMETER", e.QUOTED_PARAMETER = "QUOTED_PARAMETER", e.NUMBERED_PARAMETER = "NUMBERED_PARAMETER", e.POSITIONAL_PARAMETER = "POSITIONAL_PARAMETER", e.CUSTOM_PARAMETER = "CUSTOM_PARAMETER", e.DELIMITER = "DELIMITER", e.EOF = "EOF";
 })(D = D || (D = {}));
-const FT = (e) => ({
+const pT = (e) => ({
   type: D.EOF,
   raw: "«EOF»",
   text: "«EOF»",
   start: e
-}), v = FT(1 / 0), w = (e) => (E) => E.type === e.type && E.text === e.text, y = {
+}), v = pT(1 / 0), w = (e) => (E) => E.type === e.type && E.text === e.text, y = {
   ARRAY: w({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
   BY: w({ text: "BY", type: D.RESERVED_KEYWORD }),
   SET: w({ text: "SET", type: D.RESERVED_CLAUSE }),
   STRUCT: w({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
   WINDOW: w({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
   VALUES: w({ text: "VALUES", type: D.RESERVED_CLAUSE })
-}, YT = (e) => e === D.RESERVED_DATA_TYPE || e === D.RESERVED_KEYWORD || e === D.RESERVED_FUNCTION_NAME || e === D.RESERVED_KEYWORD_PHRASE || e === D.RESERVED_DATA_TYPE_PHRASE || e === D.RESERVED_CLAUSE || e === D.RESERVED_SELECT || e === D.RESERVED_SET_OPERATION || e === D.RESERVED_JOIN || e === D.ARRAY_KEYWORD || e === D.CASE || e === D.END || e === D.WHEN || e === D.ELSE || e === D.THEN || e === D.LIMIT || e === D.BETWEEN || e === D.AND || e === D.OR || e === D.XOR, me = (e) => e === D.AND || e === D.OR || e === D.XOR, pe = [
+}, FT = (e) => e === D.RESERVED_DATA_TYPE || e === D.RESERVED_KEYWORD || e === D.RESERVED_FUNCTION_NAME || e === D.RESERVED_KEYWORD_PHRASE || e === D.RESERVED_DATA_TYPE_PHRASE || e === D.RESERVED_CLAUSE || e === D.RESERVED_SELECT || e === D.RESERVED_SET_OPERATION || e === D.RESERVED_JOIN || e === D.ARRAY_KEYWORD || e === D.CASE || e === D.END || e === D.WHEN || e === D.ELSE || e === D.THEN || e === D.LIMIT || e === D.BETWEEN || e === D.AND || e === D.OR || e === D.XOR, me = (e) => e === D.AND || e === D.OR || e === D.XOR, de = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -3508,7 +3508,7 @@ const FT = (e) => ({
   // pivot
   "PIVOT",
   "UNPIVOT"
-], Fe = [
+], pe = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/lexical#reserved_keywords
   "ALL",
   "AND",
@@ -3616,7 +3616,7 @@ const FT = (e) => ({
   "CASCADE",
   "RESTRICT",
   "DETERMINISTIC"
-], Ye = [
+], Fe = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types
   "ARRAY",
   "BOOL",
@@ -3641,7 +3641,7 @@ const FT = (e) => ({
   "STRUCT",
   "TIME",
   "TIMEZONE"
-], he = n(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), fe = n([
+], Ye = r(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), he = r([
   // Queries: https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax
   "WITH [RECURSIVE]",
   "FROM",
@@ -3670,9 +3670,9 @@ const FT = (e) => ({
   "WITH CONNECTION",
   "WITH PARTITION COLUMNS",
   "REMOTE WITH CONNECTION"
-]), qE = n([
+]), jE = r([
   "CREATE [OR REPLACE] [TEMP|TEMPORARY|SNAPSHOT|EXTERNAL] TABLE [IF NOT EXISTS]"
-]), rE = n([
+]), nE = r([
   // - create:
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -3760,15 +3760,15 @@ const FT = (e) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), Ve = n([
+]), fe = r([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), We = n([
+]), Ve = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), be = n([
+]), We = r([
   // 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
@@ -3779,18 +3779,18 @@ const FT = (e) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), Xe = n([]), ye = {
+]), be = r([]), Xe = {
   name: "bigquery",
   tokenizerOptions: {
-    reservedSelect: he,
-    reservedClauses: [...fe, ...rE, ...qE],
-    reservedSetOperations: Ve,
-    reservedJoins: We,
-    reservedKeywordPhrases: be,
-    reservedDataTypePhrases: Xe,
-    reservedKeywords: Fe,
-    reservedDataTypes: Ye,
-    reservedFunctionNames: pe,
+    reservedSelect: Ye,
+    reservedClauses: [...he, ...nE, ...jE],
+    reservedSetOperations: fe,
+    reservedJoins: Ve,
+    reservedKeywordPhrases: We,
+    reservedDataTypePhrases: be,
+    reservedKeywords: pe,
+    reservedDataTypes: Fe,
+    reservedFunctionNames: de,
     extraParens: ["[]"],
     stringTypes: [
       // The triple-quoted strings are listed first, so they get matched first.
@@ -3808,31 +3808,31 @@ const FT = (e) => ({
     variableTypes: [{ regex: String.raw`@@\w+` }],
     lineCommentTypes: ["--", "#"],
     operators: ["&", "|", "^", "~", ">>", "<<", "||", "=>"],
-    postProcess: ge
+    postProcess: ye
   },
   formatOptions: {
-    onelineClauses: [...qE, ...rE],
-    tabularOnelineClauses: rE
+    onelineClauses: [...jE, ...nE],
+    tabularOnelineClauses: nE
   }
 };
-function ge(e) {
-  return Ke($e(e));
+function ye(e) {
+  return ge(Ke(e));
 }
-function Ke(e) {
+function ge(e) {
   let E = v;
   return e.map((T) => T.text === "OFFSET" && E.text === "[" ? (E = T, Object.assign(Object.assign({}, T), { type: D.RESERVED_FUNCTION_NAME })) : (E = T, T));
 }
-function $e(e) {
+function Ke(e) {
   var E;
   const T = [];
   for (let R = 0; R < e.length; R++) {
     const A = e[R];
     if ((y.ARRAY(A) || y.STRUCT(A)) && ((E = e[R + 1]) === null || E === void 0 ? void 0 : E.text) === "<") {
-      const S = we(e, R + 1), I = e.slice(R, S + 1);
+      const S = $e(e, R + 1), I = e.slice(R, S + 1);
       T.push({
         type: D.IDENTIFIER,
-        raw: I.map(kE("raw")).join(""),
-        text: I.map(kE("text")).join(""),
+        raw: I.map(qE("raw")).join(""),
+        text: I.map(qE("text")).join(""),
         start: A.start
       }), R = S;
     } else
@@ -3840,8 +3840,8 @@ function $e(e) {
   }
   return T;
 }
-const kE = (e) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[e] + " " : E[e];
-function we(e, E) {
+const qE = (e) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[e] + " " : E[e];
+function $e(e, E) {
   let T = 0;
   for (let R = E; R < e.length; R++) {
     const A = e[R];
@@ -3850,7 +3850,7 @@ function we(e, E) {
   }
   return e.length - 1;
 }
-const Je = [
+const we = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=bif-aggregate-functions
   "ARRAY_AGG",
   "AVG",
@@ -4170,7 +4170,7 @@ const Je = [
   "RATIO_TO_REPORT",
   // Type casting
   "CAST"
-], xe = [
+], Je = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=sql-reserved-schema-names-reserved-words
   "ACTIVATE",
   "ADD",
@@ -4571,7 +4571,7 @@ const Je = [
   "XMLNAMESPACES",
   "YEAR",
   "YEARS"
-], ve = [
+], xe = [
   // https://www.ibm.com/docs/en/db2-for-zos/12?topic=columns-data-types
   "ARRAY",
   "BIGINT",
@@ -4613,7 +4613,7 @@ const Je = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], Qe = n(["SELECT [ALL | DISTINCT]"]), Ze = n([
+], ve = r(["SELECT [ALL | DISTINCT]"]), Qe = r([
   // queries
   "WITH",
   "FROM",
@@ -4642,9 +4642,9 @@ const Je = [
   "WHEN [NOT] MATCHED [THEN]",
   "UPDATE SET",
   "INSERT"
-]), zE = n([
+]), kE = r([
   "CREATE [GLOBAL TEMPORARY | EXTERNAL] TABLE [IF NOT EXISTS]"
-]), nE = n([
+]), rE = r([
   // - create:
   "CREATE [OR REPLACE] VIEW",
   // - update:
@@ -4847,27 +4847,27 @@ const Je = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), je = n(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), qe = n([
+]), Ze = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), je = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), ke = n([
+]), qe = r([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), ze = n([]), ER = {
+]), ke = r([]), ze = {
   name: "db2",
   tokenizerOptions: {
-    reservedSelect: Qe,
-    reservedClauses: [...Ze, ...zE, ...nE],
-    reservedSetOperations: je,
-    reservedJoins: qe,
-    reservedKeywordPhrases: ke,
-    reservedDataTypePhrases: ze,
-    reservedKeywords: xe,
-    reservedDataTypes: ve,
-    reservedFunctionNames: Je,
+    reservedSelect: ve,
+    reservedClauses: [...Qe, ...kE, ...rE],
+    reservedSetOperations: Ze,
+    reservedJoins: je,
+    reservedKeywordPhrases: qe,
+    reservedDataTypePhrases: ke,
+    reservedKeywords: Je,
+    reservedDataTypes: xe,
+    reservedFunctionNames: we,
     extraParens: ["[]"],
     stringTypes: [
       { quote: "''-qq", prefixes: ["G", "N", "U&"] },
@@ -4898,10 +4898,10 @@ const Je = [
     ]
   },
   formatOptions: {
-    onelineClauses: [...zE, ...nE],
-    tabularOnelineClauses: nE
+    onelineClauses: [...kE, ...rE],
+    tabularOnelineClauses: rE
   }
-}, TR = [
+}, ER = [
   // 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",
@@ -5235,7 +5235,7 @@ const Je = [
   "ROW_NUMBER",
   // Type casting
   "CAST"
-], eR = [
+], TR = [
   // 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.
@@ -5731,7 +5731,7 @@ const Je = [
   "YEARS",
   "YES",
   "ZONE"
-], RR = [
+], eR = [
   // https://www.ibm.com/docs/en/i/7.2?topic=iaodsd-odbc-data-types-how-they-correspond-db2-i-database-types
   "ARRAY",
   "BIGINT",
@@ -5767,7 +5767,7 @@ const Je = [
   "VARCHAR",
   "VARGRAPHIC",
   "XML"
-], AR = n(["SELECT [ALL | DISTINCT]"]), SR = n([
+], RR = r(["SELECT [ALL | DISTINCT]"]), AR = r([
   // queries
   "WITH [RECURSIVE]",
   "INTO",
@@ -5797,7 +5797,7 @@ const Je = [
   "INSERT",
   // Data definition - table
   "FOR SYSTEM NAME"
-]), ET = n(["CREATE [OR REPLACE] TABLE"]), _E = n([
+]), zE = r(["CREATE [OR REPLACE] TABLE"]), _E = r([
   // - create:
   "CREATE [OR REPLACE] [RECURSIVE] VIEW",
   // - update:
@@ -5893,28 +5893,28 @@ const Je = [
   "TAG",
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}"
-]), IR = n(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), NR = n([
+]), SR = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), IR = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "[LEFT | RIGHT] EXCEPTION JOIN",
   "{INNER | CROSS} JOIN"
-]), tR = n([
+]), NR = r([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), sR = n([]), CR = {
+]), tR = r([]), sR = {
   name: "db2i",
   tokenizerOptions: {
-    reservedSelect: AR,
-    reservedClauses: [...SR, ...ET, ..._E],
-    reservedSetOperations: IR,
-    reservedJoins: NR,
-    reservedKeywordPhrases: tR,
-    reservedDataTypePhrases: sR,
-    reservedKeywords: eR,
-    reservedDataTypes: RR,
-    reservedFunctionNames: TR,
+    reservedSelect: RR,
+    reservedClauses: [...AR, ...zE, ..._E],
+    reservedSetOperations: SR,
+    reservedJoins: IR,
+    reservedKeywordPhrases: NR,
+    reservedDataTypePhrases: tR,
+    reservedKeywords: TR,
+    reservedDataTypes: eR,
+    reservedFunctionNames: ER,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     stringTypes: [
@@ -5928,10 +5928,10 @@ const Je = [
     operators: ["**", "¬=", "¬>", "¬<", "!>", "!<", "||", "=>"]
   },
   formatOptions: {
-    onelineClauses: [...ET, ..._E],
+    onelineClauses: [...zE, ..._E],
     tabularOnelineClauses: _E
   }
-}, LR = [
+}, CR = [
   // Functions from DuckDB (excluding those that start with an underscore):
   // SELECT DISTINCT upper(function_name) AS function_name
   // FROM duckdb_functions()
@@ -6594,7 +6594,7 @@ const Je = [
   // 'NULL', we really prefer treating it as keyword
   "RANK",
   "ROW_NUMBER"
-], rR = [
+], LR = [
   // Keywords from DuckDB:
   // SELECT upper(keyword_name)
   // FROM duckdb_keywords()
@@ -6756,7 +6756,7 @@ const Je = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], _R = n(["SELECT [ALL | DISTINCT]"]), iR = n([
+], rR = r(["SELECT [ALL | DISTINCT]"]), _R = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -6780,9 +6780,9 @@ const Je = [
   "SET",
   // other:
   "RETURNING"
-]), TT = n([
+]), ET = r([
   "CREATE [OR REPLACE] [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"
-]), iE = n([
+]), iE = r([
   // TABLE
   // - update:
   "UPDATE",
@@ -6860,11 +6860,11 @@ const Je = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), aR = n([
+]), iR = r([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
-]), oR = n([
+]), aR = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -6873,23 +6873,23 @@ const Je = [
   "POSITIONAL JOIN",
   "ANTI JOIN",
   "SEMI JOIN"
-]), DR = n([
+]), oR = r([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "SIMILAR TO",
   "IS [NOT] DISTINCT FROM"
-]), PR = n(["TIMESTAMP WITH TIME ZONE"]), MR = {
+]), DR = r(["TIMESTAMP WITH TIME ZONE"]), PR = {
   name: "duckdb",
   tokenizerOptions: {
-    reservedSelect: _R,
-    reservedClauses: [...iR, ...TT, ...iE],
-    reservedSetOperations: aR,
-    reservedJoins: oR,
-    reservedKeywordPhrases: DR,
-    reservedDataTypePhrases: PR,
+    reservedSelect: rR,
+    reservedClauses: [..._R, ...ET, ...iE],
+    reservedSetOperations: iR,
+    reservedJoins: aR,
+    reservedKeywordPhrases: oR,
+    reservedDataTypePhrases: DR,
     supportsXor: !0,
-    reservedKeywords: rR,
+    reservedKeywords: LR,
     reservedDataTypes: nR,
-    reservedFunctionNames: LR,
+    reservedFunctionNames: CR,
     nestedBlockComments: !0,
     extraParens: ["[]", "{}"],
     underscoresInNumbers: !0,
@@ -6950,10 +6950,10 @@ const Je = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...TT, ...iE],
+    onelineClauses: [...ET, ...iE],
     tabularOnelineClauses: iE
   }
-}, UR = [
+}, MR = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF
   // math
   "ABS",
@@ -7161,7 +7161,7 @@ const Je = [
   "CUME_DIST",
   "PERCENT_RANK",
   "NTILE"
-], cR = [
+], UR = [
   // 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",
@@ -7476,7 +7476,7 @@ const Je = [
   "JSONFILE",
   "INPUTFORMAT",
   "OUTPUTFORMAT"
-], lR = [
+], cR = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types
   "ARRAY",
   "BIGINT",
@@ -7497,7 +7497,7 @@ const Je = [
   "STRUCT",
   "TIMESTAMP",
   "VARCHAR"
-], uR = n(["SELECT [ALL | DISTINCT]"]), GR = n([
+], lR = r(["SELECT [ALL | DISTINCT]"]), uR = r([
   // queries
   "WITH",
   "FROM",
@@ -7531,9 +7531,9 @@ const Je = [
   //   https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML#LanguageManualDML-Loadingfilesintotables
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), eT = n([
+]), TT = r([
   "CREATE [TEMPORARY] [EXTERNAL] TABLE [IF NOT EXISTS]"
-]), aE = n([
+]), aE = r([
   // - create:
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
   // - update:
@@ -7558,24 +7558,24 @@ const Je = [
   "STORED AS",
   "STORED BY",
   "ROW FORMAT"
-]), HR = n(["UNION [ALL | DISTINCT]"]), BR = n([
+]), GR = r(["UNION [ALL | DISTINCT]"]), HR = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "LEFT SEMI JOIN"
-]), dR = n(["{ROWS | RANGE} BETWEEN"]), mR = n([]), pR = {
+]), BR = r(["{ROWS | RANGE} BETWEEN"]), mR = r([]), dR = {
   name: "hive",
   tokenizerOptions: {
-    reservedSelect: uR,
-    reservedClauses: [...GR, ...eT, ...aE],
-    reservedSetOperations: HR,
-    reservedJoins: BR,
-    reservedKeywordPhrases: dR,
+    reservedSelect: lR,
+    reservedClauses: [...uR, ...TT, ...aE],
+    reservedSetOperations: GR,
+    reservedJoins: HR,
+    reservedKeywordPhrases: BR,
     reservedDataTypePhrases: mR,
-    reservedKeywords: cR,
-    reservedDataTypes: lR,
-    reservedFunctionNames: UR,
+    reservedKeywords: UR,
+    reservedDataTypes: cR,
+    reservedFunctionNames: MR,
     extraParens: ["[]"],
     stringTypes: ['""-bs', "''-bs"],
     identTypes: ["``"],
@@ -7583,7 +7583,7 @@ const Je = [
     operators: ["%", "~", "^", "|", "&", "<=>", "==", "!", "||"]
   },
   formatOptions: {
-    onelineClauses: [...eT, ...aE],
+    onelineClauses: [...TT, ...aE],
     tabularOnelineClauses: aE
   }
 };
@@ -7596,7 +7596,7 @@ function RE(e) {
     return y.VALUES(E) && A.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
   });
 }
-const FR = [
+const pR = [
   // https://mariadb.com/kb/en/reserved-words/
   "ACCESSIBLE",
   "ADD",
@@ -7813,7 +7813,7 @@ const FR = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], YR = [
+], FR = [
   // https://mariadb.com/kb/en/data-types/
   "BIGINT",
   "BINARY",
@@ -7864,7 +7864,7 @@ const FR = [
   "YEAR"
   // 'NUMBER', // ?? In oracle mode only
   // 'SET' // handled as special-case in postProcess
-], hR = [
+], YR = [
   // https://mariadb.com/kb/en/information-schema-sql_functions-table/
   "ADDDATE",
   "ADD_MONTHS",
@@ -8102,7 +8102,7 @@ const FR = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], fR = n(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), VR = n([
+], hR = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), fR = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8124,9 +8124,9 @@ const FR = [
   "SET",
   // other
   "RETURNING"
-]), RT = n([
+]), eT = r([
   "CREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]"
-]), oE = n([
+]), oE = r([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -8333,12 +8333,12 @@ const FR = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), WR = n([
+]), VR = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]",
   "MINUS [ALL | DISTINCT]"
-]), bR = n([
+]), WR = r([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8346,24 +8346,24 @@ const FR = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), XR = n([
+]), bR = r([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), yR = n([]), gR = {
+]), XR = r([]), yR = {
   name: "mariadb",
   tokenizerOptions: {
-    reservedSelect: fR,
-    reservedClauses: [...VR, ...RT, ...oE],
-    reservedSetOperations: WR,
-    reservedJoins: bR,
-    reservedKeywordPhrases: XR,
-    reservedDataTypePhrases: yR,
+    reservedSelect: hR,
+    reservedClauses: [...fR, ...eT, ...oE],
+    reservedSetOperations: VR,
+    reservedJoins: WR,
+    reservedKeywordPhrases: bR,
+    reservedDataTypePhrases: XR,
     supportsXor: !0,
-    reservedKeywords: FR,
-    reservedDataTypes: YR,
-    reservedFunctionNames: hR,
+    reservedKeywords: pR,
+    reservedDataTypes: FR,
+    reservedFunctionNames: YR,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -8399,10 +8399,10 @@ const FR = [
     postProcess: RE
   },
   formatOptions: {
-    onelineClauses: [...RT, ...oE],
+    onelineClauses: [...eT, ...oE],
     tabularOnelineClauses: oE
   }
-}, KR = [
+}, gR = [
   // https://dev.mysql.com/doc/refman/8.0/en/keywords.html
   "ACCESSIBLE",
   "ADD",
@@ -8633,7 +8633,7 @@ const FR = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], $R = [
+], KR = [
   // https://dev.mysql.com/doc/refman/8.0/en/data-types.html
   "BIGINT",
   "BINARY",
@@ -8685,7 +8685,7 @@ const FR = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], wR = [
+], $R = [
   // https://dev.mysql.com/doc/refman/8.0/en/built-in-function-reference.html
   "ABS",
   "ACOS",
@@ -9108,7 +9108,7 @@ const FR = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], JR = n(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), xR = n([
+], wR = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), JR = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -9128,7 +9128,7 @@ const FR = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), AT = n(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), DE = n([
+]), RT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), DE = r([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -9309,7 +9309,7 @@ const FR = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), vR = n(["UNION [ALL | DISTINCT]"]), QR = n([
+]), xR = r(["UNION [ALL | DISTINCT]"]), vR = r([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -9317,24 +9317,24 @@ const FR = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), ZR = n([
+]), QR = r([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), jR = n([]), qR = {
+]), ZR = r([]), jR = {
   name: "mysql",
   tokenizerOptions: {
-    reservedSelect: JR,
-    reservedClauses: [...xR, ...AT, ...DE],
-    reservedSetOperations: vR,
-    reservedJoins: QR,
-    reservedKeywordPhrases: ZR,
-    reservedDataTypePhrases: jR,
+    reservedSelect: wR,
+    reservedClauses: [...JR, ...RT, ...DE],
+    reservedSetOperations: xR,
+    reservedJoins: vR,
+    reservedKeywordPhrases: QR,
+    reservedDataTypePhrases: ZR,
     supportsXor: !0,
-    reservedKeywords: KR,
-    reservedDataTypes: $R,
-    reservedFunctionNames: wR,
+    reservedKeywords: gR,
+    reservedDataTypes: KR,
+    reservedFunctionNames: $R,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -9372,10 +9372,10 @@ const FR = [
     postProcess: RE
   },
   formatOptions: {
-    onelineClauses: [...AT, ...DE],
+    onelineClauses: [...RT, ...DE],
     tabularOnelineClauses: DE
   }
-}, kR = [
+}, qR = [
   // https://docs.pingcap.com/tidb/stable/keywords
   "ADD",
   "ALL",
@@ -9567,7 +9567,7 @@ const FR = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], zR = [
+], kR = [
   // https://docs.pingcap.com/tidb/stable/data-type-overview
   "BIGINT",
   "BINARY",
@@ -9614,7 +9614,7 @@ const FR = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], EA = [
+], zR = [
   // 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
@@ -9940,7 +9940,7 @@ const FR = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], TA = n(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), eA = n([
+], EA = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), TA = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -9960,7 +9960,7 @@ const FR = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), ST = n(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), PE = n([
+]), AT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), PE = r([
   // 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
@@ -10075,7 +10075,7 @@ const FR = [
   "UNLOCK TABLES",
   // https://docs.pingcap.com/tidb/stable/sql-statement-use
   "USE"
-]), RA = n(["UNION [ALL | DISTINCT]"]), AA = n([
+]), eA = r(["UNION [ALL | DISTINCT]"]), RA = r([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10083,24 +10083,24 @@ const FR = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), SA = n([
+]), AA = r([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), IA = n([]), OA = {
+]), SA = r([]), IA = {
   name: "tidb",
   tokenizerOptions: {
-    reservedSelect: TA,
-    reservedClauses: [...eA, ...ST, ...PE],
-    reservedSetOperations: RA,
-    reservedJoins: AA,
-    reservedKeywordPhrases: SA,
-    reservedDataTypePhrases: IA,
+    reservedSelect: EA,
+    reservedClauses: [...TA, ...AT, ...PE],
+    reservedSetOperations: eA,
+    reservedJoins: RA,
+    reservedKeywordPhrases: AA,
+    reservedDataTypePhrases: SA,
     supportsXor: !0,
-    reservedKeywords: kR,
-    reservedDataTypes: zR,
-    reservedFunctionNames: EA,
+    reservedKeywords: qR,
+    reservedDataTypes: kR,
+    reservedFunctionNames: zR,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -10138,10 +10138,10 @@ const FR = [
     postProcess: RE
   },
   formatOptions: {
-    onelineClauses: [...ST, ...PE],
+    onelineClauses: [...AT, ...PE],
     tabularOnelineClauses: PE
   }
-}, NA = [
+}, OA = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/functions.html
   "ABORT",
   "ABS",
@@ -10371,7 +10371,7 @@ const FR = [
   // 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"
-], tA = [
+], NA = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/reservedwords.html
   "ADVISE",
   "ALL",
@@ -10577,7 +10577,7 @@ const FR = [
   "WITHIN",
   "WORK",
   "XOR"
-], sA = [
+], tA = [
   // N1QL does not support any way of declaring types for columns.
   // It does not support the CREATE TABLE statement nor the CAST() expression.
   //
@@ -10586,7 +10586,7 @@ const FR = [
   // which it actually doesn't use.
   //
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/datatypes.html
-], CA = n(["SELECT [ALL | DISTINCT]"]), LA = n([
+], sA = r(["SELECT [ALL | DISTINCT]"]), CA = r([
   // queries
   "WITH",
   "FROM",
@@ -10613,7 +10613,7 @@ const FR = [
   "NEST",
   "UNNEST",
   "RETURNING"
-]), IT = n([
+]), ST = r([
   // - update:
   "UPDATE",
   // - delete:
@@ -10653,19 +10653,19 @@ const FR = [
   "SET CURRENT SCHEMA",
   "SHOW",
   "USE [PRIMARY] KEYS"
-]), rA = n(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), nA = n(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), _A = n(["{ROWS | RANGE | GROUPS} BETWEEN"]), iA = n([]), aA = {
+]), LA = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), nA = r(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), rA = r(["{ROWS | RANGE | GROUPS} BETWEEN"]), _A = r([]), iA = {
   name: "n1ql",
   tokenizerOptions: {
-    reservedSelect: CA,
-    reservedClauses: [...LA, ...IT],
-    reservedSetOperations: rA,
+    reservedSelect: sA,
+    reservedClauses: [...CA, ...ST],
+    reservedSetOperations: LA,
     reservedJoins: nA,
-    reservedKeywordPhrases: _A,
-    reservedDataTypePhrases: iA,
+    reservedKeywordPhrases: rA,
+    reservedDataTypePhrases: _A,
     supportsXor: !0,
-    reservedKeywords: tA,
-    reservedDataTypes: sA,
-    reservedFunctionNames: NA,
+    reservedKeywords: NA,
+    reservedDataTypes: tA,
+    reservedFunctionNames: OA,
     // 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.
@@ -10677,9 +10677,9 @@ const FR = [
     operators: ["%", "==", ":", "||"]
   },
   formatOptions: {
-    onelineClauses: IT
+    onelineClauses: ST
   }
-}, oA = [
+}, aA = [
   // https://docs.oracle.com/cd/B19306_01/appdev.102/b14261/reservewords.htm
   // 'A',
   "ADD",
@@ -10984,7 +10984,7 @@ const FR = [
   "WRITE",
   "YEAR",
   "ZONE"
-], DA = [
+], oA = [
   // https://www.ibm.com/docs/en/db2/10.5?topic=plsql-data-types
   "ARRAY",
   "BFILE_BASE",
@@ -11022,7 +11022,7 @@ const FR = [
   "UROWID",
   "VARCHAR",
   "VARCHAR2"
-], PA = [
+], DA = [
   // https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions001.htm
   // numeric
   "ABS",
@@ -11287,7 +11287,7 @@ const FR = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], MA = n(["SELECT [ALL | DISTINCT | UNIQUE]"]), UA = n([
+], PA = r(["SELECT [ALL | DISTINCT | UNIQUE]"]), MA = r([
   // queries
   "WITH",
   "FROM",
@@ -11311,9 +11311,9 @@ const FR = [
   "UPDATE SET",
   // other
   "RETURNING"
-]), OT = n([
+]), IT = r([
   "CREATE [GLOBAL TEMPORARY | PRIVATE TEMPORARY | SHARDED | DUPLICATED | IMMUTABLE BLOCKCHAIN | BLOCKCHAIN | IMMUTABLE] TABLE"
-]), ME = n([
+]), ME = r([
   // - create:
   "CREATE [OR REPLACE] [NO FORCE | FORCE] [EDITIONING | EDITIONABLE | EDITIONABLE EDITIONING | NONEDITIONABLE] VIEW",
   "CREATE MATERIALIZED VIEW",
@@ -11341,7 +11341,7 @@ const FR = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), cA = n(["UNION [ALL]", "MINUS", "INTERSECT"]), lA = n([
+]), UA = r(["UNION [ALL]", "MINUS", "INTERSECT"]), cA = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -11349,23 +11349,23 @@ const FR = [
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), uA = n([
+]), lA = r([
   "ON {UPDATE | DELETE} [SET NULL]",
   "ON COMMIT",
   "{ROWS | RANGE} BETWEEN"
-]), GA = n([]), HA = {
+]), uA = r([]), GA = {
   name: "plsql",
   tokenizerOptions: {
-    reservedSelect: MA,
-    reservedClauses: [...UA, ...OT, ...ME],
-    reservedSetOperations: cA,
-    reservedJoins: lA,
-    reservedKeywordPhrases: uA,
-    reservedDataTypePhrases: GA,
+    reservedSelect: PA,
+    reservedClauses: [...MA, ...IT, ...ME],
+    reservedSetOperations: UA,
+    reservedJoins: cA,
+    reservedKeywordPhrases: lA,
+    reservedDataTypePhrases: uA,
     supportsXor: !0,
-    reservedKeywords: oA,
-    reservedDataTypes: DA,
-    reservedFunctionNames: PA,
+    reservedKeywords: aA,
+    reservedDataTypes: oA,
+    reservedFunctionNames: DA,
     stringTypes: [
       { quote: "''-qq", prefixes: ["N"] },
       { quote: "q''", prefixes: ["N"] }
@@ -11390,19 +11390,19 @@ const FR = [
       "@",
       "||"
     ],
-    postProcess: BA
+    postProcess: HA
   },
   formatOptions: {
     alwaysDenseOperators: ["@"],
-    onelineClauses: [...OT, ...ME],
+    onelineClauses: [...IT, ...ME],
     tabularOnelineClauses: ME
   }
 };
-function BA(e) {
+function HA(e) {
   let E = v;
-  return e.map((T) => y.SET(T) && y.BY(E) ? Object.assign(Object.assign({}, T), { type: D.RESERVED_KEYWORD }) : (YT(T.type) && (E = T), T));
+  return e.map((T) => y.SET(T) && y.BY(E) ? Object.assign(Object.assign({}, T), { type: D.RESERVED_KEYWORD }) : (FT(T.type) && (E = T), T));
 }
-const dA = [
+const BA = [
   // https://www.postgresql.org/docs/14/functions.html
   //
   // https://www.postgresql.org/docs/14/functions-math.html
@@ -12209,7 +12209,7 @@ const dA = [
   "WITHOUT",
   "YEAR"
   // requires AS
-], pA = [
+], dA = [
   // https://www.postgresql.org/docs/current/datatype.html
   "ARRAY",
   "BIGINT",
@@ -12243,7 +12243,7 @@ const dA = [
   "VARCHAR",
   "XML",
   "ZONE"
-], FA = n(["SELECT [ALL | DISTINCT]"]), YA = n([
+], pA = r(["SELECT [ALL | DISTINCT]"]), FA = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12266,9 +12266,9 @@ const dA = [
   "SET",
   // other
   "RETURNING"
-]), NT = n([
+]), OT = r([
   "CREATE [GLOBAL | LOCAL] [TEMPORARY | TEMP | UNLOGGED] TABLE [IF NOT EXISTS]"
-]), UE = n([
+]), UE = r([
   // - create
   "CREATE [OR REPLACE] [TEMP | TEMPORARY] [RECURSIVE] VIEW",
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -12467,17 +12467,17 @@ const dA = [
   "START TRANSACTION",
   "UNLISTEN",
   "VACUUM"
-]), hA = n([
+]), YA = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), fA = n([
+]), hA = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), VA = n([
+]), fA = r([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
@@ -12488,21 +12488,21 @@ const dA = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), WA = n([
+]), VA = r([
   // https://www.postgresql.org/docs/current/datatype-datetime.html
   "[TIMESTAMP | TIME] {WITH | WITHOUT} TIME ZONE"
-]), bA = {
+]), WA = {
   name: "postgresql",
   tokenizerOptions: {
-    reservedSelect: FA,
-    reservedClauses: [...YA, ...NT, ...UE],
-    reservedSetOperations: hA,
-    reservedJoins: fA,
-    reservedKeywordPhrases: VA,
-    reservedDataTypePhrases: WA,
+    reservedSelect: pA,
+    reservedClauses: [...FA, ...OT, ...UE],
+    reservedSetOperations: YA,
+    reservedJoins: hA,
+    reservedKeywordPhrases: fA,
+    reservedDataTypePhrases: VA,
     reservedKeywords: mA,
-    reservedDataTypes: pA,
-    reservedFunctionNames: dA,
+    reservedDataTypes: dA,
+    reservedFunctionNames: BA,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     underscoresInNumbers: !0,
@@ -12614,10 +12614,10 @@ const dA = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::", ":"],
-    onelineClauses: [...NT, ...UE],
+    onelineClauses: [...OT, ...UE],
     tabularOnelineClauses: UE
   }
-}, XA = [
+}, bA = [
   // https://docs.aws.amazon.com/redshift/latest/dg/c_Aggregate_Functions.html
   "ANY_VALUE",
   "APPROXIMATE PERCENTILE_DISC",
@@ -12963,7 +12963,7 @@ const dA = [
   "SLICE_NUM",
   "USER",
   "VERSION"
-], yA = [
+], XA = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_pg_keywords.html
   "AES128",
   "AES256",
@@ -13152,7 +13152,7 @@ const dA = [
    * SVL: https://docs.aws.amazon.com/redshift/latest/dg/svl_views.html
    * SVV: https://docs.aws.amazon.com/redshift/latest/dg/svv_views.html
    */
-], gA = [
+], yA = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_Character_types.html#r_Character_types-text-and-bpchar-types
   "ARRAY",
   "BIGINT",
@@ -13173,7 +13173,7 @@ const dA = [
   "TEXT",
   "VARBYTE",
   "VARCHAR"
-], KA = n(["SELECT [ALL | DISTINCT]"]), $A = n([
+], gA = r(["SELECT [ALL | DISTINCT]"]), KA = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13191,9 +13191,9 @@ const dA = [
   "VALUES",
   // - update:
   "SET"
-]), tT = n([
+]), NT = r([
   "CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]"
-]), cE = n([
+]), cE = r([
   // - create:
   "CREATE [OR REPLACE | MATERIALIZED] VIEW",
   // - update:
@@ -13284,13 +13284,13 @@ const dA = [
   "START TRANSACTION",
   "UNLOAD",
   "VACUUM"
-]), wA = n(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), JA = n([
+]), $A = r(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), wA = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), xA = n([
+]), JA = r([
   // 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
@@ -13298,18 +13298,18 @@ const dA = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), vA = n([]), QA = {
+]), xA = r([]), vA = {
   name: "redshift",
   tokenizerOptions: {
-    reservedSelect: KA,
-    reservedClauses: [...$A, ...tT, ...cE],
-    reservedSetOperations: wA,
-    reservedJoins: JA,
-    reservedKeywordPhrases: xA,
-    reservedDataTypePhrases: vA,
-    reservedKeywords: yA,
-    reservedDataTypes: gA,
-    reservedFunctionNames: XA,
+    reservedSelect: gA,
+    reservedClauses: [...KA, ...NT, ...cE],
+    reservedSetOperations: $A,
+    reservedJoins: wA,
+    reservedKeywordPhrases: JA,
+    reservedDataTypePhrases: xA,
+    reservedKeywords: XA,
+    reservedDataTypes: yA,
+    reservedFunctionNames: bA,
     extraParens: ["[]"],
     stringTypes: ["''-qq"],
     identTypes: ['""-qq'],
@@ -13333,10 +13333,10 @@ const dA = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...tT, ...cE],
+    onelineClauses: [...NT, ...cE],
     tabularOnelineClauses: cE
   }
-}, ZA = [
+}, QA = [
   // https://deepkb.com/CO_000013/en/kb/IMPORT-fbfa59f0-2bf1-31fe-bb7b-0f9efe9932c6/spark-sql-keywords
   "ADD",
   "AFTER",
@@ -13603,7 +13603,7 @@ const dA = [
   "UNSIGNED",
   "VARIABLES",
   "YEAR_MONTH"
-], jA = [
+], ZA = [
   // https://spark.apache.org/docs/latest/sql-ref-datatypes.html
   "ARRAY",
   "BIGINT",
@@ -13633,7 +13633,7 @@ const dA = [
   "TINYINT",
   "VARCHAR"
   // No varchar type in Spark, only STRING. Added for the sake of tests
-], qA = [
+], jA = [
   // http://spark.apache.org/docs/latest/sql-ref-functions.html
   //
   // http://spark.apache.org/docs/latest/sql-ref-functions-builtin.html#aggregate-functions
@@ -13954,7 +13954,7 @@ const dA = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], kA = n(["SELECT [ALL | DISTINCT]"]), zA = n([
+], qA = r(["SELECT [ALL | DISTINCT]"]), kA = r([
   // queries
   "WITH",
   "FROM",
@@ -13979,7 +13979,7 @@ const dA = [
   //   https://spark.apache.org/docs/latest/sql-ref-syntax-dml-load.html
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), sT = n(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), lE = n([
+]), tT = r(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), lE = r([
   // - create:
   "CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]",
   // - drop table:
@@ -14035,11 +14035,11 @@ const dA = [
   "SHOW TBLPROPERTIES",
   "SHOW VIEWS",
   "UNCACHE TABLE"
-]), ES = n([
+]), zA = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), TS = n([
+]), ES = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -14048,24 +14048,24 @@ const dA = [
   // non-standard-joins
   "[LEFT] {ANTI | SEMI} JOIN",
   "NATURAL [LEFT] {ANTI | SEMI} JOIN"
-]), eS = n([
+]), TS = r([
   "ON DELETE",
   "ON UPDATE",
   "CURRENT ROW",
   "{ROWS | RANGE} BETWEEN"
-]), RS = n([]), AS = {
+]), eS = r([]), RS = {
   name: "spark",
   tokenizerOptions: {
-    reservedSelect: kA,
-    reservedClauses: [...zA, ...sT, ...lE],
-    reservedSetOperations: ES,
-    reservedJoins: TS,
-    reservedKeywordPhrases: eS,
-    reservedDataTypePhrases: RS,
+    reservedSelect: qA,
+    reservedClauses: [...kA, ...tT, ...lE],
+    reservedSetOperations: zA,
+    reservedJoins: ES,
+    reservedKeywordPhrases: TS,
+    reservedDataTypePhrases: eS,
     supportsXor: !0,
-    reservedKeywords: ZA,
-    reservedDataTypes: jA,
-    reservedFunctionNames: qA,
+    reservedKeywords: QA,
+    reservedDataTypes: ZA,
+    reservedFunctionNames: jA,
     extraParens: ["[]"],
     stringTypes: [
       "''-bs",
@@ -14077,20 +14077,20 @@ const dA = [
     identChars: { allowFirstCharNumber: !0 },
     variableTypes: [{ quote: "{}", prefixes: ["$"], requirePrefix: !0 }],
     operators: ["%", "~", "^", "|", "&", "<=>", "==", "!", "||", "->"],
-    postProcess: SS
+    postProcess: AS
   },
   formatOptions: {
-    onelineClauses: [...sT, ...lE],
+    onelineClauses: [...tT, ...lE],
     tabularOnelineClauses: lE
   }
 };
-function SS(e) {
+function AS(e) {
   return e.map((E, T) => {
     const R = e[T - 1] || v, A = e[T + 1] || v;
     return y.WINDOW(E) && A.type === D.OPEN_PAREN ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E.text === "ITEMS" && E.type === D.RESERVED_KEYWORD && !(R.text === "COLLECTION" && A.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: D.IDENTIFIER, text: E.raw }) : E;
   });
 }
-const IS = [
+const SS = [
   // https://www.sqlite.org/lang_corefunc.html
   "ABS",
   "CHANGES",
@@ -14214,7 +14214,7 @@ const IS = [
   "JSON_TREE",
   // cast
   "CAST"
-], OS = [
+], IS = [
   // 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.
@@ -14367,7 +14367,7 @@ const IS = [
   "WINDOW",
   "WITH",
   "WITHOUT"
-], NS = [
+], OS = [
   // 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.
@@ -14388,7 +14388,7 @@ const IS = [
   "TEXT",
   "VARCHAR",
   "VARYING CHARACTER"
-], tS = n(["SELECT [ALL | DISTINCT]"]), sS = n([
+], NS = r(["SELECT [ALL | DISTINCT]"]), tS = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14409,7 +14409,7 @@ const IS = [
   "SET",
   // other:
   "RETURNING"
-]), CT = n(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), uE = n([
+]), sT = r(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), uE = r([
   // - create:
   "CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]",
   // - update:
@@ -14428,28 +14428,28 @@ const IS = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), CS = n(["UNION [ALL]", "EXCEPT", "INTERSECT"]), LS = n([
+]), sS = r(["UNION [ALL]", "EXCEPT", "INTERSECT"]), CS = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), rS = n([
+]), LS = r([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
-]), nS = n([]), _S = {
+]), nS = r([]), rS = {
   name: "sqlite",
   tokenizerOptions: {
-    reservedSelect: tS,
-    reservedClauses: [...sS, ...CT, ...uE],
-    reservedSetOperations: CS,
-    reservedJoins: LS,
-    reservedKeywordPhrases: rS,
+    reservedSelect: NS,
+    reservedClauses: [...tS, ...sT, ...uE],
+    reservedSetOperations: sS,
+    reservedJoins: CS,
+    reservedKeywordPhrases: LS,
     reservedDataTypePhrases: nS,
-    reservedKeywords: OS,
-    reservedDataTypes: NS,
-    reservedFunctionNames: IS,
+    reservedKeywords: IS,
+    reservedDataTypes: OS,
+    reservedFunctionNames: SS,
     stringTypes: [
       "''-qq",
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -14462,10 +14462,10 @@ const IS = [
     operators: ["%", "~", "&", "|", "<<", ">>", "==", "->", "->>", "||"]
   },
   formatOptions: {
-    onelineClauses: [...CT, ...uE],
+    onelineClauses: [...sT, ...uE],
     tabularOnelineClauses: uE
   }
-}, iS = [
+}, _S = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_9_set_function_specification
   "GROUPING",
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_10_window_function
@@ -14562,7 +14562,7 @@ const IS = [
   "ASIN",
   "ACOS",
   "ATAN"
-], aS = [
+], iS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#reserved-word
   "ALL",
   "ALLOCATE",
@@ -14760,7 +14760,7 @@ const IS = [
   "WITHIN",
   "WITHOUT",
   "YEAR"
-], oS = [
+], aS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_1_data_type
   "ARRAY",
   "BIGINT",
@@ -14800,7 +14800,7 @@ const IS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], DS = n(["SELECT [ALL | DISTINCT]"]), PS = n([
+], oS = r(["SELECT [ALL | DISTINCT]"]), DS = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14819,7 +14819,7 @@ const IS = [
   "VALUES",
   // - update:
   "SET"
-]), LT = n(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), GE = n([
+]), CT = r(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), GE = r([
   // - create:
   "CREATE [RECURSIVE] VIEW",
   // - update:
@@ -14844,31 +14844,31 @@ const IS = [
   "TRUNCATE TABLE",
   // other
   "SET SCHEMA"
-]), MS = n([
+]), PS = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), US = n([
+]), MS = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), cS = n([
+]), US = r([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), lS = n([]), uS = {
+]), cS = r([]), lS = {
   name: "sql",
   tokenizerOptions: {
-    reservedSelect: DS,
-    reservedClauses: [...PS, ...LT, ...GE],
-    reservedSetOperations: MS,
-    reservedJoins: US,
-    reservedKeywordPhrases: cS,
-    reservedDataTypePhrases: lS,
-    reservedKeywords: aS,
-    reservedDataTypes: oS,
-    reservedFunctionNames: iS,
+    reservedSelect: oS,
+    reservedClauses: [...DS, ...CT, ...GE],
+    reservedSetOperations: PS,
+    reservedJoins: MS,
+    reservedKeywordPhrases: US,
+    reservedDataTypePhrases: cS,
+    reservedKeywords: iS,
+    reservedDataTypes: aS,
+    reservedFunctionNames: _S,
     stringTypes: [
       { quote: "''-qq-bs", prefixes: ["N", "U&"] },
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -14878,10 +14878,10 @@ const IS = [
     operators: ["||"]
   },
   formatOptions: {
-    onelineClauses: [...LT, ...GE],
+    onelineClauses: [...CT, ...GE],
     tabularOnelineClauses: GE
   }
-}, GS = [
+}, uS = [
   // 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
@@ -15315,7 +15315,7 @@ const IS = [
   "NEXT",
   "PERMUTE",
   "PREV"
-], HS = [
+], GS = [
   // https://github.com/trinodb/trino/blob/432d2897bdef99388c1a47188743a061c4ac1f34/core/trino-parser/src/main/antlr4/io/trino/sql/parser/SqlBase.g4#L858-L1128
   "ABSENT",
   "ADD",
@@ -15552,7 +15552,7 @@ const IS = [
   "WRAPPER",
   "WRITE",
   "ZONE"
-], BS = [
+], HS = [
   // 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",
@@ -15591,7 +15591,7 @@ const IS = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], dS = n(["SELECT [ALL | DISTINCT]"]), mS = n([
+], BS = r(["SELECT [ALL | DISTINCT]"]), mS = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -15619,7 +15619,7 @@ const IS = [
   "PATTERN",
   "SUBSET",
   "DEFINE"
-]), rT = n(["CREATE TABLE [IF NOT EXISTS]"]), HE = n([
+]), LT = r(["CREATE TABLE [IF NOT EXISTS]"]), HE = r([
   // - create:
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW",
   // - update:
@@ -15677,32 +15677,32 @@ const IS = [
   "SHOW ROLE GRANTS",
   "SHOW FUNCTIONS",
   "SHOW SESSION"
-]), pS = n([
+]), dS = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), FS = n([
+]), pS = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), YS = n([
+]), FS = r([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), hS = n([]), fS = {
+]), YS = r([]), hS = {
   name: "trino",
   tokenizerOptions: {
-    reservedSelect: dS,
-    reservedClauses: [...mS, ...rT, ...HE],
-    reservedSetOperations: pS,
-    reservedJoins: FS,
-    reservedKeywordPhrases: YS,
-    reservedDataTypePhrases: hS,
-    reservedKeywords: HS,
-    reservedDataTypes: BS,
-    reservedFunctionNames: GS,
+    reservedSelect: BS,
+    reservedClauses: [...mS, ...LT, ...HE],
+    reservedSetOperations: dS,
+    reservedJoins: pS,
+    reservedKeywordPhrases: FS,
+    reservedDataTypePhrases: YS,
+    reservedKeywords: GS,
+    reservedDataTypes: HS,
+    reservedFunctionNames: uS,
     // Trino also supports {- ... -} parenthesis.
     // The formatting of these currently works out as a result of { and -
     // not getting a space added in-between.
@@ -15731,10 +15731,10 @@ const IS = [
     ]
   },
   formatOptions: {
-    onelineClauses: [...rT, ...HE],
+    onelineClauses: [...LT, ...HE],
     tabularOnelineClauses: HE
   }
-}, VS = [
+}, fS = [
   // https://docs.microsoft.com/en-us/sql/t-sql/functions/functions?view=sql-server-ver15
   // aggregate
   "APPROX_COUNT_DISTINCT",
@@ -16039,7 +16039,7 @@ const IS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], WS = [
+], VS = [
   // https://docs.microsoft.com/en-us/sql/t-sql/language-elements/reserved-keywords-transact-sql?view=sql-server-ver15
   // standard
   "ADD",
@@ -16220,7 +16220,7 @@ const IS = [
   "WRITETEXT",
   // https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql?view=sql-server-ver16#action
   "$ACTION"
-], bS = [
+], WS = [
   // https://learn.microsoft.com/en-us/sql/t-sql/data-types/data-types-transact-sql?view=sql-server-ver15
   "BINARY",
   "BIT",
@@ -16247,7 +16247,7 @@ const IS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], XS = n(["SELECT [ALL | DISTINCT]"]), yS = n([
+], bS = r(["SELECT [ALL | DISTINCT]"]), XS = r([
   // queries
   "WITH",
   "INTO",
@@ -16272,7 +16272,7 @@ const IS = [
   "MERGE [INTO]",
   "WHEN [NOT] MATCHED [BY TARGET | BY SOURCE] [THEN]",
   "UPDATE SET"
-]), nT = n(["CREATE TABLE"]), BE = n([
+]), nT = r(["CREATE TABLE"]), BE = r([
   // - create:
   "CREATE [OR ALTER] [MATERIALIZED] VIEW",
   // - update:
@@ -16452,27 +16452,27 @@ const IS = [
   "XACT_ABORT",
   "XML INDEX",
   "XML SCHEMA COLLECTION"
-]), gS = n(["UNION [ALL]", "EXCEPT", "INTERSECT"]), KS = n([
+]), yS = r(["UNION [ALL]", "EXCEPT", "INTERSECT"]), gS = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), $S = n([
+]), KS = r([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), wS = n([]), JS = {
+]), $S = r([]), wS = {
   name: "transactsql",
   tokenizerOptions: {
-    reservedSelect: XS,
-    reservedClauses: [...yS, ...nT, ...BE],
-    reservedSetOperations: gS,
-    reservedJoins: KS,
-    reservedKeywordPhrases: $S,
-    reservedDataTypePhrases: wS,
-    reservedKeywords: WS,
-    reservedDataTypes: bS,
-    reservedFunctionNames: VS,
+    reservedSelect: bS,
+    reservedClauses: [...XS, ...nT, ...BE],
+    reservedSetOperations: yS,
+    reservedJoins: gS,
+    reservedKeywordPhrases: KS,
+    reservedDataTypePhrases: $S,
+    reservedKeywords: VS,
+    reservedDataTypes: WS,
+    reservedFunctionNames: fS,
     nestedBlockComments: !0,
     stringTypes: [{ quote: "''-qq", prefixes: ["N"] }, "{}"],
     identTypes: ['""-qq', "[]"],
@@ -16505,7 +16505,7 @@ const IS = [
     onelineClauses: [...nT, ...BE],
     tabularOnelineClauses: BE
   }
-}, xS = [
+}, JS = [
   // 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
@@ -16718,7 +16718,7 @@ const IS = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], vS = [
+], xS = [
   // https://docs.singlestore.com/cloud/reference/sql-reference/data-types/
   "BIGINT",
   "BINARY",
@@ -16767,7 +16767,7 @@ const IS = [
   "VARCHAR",
   "VARCHARACTER",
   "YEAR"
-], QS = [
+], vS = [
   // 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
@@ -17047,7 +17047,7 @@ const IS = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], ZS = n(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), jS = n([
+], QS = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), ZS = r([
   // queries
   "WITH",
   "FROM",
@@ -17069,9 +17069,9 @@ const IS = [
   // Data definition
   "CREATE [OR REPLACE] [TEMPORARY] PROCEDURE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [EXTERNAL] FUNCTION"
-]), _T = n([
+]), rT = r([
   "CREATE [ROWSTORE] [REFERENCE | TEMPORARY | GLOBAL TEMPORARY] TABLE [IF NOT EXISTS]"
-]), dE = n([
+]), mE = r([
   // - create:
   "CREATE VIEW",
   // - update:
@@ -17248,36 +17248,36 @@ const IS = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), qS = n([
+]), jS = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
   "MINUS"
-]), kS = n([
+]), qS = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), zS = n([
+]), kS = r([
   "ON DELETE",
   "ON UPDATE",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), EI = n([]), TI = {
+]), zS = r([]), EI = {
   name: "singlestoredb",
   tokenizerOptions: {
-    reservedSelect: ZS,
-    reservedClauses: [...jS, ..._T, ...dE],
-    reservedSetOperations: qS,
-    reservedJoins: kS,
-    reservedKeywordPhrases: zS,
-    reservedDataTypePhrases: EI,
-    reservedKeywords: xS,
-    reservedDataTypes: vS,
-    reservedFunctionNames: QS,
+    reservedSelect: QS,
+    reservedClauses: [...ZS, ...rT, ...mE],
+    reservedSetOperations: jS,
+    reservedJoins: qS,
+    reservedKeywordPhrases: kS,
+    reservedDataTypePhrases: zS,
+    reservedKeywords: JS,
+    reservedDataTypes: xS,
+    reservedFunctionNames: vS,
     // TODO: support _binary"some string" prefix
     stringTypes: [
       '""-qq-bs',
@@ -17314,10 +17314,10 @@ const IS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::", "::$", "::%"],
-    onelineClauses: [..._T, ...dE],
-    tabularOnelineClauses: dE
+    onelineClauses: [...rT, ...mE],
+    tabularOnelineClauses: mE
   }
-}, eI = [
+}, TI = [
   // https://docs.snowflake.com/en/sql-reference-functions.html
   //
   // https://docs.snowflake.com/en/sql-reference/functions-all.html
@@ -17925,7 +17925,7 @@ const IS = [
   "QUARTER",
   "ZEROIFNULL",
   "ZIPF"
-], RI = [
+], eI = [
   // 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)
@@ -18022,7 +18022,7 @@ const IS = [
   "WITH",
   // These are definitely keywords, but haven't found a definite list in the docs
   "COMMENT"
-], AI = [
+], RI = [
   "NUMBER",
   "DECIMAL",
   "NUMERIC",
@@ -18059,7 +18059,7 @@ const IS = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], SI = n(["SELECT [ALL | DISTINCT]"]), II = n([
+], AI = r(["SELECT [ALL | DISTINCT]"]), SI = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -18087,10 +18087,10 @@ const IS = [
   "WHEN MATCHED [AND]",
   "THEN {UPDATE SET | DELETE}",
   "WHEN NOT MATCHED THEN INSERT"
-]), iT = n([
+]), _T = r([
   "CREATE [OR REPLACE] [VOLATILE] TABLE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [LOCAL | GLOBAL] {TEMP|TEMPORARY} TABLE [IF NOT EXISTS]"
-]), mE = n([
+]), dE = r([
   // - create:
   "CREATE [OR REPLACE] [SECURE] [RECURSIVE] VIEW [IF NOT EXISTS]",
   // - update:
@@ -18331,25 +18331,25 @@ const IS = [
   "USE SCHEMA",
   "USE SECONDARY ROLES",
   "USE WAREHOUSE"
-]), OI = n(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), NI = n([
+]), II = r(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), OI = r([
   "[INNER] JOIN",
   "[NATURAL] {LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{CROSS | NATURAL} JOIN"
-]), tI = n([
+]), NI = r([
   "{ROWS | RANGE} BETWEEN",
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]"
-]), sI = n([]), CI = {
+]), tI = r([]), sI = {
   name: "snowflake",
   tokenizerOptions: {
-    reservedSelect: SI,
-    reservedClauses: [...II, ...iT, ...mE],
-    reservedSetOperations: OI,
-    reservedJoins: NI,
-    reservedKeywordPhrases: tI,
-    reservedDataTypePhrases: sI,
-    reservedKeywords: RI,
-    reservedDataTypes: AI,
-    reservedFunctionNames: eI,
+    reservedSelect: AI,
+    reservedClauses: [...SI, ..._T, ...dE],
+    reservedSetOperations: II,
+    reservedJoins: OI,
+    reservedKeywordPhrases: NI,
+    reservedDataTypePhrases: tI,
+    reservedKeywords: eI,
+    reservedDataTypes: RI,
+    reservedFunctionNames: TI,
     stringTypes: ["$$", "''-qq-bs"],
     identTypes: ['""-qq'],
     variableTypes: [
@@ -18379,46 +18379,46 @@ const IS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...iT, ...mE],
-    tabularOnelineClauses: mE
+    onelineClauses: [..._T, ...dE],
+    tabularOnelineClauses: dE
   }
-}, LI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, CI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  bigquery: ye,
-  db2: ER,
-  db2i: CR,
-  duckdb: MR,
-  hive: pR,
-  mariadb: gR,
-  mysql: qR,
-  n1ql: aA,
-  plsql: HA,
-  postgresql: bA,
-  redshift: QA,
-  singlestoredb: TI,
-  snowflake: CI,
-  spark: AS,
-  sql: uS,
-  sqlite: _S,
-  tidb: OA,
-  transactsql: JS,
-  trino: fS
-}, Symbol.toStringTag, { value: "Module" })), Z = (e) => e[e.length - 1], hT = (e) => e.sort((E, T) => T.length - E.length || E.localeCompare(T)), z = (e) => e.replace(/\s+/gu, " "), pE = (e) => /\n/.test(e), h = (e) => e.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), aT = /\s+/uy, g = (e) => new RegExp(`(?:${e})`, "uy"), rI = (e) => e.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), nI = (e) => e + "(?:-" + e + ")*", _I = ({ prefixes: e, requirePrefix: E }) => `(?:${e.map(rI).join("|")}${E ? "" : "|"})`, iI = (e) => new RegExp(`(?:${e.map(h).join("|")}).*?(?=\r
+  bigquery: Xe,
+  db2: ze,
+  db2i: sR,
+  duckdb: PR,
+  hive: dR,
+  mariadb: yR,
+  mysql: jR,
+  n1ql: iA,
+  plsql: GA,
+  postgresql: WA,
+  redshift: vA,
+  singlestoredb: EI,
+  snowflake: sI,
+  spark: RS,
+  sql: lS,
+  sqlite: rS,
+  tidb: IA,
+  transactsql: wS,
+  trino: hS
+}, Symbol.toStringTag, { value: "Module" })), Z = (e) => e[e.length - 1], YT = (e) => e.sort((E, T) => T.length - E.length || E.localeCompare(T)), z = (e) => e.replace(/\s+/gu, " "), pE = (e) => /\n/.test(e), h = (e) => e.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), iT = /\s+/uy, g = (e) => new RegExp(`(?:${e})`, "uy"), LI = (e) => e.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), nI = (e) => e + "(?:-" + e + ")*", rI = ({ prefixes: e, requirePrefix: E }) => `(?:${e.map(LI).join("|")}${E ? "" : "|"})`, _I = (e) => new RegExp(`(?:${e.map(h).join("|")}).*?(?=\r
 |\r|
-|$)`, "uy"), oT = (e, E = []) => {
+|$)`, "uy"), aT = (e, E = []) => {
   const T = e === "open" ? 0 : 1, R = ["()", ...E].map((A) => A[T]);
   return g(R.map(h).join("|"));
-}, DT = (e) => g(`${hT(e).map(h).join("|")}`), aI = ({ rest: e, dashes: E }) => e || E ? `(?![${e || ""}${E ? "-" : ""}])` : "", V = (e, E = {}) => {
+}, oT = (e) => g(`${YT(e).map(h).join("|")}`), iI = ({ rest: e, dashes: E }) => e || E ? `(?![${e || ""}${E ? "-" : ""}])` : "", V = (e, E = {}) => {
   if (e.length === 0)
     return /^\b$/u;
-  const T = aI(E), R = hT(e).map(h).join("|").replace(/ /gu, "\\s+");
+  const T = iI(E), R = YT(e).map(h).join("|").replace(/ /gu, "\\s+");
   return new RegExp(`(?:${R})${T}\\b`, "iuy");
 }, FE = (e, E) => {
   if (!e.length)
     return;
   const T = e.map(h).join("|");
   return g(`(?:${T})(?:${E})`);
-}, oI = () => {
+}, aI = () => {
   const e = {
     "<": ">",
     "[": "]",
@@ -18426,7 +18426,7 @@ const IS = [
     "{": "}"
   }, E = "{left}(?:(?!{right}').)*?{right}", T = Object.entries(e).map(([I, t]) => E.replace(/{left}/g, h(I)).replace(/{right}/g, h(t))), R = h(Object.keys(e).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${R}])(?:(?!\k<tag>').)*?\k<tag>`}|${T.join("|")})'`;
-}, PT = {
+}, DT = {
   // - backtick quoted (using `` to escape)
   "``": "(?:`[^`]*`)+",
   // - Transact-SQL square bracket quoted (using ]] to escape)
@@ -18450,16 +18450,16 @@ const IS = [
   // Hive and Spark variables: ${name}
   "{}": String.raw`(?:\{[^\}]*\})`,
   // Oracle q'' strings: q'<text>' q'|text|' ...
-  "q''": oI()
-}, fT = (e) => typeof e == "string" ? PT[e] : "regex" in e ? e.regex : _I(e) + PT[e.quote], DI = (e) => g(e.map((E) => "regex" in E ? E.regex : fT(E)).join("|")), VT = (e) => e.map(fT).join("|"), MT = (e) => g(VT(e)), PI = (e = {}) => g(WT(e)), WT = ({ first: e, rest: E, dashes: T, allowFirstCharNumber: R } = {}) => {
+  "q''": aI()
+}, hT = (e) => typeof e == "string" ? DT[e] : "regex" in e ? e.regex : rI(e) + DT[e.quote], oI = (e) => g(e.map((E) => "regex" in E ? E.regex : hT(E)).join("|")), fT = (e) => e.map(hT).join("|"), PT = (e) => g(fT(e)), DI = (e = {}) => g(VT(e)), VT = ({ first: e, rest: E, dashes: T, allowFirstCharNumber: R } = {}) => {
   const A = "\\p{Alphabetic}\\p{Mark}_", S = "\\p{Decimal_Number}", I = h(e ?? ""), t = h(E ?? ""), s = R ? `[${A}${S}${I}][${A}${S}${t}]*` : `[${A}${I}][${A}${S}${t}]*`;
   return T ? nI(s) : s;
 };
-function bT(e, E) {
+function WT(e, E) {
   const T = e.slice(0, E).split(/\n/);
   return { line: T.length, col: T[T.length - 1].length + 1 };
 }
-class MI {
+class PI {
   constructor(E, T) {
     this.rules = E, this.dialectName = T, this.input = "", this.index = 0;
   }
@@ -18485,7 +18485,7 @@ class MI {
     return T;
   }
   createParseError() {
-    const E = this.input.slice(this.index, this.index + 10), { line: T, col: R } = bT(this.input, this.index);
+    const E = this.input.slice(this.index, this.index + 10), { line: T, col: R } = WT(this.input, this.index);
     return new Error(`Parse error: Unexpected "${E}" at line ${T} column ${R}.
 ${this.dialectInfo()}`);
   }
@@ -18494,8 +18494,8 @@ ${this.dialectInfo()}`);
 If possible, please select a more specific dialect (like sqlite, postgresql, etc).` : `SQL dialect used: "${this.dialectName}".`;
   }
   getWhitespace() {
-    aT.lastIndex = this.index;
-    const E = aT.exec(this.input);
+    iT.lastIndex = this.index;
+    const E = iT.exec(this.input);
     if (E)
       return this.index += E[0].length, E[0];
   }
@@ -18521,23 +18521,23 @@ If possible, please select a more specific dialect (like sqlite, postgresql, etc
     }
   }
 }
-const UT = /\/\*/uy, UI = /[\s\S]/uy, cI = /\*\//uy;
-class lI {
+const MT = /\/\*/uy, MI = /[\s\S]/uy, UI = /\*\//uy;
+class cI {
   constructor() {
     this.lastIndex = 0;
   }
   exec(E) {
     let T = "", R, A = 0;
-    if (R = this.matchSection(UT, E))
+    if (R = this.matchSection(MT, E))
       T += R, A++;
     else
       return null;
     for (; A > 0; )
-      if (R = this.matchSection(UT, E))
+      if (R = this.matchSection(MT, E))
         T += R, A++;
-      else if (R = this.matchSection(cI, E))
-        T += R, A--;
       else if (R = this.matchSection(UI, E))
+        T += R, A--;
+      else if (R = this.matchSection(MI, E))
         T += R;
       else
         return null;
@@ -18549,7 +18549,7 @@ class lI {
     return R && (this.lastIndex += R[0].length), R ? R[0] : null;
   }
 }
-class uI {
+class lI {
   constructor(E, T) {
     this.cfg = E, this.dialectName = T, this.rulesBeforeParams = this.buildRulesBeforeParams(E), this.rulesAfterParams = this.buildRulesAfterParams(E);
   }
@@ -18558,7 +18558,7 @@ class uI {
       ...this.rulesBeforeParams,
       ...this.buildParamRules(this.cfg, T),
       ...this.rulesAfterParams
-    ], A = new MI(R, this.dialectName).tokenize(E);
+    ], A = new PI(R, this.dialectName).tokenize(E);
     return this.cfg.postProcess ? this.cfg.postProcess(A) : A;
   }
   // These rules can be cached as they only depend on
@@ -18572,15 +18572,15 @@ class uI {
       },
       {
         type: D.BLOCK_COMMENT,
-        regex: E.nestedBlockComments ? new lI() : /(\/\*[^]*?\*\/)/uy
+        regex: E.nestedBlockComments ? new cI() : /(\/\*[^]*?\*\/)/uy
       },
       {
         type: D.LINE_COMMENT,
-        regex: iI((T = E.lineCommentTypes) !== null && T !== void 0 ? T : ["--"])
+        regex: _I((T = E.lineCommentTypes) !== null && T !== void 0 ? T : ["--"])
       },
       {
         type: D.QUOTED_IDENTIFIER,
-        regex: MT(E.identTypes)
+        regex: PT(E.identTypes)
       },
       {
         type: D.NUMBER,
@@ -18591,82 +18591,82 @@ class uI {
       {
         type: D.RESERVED_KEYWORD_PHRASE,
         regex: V((R = E.reservedKeywordPhrases) !== null && R !== void 0 ? R : [], E.identChars),
-        text: d
+        text: m
       },
       {
         type: D.RESERVED_DATA_TYPE_PHRASE,
         regex: V((A = E.reservedDataTypePhrases) !== null && A !== void 0 ? A : [], E.identChars),
-        text: d
+        text: m
       },
       {
         type: D.CASE,
         regex: /CASE\b/iuy,
-        text: d
+        text: m
       },
       {
         type: D.END,
         regex: /END\b/iuy,
-        text: d
+        text: m
       },
       {
         type: D.BETWEEN,
         regex: /BETWEEN\b/iuy,
-        text: d
+        text: m
       },
       {
         type: D.LIMIT,
         regex: E.reservedClauses.includes("LIMIT") ? /LIMIT\b/iuy : void 0,
-        text: d
+        text: m
       },
       {
         type: D.RESERVED_CLAUSE,
         regex: V(E.reservedClauses, E.identChars),
-        text: d
+        text: m
       },
       {
         type: D.RESERVED_SELECT,
         regex: V(E.reservedSelect, E.identChars),
-        text: d
+        text: m
       },
       {
         type: D.RESERVED_SET_OPERATION,
         regex: V(E.reservedSetOperations, E.identChars),
-        text: d
+        text: m
       },
       {
         type: D.WHEN,
         regex: /WHEN\b/iuy,
-        text: d
+        text: m
       },
       {
         type: D.ELSE,
         regex: /ELSE\b/iuy,
-        text: d
+        text: m
       },
       {
         type: D.THEN,
         regex: /THEN\b/iuy,
-        text: d
+        text: m
       },
       {
         type: D.RESERVED_JOIN,
         regex: V(E.reservedJoins, E.identChars),
-        text: d
+        text: m
       },
       {
         type: D.AND,
         regex: /AND\b/iuy,
-        text: d
+        text: m
       },
       {
         type: D.OR,
         regex: /OR\b/iuy,
-        text: d
+        text: m
       },
       {
         type: D.XOR,
         regex: E.supportsXor ? /XOR\b/iuy : void 0,
-        text: d
+        text: m
       },
       ...E.operatorKeyword ? [
         {
@@ -18677,17 +18677,17 @@ class uI {
       {
         type: D.RESERVED_FUNCTION_NAME,
         regex: V(E.reservedFunctionNames, E.identChars),
-        text: d
+        text: m
       },
       {
         type: D.RESERVED_DATA_TYPE,
         regex: V(E.reservedDataTypes, E.identChars),
-        text: d
+        text: m
       },
       {
         type: D.RESERVED_KEYWORD,
         regex: V(E.reservedKeywords, E.identChars),
-        text: d
+        text: m
       }
     ]);
   }
@@ -18698,26 +18698,26 @@ class uI {
     return this.validRules([
       {
         type: D.VARIABLE,
-        regex: E.variableTypes ? DI(E.variableTypes) : void 0
+        regex: E.variableTypes ? oI(E.variableTypes) : void 0
       },
-      { type: D.STRING, regex: MT(E.stringTypes) },
+      { type: D.STRING, regex: PT(E.stringTypes) },
       {
         type: D.IDENTIFIER,
-        regex: PI(E.identChars)
+        regex: DI(E.identChars)
       },
       { type: D.DELIMITER, regex: /[;]/uy },
       { type: D.COMMA, regex: /[,]/y },
       {
         type: D.OPEN_PAREN,
-        regex: oT("open", E.extraParens)
+        regex: aT("open", E.extraParens)
       },
       {
         type: D.CLOSE_PAREN,
-        regex: oT("close", E.extraParens)
+        regex: aT("close", E.extraParens)
       },
       {
         type: D.OPERATOR,
-        regex: DT([
+        regex: oT([
           // standard operators
           "+",
           "-",
@@ -18735,7 +18735,7 @@ class uI {
       { type: D.ASTERISK, regex: /[*]/uy },
       {
         type: D.PROPERTY_ACCESS_OPERATOR,
-        regex: DT([".", ...(R = E.propertyAccessOperators) !== null && R !== void 0 ? R : []])
+        regex: oT([".", ...(R = E.propertyAccessOperators) !== null && R !== void 0 ? R : []])
       }
     ]);
   }
@@ -18753,12 +18753,12 @@ class uI {
     return this.validRules([
       {
         type: D.NAMED_PARAMETER,
-        regex: FE(s.named, WT(E.paramChars || E.identChars)),
+        regex: FE(s.named, VT(E.paramChars || E.identChars)),
         key: (O) => O.slice(1)
       },
       {
         type: D.QUOTED_PARAMETER,
-        regex: FE(s.quoted, VT(E.identTypes)),
+        regex: FE(s.quoted, fT(E.identTypes)),
         key: (O) => (({ tokenKey: N, quoteChar: C }) => N.replace(new RegExp(h("\\" + C), "gu"), C))({
           tokenKey: O.slice(2, -1),
           quoteChar: O.slice(-1)
@@ -18788,13 +18788,13 @@ class uI {
     return E.filter((T) => !!T.regex);
   }
 }
-const d = (e) => z(e.toUpperCase()), cT = /* @__PURE__ */ new Map(), GI = (e) => {
-  let E = cT.get(e);
-  return E || (E = HI(e), cT.set(e, E)), E;
-}, HI = (e) => ({
-  tokenizer: new uI(e.tokenizerOptions, e.name),
-  formatOptions: BI(e.formatOptions)
-}), BI = (e) => {
+const m = (e) => z(e.toUpperCase()), UT = /* @__PURE__ */ new Map(), uI = (e) => {
+  let E = UT.get(e);
+  return E || (E = GI(e), UT.set(e, E)), E;
+}, GI = (e) => ({
+  tokenizer: new lI(e.tokenizerOptions, e.name),
+  formatOptions: HI(e.formatOptions)
+}), HI = (e) => {
   var E;
   return {
     alwaysDenseOperators: e.alwaysDenseOperators || [],
@@ -18802,7 +18802,7 @@ const d = (e) => z(e.toUpperCase()), cT = /* @__PURE__ */ new Map(), GI = (e) =>
     tabularOnelineClauses: Object.fromEntries(((E = e.tabularOnelineClauses) !== null && E !== void 0 ? E : e.onelineClauses).map((T) => [T, !0]))
   };
 };
-function dI(e) {
+function BI(e) {
   return e.indentStyle === "tabularLeft" || e.indentStyle === "tabularRight" ? " ".repeat(10) : e.useTabs ? "	" : " ".repeat(e.tabWidth);
 }
 function J(e) {
@@ -18831,15 +18831,15 @@ class mI {
     this.index = E;
   }
 }
-function pI(e) {
+function dI(e) {
   return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
 }
-var EE = { exports: {} }, FI = EE.exports, lT;
-function YI() {
-  return lT || (lT = 1, (function(e) {
+var EE = { exports: {} }, pI = EE.exports, cT;
+function FI() {
+  return cT || (cT = 1, (function(e) {
     (function(E, T) {
       e.exports ? e.exports = T() : E.nearley = T();
-    })(FI, function() {
+    })(pI, function() {
       function E(O, N, C) {
         return this.id = ++E.highestId, this.name = O, this.symbols = N, this.postprocess = C, this;
       }
@@ -18847,8 +18847,8 @@ function YI() {
         var N = typeof O > "u" ? this.symbols.map(s).join(" ") : this.symbols.slice(0, O).map(s).join(" ") + " ● " + this.symbols.slice(O).map(s).join(" ");
         return this.name + " → " + N;
       };
-      function T(O, N, C, r) {
-        this.rule = O, this.dot = N, this.reference = C, this.data = [], this.wantedBy = r, this.isComplete = this.dot === O.symbols.length;
+      function T(O, N, C, n) {
+        this.rule = O, this.dot = N, this.reference = C, this.data = [], this.wantedBy = n, this.isComplete = this.dot === O.symbols.length;
       }
       T.prototype.toString = function() {
         return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
@@ -18868,7 +18868,7 @@ function YI() {
         this.grammar = O, this.index = N, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
       }
       R.prototype.process = function(O) {
-        for (var N = this.states, C = this.wants, r = this.completed, L = 0; L < N.length; L++) {
+        for (var N = this.states, C = this.wants, n = this.completed, L = 0; L < N.length; L++) {
           var i = N[L];
           if (i.isComplete) {
             if (i.finish(), i.data !== I.fail) {
@@ -18888,8 +18888,8 @@ function YI() {
               continue;
             }
             if (C[U]) {
-              if (C[U].push(i), r.hasOwnProperty(U))
-                for (var M = r[U], l = 0; l < M.length; l++) {
+              if (C[U].push(i), n.hasOwnProperty(U))
+                for (var M = n[U], l = 0; l < M.length; l++) {
                   var G = M[l];
                   this.complete(i, G);
                 }
@@ -18899,7 +18899,7 @@ function YI() {
         }
       }, R.prototype.predict = function(O) {
         for (var N = this.grammar.byName[O] || [], C = 0; C < N.length; C++) {
-          var r = N[C], L = this.wants[O], i = new T(r, 0, this.index, L);
+          var n = N[C], L = this.wants[O], i = new T(n, 0, this.index, L);
           this.states.push(i);
         }
       }, R.prototype.complete = function(O, N) {
@@ -18909,16 +18909,16 @@ function YI() {
       function A(O, N) {
         this.rules = O, this.start = N || this.rules[0].name;
         var C = this.byName = {};
-        this.rules.forEach(function(r) {
-          C.hasOwnProperty(r.name) || (C[r.name] = []), C[r.name].push(r);
+        this.rules.forEach(function(n) {
+          C.hasOwnProperty(n.name) || (C[n.name] = []), C[n.name].push(n);
         });
       }
-      A.fromCompiled = function(r, N) {
-        var C = r.Lexer;
-        r.ParserStart && (N = r.ParserStart, r = r.ParserRules);
-        var r = r.map(function(i) {
+      A.fromCompiled = function(n, N) {
+        var C = n.Lexer;
+        n.ParserStart && (N = n.ParserStart, n = n.ParserRules);
+        var n = n.map(function(i) {
           return new E(i.name, i.symbols, i.postprocess);
-        }), L = new A(r, N);
+        }), L = new A(n, N);
         return L.lexer = C, L;
       };
       function S() {
@@ -18940,7 +18940,7 @@ function YI() {
       }, S.prototype.formatError = function(O, N) {
         var C = this.buffer;
         if (typeof C == "string") {
-          var r = C.split(`
+          var n = C.split(`
 `).slice(
             Math.max(0, this.line - 5),
             this.line
@@ -18950,8 +18950,8 @@ function YI() {
           var i = this.index - this.lastLineBreak, a = String(this.line).length;
           return N += " at line " + this.line + " col " + i + `:
 
-`, N += r.map(function(P, U) {
-            return l(this.line - r.length + U + 1, a) + " " + P;
+`, N += n.map(function(P, U) {
+            return l(this.line - n.length + U + 1, a) + " " + P;
           }, this).join(`
 `), N += `
 ` + l("", a + i) + `^
@@ -18965,18 +18965,18 @@ function YI() {
       };
       function I(O, N, C) {
         if (O instanceof A)
-          var r = O, C = N;
+          var n = O, C = N;
         else
-          var r = A.fromCompiled(O, N);
-        this.grammar = r, this.options = {
+          var n = A.fromCompiled(O, N);
+        this.grammar = n, this.options = {
           keepHistory: !1,
-          lexer: r.lexer || new S()
+          lexer: n.lexer || new S()
         };
         for (var L in C || {})
           this.options[L] = C[L];
         this.lexer = this.options.lexer, this.lexerState = void 0;
-        var i = new R(r, 0);
-        this.table = [i], i.wants[r.start] = [], i.predict(r.start), i.process(), this.current = 0;
+        var i = new R(n, 0);
+        this.table = [i], i.wants[n.start] = [], i.predict(n.start), i.process(), this.current = 0;
       }
       I.fail = {}, I.prototype.feed = function(O) {
         var N = this.lexer;
@@ -18988,8 +18988,8 @@ function YI() {
           } catch (Y) {
             var a = new R(this.grammar, this.current + 1);
             this.table.push(a);
-            var r = new Error(this.reportLexerError(Y));
-            throw r.offset = this.current, r.token = Y.token, r;
+            var n = new Error(this.reportLexerError(Y));
+            throw n.offset = this.current, n.token = Y.token, n;
           }
           var L = this.table[this.current];
           this.options.keepHistory || delete this.table[this.current - 1];
@@ -19003,22 +19003,22 @@ function YI() {
             }
           }
           if (a.process(), a.states.length === 0) {
-            var r = new Error(this.reportError(C));
-            throw r.offset = this.current, r.token = C, r;
+            var n = new Error(this.reportError(C));
+            throw n.offset = this.current, n.token = C, n;
           }
           this.options.keepHistory && (L.lexerState = N.save()), this.current++;
         }
         return L && (this.lexerState = N.save()), this.results = this.finish(), this;
       }, I.prototype.reportLexerError = function(O) {
-        var N, C, r = O.token;
-        return r ? (N = "input " + JSON.stringify(r.text[0]) + " (lexer error)", C = this.lexer.formatError(r, "Syntax error")) : (N = "input (lexer error)", C = O.message), this.reportErrorCommon(C, N);
+        var N, C, n = O.token;
+        return n ? (N = "input " + JSON.stringify(n.text[0]) + " (lexer error)", C = this.lexer.formatError(n, "Syntax error")) : (N = "input (lexer error)", C = O.message), this.reportErrorCommon(C, N);
       }, I.prototype.reportError = function(O) {
         var N = (O.type ? O.type + " token: " : "") + JSON.stringify(O.value !== void 0 ? O.value : O), C = this.lexer.formatError(O, "Syntax error");
         return this.reportErrorCommon(C, N);
       }, I.prototype.reportErrorCommon = function(O, N) {
         var C = [];
         C.push(O);
-        var r = this.table.length - 2, L = this.table[r], i = L.states.filter(function(l) {
+        var n = this.table.length - 2, L = this.table[n], i = L.states.filter(function(l) {
           var P = l.rule.symbols[l.dot];
           return P && typeof P != "string";
         });
@@ -19039,9 +19039,9 @@ function YI() {
         return C.push(""), C.join(`
 `);
       }, I.prototype.displayStateStack = function(O, N) {
-        for (var C, r = 0, L = 0; L < O.length; L++) {
+        for (var C, n = 0, L = 0; L < O.length; L++) {
           var i = O[L], a = i.rule.toString(i.dot);
-          a === C ? r++ : (r > 0 && N.push("    ^ " + r + " more lines identical to this"), r = 0, N.push("    " + a)), C = a;
+          a === C ? n++ : (n > 0 && N.push("    ^ " + n + " more lines identical to this"), n = 0, N.push("    " + a)), C = a;
         }
       }, I.prototype.getSymbolDisplay = function(O) {
         return t(O);
@@ -19050,7 +19050,7 @@ function YI() {
           return null;
         if (O.wantedBy.length === 0)
           return [O];
-        var C = O.wantedBy[0], r = [O].concat(N), L = this.buildFirstStateStack(C, r);
+        var C = O.wantedBy[0], n = [O].concat(N), L = this.buildFirstStateStack(C, n);
         return L === null ? null : [O].concat(L);
       }, I.prototype.save = function() {
         var O = this.table[this.current];
@@ -19064,10 +19064,10 @@ function YI() {
         this.restore(this.table[O]);
       }, I.prototype.finish = function() {
         var O = [], N = this.grammar.start, C = this.table[this.table.length - 1];
-        return C.states.forEach(function(r) {
-          r.rule.name === N && r.dot === r.rule.symbols.length && r.reference === 0 && r.data !== I.fail && O.push(r);
-        }), O.map(function(r) {
-          return r.data;
+        return C.states.forEach(function(n) {
+          n.rule.name === N && n.dot === n.rule.symbols.length && n.reference === 0 && n.data !== I.fail && O.push(n);
+        }), O.map(function(n) {
+          return n.data;
         });
       };
       function t(O) {
@@ -19110,14 +19110,14 @@ function YI() {
     });
   })(EE)), EE.exports;
 }
-var hI = YI();
-const fI = /* @__PURE__ */ pI(hI);
-function VI(e) {
-  return e.map(WI).map(bI).map(XI).map(yI).map(gI);
+var YI = FI();
+const hI = /* @__PURE__ */ dI(YI);
+function fI(e) {
+  return e.map(VI).map(WI).map(bI).map(XI).map(yI);
 }
-const WI = (e, E, T) => {
-  if (YT(e.type)) {
-    const R = KI(T, E);
+const VI = (e, E, T) => {
+  if (FT(e.type)) {
+    const R = gI(T, E);
     if (R && R.type === D.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, e), { type: D.IDENTIFIER, text: e.raw });
     const A = Q(T, E);
@@ -19125,41 +19125,41 @@ const WI = (e, E, T) => {
       return Object.assign(Object.assign({}, e), { type: D.IDENTIFIER, text: e.raw });
   }
   return e;
-}, bI = (e, E, T) => {
+}, WI = (e, E, T) => {
   if (e.type === D.RESERVED_FUNCTION_NAME) {
     const R = Q(T, E);
-    if (!R || !XT(R))
+    if (!R || !bT(R))
       return Object.assign(Object.assign({}, e), { type: D.IDENTIFIER, text: e.raw });
   }
   return e;
-}, XI = (e, E, T) => {
+}, bI = (e, E, T) => {
   if (e.type === D.RESERVED_DATA_TYPE) {
     const R = Q(T, E);
-    if (R && XT(R))
+    if (R && bT(R))
       return Object.assign(Object.assign({}, e), { type: D.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return e;
-}, yI = (e, E, T) => {
+}, XI = (e, E, T) => {
   if (e.type === D.IDENTIFIER) {
     const R = Q(T, E);
-    if (R && yT(R))
+    if (R && XT(R))
       return Object.assign(Object.assign({}, e), { type: D.ARRAY_IDENTIFIER });
   }
   return e;
-}, gI = (e, E, T) => {
+}, yI = (e, E, T) => {
   if (e.type === D.RESERVED_DATA_TYPE) {
     const R = Q(T, E);
-    if (R && yT(R))
+    if (R && XT(R))
       return Object.assign(Object.assign({}, e), { type: D.ARRAY_KEYWORD });
   }
   return e;
-}, KI = (e, E) => Q(e, E, -1), Q = (e, E, T = 1) => {
+}, gI = (e, E) => Q(e, E, -1), Q = (e, E, T = 1) => {
   let R = 1;
-  for (; e[E + R * T] && $I(e[E + R * T]); )
+  for (; e[E + R * T] && KI(e[E + R * T]); )
     R++;
   return e[E + R * T];
-}, XT = (e) => e.type === D.OPEN_PAREN && e.text === "(", yT = (e) => e.type === D.OPEN_PAREN && e.text === "[", $I = (e) => e.type === D.BLOCK_COMMENT || e.type === D.LINE_COMMENT;
-class gT {
+}, bT = (e) => e.type === D.OPEN_PAREN && e.text === "(", XT = (e) => e.type === D.OPEN_PAREN && e.text === "[", KI = (e) => e.type === D.BLOCK_COMMENT || e.type === D.LINE_COMMENT;
+class yT {
   constructor(E) {
     this.tokenize = E, this.index = 0, this.tokens = [], this.input = "";
   }
@@ -19172,7 +19172,7 @@ class gT {
   save() {
   }
   formatError(E) {
-    const { line: T, col: R } = bT(this.input, E.start);
+    const { line: T, col: R } = WT(this.input, E.start);
     return `Parse error at token: ${E.text} at line ${T} column ${R}`;
   }
   has(E) {
@@ -19186,16 +19186,16 @@ var c;
 function YE(e) {
   return e[0];
 }
-const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
+const u = new yT((e) => []), W = ([[e]]) => e, d = (e) => ({
   type: c.keyword,
   tokenType: e.type,
   text: e.text,
   raw: e.raw
-}), uT = (e) => ({
+}), lT = (e) => ({
   type: c.data_type,
   text: e.text,
   raw: e.raw
-}), p = (e, { leading: E, trailing: T }) => (E?.length && (e = Object.assign(Object.assign({}, e), { leadingComments: E })), T?.length && (e = Object.assign(Object.assign({}, e), { trailingComments: T })), e), wI = (e, { leading: E, trailing: T }) => {
+}), p = (e, { leading: E, trailing: T }) => (E?.length && (e = Object.assign(Object.assign({}, e), { leadingComments: E })), T?.length && (e = Object.assign(Object.assign({}, e), { trailingComments: T })), e), $I = (e, { leading: E, trailing: T }) => {
   if (E?.length) {
     const [R, ...A] = e;
     e = [p(R, { leading: E }), ...A];
@@ -19205,7 +19205,7 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
     e = [...R, p(A, { trailing: T })];
   }
   return e;
-}, JI = {
+}, wI = {
   Lexer: u,
   ParserRules: [
     { name: "main$ebnf$1", symbols: [] },
@@ -19256,14 +19256,14 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
           const [A, S] = R;
           return {
             type: c.limit_clause,
-            limitKw: p(m(e), { trailing: E }),
+            limitKw: p(d(e), { trailing: E }),
             offset: T,
             count: S
           };
         } else
           return {
             type: c.limit_clause,
-            limitKw: p(m(e), { trailing: E }),
+            limitKw: p(d(e), { trailing: E }),
             count: T
           };
       }
@@ -19279,7 +19279,7 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
       symbols: [u.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT, "select_clause$subexpression$1"],
       postprocess: ([e, [E, T]]) => ({
         type: c.clause,
-        nameKw: m(e),
+        nameKw: d(e),
         children: [E, ...T]
       })
     },
@@ -19288,7 +19288,7 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
       symbols: [u.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT],
       postprocess: ([e]) => ({
         type: c.clause,
-        nameKw: m(e),
+        nameKw: d(e),
         children: []
       })
     },
@@ -19304,7 +19304,7 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
       symbols: [u.has("RESERVED_CLAUSE") ? { type: "RESERVED_CLAUSE" } : RESERVED_CLAUSE, "other_clause$ebnf$1"],
       postprocess: ([e, E]) => ({
         type: c.clause,
-        nameKw: m(e),
+        nameKw: d(e),
         children: E
       })
     },
@@ -19315,7 +19315,7 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
       symbols: [u.has("RESERVED_SET_OPERATION") ? { type: "RESERVED_SET_OPERATION" } : RESERVED_SET_OPERATION, "set_operation$ebnf$1"],
       postprocess: ([e, E]) => ({
         type: c.set_operation,
-        nameKw: m(e),
+        nameKw: d(e),
         children: E
       })
     },
@@ -19397,7 +19397,7 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
       symbols: [u.has("ARRAY_KEYWORD") ? { type: "ARRAY_KEYWORD" } : ARRAY_KEYWORD, "_", "square_brackets"],
       postprocess: ([e, E, T]) => ({
         type: c.array_subscript,
-        array: p(m(e), { trailing: E }),
+        array: p(d(e), { trailing: E }),
         parenthesis: T
       })
     },
@@ -19406,7 +19406,7 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
       symbols: [u.has("RESERVED_FUNCTION_NAME") ? { type: "RESERVED_FUNCTION_NAME" } : RESERVED_FUNCTION_NAME, "_", "parenthesis"],
       postprocess: ([e, E, T]) => ({
         type: c.function_call,
-        nameKw: p(m(e), { trailing: E }),
+        nameKw: p(d(e), { trailing: E }),
         parenthesis: T
       })
     },
@@ -19469,9 +19469,9 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
       symbols: [u.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", u.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
       postprocess: ([e, E, T, R, A, S, I]) => ({
         type: c.between_predicate,
-        betweenKw: m(e),
-        expr1: wI(T, { leading: E, trailing: R }),
-        andKw: m(A),
+        betweenKw: d(e),
+        expr1: $I(T, { leading: E, trailing: R }),
+        andKw: d(A),
         expr2: [p(I, { leading: S })]
       })
     },
@@ -19484,8 +19484,8 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
       symbols: [u.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", u.has("END") ? { type: "END" } : END],
       postprocess: ([e, E, T, R, A]) => ({
         type: c.case_expression,
-        caseKw: p(m(e), { trailing: E }),
-        endKw: m(A),
+        caseKw: p(d(e), { trailing: E }),
+        endKw: d(A),
         expr: T || [],
         clauses: R
       })
@@ -19495,8 +19495,8 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
       symbols: [u.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", u.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
       postprocess: ([e, E, T, R, A, S]) => ({
         type: c.case_when,
-        whenKw: p(m(e), { trailing: E }),
-        thenKw: p(m(R), { trailing: A }),
+        whenKw: p(d(e), { trailing: E }),
+        thenKw: p(d(R), { trailing: A }),
         condition: T,
         result: S
       })
@@ -19506,7 +19506,7 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
       symbols: [u.has("ELSE") ? { type: "ELSE" } : ELSE, "_", "expression_chain_"],
       postprocess: ([e, E, T]) => ({
         type: c.case_else,
-        elseKw: p(m(e), { trailing: E }),
+        elseKw: p(d(e), { trailing: E }),
         result: T
       })
     },
@@ -19535,21 +19535,21 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
     {
       name: "keyword",
       symbols: ["keyword$subexpression$1"],
-      postprocess: ([[e]]) => m(e)
+      postprocess: ([[e]]) => d(e)
     },
     { name: "data_type$subexpression$1", symbols: [u.has("RESERVED_DATA_TYPE") ? { type: "RESERVED_DATA_TYPE" } : RESERVED_DATA_TYPE] },
     { name: "data_type$subexpression$1", symbols: [u.has("RESERVED_DATA_TYPE_PHRASE") ? { type: "RESERVED_DATA_TYPE_PHRASE" } : RESERVED_DATA_TYPE_PHRASE] },
     {
       name: "data_type",
       symbols: ["data_type$subexpression$1"],
-      postprocess: ([[e]]) => uT(e)
+      postprocess: ([[e]]) => lT(e)
     },
     {
       name: "data_type",
       symbols: [u.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
       postprocess: ([e, E, T]) => ({
         type: c.parameterized_data_type,
-        dataType: p(uT(e), { trailing: E }),
+        dataType: p(lT(e), { trailing: E }),
         parenthesis: T
       })
     },
@@ -19559,7 +19559,7 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
     {
       name: "logic_operator",
       symbols: ["logic_operator$subexpression$1"],
-      postprocess: ([[e]]) => m(e)
+      postprocess: ([[e]]) => d(e)
     },
     { name: "other_keyword$subexpression$1", symbols: [u.has("WHEN") ? { type: "WHEN" } : WHEN] },
     { name: "other_keyword$subexpression$1", symbols: [u.has("THEN") ? { type: "THEN" } : THEN] },
@@ -19568,7 +19568,7 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
     {
       name: "other_keyword",
       symbols: ["other_keyword$subexpression$1"],
-      postprocess: ([[e]]) => m(e)
+      postprocess: ([[e]]) => d(e)
     },
     { name: "_$ebnf$1", symbols: [] },
     { name: "_$ebnf$1", symbols: ["_$ebnf$1", "comment"], postprocess: (e) => e[0].concat([e[1]]) },
@@ -19602,13 +19602,13 @@ const u = new gT((e) => []), W = ([[e]]) => e, m = (e) => ({
     }
   ],
   ParserStart: "main"
-}, { Parser: xI, Grammar: vI } = fI;
-function QI(e) {
+}, { Parser: JI, Grammar: xI } = hI;
+function vI(e) {
   let E = {};
-  const T = new gT((A) => [
-    ...VI(e.tokenize(A, E)),
-    FT(A.length)
-  ]), R = new xI(vI.fromCompiled(JI), { lexer: T });
+  const T = new yT((A) => [
+    ...fI(e.tokenize(A, E)),
+    pT(A.length)
+  ]), R = new JI(xI.fromCompiled(wI), { lexer: T });
   return {
     parse: (A, S) => {
       E = S;
@@ -19624,7 +19624,7 @@ var o;
 (function(e) {
   e[e.SPACE = 0] = "SPACE", e[e.NO_SPACE = 1] = "NO_SPACE", e[e.NO_NEWLINE = 2] = "NO_NEWLINE", e[e.NEWLINE = 3] = "NEWLINE", e[e.MANDATORY_NEWLINE = 4] = "MANDATORY_NEWLINE", e[e.INDENT = 5] = "INDENT", e[e.SINGLE_INDENT = 6] = "SINGLE_INDENT";
 })(o = o || (o = {}));
-class KT {
+class gT {
   constructor(E) {
     this.indentation = E, this.items = [];
   }
@@ -19660,11 +19660,11 @@ class KT {
       }
   }
   trimHorizontalWhitespace() {
-    for (; ZI(Z(this.items)); )
+    for (; QI(Z(this.items)); )
       this.items.pop();
   }
   trimWhitespace() {
-    for (; jI(Z(this.items)); )
+    for (; ZI(Z(this.items)); )
       this.items.pop();
   }
   addNewline(E) {
@@ -19711,18 +19711,18 @@ class KT {
     }
   }
 }
-const ZI = (e) => e === o.SPACE || e === o.SINGLE_INDENT, jI = (e) => e === o.SPACE || e === o.SINGLE_INDENT || e === o.NEWLINE;
-function GT(e, E) {
+const QI = (e) => e === o.SPACE || e === o.SINGLE_INDENT, ZI = (e) => e === o.SPACE || e === o.SINGLE_INDENT || e === o.NEWLINE;
+function uT(e, E) {
   if (E === "standard")
     return e;
   let T = [];
   return e.length >= 10 && e.includes(" ") && ([e, ...T] = e.split(" ")), E === "tabularLeft" ? e = e.padEnd(9, " ") : e = e.padStart(9, " "), e + ["", ...T].join(" ");
 }
-function HT(e) {
+function GT(e) {
   return me(e) || e === D.RESERVED_CLAUSE || e === D.RESERVED_SELECT || e === D.RESERVED_SET_OPERATION || e === D.RESERVED_JOIN || e === D.LIMIT;
 }
-const hE = "top-level", qI = "block-level";
-class $T {
+const hE = "top-level", jI = "block-level";
+class KT {
   /**
    * @param {string} indent A string to indent with
    */
@@ -19751,7 +19751,7 @@ class $T {
    * Increases indentation by one block-level indent.
    */
   increaseBlockLevel() {
-    this.indentTypes.push(qI);
+    this.indentTypes.push(jI);
   }
   /**
    * Decreases indentation by one top-level indent.
@@ -19770,9 +19770,9 @@ class $T {
       ;
   }
 }
-class kI extends KT {
+class qI extends gT {
   constructor(E) {
-    super(new $T("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
+    super(new KT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
   }
   add(...E) {
     if (E.forEach((T) => this.addToLength(T)), this.length > this.expressionWidth)
@@ -20014,7 +20014,7 @@ class eE {
         cfg: this.cfg,
         dialectCfg: this.dialectCfg,
         params: this.params,
-        layout: new kI(this.cfg.expressionWidth),
+        layout: new qI(this.cfg.expressionWidth),
         inline: !0
       }).format(E);
     } catch (R) {
@@ -20050,7 +20050,7 @@ class eE {
     this.layout.add(this.showDataType(E), o.SPACE);
   }
   showKw(E) {
-    return HT(E.tokenType) ? GT(this.showNonTabularKw(E), this.cfg.indentStyle) : this.showNonTabularKw(E);
+    return GT(E.tokenType) ? uT(this.showNonTabularKw(E), this.cfg.indentStyle) : this.showNonTabularKw(E);
   }
   // Like showKw(), but skips tabular formatting
   showNonTabularKw(E) {
@@ -20064,7 +20064,7 @@ class eE {
     }
   }
   showFunctionKw(E) {
-    return HT(E.tokenType) ? GT(this.showNonTabularFunctionKw(E), this.cfg.indentStyle) : this.showNonTabularFunctionKw(E);
+    return GT(E.tokenType) ? uT(this.showNonTabularFunctionKw(E), this.cfg.indentStyle) : this.showNonTabularFunctionKw(E);
   }
   // Like showFunctionKw(), but skips tabular formatting
   showNonTabularFunctionKw(E) {
@@ -20100,7 +20100,7 @@ class eE {
     }
   }
 }
-class zI {
+class kI {
   constructor(E, T) {
     this.dialect = E, this.cfg = T, this.params = new mI(this.cfg.params);
   }
@@ -20114,7 +20114,7 @@ class zI {
     return this.formatAst(T).trimEnd();
   }
   parse(E) {
-    return QI(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
+    return vI(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
   }
   formatAst(E) {
     return E.map((T) => this.formatStatement(T)).join(`
@@ -20125,14 +20125,14 @@ class zI {
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new KT(new $T(dI(this.cfg)))
+      layout: new gT(new KT(BI(this.cfg)))
     }).format(E.children);
     return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? T.add(o.NEWLINE, ";") : T.add(o.NO_NEWLINE, ";")), T.toString();
   }
 }
 class TE extends Error {
 }
-function EO(e) {
+function zI(e) {
   const E = [
     "multilineLists",
     "newlineBeforeOpenParen",
@@ -20146,17 +20146,17 @@ function EO(e) {
       throw new TE(`${T} config is no more supported.`);
   if (e.expressionWidth <= 0)
     throw new TE(`expressionWidth config must be positive number. Received ${e.expressionWidth} instead.`);
-  if (e.params && !TO(e.params) && console.warn('WARNING: All "params" option values should be strings.'), e.paramTypes && !eO(e.paramTypes))
+  if (e.params && !EO(e.params) && console.warn('WARNING: All "params" option values should be strings.'), e.paramTypes && !TO(e.paramTypes))
     throw new TE("Empty regex given in custom paramTypes. That would result in matching infinite amount of parameters.");
   return e;
 }
-function TO(e) {
+function EO(e) {
   return (e instanceof Array ? e : Object.values(e)).every((T) => typeof T == "string");
 }
-function eO(e) {
+function TO(e) {
   return e.custom && Array.isArray(e.custom) ? e.custom.every((E) => E.regex !== "") : !0;
 }
-var RO = function(e, E) {
+var eO = function(e, E) {
   var T = {};
   for (var R in e) Object.prototype.hasOwnProperty.call(e, R) && E.indexOf(R) < 0 && (T[R] = e[R]);
   if (e != null && typeof Object.getOwnPropertySymbols == "function")
@@ -20164,7 +20164,7 @@ var RO = function(e, E) {
       E.indexOf(R[A]) < 0 && Object.prototype.propertyIsEnumerable.call(e, R[A]) && (T[R[A]] = e[R[A]]);
   return T;
 };
-const wT = {
+const $T = {
   bigquery: "bigquery",
   db2: "db2",
   db2i: "db2i",
@@ -20185,7 +20185,7 @@ const wT = {
   tsql: "transactsql",
   singlestoredb: "singlestoredb",
   snowflake: "snowflake"
-}, AO = Object.keys(wT), SO = {
+}, RO = Object.keys($T), AO = {
   tabWidth: 2,
   useTabs: !1,
   keywordCase: "preserve",
@@ -20198,21 +20198,21 @@ const wT = {
   linesBetweenQueries: 1,
   denseOperators: !1,
   newlineBeforeSemicolon: !1
-}, IO = (e, E = {}) => {
-  if (typeof E.language == "string" && !AO.includes(E.language))
+}, SO = (e, E = {}) => {
+  if (typeof E.language == "string" && !RO.includes(E.language))
     throw new TE(`Unsupported SQL dialect: ${E.language}`);
-  const T = wT[E.language || "sql"];
-  return OO(e, Object.assign(Object.assign({}, E), { dialect: LI[T] }));
-}, OO = (e, E) => {
-  var { dialect: T } = E, R = RO(E, ["dialect"]);
+  const T = $T[E.language || "sql"];
+  return IO(e, Object.assign(Object.assign({}, E), { dialect: CI[T] }));
+}, IO = (e, E) => {
+  var { dialect: T } = E, R = eO(E, ["dialect"]);
   if (typeof e != "string")
     throw new Error("Invalid query argument. Expected string, instead got " + typeof e);
-  const A = EO(Object.assign(Object.assign({}, SO), R));
-  return new zI(GI(T), A).format(e);
+  const A = zI(Object.assign(Object.assign({}, AO), R));
+  return new kI(uI(T), A).format(e);
 };
-function BT(e, E) {
+function HT(e, E) {
   try {
-    return IO(e, {
+    return SO(e, {
       language: {
         postgres: "postgresql",
         mysql: "mysql",
@@ -20228,7 +20228,7 @@ function BT(e, E) {
     return console.warn("SQL formatting failed:", T), e;
   }
 }
-class gE {
+class OO {
   cubes = /* @__PURE__ */ new Map();
   dbExecutor;
   metadataCache;
@@ -20236,7 +20236,7 @@ class gE {
   METADATA_CACHE_TTL = 300 * 1e3;
   // 5 minutes in milliseconds
   constructor(E) {
-    E?.databaseExecutor ? this.dbExecutor = E.databaseExecutor : E?.drizzle && (this.dbExecutor = ZE(
+    E?.databaseExecutor ? this.dbExecutor = E.databaseExecutor : E?.drizzle && (this.dbExecutor = QE(
       E.drizzle,
       E.schema,
       E.engineType
@@ -20258,7 +20258,7 @@ class gE {
    * Set Drizzle instance and schema directly
    */
   setDrizzle(E, T, R) {
-    this.dbExecutor = ZE(E, T, R);
+    this.dbExecutor = QE(E, T, R);
   }
   /**
    * Check if database executor is configured
@@ -20287,7 +20287,7 @@ class gE {
           );
           continue;
         }
-        const S = re(A.calculatedSql);
+        const S = Le(A.calculatedSql);
         if (!S.isValid) {
           T.push(
             `Invalid calculatedSql syntax in '${E.name}.${R}': ${S.errors.join(", ")}`
@@ -20452,7 +20452,7 @@ ${T.join(`
       throw new Error("Database executor not configured");
     const I = await new LE(this.dbExecutor).generateSQL(A, T, R), t = this.dbExecutor.getEngineType();
     return {
-      sql: BT(I.sql, t),
+      sql: HT(I.sql, t),
       params: I.params
     };
   }
@@ -20464,7 +20464,7 @@ ${T.join(`
       throw new Error("Database executor not configured");
     const A = await new LE(this.dbExecutor).generateMultiCubeSQL(this.cubes, E, T), S = this.dbExecutor.getEngineType();
     return {
-      sql: BT(A.sql, S),
+      sql: HT(A.sql, S),
       params: A.params
     };
   }
@@ -20505,7 +20505,7 @@ ${T.join(`
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(E) {
-    return JT(this.cubes, E);
+    return wT(this.cubes, E);
   }
   /**
    * Analyze query planning decisions for debugging and transparency
@@ -20515,7 +20515,7 @@ ${T.join(`
   analyzeQuery(E, T) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const R = new pT(), A = {
+    const R = new dT(), A = {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: T
@@ -20523,7 +20523,7 @@ ${T.join(`
     return R.analyzeQueryPlan(this.cubes, E, A);
   }
 }
-function JT(e, E) {
+function wT(e, E) {
   const T = [], R = /* @__PURE__ */ new Set();
   if (E.measures)
     for (const A of E.measures) {
@@ -20572,17 +20572,17 @@ function JT(e, E) {
     }
   if (E.filters)
     for (const A of E.filters)
-      xT(A, e, T, R);
+      JT(A, e, T, R);
   return R.size === 0 && T.push("Query must reference at least one cube through measures, dimensions, or filters"), {
     isValid: T.length === 0,
     errors: T
   };
 }
-function xT(e, E, T, R) {
+function JT(e, E, T, R) {
   if ("and" in e || "or" in e) {
     const t = e.and || e.or || [];
     for (const s of t)
-      xT(s, E, T, R);
+      JT(s, E, T, R);
     return;
   }
   if (!("member" in e)) {
@@ -20602,143 +20602,29 @@ function xT(e, E, T, R) {
   }
   !I.dimensions[S] && !I.measures[S] && T.push(`Filter field '${S}' not found on cube '${A}' (must be a dimension or measure)`);
 }
-function LO(e) {
-  return new gE(e);
-}
-const NO = new gE(), rO = NO;
-function nO(e) {
-  return new gE({
+function CO(e) {
+  return new OO({
     drizzle: e.drizzle,
     schema: e.schema
   });
 }
-const _O = {
-  /**
-   * Create a simple query builder
-   */
-  query: () => {
-    const e = (E, T = [], R = [], A = [], S, I) => ({
-      measures: E,
-      dimensions: T,
-      filters: R,
-      timeDimensions: A,
-      limit: S,
-      order: I
-    });
-    return {
-      measures: (E) => ({
-        dimensions: (T = []) => ({
-          filters: (R = []) => ({
-            timeDimensions: (A = []) => ({
-              limit: (S) => ({
-                order: (I) => e(E, T, R, A, S, I)
-              }),
-              order: (S) => e(E, T, R, A, void 0, S)
-            }),
-            limit: (A) => ({
-              order: (S) => e(E, T, R, [], A, S)
-            }),
-            order: (A) => e(E, T, R, [], void 0, A)
-          }),
-          timeDimensions: (R = []) => ({
-            filters: (A = []) => ({
-              limit: (S) => ({
-                order: (I) => e(E, T, A, R, S, I)
-              }),
-              order: (S) => e(E, T, A, R, void 0, S)
-            }),
-            limit: (A) => ({
-              order: (S) => e(E, T, [], R, A, S)
-            }),
-            order: (A) => e(E, T, [], R, void 0, A)
-          }),
-          limit: (R) => ({
-            order: (A) => e(E, T, [], [], R, A)
-          }),
-          order: (R) => e(E, T, [], [], void 0, R)
-        }),
-        filters: (T = []) => ({
-          dimensions: (R = []) => ({
-            timeDimensions: (A = []) => ({
-              limit: (S) => ({
-                order: (I) => e(E, R, T, A, S, I)
-              }),
-              order: (S) => e(E, R, T, A, void 0, S)
-            }),
-            limit: (A) => ({
-              order: (S) => e(E, R, T, [], A, S)
-            }),
-            order: (A) => e(E, R, T, [], void 0, A)
-          }),
-          timeDimensions: (R = []) => ({
-            dimensions: (A = []) => ({
-              limit: (S) => ({
-                order: (I) => e(E, A, T, R, S, I)
-              }),
-              order: (S) => e(E, A, T, R, void 0, S)
-            }),
-            limit: (A) => ({
-              order: (S) => e(E, [], T, R, A, S)
-            }),
-            order: (A) => e(E, [], T, R, void 0, A)
-          }),
-          limit: (R) => ({
-            order: (A) => e(E, [], T, [], R, A)
-          }),
-          order: (R) => e(E, [], T, [], void 0, R)
-        })
-      })
-    };
-  },
-  /**
-   * Create filters
-   */
-  filters: {
-    equals: (e, E) => ({ member: e, operator: "equals", values: [E] }),
-    notEquals: (e, E) => ({ member: e, operator: "notEquals", values: [E] }),
-    contains: (e, E) => ({ member: e, operator: "contains", values: [E] }),
-    greaterThan: (e, E) => ({ member: e, operator: "gt", values: [E] }),
-    lessThan: (e, E) => ({ member: e, operator: "lt", values: [E] }),
-    inDateRange: (e, E, T) => ({
-      member: e,
-      operator: "inDateRange",
-      values: [E, T]
-    }),
-    set: (e) => ({ member: e, operator: "set", values: [] }),
-    notSet: (e) => ({ member: e, operator: "notSet", values: [] })
-  },
-  /**
-   * Create time dimensions
-   */
-  timeDimensions: {
-    create: (e, E, T) => ({
-      dimension: e,
-      granularity: E,
-      dateRange: T
-    })
-  }
-};
 export {
   bE as BaseDatabaseExecutor,
   mT as MySQLExecutor,
-  Se as PostgresExecutor,
+  Ae as PostgresExecutor,
   ne as QueryBuilder,
   LE as QueryExecutor,
-  pT as QueryPlanner,
-  Oe as SQLiteExecutor,
-  gE as SemanticLayerCompiler,
-  _O as SemanticLayerUtils,
-  ZE as createDatabaseExecutor,
-  nO as createDrizzleSemanticLayer,
-  sO as createMultiCubeContext,
-  Ie as createMySQLExecutor,
-  vE as createPostgresExecutor,
-  QE as createSQLiteExecutor,
-  LO as createSemanticLayer,
-  rO as defaultSemanticLayer,
-  CO as defineCube,
+  dT as QueryPlanner,
+  Ie as SQLiteExecutor,
+  OO as SemanticLayerCompiler,
+  QE as createDatabaseExecutor,
+  CO as createDrizzleSemanticLayer,
+  tO as createMultiCubeContext,
+  Se as createMySQLExecutor,
+  xE as createPostgresExecutor,
+  vE as createSQLiteExecutor,
+  sO as defineCube,
   fE as getJoinType,
   sE as resolveCubeReference,
-  b as resolveSqlExpression,
-  NO as semanticLayer
+  b as resolveSqlExpression
 };