drizzle-cube 0.1.26 → 0.1.28

package/dist/adapters/{compiler-CSr2Ti96.js → compiler-BibS3bXd.js}

@@ -1,6 +1,6 @@
-var hR = Object.defineProperty;
-var VR = (T, E, R) => E in T ? hR(T, E, { enumerable: !0, configurable: !0, writable: !0, value: R }) : T[E] = R;
-var l = (T, E, R) => VR(T, typeof E != "symbol" ? E + "" : E, R);
+var WR = Object.defineProperty;
+var XR = (T, E, R) => E in T ? WR(T, E, { enumerable: !0, configurable: !0, writable: !0, value: R }) : T[E] = R;
+var l = (T, E, R) => XR(T, typeof E != "symbol" ? E + "" : E, R);
 const X = Symbol.for("drizzle:entityKind");
 function F(T, E) {
   if (!T || typeof T != "object")
@@ -55,21 +55,21 @@ class RE {
   }
 }
 l(RE, QT, "Column");
-const aE = Symbol.for("drizzle:Name"), ST = Symbol.for("drizzle:isPgEnum");
-function WR(T) {
-  return !!T && typeof T == "function" && ST in T && T[ST] === !0;
+const aE = Symbol.for("drizzle:Name"), eT = Symbol.for("drizzle:isPgEnum");
+function bR(T) {
+  return !!T && typeof T == "function" && eT in T && T[eT] === !0;
 }
 var ZT;
 ZT = X;
 class zE {
-  constructor(E, R, A, S = !1, e = []) {
+  constructor(E, R, A, e = !1, S = []) {
     this._ = {
       brand: "Subquery",
       sql: E,
       selectedFields: R,
       alias: A,
-      isWith: S,
-      usedTables: e
+      isWith: e,
+      usedTables: S
     };
   }
   // getSQL(): SQL<unknown> {
@@ -77,20 +77,20 @@ class zE {
   // }
 }
 l(zE, ZT, "Subquery");
-const XR = {
+const yR = {
   startActiveSpan(T, E) {
     return E();
   }
-}, SE = Symbol.for("drizzle:ViewBaseConfig"), oE = Symbol.for("drizzle:Schema"), eT = Symbol.for("drizzle:Columns"), IT = Symbol.for("drizzle:ExtraConfigColumns"), PE = Symbol.for("drizzle:OriginalName"), ME = Symbol.for("drizzle:BaseName"), CE = Symbol.for("drizzle:IsAlias"), OT = Symbol.for("drizzle:ExtraConfigBuilder"), bR = Symbol.for("drizzle:IsDrizzleTable");
-var qT, jT, kT, zT, ER, TR, RR, AR, SR, eR;
-eR = X, SR = aE, AR = PE, RR = oE, TR = eT, ER = IT, zT = ME, kT = CE, jT = bR, qT = OT;
+}, eE = Symbol.for("drizzle:ViewBaseConfig"), oE = Symbol.for("drizzle:Schema"), ST = Symbol.for("drizzle:Columns"), IT = Symbol.for("drizzle:ExtraConfigColumns"), PE = Symbol.for("drizzle:OriginalName"), ME = Symbol.for("drizzle:BaseName"), CE = Symbol.for("drizzle:IsAlias"), OT = Symbol.for("drizzle:ExtraConfigBuilder"), KR = Symbol.for("drizzle:IsDrizzleTable");
+var qT, jT, kT, zT, ER, TR, RR, AR, eR, SR;
+SR = X, eR = aE, AR = PE, RR = oE, TR = ST, ER = IT, zT = ME, kT = CE, jT = KR, qT = OT;
 class W {
   constructor(E, R, A) {
     /**
      * @internal
      * Can be changed if the table is aliased.
      */
-    l(this, SR);
+    l(this, eR);
     /**
      * @internal
      * Used to store the original name of the table, before any aliasing.
@@ -116,12 +116,12 @@ class W {
     this[aE] = this[PE] = E, this[oE] = R, this[ME] = A;
   }
 }
-l(W, eR, "Table"), /** @internal */
+l(W, SR, "Table"), /** @internal */
 l(W, "Symbol", {
   Name: aE,
   Schema: oE,
   OriginalName: PE,
-  Columns: eT,
+  Columns: ST,
   ExtraConfigColumns: IT,
   BaseName: ME,
   IsAlias: CE,
@@ -130,7 +130,7 @@ l(W, "Symbol", {
 function nR(T) {
   return T != null && typeof T.getSQL == "function";
 }
-function yR(T) {
+function $R(T) {
   var R;
   const E = { sql: "", params: [] };
   for (const A of T)
@@ -171,7 +171,7 @@ const v = class v {
     return this.queryChunks.push(...E.queryChunks), this;
   }
   toQuery(E) {
-    return XR.startActiveSpan("drizzle.buildSQL", (R) => {
+    return yR.startActiveSpan("drizzle.buildSQL", (R) => {
       const A = this.buildQueryFromSourceParams(this.queryChunks, E);
       return R == null || R.setAttributes({
         "drizzle.query.text": A.sql,
@@ -184,19 +184,19 @@ const v = class v {
       inlineParams: R.inlineParams || this.shouldInlineParams,
       paramStartIndex: R.paramStartIndex || { value: 0 }
     }), {
-      casing: S,
-      escapeName: e,
+      casing: e,
+      escapeName: S,
       escapeParam: N,
       prepareTyping: s,
       inlineParams: _,
       paramStartIndex: I
     } = A;
-    return yR(E.map((O) => {
+    return $R(E.map((O) => {
       var C;
       if (F(O, h))
         return { sql: O.value.join(""), params: [] };
       if (F(O, LE))
-        return { sql: e(O.value), params: [] };
+        return { sql: S(O.value), params: [] };
       if (O === void 0)
         return { sql: "", params: [] };
       if (Array.isArray(O)) {
@@ -213,24 +213,24 @@ const v = class v {
       if (F(O, W)) {
         const t = O[W.Symbol.Schema], i = O[W.Symbol.Name];
         return {
-          sql: t === void 0 || O[CE] ? e(i) : e(t) + "." + e(i),
+          sql: t === void 0 || O[CE] ? S(i) : S(t) + "." + S(i),
           params: []
         };
       }
       if (F(O, RE)) {
-        const t = S.getColumnCasing(O);
+        const t = e.getColumnCasing(O);
         if (R.invokeSource === "indexes")
-          return { sql: e(t), params: [] };
+          return { sql: S(t), params: [] };
         const i = O.table[W.Symbol.Schema];
         return {
-          sql: O.table[CE] || i === void 0 ? e(O.table[W.Symbol.Name]) + "." + e(t) : e(i) + "." + e(O.table[W.Symbol.Name]) + "." + e(t),
+          sql: O.table[CE] || i === void 0 ? S(O.table[W.Symbol.Name]) + "." + S(t) : S(i) + "." + S(O.table[W.Symbol.Name]) + "." + S(t),
           params: []
         };
       }
       if (F(O, ET)) {
-        const t = O[SE].schema, i = O[SE].name;
+        const t = O[eE].schema, i = O[eE].name;
         return {
-          sql: t === void 0 || O[SE].isAlias ? e(i) : e(t) + "." + e(i),
+          sql: t === void 0 || O[eE].isAlias ? S(i) : S(t) + "." + S(i),
           params: []
         };
       }
@@ -245,12 +245,12 @@ const v = class v {
         let i = ["none"];
         return s && (i = [s(O.encoder)]), { sql: N(I.value++, t), params: [t], typings: i };
       }
-      return F(O, OE) ? { sql: N(I.value++, O), params: [O], typings: ["none"] } : F(O, v.Aliased) && O.fieldAlias !== void 0 ? { sql: e(O.fieldAlias), params: [] } : F(O, zE) ? O._.isWith ? { sql: e(O._.alias), params: [] } : this.buildQueryFromSourceParams([
+      return F(O, OE) ? { sql: N(I.value++, O), params: [O], typings: ["none"] } : F(O, v.Aliased) && O.fieldAlias !== void 0 ? { sql: S(O.fieldAlias), params: [] } : F(O, zE) ? O._.isWith ? { sql: S(O._.alias), params: [] } : this.buildQueryFromSourceParams([
         new h("("),
         O._.sql,
         new h(") "),
         new LE(O._.alias)
-      ], A) : WR(O) ? O.schema ? { sql: e(O.schema) + "." + e(O.enumName), params: [] } : { sql: e(O.enumName), params: [] } : nR(O) ? (C = O.shouldOmitSQLParens) != null && C.call(O) ? this.buildQueryFromSourceParams([O.getSQL()], A) : this.buildQueryFromSourceParams([
+      ], A) : bR(O) ? O.schema ? { sql: S(O.schema) + "." + S(O.enumName), params: [] } : { sql: S(O.enumName), params: [] } : nR(O) ? (C = O.shouldOmitSQLParens) != null && C.call(O) ? this.buildQueryFromSourceParams([O.getSQL()], A) : this.buildQueryFromSourceParams([
         new h("("),
         O.getSQL(),
         new h(")")
@@ -306,7 +306,7 @@ class LE {
   }
 }
 l(LE, tR, "Name");
-function KR(T) {
+function gR(T) {
   return typeof T == "object" && T !== null && "mapToDriverValue" in T && typeof T.mapToDriverValue == "function";
 }
 const iR = {
@@ -337,8 +337,8 @@ l(IE, sR, "Param");
 function L(T, ...E) {
   const R = [];
   (E.length > 0 || T.length > 0 && T[0] !== "") && R.push(new h(T[0]));
-  for (const [A, S] of E.entries())
-    R.push(S, new h(T[A + 1]));
+  for (const [A, e] of E.entries())
+    R.push(e, new h(T[A + 1]));
   return new m(R);
 }
 ((T) => {
@@ -354,17 +354,17 @@ function L(T, ...E) {
     return new m([new h(_)]);
   }
   T.raw = A;
-  function S(_, I) {
+  function e(_, I) {
     const O = [];
     for (const [C, t] of _.entries())
       C > 0 && I !== void 0 && O.push(I), O.push(t);
     return new m(O);
   }
-  T.join = S;
-  function e(_) {
+  T.join = e;
+  function S(_) {
     return new LE(_);
   }
-  T.identifier = e;
+  T.identifier = S;
   function N(_) {
     return new OE(_);
   }
@@ -378,10 +378,10 @@ function L(T, ...E) {
   var R;
   R = X;
   const A = class A {
-    constructor(e, N) {
+    constructor(S, N) {
       /** @internal */
       l(this, "isSelectionField", !1);
-      this.sql = e, this.fieldAlias = N;
+      this.sql = S, this.fieldAlias = N;
     }
     getSQL() {
       return this.sql;
@@ -406,22 +406,22 @@ class OE {
   }
 }
 l(OE, CR, "Placeholder");
-const $R = Symbol.for("drizzle:IsDrizzleView");
+const JR = Symbol.for("drizzle:IsDrizzleView");
 var LR, _R, rR;
-rR = X, _R = SE, LR = $R;
+rR = X, _R = eE, LR = JR;
 class ET {
-  constructor({ name: E, schema: R, selectedFields: A, query: S }) {
+  constructor({ name: E, schema: R, selectedFields: A, query: e }) {
     /** @internal */
     l(this, _R);
     /** @internal */
     l(this, LR, !0);
-    this[SE] = {
+    this[eE] = {
       name: E,
       originalName: E,
       schema: R,
       selectedFields: A,
-      query: S,
-      isExisting: !S,
+      query: e,
+      isExisting: !e,
       isAlias: !1
     };
   }
@@ -440,7 +440,7 @@ zE.prototype.getSQL = function() {
   return new m([this]);
 };
 function $(T, E) {
-  return KR(E) && !nR(T) && !F(T, IE) && !F(T, OE) && !F(T, RE) && !F(T, W) && !F(T, ET) ? new IE(T, E) : T;
+  return gR(E) && !nR(T) && !F(T, IE) && !F(T, OE) && !F(T, RE) && !F(T, W) && !F(T, ET) ? new IE(T, E) : T;
 }
 const _E = (T, E) => L`${T} = ${$(E, T)}`, NT = (T, E) => L`${T} <> ${$(E, T)}`;
 function b(...T) {
@@ -481,13 +481,13 @@ function CT(T) {
 function LT(T) {
   return L`${T} asc`;
 }
-function gR(T) {
+function wR(T) {
   return L`${T} desc`;
 }
 function uE(T) {
   return L`count(${T || L.raw("*")})`.mapWith(Number);
 }
-function JR(T) {
+function xR(T) {
   return L`count(distinct ${T})`.mapWith(Number);
 }
 function Q(T) {
@@ -518,7 +518,7 @@ class TT {
     }
   }
 }
-class wR extends TT {
+class vR extends TT {
   getEngineType() {
     return "postgres";
   }
@@ -604,7 +604,7 @@ class wR extends TT {
    * Build PostgreSQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, R) {
-    const A = E.map((S) => L`WHEN ${S.when} THEN ${S.then}`).reduce((S, e) => L`${S} ${e}`);
+    const A = E.map((e) => L`WHEN ${e.when} THEN ${e.then}`).reduce((e, S) => L`${e} ${S}`);
     return R !== void 0 ? L`CASE ${A} ELSE ${R} END` : L`CASE ${A} END`;
   }
   /**
@@ -642,7 +642,7 @@ class wR extends TT {
     return E;
   }
 }
-class xR extends TT {
+class aR extends TT {
   getEngineType() {
     return "mysql";
   }
@@ -669,8 +669,8 @@ class xR extends TT {
       case "week":
         return L`DATE_SUB(${R}, INTERVAL WEEKDAY(${R}) DAY)`;
       default:
-        const S = A[E];
-        return S ? L`STR_TO_DATE(DATE_FORMAT(${R}, ${S}), '%Y-%m-%d %H:%i:%s')` : R;
+        const e = A[E];
+        return e ? L`STR_TO_DATE(DATE_FORMAT(${R}, ${e}), '%Y-%m-%d %H:%i:%s')` : R;
     }
   }
   /**
@@ -729,7 +729,7 @@ class xR extends TT {
    * Build MySQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, R) {
-    const A = E.map((S) => L`WHEN ${S.when} THEN ${S.then}`).reduce((S, e) => L`${S} ${e}`);
+    const A = E.map((e) => L`WHEN ${e.when} THEN ${e.then}`).reduce((e, S) => L`${e} ${S}`);
     return R !== void 0 ? L`CASE ${A} ELSE ${R} END` : L`CASE ${A} END`;
   }
   /**
@@ -767,7 +767,7 @@ class xR extends TT {
     return E;
   }
 }
-class vR extends TT {
+class QR extends TT {
   getEngineType() {
     return "sqlite";
   }
@@ -792,11 +792,11 @@ class vR extends TT {
       case "day":
         return L`datetime(${R}, 'unixepoch', 'start of day')`;
       case "hour":
-        const S = L`datetime(${R}, 'unixepoch')`;
-        return L`datetime(strftime('%Y-%m-%d %H:00:00', ${S}))`;
-      case "minute":
         const e = L`datetime(${R}, 'unixepoch')`;
-        return L`datetime(strftime('%Y-%m-%d %H:%M:00', ${e}))`;
+        return L`datetime(strftime('%Y-%m-%d %H:00:00', ${e}))`;
+      case "minute":
+        const S = L`datetime(${R}, 'unixepoch')`;
+        return L`datetime(strftime('%Y-%m-%d %H:%M:00', ${S}))`;
       case "second":
         const N = L`datetime(${R}, 'unixepoch')`;
         return L`datetime(strftime('%Y-%m-%d %H:%M:%S', ${N}))`;
@@ -859,7 +859,7 @@ class vR extends TT {
    * Build SQLite CASE WHEN conditional expression
    */
   buildCaseWhen(E, R) {
-    const A = E.map((S) => S.then && typeof S.then == "object" && (S.then.queryChunks || S.then._ || S.then.sql) ? L`WHEN ${S.when} THEN ${L.raw("(")}${S.then}${L.raw(")")}` : L`WHEN ${S.when} THEN ${S.then}`).reduce((S, e) => L`${S} ${e}`);
+    const A = E.map((e) => e.then && typeof e.then == "object" && (e.then.queryChunks || e.then._ || e.then.sql) ? L`WHEN ${e.when} THEN ${L.raw("(")}${e.then}${L.raw(")")}` : L`WHEN ${e.when} THEN ${e.then}`).reduce((e, S) => L`${e} ${S}`);
     return R !== void 0 ? R && typeof R == "object" && (R.queryChunks || R._ || R.sql) ? L`CASE ${A} ELSE ${L.raw("(")}${R}${L.raw(")")} END` : L`CASE ${A} ELSE ${R} END` : L`CASE ${A} END`;
   }
   /**
@@ -903,14 +903,29 @@ class vR extends TT {
     return E;
   }
 }
-function QR(T) {
+class ZR extends aR {
+  getEngineType() {
+    return "singlestore";
+  }
+  // SingleStore inherits most MySQL functionality
+  // Override methods here only if SingleStore-specific behavior is needed
+  // Note: SingleStore has some known limitations:
+  // - ORDER BY and LIMIT cannot be chained together in some contexts
+  // - Nested selects with aggregation functions are not supported
+  // - Serial column type only assures uniqueness (tests may need ORDER BY)
+  // These limitations are typically handled at the query building level
+  // rather than in the adapter, but can be addressed here if needed
+}
+function qR(T) {
   switch (T) {
     case "postgres":
-      return new wR();
+      return new vR();
     case "mysql":
-      return new xR();
+      return new aR();
     case "sqlite":
-      return new vR();
+      return new QR();
+    case "singlestore":
+      return new ZR();
     default:
       throw new Error(`Unsupported database engine: ${T}`);
   }
@@ -919,20 +934,20 @@ class RT {
   constructor(E, R, A) {
     l(this, "databaseAdapter");
     this.db = E, this.schema = R;
-    const S = A || this.getEngineType();
-    this.databaseAdapter = QR(S);
+    const e = A || this.getEngineType();
+    this.databaseAdapter = qR(e);
   }
 }
-class ZR extends RT {
+class jR extends RT {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
-      const S = await E.execute();
-      return Array.isArray(S) ? S.map((e) => this.convertNumericFields(e, R)) : S;
+      const e = await E.execute();
+      return Array.isArray(e) ? e.map((S) => this.convertNumericFields(S, R)) : e;
     }
     if (!this.db.execute)
       throw new Error("PostgreSQL database instance must have an execute method");
     const A = await this.db.execute(E);
-    return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
+    return Array.isArray(A) ? A.map((e) => this.convertNumericFields(e, R)) : A;
   }
   /**
    * Convert numeric string fields to numbers (only for measure fields)
@@ -940,8 +955,8 @@ class ZR extends RT {
   convertNumericFields(E, R) {
     if (!E || typeof E != "object") return E;
     const A = {};
-    for (const [S, e] of Object.entries(E))
-      R && R.includes(S) ? A[S] = this.coerceToNumber(e) : A[S] = e;
+    for (const [e, S] of Object.entries(E))
+      R && R.includes(e) ? A[e] = this.coerceToNumber(S) : A[e] = S;
     return A;
   }
   /**
@@ -953,13 +968,13 @@ class ZR extends RT {
     if (typeof E == "bigint") return Number(E);
     if (E && typeof E == "object") {
       if (typeof E.toString == "function") {
-        const S = E.toString();
-        if (/^-?\d+(\.\d+)?$/.test(S))
-          return S.includes(".") ? parseFloat(S) : parseInt(S, 10);
+        const e = E.toString();
+        if (/^-?\d+(\.\d+)?$/.test(e))
+          return e.includes(".") ? parseFloat(e) : parseInt(e, 10);
       }
       if (((R = E.constructor) == null ? void 0 : R.name) === "Numeric" || ((A = E.constructor) == null ? void 0 : A.name) === "Decimal" || "digits" in E || "sign" in E) {
-        const S = E.toString();
-        return parseFloat(S);
+        const e = E.toString();
+        return parseFloat(e);
       }
       return E;
     }
@@ -976,18 +991,18 @@ class ZR extends RT {
   }
 }
 function _T(T, E) {
-  return new ZR(T, E, "postgres");
+  return new jR(T, E, "postgres");
 }
-class qR extends RT {
+class oR extends RT {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
-      const S = await E.execute();
-      return Array.isArray(S) ? S.map((e) => this.convertNumericFields(e, R)) : S;
+      const e = await E.execute();
+      return Array.isArray(e) ? e.map((S) => this.convertNumericFields(S, R)) : e;
     }
     if (!this.db.execute)
       throw new Error("MySQL database instance must have an execute method");
     const A = await this.db.execute(E);
-    return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
+    return Array.isArray(A) ? A.map((e) => this.convertNumericFields(e, R)) : A;
   }
   /**
    * Convert numeric string fields to numbers (measure fields + numeric dimensions)
@@ -995,8 +1010,8 @@ class qR extends RT {
   convertNumericFields(E, R) {
     if (!E || typeof E != "object") return E;
     const A = {};
-    for (const [S, e] of Object.entries(E))
-      R && R.includes(S) ? A[S] = this.coerceToNumber(e) : A[S] = e;
+    for (const [e, S] of Object.entries(E))
+      R && R.includes(e) ? A[e] = this.coerceToNumber(S) : A[e] = S;
     return A;
   }
   /**
@@ -1016,19 +1031,19 @@ class qR extends RT {
     return "mysql";
   }
 }
-function jR(T, E) {
-  return new qR(T, E, "mysql");
+function kR(T, E) {
+  return new oR(T, E, "mysql");
 }
-class kR extends RT {
+class zR extends RT {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const A = await E.execute();
-      return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
+      return Array.isArray(A) ? A.map((e) => this.convertNumericFields(e, R)) : A;
     }
     try {
       if (this.db.all) {
         const A = this.db.all(E);
-        return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
+        return Array.isArray(A) ? A.map((e) => this.convertNumericFields(e, R)) : A;
       } else {
         if (this.db.run)
           return this.db.run(E);
@@ -1044,8 +1059,8 @@ class kR extends RT {
   convertNumericFields(E, R) {
     if (!E || typeof E != "object") return E;
     const A = {};
-    for (const [S, e] of Object.entries(E))
-      R && R.includes(S) ? A[S] = this.coerceToNumber(e) : A[S] = e;
+    for (const [e, S] of Object.entries(E))
+      R && R.includes(e) ? A[e] = this.coerceToNumber(S) : A[e] = S;
     return A;
   }
   /**
@@ -1066,7 +1081,18 @@ class kR extends RT {
   }
 }
 function rT(T, E) {
-  return new kR(T, E, "sqlite");
+  return new zR(T, E, "sqlite");
+}
+class EA extends oR {
+  getEngineType() {
+    return "singlestore";
+  }
+  // SingleStore-specific optimizations can be added here if needed
+  // For now, we inherit all behavior from MySQLExecutor since
+  // SingleStore is largely MySQL-compatible
+}
+function TA(T, E) {
+  return new EA(T, E);
 }
 function nT(T, E, R) {
   if (R)
@@ -1074,9 +1100,11 @@ function nT(T, E, R) {
       case "postgres":
         return _T(T, E);
       case "mysql":
-        return jR(T, E);
+        return kR(T, E);
       case "sqlite":
         return rT(T, E);
+      case "singlestore":
+        return TA(T, E);
     }
   if (T.all && T.run)
     return rT(T, E);
@@ -1087,7 +1115,7 @@ function nT(T, E, R) {
 function iT(T) {
   return typeof T == "function" ? T() : T;
 }
-function zR(T, E) {
+function RA(T, E) {
   if (E) return E;
   switch (T) {
     case "belongsTo":
@@ -1103,7 +1131,7 @@ function zR(T, E) {
 function x(T, E) {
   return typeof T == "function" ? T(E) : T;
 }
-class EA {
+class AA {
   constructor(E) {
     this.databaseAdapter = E;
   }
@@ -1112,43 +1140,43 @@ class EA {
    * Works for both single and multi-cube queries
    */
   buildSelections(E, R, A) {
-    const S = {}, e = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const e = {}, S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
       for (const N of R.dimensions) {
-        const [s, _] = N.split("."), I = e.get(s);
+        const [s, _] = N.split("."), I = S.get(s);
         if (I && I.dimensions && I.dimensions[_]) {
           const O = I.dimensions[_], C = x(O.sql, A);
-          S[N] = L`${C}`.as(N);
+          e[N] = L`${C}`.as(N);
         }
       }
     if (R.measures)
       for (const N of R.measures) {
-        const [s, _] = N.split("."), I = e.get(s);
+        const [s, _] = N.split("."), I = S.get(s);
         if (I && I.measures && I.measures[_]) {
           const O = I.measures[_], C = this.buildMeasureExpression(O, A);
-          S[N] = L`${C}`.as(N);
+          e[N] = L`${C}`.as(N);
         }
       }
     if (R.timeDimensions)
       for (const N of R.timeDimensions) {
-        const [s, _] = N.dimension.split("."), I = e.get(s);
+        const [s, _] = N.dimension.split("."), I = S.get(s);
         if (I && I.dimensions && I.dimensions[_]) {
           const O = I.dimensions[_], C = this.buildTimeDimensionExpression(
             O.sql,
             N.granularity,
             A
           );
-          S[N.dimension] = L`${C}`.as(N.dimension);
+          e[N.dimension] = L`${C}`.as(N.dimension);
         }
       }
-    return Object.keys(S).length === 0 && (S.count = uE()), S;
+    return Object.keys(e).length === 0 && (e.count = uE()), e;
   }
   /**
    * Build measure expression for HAVING clause, handling CTE references correctly
    */
-  buildHavingMeasureExpression(E, R, A, S, e) {
-    if (e && e.preAggregationCTEs) {
-      const N = e.preAggregationCTEs.find((s) => s.cube.name === E);
+  buildHavingMeasureExpression(E, R, A, e, S) {
+    if (S && S.preAggregationCTEs) {
+      const N = S.preAggregationCTEs.find((s) => s.cube.name === E);
       if (N && N.measures.includes(`${E}.${R}`)) {
         const s = L`${L.identifier(N.cteAlias)}.${L.identifier(R)}`;
         switch (A.type) {
@@ -1169,7 +1197,7 @@ class EA {
         }
       }
     }
-    return this.buildMeasureExpression(A, S);
+    return this.buildMeasureExpression(A, e);
   }
   /**
    * Build measure expression with aggregation and filters
@@ -1177,11 +1205,11 @@ class EA {
   buildMeasureExpression(E, R) {
     let A = x(E.sql, R);
     if (E.filters && E.filters.length > 0) {
-      const S = E.filters.map((e) => e(R)).filter(Boolean);
-      if (S.length > 0) {
-        const e = S.length === 1 ? S[0] : b(...S);
+      const e = E.filters.map((S) => S(R)).filter(Boolean);
+      if (e.length > 0) {
+        const S = e.length === 1 ? e[0] : b(...e);
         A = this.databaseAdapter.buildCaseWhen([
-          { when: e, then: A }
+          { when: S, then: A }
         ]);
       }
     }
@@ -1189,7 +1217,7 @@ class EA {
       case "count":
         return uE(A);
       case "countDistinct":
-        return JR(A);
+        return xR(A);
       case "sum":
         return Q(A);
       case "avg":
@@ -1208,58 +1236,58 @@ class EA {
    * Build time dimension expression with granularity using database adapter
    */
   buildTimeDimensionExpression(E, R, A) {
-    const S = x(E, A);
-    return R ? this.databaseAdapter.buildTimeDimension(R, S) : S instanceof m ? S : L`${S}`;
+    const e = x(E, A);
+    return R ? this.databaseAdapter.buildTimeDimension(R, e) : e instanceof m ? e : L`${e}`;
   }
   /**
    * Build WHERE conditions from semantic query filters (dimensions only)
    * Works for both single and multi-cube queries
    */
-  buildWhereConditions(E, R, A, S) {
-    const e = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+  buildWhereConditions(E, R, A, e) {
+    const S = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
       for (const s of R.filters) {
-        const _ = this.processFilter(s, N, A, "where", S);
-        _ && e.push(_);
+        const _ = this.processFilter(s, N, A, "where", e);
+        _ && S.push(_);
       }
     if (R.timeDimensions)
       for (const s of R.timeDimensions) {
         const [_, I] = s.dimension.split("."), O = N.get(_);
         if (O && O.dimensions[I] && s.dateRange) {
-          if (S != null && S.preAggregationCTEs && S.preAggregationCTEs.some((M) => M.cube.name === _))
+          if (e != null && e.preAggregationCTEs && e.preAggregationCTEs.some((M) => M.cube.name === _))
             continue;
           const C = O.dimensions[I], t = x(C.sql, A), i = this.buildDateRangeCondition(t, s.dateRange);
-          i && e.push(i);
+          i && S.push(i);
         }
       }
-    return e;
+    return S;
   }
   /**
    * Build HAVING conditions from semantic query filters (measures only)
    * Works for both single and multi-cube queries
    */
-  buildHavingConditions(E, R, A, S) {
-    const e = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+  buildHavingConditions(E, R, A, e) {
+    const S = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
       for (const s of R.filters) {
-        const _ = this.processFilter(s, N, A, "having", S);
-        _ && e.push(_);
+        const _ = this.processFilter(s, N, A, "having", e);
+        _ && S.push(_);
       }
-    return e;
+    return S;
   }
   /**
    * Process a single filter (basic or logical)
    * @param filterType - 'where' for dimension filters, 'having' for measure filters
    */
-  processFilter(E, R, A, S, e) {
+  processFilter(E, R, A, e, S) {
     if ("and" in E || "or" in E) {
       const i = E;
       if (i.and) {
-        const P = i.and.map((M) => this.processFilter(M, R, A, S, e)).filter((M) => M !== null);
+        const P = i.and.map((M) => this.processFilter(M, R, A, e, S)).filter((M) => M !== null);
         return P.length > 0 ? b(...P) : null;
       }
       if (i.or) {
-        const P = i.or.map((M) => this.processFilter(M, R, A, S, e)).filter((M) => M !== null);
+        const P = i.or.map((M) => this.processFilter(M, R, A, e, S)).filter((M) => M !== null);
         return P.length > 0 ? UE(...P) : null;
       }
     }
@@ -1267,16 +1295,16 @@ class EA {
     if (!I) return null;
     const O = I.dimensions[_], C = I.measures[_], t = O || C;
     if (!t) return null;
-    if (S === "where" && O) {
-      if (e != null && e.preAggregationCTEs && e.preAggregationCTEs.some((M) => M.cube.name === s))
+    if (e === "where" && O) {
+      if (S != null && S.preAggregationCTEs && S.preAggregationCTEs.some((M) => M.cube.name === s))
         return null;
       const i = x(O.sql, A);
       return this.buildFilterCondition(i, N.operator, N.values, t);
     } else {
-      if (S === "where" && C)
+      if (e === "where" && C)
         return null;
-      if (S === "having" && C) {
-        const i = this.buildHavingMeasureExpression(s, _, C, A, e);
+      if (e === "having" && C) {
+        const i = this.buildHavingMeasureExpression(s, _, C, A, S);
         return this.buildFilterCondition(i, N.operator, N.values, t);
       }
     }
@@ -1285,28 +1313,28 @@ class EA {
   /**
    * Build filter condition using Drizzle operators
    */
-  buildFilterCondition(E, R, A, S) {
+  buildFilterCondition(E, R, A, e) {
     if (!A || A.length === 0)
       return R === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const e = A.filter((s) => !(s == null || s === "" || typeof s == "string" && s.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
-    if (e.length === 0 && !["set", "notSet"].includes(R))
+    const S = A.filter((s) => !(s == null || s === "" || typeof s == "string" && s.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
+    if (S.length === 0 && !["set", "notSet"].includes(R))
       return R === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const N = e[0];
+    const N = S[0];
     switch (R) {
       case "equals":
-        if (e.length > 1) {
-          if ((S == null ? void 0 : S.type) === "time") {
-            const s = e.map((_) => this.normalizeDate(_) || _);
+        if (S.length > 1) {
+          if ((e == null ? void 0 : e.type) === "time") {
+            const s = S.map((_) => this.normalizeDate(_) || _);
             return cE(E, s);
           }
-          return cE(E, e);
-        } else if (e.length === 1) {
-          const s = (S == null ? void 0 : S.type) === "time" && this.normalizeDate(N) || N;
+          return cE(E, S);
+        } else if (S.length === 1) {
+          const s = (e == null ? void 0 : e.type) === "time" && this.normalizeDate(N) || N;
           return _E(E, s);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return e.length > 1 ? tT(E, e) : e.length === 1 ? NT(E, N) : null;
+        return S.length > 1 ? tT(E, S) : S.length === 1 ? NT(E, N) : null;
       case "contains":
         return this.databaseAdapter.buildStringCondition(E, "contains", N);
       case "notContains":
@@ -1328,8 +1356,8 @@ class EA {
       case "notSet":
         return sT(E);
       case "inDateRange":
-        if (e.length >= 2) {
-          const s = this.normalizeDate(e[0]), _ = this.normalizeDate(e[1]);
+        if (S.length >= 2) {
+          const s = this.normalizeDate(S[0]), _ = this.normalizeDate(S[1]);
           if (s && _)
             return b(
               j(E, s),
@@ -1346,19 +1374,19 @@ class EA {
         return s ? GE(E, s) : null;
       }
       case "between":
-        return e.length >= 2 ? b(
-          j(E, e[0]),
-          k(E, e[1])
+        return S.length >= 2 ? b(
+          j(E, S[0]),
+          k(E, S[1])
         ) : null;
       case "notBetween":
-        return e.length >= 2 ? UE(
-          lE(E, e[0]),
-          GE(E, e[1])
+        return S.length >= 2 ? UE(
+          lE(E, S[0]),
+          GE(E, S[1])
         ) : null;
       case "in":
-        return e.length > 0 ? cE(E, e) : null;
+        return S.length > 0 ? cE(E, S) : null;
       case "notIn":
-        return e.length > 0 ? tT(E, e) : null;
+        return S.length > 0 ? tT(E, S) : null;
       case "like":
         return this.databaseAdapter.buildStringCondition(E, "like", N);
       case "notLike":
@@ -1389,10 +1417,10 @@ class EA {
   buildDateRangeCondition(E, R) {
     if (!R) return null;
     if (Array.isArray(R) && R.length >= 2) {
-      const A = this.normalizeDate(R[0]), S = this.normalizeDate(R[1]);
-      return !A || !S ? null : b(
+      const A = this.normalizeDate(R[0]), e = this.normalizeDate(R[1]);
+      return !A || !e ? null : b(
         j(E, A),
-        k(E, S)
+        k(E, e)
       );
     }
     if (typeof R == "string") {
@@ -1402,13 +1430,13 @@ class EA {
           j(E, A.start),
           k(E, A.end)
         );
-      const S = this.normalizeDate(R);
-      if (!S) return null;
-      const e = new Date(S);
-      e.setUTCHours(0, 0, 0, 0);
-      const N = new Date(S);
+      const e = this.normalizeDate(R);
+      if (!e) return null;
+      const S = new Date(e);
+      S.setUTCHours(0, 0, 0, 0);
+      const N = new Date(e);
       return N.setUTCHours(23, 59, 59, 999), b(
-        j(E, e),
+        j(E, S),
         k(E, N)
       );
     }
@@ -1419,7 +1447,7 @@ class EA {
    * Handles all 14 DATE_RANGE_OPTIONS from the client
    */
   parseRelativeDateRange(E) {
-    const R = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), S = R.getUTCFullYear(), e = R.getUTCMonth(), N = R.getUTCDate(), s = R.getUTCDay();
+    const R = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), e = R.getUTCFullYear(), S = R.getUTCMonth(), N = R.getUTCDate(), s = R.getUTCDay();
     if (A === "today") {
       const C = new Date(R);
       C.setUTCHours(0, 0, 0, 0);
@@ -1439,15 +1467,15 @@ class EA {
       return i.setUTCDate(t.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     if (A === "this month") {
-      const C = new Date(Date.UTC(S, e, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, e + 1, 0, 23, 59, 59, 999));
+      const C = new Date(Date.UTC(e, S, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(e, S + 1, 0, 23, 59, 59, 999));
       return { start: C, end: t };
     }
     if (A === "this quarter") {
-      const C = Math.floor(e / 3), t = new Date(Date.UTC(S, C * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(S, C * 3 + 3, 0, 23, 59, 59, 999));
+      const C = Math.floor(S / 3), t = new Date(Date.UTC(e, C * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(e, C * 3 + 3, 0, 23, 59, 59, 999));
       return { start: t, end: i };
     }
     if (A === "this year") {
-      const C = new Date(Date.UTC(S, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, 11, 31, 23, 59, 59, 999));
+      const C = new Date(Date.UTC(e, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(e, 11, 31, 23, 59, 59, 999));
       return { start: C, end: t };
     }
     const _ = A.match(/^last\s+(\d+)\s+days?$/);
@@ -1464,29 +1492,29 @@ class EA {
       return i.setUTCDate(t.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     if (A === "last month") {
-      const C = new Date(Date.UTC(S, e - 1, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, e, 0, 23, 59, 59, 999));
+      const C = new Date(Date.UTC(e, S - 1, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(e, S, 0, 23, 59, 59, 999));
       return { start: C, end: t };
     }
     if (A === "last quarter") {
-      const C = Math.floor(e / 3), t = C === 0 ? 3 : C - 1, i = C === 0 ? S - 1 : S, P = new Date(Date.UTC(i, t * 3, 1, 0, 0, 0, 0)), M = new Date(Date.UTC(i, t * 3 + 3, 0, 23, 59, 59, 999));
+      const C = Math.floor(S / 3), t = C === 0 ? 3 : C - 1, i = C === 0 ? e - 1 : e, P = new Date(Date.UTC(i, t * 3, 1, 0, 0, 0, 0)), M = new Date(Date.UTC(i, t * 3 + 3, 0, 23, 59, 59, 999));
       return { start: P, end: M };
     }
     if (A === "last year") {
-      const C = new Date(Date.UTC(S - 1, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S - 1, 11, 31, 23, 59, 59, 999));
+      const C = new Date(Date.UTC(e - 1, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(e - 1, 11, 31, 23, 59, 59, 999));
       return { start: C, end: t };
     }
     if (A === "last 12 months") {
-      const C = new Date(Date.UTC(S, e - 11, 1, 0, 0, 0, 0)), t = new Date(R);
+      const C = new Date(Date.UTC(e, S - 11, 1, 0, 0, 0, 0)), t = new Date(R);
       return t.setUTCHours(23, 59, 59, 999), { start: C, end: t };
     }
     const I = A.match(/^last\s+(\d+)\s+months?$/);
     if (I) {
-      const C = parseInt(I[1], 10), t = new Date(Date.UTC(S, e - C + 1, 1, 0, 0, 0, 0)), i = new Date(R);
+      const C = parseInt(I[1], 10), t = new Date(Date.UTC(e, S - C + 1, 1, 0, 0, 0, 0)), i = new Date(R);
       return i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     const O = A.match(/^last\s+(\d+)\s+years?$/);
     if (O) {
-      const C = parseInt(O[1], 10), t = new Date(Date.UTC(S - C, 0, 1, 0, 0, 0, 0)), i = new Date(R);
+      const C = parseInt(O[1], 10), t = new Date(Date.UTC(e - C, 0, 1, 0, 0, 0, 0)), i = new Date(R);
       return i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     return null;
@@ -1501,8 +1529,8 @@ class EA {
     if (E instanceof Date)
       return isNaN(E.getTime()) ? null : E;
     if (typeof E == "number") {
-      const A = E < 1e10 ? E * 1e3 : E, S = new Date(A);
-      return isNaN(S.getTime()) ? null : S;
+      const A = E < 1e10 ? E * 1e3 : E, e = new Date(A);
+      return isNaN(e.getTime()) ? null : e;
     }
     if (typeof E == "string") {
       const A = new Date(E);
@@ -1515,9 +1543,9 @@ class EA {
    * Build GROUP BY fields from dimensions and time dimensions
    * Works for both single and multi-cube queries
    */
-  buildGroupByFields(E, R, A, S) {
+  buildGroupByFields(E, R, A, e) {
     var _, I;
-    const e = [];
+    const S = [];
     if (!(R.measures && R.measures.length > 0))
       return [];
     const s = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
@@ -1525,35 +1553,35 @@ class EA {
       for (const O of R.dimensions) {
         const [C, t] = O.split("."), i = s.get(C);
         if (i && i.dimensions && i.dimensions[t])
-          if ((_ = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : _.some((M) => M.cube.name === C)) {
-            const M = S.preAggregationCTEs.find((G) => G.cube.name === C), o = M.joinKeys.find((G) => G.targetColumn === t);
+          if ((_ = e == null ? void 0 : e.preAggregationCTEs) == null ? void 0 : _.some((M) => M.cube.name === C)) {
+            const M = e.preAggregationCTEs.find((G) => G.cube.name === C), o = M.joinKeys.find((G) => G.targetColumn === t);
             if (o && o.sourceColumnObj)
-              e.push(o.sourceColumnObj);
+              S.push(o.sourceColumnObj);
             else {
               const G = L`${L.identifier(M.cteAlias)}.${L.identifier(t)}`;
-              e.push(G);
+              S.push(G);
             }
           } else {
             const M = i.dimensions[t], o = x(M.sql, A);
-            e.push(o);
+            S.push(o);
           }
       }
     if (R.timeDimensions)
       for (const O of R.timeDimensions) {
         const [C, t] = O.dimension.split("."), i = s.get(C);
         if (i && i.dimensions && i.dimensions[t])
-          if ((I = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : I.some((M) => M.cube.name === C)) {
-            const M = S.preAggregationCTEs.find((G) => G.cube.name === C), o = M.joinKeys.find((G) => G.targetColumn === t);
+          if ((I = e == null ? void 0 : e.preAggregationCTEs) == null ? void 0 : I.some((M) => M.cube.name === C)) {
+            const M = e.preAggregationCTEs.find((G) => G.cube.name === C), o = M.joinKeys.find((G) => G.targetColumn === t);
             if (o && o.sourceColumnObj) {
               const G = this.buildTimeDimensionExpression(
                 o.sourceColumnObj,
                 O.granularity,
                 A
               );
-              e.push(G);
+              S.push(G);
             } else {
               const G = L`${L.identifier(M.cteAlias)}.${L.identifier(t)}`;
-              e.push(G);
+              S.push(G);
             }
           } else {
             const M = i.dimensions[t], o = this.buildTimeDimensionExpression(
@@ -1561,26 +1589,26 @@ class EA {
               O.granularity,
               A
             );
-            e.push(o);
+            S.push(o);
           }
       }
-    return e;
+    return S;
   }
   /**
    * Build ORDER BY clause with automatic time dimension sorting
    */
   buildOrderBy(E, R) {
-    var e;
-    const A = [], S = R || [
+    var S;
+    const A = [], e = R || [
       ...E.measures || [],
       ...E.dimensions || [],
-      ...((e = E.timeDimensions) == null ? void 0 : e.map((N) => N.dimension)) || []
+      ...((S = E.timeDimensions) == null ? void 0 : S.map((N) => N.dimension)) || []
     ];
     if (E.order && Object.keys(E.order).length > 0)
       for (const [N, s] of Object.entries(E.order)) {
-        if (!S.includes(N))
+        if (!e.includes(N))
           throw new Error(`Cannot order by '${N}': field is not selected in the query`);
-        const _ = s === "desc" ? gR(L.identifier(N)) : LT(L.identifier(N));
+        const _ = s === "desc" ? wR(L.identifier(N)) : LT(L.identifier(N));
         A.push(_);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
@@ -1597,13 +1625,13 @@ class EA {
    * Works for both single and multi-cube queries
    */
   collectNumericFields(E, R) {
-    const A = [], S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const A = [], e = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.measures && A.push(...R.measures), R.dimensions)
-      for (const e of R.dimensions) {
-        const [N, s] = e.split("."), _ = S.get(N);
+      for (const S of R.dimensions) {
+        const [N, s] = S.split("."), _ = e.get(N);
         if (_) {
           const I = _.dimensions[s];
-          I && I.type === "number" && A.push(e);
+          I && I.type === "number" && A.push(S);
         }
       }
     return A;
@@ -1615,21 +1643,21 @@ class EA {
   applyLimitAndOffset(E, R) {
     let A = R.limit;
     R.offset !== void 0 && R.offset > 0 && A === void 0 && (A = 50);
-    let S = E;
+    let e = E;
     if (A !== void 0) {
       if (A < 0)
         throw new Error("Limit must be non-negative");
-      S = S.limit(A);
+      e = e.limit(A);
     }
     if (R.offset !== void 0) {
       if (R.offset < 0)
         throw new Error("Offset must be non-negative");
-      S = S.offset(R.offset);
+      e = e.offset(R.offset);
     }
-    return S;
+    return e;
   }
 }
-class TA {
+class eA {
   /**
    * Analyze a semantic query to determine which cubes are involved
    */
@@ -1637,18 +1665,18 @@ class TA {
     const R = /* @__PURE__ */ new Set();
     if (E.measures)
       for (const A of E.measures) {
-        const [S] = A.split(".");
-        R.add(S);
+        const [e] = A.split(".");
+        R.add(e);
       }
     if (E.dimensions)
       for (const A of E.dimensions) {
-        const [S] = A.split(".");
-        R.add(S);
+        const [e] = A.split(".");
+        R.add(e);
       }
     if (E.timeDimensions)
       for (const A of E.timeDimensions) {
-        const [S] = A.dimension.split(".");
-        R.add(S);
+        const [e] = A.dimension.split(".");
+        R.add(e);
       }
     if (E.filters)
       for (const A of E.filters)
@@ -1661,8 +1689,8 @@ class TA {
   extractCubeNamesFromFilter(E, R) {
     if ("and" in E || "or" in E) {
       const A = E.and || E.or || [];
-      for (const S of A)
-        this.extractCubeNamesFromFilter(S, R);
+      for (const e of A)
+        this.extractCubeNamesFromFilter(e, R);
       return;
     }
     if ("member" in E) {
@@ -1677,8 +1705,8 @@ class TA {
     const A = [];
     if (!E.filters)
       return A;
-    for (const S of E.filters)
-      this.extractMeasuresFromFilter(S, R, A);
+    for (const e of E.filters)
+      this.extractMeasuresFromFilter(e, R, A);
     return A;
   }
   /**
@@ -1686,27 +1714,27 @@ class TA {
    */
   extractMeasuresFromFilter(E, R, A) {
     if ("and" in E || "or" in E) {
-      const S = E.and || E.or || [];
-      for (const e of S)
-        this.extractMeasuresFromFilter(e, R, A);
+      const e = E.and || E.or || [];
+      for (const S of e)
+        this.extractMeasuresFromFilter(S, R, A);
       return;
     }
     if ("member" in E) {
-      const S = E.member, [e] = S.split(".");
-      e === R && A.push(S);
+      const e = E.member, [S] = e.split(".");
+      S === R && A.push(e);
     }
   }
   /**
    * Create a unified query plan that works for both single and multi-cube queries
    */
   createQueryPlan(E, R, A) {
-    const S = this.analyzeCubeUsage(R), e = Array.from(S);
-    if (e.length === 0)
+    const e = this.analyzeCubeUsage(R), S = Array.from(e);
+    if (S.length === 0)
       throw new Error("No cubes found in query");
-    const N = this.choosePrimaryCube(e, R, E), s = E.get(N);
+    const N = this.choosePrimaryCube(S, R, E), s = E.get(N);
     if (!s)
       throw new Error(`Primary cube '${N}' not found`);
-    if (e.length === 1)
+    if (S.length === 1)
       return {
         primaryCube: s,
         joinCubes: [],
@@ -1718,7 +1746,7 @@ class TA {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const _ = this.buildJoinPlan(E, s, e), I = this.planPreAggregationCTEs(E, s, _, R);
+    const _ = this.buildJoinPlan(E, s, S), I = this.planPreAggregationCTEs(E, s, _, R);
     return {
       primaryCube: s,
       joinCubes: _,
@@ -1737,26 +1765,26 @@ class TA {
    */
   choosePrimaryCube(E, R, A) {
     if (R.dimensions && R.dimensions.length > 0 && A) {
-      const S = R.dimensions.map((N) => N.split(".")[0]), e = /* @__PURE__ */ new Map();
-      for (const N of S)
-        e.set(N, (e.get(N) || 0) + 1);
-      if (e.size > 0) {
-        const N = Math.max(...e.values()), s = [...e.entries()].filter(([, _]) => _ === N).map(([_]) => _).sort();
+      const e = R.dimensions.map((N) => N.split(".")[0]), S = /* @__PURE__ */ new Map();
+      for (const N of e)
+        S.set(N, (S.get(N) || 0) + 1);
+      if (S.size > 0) {
+        const N = Math.max(...S.values()), s = [...S.entries()].filter(([, _]) => _ === N).map(([_]) => _).sort();
         for (const _ of s)
           if (this.canReachAllCubes(_, E, A))
             return _;
       }
     }
     if (A) {
-      const S = /* @__PURE__ */ new Map();
-      for (const e of E)
-        if (this.canReachAllCubes(e, E, A)) {
-          const N = A.get(e), s = N != null && N.joins ? Object.keys(N.joins).length : 0;
-          S.set(e, s);
+      const e = /* @__PURE__ */ new Map();
+      for (const S of E)
+        if (this.canReachAllCubes(S, E, A)) {
+          const N = A.get(S), s = N != null && N.joins ? Object.keys(N.joins).length : 0;
+          e.set(S, s);
         }
-      if (S.size > 0) {
-        const e = Math.max(...S.values());
-        return [...S.entries()].filter(([, s]) => s === e).map(([s]) => s).sort()[0];
+      if (e.size > 0) {
+        const S = Math.max(...e.values());
+        return [...e.entries()].filter(([, s]) => s === S).map(([s]) => s).sort()[0];
       }
     }
     return [...E].sort()[0];
@@ -1765,9 +1793,9 @@ class TA {
    * Check if a cube can reach all other cubes in the list via joins
    */
   canReachAllCubes(E, R, A) {
-    const S = R.filter((e) => e !== E);
-    for (const e of S) {
-      const N = this.findJoinPath(A, E, e, /* @__PURE__ */ new Set());
+    const e = R.filter((S) => S !== E);
+    for (const S of e) {
+      const N = this.findJoinPath(A, E, S, /* @__PURE__ */ new Set());
       if (!N || N.length === 0)
         return !1;
     }
@@ -1778,15 +1806,15 @@ class TA {
    * Supports both direct joins and transitive joins through intermediate cubes
    */
   buildJoinPlan(E, R, A) {
-    const S = [], e = /* @__PURE__ */ new Set([R.name]), N = A.filter((s) => s !== R.name);
+    const e = [], S = /* @__PURE__ */ new Set([R.name]), N = A.filter((s) => s !== R.name);
     for (const s of N) {
-      if (e.has(s))
+      if (S.has(s))
         continue;
-      const _ = this.findJoinPath(E, R.name, s, e);
+      const _ = this.findJoinPath(E, R.name, s, S);
       if (!_ || _.length === 0)
         throw new Error(`No join path found from '${R.name}' to '${s}'`);
       for (const { toCube: I, joinDef: O } of _) {
-        if (e.has(I))
+        if (S.has(I))
           continue;
         const C = E.get(I);
         if (!C)
@@ -1797,40 +1825,40 @@ class TA {
           // No source alias needed - use the actual column
           null
           // No target alias needed - use the actual column 
-        ), i = zR(O.relationship, O.sqlJoinType);
-        S.push({
+        ), i = RA(O.relationship, O.sqlJoinType);
+        e.push({
           cube: C,
           alias: `${I.toLowerCase()}_cube`,
           joinType: i,
           joinCondition: t
-        }), e.add(I);
+        }), S.add(I);
       }
     }
-    return S;
+    return e;
   }
   /**
    * Build join condition from new array-based join definition
    */
   buildJoinCondition(E, R, A) {
-    const S = [];
-    for (const e of E.on) {
-      const N = R ? L`${L.identifier(R)}.${L.identifier(e.source.name)}` : e.source, s = A ? L`${L.identifier(A)}.${L.identifier(e.target.name)}` : e.target, _ = e.as || _E;
-      S.push(_(N, s));
+    const e = [];
+    for (const S of E.on) {
+      const N = R ? L`${L.identifier(R)}.${L.identifier(S.source.name)}` : S.source, s = A ? L`${L.identifier(A)}.${L.identifier(S.target.name)}` : S.target, _ = S.as || _E;
+      e.push(_(N, s));
     }
-    return b(...S);
+    return b(...e);
   }
   /**
    * Find join path from source cube to target cube
    * Returns array of join steps to reach target
    */
-  findJoinPath(E, R, A, S) {
+  findJoinPath(E, R, A, e) {
     if (R === A)
       return [];
-    const e = [
+    const S = [
       { cube: R, path: [] }
-    ], N = /* @__PURE__ */ new Set([R, ...S]);
-    for (; e.length > 0; ) {
-      const { cube: s, path: _ } = e.shift(), I = E.get(s);
+    ], N = /* @__PURE__ */ new Set([R, ...e]);
+    for (; S.length > 0; ) {
+      const { cube: s, path: _ } = S.shift(), I = E.get(s);
       if (I != null && I.joins)
         for (const [, O] of Object.entries(I.joins)) {
           const t = iT(O.targetCube).name;
@@ -1843,7 +1871,7 @@ class TA {
           }];
           if (t === A)
             return i;
-          N.add(t), e.push({ cube: t, path: i });
+          N.add(t), S.push({ cube: t, path: i });
         }
     }
     return null;
@@ -1851,17 +1879,17 @@ class TA {
   /**
    * Plan pre-aggregation CTEs for hasMany relationships to prevent fan-out
    */
-  planPreAggregationCTEs(E, R, A, S) {
-    const e = [];
-    if (!S.measures || S.measures.length === 0)
-      return e;
+  planPreAggregationCTEs(E, R, A, e) {
+    const S = [];
+    if (!e.measures || e.measures.length === 0)
+      return S;
     for (const N of A) {
       const s = this.findHasManyJoinDef(R, N.cube.name);
       if (!s)
         continue;
-      const _ = S.measures ? S.measures.filter(
+      const _ = e.measures ? e.measures.filter(
         (t) => t.startsWith(N.cube.name + ".")
-      ) : [], I = this.extractMeasuresFromFilters(S, N.cube.name), O = [.../* @__PURE__ */ new Set([..._, ...I])];
+      ) : [], I = this.extractMeasuresFromFilters(e, N.cube.name), O = [.../* @__PURE__ */ new Set([..._, ...I])];
       if (O.length === 0)
         continue;
       const C = s.on.map((t) => ({
@@ -1870,7 +1898,7 @@ class TA {
         sourceColumnObj: t.source,
         targetColumnObj: t.target
       }));
-      e.push({
+      S.push({
         cube: N.cube,
         alias: N.alias,
         cteAlias: `${N.cube.name.toLowerCase()}_agg`,
@@ -1878,7 +1906,7 @@ class TA {
         measures: O
       });
     }
-    return e;
+    return S;
   }
   /**
    * Find hasMany join definition from primary cube to target cube
@@ -1899,21 +1927,21 @@ class HE {
     l(this, "databaseAdapter");
     if (this.dbExecutor = E, this.databaseAdapter = E.databaseAdapter, !this.databaseAdapter)
       throw new Error("DatabaseExecutor must have a databaseAdapter property");
-    this.queryBuilder = new EA(this.databaseAdapter), this.queryPlanner = new TA();
+    this.queryBuilder = new AA(this.databaseAdapter), this.queryPlanner = new eA();
   }
   /**
    * Unified query execution method that handles both single and multi-cube queries
    */
   async execute(E, R, A) {
     try {
-      const S = pR(E, R);
-      if (!S.isValid)
-        throw new Error(`Query validation failed: ${S.errors.join(", ")}`);
-      const e = {
+      const e = fR(E, R);
+      if (!e.isValid)
+        throw new Error(`Query validation failed: ${e.errors.join(", ")}`);
+      const S = {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: A
-      }, N = this.queryPlanner.createQueryPlan(E, R, e), s = this.buildUnifiedQuery(N, R, e), _ = this.queryBuilder.collectNumericFields(E, R), I = await this.dbExecutor.execute(s, _), O = Array.isArray(I) ? I.map((t) => {
+      }, N = this.queryPlanner.createQueryPlan(E, R, S), s = this.buildUnifiedQuery(N, R, S), _ = this.queryBuilder.collectNumericFields(E, R), I = await this.dbExecutor.execute(s, _), O = Array.isArray(I) ? I.map((t) => {
         const i = { ...t };
         if (R.timeDimensions) {
           for (const P of R.timeDimensions)
@@ -1932,65 +1960,65 @@ class HE {
         data: O,
         annotation: C
       };
-    } catch (S) {
-      throw new Error(`Query execution failed: ${S instanceof Error ? S.message : "Unknown error"}`);
+    } catch (e) {
+      throw new Error(`Query execution failed: ${e instanceof Error ? e.message : "Unknown error"}`);
     }
   }
   /**
    * Legacy interface for single cube queries
    */
   async executeQuery(E, R, A) {
-    const S = /* @__PURE__ */ new Map();
-    return S.set(E.name, E), this.execute(S, R, A);
+    const e = /* @__PURE__ */ new Map();
+    return e.set(E.name, E), this.execute(e, R, A);
   }
   /**
    * Build pre-aggregation CTE for hasMany relationships
    */
-  buildPreAggregationCTE(E, R, A, S) {
+  buildPreAggregationCTE(E, R, A, e) {
     var M;
-    const e = E.cube, N = e.sql(A), s = {};
+    const S = E.cube, N = S.sql(A), s = {};
     for (const o of E.joinKeys)
       if (o.targetColumnObj) {
         s[o.targetColumn] = o.targetColumnObj;
-        for (const [G, a] of Object.entries(e.dimensions || {}))
+        for (const [G, a] of Object.entries(S.dimensions || {}))
           a.sql === o.targetColumnObj && G !== o.targetColumn && (s[G] = L`${o.targetColumnObj}`.as(G));
       }
     for (const o of E.measures) {
       const [, G] = o.split(".");
-      if (e.measures && e.measures[G]) {
-        const a = e.measures[G], H = this.queryBuilder.buildMeasureExpression(a, A);
+      if (S.measures && S.measures[G]) {
+        const a = S.measures[G], H = this.queryBuilder.buildMeasureExpression(a, A);
         s[G] = L`${H}`.as(G);
       }
     }
-    const _ = e.name;
+    const _ = S.name;
     if (R.dimensions)
       for (const o of R.dimensions) {
         const [G, a] = o.split(".");
-        if (G === _ && e.dimensions && e.dimensions[a]) {
-          const H = e.dimensions[a], u = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A);
+        if (G === _ && S.dimensions && S.dimensions[a]) {
+          const H = S.dimensions[a], u = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A);
           s[a] = L`${u}`.as(a);
         }
       }
     if (R.timeDimensions)
       for (const o of R.timeDimensions) {
         const [G, a] = o.dimension.split(".");
-        if (G === _ && e.dimensions && e.dimensions[a]) {
-          const H = e.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
+        if (G === _ && S.dimensions && S.dimensions[a]) {
+          const H = S.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
           s[a] = L`${u}`.as(a);
         }
       }
     if (Object.keys(s).length === 0)
       return null;
     let I = A.db.select(s).from(N.from);
-    const O = S ? {
-      ...S,
-      preAggregationCTEs: (M = S.preAggregationCTEs) == null ? void 0 : M.filter((o) => o.cube.name !== e.name)
-    } : void 0, C = this.queryBuilder.buildWhereConditions(e, R, A, O), t = [];
+    const O = e ? {
+      ...e,
+      preAggregationCTEs: (M = e.preAggregationCTEs) == null ? void 0 : M.filter((o) => o.cube.name !== S.name)
+    } : void 0, C = this.queryBuilder.buildWhereConditions(S, R, A, O), t = [];
     if (R.timeDimensions)
       for (const o of R.timeDimensions) {
         const [G, a] = o.dimension.split(".");
-        if (G === _ && e.dimensions && e.dimensions[a] && o.dateRange) {
-          const H = e.dimensions[a], u = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(u, o.dateRange);
+        if (G === _ && S.dimensions && S.dimensions[a] && o.dateRange) {
+          const H = S.dimensions[a], u = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(u, o.dateRange);
           B && t.push(B);
         }
       }
@@ -1998,8 +2026,8 @@ class HE {
       for (const o of R.filters)
         if (!("and" in o) && !("or" in o) && "member" in o && "operator" in o) {
           const G = o, [a, H] = G.member.split(".");
-          if (a === _ && e.dimensions && e.dimensions[H]) {
-            const u = e.dimensions[H];
+          if (a === _ && S.dimensions && S.dimensions[H]) {
+            const u = S.dimensions[H];
             if (G.operator === "inDateRange") {
               const B = this.queryBuilder.buildMeasureExpression({ sql: u.sql, type: "number" }, A), Y = this.queryBuilder.buildDateRangeCondition(B, G.values);
               Y && t.push(Y);
@@ -2018,16 +2046,16 @@ class HE {
     if (R.dimensions)
       for (const o of R.dimensions) {
         const [G, a] = o.split(".");
-        if (G === _ && e.dimensions && e.dimensions[a]) {
-          const H = e.dimensions[a], u = x(H.sql, A);
+        if (G === _ && S.dimensions && S.dimensions[a]) {
+          const H = S.dimensions[a], u = x(H.sql, A);
           P.push(u);
         }
       }
     if (R.timeDimensions)
       for (const o of R.timeDimensions) {
         const [G, a] = o.dimension.split(".");
-        if (G === _ && e.dimensions && e.dimensions[a]) {
-          const H = e.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
+        if (G === _ && S.dimensions && S.dimensions[a]) {
+          const H = S.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
           P.push(u);
         }
       }
@@ -2039,26 +2067,26 @@ class HE {
    */
   buildCTEJoinCondition(E, R, A) {
     var N;
-    const S = (N = A.preAggregationCTEs) == null ? void 0 : N.find((s) => s.cube.name === E.cube.name);
-    if (!S)
+    const e = (N = A.preAggregationCTEs) == null ? void 0 : N.find((s) => s.cube.name === E.cube.name);
+    if (!e)
       throw new Error(`CTE info not found for cube ${E.cube.name}`);
-    const e = [];
-    for (const s of S.joinKeys) {
+    const S = [];
+    for (const s of e.joinKeys) {
       const _ = s.sourceColumnObj || L.identifier(s.sourceColumn), I = L`${L.identifier(R)}.${L.identifier(s.targetColumn)}`;
-      e.push(_E(_, I));
+      S.push(_E(_, I));
     }
-    return e.length === 1 ? e[0] : b(...e);
+    return S.length === 1 ? S[0] : b(...S);
   }
   /**
    * Build unified query that works for both single and multi-cube queries
    */
   buildUnifiedQuery(E, R, A) {
     var M, o, G;
-    const S = [], e = /* @__PURE__ */ new Map();
+    const e = [], S = /* @__PURE__ */ new Map();
     if (E.preAggregationCTEs && E.preAggregationCTEs.length > 0)
       for (const a of E.preAggregationCTEs) {
         const H = this.buildPreAggregationCTE(a, R, A, E);
-        H && (S.push(H), e.set(a.cube.name, a.cteAlias));
+        H && (e.push(H), S.set(a.cube.name, a.cteAlias));
       }
     const N = E.primaryCube.sql(A), _ = { ...this.queryBuilder.buildSelections(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -2107,7 +2135,7 @@ class HE {
               let iE = a.joinKeys.find((DE) => DE.targetColumn === Y);
               if (!iE && ((o = V == null ? void 0 : V.dimensions) != null && o[Y])) {
                 const DE = V.dimensions[Y].sql;
-                iE = a.joinKeys.find((fR) => fR.targetColumnObj === DE);
+                iE = a.joinKeys.find((VR) => VR.targetColumnObj === DE);
               }
               iE ? _[u] = L`${L.identifier(a.cteAlias)}.${L.identifier(Y)}`.as(u) : K && ((G = V == null ? void 0 : V.dimensions) != null && G[Y]) && (_[u] = L`${L.identifier(a.cteAlias)}.${L.identifier(Y)}`.as(u));
             }
@@ -2115,7 +2143,7 @@ class HE {
         }
       }
     let I = A.db.select(_).from(N.from);
-    if (S.length > 0 && (I = A.db.with(...S).select(_).from(N.from)), N.joins)
+    if (e.length > 0 && (I = A.db.with(...e).select(_).from(N.from)), N.joins)
       for (const a of N.joins)
         switch (a.type || "left") {
           case "left":
@@ -2133,7 +2161,7 @@ class HE {
         }
     if (E.joinCubes && E.joinCubes.length > 0)
       for (const a of E.joinCubes) {
-        const H = e.get(a.cube.name);
+        const H = S.get(a.cube.name);
         let u, B;
         H ? (u = L`${L.identifier(H)}`, B = this.buildCTEJoinCondition(a, H, E)) : (u = a.cube.sql(A).from, B = a.joinCondition);
         try {
@@ -2157,7 +2185,7 @@ class HE {
     const O = [];
     if (N.where && O.push(N.where), E.joinCubes && E.joinCubes.length > 0)
       for (const a of E.joinCubes) {
-        if (e.get(a.cube.name))
+        if (S.get(a.cube.name))
           continue;
         const u = a.cube.sql(A);
         u.where && O.push(u.where);
@@ -2212,8 +2240,8 @@ class HE {
    * Generate raw SQL for debugging (without execution) - unified approach
    */
   async generateSQL(E, R, A) {
-    const S = /* @__PURE__ */ new Map();
-    return S.set(E.name, E), this.generateUnifiedSQL(S, R, A);
+    const e = /* @__PURE__ */ new Map();
+    return e.set(E.name, E), this.generateUnifiedSQL(e, R, A);
   }
   /**
    * Generate raw SQL for multi-cube queries without execution - unified approach
@@ -2225,11 +2253,11 @@ class HE {
    * Generate SQL using unified approach (works for both single and multi-cube)
    */
   async generateUnifiedSQL(E, R, A) {
-    const S = {
+    const e = {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: A
-    }, e = this.queryPlanner.createQueryPlan(E, R, S), s = this.buildUnifiedQuery(e, R, S).toSQL();
+    }, S = this.queryPlanner.createQueryPlan(E, R, e), s = this.buildUnifiedQuery(S, R, e).toSQL();
     return {
       sql: s.sql,
       params: s.params
@@ -2239,7 +2267,7 @@ class HE {
    * Generate annotations for UI metadata - unified approach
    */
   generateAnnotations(E, R) {
-    const A = {}, S = {}, e = {}, N = [E.primaryCube];
+    const A = {}, e = {}, S = {}, N = [E.primaryCube];
     if (E.joinCubes && E.joinCubes.length > 0 && N.push(...E.joinCubes.map((s) => s.cube)), R.measures)
       for (const s of R.measures) {
         const [_, I] = s.split("."), O = N.find((C) => C.name === _);
@@ -2257,7 +2285,7 @@ class HE {
         const [_, I] = s.split("."), O = N.find((C) => C.name === _);
         if (O && O.dimensions[I]) {
           const C = O.dimensions[I];
-          S[s] = {
+          e[s] = {
             title: C.title || I,
             shortTitle: C.title || I,
             type: C.type
@@ -2269,7 +2297,7 @@ class HE {
         const [_, I] = s.dimension.split("."), O = N.find((C) => C.name === _);
         if (O && O.dimensions && O.dimensions[I]) {
           const C = O.dimensions[I];
-          e[s.dimension] = {
+          S[s.dimension] = {
             title: C.title || I,
             shortTitle: C.title || I,
             type: C.type,
@@ -2279,20 +2307,20 @@ class HE {
       }
     return {
       measures: A,
-      dimensions: S,
+      dimensions: e,
       segments: {},
-      timeDimensions: e
+      timeDimensions: S
     };
   }
 }
-const r = (T) => T.flatMap(RA), RA = (T) => NE(SA(T)).map(AA), AA = (T) => T.replace(/ +/g, " ").trim(), SA = (T) => ({
+const r = (T) => T.flatMap(SA), SA = (T) => NE(OA(T)).map(IA), IA = (T) => T.replace(/ +/g, " ").trim(), OA = (T) => ({
   type: "mandatory_block",
   items: AT(T, 0)[0]
 }), AT = (T, E, R) => {
   const A = [];
   for (; T[E]; ) {
-    const [S, e] = eA(T, E);
-    if (A.push(S), E = e, T[E] === "|")
+    const [e, S] = NA(T, E);
+    if (A.push(e), E = S, T[E] === "|")
       E++;
     else if (T[E] === "}" || T[E] === "]") {
       if (R !== T[E])
@@ -2306,67 +2334,67 @@ const r = (T) => T.flatMap(RA), RA = (T) => NE(SA(T)).map(AA), AA = (T) => T.rep
       throw new Error(`Unexpected "${T[E]}"`);
   }
   return [A, E];
-}, eA = (T, E) => {
+}, NA = (T, E) => {
   const R = [];
   for (; ; ) {
-    const [A, S] = IA(T, E);
+    const [A, e] = tA(T, E);
     if (A)
-      R.push(A), E = S;
+      R.push(A), E = e;
     else
       break;
   }
   return R.length === 1 ? [R[0], E] : [{ type: "concatenation", items: R }, E];
-}, IA = (T, E) => {
+}, tA = (T, E) => {
   if (T[E] === "{")
-    return OA(T, E + 1);
+    return sA(T, E + 1);
   if (T[E] === "[")
-    return NA(T, E + 1);
+    return CA(T, E + 1);
   {
     let R = "";
     for (; T[E] && /[A-Za-z0-9_ ]/.test(T[E]); )
       R += T[E], E++;
     return [R, E];
   }
-}, OA = (T, E) => {
+}, sA = (T, E) => {
   const [R, A] = AT(T, E, "}");
   return [{ type: "mandatory_block", items: R }, A];
-}, NA = (T, E) => {
+}, CA = (T, E) => {
   const [R, A] = AT(T, E, "]");
   return [{ type: "optional_block", items: R }, A];
 }, NE = (T) => {
   if (typeof T == "string")
     return [T];
   if (T.type === "concatenation")
-    return T.items.map(NE).reduce(tA, [""]);
+    return T.items.map(NE).reduce(LA, [""]);
   if (T.type === "mandatory_block")
     return T.items.flatMap(NE);
   if (T.type === "optional_block")
     return ["", ...T.items.flatMap(NE)];
   throw new Error(`Unknown node type: ${T}`);
-}, tA = (T, E) => {
+}, LA = (T, E) => {
   const R = [];
   for (const A of T)
-    for (const S of E)
-      R.push(A + S);
+    for (const e of E)
+      R.push(A + e);
   return R;
 };
 var D;
 (function(T) {
   T.QUOTED_IDENTIFIER = "QUOTED_IDENTIFIER", T.IDENTIFIER = "IDENTIFIER", T.STRING = "STRING", T.VARIABLE = "VARIABLE", T.RESERVED_DATA_TYPE = "RESERVED_DATA_TYPE", T.RESERVED_PARAMETERIZED_DATA_TYPE = "RESERVED_PARAMETERIZED_DATA_TYPE", T.RESERVED_KEYWORD = "RESERVED_KEYWORD", T.RESERVED_FUNCTION_NAME = "RESERVED_FUNCTION_NAME", T.RESERVED_PHRASE = "RESERVED_PHRASE", T.RESERVED_SET_OPERATION = "RESERVED_SET_OPERATION", T.RESERVED_CLAUSE = "RESERVED_CLAUSE", T.RESERVED_SELECT = "RESERVED_SELECT", T.RESERVED_JOIN = "RESERVED_JOIN", T.ARRAY_IDENTIFIER = "ARRAY_IDENTIFIER", T.ARRAY_KEYWORD = "ARRAY_KEYWORD", T.CASE = "CASE", T.END = "END", T.WHEN = "WHEN", T.ELSE = "ELSE", T.THEN = "THEN", T.LIMIT = "LIMIT", T.BETWEEN = "BETWEEN", T.AND = "AND", T.OR = "OR", T.XOR = "XOR", T.OPERATOR = "OPERATOR", T.COMMA = "COMMA", T.ASTERISK = "ASTERISK", T.PROPERTY_ACCESS_OPERATOR = "PROPERTY_ACCESS_OPERATOR", T.OPEN_PAREN = "OPEN_PAREN", T.CLOSE_PAREN = "CLOSE_PAREN", T.LINE_COMMENT = "LINE_COMMENT", T.BLOCK_COMMENT = "BLOCK_COMMENT", T.DISABLE_COMMENT = "DISABLE_COMMENT", T.NUMBER = "NUMBER", T.NAMED_PARAMETER = "NAMED_PARAMETER", T.QUOTED_PARAMETER = "QUOTED_PARAMETER", T.NUMBERED_PARAMETER = "NUMBERED_PARAMETER", T.POSITIONAL_PARAMETER = "POSITIONAL_PARAMETER", T.CUSTOM_PARAMETER = "CUSTOM_PARAMETER", T.DELIMITER = "DELIMITER", T.EOF = "EOF";
 })(D = D || (D = {}));
-const aR = (T) => ({
+const PR = (T) => ({
   type: D.EOF,
   raw: "«EOF»",
   text: "«EOF»",
   start: T
-}), TE = aR(1 / 0), z = (T) => (E) => E.type === T.type && E.text === T.text, Z = {
+}), TE = PR(1 / 0), z = (T) => (E) => E.type === T.type && E.text === T.text, Z = {
   ARRAY: z({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
   BY: z({ text: "BY", type: D.RESERVED_KEYWORD }),
   SET: z({ text: "SET", type: D.RESERVED_CLAUSE }),
   STRUCT: z({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
   WINDOW: z({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
   VALUES: z({ text: "VALUES", type: D.RESERVED_CLAUSE })
-}, oR = (T) => T === D.RESERVED_DATA_TYPE || T === D.RESERVED_KEYWORD || T === D.RESERVED_FUNCTION_NAME || T === D.RESERVED_PHRASE || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.ARRAY_KEYWORD || T === D.CASE || T === D.END || T === D.WHEN || T === D.ELSE || T === D.THEN || T === D.LIMIT || T === D.BETWEEN || T === D.AND || T === D.OR || T === D.XOR, sA = (T) => T === D.AND || T === D.OR || T === D.XOR, CA = [
+}, MR = (T) => T === D.RESERVED_DATA_TYPE || T === D.RESERVED_KEYWORD || T === D.RESERVED_FUNCTION_NAME || T === D.RESERVED_PHRASE || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.ARRAY_KEYWORD || T === D.CASE || T === D.END || T === D.WHEN || T === D.ELSE || T === D.THEN || T === D.LIMIT || T === D.BETWEEN || T === D.AND || T === D.OR || T === D.XOR, _A = (T) => T === D.AND || T === D.OR || T === D.XOR, rA = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -2910,7 +2938,7 @@ const aR = (T) => ({
   // pivot
   "PIVOT",
   "UNPIVOT"
-], LA = [
+], nA = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/lexical#reserved_keywords
   "ALL",
   "AND",
@@ -3018,7 +3046,7 @@ const aR = (T) => ({
   "CASCADE",
   "RESTRICT",
   "DETERMINISTIC"
-], _A = [
+], iA = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types
   "ARRAY",
   "BOOL",
@@ -3043,7 +3071,7 @@ const aR = (T) => ({
   "STRUCT",
   "TIME",
   "TIMEZONE"
-], rA = r(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), nA = r([
+], DA = r(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), aA = r([
   // Queries: https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax
   "WITH [RECURSIVE]",
   "FROM",
@@ -3162,15 +3190,15 @@ const aR = (T) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), iA = r([
+]), oA = r([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), DA = r([
+]), PA = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), aA = r([
+]), MA = 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
@@ -3181,17 +3209,17 @@ const aR = (T) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), oA = {
+]), UA = {
   name: "bigquery",
   tokenizerOptions: {
-    reservedSelect: rA,
-    reservedClauses: [...nA, ...BE, ...DT],
-    reservedSetOperations: iA,
-    reservedJoins: DA,
-    reservedPhrases: aA,
-    reservedKeywords: LA,
-    reservedDataTypes: _A,
-    reservedFunctionNames: CA,
+    reservedSelect: DA,
+    reservedClauses: [...aA, ...BE, ...DT],
+    reservedSetOperations: oA,
+    reservedJoins: PA,
+    reservedPhrases: MA,
+    reservedKeywords: nA,
+    reservedDataTypes: iA,
+    reservedFunctionNames: rA,
     extraParens: ["[]"],
     stringTypes: [
       // The triple-quoted strings are listed first, so they get matched first.
@@ -3209,49 +3237,49 @@ const aR = (T) => ({
     variableTypes: [{ regex: String.raw`@@\w+` }],
     lineCommentTypes: ["--", "#"],
     operators: ["&", "|", "^", "~", ">>", "<<", "||", "=>"],
-    postProcess: PA
+    postProcess: GA
   },
   formatOptions: {
     onelineClauses: [...DT, ...BE],
     tabularOnelineClauses: BE
   }
 };
-function PA(T) {
-  return MA(UA(T));
+function GA(T) {
+  return lA(cA(T));
 }
-function MA(T) {
+function lA(T) {
   let E = TE;
   return T.map((R) => R.text === "OFFSET" && E.text === "[" ? (E = R, Object.assign(Object.assign({}, R), { type: D.RESERVED_FUNCTION_NAME })) : (E = R, R));
 }
-function UA(T) {
+function cA(T) {
   var E;
   const R = [];
   for (let A = 0; A < T.length; A++) {
-    const S = T[A];
-    if ((Z.ARRAY(S) || Z.STRUCT(S)) && ((E = T[A + 1]) === null || E === void 0 ? void 0 : E.text) === "<") {
-      const e = GA(T, A + 1), N = T.slice(A, e + 1);
+    const e = T[A];
+    if ((Z.ARRAY(e) || Z.STRUCT(e)) && ((E = T[A + 1]) === null || E === void 0 ? void 0 : E.text) === "<") {
+      const S = uA(T, A + 1), N = T.slice(A, S + 1);
       R.push({
         type: D.IDENTIFIER,
         raw: N.map(aT("raw")).join(""),
         text: N.map(aT("text")).join(""),
-        start: S.start
-      }), A = e;
+        start: e.start
+      }), A = S;
     } else
-      R.push(S);
+      R.push(e);
   }
   return R;
 }
 const aT = (T) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[T] + " " : E[T];
-function GA(T, E) {
+function uA(T, E) {
   let R = 0;
   for (let A = E; A < T.length; A++) {
-    const S = T[A];
-    if (S.text === "<" ? R++ : S.text === ">" ? R-- : S.text === ">>" && (R -= 2), R === 0)
+    const e = T[A];
+    if (e.text === "<" ? R++ : e.text === ">" ? R-- : e.text === ">>" && (R -= 2), R === 0)
       return A;
   }
   return T.length - 1;
 }
-const lA = [
+const HA = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=bif-aggregate-functions
   "ARRAY_AGG",
   "AVG",
@@ -3571,7 +3599,7 @@ const lA = [
   "RATIO_TO_REPORT",
   // Type casting
   "CAST"
-], cA = [
+], BA = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=sql-reserved-schema-names-reserved-words
   "ACTIVATE",
   "ADD",
@@ -3972,7 +4000,7 @@ const lA = [
   "XMLNAMESPACES",
   "YEAR",
   "YEARS"
-], uA = [
+], mA = [
   // https://www.ibm.com/docs/en/db2-for-zos/12?topic=columns-data-types
   "ARRAY",
   "BIGINT",
@@ -4014,7 +4042,7 @@ const lA = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], HA = r(["SELECT [ALL | DISTINCT]"]), BA = r([
+], FA = r(["SELECT [ALL | DISTINCT]"]), YA = r([
   // queries
   "WITH",
   "FROM",
@@ -4248,26 +4276,26 @@ const lA = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), mA = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), FA = r([
+]), pA = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), dA = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), YA = r([
+]), fA = r([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), pA = {
+]), hA = {
   name: "db2",
   tokenizerOptions: {
-    reservedSelect: HA,
-    reservedClauses: [...BA, ...oT, ...mE],
-    reservedSetOperations: mA,
-    reservedJoins: FA,
-    reservedPhrases: YA,
-    reservedKeywords: cA,
-    reservedDataTypes: uA,
-    reservedFunctionNames: lA,
+    reservedSelect: FA,
+    reservedClauses: [...YA, ...oT, ...mE],
+    reservedSetOperations: pA,
+    reservedJoins: dA,
+    reservedPhrases: fA,
+    reservedKeywords: BA,
+    reservedDataTypes: mA,
+    reservedFunctionNames: HA,
     extraParens: ["[]"],
     stringTypes: [
       { quote: "''-qq", prefixes: ["G", "N", "U&"] },
@@ -4301,7 +4329,7 @@ const lA = [
     onelineClauses: [...oT, ...mE],
     tabularOnelineClauses: mE
   }
-}, dA = [
+}, VA = [
   // 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",
@@ -4635,7 +4663,7 @@ const lA = [
   "ROW_NUMBER",
   // Type casting
   "CAST"
-], fA = [
+], WA = [
   // 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.
@@ -5131,7 +5159,7 @@ const lA = [
   "YEARS",
   "YES",
   "ZONE"
-], hA = [
+], XA = [
   // https://www.ibm.com/docs/en/i/7.2?topic=iaodsd-odbc-data-types-how-they-correspond-db2-i-database-types
   "ARRAY",
   "BIGINT",
@@ -5167,7 +5195,7 @@ const lA = [
   "VARCHAR",
   "VARGRAPHIC",
   "XML"
-], VA = r(["SELECT [ALL | DISTINCT]"]), WA = r([
+], bA = r(["SELECT [ALL | DISTINCT]"]), yA = r([
   // queries
   "WITH [RECURSIVE]",
   "INTO",
@@ -5293,27 +5321,27 @@ const lA = [
   "TAG",
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}"
-]), XA = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), bA = r([
+]), KA = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), $A = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "[LEFT | RIGHT] EXCEPTION JOIN",
   "{INNER | CROSS} JOIN"
-]), yA = r([
+]), gA = r([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), KA = {
+]), JA = {
   name: "db2i",
   tokenizerOptions: {
-    reservedSelect: VA,
-    reservedClauses: [...WA, ...PT, ...FE],
-    reservedSetOperations: XA,
-    reservedJoins: bA,
-    reservedPhrases: yA,
-    reservedKeywords: fA,
-    reservedDataTypes: hA,
-    reservedFunctionNames: dA,
+    reservedSelect: bA,
+    reservedClauses: [...yA, ...PT, ...FE],
+    reservedSetOperations: KA,
+    reservedJoins: $A,
+    reservedPhrases: gA,
+    reservedKeywords: WA,
+    reservedDataTypes: XA,
+    reservedFunctionNames: VA,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     stringTypes: [
@@ -5330,7 +5358,7 @@ const lA = [
     onelineClauses: [...PT, ...FE],
     tabularOnelineClauses: FE
   }
-}, $A = [
+}, wA = [
   // Functions from DuckDB (excluding those that start with an underscore):
   // SELECT DISTINCT upper(function_name) AS function_name
   // FROM duckdb_functions()
@@ -5993,7 +6021,7 @@ const lA = [
   // 'NULL', we really prefer treating it as keyword
   "RANK",
   "ROW_NUMBER"
-], gA = [
+], xA = [
   // Keywords from DuckDB:
   // SELECT upper(keyword_name)
   // FROM duckdb_keywords()
@@ -6075,7 +6103,7 @@ const lA = [
   "WHERE",
   "WINDOW",
   "WITH"
-], JA = [
+], vA = [
   // Types from DuckDB:
   // SELECT DISTINCT upper(type_name)
   // FROM duckdb_types()
@@ -6155,7 +6183,7 @@ const lA = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], wA = r(["SELECT [ALL | DISTINCT]"]), xA = r([
+], QA = r(["SELECT [ALL | DISTINCT]"]), ZA = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -6259,11 +6287,11 @@ const lA = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), vA = r([
+]), qA = r([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
-]), QA = r([
+]), jA = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -6272,23 +6300,23 @@ const lA = [
   "POSITIONAL JOIN",
   "ANTI JOIN",
   "SEMI JOIN"
-]), ZA = r([
+]), kA = r([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "SIMILAR TO",
   "IS [NOT] DISTINCT FROM",
   "TIMESTAMP WITH TIME ZONE"
-]), qA = {
+]), zA = {
   name: "duckdb",
   tokenizerOptions: {
-    reservedSelect: wA,
-    reservedClauses: [...xA, ...MT, ...YE],
-    reservedSetOperations: vA,
-    reservedJoins: QA,
-    reservedPhrases: ZA,
+    reservedSelect: QA,
+    reservedClauses: [...ZA, ...MT, ...YE],
+    reservedSetOperations: qA,
+    reservedJoins: jA,
+    reservedPhrases: kA,
     supportsXor: !0,
-    reservedKeywords: gA,
-    reservedDataTypes: JA,
-    reservedFunctionNames: $A,
+    reservedKeywords: xA,
+    reservedDataTypes: vA,
+    reservedFunctionNames: wA,
     nestedBlockComments: !0,
     extraParens: ["[]", "{}"],
     stringTypes: [
@@ -6351,7 +6379,7 @@ const lA = [
     onelineClauses: [...MT, ...YE],
     tabularOnelineClauses: YE
   }
-}, jA = [
+}, Ee = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF
   // math
   "ABS",
@@ -6559,7 +6587,7 @@ const lA = [
   "CUME_DIST",
   "PERCENT_RANK",
   "NTILE"
-], kA = [
+], Te = [
   // 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",
@@ -6874,7 +6902,7 @@ const lA = [
   "JSONFILE",
   "INPUTFORMAT",
   "OUTPUTFORMAT"
-], zA = [
+], Re = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types
   "ARRAY",
   "BIGINT",
@@ -6895,7 +6923,7 @@ const lA = [
   "STRUCT",
   "TIMESTAMP",
   "VARCHAR"
-], ES = r(["SELECT [ALL | DISTINCT]"]), TS = r([
+], Ae = r(["SELECT [ALL | DISTINCT]"]), ee = r([
   // queries
   "WITH",
   "FROM",
@@ -6956,23 +6984,23 @@ const lA = [
   "STORED AS",
   "STORED BY",
   "ROW FORMAT"
-]), RS = r(["UNION [ALL | DISTINCT]"]), AS = r([
+]), Se = r(["UNION [ALL | DISTINCT]"]), Ie = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "LEFT SEMI JOIN"
-]), SS = r(["{ROWS | RANGE} BETWEEN"]), eS = {
+]), Oe = r(["{ROWS | RANGE} BETWEEN"]), Ne = {
   name: "hive",
   tokenizerOptions: {
-    reservedSelect: ES,
-    reservedClauses: [...TS, ...UT, ...pE],
-    reservedSetOperations: RS,
-    reservedJoins: AS,
-    reservedPhrases: SS,
-    reservedKeywords: kA,
-    reservedDataTypes: zA,
-    reservedFunctionNames: jA,
+    reservedSelect: Ae,
+    reservedClauses: [...ee, ...UT, ...pE],
+    reservedSetOperations: Se,
+    reservedJoins: Ie,
+    reservedPhrases: Oe,
+    reservedKeywords: Te,
+    reservedDataTypes: Re,
+    reservedFunctionNames: Ee,
     extraParens: ["[]"],
     stringTypes: ['""-bs', "''-bs"],
     identTypes: ["``"],
@@ -6989,11 +7017,11 @@ function nE(T) {
     const A = T[R + 1] || TE;
     if (Z.SET(E) && A.text === "(")
       return Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME });
-    const S = T[R - 1] || TE;
-    return Z.VALUES(E) && S.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
+    const e = T[R - 1] || TE;
+    return Z.VALUES(E) && e.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
   });
 }
-const IS = [
+const te = [
   // https://mariadb.com/kb/en/reserved-words/
   "ACCESSIBLE",
   "ADD",
@@ -7210,7 +7238,7 @@ const IS = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], OS = [
+], se = [
   // https://mariadb.com/kb/en/data-types/
   "BIGINT",
   "BINARY",
@@ -7261,7 +7289,7 @@ const IS = [
   "YEAR"
   // 'NUMBER', // ?? In oracle mode only
   // 'SET' // handled as special-case in postProcess
-], NS = [
+], Ce = [
   // https://mariadb.com/kb/en/information-schema-sql_functions-table/
   "ADDDATE",
   "ADD_MONTHS",
@@ -7499,7 +7527,7 @@ const IS = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], tS = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), sS = r([
+], Le = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), _e = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -7730,12 +7758,12 @@ const IS = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), CS = r([
+]), re = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]",
   "MINUS [ALL | DISTINCT]"
-]), LS = r([
+]), ne = r([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -7743,23 +7771,23 @@ const IS = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), _S = r([
+]), ie = r([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), rS = {
+]), De = {
   name: "mariadb",
   tokenizerOptions: {
-    reservedSelect: tS,
-    reservedClauses: [...sS, ...GT, ...dE],
-    reservedSetOperations: CS,
-    reservedJoins: LS,
-    reservedPhrases: _S,
+    reservedSelect: Le,
+    reservedClauses: [..._e, ...GT, ...dE],
+    reservedSetOperations: re,
+    reservedJoins: ne,
+    reservedPhrases: ie,
     supportsXor: !0,
-    reservedKeywords: IS,
-    reservedDataTypes: OS,
-    reservedFunctionNames: NS,
+    reservedKeywords: te,
+    reservedDataTypes: se,
+    reservedFunctionNames: Ce,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -7798,7 +7826,7 @@ const IS = [
     onelineClauses: [...GT, ...dE],
     tabularOnelineClauses: dE
   }
-}, nS = [
+}, ae = [
   // https://dev.mysql.com/doc/refman/8.0/en/keywords.html
   "ACCESSIBLE",
   "ADD",
@@ -8029,7 +8057,7 @@ const IS = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], iS = [
+], oe = [
   // https://dev.mysql.com/doc/refman/8.0/en/data-types.html
   "BIGINT",
   "BINARY",
@@ -8081,7 +8109,7 @@ const IS = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], DS = [
+], Pe = [
   // https://dev.mysql.com/doc/refman/8.0/en/built-in-function-reference.html
   "ABS",
   "ACOS",
@@ -8504,7 +8532,7 @@ const IS = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], aS = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), oS = r([
+], Me = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), Ue = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8705,7 +8733,7 @@ const IS = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), PS = r(["UNION [ALL | DISTINCT]"]), MS = r([
+]), Ge = r(["UNION [ALL | DISTINCT]"]), le = r([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8713,23 +8741,23 @@ const IS = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), US = r([
+]), ce = r([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), GS = {
+]), ue = {
   name: "mysql",
   tokenizerOptions: {
-    reservedSelect: aS,
-    reservedClauses: [...oS, ...lT, ...fE],
-    reservedSetOperations: PS,
-    reservedJoins: MS,
-    reservedPhrases: US,
+    reservedSelect: Me,
+    reservedClauses: [...Ue, ...lT, ...fE],
+    reservedSetOperations: Ge,
+    reservedJoins: le,
+    reservedPhrases: ce,
     supportsXor: !0,
-    reservedKeywords: nS,
-    reservedDataTypes: iS,
-    reservedFunctionNames: DS,
+    reservedKeywords: ae,
+    reservedDataTypes: oe,
+    reservedFunctionNames: Pe,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -8770,7 +8798,7 @@ const IS = [
     onelineClauses: [...lT, ...fE],
     tabularOnelineClauses: fE
   }
-}, lS = [
+}, He = [
   // https://docs.pingcap.com/tidb/stable/keywords
   "ADD",
   "ALL",
@@ -8962,7 +8990,7 @@ const IS = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], cS = [
+], Be = [
   // https://docs.pingcap.com/tidb/stable/data-type-overview
   "BIGINT",
   "BINARY",
@@ -9009,7 +9037,7 @@ const IS = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], uS = [
+], me = [
   // 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
@@ -9335,7 +9363,7 @@ const IS = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], HS = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), BS = r([
+], Fe = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), Ye = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -9470,7 +9498,7 @@ const IS = [
   "UNLOCK TABLES",
   // https://docs.pingcap.com/tidb/stable/sql-statement-use
   "USE"
-]), mS = r(["UNION [ALL | DISTINCT]"]), FS = r([
+]), pe = r(["UNION [ALL | DISTINCT]"]), de = r([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -9478,23 +9506,23 @@ const IS = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), YS = r([
+]), fe = r([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), pS = {
+]), he = {
   name: "tidb",
   tokenizerOptions: {
-    reservedSelect: HS,
-    reservedClauses: [...BS, ...cT, ...hE],
-    reservedSetOperations: mS,
-    reservedJoins: FS,
-    reservedPhrases: YS,
+    reservedSelect: Fe,
+    reservedClauses: [...Ye, ...cT, ...hE],
+    reservedSetOperations: pe,
+    reservedJoins: de,
+    reservedPhrases: fe,
     supportsXor: !0,
-    reservedKeywords: lS,
-    reservedDataTypes: cS,
-    reservedFunctionNames: uS,
+    reservedKeywords: He,
+    reservedDataTypes: Be,
+    reservedFunctionNames: me,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -9535,7 +9563,7 @@ const IS = [
     onelineClauses: [...cT, ...hE],
     tabularOnelineClauses: hE
   }
-}, dS = [
+}, Ve = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/functions.html
   "ABORT",
   "ABS",
@@ -9765,7 +9793,7 @@ const IS = [
   // 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"
-], fS = [
+], We = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/reservedwords.html
   "ADVISE",
   "ALL",
@@ -9971,7 +9999,7 @@ const IS = [
   "WITHIN",
   "WORK",
   "XOR"
-], hS = [
+], Xe = [
   // N1QL does not support any way of declaring types for columns.
   // It does not support the CREATE TABLE statement nor the CAST() expression.
   //
@@ -9980,7 +10008,7 @@ const IS = [
   // which it actually doesn't use.
   //
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/datatypes.html
-], VS = r(["SELECT [ALL | DISTINCT]"]), WS = r([
+], be = r(["SELECT [ALL | DISTINCT]"]), ye = r([
   // queries
   "WITH",
   "FROM",
@@ -10047,18 +10075,18 @@ const IS = [
   "SET CURRENT SCHEMA",
   "SHOW",
   "USE [PRIMARY] KEYS"
-]), XS = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), bS = r(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), yS = r(["{ROWS | RANGE | GROUPS} BETWEEN"]), KS = {
+]), Ke = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), $e = r(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), ge = r(["{ROWS | RANGE | GROUPS} BETWEEN"]), Je = {
   name: "n1ql",
   tokenizerOptions: {
-    reservedSelect: VS,
-    reservedClauses: [...WS, ...uT],
-    reservedSetOperations: XS,
-    reservedJoins: bS,
-    reservedPhrases: yS,
+    reservedSelect: be,
+    reservedClauses: [...ye, ...uT],
+    reservedSetOperations: Ke,
+    reservedJoins: $e,
+    reservedPhrases: ge,
     supportsXor: !0,
-    reservedKeywords: fS,
-    reservedDataTypes: hS,
-    reservedFunctionNames: dS,
+    reservedKeywords: We,
+    reservedDataTypes: Xe,
+    reservedFunctionNames: Ve,
     // 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.
@@ -10072,7 +10100,7 @@ const IS = [
   formatOptions: {
     onelineClauses: uT
   }
-}, $S = [
+}, we = [
   // https://docs.oracle.com/cd/B19306_01/appdev.102/b14261/reservewords.htm
   // 'A',
   "ADD",
@@ -10377,7 +10405,7 @@ const IS = [
   "WRITE",
   "YEAR",
   "ZONE"
-], gS = [
+], xe = [
   // https://www.ibm.com/docs/en/db2/10.5?topic=plsql-data-types
   "ARRAY",
   "BFILE_BASE",
@@ -10415,7 +10443,7 @@ const IS = [
   "UROWID",
   "VARCHAR",
   "VARCHAR2"
-], JS = [
+], ve = [
   // https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions001.htm
   // numeric
   "ABS",
@@ -10680,7 +10708,7 @@ const IS = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], wS = r(["SELECT [ALL | DISTINCT | UNIQUE]"]), xS = r([
+], Qe = r(["SELECT [ALL | DISTINCT | UNIQUE]"]), Ze = r([
   // queries
   "WITH",
   "FROM",
@@ -10734,7 +10762,7 @@ const IS = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), vS = r(["UNION [ALL]", "MINUS", "INTERSECT"]), QS = r([
+]), qe = r(["UNION [ALL]", "MINUS", "INTERSECT"]), je = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10742,22 +10770,22 @@ const IS = [
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), ZS = r([
+]), ke = r([
   "ON {UPDATE | DELETE} [SET NULL]",
   "ON COMMIT",
   "{ROWS | RANGE} BETWEEN"
-]), qS = {
+]), ze = {
   name: "plsql",
   tokenizerOptions: {
-    reservedSelect: wS,
-    reservedClauses: [...xS, ...HT, ...VE],
-    reservedSetOperations: vS,
-    reservedJoins: QS,
-    reservedPhrases: ZS,
+    reservedSelect: Qe,
+    reservedClauses: [...Ze, ...HT, ...VE],
+    reservedSetOperations: qe,
+    reservedJoins: je,
+    reservedPhrases: ke,
     supportsXor: !0,
-    reservedKeywords: $S,
-    reservedDataTypes: gS,
-    reservedFunctionNames: JS,
+    reservedKeywords: we,
+    reservedDataTypes: xe,
+    reservedFunctionNames: ve,
     stringTypes: [
       { quote: "''-qq", prefixes: ["N"] },
       { quote: "q''", prefixes: ["N"] }
@@ -10782,7 +10810,7 @@ const IS = [
       "@",
       "||"
     ],
-    postProcess: jS
+    postProcess: ES
   },
   formatOptions: {
     alwaysDenseOperators: ["@"],
@@ -10790,11 +10818,11 @@ const IS = [
     tabularOnelineClauses: VE
   }
 };
-function jS(T) {
+function ES(T) {
   let E = TE;
-  return T.map((R) => Z.SET(R) && Z.BY(E) ? Object.assign(Object.assign({}, R), { type: D.RESERVED_KEYWORD }) : (oR(R.type) && (E = R), R));
+  return T.map((R) => Z.SET(R) && Z.BY(E) ? Object.assign(Object.assign({}, R), { type: D.RESERVED_KEYWORD }) : (MR(R.type) && (E = R), R));
 }
-const kS = [
+const TS = [
   // https://www.postgresql.org/docs/14/functions.html
   //
   // https://www.postgresql.org/docs/14/functions-math.html
@@ -11478,7 +11506,7 @@ const kS = [
   "PG_MCV_LIST_ITEMS",
   // cast
   "CAST"
-], zS = [
+], RS = [
   // https://www.postgresql.org/docs/14/sql-keywords-appendix.html
   "ALL",
   "ANALYSE",
@@ -11597,7 +11625,7 @@ const kS = [
   "WITHOUT",
   "YEAR"
   // requires AS
-], Ee = [
+], AS = [
   // https://www.postgresql.org/docs/current/datatype.html
   "ARRAY",
   "BIGINT",
@@ -11631,7 +11659,7 @@ const kS = [
   "VARCHAR",
   "XML",
   "ZONE"
-], Te = r(["SELECT [ALL | DISTINCT]"]), Re = r([
+], eS = r(["SELECT [ALL | DISTINCT]"]), SS = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -11854,17 +11882,17 @@ const kS = [
   "START TRANSACTION",
   "UNLISTEN",
   "VACUUM"
-]), Ae = r([
+]), IS = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), Se = r([
+]), OS = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), ee = r([
+]), NS = r([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
@@ -11877,17 +11905,17 @@ const kS = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), Ie = {
+]), tS = {
   name: "postgresql",
   tokenizerOptions: {
-    reservedSelect: Te,
-    reservedClauses: [...Re, ...BT, ...WE],
-    reservedSetOperations: Ae,
-    reservedJoins: Se,
-    reservedPhrases: ee,
-    reservedKeywords: zS,
-    reservedDataTypes: Ee,
-    reservedFunctionNames: kS,
+    reservedSelect: eS,
+    reservedClauses: [...SS, ...BT, ...WE],
+    reservedSetOperations: IS,
+    reservedJoins: OS,
+    reservedPhrases: NS,
+    reservedKeywords: RS,
+    reservedDataTypes: AS,
+    reservedFunctionNames: TS,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     stringTypes: [
@@ -12001,7 +12029,7 @@ const kS = [
     onelineClauses: [...BT, ...WE],
     tabularOnelineClauses: WE
   }
-}, Oe = [
+}, sS = [
   // https://docs.aws.amazon.com/redshift/latest/dg/c_Aggregate_Functions.html
   "ANY_VALUE",
   "APPROXIMATE PERCENTILE_DISC",
@@ -12347,7 +12375,7 @@ const kS = [
   "SLICE_NUM",
   "USER",
   "VERSION"
-], Ne = [
+], CS = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_pg_keywords.html
   "AES128",
   "AES256",
@@ -12536,7 +12564,7 @@ const kS = [
    * SVL: https://docs.aws.amazon.com/redshift/latest/dg/svl_views.html
    * SVV: https://docs.aws.amazon.com/redshift/latest/dg/svv_views.html
    */
-], te = [
+], LS = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_Character_types.html#r_Character_types-text-and-bpchar-types
   "ARRAY",
   "BIGINT",
@@ -12557,7 +12585,7 @@ const kS = [
   "TEXT",
   "VARBYTE",
   "VARCHAR"
-], se = r(["SELECT [ALL | DISTINCT]"]), Ce = r([
+], _S = r(["SELECT [ALL | DISTINCT]"]), rS = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12668,13 +12696,13 @@ const kS = [
   "START TRANSACTION",
   "UNLOAD",
   "VACUUM"
-]), Le = r(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), _e = r([
+]), nS = r(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), iS = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), re = r([
+]), DS = 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
@@ -12682,17 +12710,17 @@ const kS = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), ne = {
+]), aS = {
   name: "redshift",
   tokenizerOptions: {
-    reservedSelect: se,
-    reservedClauses: [...Ce, ...mT, ...XE],
-    reservedSetOperations: Le,
-    reservedJoins: _e,
-    reservedPhrases: re,
-    reservedKeywords: Ne,
-    reservedDataTypes: te,
-    reservedFunctionNames: Oe,
+    reservedSelect: _S,
+    reservedClauses: [...rS, ...mT, ...XE],
+    reservedSetOperations: nS,
+    reservedJoins: iS,
+    reservedPhrases: DS,
+    reservedKeywords: CS,
+    reservedDataTypes: LS,
+    reservedFunctionNames: sS,
     stringTypes: ["''-qq"],
     identTypes: ['""-qq'],
     identChars: { first: "#" },
@@ -12718,7 +12746,7 @@ const kS = [
     onelineClauses: [...mT, ...XE],
     tabularOnelineClauses: XE
   }
-}, ie = [
+}, oS = [
   // https://deepkb.com/CO_000013/en/kb/IMPORT-fbfa59f0-2bf1-31fe-bb7b-0f9efe9932c6/spark-sql-keywords
   "ADD",
   "AFTER",
@@ -12985,7 +13013,7 @@ const kS = [
   "UNSIGNED",
   "VARIABLES",
   "YEAR_MONTH"
-], De = [
+], PS = [
   // https://spark.apache.org/docs/latest/sql-ref-datatypes.html
   "ARRAY",
   "BIGINT",
@@ -13015,7 +13043,7 @@ const kS = [
   "TINYINT",
   "VARCHAR"
   // No varchar type in Spark, only STRING. Added for the sake of tests
-], ae = [
+], MS = [
   // http://spark.apache.org/docs/latest/sql-ref-functions.html
   //
   // http://spark.apache.org/docs/latest/sql-ref-functions-builtin.html#aggregate-functions
@@ -13336,7 +13364,7 @@ const kS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], oe = r(["SELECT [ALL | DISTINCT]"]), Pe = r([
+], US = r(["SELECT [ALL | DISTINCT]"]), GS = r([
   // queries
   "WITH",
   "FROM",
@@ -13417,11 +13445,11 @@ const kS = [
   "SHOW TBLPROPERTIES",
   "SHOW VIEWS",
   "UNCACHE TABLE"
-]), Me = r([
+]), lS = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), Ue = r([
+]), cS = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -13430,23 +13458,23 @@ const kS = [
   // non-standard-joins
   "[LEFT] {ANTI | SEMI} JOIN",
   "NATURAL [LEFT] {ANTI | SEMI} JOIN"
-]), Ge = r([
+]), uS = r([
   "ON DELETE",
   "ON UPDATE",
   "CURRENT ROW",
   "{ROWS | RANGE} BETWEEN"
-]), le = {
+]), HS = {
   name: "spark",
   tokenizerOptions: {
-    reservedSelect: oe,
-    reservedClauses: [...Pe, ...FT, ...bE],
-    reservedSetOperations: Me,
-    reservedJoins: Ue,
-    reservedPhrases: Ge,
+    reservedSelect: US,
+    reservedClauses: [...GS, ...FT, ...bE],
+    reservedSetOperations: lS,
+    reservedJoins: cS,
+    reservedPhrases: uS,
     supportsXor: !0,
-    reservedKeywords: ie,
-    reservedDataTypes: De,
-    reservedFunctionNames: ae,
+    reservedKeywords: oS,
+    reservedDataTypes: PS,
+    reservedFunctionNames: MS,
     extraParens: ["[]"],
     stringTypes: [
       "''-bs",
@@ -13458,20 +13486,20 @@ const kS = [
     identChars: { allowFirstCharNumber: !0 },
     variableTypes: [{ quote: "{}", prefixes: ["$"], requirePrefix: !0 }],
     operators: ["%", "~", "^", "|", "&", "<=>", "==", "!", "||", "->"],
-    postProcess: ce
+    postProcess: BS
   },
   formatOptions: {
     onelineClauses: [...FT, ...bE],
     tabularOnelineClauses: bE
   }
 };
-function ce(T) {
+function BS(T) {
   return T.map((E, R) => {
-    const A = T[R - 1] || TE, S = T[R + 1] || TE;
-    return Z.WINDOW(E) && S.type === D.OPEN_PAREN ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E.text === "ITEMS" && E.type === D.RESERVED_KEYWORD && !(A.text === "COLLECTION" && S.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: D.IDENTIFIER, text: E.raw }) : E;
+    const A = T[R - 1] || TE, e = T[R + 1] || TE;
+    return Z.WINDOW(E) && e.type === D.OPEN_PAREN ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E.text === "ITEMS" && E.type === D.RESERVED_KEYWORD && !(A.text === "COLLECTION" && e.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: D.IDENTIFIER, text: E.raw }) : E;
   });
 }
-const ue = [
+const mS = [
   // https://www.sqlite.org/lang_corefunc.html
   "ABS",
   "CHANGES",
@@ -13595,7 +13623,7 @@ const ue = [
   "JSON_TREE",
   // cast
   "CAST"
-], He = [
+], FS = [
   // 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.
@@ -13748,7 +13776,7 @@ const ue = [
   "WINDOW",
   "WITH",
   "WITHOUT"
-], Be = [
+], YS = [
   // 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.
@@ -13769,7 +13797,7 @@ const ue = [
   "TEXT",
   "VARCHAR",
   "VARYING CHARACTER"
-], me = r(["SELECT [ALL | DISTINCT]"]), Fe = r([
+], pS = r(["SELECT [ALL | DISTINCT]"]), dS = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13807,27 +13835,27 @@ const ue = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), Ye = r(["UNION [ALL]", "EXCEPT", "INTERSECT"]), pe = r([
+]), fS = r(["UNION [ALL]", "EXCEPT", "INTERSECT"]), hS = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), de = r([
+]), VS = r([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
-]), fe = {
+]), WS = {
   name: "sqlite",
   tokenizerOptions: {
-    reservedSelect: me,
-    reservedClauses: [...Fe, ...YT, ...yE],
-    reservedSetOperations: Ye,
-    reservedJoins: pe,
-    reservedPhrases: de,
-    reservedKeywords: He,
-    reservedDataTypes: Be,
-    reservedFunctionNames: ue,
+    reservedSelect: pS,
+    reservedClauses: [...dS, ...YT, ...yE],
+    reservedSetOperations: fS,
+    reservedJoins: hS,
+    reservedPhrases: VS,
+    reservedKeywords: FS,
+    reservedDataTypes: YS,
+    reservedFunctionNames: mS,
     stringTypes: [
       "''-qq",
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -13843,7 +13871,7 @@ const ue = [
     onelineClauses: [...YT, ...yE],
     tabularOnelineClauses: yE
   }
-}, he = [
+}, XS = [
   // 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
@@ -13940,7 +13968,7 @@ const ue = [
   "ASIN",
   "ACOS",
   "ATAN"
-], Ve = [
+], bS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#reserved-word
   "ALL",
   "ALLOCATE",
@@ -14138,7 +14166,7 @@ const ue = [
   "WITHIN",
   "WITHOUT",
   "YEAR"
-], We = [
+], yS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_1_data_type
   "ARRAY",
   "BIGINT",
@@ -14178,7 +14206,7 @@ const ue = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], Xe = r(["SELECT [ALL | DISTINCT]"]), be = r([
+], KS = r(["SELECT [ALL | DISTINCT]"]), $S = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14222,30 +14250,30 @@ const ue = [
   "TRUNCATE TABLE",
   // other
   "SET SCHEMA"
-]), ye = r([
+]), gS = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), Ke = r([
+]), JS = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), $e = r([
+]), wS = r([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), ge = {
+]), xS = {
   name: "sql",
   tokenizerOptions: {
-    reservedSelect: Xe,
-    reservedClauses: [...be, ...pT, ...KE],
-    reservedSetOperations: ye,
-    reservedJoins: Ke,
-    reservedPhrases: $e,
-    reservedKeywords: Ve,
-    reservedDataTypes: We,
-    reservedFunctionNames: he,
+    reservedSelect: KS,
+    reservedClauses: [...$S, ...pT, ...KE],
+    reservedSetOperations: gS,
+    reservedJoins: JS,
+    reservedPhrases: wS,
+    reservedKeywords: bS,
+    reservedDataTypes: yS,
+    reservedFunctionNames: XS,
     stringTypes: [
       { quote: "''-qq-bs", prefixes: ["N", "U&"] },
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -14258,7 +14286,7 @@ const ue = [
     onelineClauses: [...pT, ...KE],
     tabularOnelineClauses: KE
   }
-}, Je = [
+}, vS = [
   // 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
@@ -14692,7 +14720,7 @@ const ue = [
   "NEXT",
   "PERMUTE",
   "PREV"
-], we = [
+], QS = [
   // https://github.com/trinodb/trino/blob/432d2897bdef99388c1a47188743a061c4ac1f34/core/trino-parser/src/main/antlr4/io/trino/sql/parser/SqlBase.g4#L858-L1128
   "ABSENT",
   "ADD",
@@ -14929,7 +14957,7 @@ const ue = [
   "WRAPPER",
   "WRITE",
   "ZONE"
-], xe = [
+], ZS = [
   // 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",
@@ -14968,7 +14996,7 @@ const ue = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], ve = r(["SELECT [ALL | DISTINCT]"]), Qe = r([
+], qS = r(["SELECT [ALL | DISTINCT]"]), jS = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -15054,31 +15082,31 @@ const ue = [
   "SHOW ROLE GRANTS",
   "SHOW FUNCTIONS",
   "SHOW SESSION"
-]), Ze = r([
+]), kS = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), qe = r([
+]), zS = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), je = r([
+]), EI = r([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), ke = {
+]), TI = {
   name: "trino",
   tokenizerOptions: {
-    reservedSelect: ve,
-    reservedClauses: [...Qe, ...dT, ...$E],
-    reservedSetOperations: Ze,
-    reservedJoins: qe,
-    reservedPhrases: je,
-    reservedKeywords: we,
-    reservedDataTypes: xe,
-    reservedFunctionNames: Je,
+    reservedSelect: qS,
+    reservedClauses: [...jS, ...dT, ...$E],
+    reservedSetOperations: kS,
+    reservedJoins: zS,
+    reservedPhrases: EI,
+    reservedKeywords: QS,
+    reservedDataTypes: ZS,
+    reservedFunctionNames: vS,
     // Trino also supports {- ... -} parenthesis.
     // The formatting of these currently works out as a result of { and -
     // not getting a space added in-between.
@@ -15110,7 +15138,7 @@ const ue = [
     onelineClauses: [...dT, ...$E],
     tabularOnelineClauses: $E
   }
-}, ze = [
+}, RI = [
   // https://docs.microsoft.com/en-us/sql/t-sql/functions/functions?view=sql-server-ver15
   // aggregate
   "APPROX_COUNT_DISTINCT",
@@ -15415,7 +15443,7 @@ const ue = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], EI = [
+], AI = [
   // https://docs.microsoft.com/en-us/sql/t-sql/language-elements/reserved-keywords-transact-sql?view=sql-server-ver15
   // standard
   "ADD",
@@ -15596,7 +15624,7 @@ const ue = [
   "WRITETEXT",
   // https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql?view=sql-server-ver16#action
   "$ACTION"
-], TI = [
+], eI = [
   // https://learn.microsoft.com/en-us/sql/t-sql/data-types/data-types-transact-sql?view=sql-server-ver15
   "BINARY",
   "BIT",
@@ -15623,7 +15651,7 @@ const ue = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], RI = r(["SELECT [ALL | DISTINCT]"]), AI = r([
+], SI = r(["SELECT [ALL | DISTINCT]"]), II = r([
   // queries
   "WITH",
   "INTO",
@@ -15830,26 +15858,26 @@ const ue = [
   "XACT_ABORT",
   "XML INDEX",
   "XML SCHEMA COLLECTION"
-]), SI = r(["UNION [ALL]", "EXCEPT", "INTERSECT"]), eI = r([
+]), OI = r(["UNION [ALL]", "EXCEPT", "INTERSECT"]), NI = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), II = r([
+]), tI = r([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), OI = {
+]), sI = {
   name: "transactsql",
   tokenizerOptions: {
-    reservedSelect: RI,
-    reservedClauses: [...AI, ...fT, ...gE],
-    reservedSetOperations: SI,
-    reservedJoins: eI,
-    reservedPhrases: II,
-    reservedKeywords: EI,
-    reservedDataTypes: TI,
-    reservedFunctionNames: ze,
+    reservedSelect: SI,
+    reservedClauses: [...II, ...fT, ...gE],
+    reservedSetOperations: OI,
+    reservedJoins: NI,
+    reservedPhrases: tI,
+    reservedKeywords: AI,
+    reservedDataTypes: eI,
+    reservedFunctionNames: RI,
     nestedBlockComments: !0,
     stringTypes: [{ quote: "''-qq", prefixes: ["N"] }, "{}"],
     identTypes: ['""-qq', "[]"],
@@ -15882,7 +15910,7 @@ const ue = [
     onelineClauses: [...fT, ...gE],
     tabularOnelineClauses: gE
   }
-}, NI = [
+}, CI = [
   // 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
@@ -16095,7 +16123,7 @@ const ue = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], tI = [
+], LI = [
   // https://docs.singlestore.com/cloud/reference/sql-reference/data-types/
   "BIGINT",
   "BINARY",
@@ -16144,7 +16172,7 @@ const ue = [
   "VARCHAR",
   "VARCHARACTER",
   "YEAR"
-], sI = [
+], _I = [
   // 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
@@ -16424,7 +16452,7 @@ const ue = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], CI = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), LI = r([
+], rI = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), nI = r([
   // queries
   "WITH",
   "FROM",
@@ -16625,35 +16653,35 @@ const ue = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), _I = r([
+]), iI = r([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
   "MINUS"
-]), rI = r([
+]), DI = r([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), nI = r([
+]), aI = r([
   "ON DELETE",
   "ON UPDATE",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), iI = {
+]), oI = {
   name: "singlestoredb",
   tokenizerOptions: {
-    reservedSelect: CI,
-    reservedClauses: [...LI, ...hT, ...JE],
-    reservedSetOperations: _I,
-    reservedJoins: rI,
-    reservedPhrases: nI,
-    reservedKeywords: NI,
-    reservedDataTypes: tI,
-    reservedFunctionNames: sI,
+    reservedSelect: rI,
+    reservedClauses: [...nI, ...hT, ...JE],
+    reservedSetOperations: iI,
+    reservedJoins: DI,
+    reservedPhrases: aI,
+    reservedKeywords: CI,
+    reservedDataTypes: LI,
+    reservedFunctionNames: _I,
     // TODO: support _binary"some string" prefix
     stringTypes: [
       '""-qq-bs',
@@ -16693,7 +16721,7 @@ const ue = [
     onelineClauses: [...hT, ...JE],
     tabularOnelineClauses: JE
   }
-}, DI = [
+}, PI = [
   // https://docs.snowflake.com/en/sql-reference-functions.html
   //
   // https://docs.snowflake.com/en/sql-reference/functions-all.html
@@ -17300,7 +17328,7 @@ const ue = [
   "QUARTER",
   "ZEROIFNULL",
   "ZIPF"
-], aI = [
+], MI = [
   // 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)
@@ -17397,7 +17425,7 @@ const ue = [
   "WITH",
   // These are definitely keywords, but haven't found a definite list in the docs
   "COMMENT"
-], oI = [
+], UI = [
   "NUMBER",
   "DECIMAL",
   "NUMERIC",
@@ -17434,7 +17462,7 @@ const ue = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], PI = r(["SELECT [ALL | DISTINCT]"]), MI = r([
+], GI = r(["SELECT [ALL | DISTINCT]"]), lI = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -17706,24 +17734,24 @@ const ue = [
   "USE SCHEMA",
   "USE SECONDARY ROLES",
   "USE WAREHOUSE"
-]), UI = r(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), GI = r([
+]), cI = r(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), uI = r([
   "[INNER] JOIN",
   "[NATURAL] {LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{CROSS | NATURAL} JOIN"
-]), lI = r([
+]), HI = r([
   "{ROWS | RANGE} BETWEEN",
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]"
-]), cI = {
+]), BI = {
   name: "snowflake",
   tokenizerOptions: {
-    reservedSelect: PI,
-    reservedClauses: [...MI, ...VT, ...wE],
-    reservedSetOperations: UI,
-    reservedJoins: GI,
-    reservedPhrases: lI,
-    reservedKeywords: aI,
-    reservedDataTypes: oI,
-    reservedFunctionNames: DI,
+    reservedSelect: GI,
+    reservedClauses: [...lI, ...VT, ...wE],
+    reservedSetOperations: cI,
+    reservedJoins: uI,
+    reservedPhrases: HI,
+    reservedKeywords: MI,
+    reservedDataTypes: UI,
+    reservedFunctionNames: PI,
     stringTypes: ["$$", "''-qq-bs"],
     identTypes: ['""-qq'],
     variableTypes: [
@@ -17756,43 +17784,43 @@ const ue = [
     onelineClauses: [...VT, ...wE],
     tabularOnelineClauses: wE
   }
-}, uI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, mI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  bigquery: oA,
-  db2: pA,
-  db2i: KA,
-  duckdb: qA,
-  hive: eS,
-  mariadb: rS,
-  mysql: GS,
-  n1ql: KS,
-  plsql: qS,
-  postgresql: Ie,
-  redshift: ne,
-  singlestoredb: iI,
-  snowflake: cI,
-  spark: le,
-  sql: ge,
-  sqlite: fe,
-  tidb: pS,
-  transactsql: OI,
-  trino: ke
-}, Symbol.toStringTag, { value: "Module" })), eE = (T) => T[T.length - 1], PR = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), tE = (T) => T.replace(/\s+/gu, " "), xE = (T) => /\n/.test(T), y = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), WT = /\s+/uy, q = (T) => new RegExp(`(?:${T})`, "uy"), HI = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), BI = (T) => T + "(?:-" + T + ")*", mI = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(HI).join("|")}${E ? "" : "|"})`, FI = (T) => new RegExp(`(?:${T.map(y).join("|")}).*?(?=\r
+  bigquery: UA,
+  db2: hA,
+  db2i: JA,
+  duckdb: zA,
+  hive: Ne,
+  mariadb: De,
+  mysql: ue,
+  n1ql: Je,
+  plsql: ze,
+  postgresql: tS,
+  redshift: aS,
+  singlestoredb: oI,
+  snowflake: BI,
+  spark: HS,
+  sql: xS,
+  sqlite: WS,
+  tidb: he,
+  transactsql: sI,
+  trino: TI
+}, Symbol.toStringTag, { value: "Module" })), SE = (T) => T[T.length - 1], UR = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), tE = (T) => T.replace(/\s+/gu, " "), xE = (T) => /\n/.test(T), y = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), WT = /\s+/uy, q = (T) => new RegExp(`(?:${T})`, "uy"), FI = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), YI = (T) => T + "(?:-" + T + ")*", pI = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(FI).join("|")}${E ? "" : "|"})`, dI = (T) => new RegExp(`(?:${T.map(y).join("|")}).*?(?=\r
 |\r|
 |$)`, "uy"), XT = (T, E = []) => {
-  const R = T === "open" ? 0 : 1, A = ["()", ...E].map((S) => S[R]);
+  const R = T === "open" ? 0 : 1, A = ["()", ...E].map((e) => e[R]);
   return q(A.map(y).join("|"));
-}, bT = (T) => q(`${PR(T).map(y).join("|")}`), YI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", J = (T, E = {}) => {
+}, bT = (T) => q(`${UR(T).map(y).join("|")}`), fI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", J = (T, E = {}) => {
   if (T.length === 0)
     return /^\b$/u;
-  const R = YI(E), A = PR(T).map(y).join("|").replace(/ /gu, "\\s+");
+  const R = fI(E), A = UR(T).map(y).join("|").replace(/ /gu, "\\s+");
   return new RegExp(`(?:${A})${R}\\b`, "iuy");
 }, vE = (T, E) => {
   if (!T.length)
     return;
   const R = T.map(y).join("|");
   return q(`(?:${R})(?:${E})`);
-}, pI = () => {
+}, hI = () => {
   const T = {
     "<": ">",
     "[": "]",
@@ -17824,16 +17852,16 @@ const ue = [
   // Hive and Spark variables: ${name}
   "{}": String.raw`(?:\{[^\}]*\})`,
   // Oracle q'' strings: q'<text>' q'|text|' ...
-  "q''": pI()
-}, MR = (T) => typeof T == "string" ? yT[T] : "regex" in T ? T.regex : mI(T) + yT[T.quote], dI = (T) => q(T.map((E) => "regex" in E ? E.regex : MR(E)).join("|")), UR = (T) => T.map(MR).join("|"), KT = (T) => q(UR(T)), fI = (T = {}) => q(GR(T)), GR = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
-  const S = "\\p{Alphabetic}\\p{Mark}_", e = "\\p{Decimal_Number}", N = y(T ?? ""), s = y(E ?? ""), _ = A ? `[${S}${e}${N}][${S}${e}${s}]*` : `[${S}${N}][${S}${e}${s}]*`;
-  return R ? BI(_) : _;
+  "q''": hI()
+}, GR = (T) => typeof T == "string" ? yT[T] : "regex" in T ? T.regex : pI(T) + yT[T.quote], VI = (T) => q(T.map((E) => "regex" in E ? E.regex : GR(E)).join("|")), lR = (T) => T.map(GR).join("|"), KT = (T) => q(lR(T)), WI = (T = {}) => q(cR(T)), cR = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
+  const e = "\\p{Alphabetic}\\p{Mark}_", S = "\\p{Decimal_Number}", N = y(T ?? ""), s = y(E ?? ""), _ = A ? `[${e}${S}${N}][${e}${S}${s}]*` : `[${e}${N}][${e}${S}${s}]*`;
+  return R ? YI(_) : _;
 };
-function lR(T, E) {
+function uR(T, E) {
   const R = T.slice(0, E).split(/\n/);
   return { line: R.length, col: R[R.length - 1].length + 1 };
 }
-class hI {
+class XI {
   constructor(E, R) {
     this.rules = E, this.dialectName = R, this.input = "", this.index = 0;
   }
@@ -17849,17 +17877,17 @@ class hI {
     const R = [];
     let A;
     for (; this.index < this.input.length; ) {
-      const S = this.getWhitespace();
+      const e = this.getWhitespace();
       if (this.index < this.input.length) {
         if (A = this.getNextToken(), !A)
           throw this.createParseError();
-        R.push(Object.assign(Object.assign({}, A), { precedingWhitespace: S }));
+        R.push(Object.assign(Object.assign({}, A), { precedingWhitespace: e }));
       }
     }
     return R;
   }
   createParseError() {
-    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = lR(this.input, this.index);
+    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = uR(this.input, this.index);
     return new Error(`Parse error: Unexpected "${E}" at line ${R} column ${A}.
 ${this.dialectInfo()}`);
   }
@@ -17885,33 +17913,33 @@ If possible, please select a more specific dialect (like sqlite, postgresql, etc
     E.regex.lastIndex = this.index;
     const R = E.regex.exec(this.input);
     if (R) {
-      const A = R[0], S = {
+      const A = R[0], e = {
         type: E.type,
         raw: A,
         text: E.text ? E.text(A) : A,
         start: this.index
       };
-      return E.key && (S.key = E.key(A)), this.index += A.length, S;
+      return E.key && (e.key = E.key(A)), this.index += A.length, e;
     }
   }
 }
-const $T = /\/\*/uy, VI = /[\s\S]/uy, WI = /\*\//uy;
-class XI {
+const $T = /\/\*/uy, bI = /[\s\S]/uy, yI = /\*\//uy;
+class KI {
   constructor() {
     this.lastIndex = 0;
   }
   exec(E) {
-    let R = "", A, S = 0;
+    let R = "", A, e = 0;
     if (A = this.matchSection($T, E))
-      R += A, S++;
+      R += A, e++;
     else
       return null;
-    for (; S > 0; )
+    for (; e > 0; )
       if (A = this.matchSection($T, E))
-        R += A, S++;
-      else if (A = this.matchSection(WI, E))
-        R += A, S--;
-      else if (A = this.matchSection(VI, E))
+        R += A, e++;
+      else if (A = this.matchSection(yI, E))
+        R += A, e--;
+      else if (A = this.matchSection(bI, E))
         R += A;
       else
         return null;
@@ -17923,7 +17951,7 @@ class XI {
     return A && (this.lastIndex += A[0].length), A ? A[0] : null;
   }
 }
-class bI {
+class $I {
   constructor(E, R) {
     this.cfg = E, this.dialectName = R, this.rulesBeforeParams = this.buildRulesBeforeParams(E), this.rulesAfterParams = this.buildRulesAfterParams(E);
   }
@@ -17932,8 +17960,8 @@ class bI {
       ...this.rulesBeforeParams,
       ...this.buildParamRules(this.cfg, R),
       ...this.rulesAfterParams
-    ], S = new hI(A, this.dialectName).tokenize(E);
-    return this.cfg.postProcess ? this.cfg.postProcess(S) : S;
+    ], e = new XI(A, this.dialectName).tokenize(E);
+    return this.cfg.postProcess ? this.cfg.postProcess(e) : e;
   }
   // These rules can be cached as they only depend on
   // the Tokenizer config options specified for each SQL dialect
@@ -17946,11 +17974,11 @@ class bI {
       },
       {
         type: D.BLOCK_COMMENT,
-        regex: E.nestedBlockComments ? new XI() : /(\/\*[^]*?\*\/)/uy
+        regex: E.nestedBlockComments ? new KI() : /(\/\*[^]*?\*\/)/uy
       },
       {
         type: D.LINE_COMMENT,
-        regex: FI((R = E.lineCommentTypes) !== null && R !== void 0 ? R : ["--"])
+        regex: dI((R = E.lineCommentTypes) !== null && R !== void 0 ? R : ["--"])
       },
       {
         type: D.QUOTED_IDENTIFIER,
@@ -18067,12 +18095,12 @@ class bI {
     return this.validRules([
       {
         type: D.VARIABLE,
-        regex: E.variableTypes ? dI(E.variableTypes) : void 0
+        regex: E.variableTypes ? VI(E.variableTypes) : void 0
       },
       { type: D.STRING, regex: KT(E.stringTypes) },
       {
         type: D.IDENTIFIER,
-        regex: fI(E.identChars)
+        regex: WI(E.identChars)
       },
       { type: D.DELIMITER, regex: /[;]/uy },
       { type: D.COMMA, regex: /[,]/y },
@@ -18111,23 +18139,23 @@ class bI {
   // These rules can't be blindly cached as the paramTypesOverrides object
   // can differ on each invocation of the format() function.
   buildParamRules(E, R) {
-    var A, S, e, N, s;
+    var A, e, S, N, s;
     const _ = {
       named: (R == null ? void 0 : R.named) || ((A = E.paramTypes) === null || A === void 0 ? void 0 : A.named) || [],
-      quoted: (R == null ? void 0 : R.quoted) || ((S = E.paramTypes) === null || S === void 0 ? void 0 : S.quoted) || [],
-      numbered: (R == null ? void 0 : R.numbered) || ((e = E.paramTypes) === null || e === void 0 ? void 0 : e.numbered) || [],
+      quoted: (R == null ? void 0 : R.quoted) || ((e = E.paramTypes) === null || e === void 0 ? void 0 : e.quoted) || [],
+      numbered: (R == null ? void 0 : R.numbered) || ((S = E.paramTypes) === null || S === void 0 ? void 0 : S.numbered) || [],
       positional: typeof (R == null ? void 0 : R.positional) == "boolean" ? R.positional : (N = E.paramTypes) === null || N === void 0 ? void 0 : N.positional,
       custom: (R == null ? void 0 : R.custom) || ((s = E.paramTypes) === null || s === void 0 ? void 0 : s.custom) || []
     };
     return this.validRules([
       {
         type: D.NAMED_PARAMETER,
-        regex: vE(_.named, GR(E.paramChars || E.identChars)),
+        regex: vE(_.named, cR(E.paramChars || E.identChars)),
         key: (I) => I.slice(1)
       },
       {
         type: D.QUOTED_PARAMETER,
-        regex: vE(_.quoted, UR(E.identTypes)),
+        regex: vE(_.quoted, lR(E.identTypes)),
         key: (I) => (({ tokenKey: O, quoteChar: C }) => O.replace(new RegExp(y("\\" + C), "gu"), C))({
           tokenKey: I.slice(2, -1),
           quoteChar: I.slice(-1)
@@ -18157,13 +18185,13 @@ class bI {
     return E.filter((R) => !!R.regex);
   }
 }
-const p = (T) => tE(T.toUpperCase()), gT = /* @__PURE__ */ new Map(), yI = (T) => {
+const p = (T) => tE(T.toUpperCase()), gT = /* @__PURE__ */ new Map(), gI = (T) => {
   let E = gT.get(T);
-  return E || (E = KI(T), gT.set(T, E)), E;
-}, KI = (T) => ({
-  tokenizer: new bI(T.tokenizerOptions, T.name),
-  formatOptions: $I(T.formatOptions)
-}), $I = (T) => {
+  return E || (E = JI(T), gT.set(T, E)), E;
+}, JI = (T) => ({
+  tokenizer: new $I(T.tokenizerOptions, T.name),
+  formatOptions: wI(T.formatOptions)
+}), wI = (T) => {
   var E;
   return {
     alwaysDenseOperators: T.alwaysDenseOperators || [],
@@ -18171,13 +18199,13 @@ const p = (T) => tE(T.toUpperCase()), gT = /* @__PURE__ */ new Map(), yI = (T) =
     tabularOnelineClauses: Object.fromEntries(((E = T.tabularOnelineClauses) !== null && E !== void 0 ? E : T.onelineClauses).map((R) => [R, !0]))
   };
 };
-function gI(T) {
+function xI(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight" ? " ".repeat(10) : T.useTabs ? "	" : " ".repeat(T.tabWidth);
 }
 function EE(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight";
 }
-class JI {
+class vI {
   constructor(E) {
     this.params = E, this.index = 0;
   }
@@ -18200,15 +18228,15 @@ class JI {
     this.index = E;
   }
 }
-var wI = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
-function xI(T) {
+var QI = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
+function ZI(T) {
   return T && T.__esModule && Object.prototype.hasOwnProperty.call(T, "default") ? T.default : T;
 }
-var cR = { exports: {} };
+var HR = { exports: {} };
 (function(T) {
   (function(E, R) {
     T.exports ? T.exports = R() : E.nearley = R();
-  })(wI, function() {
+  })(QI, function() {
     function E(I, O, C) {
       return this.id = ++E.highestId, this.name = I, this.symbols = O, this.postprocess = C, this;
     }
@@ -18275,38 +18303,38 @@ var cR = { exports: {} };
       var C = I.nextState(O);
       this.states.push(C);
     };
-    function S(I, O) {
+    function e(I, O) {
       this.rules = I, this.start = O || this.rules[0].name;
       var C = this.byName = {};
       this.rules.forEach(function(t) {
         C.hasOwnProperty(t.name) || (C[t.name] = []), C[t.name].push(t);
       });
     }
-    S.fromCompiled = function(t, O) {
+    e.fromCompiled = function(t, O) {
       var C = t.Lexer;
       t.ParserStart && (O = t.ParserStart, t = t.ParserRules);
       var t = t.map(function(P) {
         return new E(P.name, P.symbols, P.postprocess);
-      }), i = new S(t, O);
+      }), i = new e(t, O);
       return i.lexer = C, i;
     };
-    function e() {
+    function S() {
       this.reset("");
     }
-    e.prototype.reset = function(I, O) {
+    S.prototype.reset = function(I, O) {
       this.buffer = I, this.index = 0, this.line = O ? O.line : 1, this.lastLineBreak = O ? -O.col : 0;
-    }, e.prototype.next = function() {
+    }, S.prototype.next = function() {
       if (this.index < this.buffer.length) {
         var I = this.buffer[this.index++];
         return I === `
 ` && (this.line += 1, this.lastLineBreak = this.index), { value: I };
       }
-    }, e.prototype.save = function() {
+    }, S.prototype.save = function() {
       return {
         line: this.line,
         col: this.index - this.lastLineBreak
       };
-    }, e.prototype.formatError = function(I, O) {
+    }, S.prototype.formatError = function(I, O) {
       var C = this.buffer;
       if (typeof C == "string") {
         var t = C.split(`
@@ -18333,13 +18361,13 @@ var cR = { exports: {} };
       }
     };
     function N(I, O, C) {
-      if (I instanceof S)
+      if (I instanceof e)
         var t = I, C = O;
       else
-        var t = S.fromCompiled(I, O);
+        var t = e.fromCompiled(I, O);
       this.grammar = t, this.options = {
         keepHistory: !1,
-        lexer: t.lexer || new e()
+        lexer: t.lexer || new S()
       };
       for (var i in C || {})
         this.options[i] = C[i];
@@ -18364,7 +18392,7 @@ var cR = { exports: {} };
         this.options.keepHistory || delete this.table[this.current - 1];
         var P = this.current + 1, M = new A(this.grammar, P);
         this.table.push(M);
-        for (var o = C.text !== void 0 ? C.text : C.value, G = O.constructor === e ? C.value : C, a = i.scannable, H = a.length; H--; ) {
+        for (var o = C.text !== void 0 ? C.text : C.value, G = O.constructor === S ? C.value : C, a = i.scannable, H = a.length; H--; ) {
           var u = a[H], B = u.rule.symbols[u.dot];
           if (B.test ? B.test(G) : B.type ? B.type === C.type : B.literal === o) {
             var Y = u.nextState({ data: G, token: C, isToken: !0, reference: P - 1 });
@@ -18473,61 +18501,61 @@ var cR = { exports: {} };
     }
     return {
       Parser: N,
-      Grammar: S,
+      Grammar: e,
       Rule: E
     };
   });
-})(cR);
-var vI = cR.exports;
-const QI = /* @__PURE__ */ xI(vI);
-function ZI(T) {
-  return T.map(qI).map(jI).map(kI).map(zI).map(EO);
+})(HR);
+var qI = HR.exports;
+const jI = /* @__PURE__ */ ZI(qI);
+function kI(T) {
+  return T.map(zI).map(EO).map(TO).map(RO).map(AO);
 }
-const qI = (T, E, R) => {
-  if (oR(T.type)) {
-    const A = TO(R, E);
+const zI = (T, E, R) => {
+  if (MR(T.type)) {
+    const A = eO(R, E);
     if (A && A.type === D.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
-    const S = AE(R, E);
-    if (S && S.type === D.PROPERTY_ACCESS_OPERATOR)
+    const e = AE(R, E);
+    if (e && e.type === D.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
-}, jI = (T, E, R) => {
+}, EO = (T, E, R) => {
   if (T.type === D.RESERVED_FUNCTION_NAME) {
     const A = AE(R, E);
-    if (!A || !uR(A))
+    if (!A || !BR(A))
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
-}, kI = (T, E, R) => {
+}, TO = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
     const A = AE(R, E);
-    if (A && uR(A))
+    if (A && BR(A))
       return Object.assign(Object.assign({}, T), { type: D.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return T;
-}, zI = (T, E, R) => {
+}, RO = (T, E, R) => {
   if (T.type === D.IDENTIFIER) {
     const A = AE(R, E);
-    if (A && HR(A))
+    if (A && mR(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_IDENTIFIER });
   }
   return T;
-}, EO = (T, E, R) => {
+}, AO = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
     const A = AE(R, E);
-    if (A && HR(A))
+    if (A && mR(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_KEYWORD });
   }
   return T;
-}, TO = (T, E) => AE(T, E, -1), AE = (T, E, R = 1) => {
+}, eO = (T, E) => AE(T, E, -1), AE = (T, E, R = 1) => {
   let A = 1;
-  for (; T[E + A * R] && RO(T[E + A * R]); )
+  for (; T[E + A * R] && SO(T[E + A * R]); )
     A++;
   return T[E + A * R];
-}, uR = (T) => T.type === D.OPEN_PAREN && T.text === "(", HR = (T) => T.type === D.OPEN_PAREN && T.text === "[", RO = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
-class BR {
+}, BR = (T) => T.type === D.OPEN_PAREN && T.text === "(", mR = (T) => T.type === D.OPEN_PAREN && T.text === "[", SO = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
+class FR {
   constructor(E) {
     this.tokenize = E, this.index = 0, this.tokens = [], this.input = "";
   }
@@ -18540,7 +18568,7 @@ class BR {
   save() {
   }
   formatError(E) {
-    const { line: R, col: A } = lR(this.input, E.start);
+    const { line: R, col: A } = uR(this.input, E.start);
     return `Parse error at token: ${E.text} at line ${R} column ${A}`;
   }
   has(E) {
@@ -18554,7 +18582,7 @@ var U;
 function QE(T) {
   return T[0];
 }
-const c = new BR((T) => []), w = ([[T]]) => T, d = (T) => ({
+const c = new FR((T) => []), w = ([[T]]) => T, d = (T) => ({
   type: U.keyword,
   tokenType: T.type,
   text: T.text,
@@ -18563,17 +18591,17 @@ const c = new BR((T) => []), w = ([[T]]) => T, d = (T) => ({
   type: U.data_type,
   text: T.text,
   raw: T.raw
-}), f = (T, { leading: E, trailing: R }) => (E != null && E.length && (T = Object.assign(Object.assign({}, T), { leadingComments: E })), R != null && R.length && (T = Object.assign(Object.assign({}, T), { trailingComments: R })), T), AO = (T, { leading: E, trailing: R }) => {
+}), f = (T, { leading: E, trailing: R }) => (E != null && E.length && (T = Object.assign(Object.assign({}, T), { leadingComments: E })), R != null && R.length && (T = Object.assign(Object.assign({}, T), { trailingComments: R })), T), IO = (T, { leading: E, trailing: R }) => {
   if (E != null && E.length) {
-    const [A, ...S] = T;
-    T = [f(A, { leading: E }), ...S];
+    const [A, ...e] = T;
+    T = [f(A, { leading: E }), ...e];
   }
   if (R != null && R.length) {
-    const A = T.slice(0, -1), S = T[T.length - 1];
-    T = [...A, f(S, { trailing: R })];
+    const A = T.slice(0, -1), e = T[T.length - 1];
+    T = [...A, f(e, { trailing: R })];
   }
   return T;
-}, SO = {
+}, OO = {
   Lexer: c,
   ParserRules: [
     { name: "main$ebnf$1", symbols: [] },
@@ -18621,12 +18649,12 @@ const c = new BR((T) => []), w = ([[T]]) => T, d = (T) => ({
       symbols: [c.has("LIMIT") ? { type: "LIMIT" } : LIMIT, "_", "expression_chain_", "limit_clause$ebnf$1"],
       postprocess: ([T, E, R, A]) => {
         if (A) {
-          const [S, e] = A;
+          const [e, S] = A;
           return {
             type: U.limit_clause,
             limitKw: f(d(T), { trailing: E }),
             offset: R,
-            count: e
+            count: S
           };
         } else
           return {
@@ -18824,23 +18852,23 @@ const c = new BR((T) => []), w = ([[T]]) => T, d = (T) => ({
         // A better way would be to allow <property_access> on the left side of array_subscript,
         // but we currently can't do that because of another hack that requires
         // %ARRAY_IDENTIFIER on the left side of <array_subscript>.
-        ([T, E, R, A, [S]]) => ({
+        ([T, E, R, A, [e]]) => ({
           type: U.property_access,
           object: f(T, { trailing: E }),
           operator: R.text,
-          property: f(S, { leading: A })
+          property: f(e, { leading: A })
         })
       )
     },
     {
       name: "between_predicate",
       symbols: [c.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", c.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
-      postprocess: ([T, E, R, A, S, e, N]) => ({
+      postprocess: ([T, E, R, A, e, S, N]) => ({
         type: U.between_predicate,
         betweenKw: d(T),
-        expr1: AO(R, { leading: E, trailing: A }),
-        andKw: d(S),
-        expr2: [f(N, { leading: e })]
+        expr1: IO(R, { leading: E, trailing: A }),
+        andKw: d(e),
+        expr2: [f(N, { leading: S })]
       })
     },
     { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: QE },
@@ -18850,10 +18878,10 @@ const c = new BR((T) => []), w = ([[T]]) => T, d = (T) => ({
     {
       name: "case_expression",
       symbols: [c.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", c.has("END") ? { type: "END" } : END],
-      postprocess: ([T, E, R, A, S]) => ({
+      postprocess: ([T, E, R, A, e]) => ({
         type: U.case_expression,
         caseKw: f(d(T), { trailing: E }),
-        endKw: d(S),
+        endKw: d(e),
         expr: R || [],
         clauses: A
       })
@@ -18861,12 +18889,12 @@ const c = new BR((T) => []), w = ([[T]]) => T, d = (T) => ({
     {
       name: "case_clause",
       symbols: [c.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", c.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
-      postprocess: ([T, E, R, A, S, e]) => ({
+      postprocess: ([T, E, R, A, e, S]) => ({
         type: U.case_when,
         whenKw: f(d(T), { trailing: E }),
-        thenKw: f(d(A), { trailing: S }),
+        thenKw: f(d(A), { trailing: e }),
         condition: R,
-        result: e
+        result: S
       })
     },
     {
@@ -18969,17 +18997,17 @@ const c = new BR((T) => []), w = ([[T]]) => T, d = (T) => ({
     }
   ],
   ParserStart: "main"
-}, { Parser: eO, Grammar: IO } = QI;
-function OO(T) {
+}, { Parser: NO, Grammar: tO } = jI;
+function sO(T) {
   let E = {};
-  const R = new BR((S) => [
-    ...ZI(T.tokenize(S, E)),
-    aR(S.length)
-  ]), A = new eO(IO.fromCompiled(SO), { lexer: R });
+  const R = new FR((e) => [
+    ...kI(T.tokenize(e, E)),
+    PR(e.length)
+  ]), A = new NO(tO.fromCompiled(OO), { lexer: R });
   return {
-    parse: (S, e) => {
-      E = e;
-      const { results: N } = A.feed(S);
+    parse: (e, S) => {
+      E = S;
+      const { results: N } = A.feed(e);
       if (N.length === 1)
         return N[0];
       throw N.length === 0 ? new Error("Parse error: Invalid SQL") : new Error(`Parse error: Ambiguous grammar
@@ -18991,7 +19019,7 @@ var n;
 (function(T) {
   T[T.SPACE = 0] = "SPACE", T[T.NO_SPACE = 1] = "NO_SPACE", T[T.NO_NEWLINE = 2] = "NO_NEWLINE", T[T.NEWLINE = 3] = "NEWLINE", T[T.MANDATORY_NEWLINE = 4] = "MANDATORY_NEWLINE", T[T.INDENT = 5] = "INDENT", T[T.SINGLE_INDENT = 6] = "SINGLE_INDENT";
 })(n = n || (n = {}));
-class mR {
+class YR {
   constructor(E) {
     this.indentation = E, this.items = [];
   }
@@ -19027,16 +19055,16 @@ class mR {
       }
   }
   trimHorizontalWhitespace() {
-    for (; NO(eE(this.items)); )
+    for (; CO(SE(this.items)); )
       this.items.pop();
   }
   trimWhitespace() {
-    for (; tO(eE(this.items)); )
+    for (; LO(SE(this.items)); )
       this.items.pop();
   }
   addNewline(E) {
     if (this.items.length > 0)
-      switch (eE(this.items)) {
+      switch (SE(this.items)) {
         case n.NEWLINE:
           this.items.pop(), this.items.push(E);
           break;
@@ -19078,7 +19106,7 @@ class mR {
     }
   }
 }
-const NO = (T) => T === n.SPACE || T === n.SINGLE_INDENT, tO = (T) => T === n.SPACE || T === n.SINGLE_INDENT || T === n.NEWLINE;
+const CO = (T) => T === n.SPACE || T === n.SINGLE_INDENT, LO = (T) => T === n.SPACE || T === n.SINGLE_INDENT || T === n.NEWLINE;
 function wT(T, E) {
   if (E === "standard")
     return T;
@@ -19086,10 +19114,10 @@ function wT(T, E) {
   return T.length >= 10 && T.includes(" ") && ([T, ...R] = T.split(" ")), E === "tabularLeft" ? T = T.padEnd(9, " ") : T = T.padStart(9, " "), T + ["", ...R].join(" ");
 }
 function xT(T) {
-  return sA(T) || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.LIMIT;
+  return _A(T) || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.LIMIT;
 }
-const ZE = "top-level", sO = "block-level";
-class FR {
+const ZE = "top-level", _O = "block-level";
+class pR {
   /**
    * @param {string} indent A string to indent with
    */
@@ -19118,14 +19146,14 @@ class FR {
    * Increases indentation by one block-level indent.
    */
   increaseBlockLevel() {
-    this.indentTypes.push(sO);
+    this.indentTypes.push(_O);
   }
   /**
    * Decreases indentation by one top-level indent.
    * Does nothing when the previous indent is not top-level.
    */
   decreaseTopLevel() {
-    this.indentTypes.length > 0 && eE(this.indentTypes) === ZE && this.indentTypes.pop();
+    this.indentTypes.length > 0 && SE(this.indentTypes) === ZE && this.indentTypes.pop();
   }
   /**
    * Decreases indentation by one block-level indent.
@@ -19137,9 +19165,9 @@ class FR {
       ;
   }
 }
-class CO extends mR {
+class rO extends YR {
   constructor(E) {
-    super(new FR("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
+    super(new pR("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
   }
   add(...E) {
     if (E.forEach((R) => this.addToLength(R)), this.length > this.expressionWidth)
@@ -19159,8 +19187,8 @@ class CO extends mR {
 class kE extends Error {
 }
 class rE {
-  constructor({ cfg: E, dialectCfg: R, params: A, layout: S, inline: e = !1 }) {
-    this.inline = !1, this.nodes = [], this.index = -1, this.cfg = E, this.dialectCfg = R, this.inline = e, this.params = A, this.layout = S;
+  constructor({ cfg: E, dialectCfg: R, params: A, layout: e, inline: S = !1 }) {
+    this.inline = !1, this.nodes = [], this.index = -1, this.cfg = E, this.dialectCfg = R, this.inline = S, this.params = A, this.layout = e;
   }
   format(E) {
     for (this.nodes = E, this.index = 0; this.index < this.nodes.length; this.index++)
@@ -19332,7 +19360,7 @@ class rE {
       // first line starts with /* or /**
       /^\/\*\*?$/.test(R[0]) && // intermediate lines start with *
       R.slice(1, R.length - 1).every((A) => /^\s*\*/.test(A)) && // last line ends with */
-      /^\s*\*\/$/.test(eE(R))
+      /^\s*\*\/$/.test(SE(R))
     );
   }
   // Breaks up block comment to multiple lines.
@@ -19381,7 +19409,7 @@ class rE {
         cfg: this.cfg,
         dialectCfg: this.dialectCfg,
         params: this.params,
-        layout: new CO(this.cfg.expressionWidth),
+        layout: new rO(this.cfg.expressionWidth),
         inline: !0
       }).format(E);
     } catch (A) {
@@ -19467,9 +19495,9 @@ class rE {
     }
   }
 }
-class LO {
+class nO {
   constructor(E, R) {
-    this.dialect = E, this.cfg = R, this.params = new JI(this.cfg.params);
+    this.dialect = E, this.cfg = R, this.params = new vI(this.cfg.params);
   }
   /**
    * Formats an SQL query.
@@ -19481,7 +19509,7 @@ class LO {
     return this.formatAst(R).trimEnd();
   }
   parse(E) {
-    return OO(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
+    return sO(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
   }
   formatAst(E) {
     return E.map((R) => this.formatStatement(R)).join(`
@@ -19492,14 +19520,14 @@ class LO {
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new mR(new FR(gI(this.cfg)))
+      layout: new YR(new pR(xI(this.cfg)))
     }).format(E.children);
     return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? R.add(n.NEWLINE, ";") : R.add(n.NO_NEWLINE, ";")), R.toString();
   }
 }
 class sE extends Error {
 }
-function _O(T) {
+function iO(T) {
   const E = [
     "multilineLists",
     "newlineBeforeOpenParen",
@@ -19513,25 +19541,25 @@ function _O(T) {
       throw new sE(`${R} config is no more supported.`);
   if (T.expressionWidth <= 0)
     throw new sE(`expressionWidth config must be positive number. Received ${T.expressionWidth} instead.`);
-  if (T.params && !rO(T.params) && console.warn('WARNING: All "params" option values should be strings.'), T.paramTypes && !nO(T.paramTypes))
+  if (T.params && !DO(T.params) && console.warn('WARNING: All "params" option values should be strings.'), T.paramTypes && !aO(T.paramTypes))
     throw new sE("Empty regex given in custom paramTypes. That would result in matching infinite amount of parameters.");
   return T;
 }
-function rO(T) {
+function DO(T) {
   return (T instanceof Array ? T : Object.values(T)).every((R) => typeof R == "string");
 }
-function nO(T) {
+function aO(T) {
   return T.custom && Array.isArray(T.custom) ? T.custom.every((E) => E.regex !== "") : !0;
 }
-var iO = function(T, E) {
+var oO = function(T, E) {
   var R = {};
   for (var A in T) Object.prototype.hasOwnProperty.call(T, A) && E.indexOf(A) < 0 && (R[A] = T[A]);
   if (T != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var S = 0, A = Object.getOwnPropertySymbols(T); S < A.length; S++)
-      E.indexOf(A[S]) < 0 && Object.prototype.propertyIsEnumerable.call(T, A[S]) && (R[A[S]] = T[A[S]]);
+    for (var e = 0, A = Object.getOwnPropertySymbols(T); e < A.length; e++)
+      E.indexOf(A[e]) < 0 && Object.prototype.propertyIsEnumerable.call(T, A[e]) && (R[A[e]] = T[A[e]]);
   return R;
 };
-const YR = {
+const dR = {
   bigquery: "bigquery",
   db2: "db2",
   db2i: "db2i",
@@ -19552,7 +19580,7 @@ const YR = {
   tsql: "transactsql",
   singlestoredb: "singlestoredb",
   snowflake: "snowflake"
-}, DO = Object.keys(YR), aO = {
+}, PO = Object.keys(dR), MO = {
   tabWidth: 2,
   useTabs: !1,
   keywordCase: "preserve",
@@ -19565,28 +19593,28 @@ const YR = {
   linesBetweenQueries: 1,
   denseOperators: !1,
   newlineBeforeSemicolon: !1
-}, oO = (T, E = {}) => {
-  if (typeof E.language == "string" && !DO.includes(E.language))
+}, UO = (T, E = {}) => {
+  if (typeof E.language == "string" && !PO.includes(E.language))
     throw new sE(`Unsupported SQL dialect: ${E.language}`);
-  const R = YR[E.language || "sql"];
-  return PO(T, Object.assign(Object.assign({}, E), { dialect: uI[R] }));
-}, PO = (T, E) => {
-  var { dialect: R } = E, A = iO(E, ["dialect"]);
+  const R = dR[E.language || "sql"];
+  return GO(T, Object.assign(Object.assign({}, E), { dialect: mI[R] }));
+}, GO = (T, E) => {
+  var { dialect: R } = E, A = oO(E, ["dialect"]);
   if (typeof T != "string")
     throw new Error("Invalid query argument. Expected string, instead got " + typeof T);
-  const S = _O(Object.assign(Object.assign({}, aO), A));
-  return new LO(yI(R), S).format(T);
+  const e = iO(Object.assign(Object.assign({}, MO), A));
+  return new nO(gI(R), e).format(T);
 };
-function MO(T) {
-  var R, A, S, e;
+function lO(T) {
+  var R, A, e, S;
   let E = 0;
-  return E += (((R = T.measures) == null ? void 0 : R.length) || 0) * 1, E += (((A = T.dimensions) == null ? void 0 : A.length) || 0) * 1, E += (((S = T.filters) == null ? void 0 : S.length) || 0) * 2, E += (((e = T.timeDimensions) == null ? void 0 : e.length) || 0) * 3, E <= 5 ? "low" : E <= 15 ? "medium" : "high";
+  return E += (((R = T.measures) == null ? void 0 : R.length) || 0) * 1, E += (((A = T.dimensions) == null ? void 0 : A.length) || 0) * 1, E += (((e = T.filters) == null ? void 0 : e.length) || 0) * 2, E += (((S = T.timeDimensions) == null ? void 0 : S.length) || 0) * 3, E <= 5 ? "low" : E <= 15 ? "medium" : "high";
 }
-function UO() {
+function cO() {
   const T = Date.now(), E = Math.random().toString(36).substring(2, 9);
   return `${T}-${E}`;
 }
-function GO(T) {
+function uO(T) {
   const E = T.dimensions || [], R = T.timeDimensions || [], A = T.measures || [];
   return {
     sortedDimensions: E,
@@ -19611,7 +19639,7 @@ function GO(T) {
     hasMultiStage: !1
   };
 }
-function lO(T) {
+function HO(T) {
   if (T.hasExecutor()) {
     const E = T.databaseExecutor;
     if (E != null && E.engineType)
@@ -19619,36 +19647,36 @@ function lO(T) {
   }
   return "postgres";
 }
-async function HO(T, E, R) {
+async function FO(T, E, R) {
   var _, I, O, C;
   const A = R.validateQuery(T);
   if (!A.isValid)
     throw new Error(`Query validation failed: ${A.errors.join(", ")}`);
-  const S = /* @__PURE__ */ new Set();
+  const e = /* @__PURE__ */ new Set();
   (_ = T.measures) == null || _.forEach((t) => {
     const i = t.split(".")[0];
-    S.add(i);
+    e.add(i);
   }), (I = T.dimensions) == null || I.forEach((t) => {
     const i = t.split(".")[0];
-    S.add(i);
+    e.add(i);
   }), (O = T.timeDimensions) == null || O.forEach((t) => {
     const i = t.dimension.split(".")[0];
-    S.add(i);
+    e.add(i);
   }), (C = T.filters) == null || C.forEach((t) => {
     if ("member" in t) {
       const i = t.member.split(".")[0];
-      S.add(i);
+      e.add(i);
     }
   });
-  const e = S.size > 1;
+  const S = e.size > 1;
   let N;
-  if (e)
+  if (S)
     N = await R.generateMultiCubeSQL(T, E);
   else {
-    const t = Array.from(S)[0];
+    const t = Array.from(e)[0];
     N = await R.generateSQL(t, T, E);
   }
-  const s = Array.from(S).map((t) => {
+  const s = Array.from(e).map((t) => {
     var i, P;
     return {
       cube: t,
@@ -19666,33 +19694,33 @@ async function HO(T, E, R) {
   return {
     queryType: "regularQuery",
     normalizedQueries: s,
-    queryOrder: Array.from(S),
+    queryOrder: Array.from(e),
     transformedQueries: s,
     pivotQuery: {
       query: T,
-      cubes: Array.from(S)
+      cubes: Array.from(e)
     },
     sql: {
       sql: [N.sql],
       params: N.params || []
     },
-    complexity: MO(T),
+    complexity: lO(T),
     valid: !0,
-    cubesUsed: Array.from(S),
-    joinType: e ? "multi_cube_join" : "single_cube",
+    cubesUsed: Array.from(e),
+    joinType: S ? "multi_cube_join" : "single_cube",
     query: T
   };
 }
-function BO(T, E, R) {
-  const A = lO(R), S = UO(), e = (/* @__PURE__ */ new Date()).toISOString(), N = GO(T);
+function YO(T, E, R) {
+  const A = HO(R), e = cO(), S = (/* @__PURE__ */ new Date()).toISOString(), N = uO(T);
   return {
     queryType: "regularQuery",
     results: [{
       query: T,
-      lastRefreshTime: e,
+      lastRefreshTime: S,
       usedPreAggregations: {},
       transformedQuery: N,
-      requestId: S,
+      requestId: e,
       annotation: E.annotation,
       dataSource: "default",
       dbType: A,
@@ -19710,11 +19738,13 @@ function BO(T, E, R) {
 }
 function vT(T, E) {
   try {
-    return oO(T, {
+    return UO(T, {
       language: {
         postgres: "postgresql",
         mysql: "mysql",
-        sqlite: "sqlite"
+        sqlite: "sqlite",
+        singlestore: "mysql"
+        // SingleStore uses MySQL dialect for formatting
       }[E],
       tabWidth: 2,
       keywordCase: "upper",
@@ -19724,25 +19754,25 @@ function vT(T, E) {
     return console.warn("SQL formatting failed:", R), T;
   }
 }
-function mO(T, E) {
+function pO(T, E) {
   return {
     sql: E.sql,
     params: E.params || [],
     query: T
   };
 }
-function FO(T) {
+function dO(T) {
   return {
     cubes: T
   };
 }
-function YO(T, E = 500) {
+function fO(T, E = 500) {
   return {
     error: T instanceof Error ? T.message : T,
     status: E
   };
 }
-class cO {
+class BO {
   // 5 minutes in milliseconds
   constructor(E) {
     l(this, "cubes", /* @__PURE__ */ new Map());
@@ -19838,56 +19868,86 @@ class cO {
     const R = Array.from(this.cubes.values()).map((A) => this.generateCubeMetadata(A));
     return this.metadataCache = R, this.metadataCacheTimestamp = E, R;
   }
+  /**
+   * Extract column name from Drizzle column reference
+   * Handles different column types and extracts the actual column name
+   */
+  getColumnName(E) {
+    if (E && E.name || E && E.columnType && E.name)
+      return E.name;
+    if (typeof E == "string")
+      return E;
+    if (E && typeof E == "object") {
+      if (E._.name) return E._.name;
+      if (E.name) return E.name;
+      if (E.columnName) return E.columnName;
+    }
+    return "unknown_column";
+  }
   /**
    * Generate cube metadata for API responses from cubes
    * Optimized version that minimizes object iterations
    */
   generateCubeMetadata(E) {
-    const R = Object.keys(E.measures), A = Object.keys(E.dimensions), S = new Array(R.length), e = new Array(A.length);
-    for (let N = 0; N < R.length; N++) {
-      const s = R[N], _ = E.measures[s];
-      S[N] = {
-        name: `${E.name}.${s}`,
-        title: _.title || s,
-        shortTitle: _.title || s,
-        type: _.type,
+    const R = Object.keys(E.measures), A = Object.keys(E.dimensions), e = new Array(R.length), S = new Array(A.length);
+    for (let s = 0; s < R.length; s++) {
+      const _ = R[s], I = E.measures[_];
+      e[s] = {
+        name: `${E.name}.${_}`,
+        title: I.title || _,
+        shortTitle: I.title || _,
+        type: I.type,
         format: void 0,
         // Measure doesn't have format field
-        description: _.description
+        description: I.description
       };
     }
-    for (let N = 0; N < A.length; N++) {
-      const s = A[N], _ = E.dimensions[s];
-      e[N] = {
-        name: `${E.name}.${s}`,
-        title: _.title || s,
-        shortTitle: _.title || s,
-        type: _.type,
+    for (let s = 0; s < A.length; s++) {
+      const _ = A[s], I = E.dimensions[_];
+      S[s] = {
+        name: `${E.name}.${_}`,
+        title: I.title || _,
+        shortTitle: I.title || _,
+        type: I.type,
         format: void 0,
         // Dimension doesn't have format field
-        description: _.description
+        description: I.description
       };
     }
+    const N = [];
+    if (E.joins)
+      for (const [, s] of Object.entries(E.joins)) {
+        const _ = typeof s.targetCube == "function" ? s.targetCube() : s.targetCube;
+        N.push({
+          targetCube: _.name,
+          relationship: s.relationship,
+          joinFields: s.on.map((I) => ({
+            sourceField: this.getColumnName(I.source),
+            targetField: this.getColumnName(I.target)
+          }))
+        });
+      }
     return {
       name: E.name,
       title: E.title || E.name,
       description: E.description,
-      measures: S,
-      dimensions: e,
-      segments: []
+      measures: e,
+      dimensions: S,
+      segments: [],
       // Add segments support later if needed
+      relationships: N.length > 0 ? N : void 0
     };
   }
   /**
    * Get SQL for a query without executing it (debugging)
    */
   async generateSQL(E, R, A) {
-    const S = this.getCube(E);
-    if (!S)
+    const e = this.getCube(E);
+    if (!e)
       throw new Error(`Cube '${E}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const N = await new HE(this.dbExecutor).generateSQL(S, R, A), s = this.dbExecutor.getEngineType();
+    const N = await new HE(this.dbExecutor).generateSQL(e, R, A), s = this.dbExecutor.getEngineType();
     return {
       sql: vT(N.sql, s),
       params: N.params
@@ -19899,10 +19959,10 @@ class cO {
   async generateMultiCubeSQL(E, R) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const S = await new HE(this.dbExecutor).generateMultiCubeSQL(this.cubes, E, R), e = this.dbExecutor.getEngineType();
+    const e = await new HE(this.dbExecutor).generateMultiCubeSQL(this.cubes, E, R), S = this.dbExecutor.getEngineType();
     return {
-      sql: vT(S.sql, e),
-      params: S.params
+      sql: vT(e.sql, S),
+      params: e.params
     };
   }
   /**
@@ -19942,94 +20002,94 @@ class cO {
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(E) {
-    return pR(this.cubes, E);
+    return fR(this.cubes, E);
   }
 }
-function pR(T, E) {
+function fR(T, E) {
   const R = [], A = /* @__PURE__ */ new Set();
   if (E.measures)
-    for (const S of E.measures) {
-      const [e, N] = S.split(".");
-      if (!e || !N) {
-        R.push(`Invalid measure format: ${S}. Expected format: 'CubeName.fieldName'`);
+    for (const e of E.measures) {
+      const [S, N] = e.split(".");
+      if (!S || !N) {
+        R.push(`Invalid measure format: ${e}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
-      A.add(e);
-      const s = T.get(e);
+      A.add(S);
+      const s = T.get(S);
       if (!s) {
-        R.push(`Cube '${e}' not found (referenced in measure '${S}')`);
+        R.push(`Cube '${S}' not found (referenced in measure '${e}')`);
         continue;
       }
-      s.measures[N] || R.push(`Measure '${N}' not found on cube '${e}'`);
+      s.measures[N] || R.push(`Measure '${N}' not found on cube '${S}'`);
     }
   if (E.dimensions)
-    for (const S of E.dimensions) {
-      const [e, N] = S.split(".");
-      if (!e || !N) {
-        R.push(`Invalid dimension format: ${S}. Expected format: 'CubeName.fieldName'`);
+    for (const e of E.dimensions) {
+      const [S, N] = e.split(".");
+      if (!S || !N) {
+        R.push(`Invalid dimension format: ${e}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
-      A.add(e);
-      const s = T.get(e);
+      A.add(S);
+      const s = T.get(S);
       if (!s) {
-        R.push(`Cube '${e}' not found (referenced in dimension '${S}')`);
+        R.push(`Cube '${S}' not found (referenced in dimension '${e}')`);
         continue;
       }
-      s.dimensions[N] || R.push(`Dimension '${N}' not found on cube '${e}'`);
+      s.dimensions[N] || R.push(`Dimension '${N}' not found on cube '${S}'`);
     }
   if (E.timeDimensions)
-    for (const S of E.timeDimensions) {
-      const [e, N] = S.dimension.split(".");
-      if (!e || !N) {
-        R.push(`Invalid timeDimension format: ${S.dimension}. Expected format: 'CubeName.fieldName'`);
+    for (const e of E.timeDimensions) {
+      const [S, N] = e.dimension.split(".");
+      if (!S || !N) {
+        R.push(`Invalid timeDimension format: ${e.dimension}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
-      A.add(e);
-      const s = T.get(e);
+      A.add(S);
+      const s = T.get(S);
       if (!s) {
-        R.push(`Cube '${e}' not found (referenced in timeDimension '${S.dimension}')`);
+        R.push(`Cube '${S}' not found (referenced in timeDimension '${e.dimension}')`);
         continue;
       }
-      s.dimensions[N] || R.push(`TimeDimension '${N}' not found on cube '${e}' (must be a dimension with time type)`);
+      s.dimensions[N] || R.push(`TimeDimension '${N}' not found on cube '${S}' (must be a dimension with time type)`);
     }
   if (E.filters)
-    for (const S of E.filters)
-      dR(S, T, R, A);
+    for (const e of E.filters)
+      hR(e, T, R, A);
   return A.size === 0 && R.push("Query must reference at least one cube through measures, dimensions, or filters"), {
     isValid: R.length === 0,
     errors: R
   };
 }
-function dR(T, E, R, A) {
+function hR(T, E, R, A) {
   if ("and" in T || "or" in T) {
     const s = T.and || T.or || [];
     for (const _ of s)
-      dR(_, E, R, A);
+      hR(_, E, R, A);
     return;
   }
   if (!("member" in T)) {
     R.push("Filter must have a member field");
     return;
   }
-  const [S, e] = T.member.split(".");
-  if (!S || !e) {
+  const [e, S] = T.member.split(".");
+  if (!e || !S) {
     R.push(`Invalid filter member format: ${T.member}. Expected format: 'CubeName.fieldName'`);
     return;
   }
-  A.add(S);
-  const N = E.get(S);
+  A.add(e);
+  const N = E.get(e);
   if (!N) {
-    R.push(`Cube '${S}' not found (referenced in filter '${T.member}')`);
+    R.push(`Cube '${e}' not found (referenced in filter '${T.member}')`);
     return;
   }
-  !N.dimensions[e] && !N.measures[e] && R.push(`Filter field '${e}' not found on cube '${S}' (must be a dimension or measure)`);
+  !N.dimensions[S] && !N.measures[S] && R.push(`Filter field '${S}' not found on cube '${e}' (must be a dimension or measure)`);
 }
-new cO();
+new BO();
 export {
-  cO as S,
-  FO as a,
-  mO as b,
-  YO as c,
-  BO as f,
-  HO as h
+  BO as S,
+  dO as a,
+  pO as b,
+  fO as c,
+  YO as f,
+  FO as h
 };