npm - drizzle-cube - Versions diffs - 0.1.41 → 0.1.42 - Mend

drizzle-cube 0.1.41 → 0.1.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/dist/adapters/{compiler-CkjmApqo.js → compiler-B57cLx38.js} +1148 -1118
package/dist/adapters/express/index.js +1 -1
package/dist/adapters/fastify/index.js +1 -1
package/dist/adapters/hono/index.js +1 -1
package/dist/adapters/nextjs/index.js +1 -1
package/dist/client/chunks/{components-DnCh4Y4N.js → components-DzCsplX7.js} +5752 -5618
package/dist/client/chunks/components-DzCsplX7.js.map +1 -0
package/dist/client/components.js +1 -1
package/dist/client/index.js +1 -1
package/dist/client/types.d.ts +2 -0
package/dist/client-bundle-stats.html +1 -1
package/dist/server/index.d.ts +1 -0
package/dist/server/index.js +854 -824
package/package.json +1 -1
package/dist/client/chunks/components-DnCh4Y4N.js.map +0 -1

package/dist/server/index.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { sql as r, eq as x, and as p, StringChunk as xT, count as SE, sum as f, max as q, min as j, countDistinct as vT, SQL as QT, or as IE, isNotNull as yE, ne as KE, isNull as $E, notInArray as gE, inArray as OE, lt as NE, gt as tE, gte as $, lte as g, desc as ZT, asc as wE } from "drizzle-orm";
+import { sql as n, eq as x, and as p, StringChunk as xT, count as SE, sum as f, max as q, min as j, countDistinct as vT, SQL as QT, or as IE, isNotNull as yE, ne as KE, isNull as $E, notInArray as gE, inArray as OE, lt as NE, gt as tE, gte as $, lte as g, desc as ZT, asc as wE } from "drizzle-orm";
 class fE {
   /**
    * Default implementation returns template unchanged
@@ -36,21 +36,21 @@ class qT extends fE {
   buildTimeDimension(E, T) {
     switch (E) {
       case "year":
-        return r`DATE_TRUNC('year', ${T}::timestamp)`;
+        return n`DATE_TRUNC('year', ${T}::timestamp)`;
       case "quarter":
-        return r`DATE_TRUNC('quarter', ${T}::timestamp)`;
+        return n`DATE_TRUNC('quarter', ${T}::timestamp)`;
       case "month":
-        return r`DATE_TRUNC('month', ${T}::timestamp)`;
+        return n`DATE_TRUNC('month', ${T}::timestamp)`;
       case "week":
-        return r`DATE_TRUNC('week', ${T}::timestamp)`;
+        return n`DATE_TRUNC('week', ${T}::timestamp)`;
       case "day":
-        return r`DATE_TRUNC('day', ${T}::timestamp)::timestamp`;
+        return n`DATE_TRUNC('day', ${T}::timestamp)::timestamp`;
       case "hour":
-        return r`DATE_TRUNC('hour', ${T}::timestamp)`;
+        return n`DATE_TRUNC('hour', ${T}::timestamp)`;
       case "minute":
-        return r`DATE_TRUNC('minute', ${T}::timestamp)`;
+        return n`DATE_TRUNC('minute', ${T}::timestamp)`;
       case "second":
-        return r`DATE_TRUNC('second', ${T}::timestamp)`;
+        return n`DATE_TRUNC('second', ${T}::timestamp)`;
       default:
         return T;
     }
@@ -62,23 +62,23 @@ class qT extends fE {
   buildStringCondition(E, T, A) {
     switch (T) {
       case "contains":
-        return r`${E} ILIKE ${`%${A}%`}`;
+        return n`${E} ILIKE ${`%${A}%`}`;
       case "notContains":
-        return r`${E} NOT ILIKE ${`%${A}%`}`;
+        return n`${E} NOT ILIKE ${`%${A}%`}`;
       case "startsWith":
-        return r`${E} ILIKE ${`${A}%`}`;
+        return n`${E} ILIKE ${`${A}%`}`;
       case "endsWith":
-        return r`${E} ILIKE ${`%${A}`}`;
+        return n`${E} ILIKE ${`%${A}`}`;
       case "like":
-        return r`${E} LIKE ${A}`;
+        return n`${E} LIKE ${A}`;
       case "notLike":
-        return r`${E} NOT LIKE ${A}`;
+        return n`${E} NOT LIKE ${A}`;
       case "ilike":
-        return r`${E} ILIKE ${A}`;
+        return n`${E} ILIKE ${A}`;
       case "regex":
-        return r`${E} ~* ${A}`;
+        return n`${E} ~* ${A}`;
       case "notRegex":
-        return r`${E} !~* ${A}`;
+        return n`${E} !~* ${A}`;
       default:
         throw new Error(`Unsupported string operator: ${T}`);
     }
@@ -90,11 +90,11 @@ class qT extends fE {
   castToType(E, T) {
     switch (T) {
       case "timestamp":
-        return r`${E}::timestamp`;
+        return n`${E}::timestamp`;
       case "decimal":
-        return r`${E}::decimal`;
+        return n`${E}::decimal`;
       case "integer":
-        return r`${E}::integer`;
+        return n`${E}::integer`;
       default:
         throw new Error(`Unsupported cast type: ${T}`);
     }
@@ -105,21 +105,21 @@ class qT extends fE {
    * Extracted from multi-cube-builder.ts:284
    */
   buildAvg(E) {
-    return r`COALESCE(AVG(${E}), 0)`;
+    return n`COALESCE(AVG(${E}), 0)`;
   }
   /**
    * Build PostgreSQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, T) {
-    const A = E.map((e) => r`WHEN ${e.when} THEN ${e.then}`).reduce((e, S) => r`${e} ${S}`);
-    return T !== void 0 ? r`CASE ${A} ELSE ${T} END` : r`CASE ${A} END`;
+    const A = E.map((e) => n`WHEN ${e.when} THEN ${e.then}`).reduce((e, S) => n`${e} ${S}`);
+    return T !== void 0 ? n`CASE ${A} ELSE ${T} END` : n`CASE ${A} END`;
   }
   /**
    * Build PostgreSQL boolean literal
    * PostgreSQL uses TRUE/FALSE keywords
    */
   buildBooleanLiteral(E) {
-    return E ? r`TRUE` : r`FALSE`;
+    return E ? n`TRUE` : n`FALSE`;
   }
   /**
    * Convert filter values - PostgreSQL uses native types
@@ -172,12 +172,12 @@ class HT extends fE {
     };
     switch (E) {
       case "quarter":
-        return r`DATE_ADD(MAKEDATE(YEAR(${T}), 1), INTERVAL (QUARTER(${T}) - 1) * 3 MONTH)`;
+        return n`DATE_ADD(MAKEDATE(YEAR(${T}), 1), INTERVAL (QUARTER(${T}) - 1) * 3 MONTH)`;
       case "week":
-        return r`DATE_SUB(${T}, INTERVAL WEEKDAY(${T}) DAY)`;
+        return n`DATE_SUB(${T}, INTERVAL WEEKDAY(${T}) DAY)`;
       default:
         const e = A[E];
-        return e ? r`STR_TO_DATE(DATE_FORMAT(${T}, ${e}), '%Y-%m-%d %H:%i:%s')` : T;
+        return e ? n`STR_TO_DATE(DATE_FORMAT(${T}, ${e}), '%Y-%m-%d %H:%i:%s')` : T;
     }
   }
   /**
@@ -188,23 +188,23 @@ class HT extends fE {
   buildStringCondition(E, T, A) {
     switch (T) {
       case "contains":
-        return r`LOWER(${E}) LIKE ${`%${A.toLowerCase()}%`}`;
+        return n`LOWER(${E}) LIKE ${`%${A.toLowerCase()}%`}`;
       case "notContains":
-        return r`LOWER(${E}) NOT LIKE ${`%${A.toLowerCase()}%`}`;
+        return n`LOWER(${E}) NOT LIKE ${`%${A.toLowerCase()}%`}`;
       case "startsWith":
-        return r`LOWER(${E}) LIKE ${`${A.toLowerCase()}%`}`;
+        return n`LOWER(${E}) LIKE ${`${A.toLowerCase()}%`}`;
       case "endsWith":
-        return r`LOWER(${E}) LIKE ${`%${A.toLowerCase()}`}`;
+        return n`LOWER(${E}) LIKE ${`%${A.toLowerCase()}`}`;
       case "like":
-        return r`${E} LIKE ${A}`;
+        return n`${E} LIKE ${A}`;
       case "notLike":
-        return r`${E} NOT LIKE ${A}`;
+        return n`${E} NOT LIKE ${A}`;
       case "ilike":
-        return r`LOWER(${E}) LIKE ${A.toLowerCase()}`;
+        return n`LOWER(${E}) LIKE ${A.toLowerCase()}`;
       case "regex":
-        return r`${E} REGEXP ${A}`;
+        return n`${E} REGEXP ${A}`;
       case "notRegex":
-        return r`${E} NOT REGEXP ${A}`;
+        return n`${E} NOT REGEXP ${A}`;
       default:
         throw new Error(`Unsupported string operator: ${T}`);
     }
@@ -216,11 +216,11 @@ class HT extends fE {
   castToType(E, T) {
     switch (T) {
       case "timestamp":
-        return r`CAST(${E} AS DATETIME)`;
+        return n`CAST(${E} AS DATETIME)`;
       case "decimal":
-        return r`CAST(${E} AS DECIMAL(10,2))`;
+        return n`CAST(${E} AS DECIMAL(10,2))`;
       case "integer":
-        return r`CAST(${E} AS SIGNED INTEGER)`;
+        return n`CAST(${E} AS SIGNED INTEGER)`;
       default:
         throw new Error(`Unsupported cast type: ${T}`);
     }
@@ -230,21 +230,21 @@ class HT extends fE {
    * MySQL AVG returns NULL for empty sets, using IFNULL for consistency
    */
   buildAvg(E) {
-    return r`IFNULL(AVG(${E}), 0)`;
+    return n`IFNULL(AVG(${E}), 0)`;
   }
   /**
    * Build MySQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, T) {
-    const A = E.map((e) => r`WHEN ${e.when} THEN ${e.then}`).reduce((e, S) => r`${e} ${S}`);
-    return T !== void 0 ? r`CASE ${A} ELSE ${T} END` : r`CASE ${A} END`;
+    const A = E.map((e) => n`WHEN ${e.when} THEN ${e.then}`).reduce((e, S) => n`${e} ${S}`);
+    return T !== void 0 ? n`CASE ${A} ELSE ${T} END` : n`CASE ${A} END`;
   }
   /**
    * Build MySQL boolean literal
    * MySQL uses TRUE/FALSE keywords (equivalent to 1/0)
    */
   buildBooleanLiteral(E) {
-    return E ? r`TRUE` : r`FALSE`;
+    return E ? n`TRUE` : n`FALSE`;
   }
   /**
    * Convert filter values - MySQL uses native types
@@ -287,28 +287,28 @@ class jT extends fE {
   buildTimeDimension(E, T) {
     switch (E) {
       case "year":
-        return r`datetime(${T}, 'unixepoch', 'start of year')`;
+        return n`datetime(${T}, 'unixepoch', 'start of year')`;
       case "quarter":
-        const A = r`datetime(${T}, 'unixepoch')`;
-        return r`datetime(${A}, 'start of year',
+        const A = n`datetime(${T}, 'unixepoch')`;
+        return n`datetime(${A}, 'start of year',
           '+' || (((CAST(strftime('%m', ${A}) AS INTEGER) - 1) / 3) * 3) || ' months')`;
       case "month":
-        return r`datetime(${T}, 'unixepoch', 'start of month')`;
+        return n`datetime(${T}, 'unixepoch', 'start of month')`;
       case "week":
-        return r`date(datetime(${T}, 'unixepoch'), 'weekday 1', '-6 days')`;
+        return n`date(datetime(${T}, 'unixepoch'), 'weekday 1', '-6 days')`;
       case "day":
-        return r`datetime(${T}, 'unixepoch', 'start of day')`;
+        return n`datetime(${T}, 'unixepoch', 'start of day')`;
       case "hour":
-        const e = r`datetime(${T}, 'unixepoch')`;
-        return r`datetime(strftime('%Y-%m-%d %H:00:00', ${e}))`;
+        const e = n`datetime(${T}, 'unixepoch')`;
+        return n`datetime(strftime('%Y-%m-%d %H:00:00', ${e}))`;
       case "minute":
-        const S = r`datetime(${T}, 'unixepoch')`;
-        return r`datetime(strftime('%Y-%m-%d %H:%M:00', ${S}))`;
+        const S = n`datetime(${T}, 'unixepoch')`;
+        return n`datetime(strftime('%Y-%m-%d %H:%M:00', ${S}))`;
       case "second":
-        const I = r`datetime(${T}, 'unixepoch')`;
-        return r`datetime(strftime('%Y-%m-%d %H:%M:%S', ${I}))`;
+        const I = n`datetime(${T}, 'unixepoch')`;
+        return n`datetime(strftime('%Y-%m-%d %H:%M:%S', ${I}))`;
       default:
-        return r`datetime(${T}, 'unixepoch')`;
+        return n`datetime(${T}, 'unixepoch')`;
     }
   }
   /**
@@ -318,23 +318,23 @@ class jT extends fE {
   buildStringCondition(E, T, A) {
     switch (T) {
       case "contains":
-        return r`LOWER(${E}) LIKE ${`%${A.toLowerCase()}%`}`;
+        return n`LOWER(${E}) LIKE ${`%${A.toLowerCase()}%`}`;
       case "notContains":
-        return r`LOWER(${E}) NOT LIKE ${`%${A.toLowerCase()}%`}`;
+        return n`LOWER(${E}) NOT LIKE ${`%${A.toLowerCase()}%`}`;
       case "startsWith":
-        return r`LOWER(${E}) LIKE ${`${A.toLowerCase()}%`}`;
+        return n`LOWER(${E}) LIKE ${`${A.toLowerCase()}%`}`;
       case "endsWith":
-        return r`LOWER(${E}) LIKE ${`%${A.toLowerCase()}`}`;
+        return n`LOWER(${E}) LIKE ${`%${A.toLowerCase()}`}`;
       case "like":
-        return r`${E} LIKE ${A}`;
+        return n`${E} LIKE ${A}`;
       case "notLike":
-        return r`${E} NOT LIKE ${A}`;
+        return n`${E} NOT LIKE ${A}`;
       case "ilike":
-        return r`LOWER(${E}) LIKE ${A.toLowerCase()}`;
+        return n`LOWER(${E}) LIKE ${A.toLowerCase()}`;
       case "regex":
-        return r`${E} GLOB ${A}`;
+        return n`${E} GLOB ${A}`;
       case "notRegex":
-        return r`${E} NOT GLOB ${A}`;
+        return n`${E} NOT GLOB ${A}`;
       default:
         throw new Error(`Unsupported string operator: ${T}`);
     }
@@ -346,11 +346,11 @@ class jT extends fE {
   castToType(E, T) {
     switch (T) {
       case "timestamp":
-        return r`datetime(${E} / 1000, 'unixepoch')`;
+        return n`datetime(${E} / 1000, 'unixepoch')`;
       case "decimal":
-        return r`CAST(${E} AS REAL)`;
+        return n`CAST(${E} AS REAL)`;
       case "integer":
-        return r`CAST(${E} AS INTEGER)`;
+        return n`CAST(${E} AS INTEGER)`;
       default:
         throw new Error(`Unsupported cast type: ${T}`);
     }
@@ -360,21 +360,21 @@ class jT extends fE {
    * SQLite AVG returns NULL for empty sets, using IFNULL for consistency
    */
   buildAvg(E) {
-    return r`IFNULL(AVG(${E}), 0)`;
+    return n`IFNULL(AVG(${E}), 0)`;
   }
   /**
    * Build SQLite CASE WHEN conditional expression
    */
   buildCaseWhen(E, T) {
-    const A = E.map((e) => e.then && typeof e.then == "object" && (e.then.queryChunks || e.then._ || e.then.sql) ? r`WHEN ${e.when} THEN ${r.raw("(")}${e.then}${r.raw(")")}` : r`WHEN ${e.when} THEN ${e.then}`).reduce((e, S) => r`${e} ${S}`);
-    return T !== void 0 ? T && typeof T == "object" && (T.queryChunks || T._ || T.sql) ? r`CASE ${A} ELSE ${r.raw("(")}${T}${r.raw(")")} END` : r`CASE ${A} ELSE ${T} END` : r`CASE ${A} END`;
+    const A = E.map((e) => e.then && typeof e.then == "object" && (e.then.queryChunks || e.then._ || e.then.sql) ? n`WHEN ${e.when} THEN ${n.raw("(")}${e.then}${n.raw(")")}` : n`WHEN ${e.when} THEN ${e.then}`).reduce((e, S) => n`${e} ${S}`);
+    return T !== void 0 ? T && typeof T == "object" && (T.queryChunks || T._ || T.sql) ? n`CASE ${A} ELSE ${n.raw("(")}${T}${n.raw(")")} END` : n`CASE ${A} ELSE ${T} END` : n`CASE ${A} END`;
   }
   /**
    * Build SQLite boolean literal
    * SQLite uses 1/0 for true/false
    */
   buildBooleanLiteral(E) {
-    return E ? r`1` : r`0`;
+    return E ? n`1` : n`0`;
   }
   /**
    * Preprocess calculated measure templates for SQLite-specific handling
@@ -657,7 +657,7 @@ function dT(R, E) {
   }
 }
 function SR(R) {
-  return R && typeof R == "object" ? r`${r`${R}`}` : R;
+  return R && typeof R == "object" ? n`${n`${R}`}` : R;
 }
 function X(R, E) {
   const T = typeof R == "function" ? R(E) : R;
@@ -680,30 +680,30 @@ function IR(R, E) {
   if (R.relationship !== "belongsToMany" || !R.through)
     throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
   const { table: T, sourceKey: A, targetKey: e, securitySql: S } = R.through, I = [];
-  for (const O of A) {
-    const s = O.as || x;
-    I.push(s(O.source, O.target));
+  for (const N of A) {
+    const s = N.as || x;
+    I.push(s(N.source, N.target));
   }
   const t = [];
-  for (const O of e) {
-    const s = O.as || x;
-    t.push(s(O.source, O.target));
+  for (const N of e) {
+    const s = N.as || x;
+    t.push(s(N.source, N.target));
   }
   let C;
   if (S) {
-    const O = S(E);
-    C = Array.isArray(O) ? O : [O];
+    const N = S(E);
+    C = Array.isArray(N) ? N : [N];
   }
-  const N = dT("belongsToMany", R.sqlJoinType);
+  const O = dT("belongsToMany", R.sqlJoinType);
   return {
     junctionJoins: [
       {
-        joinType: N,
+        joinType: O,
         table: T,
         condition: p(...I)
       },
       {
-        joinType: N,
+        joinType: O,
         table: T,
         // This will be replaced with target cube table in query planner
         condition: p(...t)
@@ -755,8 +755,8 @@ class b {
       if (A.type === "calculated" && A.calculatedSql) {
         const e = `${E.name}.${T}`, S = this.extractDependencies(A.calculatedSql), I = /* @__PURE__ */ new Set();
         for (const t of S) {
-          const N = `${t.cubeName || E.name}.${t.fieldName}`;
-          I.add(N);
+          const O = `${t.cubeName || E.name}.${t.fieldName}`;
+          I.add(O);
         }
         this.dependencyGraph.set(e, {
           id: e,
@@ -935,35 +935,35 @@ class b {
 function NR(R, E) {
   const { cube: T, allCubes: A, resolvedMeasures: e } = E, S = WE(R), I = /* @__PURE__ */ new Map();
   for (const s of S) {
-    const { originalRef: _, cubeName: n, fieldName: D } = s, o = n || T.name;
+    const { originalRef: r, cubeName: L, fieldName: i } = s, o = L || T.name;
     if (!A.get(o))
       throw new Error(
-        `Cannot substitute {${_}}: cube '${o}' not found`
+        `Cannot substitute {${r}}: cube '${o}' not found`
       );
-    const P = `${o}.${D}`, c = e.get(P);
+    const P = `${o}.${i}`, c = e.get(P);
     if (!c)
       throw new Error(
-        `Cannot substitute {${_}}: measure '${P}' not resolved yet. Ensure measures are resolved in dependency order.`
+        `Cannot substitute {${r}}: measure '${P}' not resolved yet. Ensure measures are resolved in dependency order.`
       );
-    const M = c(), u = r`${M}`;
-    I.set(_, u);
+    const M = c(), u = n`${M}`;
+    I.set(r, u);
   }
   const t = [], C = [];
-  let N = 0;
+  let O = 0;
   for (const s of S) {
-    const _ = `{${s.originalRef}}`, n = R.indexOf(_, N);
-    if (n >= 0) {
-      t.push(R.substring(N, n));
-      const D = I.get(s.originalRef);
-      D && C.push(D), N = n + _.length;
+    const r = `{${s.originalRef}}`, L = R.indexOf(r, O);
+    if (L >= 0) {
+      t.push(R.substring(O, L));
+      const i = I.get(s.originalRef);
+      i && C.push(i), O = L + r.length;
     }
   }
-  if (t.push(R.substring(N)), C.length === 0)
-    return r.raw(R);
-  const O = [];
+  if (t.push(R.substring(O)), C.length === 0)
+    return n.raw(R);
+  const N = [];
   for (let s = 0; s < t.length; s++)
-    t[s] && O.push(new xT(t[s])), s < C.length && O.push(C[s]);
-  return r.join(O, r.raw(""));
+    t[s] && N.push(new xT(t[s])), s < C.length && N.push(C[s]);
+  return n.join(N, n.raw(""));
 }
 function WE(R) {
   const E = /\{([^}]+)\}/g, T = R.matchAll(E), A = [];
@@ -1034,44 +1034,44 @@ class sR {
    * @returns Map of measure names to SQL builder functions
    */
   buildResolvedMeasures(E, T, A, e) {
-    const S = /* @__PURE__ */ new Map(), I = [], t = [], C = new Set(E), N = new b(T);
-    for (const O of T.values())
-      N.buildGraph(O);
-    for (const O of E) {
-      const [s, _] = O.split("."), n = T.get(s);
-      if (n && n.measures && n.measures[_]) {
-        const D = n.measures[_];
-        b.isCalculatedMeasure(D) ? (t.push(O), sE(D.calculatedSql, s).forEach((P) => C.add(P)), N.getAllDependencies(O).forEach((P) => {
+    const S = /* @__PURE__ */ new Map(), I = [], t = [], C = new Set(E), O = new b(T);
+    for (const N of T.values())
+      O.buildGraph(N);
+    for (const N of E) {
+      const [s, r] = N.split("."), L = T.get(s);
+      if (L && L.measures && L.measures[r]) {
+        const i = L.measures[r];
+        b.isCalculatedMeasure(i) ? (t.push(N), sE(i.calculatedSql, s).forEach((P) => C.add(P)), O.getAllDependencies(N).forEach((P) => {
           const [c, M] = P.split("."), u = T.get(c);
           if (u && u.measures[M]) {
             const H = u.measures[M];
             b.isCalculatedMeasure(H) && sE(H.calculatedSql, c).forEach((Y) => C.add(Y));
           }
-        })) : I.push(O);
+        })) : I.push(N);
       }
     }
-    for (const O of C) {
-      const [s, _] = O.split("."), n = T.get(s);
-      if (n && n.measures && n.measures[_]) {
-        const D = n.measures[_];
-        b.isCalculatedMeasure(D) ? t.includes(O) || t.push(O) : I.includes(O) || I.push(O);
+    for (const N of C) {
+      const [s, r] = N.split("."), L = T.get(s);
+      if (L && L.measures && L.measures[r]) {
+        const i = L.measures[r];
+        b.isCalculatedMeasure(i) ? t.includes(N) || t.push(N) : I.includes(N) || I.push(N);
       }
     }
-    for (const O of I) {
-      const [s, _] = O.split("."), n = T.get(s), D = n.measures[_];
+    for (const N of I) {
+      const [s, r] = N.split("."), L = T.get(s), i = L.measures[r];
       if (e) {
-        const o = e(O, D, n);
-        S.set(O, () => o);
+        const o = e(N, i, L);
+        S.set(N, () => o);
       } else
-        S.set(O, () => this.buildMeasureExpression(D, A));
+        S.set(N, () => this.buildMeasureExpression(i, A));
     }
     if (t.length > 0) {
-      const O = N.topologicalSort(t);
-      for (const s of O) {
-        const [_, n] = s.split("."), D = T.get(_), o = D.measures[n];
+      const N = O.topologicalSort(t);
+      for (const s of N) {
+        const [r, L] = s.split("."), i = T.get(r), o = i.measures[L];
         S.set(s, () => this.buildCalculatedMeasure(
           o,
-          D,
+          i,
           T,
           S,
           A
@@ -1089,10 +1089,10 @@ class sR {
     const e = {}, S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (T.dimensions)
       for (const I of T.dimensions) {
-        const [t, C] = I.split("."), N = S.get(t);
-        if (N && N.dimensions && N.dimensions[C]) {
-          const O = N.dimensions[C], s = X(O.sql, A);
-          e[I] = r`${s}`.as(I);
+        const [t, C] = I.split("."), O = S.get(t);
+        if (O && O.dimensions && O.dimensions[C]) {
+          const N = O.dimensions[C], s = X(N.sql, A);
+          e[I] = n`${s}`.as(I);
         }
       }
     if (T.measures) {
@@ -1104,21 +1104,21 @@ class sR {
       for (const t of T.measures) {
         const C = I.get(t);
         if (C) {
-          const N = C();
-          e[t] = r`${N}`.as(t);
+          const O = C();
+          e[t] = n`${O}`.as(t);
         }
       }
     }
     if (T.timeDimensions)
       for (const I of T.timeDimensions) {
-        const [t, C] = I.dimension.split("."), N = S.get(t);
-        if (N && N.dimensions && N.dimensions[C]) {
-          const O = N.dimensions[C], s = this.buildTimeDimensionExpression(
-            O.sql,
+        const [t, C] = I.dimension.split("."), O = S.get(t);
+        if (O && O.dimensions && O.dimensions[C]) {
+          const N = O.dimensions[C], s = this.buildTimeDimensionExpression(
+            N.sql,
             I.granularity,
             A
           );
-          e[I.dimension] = r`${s}`.as(I.dimension);
+          e[I.dimension] = n`${s}`.as(I.dimension);
         }
       }
     return Object.keys(e).length === 0 && (e.count = SE()), e;
@@ -1160,34 +1160,34 @@ class sR {
       );
     const I = /* @__PURE__ */ new Map(), t = sE(E.calculatedSql, T.name);
     for (const C of t) {
-      const [N, O] = C.split("."), s = e.get(N);
-      if (s && s.measures[O]) {
-        const _ = s.measures[O];
+      const [O, N] = C.split("."), s = e.get(O);
+      if (s && s.measures[N]) {
+        const r = s.measures[N];
         if (A.measures.includes(C)) {
-          const n = r`${r.identifier(A.cteAlias)}.${r.identifier(O)}`;
-          let D;
-          switch (_.type) {
+          const L = n`${n.identifier(A.cteAlias)}.${n.identifier(N)}`;
+          let i;
+          switch (r.type) {
             case "count":
             case "countDistinct":
             case "sum":
-              D = f(n);
+              i = f(L);
               break;
             case "avg":
-              D = this.databaseAdapter.buildAvg(n);
+              i = this.databaseAdapter.buildAvg(L);
               break;
             case "min":
-              D = j(n);
+              i = j(L);
               break;
             case "max":
-              D = q(n);
+              i = q(L);
               break;
             case "number":
-              D = f(n);
+              i = f(L);
               break;
             default:
-              D = f(n);
+              i = f(L);
           }
-          I.set(C, () => D);
+          I.set(C, () => i);
         }
       }
     }
@@ -1207,13 +1207,13 @@ class sR {
       const I = S.preAggregationCTEs.find((t) => t.cube.name === E);
       if (I && I.measures.includes(`${E}.${T}`))
         if (A.type === "calculated" && A.calculatedSql) {
-          const t = S.primaryCube.name === E ? S.primaryCube : S.joinCubes?.find((N) => N.cube.name === E)?.cube;
+          const t = S.primaryCube.name === E ? S.primaryCube : S.joinCubes?.find((O) => O.cube.name === E)?.cube;
           if (!t)
             throw new Error(`Cube ${E} not found in query plan`);
           const C = /* @__PURE__ */ new Map([[S.primaryCube.name, S.primaryCube]]);
           if (S.joinCubes)
-            for (const N of S.joinCubes)
-              C.set(N.cube.name, N.cube);
+            for (const O of S.joinCubes)
+              C.set(O.cube.name, O.cube);
           return this.buildCTECalculatedMeasure(
             A,
             t,
@@ -1222,7 +1222,7 @@ class sR {
             e
           );
         } else {
-          const t = r`${r.identifier(I.cteAlias)}.${r.identifier(T)}`;
+          const t = n`${n.identifier(I.cteAlias)}.${n.identifier(T)}`;
           switch (A.type) {
             case "count":
             case "countDistinct":
@@ -1260,7 +1260,7 @@ class sR {
     if (E.filters && E.filters.length > 0) {
       const e = E.filters.map((S) => {
         const I = S(T);
-        return I ? r`(${I})` : void 0;
+        return I ? n`(${I})` : void 0;
       }).filter(Boolean);
       if (e.length > 0) {
         const S = e.length === 1 ? e[0] : p(...e);
@@ -1293,7 +1293,7 @@ class sR {
    */
   buildTimeDimensionExpression(E, T, A) {
     const e = X(E, A);
-    return T ? this.databaseAdapter.buildTimeDimension(T, e) : e instanceof QT ? e : r`${e}`;
+    return T ? this.databaseAdapter.buildTimeDimension(T, e) : e instanceof QT ? e : n`${e}`;
   }
   /**
    * Build WHERE conditions from semantic query filters (dimensions only)
@@ -1308,12 +1308,12 @@ class sR {
       }
     if (T.timeDimensions)
       for (const t of T.timeDimensions) {
-        const [C, N] = t.dimension.split("."), O = I.get(C);
-        if (O && O.dimensions[N] && t.dateRange) {
+        const [C, O] = t.dimension.split("."), N = I.get(C);
+        if (N && N.dimensions[O] && t.dateRange) {
           if (e?.preAggregationCTEs && e.preAggregationCTEs.some((o) => o.cube.name === C))
             continue;
-          const s = O.dimensions[N], _ = X(s.sql, A), n = this.buildDateRangeCondition(_, t.dateRange);
-          n && S.push(n);
+          const s = N.dimensions[O], r = X(s.sql, A), L = this.buildDateRangeCondition(r, t.dateRange);
+          L && S.push(L);
         }
       }
     return S;
@@ -1337,31 +1337,43 @@ class sR {
    */
   processFilter(E, T, A, e, S) {
     if ("and" in E || "or" in E) {
-      const n = E;
-      if (n.and) {
-        const D = n.and.map((o) => this.processFilter(o, T, A, e, S)).filter((o) => o !== null);
-        return D.length > 0 ? p(...D) : null;
+      const L = E;
+      if (L.and) {
+        const i = L.and.map((o) => this.processFilter(o, T, A, e, S)).filter((o) => o !== null);
+        return i.length > 0 ? p(...i) : null;
       }
-      if (n.or) {
-        const D = n.or.map((o) => this.processFilter(o, T, A, e, S)).filter((o) => o !== null);
-        return D.length > 0 ? IE(...D) : null;
+      if (L.or) {
+        const i = L.or.map((o) => this.processFilter(o, T, A, e, S)).filter((o) => o !== null);
+        return i.length > 0 ? IE(...i) : null;
       }
     }
-    const I = E, [t, C] = I.member.split("."), N = T.get(t);
-    if (!N) return null;
-    const O = N.dimensions[C], s = N.measures[C], _ = O || s;
-    if (!_) return null;
-    if (e === "where" && O) {
+    const I = E, [t, C] = I.member.split("."), O = T.get(t);
+    if (!O) return null;
+    const N = O.dimensions[C], s = O.measures[C], r = N || s;
+    if (!r) return null;
+    if (e === "where" && N) {
       if (S?.preAggregationCTEs && S.preAggregationCTEs.some((o) => o.cube.name === t))
         return null;
-      const n = X(O.sql, A);
-      return this.buildFilterCondition(n, I.operator, I.values, _);
+      const L = X(N.sql, A);
+      return this.buildFilterCondition(
+        L,
+        I.operator,
+        I.values,
+        r,
+        I.dateRange
+      );
     } else {
       if (e === "where" && s)
         return null;
       if (e === "having" && s) {
-        const n = this.buildHavingMeasureExpression(t, C, s, A, S);
-        return this.buildFilterCondition(n, I.operator, I.values, _);
+        const L = this.buildHavingMeasureExpression(t, C, s, A, S);
+        return this.buildFilterCondition(
+          L,
+          I.operator,
+          I.values,
+          r,
+          I.dateRange
+        );
       }
     }
     return null;
@@ -1369,97 +1381,108 @@ class sR {
   /**
    * Build filter condition using Drizzle operators
    */
-  buildFilterCondition(E, T, A, e) {
+  buildFilterCondition(E, T, A, e, S) {
+    if (S !== void 0) {
+      if (T !== "inDateRange")
+        throw new Error(
+          `dateRange can only be used with 'inDateRange' operator, but got '${T}'. Use explicit date values in the 'values' array for other date operators.`
+        );
+      if (e && e.type !== "time")
+        throw new Error(
+          `dateRange can only be used on time dimensions, but field '${e.name || "unknown"}' has type '${e.type}'`
+        );
+      return this.buildDateRangeCondition(E, S);
+    }
     if (!A || A.length === 0)
       return T === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const S = A.filter((t) => !(t == null || t === "" || typeof t == "string" && t.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
-    if (S.length === 0 && !["set", "notSet"].includes(T))
+    const I = A.filter((C) => !(C == null || C === "" || typeof C == "string" && C.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
+    if (I.length === 0 && !["set", "notSet"].includes(T))
       return T === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const I = S[0];
+    const t = I[0];
     switch (T) {
       case "equals":
-        if (S.length > 1) {
+        if (I.length > 1) {
           if (e?.type === "time") {
-            const t = S.map((C) => this.normalizeDate(C) || C);
-            return OE(E, t);
+            const C = I.map((O) => this.normalizeDate(O) || O);
+            return OE(E, C);
           }
-          return OE(E, S);
-        } else if (S.length === 1) {
-          const t = e?.type === "time" && this.normalizeDate(I) || I;
-          return x(E, t);
+          return OE(E, I);
+        } else if (I.length === 1) {
+          const C = e?.type === "time" && this.normalizeDate(t) || t;
+          return x(E, C);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return S.length > 1 ? gE(E, S) : S.length === 1 ? KE(E, I) : null;
+        return I.length > 1 ? gE(E, I) : I.length === 1 ? KE(E, t) : null;
       case "contains":
-        return this.databaseAdapter.buildStringCondition(E, "contains", I);
+        return this.databaseAdapter.buildStringCondition(E, "contains", t);
       case "notContains":
-        return this.databaseAdapter.buildStringCondition(E, "notContains", I);
+        return this.databaseAdapter.buildStringCondition(E, "notContains", t);
       case "startsWith":
-        return this.databaseAdapter.buildStringCondition(E, "startsWith", I);
+        return this.databaseAdapter.buildStringCondition(E, "startsWith", t);
       case "endsWith":
-        return this.databaseAdapter.buildStringCondition(E, "endsWith", I);
+        return this.databaseAdapter.buildStringCondition(E, "endsWith", t);
       case "gt":
-        return tE(E, I);
+        return tE(E, t);
       case "gte":
-        return $(E, I);
+        return $(E, t);
       case "lt":
-        return NE(E, I);
+        return NE(E, t);
       case "lte":
-        return g(E, I);
+        return g(E, t);
       case "set":
         return yE(E);
       case "notSet":
         return $E(E);
       case "inDateRange":
-        if (S.length >= 2) {
-          const t = this.normalizeDate(S[0]);
-          let C = this.normalizeDate(S[1]);
-          if (t && C) {
+        if (I.length >= 2) {
+          const C = this.normalizeDate(I[0]);
+          let O = this.normalizeDate(I[1]);
+          if (C && O) {
             const N = A[1];
             if (typeof N == "string" && /^\d{4}-\d{2}-\d{2}$/.test(N.trim())) {
-              const O = typeof C == "number" ? new Date(C * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(C), s = new Date(O);
-              s.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? C = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(s.getTime() / 1e3) : s.getTime() : C = s.toISOString();
+              const s = typeof O == "number" ? new Date(O * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(O), r = new Date(s);
+              r.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? O = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(r.getTime() / 1e3) : r.getTime() : O = r.toISOString();
             }
             return p(
-              $(E, t),
-              g(E, C)
+              $(E, C),
+              g(E, O)
             );
           }
         }
         return null;
       case "beforeDate": {
-        const t = this.normalizeDate(I);
-        return t ? NE(E, t) : null;
+        const C = this.normalizeDate(t);
+        return C ? NE(E, C) : null;
       }
       case "afterDate": {
-        const t = this.normalizeDate(I);
-        return t ? tE(E, t) : null;
+        const C = this.normalizeDate(t);
+        return C ? tE(E, C) : null;
       }
       case "between":
-        return S.length >= 2 ? p(
-          $(E, S[0]),
-          g(E, S[1])
+        return I.length >= 2 ? p(
+          $(E, I[0]),
+          g(E, I[1])
         ) : null;
       case "notBetween":
-        return S.length >= 2 ? IE(
-          NE(E, S[0]),
-          tE(E, S[1])
+        return I.length >= 2 ? IE(
+          NE(E, I[0]),
+          tE(E, I[1])
         ) : null;
       case "in":
-        return S.length > 0 ? OE(E, S) : null;
+        return I.length > 0 ? OE(E, I) : null;
       case "notIn":
-        return S.length > 0 ? gE(E, S) : null;
+        return I.length > 0 ? gE(E, I) : null;
       case "like":
-        return this.databaseAdapter.buildStringCondition(E, "like", I);
+        return this.databaseAdapter.buildStringCondition(E, "like", t);
       case "notLike":
-        return this.databaseAdapter.buildStringCondition(E, "notLike", I);
+        return this.databaseAdapter.buildStringCondition(E, "notLike", t);
       case "ilike":
-        return this.databaseAdapter.buildStringCondition(E, "ilike", I);
+        return this.databaseAdapter.buildStringCondition(E, "ilike", t);
       case "regex":
-        return this.databaseAdapter.buildStringCondition(E, "regex", I);
+        return this.databaseAdapter.buildStringCondition(E, "regex", t);
       case "notRegex":
-        return this.databaseAdapter.buildStringCondition(E, "notRegex", I);
+        return this.databaseAdapter.buildStringCondition(E, "notRegex", t);
       case "isEmpty":
         return IE(
           $E(E),
@@ -1495,9 +1518,9 @@ class sR {
     if (typeof T == "string") {
       const A = this.parseRelativeDateRange(T);
       if (A) {
-        let O, s;
-        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (O = Math.floor(A.start.getTime() / 1e3), s = Math.floor(A.end.getTime() / 1e3)) : (O = A.start.getTime(), s = A.end.getTime()) : (O = A.start.toISOString(), s = A.end.toISOString()), p(
-          $(E, O),
+        let N, s;
+        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (N = Math.floor(A.start.getTime() / 1e3), s = Math.floor(A.end.getTime() / 1e3)) : (N = A.start.getTime(), s = A.end.getTime()) : (N = A.start.toISOString(), s = A.end.toISOString()), p(
+          $(E, N),
           g(E, s)
         );
       }
@@ -1507,10 +1530,10 @@ class sR {
       I.setUTCHours(0, 0, 0, 0);
       const t = new Date(S);
       t.setUTCHours(23, 59, 59, 999);
-      let C, N;
-      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (C = Math.floor(I.getTime() / 1e3), N = Math.floor(t.getTime() / 1e3)) : (C = I.getTime(), N = t.getTime()) : (C = I.toISOString(), N = t.toISOString()), p(
+      let C, O;
+      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (C = Math.floor(I.getTime() / 1e3), O = Math.floor(t.getTime() / 1e3)) : (C = I.getTime(), O = t.getTime()) : (C = I.toISOString(), O = t.toISOString()), p(
         $(E, C),
-        g(E, N)
+        g(E, O)
       );
     }
     return null;
@@ -1522,73 +1545,80 @@ class sR {
   parseRelativeDateRange(E) {
     const T = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), e = T.getUTCFullYear(), S = T.getUTCMonth(), I = T.getUTCDate(), t = T.getUTCDay();
     if (A === "today") {
-      const s = new Date(T);
-      s.setUTCHours(0, 0, 0, 0);
-      const _ = new Date(T);
-      return _.setUTCHours(23, 59, 59, 999), { start: s, end: _ };
+      const r = new Date(T);
+      r.setUTCHours(0, 0, 0, 0);
+      const L = new Date(T);
+      return L.setUTCHours(23, 59, 59, 999), { start: r, end: L };
     }
     if (A === "yesterday") {
-      const s = new Date(T);
-      s.setUTCDate(I - 1), s.setUTCHours(0, 0, 0, 0);
-      const _ = new Date(T);
-      return _.setUTCDate(I - 1), _.setUTCHours(23, 59, 59, 999), { start: s, end: _ };
+      const r = new Date(T);
+      r.setUTCDate(I - 1), r.setUTCHours(0, 0, 0, 0);
+      const L = new Date(T);
+      return L.setUTCDate(I - 1), L.setUTCHours(23, 59, 59, 999), { start: r, end: L };
     }
     if (A === "this week") {
-      const s = t === 0 ? -6 : 1 - t, _ = new Date(T);
-      _.setUTCDate(I + s), _.setUTCHours(0, 0, 0, 0);
-      const n = new Date(_);
-      return n.setUTCDate(_.getUTCDate() + 6), n.setUTCHours(23, 59, 59, 999), { start: _, end: n };
+      const r = t === 0 ? -6 : 1 - t, L = new Date(T);
+      L.setUTCDate(I + r), L.setUTCHours(0, 0, 0, 0);
+      const i = new Date(L);
+      return i.setUTCDate(L.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
     }
     if (A === "this month") {
-      const s = new Date(Date.UTC(e, S, 1, 0, 0, 0, 0)), _ = new Date(Date.UTC(e, S + 1, 0, 23, 59, 59, 999));
-      return { start: s, end: _ };
+      const r = new Date(Date.UTC(e, S, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e, S + 1, 0, 23, 59, 59, 999));
+      return { start: r, end: L };
     }
     if (A === "this quarter") {
-      const s = Math.floor(S / 3), _ = new Date(Date.UTC(e, s * 3, 1, 0, 0, 0, 0)), n = new Date(Date.UTC(e, s * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: _, end: n };
+      const r = Math.floor(S / 3), L = new Date(Date.UTC(e, r * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(e, r * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: L, end: i };
     }
     if (A === "this year") {
-      const s = new Date(Date.UTC(e, 0, 1, 0, 0, 0, 0)), _ = new Date(Date.UTC(e, 11, 31, 23, 59, 59, 999));
-      return { start: s, end: _ };
+      const r = new Date(Date.UTC(e, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e, 11, 31, 23, 59, 59, 999));
+      return { start: r, end: L };
     }
     const C = A.match(/^last\s+(\d+)\s+days?$/);
     if (C) {
-      const s = parseInt(C[1], 10), _ = new Date(T);
-      _.setUTCDate(I - s + 1), _.setUTCHours(0, 0, 0, 0);
-      const n = new Date(T);
-      return n.setUTCHours(23, 59, 59, 999), { start: _, end: n };
+      const r = parseInt(C[1], 10), L = new Date(T);
+      L.setUTCDate(I - r + 1), L.setUTCHours(0, 0, 0, 0);
+      const i = new Date(T);
+      return i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
+    }
+    const O = A.match(/^last\s+(\d+)\s+weeks?$/);
+    if (O) {
+      const L = parseInt(O[1], 10) * 7, i = new Date(T);
+      i.setUTCDate(I - L + 1), i.setUTCHours(0, 0, 0, 0);
+      const o = new Date(T);
+      return o.setUTCHours(23, 59, 59, 999), { start: i, end: o };
     }
     if (A === "last week") {
-      const s = t === 0 ? -13 : -6 - t, _ = new Date(T);
-      _.setUTCDate(I + s), _.setUTCHours(0, 0, 0, 0);
-      const n = new Date(_);
-      return n.setUTCDate(_.getUTCDate() + 6), n.setUTCHours(23, 59, 59, 999), { start: _, end: n };
+      const r = t === 0 ? -13 : -6 - t, L = new Date(T);
+      L.setUTCDate(I + r), L.setUTCHours(0, 0, 0, 0);
+      const i = new Date(L);
+      return i.setUTCDate(L.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
     }
     if (A === "last month") {
-      const s = new Date(Date.UTC(e, S - 1, 1, 0, 0, 0, 0)), _ = new Date(Date.UTC(e, S, 0, 23, 59, 59, 999));
-      return { start: s, end: _ };
+      const r = new Date(Date.UTC(e, S - 1, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e, S, 0, 23, 59, 59, 999));
+      return { start: r, end: L };
     }
     if (A === "last quarter") {
-      const s = Math.floor(S / 3), _ = s === 0 ? 3 : s - 1, n = s === 0 ? e - 1 : e, D = new Date(Date.UTC(n, _ * 3, 1, 0, 0, 0, 0)), o = new Date(Date.UTC(n, _ * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: D, end: o };
+      const r = Math.floor(S / 3), L = r === 0 ? 3 : r - 1, i = r === 0 ? e - 1 : e, o = new Date(Date.UTC(i, L * 3, 1, 0, 0, 0, 0)), l = new Date(Date.UTC(i, L * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: o, end: l };
     }
     if (A === "last year") {
-      const s = new Date(Date.UTC(e - 1, 0, 1, 0, 0, 0, 0)), _ = new Date(Date.UTC(e - 1, 11, 31, 23, 59, 59, 999));
-      return { start: s, end: _ };
+      const r = new Date(Date.UTC(e - 1, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e - 1, 11, 31, 23, 59, 59, 999));
+      return { start: r, end: L };
     }
     if (A === "last 12 months") {
-      const s = new Date(Date.UTC(e, S - 11, 1, 0, 0, 0, 0)), _ = new Date(T);
-      return _.setUTCHours(23, 59, 59, 999), { start: s, end: _ };
+      const r = new Date(Date.UTC(e, S - 11, 1, 0, 0, 0, 0)), L = new Date(T);
+      return L.setUTCHours(23, 59, 59, 999), { start: r, end: L };
     }
     const N = A.match(/^last\s+(\d+)\s+months?$/);
     if (N) {
-      const s = parseInt(N[1], 10), _ = new Date(Date.UTC(e, S - s + 1, 1, 0, 0, 0, 0)), n = new Date(T);
-      return n.setUTCHours(23, 59, 59, 999), { start: _, end: n };
+      const r = parseInt(N[1], 10), L = new Date(Date.UTC(e, S - r + 1, 1, 0, 0, 0, 0)), i = new Date(T);
+      return i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
     }
-    const O = A.match(/^last\s+(\d+)\s+years?$/);
-    if (O) {
-      const s = parseInt(O[1], 10), _ = new Date(Date.UTC(e - s, 0, 1, 0, 0, 0, 0)), n = new Date(T);
-      return n.setUTCHours(23, 59, 59, 999), { start: _, end: n };
+    const s = A.match(/^last\s+(\d+)\s+years?$/);
+    if (s) {
+      const r = parseInt(s[1], 10), L = new Date(Date.UTC(e - r, 0, 1, 0, 0, 0, 0)), i = new Date(T);
+      return i.setUTCHours(23, 59, 59, 999), { start: L, end: i };
     }
     return null;
   }
@@ -1627,45 +1657,45 @@ class sR {
     const t = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (T.dimensions)
       for (const C of T.dimensions) {
-        const [N, O] = C.split("."), s = t.get(N);
-        if (s && s.dimensions && s.dimensions[O])
-          if (e?.preAggregationCTEs?.some((n) => n.cube.name === N)) {
-            const n = e.preAggregationCTEs.find((o) => o.cube.name === N), D = n.joinKeys.find((o) => o.targetColumn === O);
-            if (D && D.sourceColumnObj)
-              S.push(D.sourceColumnObj);
+        const [O, N] = C.split("."), s = t.get(O);
+        if (s && s.dimensions && s.dimensions[N])
+          if (e?.preAggregationCTEs?.some((L) => L.cube.name === O)) {
+            const L = e.preAggregationCTEs.find((o) => o.cube.name === O), i = L.joinKeys.find((o) => o.targetColumn === N);
+            if (i && i.sourceColumnObj)
+              S.push(i.sourceColumnObj);
             else {
-              const o = r`${r.identifier(n.cteAlias)}.${r.identifier(O)}`;
+              const o = n`${n.identifier(L.cteAlias)}.${n.identifier(N)}`;
               S.push(o);
             }
           } else {
-            const n = s.dimensions[O], D = X(n.sql, A);
-            S.push(D);
+            const L = s.dimensions[N], i = X(L.sql, A);
+            S.push(i);
           }
       }
     if (T.timeDimensions)
       for (const C of T.timeDimensions) {
-        const [N, O] = C.dimension.split("."), s = t.get(N);
-        if (s && s.dimensions && s.dimensions[O])
-          if (e?.preAggregationCTEs?.some((n) => n.cube.name === N)) {
-            const n = e.preAggregationCTEs.find((o) => o.cube.name === N), D = n.joinKeys.find((o) => o.targetColumn === O);
-            if (D && D.sourceColumnObj) {
+        const [O, N] = C.dimension.split("."), s = t.get(O);
+        if (s && s.dimensions && s.dimensions[N])
+          if (e?.preAggregationCTEs?.some((L) => L.cube.name === O)) {
+            const L = e.preAggregationCTEs.find((o) => o.cube.name === O), i = L.joinKeys.find((o) => o.targetColumn === N);
+            if (i && i.sourceColumnObj) {
               const o = this.buildTimeDimensionExpression(
-                D.sourceColumnObj,
+                i.sourceColumnObj,
                 C.granularity,
                 A
               );
               S.push(o);
             } else {
-              const o = r`${r.identifier(n.cteAlias)}.${r.identifier(O)}`;
+              const o = n`${n.identifier(L.cteAlias)}.${n.identifier(N)}`;
               S.push(o);
             }
           } else {
-            const n = s.dimensions[O], D = this.buildTimeDimensionExpression(
-              n.sql,
+            const L = s.dimensions[N], i = this.buildTimeDimensionExpression(
+              L.sql,
               C.granularity,
               A
             );
-            S.push(D);
+            S.push(i);
           }
       }
     return S;
@@ -1683,7 +1713,7 @@ class sR {
       for (const [S, I] of Object.entries(E.order)) {
         if (!e.includes(S))
           throw new Error(`Cannot order by '${S}': field is not selected in the query`);
-        const t = I === "desc" ? ZT(r.identifier(S)) : wE(r.identifier(S));
+        const t = I === "desc" ? ZT(n.identifier(S)) : wE(n.identifier(S));
         A.push(t);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
@@ -1691,7 +1721,7 @@ class sR {
         (t, C) => t.dimension.localeCompare(C.dimension)
       );
       for (const t of I)
-        S.has(t.dimension) || A.push(wE(r.identifier(t.dimension)));
+        S.has(t.dimension) || A.push(wE(n.identifier(t.dimension)));
     }
     return A;
   }
@@ -1705,8 +1735,8 @@ class sR {
       for (const S of T.dimensions) {
         const [I, t] = S.split("."), C = e.get(I);
         if (C) {
-          const N = C.dimensions[t];
-          N && N.type === "number" && A.push(S);
+          const O = C.dimensions[t];
+          O && O.type === "number" && A.push(S);
         }
       }
     return A;
@@ -1821,7 +1851,7 @@ class CR {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const C = this.buildJoinPlan(E, t, S, A), N = this.planPreAggregationCTEs(E, t, C, T);
+    const C = this.buildJoinPlan(E, t, S, A), O = this.planPreAggregationCTEs(E, t, C, T);
     return {
       primaryCube: t,
       joinCubes: C,
@@ -1831,7 +1861,7 @@ class CR {
       // Will be built by QueryBuilder
       groupByFields: [],
       // Will be built by QueryBuilder
-      preAggregationCTEs: N
+      preAggregationCTEs: O
     };
   }
   /**
@@ -1885,48 +1915,48 @@ class CR {
     for (const C of t) {
       if (I.has(C))
         continue;
-      const N = this.findJoinPath(E, T.name, C, I);
-      if (!N || N.length === 0)
+      const O = this.findJoinPath(E, T.name, C, I);
+      if (!O || O.length === 0)
         throw new Error(`No join path found from '${T.name}' to '${C}'`);
-      for (const { toCube: O, joinDef: s } of N) {
-        if (I.has(O))
+      for (const { toCube: N, joinDef: s } of O) {
+        if (I.has(N))
           continue;
-        const _ = E.get(O);
-        if (!_)
-          throw new Error(`Cube '${O}' not found`);
+        const r = E.get(N);
+        if (!r)
+          throw new Error(`Cube '${N}' not found`);
         if (s.relationship === "belongsToMany" && s.through) {
-          const n = IR(s, e.securityContext);
+          const L = IR(s, e.securityContext);
           S.push({
-            cube: _,
-            alias: `${O.toLowerCase()}_cube`,
-            joinType: n.junctionJoins[1].joinType,
+            cube: r,
+            alias: `${N.toLowerCase()}_cube`,
+            joinType: L.junctionJoins[1].joinType,
             // Use the target join type
-            joinCondition: n.junctionJoins[1].condition,
+            joinCondition: L.junctionJoins[1].condition,
             // Target join condition
             junctionTable: {
               table: s.through.table,
-              alias: `junction_${O.toLowerCase()}`,
-              joinType: n.junctionJoins[0].joinType,
-              joinCondition: n.junctionJoins[0].condition,
+              alias: `junction_${N.toLowerCase()}`,
+              joinType: L.junctionJoins[0].joinType,
+              joinCondition: L.junctionJoins[0].condition,
               securitySql: s.through.securitySql
             }
           });
         } else {
-          const n = this.buildJoinCondition(
+          const L = this.buildJoinCondition(
             s,
             null,
             // No source alias needed - use the actual column
             null
             // No target alias needed - use the actual column
-          ), D = dT(s.relationship, s.sqlJoinType);
+          ), i = dT(s.relationship, s.sqlJoinType);
           S.push({
-            cube: _,
-            alias: `${O.toLowerCase()}_cube`,
-            joinType: D,
-            joinCondition: n
+            cube: r,
+            alias: `${N.toLowerCase()}_cube`,
+            joinType: i,
+            joinCondition: L
           });
         }
-        I.add(O);
+        I.add(N);
       }
     }
     return S;
@@ -1937,7 +1967,7 @@ class CR {
   buildJoinCondition(E, T, A) {
     const e = [];
     for (const S of E.on) {
-      const I = T ? r`${r.identifier(T)}.${r.identifier(S.source.name)}` : S.source, t = A ? r`${r.identifier(A)}.${r.identifier(S.target.name)}` : S.target, C = S.as || x;
+      const I = T ? n`${n.identifier(T)}.${n.identifier(S.source.name)}` : S.source, t = A ? n`${n.identifier(A)}.${n.identifier(S.target.name)}` : S.target, C = S.as || x;
       e.push(C(I, t));
     }
     return p(...e);
@@ -1953,20 +1983,20 @@ class CR {
       { cube: T, path: [] }
     ], I = /* @__PURE__ */ new Set([T, ...e]);
     for (; S.length > 0; ) {
-      const { cube: t, path: C } = S.shift(), N = E.get(t);
-      if (N?.joins)
-        for (const [, O] of Object.entries(N.joins)) {
-          const _ = QE(O.targetCube).name;
-          if (I.has(_))
+      const { cube: t, path: C } = S.shift(), O = E.get(t);
+      if (O?.joins)
+        for (const [, N] of Object.entries(O.joins)) {
+          const r = QE(N.targetCube).name;
+          if (I.has(r))
             continue;
-          const n = [...C, {
+          const L = [...C, {
             fromCube: t,
-            toCube: _,
-            joinDef: O
+            toCube: r,
+            joinDef: N
           }];
-          if (_ === A)
-            return n;
-          I.add(_), S.push({ cube: _, path: n });
+          if (r === A)
+            return L;
+          I.add(r), S.push({ cube: r, path: L });
         }
     }
     return null;
@@ -1985,24 +2015,24 @@ class CR {
       if (!t)
         continue;
       const C = e.measures ? e.measures.filter(
-        (n) => n.startsWith(I.cube.name + ".")
-      ) : [], N = this.extractMeasuresFromFilters(e, I.cube.name), O = [.../* @__PURE__ */ new Set([...C, ...N])];
-      if (O.length === 0)
+        (L) => L.startsWith(I.cube.name + ".")
+      ) : [], O = this.extractMeasuresFromFilters(e, I.cube.name), N = [.../* @__PURE__ */ new Set([...C, ...O])];
+      if (N.length === 0)
         continue;
       const s = this.expandCalculatedMeasureDependencies(
         I.cube,
-        O
-      ), _ = t.on.map((n) => ({
-        sourceColumn: n.source.name,
-        targetColumn: n.target.name,
-        sourceColumnObj: n.source,
-        targetColumnObj: n.target
+        N
+      ), r = t.on.map((L) => ({
+        sourceColumn: L.source.name,
+        targetColumn: L.target.name,
+        sourceColumnObj: L.source,
+        targetColumnObj: L.target
       }));
       S.push({
         cube: I.cube,
         alias: I.alias,
         cteAlias: `${I.cube.name.toLowerCase()}_agg`,
-        joinKeys: _,
+        joinKeys: r,
         measures: s
       });
     }
@@ -2024,8 +2054,8 @@ class CR {
       const t = E.measures[I];
       if (t.type === "calculated" && t.calculatedSql) {
         const C = this.extractDependenciesFromTemplate(t.calculatedSql, E.name);
-        for (const N of C)
-          A.has(N) || e.push(N);
+        for (const O of C)
+          A.has(O) || e.push(O);
       }
     }
     return Array.from(A);
@@ -2074,23 +2104,23 @@ class CE {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: A
-      }, I = this.queryPlanner.createQueryPlan(E, T, S), t = this.buildUnifiedQuery(I, T, S), C = this.queryBuilder.collectNumericFields(E, T), N = await this.dbExecutor.execute(t, C), O = Array.isArray(N) ? N.map((_) => {
-        const n = { ..._ };
+      }, I = this.queryPlanner.createQueryPlan(E, T, S), t = this.buildUnifiedQuery(I, T, S), C = this.queryBuilder.collectNumericFields(E, T), O = await this.dbExecutor.execute(t, C), N = Array.isArray(O) ? O.map((r) => {
+        const L = { ...r };
         if (T.timeDimensions) {
-          for (const D of T.timeDimensions)
-            if (D.dimension in n) {
-              let o = n[D.dimension];
+          for (const i of T.timeDimensions)
+            if (i.dimension in L) {
+              let o = L[i.dimension];
               if (typeof o == "string" && o.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
                 const l = o.replace(" ", "T"), P = !l.endsWith("Z") && !l.includes("+") ? l + "Z" : l;
                 o = new Date(P);
               }
-              o = this.databaseAdapter.convertTimeDimensionResult(o), n[D.dimension] = o;
+              o = this.databaseAdapter.convertTimeDimensionResult(o), L[i.dimension] = o;
             }
         }
-        return n;
-      }) : [N], s = this.generateAnnotations(I, T);
+        return L;
+      }) : [O], s = this.generateAnnotations(I, T);
       return {
-        data: O,
+        data: N,
         annotation: s
       };
     } catch (e) {
@@ -2113,18 +2143,18 @@ class CE {
       if (P.targetColumnObj) {
         t[P.targetColumn] = P.targetColumnObj;
         for (const [c, M] of Object.entries(S.dimensions || {}))
-          M.sql === P.targetColumnObj && c !== P.targetColumn && (t[c] = r`${P.targetColumnObj}`.as(c));
+          M.sql === P.targetColumnObj && c !== P.targetColumn && (t[c] = n`${P.targetColumnObj}`.as(c));
       }
-    const C = S.name, N = /* @__PURE__ */ new Map([[C, S]]), O = this.queryBuilder.buildResolvedMeasures(
+    const C = S.name, O = /* @__PURE__ */ new Map([[C, S]]), N = this.queryBuilder.buildResolvedMeasures(
       E.measures,
-      N,
+      O,
       A
     );
     for (const P of E.measures) {
-      const [, c] = P.split("."), M = O.get(P);
+      const [, c] = P.split("."), M = N.get(P);
       if (M) {
         const u = M();
-        t[c] = r`${u}`.as(c);
+        t[c] = n`${u}`.as(c);
       }
     }
     if (T.dimensions)
@@ -2132,7 +2162,7 @@ class CE {
         const [c, M] = P.split(".");
         if (c === C && S.dimensions && S.dimensions[M]) {
           const u = S.dimensions[M], H = this.queryBuilder.buildMeasureExpression({ sql: u.sql, type: "number" }, A);
-          t[M] = r`${H}`.as(M);
+          t[M] = n`${H}`.as(M);
         }
       }
     if (T.timeDimensions)
@@ -2140,22 +2170,22 @@ class CE {
         const [c, M] = P.dimension.split(".");
         if (c === C && S.dimensions && S.dimensions[M]) {
           const u = S.dimensions[M], H = this.queryBuilder.buildTimeDimensionExpression(u.sql, P.granularity, A);
-          t[M] = r`${H}`.as(M);
+          t[M] = n`${H}`.as(M);
         }
       }
     if (Object.keys(t).length === 0)
       return null;
     let s = A.db.select(t).from(I.from);
-    const _ = e ? {
+    const r = e ? {
       ...e,
       preAggregationCTEs: e.preAggregationCTEs?.filter((P) => P.cube.name !== S.name)
-    } : void 0, n = this.queryBuilder.buildWhereConditions(S, T, A, _), D = [];
+    } : void 0, L = this.queryBuilder.buildWhereConditions(S, T, A, r), i = [];
     if (T.timeDimensions)
       for (const P of T.timeDimensions) {
         const [c, M] = P.dimension.split(".");
         if (c === C && S.dimensions && S.dimensions[M] && P.dateRange) {
           const u = S.dimensions[M], H = this.queryBuilder.buildMeasureExpression({ sql: u.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(H, P.dateRange);
-          B && D.push(B);
+          B && i.push(B);
         }
       }
     if (T.filters) {
@@ -2166,13 +2196,13 @@ class CE {
             const H = S.dimensions[u];
             if (c.operator === "inDateRange") {
               const B = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A), Y = this.queryBuilder.buildDateRangeCondition(B, c.values);
-              Y && D.push(Y);
+              Y && i.push(Y);
             }
           }
         }
     }
     const o = [];
-    if (I.where && o.push(I.where), o.push(...n, ...D), o.length > 0) {
+    if (I.where && o.push(I.where), o.push(...L, ...i), o.length > 0) {
       const P = o.length === 1 ? o[0] : p(...o);
       s = s.where(P);
     }
@@ -2207,7 +2237,7 @@ class CE {
       throw new Error(`CTE info not found for cube ${E.cube.name}`);
     const S = [];
     for (const I of e.joinKeys) {
-      const t = I.sourceColumnObj || r.identifier(I.sourceColumn), C = r`${r.identifier(T)}.${r.identifier(I.targetColumn)}`;
+      const t = I.sourceColumnObj || n.identifier(I.sourceColumn), C = n`${n.identifier(T)}.${n.identifier(I.targetColumn)}`;
       S.push(x(t, C));
     }
     return S.length === 1 ? S[0] : p(...S);
@@ -2247,7 +2277,7 @@ class CE {
                   A
                 );
               } else {
-                const B = r`${r.identifier(o.cteAlias)}.${r.identifier(c)}`;
+                const B = n`${n.identifier(o.cteAlias)}.${n.identifier(c)}`;
                 switch (u.type) {
                   case "count":
                   case "countDistinct":
@@ -2270,7 +2300,7 @@ class CE {
                     H = f(B);
                 }
               }
-              C[P] = r`${H}`.as(P);
+              C[P] = n`${H}`.as(P);
             }
           }
         for (const P in C) {
@@ -2283,27 +2313,27 @@ class CE {
                 const eE = u.dimensions[M].sql;
                 Y = o.joinKeys.find((JT) => JT.targetColumnObj === eE);
               }
-              Y ? C[P] = r`${r.identifier(o.cteAlias)}.${r.identifier(M)}`.as(P) : B && u?.dimensions?.[M] && (C[P] = r`${r.identifier(o.cteAlias)}.${r.identifier(M)}`.as(P));
+              Y ? C[P] = n`${n.identifier(o.cteAlias)}.${n.identifier(M)}`.as(P) : B && u?.dimensions?.[M] && (C[P] = n`${n.identifier(o.cteAlias)}.${n.identifier(M)}`.as(P));
             }
           }
         }
       }
-    const N = [];
-    let O = A.db.select(C).from(I.from);
-    if (e.length > 0 && (O = A.db.with(...e).select(C).from(I.from)), I.joins)
+    const O = [];
+    let N = A.db.select(C).from(I.from);
+    if (e.length > 0 && (N = A.db.with(...e).select(C).from(I.from)), I.joins)
       for (const o of I.joins)
         switch (o.type || "left") {
           case "left":
-            O = O.leftJoin(o.table, o.on);
+            N = N.leftJoin(o.table, o.on);
             break;
           case "inner":
-            O = O.innerJoin(o.table, o.on);
+            N = N.innerJoin(o.table, o.on);
             break;
           case "right":
-            O = O.rightJoin(o.table, o.on);
+            N = N.rightJoin(o.table, o.on);
             break;
           case "full":
-            O = O.fullJoin(o.table, o.on);
+            N = N.fullJoin(o.table, o.on);
             break;
         }
     if (E.joinCubes && E.joinCubes.length > 0)
@@ -2318,48 +2348,48 @@ class CE {
           try {
             switch (M.joinType || "left") {
               case "left":
-                O = O.leftJoin(M.table, M.joinCondition);
+                N = N.leftJoin(M.table, M.joinCondition);
                 break;
               case "inner":
-                O = O.innerJoin(M.table, M.joinCondition);
+                N = N.innerJoin(M.table, M.joinCondition);
                 break;
               case "right":
-                O = O.rightJoin(M.table, M.joinCondition);
+                N = N.rightJoin(M.table, M.joinCondition);
                 break;
               case "full":
-                O = O.fullJoin(M.table, M.joinCondition);
+                N = N.fullJoin(M.table, M.joinCondition);
                 break;
             }
-            u.length > 0 && N.push(...u);
+            u.length > 0 && O.push(...u);
           } catch {
           }
         }
         let P, c;
-        l ? (P = r`${r.identifier(l)}`, c = this.buildCTEJoinCondition(o, l, E)) : (P = o.cube.sql(A).from, c = o.joinCondition);
+        l ? (P = n`${n.identifier(l)}`, c = this.buildCTEJoinCondition(o, l, E)) : (P = o.cube.sql(A).from, c = o.joinCondition);
         try {
           switch (o.joinType || "left") {
             case "left":
-              O = O.leftJoin(P, c);
+              N = N.leftJoin(P, c);
               break;
             case "inner":
-              O = O.innerJoin(P, c);
+              N = N.innerJoin(P, c);
               break;
             case "right":
-              O = O.rightJoin(P, c);
+              N = N.rightJoin(P, c);
               break;
             case "full":
-              O = O.fullJoin(P, c);
+              N = N.fullJoin(P, c);
               break;
           }
         } catch {
         }
       }
-    if (I.where && N.push(I.where), E.joinCubes && E.joinCubes.length > 0)
+    if (I.where && O.push(I.where), E.joinCubes && E.joinCubes.length > 0)
       for (const o of E.joinCubes) {
         if (S.get(o.cube.name))
           continue;
         const P = o.cube.sql(A);
-        P.where && N.push(P.where);
+        P.where && O.push(P.where);
       }
     const s = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -2369,11 +2399,11 @@ class CE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (s.length > 0 && N.push(...s), N.length > 0) {
-      const o = N.length === 1 ? N[0] : p(...N);
-      O = O.where(o);
+    if (s.length > 0 && O.push(...s), O.length > 0) {
+      const o = O.length === 1 ? O[0] : p(...O);
+      N = N.where(o);
     }
-    const _ = this.queryBuilder.buildGroupByFields(
+    const r = this.queryBuilder.buildGroupByFields(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       T,
@@ -2381,8 +2411,8 @@ class CE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    _.length > 0 && (O = O.groupBy(..._));
-    const n = this.queryBuilder.buildHavingConditions(
+    r.length > 0 && (N = N.groupBy(...r));
+    const L = this.queryBuilder.buildHavingConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       T,
@@ -2390,12 +2420,12 @@ class CE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (n.length > 0) {
-      const o = n.length === 1 ? n[0] : p(...n);
-      O = O.having(o);
+    if (L.length > 0) {
+      const o = L.length === 1 ? L[0] : p(...L);
+      N = N.having(o);
     }
-    const D = this.queryBuilder.buildOrderBy(T);
-    return D.length > 0 && (O = O.orderBy(...D)), O = this.queryBuilder.applyLimitAndOffset(O, T), O;
+    const i = this.queryBuilder.buildOrderBy(T);
+    return i.length > 0 && (N = N.orderBy(...i)), N = this.queryBuilder.applyLimitAndOffset(N, T), N;
   }
   /**
    * Convert query plan to cube map for QueryBuilder methods
@@ -2441,36 +2471,36 @@ class CE {
     const A = {}, e = {}, S = {}, I = [E.primaryCube];
     if (E.joinCubes && E.joinCubes.length > 0 && I.push(...E.joinCubes.map((t) => t.cube)), T.measures)
       for (const t of T.measures) {
-        const [C, N] = t.split("."), O = I.find((s) => s.name === C);
-        if (O && O.measures[N]) {
-          const s = O.measures[N];
+        const [C, O] = t.split("."), N = I.find((s) => s.name === C);
+        if (N && N.measures[O]) {
+          const s = N.measures[O];
           A[t] = {
-            title: s.title || N,
-            shortTitle: s.title || N,
+            title: s.title || O,
+            shortTitle: s.title || O,
             type: s.type
           };
         }
       }
     if (T.dimensions)
       for (const t of T.dimensions) {
-        const [C, N] = t.split("."), O = I.find((s) => s.name === C);
-        if (O && O.dimensions[N]) {
-          const s = O.dimensions[N];
+        const [C, O] = t.split("."), N = I.find((s) => s.name === C);
+        if (N && N.dimensions[O]) {
+          const s = N.dimensions[O];
           e[t] = {
-            title: s.title || N,
-            shortTitle: s.title || N,
+            title: s.title || O,
+            shortTitle: s.title || O,
             type: s.type
           };
         }
       }
     if (T.timeDimensions)
       for (const t of T.timeDimensions) {
-        const [C, N] = t.dimension.split("."), O = I.find((s) => s.name === C);
-        if (O && O.dimensions && O.dimensions[N]) {
-          const s = O.dimensions[N];
+        const [C, O] = t.dimension.split("."), N = I.find((s) => s.name === C);
+        if (N && N.dimensions && N.dimensions[O]) {
+          const s = N.dimensions[O];
           S[t.dimension] = {
-            title: s.title || N,
-            shortTitle: s.title || N,
+            title: s.title || O,
+            shortTitle: s.title || O,
             type: s.type,
             granularity: t.granularity
           };
@@ -2484,7 +2514,7 @@ class CE {
     };
   }
 }
-const L = (R) => R.flatMap(LR), LR = (R) => k(rR(R)).map(_R), _R = (R) => R.replace(/ +/g, " ").trim(), rR = (R) => ({
+const _ = (R) => R.flatMap(LR), LR = (R) => k(rR(R)).map(_R), _R = (R) => R.replace(/ +/g, " ").trim(), rR = (R) => ({
   type: "mandatory_block",
   items: XE(R, 0)[0]
 }), XE = (R, E, T) => {
@@ -2549,23 +2579,23 @@ const L = (R) => R.flatMap(LR), LR = (R) => k(rR(R)).map(_R), _R = (R) => R.repl
       T.push(A + e);
   return T;
 };
-var a;
+var D;
 (function(R) {
   R.QUOTED_IDENTIFIER = "QUOTED_IDENTIFIER", R.IDENTIFIER = "IDENTIFIER", R.STRING = "STRING", R.VARIABLE = "VARIABLE", R.RESERVED_DATA_TYPE = "RESERVED_DATA_TYPE", R.RESERVED_PARAMETERIZED_DATA_TYPE = "RESERVED_PARAMETERIZED_DATA_TYPE", R.RESERVED_KEYWORD = "RESERVED_KEYWORD", R.RESERVED_FUNCTION_NAME = "RESERVED_FUNCTION_NAME", R.RESERVED_KEYWORD_PHRASE = "RESERVED_KEYWORD_PHRASE", R.RESERVED_DATA_TYPE_PHRASE = "RESERVED_DATA_TYPE_PHRASE", R.RESERVED_SET_OPERATION = "RESERVED_SET_OPERATION", R.RESERVED_CLAUSE = "RESERVED_CLAUSE", R.RESERVED_SELECT = "RESERVED_SELECT", R.RESERVED_JOIN = "RESERVED_JOIN", R.ARRAY_IDENTIFIER = "ARRAY_IDENTIFIER", R.ARRAY_KEYWORD = "ARRAY_KEYWORD", R.CASE = "CASE", R.END = "END", R.WHEN = "WHEN", R.ELSE = "ELSE", R.THEN = "THEN", R.LIMIT = "LIMIT", R.BETWEEN = "BETWEEN", R.AND = "AND", R.OR = "OR", R.XOR = "XOR", R.OPERATOR = "OPERATOR", R.COMMA = "COMMA", R.ASTERISK = "ASTERISK", R.PROPERTY_ACCESS_OPERATOR = "PROPERTY_ACCESS_OPERATOR", R.OPEN_PAREN = "OPEN_PAREN", R.CLOSE_PAREN = "CLOSE_PAREN", R.LINE_COMMENT = "LINE_COMMENT", R.BLOCK_COMMENT = "BLOCK_COMMENT", R.DISABLE_COMMENT = "DISABLE_COMMENT", R.NUMBER = "NUMBER", R.NAMED_PARAMETER = "NAMED_PARAMETER", R.QUOTED_PARAMETER = "QUOTED_PARAMETER", R.NUMBERED_PARAMETER = "NUMBERED_PARAMETER", R.POSITIONAL_PARAMETER = "POSITIONAL_PARAMETER", R.CUSTOM_PARAMETER = "CUSTOM_PARAMETER", R.DELIMITER = "DELIMITER", R.EOF = "EOF";
-})(a = a || (a = {}));
+})(D = D || (D = {}));
 const FT = (R) => ({
-  type: a.EOF,
+  type: D.EOF,
   raw: "«EOF»",
   text: "«EOF»",
   start: R
 }), v = FT(1 / 0), w = (R) => (E) => E.type === R.type && E.text === R.text, y = {
-  ARRAY: w({ text: "ARRAY", type: a.RESERVED_DATA_TYPE }),
-  BY: w({ text: "BY", type: a.RESERVED_KEYWORD }),
-  SET: w({ text: "SET", type: a.RESERVED_CLAUSE }),
-  STRUCT: w({ text: "STRUCT", type: a.RESERVED_DATA_TYPE }),
-  WINDOW: w({ text: "WINDOW", type: a.RESERVED_CLAUSE }),
-  VALUES: w({ text: "VALUES", type: a.RESERVED_CLAUSE })
-}, mT = (R) => R === a.RESERVED_DATA_TYPE || R === a.RESERVED_KEYWORD || R === a.RESERVED_FUNCTION_NAME || R === a.RESERVED_KEYWORD_PHRASE || R === a.RESERVED_DATA_TYPE_PHRASE || R === a.RESERVED_CLAUSE || R === a.RESERVED_SELECT || R === a.RESERVED_SET_OPERATION || R === a.RESERVED_JOIN || R === a.ARRAY_KEYWORD || R === a.CASE || R === a.END || R === a.WHEN || R === a.ELSE || R === a.THEN || R === a.LIMIT || R === a.BETWEEN || R === a.AND || R === a.OR || R === a.XOR, PR = (R) => R === a.AND || R === a.OR || R === a.XOR, MR = [
+  ARRAY: w({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
+  BY: w({ text: "BY", type: D.RESERVED_KEYWORD }),
+  SET: w({ text: "SET", type: D.RESERVED_CLAUSE }),
+  STRUCT: w({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
+  WINDOW: w({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
+  VALUES: w({ text: "VALUES", type: D.RESERVED_CLAUSE })
+}, mT = (R) => R === D.RESERVED_DATA_TYPE || R === D.RESERVED_KEYWORD || R === D.RESERVED_FUNCTION_NAME || R === D.RESERVED_KEYWORD_PHRASE || R === D.RESERVED_DATA_TYPE_PHRASE || R === D.RESERVED_CLAUSE || R === D.RESERVED_SELECT || R === D.RESERVED_SET_OPERATION || R === D.RESERVED_JOIN || R === D.ARRAY_KEYWORD || R === D.CASE || R === D.END || R === D.WHEN || R === D.ELSE || R === D.THEN || R === D.LIMIT || R === D.BETWEEN || R === D.AND || R === D.OR || R === D.XOR, PR = (R) => R === D.AND || R === D.OR || R === D.XOR, MR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -3242,7 +3272,7 @@ const FT = (R) => ({
   "STRUCT",
   "TIME",
   "TIMEZONE"
-], GR = L(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), lR = L([
+], GR = _(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), lR = _([
   // Queries: https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax
   "WITH [RECURSIVE]",
   "FROM",
@@ -3271,9 +3301,9 @@ const FT = (R) => ({
   "WITH CONNECTION",
   "WITH PARTITION COLUMNS",
   "REMOTE WITH CONNECTION"
-]), ZE = L([
+]), ZE = _([
   "CREATE [OR REPLACE] [TEMP|TEMPORARY|SNAPSHOT|EXTERNAL] TABLE [IF NOT EXISTS]"
-]), LE = L([
+]), LE = _([
   // - create:
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -3361,15 +3391,15 @@ const FT = (R) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), uR = L([
+]), uR = _([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), HR = L([
+]), HR = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), BR = L([
+]), BR = _([
   // 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
@@ -3380,7 +3410,7 @@ const FT = (R) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), dR = L([]), FR = {
+]), dR = _([]), FR = {
   name: "bigquery",
   tokenizerOptions: {
     reservedSelect: GR,
@@ -3421,7 +3451,7 @@ function mR(R) {
 }
 function pR(R) {
   let E = v;
-  return R.map((T) => T.text === "OFFSET" && E.text === "[" ? (E = T, Object.assign(Object.assign({}, T), { type: a.RESERVED_FUNCTION_NAME })) : (E = T, T));
+  return R.map((T) => T.text === "OFFSET" && E.text === "[" ? (E = T, Object.assign(Object.assign({}, T), { type: D.RESERVED_FUNCTION_NAME })) : (E = T, T));
 }
 function YR(R) {
   var E;
@@ -3431,7 +3461,7 @@ function YR(R) {
     if ((y.ARRAY(e) || y.STRUCT(e)) && ((E = R[A + 1]) === null || E === void 0 ? void 0 : E.text) === "<") {
       const S = hR(R, A + 1), I = R.slice(A, S + 1);
       T.push({
-        type: a.IDENTIFIER,
+        type: D.IDENTIFIER,
         raw: I.map(qE("raw")).join(""),
         text: I.map(qE("text")).join(""),
         start: e.start
@@ -3441,7 +3471,7 @@ function YR(R) {
   }
   return T;
 }
-const qE = (R) => (E) => E.type === a.IDENTIFIER || E.type === a.COMMA ? E[R] + " " : E[R];
+const qE = (R) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[R] + " " : E[R];
 function hR(R, E) {
   let T = 0;
   for (let A = E; A < R.length; A++) {
@@ -4214,7 +4244,7 @@ const fR = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], XR = L(["SELECT [ALL | DISTINCT]"]), bR = L([
+], XR = _(["SELECT [ALL | DISTINCT]"]), bR = _([
   // queries
   "WITH",
   "FROM",
@@ -4243,9 +4273,9 @@ const fR = [
   "WHEN [NOT] MATCHED [THEN]",
   "UPDATE SET",
   "INSERT"
-]), jE = L([
+]), jE = _([
   "CREATE [GLOBAL TEMPORARY | EXTERNAL] TABLE [IF NOT EXISTS]"
-]), _E = L([
+]), _E = _([
   // - create:
   "CREATE [OR REPLACE] VIEW",
   // - update:
@@ -4448,16 +4478,16 @@ const fR = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), yR = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), KR = L([
+]), yR = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), KR = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), $R = L([
+]), $R = _([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), gR = L([]), wR = {
+]), gR = _([]), wR = {
   name: "db2",
   tokenizerOptions: {
     reservedSelect: XR,
@@ -5368,7 +5398,7 @@ const fR = [
   "VARCHAR",
   "VARGRAPHIC",
   "XML"
-], QR = L(["SELECT [ALL | DISTINCT]"]), ZR = L([
+], QR = _(["SELECT [ALL | DISTINCT]"]), ZR = _([
   // queries
   "WITH [RECURSIVE]",
   "INTO",
@@ -5398,7 +5428,7 @@ const fR = [
   "INSERT",
   // Data definition - table
   "FOR SYSTEM NAME"
-]), kE = L(["CREATE [OR REPLACE] TABLE"]), rE = L([
+]), kE = _(["CREATE [OR REPLACE] TABLE"]), rE = _([
   // - create:
   "CREATE [OR REPLACE] [RECURSIVE] VIEW",
   // - update:
@@ -5494,17 +5524,17 @@ const fR = [
   "TAG",
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}"
-]), qR = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), jR = L([
+]), qR = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), jR = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "[LEFT | RIGHT] EXCEPTION JOIN",
   "{INNER | CROSS} JOIN"
-]), kR = L([
+]), kR = _([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), zR = L([]), EA = {
+]), zR = _([]), EA = {
   name: "db2i",
   tokenizerOptions: {
     reservedSelect: QR,
@@ -6357,7 +6387,7 @@ const fR = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], eA = L(["SELECT [ALL | DISTINCT]"]), SA = L([
+], eA = _(["SELECT [ALL | DISTINCT]"]), SA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -6381,9 +6411,9 @@ const fR = [
   "SET",
   // other:
   "RETURNING"
-]), zE = L([
+]), zE = _([
   "CREATE [OR REPLACE] [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"
-]), nE = L([
+]), nE = _([
   // TABLE
   // - update:
   "UPDATE",
@@ -6461,11 +6491,11 @@ const fR = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), IA = L([
+]), IA = _([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
-]), OA = L([
+]), OA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -6474,11 +6504,11 @@ const fR = [
   "POSITIONAL JOIN",
   "ANTI JOIN",
   "SEMI JOIN"
-]), NA = L([
+]), NA = _([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "SIMILAR TO",
   "IS [NOT] DISTINCT FROM"
-]), tA = L(["TIMESTAMP WITH TIME ZONE"]), sA = {
+]), tA = _(["TIMESTAMP WITH TIME ZONE"]), sA = {
   name: "duckdb",
   tokenizerOptions: {
     reservedSelect: eA,
@@ -7098,7 +7128,7 @@ const fR = [
   "STRUCT",
   "TIMESTAMP",
   "VARCHAR"
-], rA = L(["SELECT [ALL | DISTINCT]"]), nA = L([
+], rA = _(["SELECT [ALL | DISTINCT]"]), nA = _([
   // queries
   "WITH",
   "FROM",
@@ -7132,9 +7162,9 @@ const fR = [
   //   https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML#LanguageManualDML-Loadingfilesintotables
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), ET = L([
+]), ET = _([
   "CREATE [TEMPORARY] [EXTERNAL] TABLE [IF NOT EXISTS]"
-]), iE = L([
+]), iE = _([
   // - create:
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
   // - update:
@@ -7159,13 +7189,13 @@ const fR = [
   "STORED AS",
   "STORED BY",
   "ROW FORMAT"
-]), iA = L(["UNION [ALL | DISTINCT]"]), aA = L([
+]), iA = _(["UNION [ALL | DISTINCT]"]), aA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "LEFT SEMI JOIN"
-]), oA = L(["{ROWS | RANGE} BETWEEN"]), DA = L([]), PA = {
+]), oA = _(["{ROWS | RANGE} BETWEEN"]), DA = _([]), PA = {
   name: "hive",
   tokenizerOptions: {
     reservedSelect: rA,
@@ -7192,9 +7222,9 @@ function AE(R) {
   return R.map((E, T) => {
     const A = R[T + 1] || v;
     if (y.SET(E) && A.text === "(")
-      return Object.assign(Object.assign({}, E), { type: a.RESERVED_FUNCTION_NAME });
+      return Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME });
     const e = R[T - 1] || v;
-    return y.VALUES(E) && e.text === "=" ? Object.assign(Object.assign({}, E), { type: a.RESERVED_FUNCTION_NAME }) : E;
+    return y.VALUES(E) && e.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
   });
 }
 const MA = [
@@ -7703,7 +7733,7 @@ const MA = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], GA = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), lA = L([
+], GA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), lA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -7725,9 +7755,9 @@ const MA = [
   "SET",
   // other
   "RETURNING"
-]), TT = L([
+]), TT = _([
   "CREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]"
-]), aE = L([
+]), aE = _([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -7934,12 +7964,12 @@ const MA = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), uA = L([
+]), uA = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]",
   "MINUS [ALL | DISTINCT]"
-]), HA = L([
+]), HA = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -7947,12 +7977,12 @@ const MA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), BA = L([
+]), BA = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), dA = L([]), FA = {
+]), dA = _([]), FA = {
   name: "mariadb",
   tokenizerOptions: {
     reservedSelect: GA,
@@ -8709,7 +8739,7 @@ const MA = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], hA = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), fA = L([
+], hA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), fA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8729,7 +8759,7 @@ const MA = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), RT = L(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), oE = L([
+]), RT = _(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), oE = _([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -8910,7 +8940,7 @@ const MA = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), VA = L(["UNION [ALL | DISTINCT]"]), WA = L([
+]), VA = _(["UNION [ALL | DISTINCT]"]), WA = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8918,12 +8948,12 @@ const MA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), XA = L([
+]), XA = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), bA = L([]), yA = {
+]), bA = _([]), yA = {
   name: "mysql",
   tokenizerOptions: {
     reservedSelect: hA,
@@ -9541,7 +9571,7 @@ const MA = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], wA = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), JA = L([
+], wA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), JA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -9561,7 +9591,7 @@ const MA = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), AT = L(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), DE = L([
+]), AT = _(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), DE = _([
   // https://docs.pingcap.com/tidb/stable/sql-statement-create-view
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // https://docs.pingcap.com/tidb/stable/sql-statement-update
@@ -9676,7 +9706,7 @@ const MA = [
   "UNLOCK TABLES",
   // https://docs.pingcap.com/tidb/stable/sql-statement-use
   "USE"
-]), xA = L(["UNION [ALL | DISTINCT]"]), vA = L([
+]), xA = _(["UNION [ALL | DISTINCT]"]), vA = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -9684,12 +9714,12 @@ const MA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), QA = L([
+]), QA = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), ZA = L([]), qA = {
+]), ZA = _([]), qA = {
   name: "tidb",
   tokenizerOptions: {
     reservedSelect: wA,
@@ -10187,7 +10217,7 @@ const MA = [
   // which it actually doesn't use.
   //
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/datatypes.html
-], Ee = L(["SELECT [ALL | DISTINCT]"]), Te = L([
+], Ee = _(["SELECT [ALL | DISTINCT]"]), Te = _([
   // queries
   "WITH",
   "FROM",
@@ -10214,7 +10244,7 @@ const MA = [
   "NEST",
   "UNNEST",
   "RETURNING"
-]), eT = L([
+]), eT = _([
   // - update:
   "UPDATE",
   // - delete:
@@ -10254,7 +10284,7 @@ const MA = [
   "SET CURRENT SCHEMA",
   "SHOW",
   "USE [PRIMARY] KEYS"
-]), Re = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), Ae = L(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), ee = L(["{ROWS | RANGE | GROUPS} BETWEEN"]), Se = L([]), Ie = {
+]), Re = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), Ae = _(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), ee = _(["{ROWS | RANGE | GROUPS} BETWEEN"]), Se = _([]), Ie = {
   name: "n1ql",
   tokenizerOptions: {
     reservedSelect: Ee,
@@ -10888,7 +10918,7 @@ const MA = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], se = L(["SELECT [ALL | DISTINCT | UNIQUE]"]), Ce = L([
+], se = _(["SELECT [ALL | DISTINCT | UNIQUE]"]), Ce = _([
   // queries
   "WITH",
   "FROM",
@@ -10912,9 +10942,9 @@ const MA = [
   "UPDATE SET",
   // other
   "RETURNING"
-]), ST = L([
+]), ST = _([
   "CREATE [GLOBAL TEMPORARY | PRIVATE TEMPORARY | SHARDED | DUPLICATED | IMMUTABLE BLOCKCHAIN | BLOCKCHAIN | IMMUTABLE] TABLE"
-]), PE = L([
+]), PE = _([
   // - create:
   "CREATE [OR REPLACE] [NO FORCE | FORCE] [EDITIONING | EDITIONABLE | EDITIONABLE EDITIONING | NONEDITIONABLE] VIEW",
   "CREATE MATERIALIZED VIEW",
@@ -10942,7 +10972,7 @@ const MA = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), Le = L(["UNION [ALL]", "MINUS", "INTERSECT"]), _e = L([
+]), Le = _(["UNION [ALL]", "MINUS", "INTERSECT"]), _e = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10950,11 +10980,11 @@ const MA = [
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), re = L([
+]), re = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "ON COMMIT",
   "{ROWS | RANGE} BETWEEN"
-]), ne = L([]), ie = {
+]), ne = _([]), ie = {
   name: "plsql",
   tokenizerOptions: {
     reservedSelect: se,
@@ -11001,7 +11031,7 @@ const MA = [
 };
 function ae(R) {
   let E = v;
-  return R.map((T) => y.SET(T) && y.BY(E) ? Object.assign(Object.assign({}, T), { type: a.RESERVED_KEYWORD }) : (mT(T.type) && (E = T), T));
+  return R.map((T) => y.SET(T) && y.BY(E) ? Object.assign(Object.assign({}, T), { type: D.RESERVED_KEYWORD }) : (mT(T.type) && (E = T), T));
 }
 const oe = [
   // https://www.postgresql.org/docs/14/functions.html
@@ -11840,7 +11870,7 @@ const oe = [
   "VARCHAR",
   "XML",
   "ZONE"
-], Me = L(["SELECT [ALL | DISTINCT]"]), Ue = L([
+], Me = _(["SELECT [ALL | DISTINCT]"]), Ue = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -11863,9 +11893,9 @@ const oe = [
   "SET",
   // other
   "RETURNING"
-]), IT = L([
+]), IT = _([
   "CREATE [GLOBAL | LOCAL] [TEMPORARY | TEMP | UNLOGGED] TABLE [IF NOT EXISTS]"
-]), ME = L([
+]), ME = _([
   // - create
   "CREATE [OR REPLACE] [TEMP | TEMPORARY] [RECURSIVE] VIEW",
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -12063,17 +12093,17 @@ const oe = [
   "START TRANSACTION",
   "UNLISTEN",
   "VACUUM"
-]), ce = L([
+]), ce = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), Ge = L([
+]), Ge = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), le = L([
+]), le = _([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
@@ -12084,7 +12114,7 @@ const oe = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), ue = L([
+]), ue = _([
   // https://www.postgresql.org/docs/current/datatype-datetime.html
   "[TIMESTAMP | TIME] {WITH | WITHOUT} TIME ZONE"
 ]), He = {
@@ -12769,7 +12799,7 @@ const oe = [
   "TEXT",
   "VARBYTE",
   "VARCHAR"
-], me = L(["SELECT [ALL | DISTINCT]"]), pe = L([
+], me = _(["SELECT [ALL | DISTINCT]"]), pe = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12787,9 +12817,9 @@ const oe = [
   "VALUES",
   // - update:
   "SET"
-]), OT = L([
+]), OT = _([
   "CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]"
-]), UE = L([
+]), UE = _([
   // - create:
   "CREATE [OR REPLACE | MATERIALIZED] VIEW",
   // - update:
@@ -12880,13 +12910,13 @@ const oe = [
   "START TRANSACTION",
   "UNLOAD",
   "VACUUM"
-]), Ye = L(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), he = L([
+]), Ye = _(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), he = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), fe = L([
+]), fe = _([
   // 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
@@ -12894,7 +12924,7 @@ const oe = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), Ve = L([]), We = {
+]), Ve = _([]), We = {
   name: "redshift",
   tokenizerOptions: {
     reservedSelect: me,
@@ -13550,7 +13580,7 @@ const oe = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], Ke = L(["SELECT [ALL | DISTINCT]"]), $e = L([
+], Ke = _(["SELECT [ALL | DISTINCT]"]), $e = _([
   // queries
   "WITH",
   "FROM",
@@ -13575,7 +13605,7 @@ const oe = [
   //   https://spark.apache.org/docs/latest/sql-ref-syntax-dml-load.html
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), NT = L(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), cE = L([
+]), NT = _(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), cE = _([
   // - create:
   "CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]",
   // - drop table:
@@ -13631,11 +13661,11 @@ const oe = [
   "SHOW TBLPROPERTIES",
   "SHOW VIEWS",
   "UNCACHE TABLE"
-]), ge = L([
+]), ge = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), we = L([
+]), we = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -13644,12 +13674,12 @@ const oe = [
   // non-standard-joins
   "[LEFT] {ANTI | SEMI} JOIN",
   "NATURAL [LEFT] {ANTI | SEMI} JOIN"
-]), Je = L([
+]), Je = _([
   "ON DELETE",
   "ON UPDATE",
   "CURRENT ROW",
   "{ROWS | RANGE} BETWEEN"
-]), xe = L([]), ve = {
+]), xe = _([]), ve = {
   name: "spark",
   tokenizerOptions: {
     reservedSelect: Ke,
@@ -13683,7 +13713,7 @@ const oe = [
 function Qe(R) {
   return R.map((E, T) => {
     const A = R[T - 1] || v, e = R[T + 1] || v;
-    return y.WINDOW(E) && e.type === a.OPEN_PAREN ? Object.assign(Object.assign({}, E), { type: a.RESERVED_FUNCTION_NAME }) : E.text === "ITEMS" && E.type === a.RESERVED_KEYWORD && !(A.text === "COLLECTION" && e.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: a.IDENTIFIER, text: E.raw }) : E;
+    return y.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 Ze = [
@@ -13984,7 +14014,7 @@ const Ze = [
   "TEXT",
   "VARCHAR",
   "VARYING CHARACTER"
-], ke = L(["SELECT [ALL | DISTINCT]"]), ze = L([
+], ke = _(["SELECT [ALL | DISTINCT]"]), ze = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14005,7 +14035,7 @@ const Ze = [
   "SET",
   // other:
   "RETURNING"
-]), tT = L(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), GE = L([
+]), tT = _(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), GE = _([
   // - create:
   "CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]",
   // - update:
@@ -14024,17 +14054,17 @@ const Ze = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), ES = L(["UNION [ALL]", "EXCEPT", "INTERSECT"]), TS = L([
+]), ES = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), TS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), RS = L([
+]), RS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
-]), AS = L([]), eS = {
+]), AS = _([]), eS = {
   name: "sqlite",
   tokenizerOptions: {
     reservedSelect: ke,
@@ -14396,7 +14426,7 @@ const Ze = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], NS = L(["SELECT [ALL | DISTINCT]"]), tS = L([
+], NS = _(["SELECT [ALL | DISTINCT]"]), tS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14415,7 +14445,7 @@ const Ze = [
   "VALUES",
   // - update:
   "SET"
-]), sT = L(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), lE = L([
+]), sT = _(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), lE = _([
   // - create:
   "CREATE [RECURSIVE] VIEW",
   // - update:
@@ -14440,20 +14470,20 @@ const Ze = [
   "TRUNCATE TABLE",
   // other
   "SET SCHEMA"
-]), sS = L([
+]), sS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), CS = L([
+]), CS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), LS = L([
+]), LS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), _S = L([]), rS = {
+]), _S = _([]), rS = {
   name: "sql",
   tokenizerOptions: {
     reservedSelect: NS,
@@ -15187,7 +15217,7 @@ const Ze = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], oS = L(["SELECT [ALL | DISTINCT]"]), DS = L([
+], oS = _(["SELECT [ALL | DISTINCT]"]), DS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -15215,7 +15245,7 @@ const Ze = [
   "PATTERN",
   "SUBSET",
   "DEFINE"
-]), CT = L(["CREATE TABLE [IF NOT EXISTS]"]), uE = L([
+]), CT = _(["CREATE TABLE [IF NOT EXISTS]"]), uE = _([
   // - create:
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW",
   // - update:
@@ -15273,21 +15303,21 @@ const Ze = [
   "SHOW ROLE GRANTS",
   "SHOW FUNCTIONS",
   "SHOW SESSION"
-]), PS = L([
+]), PS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), MS = L([
+]), MS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), US = L([
+]), US = _([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), cS = L([]), GS = {
+]), cS = _([]), GS = {
   name: "trino",
   tokenizerOptions: {
     reservedSelect: oS,
@@ -15843,7 +15873,7 @@ const Ze = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], BS = L(["SELECT [ALL | DISTINCT]"]), dS = L([
+], BS = _(["SELECT [ALL | DISTINCT]"]), dS = _([
   // queries
   "WITH",
   "INTO",
@@ -15868,7 +15898,7 @@ const Ze = [
   "MERGE [INTO]",
   "WHEN [NOT] MATCHED [BY TARGET | BY SOURCE] [THEN]",
   "UPDATE SET"
-]), LT = L(["CREATE TABLE"]), HE = L([
+]), LT = _(["CREATE TABLE"]), HE = _([
   // - create:
   "CREATE [OR ALTER] [MATERIALIZED] VIEW",
   // - update:
@@ -16048,16 +16078,16 @@ const Ze = [
   "XACT_ABORT",
   "XML INDEX",
   "XML SCHEMA COLLECTION"
-]), FS = L(["UNION [ALL]", "EXCEPT", "INTERSECT"]), mS = L([
+]), FS = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), mS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), pS = L([
+]), pS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), YS = L([]), hS = {
+]), YS = _([]), hS = {
   name: "transactsql",
   tokenizerOptions: {
     reservedSelect: BS,
@@ -16643,7 +16673,7 @@ const Ze = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], XS = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), bS = L([
+], XS = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), bS = _([
   // queries
   "WITH",
   "FROM",
@@ -16665,9 +16695,9 @@ const Ze = [
   // Data definition
   "CREATE [OR REPLACE] [TEMPORARY] PROCEDURE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [EXTERNAL] FUNCTION"
-]), _T = L([
+]), _T = _([
   "CREATE [ROWSTORE] [REFERENCE | TEMPORARY | GLOBAL TEMPORARY] TABLE [IF NOT EXISTS]"
-]), BE = L([
+]), BE = _([
   // - create:
   "CREATE VIEW",
   // - update:
@@ -16844,25 +16874,25 @@ const Ze = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), yS = L([
+]), yS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
   "MINUS"
-]), KS = L([
+]), KS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), $S = L([
+]), $S = _([
   "ON DELETE",
   "ON UPDATE",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), gS = L([]), wS = {
+]), gS = _([]), wS = {
   name: "singlestoredb",
   tokenizerOptions: {
     reservedSelect: XS,
@@ -17655,7 +17685,7 @@ const Ze = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], QS = L(["SELECT [ALL | DISTINCT]"]), ZS = L([
+], QS = _(["SELECT [ALL | DISTINCT]"]), ZS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -17683,10 +17713,10 @@ const Ze = [
   "WHEN MATCHED [AND]",
   "THEN {UPDATE SET | DELETE}",
   "WHEN NOT MATCHED THEN INSERT"
-]), rT = L([
+]), rT = _([
   "CREATE [OR REPLACE] [VOLATILE] TABLE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [LOCAL | GLOBAL] {TEMP|TEMPORARY} TABLE [IF NOT EXISTS]"
-]), dE = L([
+]), dE = _([
   // - create:
   "CREATE [OR REPLACE] [SECURE] [RECURSIVE] VIEW [IF NOT EXISTS]",
   // - update:
@@ -17927,14 +17957,14 @@ const Ze = [
   "USE SCHEMA",
   "USE SECONDARY ROLES",
   "USE WAREHOUSE"
-]), qS = L(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), jS = L([
+]), qS = _(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), jS = _([
   "[INNER] JOIN",
   "[NATURAL] {LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{CROSS | NATURAL} JOIN"
-]), kS = L([
+]), kS = _([
   "{ROWS | RANGE} BETWEEN",
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]"
-]), zS = L([]), EI = {
+]), zS = _([]), EI = {
   name: "snowflake",
   tokenizerOptions: {
     reservedSelect: QS,
@@ -18163,125 +18193,125 @@ class rI {
     var T, A, e;
     return this.validRules([
       {
-        type: a.DISABLE_COMMENT,
+        type: D.DISABLE_COMMENT,
         regex: /(\/\* *sql-formatter-disable *\*\/[\s\S]*?(?:\/\* *sql-formatter-enable *\*\/|$))/uy
       },
       {
-        type: a.BLOCK_COMMENT,
+        type: D.BLOCK_COMMENT,
         regex: E.nestedBlockComments ? new _I() : /(\/\*[^]*?\*\/)/uy
       },
       {
-        type: a.LINE_COMMENT,
+        type: D.LINE_COMMENT,
         regex: SI((T = E.lineCommentTypes) !== null && T !== void 0 ? T : ["--"])
       },
       {
-        type: a.QUOTED_IDENTIFIER,
+        type: D.QUOTED_IDENTIFIER,
         regex: DT(E.identTypes)
       },
       {
-        type: a.NUMBER,
+        type: D.NUMBER,
         regex: E.underscoresInNumbers ? /(?:0x[0-9a-fA-F_]+|0b[01_]+|(?:-\s*)?(?:[0-9_]*\.[0-9_]+|[0-9_]+(?:\.[0-9_]*)?)(?:[eE][-+]?[0-9_]+(?:\.[0-9_]+)?)?)(?![\w\p{Alphabetic}])/uy : /(?:0x[0-9a-fA-F]+|0b[01]+|(?:-\s*)?(?:[0-9]*\.[0-9]+|[0-9]+(?:\.[0-9]*)?)(?:[eE][-+]?[0-9]+(?:\.[0-9]+)?)?)(?![\w\p{Alphabetic}])/uy
       },
       // RESERVED_KEYWORD_PHRASE and RESERVED_DATA_TYPE_PHRASE  is matched before all other keyword tokens
       // to e.g. prioritize matching "TIMESTAMP WITH TIME ZONE" phrase over "WITH" clause.
       {
-        type: a.RESERVED_KEYWORD_PHRASE,
+        type: D.RESERVED_KEYWORD_PHRASE,
         regex: V((A = E.reservedKeywordPhrases) !== null && A !== void 0 ? A : [], E.identChars),
         text: d
       },
       {
-        type: a.RESERVED_DATA_TYPE_PHRASE,
+        type: D.RESERVED_DATA_TYPE_PHRASE,
         regex: V((e = E.reservedDataTypePhrases) !== null && e !== void 0 ? e : [], E.identChars),
         text: d
       },
       {
-        type: a.CASE,
+        type: D.CASE,
         regex: /CASE\b/iuy,
         text: d
       },
       {
-        type: a.END,
+        type: D.END,
         regex: /END\b/iuy,
         text: d
       },
       {
-        type: a.BETWEEN,
+        type: D.BETWEEN,
         regex: /BETWEEN\b/iuy,
         text: d
       },
       {
-        type: a.LIMIT,
+        type: D.LIMIT,
         regex: E.reservedClauses.includes("LIMIT") ? /LIMIT\b/iuy : void 0,
         text: d
       },
       {
-        type: a.RESERVED_CLAUSE,
+        type: D.RESERVED_CLAUSE,
         regex: V(E.reservedClauses, E.identChars),
         text: d
       },
       {
-        type: a.RESERVED_SELECT,
+        type: D.RESERVED_SELECT,
         regex: V(E.reservedSelect, E.identChars),
         text: d
       },
       {
-        type: a.RESERVED_SET_OPERATION,
+        type: D.RESERVED_SET_OPERATION,
         regex: V(E.reservedSetOperations, E.identChars),
         text: d
       },
       {
-        type: a.WHEN,
+        type: D.WHEN,
         regex: /WHEN\b/iuy,
         text: d
       },
       {
-        type: a.ELSE,
+        type: D.ELSE,
         regex: /ELSE\b/iuy,
         text: d
       },
       {
-        type: a.THEN,
+        type: D.THEN,
         regex: /THEN\b/iuy,
         text: d
       },
       {
-        type: a.RESERVED_JOIN,
+        type: D.RESERVED_JOIN,
         regex: V(E.reservedJoins, E.identChars),
         text: d
       },
       {
-        type: a.AND,
+        type: D.AND,
         regex: /AND\b/iuy,
         text: d
       },
       {
-        type: a.OR,
+        type: D.OR,
         regex: /OR\b/iuy,
         text: d
       },
       {
-        type: a.XOR,
+        type: D.XOR,
         regex: E.supportsXor ? /XOR\b/iuy : void 0,
         text: d
       },
       ...E.operatorKeyword ? [
         {
-          type: a.OPERATOR,
+          type: D.OPERATOR,
           regex: /OPERATOR *\([^)]+\)/iuy
         }
       ] : [],
       {
-        type: a.RESERVED_FUNCTION_NAME,
+        type: D.RESERVED_FUNCTION_NAME,
         regex: V(E.reservedFunctionNames, E.identChars),
         text: d
       },
       {
-        type: a.RESERVED_DATA_TYPE,
+        type: D.RESERVED_DATA_TYPE,
         regex: V(E.reservedDataTypes, E.identChars),
         text: d
       },
       {
-        type: a.RESERVED_KEYWORD,
+        type: D.RESERVED_KEYWORD,
         regex: V(E.reservedKeywords, E.identChars),
         text: d
       }
@@ -18293,26 +18323,26 @@ class rI {
     var T, A;
     return this.validRules([
       {
-        type: a.VARIABLE,
+        type: D.VARIABLE,
         regex: E.variableTypes ? NI(E.variableTypes) : void 0
       },
-      { type: a.STRING, regex: DT(E.stringTypes) },
+      { type: D.STRING, regex: DT(E.stringTypes) },
       {
-        type: a.IDENTIFIER,
+        type: D.IDENTIFIER,
         regex: tI(E.identChars)
       },
-      { type: a.DELIMITER, regex: /[;]/uy },
-      { type: a.COMMA, regex: /[,]/y },
+      { type: D.DELIMITER, regex: /[;]/uy },
+      { type: D.COMMA, regex: /[,]/y },
       {
-        type: a.OPEN_PAREN,
+        type: D.OPEN_PAREN,
         regex: iT("open", E.extraParens)
       },
       {
-        type: a.CLOSE_PAREN,
+        type: D.CLOSE_PAREN,
         regex: iT("close", E.extraParens)
       },
       {
-        type: a.OPERATOR,
+        type: D.OPERATOR,
         regex: aT([
           // standard operators
           "+",
@@ -18328,9 +18358,9 @@ class rI {
           ...(T = E.operators) !== null && T !== void 0 ? T : []
         ])
       },
-      { type: a.ASTERISK, regex: /[*]/uy },
+      { type: D.ASTERISK, regex: /[*]/uy },
       {
-        type: a.PROPERTY_ACCESS_OPERATOR,
+        type: D.PROPERTY_ACCESS_OPERATOR,
         regex: aT([".", ...(A = E.propertyAccessOperators) !== null && A !== void 0 ? A : []])
       }
     ]);
@@ -18348,33 +18378,33 @@ class rI {
     };
     return this.validRules([
       {
-        type: a.NAMED_PARAMETER,
+        type: D.NAMED_PARAMETER,
         regex: mE(C.named, fT(E.paramChars || E.identChars)),
-        key: (N) => N.slice(1)
+        key: (O) => O.slice(1)
       },
       {
-        type: a.QUOTED_PARAMETER,
+        type: D.QUOTED_PARAMETER,
         regex: mE(C.quoted, hT(E.identTypes)),
-        key: (N) => (({ tokenKey: O, quoteChar: s }) => O.replace(new RegExp(h("\\" + s), "gu"), s))({
-          tokenKey: N.slice(2, -1),
-          quoteChar: N.slice(-1)
+        key: (O) => (({ tokenKey: N, quoteChar: s }) => N.replace(new RegExp(h("\\" + s), "gu"), s))({
+          tokenKey: O.slice(2, -1),
+          quoteChar: O.slice(-1)
         })
       },
       {
-        type: a.NUMBERED_PARAMETER,
+        type: D.NUMBERED_PARAMETER,
         regex: mE(C.numbered, "[0-9]+"),
-        key: (N) => N.slice(1)
+        key: (O) => O.slice(1)
       },
       {
-        type: a.POSITIONAL_PARAMETER,
+        type: D.POSITIONAL_PARAMETER,
         regex: C.positional ? /[?]/y : void 0
       },
-      ...C.custom.map((N) => {
-        var O;
+      ...C.custom.map((O) => {
+        var N;
         return {
-          type: a.CUSTOM_PARAMETER,
-          regex: K(N.regex),
-          key: (O = N.key) !== null && O !== void 0 ? O : ((s) => s)
+          type: D.CUSTOM_PARAMETER,
+          regex: K(O.regex),
+          key: (N = O.key) !== null && N !== void 0 ? N : ((s) => s)
         };
       })
     ]);
@@ -18436,195 +18466,195 @@ function UI() {
     (function(E, T) {
       R.exports ? R.exports = T() : E.nearley = T();
     })(MI, function() {
-      function E(N, O, s) {
-        return this.id = ++E.highestId, this.name = N, this.symbols = O, this.postprocess = s, this;
+      function E(O, N, s) {
+        return this.id = ++E.highestId, this.name = O, this.symbols = N, this.postprocess = s, this;
       }
-      E.highestId = 0, E.prototype.toString = function(N) {
-        var O = typeof N > "u" ? this.symbols.map(C).join(" ") : this.symbols.slice(0, N).map(C).join(" ") + " ● " + this.symbols.slice(N).map(C).join(" ");
-        return this.name + " → " + O;
+      E.highestId = 0, E.prototype.toString = function(O) {
+        var N = typeof O > "u" ? this.symbols.map(C).join(" ") : this.symbols.slice(0, O).map(C).join(" ") + " ● " + this.symbols.slice(O).map(C).join(" ");
+        return this.name + " → " + N;
       };
-      function T(N, O, s, _) {
-        this.rule = N, this.dot = O, this.reference = s, this.data = [], this.wantedBy = _, this.isComplete = this.dot === N.symbols.length;
+      function T(O, N, s, r) {
+        this.rule = O, this.dot = N, this.reference = s, this.data = [], this.wantedBy = r, this.isComplete = this.dot === O.symbols.length;
       }
       T.prototype.toString = function() {
         return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
-      }, T.prototype.nextState = function(N) {
-        var O = new T(this.rule, this.dot + 1, this.reference, this.wantedBy);
-        return O.left = this, O.right = N, O.isComplete && (O.data = O.build(), O.right = void 0), O;
+      }, T.prototype.nextState = function(O) {
+        var N = new T(this.rule, this.dot + 1, this.reference, this.wantedBy);
+        return N.left = this, N.right = O, N.isComplete && (N.data = N.build(), N.right = void 0), N;
       }, T.prototype.build = function() {
-        var N = [], O = this;
+        var O = [], N = this;
         do
-          N.push(O.right.data), O = O.left;
-        while (O.left);
-        return N.reverse(), N;
+          O.push(N.right.data), N = N.left;
+        while (N.left);
+        return O.reverse(), O;
       }, T.prototype.finish = function() {
         this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, I.fail));
       };
-      function A(N, O) {
-        this.grammar = N, this.index = O, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
+      function A(O, N) {
+        this.grammar = O, this.index = N, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
       }
-      A.prototype.process = function(N) {
-        for (var O = this.states, s = this.wants, _ = this.completed, n = 0; n < O.length; n++) {
-          var D = O[n];
-          if (D.isComplete) {
-            if (D.finish(), D.data !== I.fail) {
-              for (var o = D.wantedBy, l = o.length; l--; ) {
+      A.prototype.process = function(O) {
+        for (var N = this.states, s = this.wants, r = this.completed, L = 0; L < N.length; L++) {
+          var i = N[L];
+          if (i.isComplete) {
+            if (i.finish(), i.data !== I.fail) {
+              for (var o = i.wantedBy, l = o.length; l--; ) {
                 var P = o[l];
-                this.complete(P, D);
+                this.complete(P, i);
               }
-              if (D.reference === this.index) {
-                var c = D.rule.name;
-                (this.completed[c] = this.completed[c] || []).push(D);
+              if (i.reference === this.index) {
+                var c = i.rule.name;
+                (this.completed[c] = this.completed[c] || []).push(i);
               }
             }
           } else {
-            var c = D.rule.symbols[D.dot];
+            var c = i.rule.symbols[i.dot];
             if (typeof c != "string") {
-              this.scannable.push(D);
+              this.scannable.push(i);
               continue;
             }
             if (s[c]) {
-              if (s[c].push(D), _.hasOwnProperty(c))
-                for (var M = _[c], l = 0; l < M.length; l++) {
+              if (s[c].push(i), r.hasOwnProperty(c))
+                for (var M = r[c], l = 0; l < M.length; l++) {
                   var u = M[l];
-                  this.complete(D, u);
+                  this.complete(i, u);
                 }
             } else
-              s[c] = [D], this.predict(c);
+              s[c] = [i], this.predict(c);
           }
         }
-      }, A.prototype.predict = function(N) {
-        for (var O = this.grammar.byName[N] || [], s = 0; s < O.length; s++) {
-          var _ = O[s], n = this.wants[N], D = new T(_, 0, this.index, n);
-          this.states.push(D);
+      }, A.prototype.predict = function(O) {
+        for (var N = this.grammar.byName[O] || [], s = 0; s < N.length; s++) {
+          var r = N[s], L = this.wants[O], i = new T(r, 0, this.index, L);
+          this.states.push(i);
         }
-      }, A.prototype.complete = function(N, O) {
-        var s = N.nextState(O);
+      }, A.prototype.complete = function(O, N) {
+        var s = O.nextState(N);
         this.states.push(s);
       };
-      function e(N, O) {
-        this.rules = N, this.start = O || this.rules[0].name;
+      function e(O, N) {
+        this.rules = O, this.start = N || this.rules[0].name;
         var s = this.byName = {};
-        this.rules.forEach(function(_) {
-          s.hasOwnProperty(_.name) || (s[_.name] = []), s[_.name].push(_);
+        this.rules.forEach(function(r) {
+          s.hasOwnProperty(r.name) || (s[r.name] = []), s[r.name].push(r);
         });
       }
-      e.fromCompiled = function(_, O) {
-        var s = _.Lexer;
-        _.ParserStart && (O = _.ParserStart, _ = _.ParserRules);
-        var _ = _.map(function(D) {
-          return new E(D.name, D.symbols, D.postprocess);
-        }), n = new e(_, O);
-        return n.lexer = s, n;
+      e.fromCompiled = function(r, N) {
+        var s = r.Lexer;
+        r.ParserStart && (N = r.ParserStart, r = r.ParserRules);
+        var r = r.map(function(i) {
+          return new E(i.name, i.symbols, i.postprocess);
+        }), L = new e(r, N);
+        return L.lexer = s, L;
       };
       function S() {
         this.reset("");
       }
-      S.prototype.reset = function(N, O) {
-        this.buffer = N, this.index = 0, this.line = O ? O.line : 1, this.lastLineBreak = O ? -O.col : 0;
+      S.prototype.reset = function(O, N) {
+        this.buffer = O, this.index = 0, this.line = N ? N.line : 1, this.lastLineBreak = N ? -N.col : 0;
       }, S.prototype.next = function() {
         if (this.index < this.buffer.length) {
-          var N = this.buffer[this.index++];
-          return N === `
-` && (this.line += 1, this.lastLineBreak = this.index), { value: N };
+          var O = this.buffer[this.index++];
+          return O === `
+` && (this.line += 1, this.lastLineBreak = this.index), { value: O };
         }
       }, S.prototype.save = function() {
         return {
           line: this.line,
           col: this.index - this.lastLineBreak
         };
-      }, S.prototype.formatError = function(N, O) {
+      }, S.prototype.formatError = function(O, N) {
         var s = this.buffer;
         if (typeof s == "string") {
-          var _ = s.split(`
+          var r = s.split(`
 `).slice(
             Math.max(0, this.line - 5),
             this.line
-          ), n = s.indexOf(`
+          ), L = s.indexOf(`
 `, this.index);
-          n === -1 && (n = s.length);
-          var D = this.index - this.lastLineBreak, o = String(this.line).length;
-          return O += " at line " + this.line + " col " + D + `:
+          L === -1 && (L = s.length);
+          var i = this.index - this.lastLineBreak, o = String(this.line).length;
+          return N += " at line " + this.line + " col " + i + `:
-`, O += _.map(function(P, c) {
-            return l(this.line - _.length + c + 1, o) + " " + P;
+`, N += r.map(function(P, c) {
+            return l(this.line - r.length + c + 1, o) + " " + P;
           }, this).join(`
-`), O += `
-` + l("", o + D) + `^
-`, O;
+`), N += `
+` + l("", o + i) + `^
+`, N;
         } else
-          return O + " at index " + (this.index - 1);
+          return N + " at index " + (this.index - 1);
         function l(P, c) {
           var M = String(P);
           return Array(c - M.length + 1).join(" ") + M;
         }
       };
-      function I(N, O, s) {
-        if (N instanceof e)
-          var _ = N, s = O;
+      function I(O, N, s) {
+        if (O instanceof e)
+          var r = O, s = N;
         else
-          var _ = e.fromCompiled(N, O);
-        this.grammar = _, this.options = {
+          var r = e.fromCompiled(O, N);
+        this.grammar = r, this.options = {
           keepHistory: !1,
-          lexer: _.lexer || new S()
+          lexer: r.lexer || new S()
         };
-        for (var n in s || {})
-          this.options[n] = s[n];
+        for (var L in s || {})
+          this.options[L] = s[L];
         this.lexer = this.options.lexer, this.lexerState = void 0;
-        var D = new A(_, 0);
-        this.table = [D], D.wants[_.start] = [], D.predict(_.start), D.process(), this.current = 0;
+        var i = new A(r, 0);
+        this.table = [i], i.wants[r.start] = [], i.predict(r.start), i.process(), this.current = 0;
       }
-      I.fail = {}, I.prototype.feed = function(N) {
-        var O = this.lexer;
-        O.reset(N, this.lexerState);
+      I.fail = {}, I.prototype.feed = function(O) {
+        var N = this.lexer;
+        N.reset(O, this.lexerState);
         for (var s; ; ) {
           try {
-            if (s = O.next(), !s)
+            if (s = N.next(), !s)
               break;
           } catch (Y) {
             var o = new A(this.grammar, this.current + 1);
             this.table.push(o);
-            var _ = new Error(this.reportLexerError(Y));
-            throw _.offset = this.current, _.token = Y.token, _;
+            var r = new Error(this.reportLexerError(Y));
+            throw r.offset = this.current, r.token = Y.token, r;
           }
-          var n = this.table[this.current];
+          var L = this.table[this.current];
           this.options.keepHistory || delete this.table[this.current - 1];
-          var D = this.current + 1, o = new A(this.grammar, D);
+          var i = this.current + 1, o = new A(this.grammar, i);
           this.table.push(o);
-          for (var l = s.text !== void 0 ? s.text : s.value, P = O.constructor === S ? s.value : s, c = n.scannable, M = c.length; M--; ) {
+          for (var l = s.text !== void 0 ? s.text : s.value, P = N.constructor === S ? s.value : s, c = L.scannable, M = c.length; M--; ) {
             var u = c[M], H = u.rule.symbols[u.dot];
             if (H.test ? H.test(P) : H.type ? H.type === s.type : H.literal === l) {
-              var B = u.nextState({ data: P, token: s, isToken: !0, reference: D - 1 });
+              var B = u.nextState({ data: P, token: s, isToken: !0, reference: i - 1 });
               o.states.push(B);
             }
           }
           if (o.process(), o.states.length === 0) {
-            var _ = new Error(this.reportError(s));
-            throw _.offset = this.current, _.token = s, _;
+            var r = new Error(this.reportError(s));
+            throw r.offset = this.current, r.token = s, r;
           }
-          this.options.keepHistory && (n.lexerState = O.save()), this.current++;
+          this.options.keepHistory && (L.lexerState = N.save()), this.current++;
         }
-        return n && (this.lexerState = O.save()), this.results = this.finish(), this;
-      }, I.prototype.reportLexerError = function(N) {
-        var O, s, _ = N.token;
-        return _ ? (O = "input " + JSON.stringify(_.text[0]) + " (lexer error)", s = this.lexer.formatError(_, "Syntax error")) : (O = "input (lexer error)", s = N.message), this.reportErrorCommon(s, O);
-      }, I.prototype.reportError = function(N) {
-        var O = (N.type ? N.type + " token: " : "") + JSON.stringify(N.value !== void 0 ? N.value : N), s = this.lexer.formatError(N, "Syntax error");
-        return this.reportErrorCommon(s, O);
-      }, I.prototype.reportErrorCommon = function(N, O) {
+        return L && (this.lexerState = N.save()), this.results = this.finish(), this;
+      }, I.prototype.reportLexerError = function(O) {
+        var N, s, r = O.token;
+        return r ? (N = "input " + JSON.stringify(r.text[0]) + " (lexer error)", s = this.lexer.formatError(r, "Syntax error")) : (N = "input (lexer error)", s = O.message), this.reportErrorCommon(s, N);
+      }, I.prototype.reportError = function(O) {
+        var N = (O.type ? O.type + " token: " : "") + JSON.stringify(O.value !== void 0 ? O.value : O), s = this.lexer.formatError(O, "Syntax error");
+        return this.reportErrorCommon(s, N);
+      }, I.prototype.reportErrorCommon = function(O, N) {
         var s = [];
-        s.push(N);
-        var _ = this.table.length - 2, n = this.table[_], D = n.states.filter(function(l) {
+        s.push(O);
+        var r = this.table.length - 2, L = this.table[r], i = L.states.filter(function(l) {
           var P = l.rule.symbols[l.dot];
           return P && typeof P != "string";
         });
-        if (D.length === 0)
-          s.push("Unexpected " + O + `. I did not expect any more input. Here is the state of my parse table:
-`), this.displayStateStack(n.states, s);
+        if (i.length === 0)
+          s.push("Unexpected " + N + `. I did not expect any more input. Here is the state of my parse table:
+`), this.displayStateStack(L.states, s);
         else {
-          s.push("Unexpected " + O + `. Instead, I was expecting to see one of the following:
+          s.push("Unexpected " + N + `. Instead, I was expecting to see one of the following:
 `);
-          var o = D.map(function(l) {
+          var o = i.map(function(l) {
             return this.buildFirstStateStack(l, []) || [l];
           }, this);
           o.forEach(function(l) {
@@ -18634,68 +18664,68 @@ function UI() {
         }
         return s.push(""), s.join(`
 `);
-      }, I.prototype.displayStateStack = function(N, O) {
-        for (var s, _ = 0, n = 0; n < N.length; n++) {
-          var D = N[n], o = D.rule.toString(D.dot);
-          o === s ? _++ : (_ > 0 && O.push("    ^ " + _ + " more lines identical to this"), _ = 0, O.push("    " + o)), s = o;
+      }, I.prototype.displayStateStack = function(O, N) {
+        for (var s, r = 0, L = 0; L < O.length; L++) {
+          var i = O[L], o = i.rule.toString(i.dot);
+          o === s ? r++ : (r > 0 && N.push("    ^ " + r + " more lines identical to this"), r = 0, N.push("    " + o)), s = o;
         }
-      }, I.prototype.getSymbolDisplay = function(N) {
-        return t(N);
-      }, I.prototype.buildFirstStateStack = function(N, O) {
-        if (O.indexOf(N) !== -1)
+      }, I.prototype.getSymbolDisplay = function(O) {
+        return t(O);
+      }, I.prototype.buildFirstStateStack = function(O, N) {
+        if (N.indexOf(O) !== -1)
           return null;
-        if (N.wantedBy.length === 0)
-          return [N];
-        var s = N.wantedBy[0], _ = [N].concat(O), n = this.buildFirstStateStack(s, _);
-        return n === null ? null : [N].concat(n);
+        if (O.wantedBy.length === 0)
+          return [O];
+        var s = O.wantedBy[0], r = [O].concat(N), L = this.buildFirstStateStack(s, r);
+        return L === null ? null : [O].concat(L);
       }, I.prototype.save = function() {
-        var N = this.table[this.current];
-        return N.lexerState = this.lexerState, N;
-      }, I.prototype.restore = function(N) {
-        var O = N.index;
-        this.current = O, this.table[O] = N, this.table.splice(O + 1), this.lexerState = N.lexerState, this.results = this.finish();
-      }, I.prototype.rewind = function(N) {
+        var O = this.table[this.current];
+        return O.lexerState = this.lexerState, O;
+      }, I.prototype.restore = function(O) {
+        var N = O.index;
+        this.current = N, this.table[N] = O, this.table.splice(N + 1), this.lexerState = O.lexerState, this.results = this.finish();
+      }, I.prototype.rewind = function(O) {
         if (!this.options.keepHistory)
           throw new Error("set option `keepHistory` to enable rewinding");
-        this.restore(this.table[N]);
+        this.restore(this.table[O]);
       }, I.prototype.finish = function() {
-        var N = [], O = this.grammar.start, s = this.table[this.table.length - 1];
-        return s.states.forEach(function(_) {
-          _.rule.name === O && _.dot === _.rule.symbols.length && _.reference === 0 && _.data !== I.fail && N.push(_);
-        }), N.map(function(_) {
-          return _.data;
+        var O = [], N = this.grammar.start, s = this.table[this.table.length - 1];
+        return s.states.forEach(function(r) {
+          r.rule.name === N && r.dot === r.rule.symbols.length && r.reference === 0 && r.data !== I.fail && O.push(r);
+        }), O.map(function(r) {
+          return r.data;
         });
       };
-      function t(N) {
-        var O = typeof N;
-        if (O === "string")
-          return N;
-        if (O === "object") {
-          if (N.literal)
-            return JSON.stringify(N.literal);
-          if (N instanceof RegExp)
-            return "character matching " + N;
-          if (N.type)
-            return N.type + " token";
-          if (N.test)
-            return "token matching " + String(N.test);
-          throw new Error("Unknown symbol type: " + N);
+      function t(O) {
+        var N = typeof O;
+        if (N === "string")
+          return O;
+        if (N === "object") {
+          if (O.literal)
+            return JSON.stringify(O.literal);
+          if (O instanceof RegExp)
+            return "character matching " + O;
+          if (O.type)
+            return O.type + " token";
+          if (O.test)
+            return "token matching " + String(O.test);
+          throw new Error("Unknown symbol type: " + O);
         }
       }
-      function C(N) {
-        var O = typeof N;
-        if (O === "string")
-          return N;
-        if (O === "object") {
-          if (N.literal)
-            return JSON.stringify(N.literal);
-          if (N instanceof RegExp)
-            return N.toString();
-          if (N.type)
-            return "%" + N.type;
-          if (N.test)
-            return "<" + String(N.test) + ">";
-          throw new Error("Unknown symbol type: " + N);
+      function C(O) {
+        var N = typeof O;
+        if (N === "string")
+          return O;
+        if (N === "object") {
+          if (O.literal)
+            return JSON.stringify(O.literal);
+          if (O instanceof RegExp)
+            return O.toString();
+          if (O.type)
+            return "%" + O.type;
+          if (O.test)
+            return "<" + String(O.test) + ">";
+          throw new Error("Unknown symbol type: " + O);
         }
       }
       return {
@@ -18714,39 +18744,39 @@ function lI(R) {
 const uI = (R, E, T) => {
   if (mT(R.type)) {
     const A = mI(T, E);
-    if (A && A.type === a.PROPERTY_ACCESS_OPERATOR)
-      return Object.assign(Object.assign({}, R), { type: a.IDENTIFIER, text: R.raw });
+    if (A && A.type === D.PROPERTY_ACCESS_OPERATOR)
+      return Object.assign(Object.assign({}, R), { type: D.IDENTIFIER, text: R.raw });
     const e = Q(T, E);
-    if (e && e.type === a.PROPERTY_ACCESS_OPERATOR)
-      return Object.assign(Object.assign({}, R), { type: a.IDENTIFIER, text: R.raw });
+    if (e && e.type === D.PROPERTY_ACCESS_OPERATOR)
+      return Object.assign(Object.assign({}, R), { type: D.IDENTIFIER, text: R.raw });
   }
   return R;
 }, HI = (R, E, T) => {
-  if (R.type === a.RESERVED_FUNCTION_NAME) {
+  if (R.type === D.RESERVED_FUNCTION_NAME) {
     const A = Q(T, E);
     if (!A || !WT(A))
-      return Object.assign(Object.assign({}, R), { type: a.IDENTIFIER, text: R.raw });
+      return Object.assign(Object.assign({}, R), { type: D.IDENTIFIER, text: R.raw });
   }
   return R;
 }, BI = (R, E, T) => {
-  if (R.type === a.RESERVED_DATA_TYPE) {
+  if (R.type === D.RESERVED_DATA_TYPE) {
     const A = Q(T, E);
     if (A && WT(A))
-      return Object.assign(Object.assign({}, R), { type: a.RESERVED_PARAMETERIZED_DATA_TYPE });
+      return Object.assign(Object.assign({}, R), { type: D.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return R;
 }, dI = (R, E, T) => {
-  if (R.type === a.IDENTIFIER) {
+  if (R.type === D.IDENTIFIER) {
     const A = Q(T, E);
     if (A && XT(A))
-      return Object.assign(Object.assign({}, R), { type: a.ARRAY_IDENTIFIER });
+      return Object.assign(Object.assign({}, R), { type: D.ARRAY_IDENTIFIER });
   }
   return R;
 }, FI = (R, E, T) => {
-  if (R.type === a.RESERVED_DATA_TYPE) {
+  if (R.type === D.RESERVED_DATA_TYPE) {
     const A = Q(T, E);
     if (A && XT(A))
-      return Object.assign(Object.assign({}, R), { type: a.ARRAY_KEYWORD });
+      return Object.assign(Object.assign({}, R), { type: D.ARRAY_KEYWORD });
   }
   return R;
 }, mI = (R, E) => Q(R, E, -1), Q = (R, E, T = 1) => {
@@ -18754,7 +18784,7 @@ const uI = (R, E, T) => {
   for (; R[E + A * T] && pI(R[E + A * T]); )
     A++;
   return R[E + A * T];
-}, WT = (R) => R.type === a.OPEN_PAREN && R.text === "(", XT = (R) => R.type === a.OPEN_PAREN && R.text === "[", pI = (R) => R.type === a.BLOCK_COMMENT || R.type === a.LINE_COMMENT;
+}, WT = (R) => R.type === D.OPEN_PAREN && R.text === "(", XT = (R) => R.type === D.OPEN_PAREN && R.text === "[", pI = (R) => R.type === D.BLOCK_COMMENT || R.type === D.LINE_COMMENT;
 class bT {
   constructor(E) {
     this.tokenize = E, this.index = 0, this.tokens = [], this.input = "";
@@ -18772,7 +18802,7 @@ class bT {
     return `Parse error at token: ${E.text} at line ${T} column ${A}`;
   }
   has(E) {
-    return E in a;
+    return E in D;
   }
 }
 var U;
@@ -18822,7 +18852,7 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
       postprocess: ([R, [E]]) => ({
         type: U.statement,
         children: R,
-        hasSemicolon: E.type === a.DELIMITER
+        hasSemicolon: E.type === D.DELIMITER
       })
     },
     { name: "expressions_or_clauses$ebnf$1", symbols: [] },
@@ -19216,10 +19246,10 @@ ${JSON.stringify(I, void 0, 2)}`);
     }
   };
 }
-var i;
+var a;
 (function(R) {
   R[R.SPACE = 0] = "SPACE", R[R.NO_SPACE = 1] = "NO_SPACE", R[R.NO_NEWLINE = 2] = "NO_NEWLINE", R[R.NEWLINE = 3] = "NEWLINE", R[R.MANDATORY_NEWLINE = 4] = "MANDATORY_NEWLINE", R[R.INDENT = 5] = "INDENT", R[R.SINGLE_INDENT = 6] = "SINGLE_INDENT";
-})(i = i || (i = {}));
+})(a = a || (a = {}));
 class yT {
   constructor(E) {
     this.indentation = E, this.items = [];
@@ -19230,26 +19260,26 @@ class yT {
   add(...E) {
     for (const T of E)
       switch (T) {
-        case i.SPACE:
-          this.items.push(i.SPACE);
+        case a.SPACE:
+          this.items.push(a.SPACE);
           break;
-        case i.NO_SPACE:
+        case a.NO_SPACE:
           this.trimHorizontalWhitespace();
           break;
-        case i.NO_NEWLINE:
+        case a.NO_NEWLINE:
           this.trimWhitespace();
           break;
-        case i.NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(i.NEWLINE);
+        case a.NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(a.NEWLINE);
           break;
-        case i.MANDATORY_NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(i.MANDATORY_NEWLINE);
+        case a.MANDATORY_NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(a.MANDATORY_NEWLINE);
           break;
-        case i.INDENT:
+        case a.INDENT:
           this.addIndentation();
           break;
-        case i.SINGLE_INDENT:
-          this.items.push(i.SINGLE_INDENT);
+        case a.SINGLE_INDENT:
+          this.items.push(a.SINGLE_INDENT);
           break;
         default:
           this.items.push(T);
@@ -19266,10 +19296,10 @@ class yT {
   addNewline(E) {
     if (this.items.length > 0)
       switch (Z(this.items)) {
-        case i.NEWLINE:
+        case a.NEWLINE:
           this.items.pop(), this.items.push(E);
           break;
-        case i.MANDATORY_NEWLINE:
+        case a.MANDATORY_NEWLINE:
           break;
         default:
           this.items.push(E);
@@ -19278,7 +19308,7 @@ class yT {
   }
   addIndentation() {
     for (let E = 0; E < this.indentation.getLevel(); E++)
-      this.items.push(i.SINGLE_INDENT);
+      this.items.push(a.SINGLE_INDENT);
   }
   /**
    * Returns the final SQL string.
@@ -19294,20 +19324,20 @@ class yT {
   }
   itemToString(E) {
     switch (E) {
-      case i.SPACE:
+      case a.SPACE:
         return " ";
-      case i.NEWLINE:
-      case i.MANDATORY_NEWLINE:
+      case a.NEWLINE:
+      case a.MANDATORY_NEWLINE:
         return `
 `;
-      case i.SINGLE_INDENT:
+      case a.SINGLE_INDENT:
         return this.indentation.getSingleIndent();
       default:
         return E;
     }
   }
 }
-const XI = (R) => R === i.SPACE || R === i.SINGLE_INDENT, bI = (R) => R === i.SPACE || R === i.SINGLE_INDENT || R === i.NEWLINE;
+const XI = (R) => R === a.SPACE || R === a.SINGLE_INDENT, bI = (R) => R === a.SPACE || R === a.SINGLE_INDENT || R === a.NEWLINE;
 function GT(R, E) {
   if (E === "standard")
     return R;
@@ -19315,7 +19345,7 @@ function GT(R, E) {
   return R.length >= 10 && R.includes(" ") && ([R, ...T] = R.split(" ")), E === "tabularLeft" ? R = R.padEnd(9, " ") : R = R.padStart(9, " "), R + ["", ...T].join(" ");
 }
 function lT(R) {
-  return PR(R) || R === a.RESERVED_CLAUSE || R === a.RESERVED_SELECT || R === a.RESERVED_SET_OPERATION || R === a.RESERVED_JOIN || R === a.LIMIT;
+  return PR(R) || R === D.RESERVED_CLAUSE || R === D.RESERVED_SELECT || R === D.RESERVED_SET_OPERATION || R === D.RESERVED_JOIN || R === D.LIMIT;
 }
 const YE = "top-level", yI = "block-level";
 class KT {
@@ -19379,9 +19409,9 @@ class KI extends yT {
     if (typeof E == "string")
       this.length += E.length, this.trailingSpace = !1;
     else {
-      if (E === i.MANDATORY_NEWLINE || E === i.NEWLINE)
+      if (E === a.MANDATORY_NEWLINE || E === a.NEWLINE)
         throw new hE();
-      E === i.INDENT || E === i.SINGLE_INDENT || E === i.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (E === i.NO_NEWLINE || E === i.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
+      E === a.INDENT || E === a.SINGLE_INDENT || E === a.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (E === a.NO_NEWLINE || E === a.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
     }
   }
 }
@@ -19477,23 +19507,23 @@ class RE {
     }), this.formatNode(E.parenthesis);
   }
   formatPropertyAccess(E) {
-    this.formatNode(E.object), this.layout.add(i.NO_SPACE, E.operator), this.formatNode(E.property);
+    this.formatNode(E.object), this.layout.add(a.NO_SPACE, E.operator), this.formatNode(E.property);
   }
   formatParenthesis(E) {
     const T = this.formatInlineExpression(E.children);
-    T ? (this.layout.add(E.openParen), this.layout.add(...T.getLayoutItems()), this.layout.add(i.NO_SPACE, E.closeParen, i.SPACE)) : (this.layout.add(E.openParen, i.NEWLINE), J(this.cfg) ? (this.layout.add(i.INDENT), this.layout = this.formatSubExpression(E.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(i.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(i.NEWLINE, i.INDENT, E.closeParen, i.SPACE));
+    T ? (this.layout.add(E.openParen), this.layout.add(...T.getLayoutItems()), this.layout.add(a.NO_SPACE, E.closeParen, a.SPACE)) : (this.layout.add(E.openParen, a.NEWLINE), J(this.cfg) ? (this.layout.add(a.INDENT), this.layout = this.formatSubExpression(E.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(a.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(a.NEWLINE, a.INDENT, E.closeParen, a.SPACE));
   }
   formatBetweenPredicate(E) {
-    this.layout.add(this.showKw(E.betweenKw), i.SPACE), this.layout = this.formatSubExpression(E.expr1), this.layout.add(i.NO_SPACE, i.SPACE, this.showNonTabularKw(E.andKw), i.SPACE), this.layout = this.formatSubExpression(E.expr2), this.layout.add(i.SPACE);
+    this.layout.add(this.showKw(E.betweenKw), a.SPACE), this.layout = this.formatSubExpression(E.expr1), this.layout.add(a.NO_SPACE, a.SPACE, this.showNonTabularKw(E.andKw), a.SPACE), this.layout = this.formatSubExpression(E.expr2), this.layout.add(a.SPACE);
   }
   formatCaseExpression(E) {
-    this.formatNode(E.caseKw), this.layout.indentation.increaseBlockLevel(), this.layout = this.formatSubExpression(E.expr), this.layout = this.formatSubExpression(E.clauses), this.layout.indentation.decreaseBlockLevel(), this.layout.add(i.NEWLINE, i.INDENT), this.formatNode(E.endKw);
+    this.formatNode(E.caseKw), this.layout.indentation.increaseBlockLevel(), this.layout = this.formatSubExpression(E.expr), this.layout = this.formatSubExpression(E.clauses), this.layout.indentation.decreaseBlockLevel(), this.layout.add(a.NEWLINE, a.INDENT), this.formatNode(E.endKw);
   }
   formatCaseWhen(E) {
-    this.layout.add(i.NEWLINE, i.INDENT), this.formatNode(E.whenKw), this.layout = this.formatSubExpression(E.condition), this.formatNode(E.thenKw), this.layout = this.formatSubExpression(E.result);
+    this.layout.add(a.NEWLINE, a.INDENT), this.formatNode(E.whenKw), this.layout = this.formatSubExpression(E.condition), this.formatNode(E.thenKw), this.layout = this.formatSubExpression(E.result);
   }
   formatCaseElse(E) {
-    this.layout.add(i.NEWLINE, i.INDENT), this.formatNode(E.elseKw), this.layout = this.formatSubExpression(E.result);
+    this.layout.add(a.NEWLINE, a.INDENT), this.formatNode(E.elseKw), this.layout = this.formatSubExpression(E.result);
   }
   formatClause(E) {
     this.isOnelineClause(E) ? this.formatClauseInOnelineStyle(E) : J(this.cfg) ? this.formatClauseInTabularStyle(E) : this.formatClauseInIndentedStyle(E);
@@ -19502,39 +19532,39 @@ class RE {
     return J(this.cfg) ? this.dialectCfg.tabularOnelineClauses[E.nameKw.text] : this.dialectCfg.onelineClauses[E.nameKw.text];
   }
   formatClauseInIndentedStyle(E) {
-    this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E.nameKw), i.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(i.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
+    this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E.nameKw), a.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(a.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
   }
   formatClauseInOnelineStyle(E) {
-    this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E.nameKw), i.SPACE), this.layout = this.formatSubExpression(E.children);
+    this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E.nameKw), a.SPACE), this.layout = this.formatSubExpression(E.children);
   }
   formatClauseInTabularStyle(E) {
-    this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E.nameKw), i.SPACE), this.layout.indentation.increaseTopLevel(), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
+    this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E.nameKw), a.SPACE), this.layout.indentation.increaseTopLevel(), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
   }
   formatSetOperation(E) {
-    this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E.nameKw), i.NEWLINE), this.layout.add(i.INDENT), this.layout = this.formatSubExpression(E.children);
+    this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E.nameKw), a.NEWLINE), this.layout.add(a.INDENT), this.layout = this.formatSubExpression(E.children);
   }
   formatLimitClause(E) {
     this.withComments(E.limitKw, () => {
-      this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E.limitKw));
-    }), this.layout.indentation.increaseTopLevel(), J(this.cfg) ? this.layout.add(i.SPACE) : this.layout.add(i.NEWLINE, i.INDENT), E.offset ? (this.layout = this.formatSubExpression(E.offset), this.layout.add(i.NO_SPACE, ",", i.SPACE), this.layout = this.formatSubExpression(E.count)) : this.layout = this.formatSubExpression(E.count), this.layout.indentation.decreaseTopLevel();
+      this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E.limitKw));
+    }), this.layout.indentation.increaseTopLevel(), J(this.cfg) ? this.layout.add(a.SPACE) : this.layout.add(a.NEWLINE, a.INDENT), E.offset ? (this.layout = this.formatSubExpression(E.offset), this.layout.add(a.NO_SPACE, ",", a.SPACE), this.layout = this.formatSubExpression(E.count)) : this.layout = this.formatSubExpression(E.count), this.layout.indentation.decreaseTopLevel();
   }
   formatAllColumnsAsterisk(E) {
-    this.layout.add("*", i.SPACE);
+    this.layout.add("*", a.SPACE);
   }
   formatLiteral(E) {
-    this.layout.add(E.text, i.SPACE);
+    this.layout.add(E.text, a.SPACE);
   }
   formatIdentifier(E) {
-    this.layout.add(this.showIdentifier(E), i.SPACE);
+    this.layout.add(this.showIdentifier(E), a.SPACE);
   }
   formatParameter(E) {
-    this.layout.add(this.params.get(E), i.SPACE);
+    this.layout.add(this.params.get(E), a.SPACE);
   }
   formatOperator({ text: E }) {
-    this.cfg.denseOperators || this.dialectCfg.alwaysDenseOperators.includes(E) ? this.layout.add(i.NO_SPACE, E) : E === ":" ? this.layout.add(i.NO_SPACE, E, i.SPACE) : this.layout.add(E, i.SPACE);
+    this.cfg.denseOperators || this.dialectCfg.alwaysDenseOperators.includes(E) ? this.layout.add(a.NO_SPACE, E) : E === ":" ? this.layout.add(a.NO_SPACE, E, a.SPACE) : this.layout.add(E, a.SPACE);
   }
   formatComma(E) {
-    this.inline ? this.layout.add(i.NO_SPACE, ",", i.SPACE) : this.layout.add(i.NO_SPACE, ",", i.NEWLINE, i.INDENT);
+    this.inline ? this.layout.add(a.NO_SPACE, ",", a.SPACE) : this.layout.add(a.NO_SPACE, ",", a.NEWLINE, a.INDENT);
   }
   withComments(E, T) {
     this.formatComments(E.leadingComments), T(), this.formatComments(E.trailingComments);
@@ -19545,12 +19575,12 @@ class RE {
     });
   }
   formatLineComment(E) {
-    FE(E.precedingWhitespace || "") ? this.layout.add(i.NEWLINE, i.INDENT, E.text, i.MANDATORY_NEWLINE, i.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(i.NO_NEWLINE, i.SPACE, E.text, i.MANDATORY_NEWLINE, i.INDENT) : this.layout.add(E.text, i.MANDATORY_NEWLINE, i.INDENT);
+    FE(E.precedingWhitespace || "") ? this.layout.add(a.NEWLINE, a.INDENT, E.text, a.MANDATORY_NEWLINE, a.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(a.NO_NEWLINE, a.SPACE, E.text, a.MANDATORY_NEWLINE, a.INDENT) : this.layout.add(E.text, a.MANDATORY_NEWLINE, a.INDENT);
   }
   formatBlockComment(E) {
     E.type === U.block_comment && this.isMultilineBlockComment(E) ? (this.splitBlockComment(E.text).forEach((T) => {
-      this.layout.add(i.NEWLINE, i.INDENT, T);
-    }), this.layout.add(i.NEWLINE, i.INDENT)) : this.layout.add(E.text, i.SPACE);
+      this.layout.add(a.NEWLINE, a.INDENT, T);
+    }), this.layout.add(a.NEWLINE, a.INDENT)) : this.layout.add(E.text, a.SPACE);
   }
   isMultilineBlockComment(E) {
     return FE(E.text) || FE(E.precedingWhitespace || "");
@@ -19623,27 +19653,27 @@ class RE {
   }
   formatKeywordNode(E) {
     switch (E.tokenType) {
-      case a.RESERVED_JOIN:
+      case D.RESERVED_JOIN:
         return this.formatJoin(E);
-      case a.AND:
-      case a.OR:
-      case a.XOR:
+      case D.AND:
+      case D.OR:
+      case D.XOR:
         return this.formatLogicalOperator(E);
       default:
         return this.formatKeyword(E);
     }
   }
   formatJoin(E) {
-    J(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E), i.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E), i.SPACE);
+    J(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E), a.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E), a.SPACE);
   }
   formatKeyword(E) {
-    this.layout.add(this.showKw(E), i.SPACE);
+    this.layout.add(this.showKw(E), a.SPACE);
   }
   formatLogicalOperator(E) {
-    this.cfg.logicalOperatorNewline === "before" ? J(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E), i.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(i.NEWLINE, i.INDENT, this.showKw(E), i.SPACE) : this.layout.add(this.showKw(E), i.NEWLINE, i.INDENT);
+    this.cfg.logicalOperatorNewline === "before" ? J(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E), a.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(a.NEWLINE, a.INDENT, this.showKw(E), a.SPACE) : this.layout.add(this.showKw(E), a.NEWLINE, a.INDENT);
   }
   formatDataType(E) {
-    this.layout.add(this.showDataType(E), i.SPACE);
+    this.layout.add(this.showDataType(E), a.SPACE);
   }
   showKw(E) {
     return lT(E.tokenType) ? GT(this.showNonTabularKw(E), this.cfg.indentStyle) : this.showNonTabularKw(E);
@@ -19723,7 +19753,7 @@ class $I {
       params: this.params,
       layout: new yT(new KT(oI(this.cfg)))
     }).format(E.children);
-    return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? T.add(i.NEWLINE, ";") : T.add(i.NO_NEWLINE, ";")), T.toString();
+    return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? T.add(a.NEWLINE, ";") : T.add(a.NO_NEWLINE, ";")), T.toString();
   }
 }
 class TE extends Error {
@@ -19990,27 +20020,27 @@ ${T.join(`
   generateCubeMetadata(E) {
     const T = Object.keys(E.measures), A = Object.keys(E.dimensions), e = new Array(T.length), S = new Array(A.length);
     for (let t = 0; t < T.length; t++) {
-      const C = T[t], N = E.measures[C];
+      const C = T[t], O = E.measures[C];
       e[t] = {
         name: `${E.name}.${C}`,
-        title: N.title || C,
-        shortTitle: N.title || C,
-        type: N.type,
+        title: O.title || C,
+        shortTitle: O.title || C,
+        type: O.type,
         format: void 0,
         // Measure doesn't have format field
-        description: N.description
+        description: O.description
       };
     }
     for (let t = 0; t < A.length; t++) {
-      const C = A[t], N = E.dimensions[C];
+      const C = A[t], O = E.dimensions[C];
       S[t] = {
         name: `${E.name}.${C}`,
-        title: N.title || C,
-        shortTitle: N.title || C,
-        type: N.type,
+        title: O.title || C,
+        shortTitle: O.title || C,
+        type: O.type,
         format: void 0,
         // Dimension doesn't have format field
-        description: N.description
+        description: O.description
       };
     }
     const I = [];
@@ -20020,9 +20050,9 @@ ${T.join(`
         I.push({
           targetCube: C.name,
           relationship: t.relationship,
-          joinFields: t.on.map((N) => ({
-            sourceField: this.getColumnName(N.source),
-            targetField: this.getColumnName(N.target)
+          joinFields: t.on.map((O) => ({
+            sourceField: this.getColumnName(O.source),
+            targetField: this.getColumnName(O.target)
           }))
         });
       }