drizzle-cube 0.1.34 → 0.1.36

package/dist/adapters/{compiler-Ce33cdy6.js → compiler-ixtRH_TD.js}

@@ -1,5 +1,5 @@
 const h = Symbol.for("drizzle:entityKind");
-function H(T, E) {
+function m(T, E) {
   if (!T || typeof T != "object")
     return !1;
   if (T instanceof E)
@@ -142,7 +142,7 @@ class u {
   constructor(E) {
     this.queryChunks = E;
     for (const R of E)
-      if (H(R, W)) {
+      if (m(R, W)) {
         const A = R[W.Symbol.Schema];
         this.usedTables.push(
           A === void 0 ? R[W.Symbol.Name] : A + "." + R[W.Symbol.Name]
@@ -177,71 +177,71 @@ class u {
       escapeParam: N,
       prepareTyping: t,
       inlineParams: r,
-      paramStartIndex: I
+      paramStartIndex: O
     } = A;
-    return iR(E.map((O) => {
-      if (H(O, d))
-        return { sql: O.value.join(""), params: [] };
-      if (H(O, JE))
-        return { sql: S(O.value), params: [] };
-      if (O === void 0)
+    return iR(E.map((I) => {
+      if (m(I, d))
+        return { sql: I.value.join(""), params: [] };
+      if (m(I, JE))
+        return { sql: S(I.value), params: [] };
+      if (I === void 0)
         return { sql: "", params: [] };
-      if (Array.isArray(O)) {
+      if (Array.isArray(I)) {
         const s = [new d("(")];
-        for (const [L, a] of O.entries())
-          s.push(a), L < O.length - 1 && s.push(new d(", "));
+        for (const [L, a] of I.entries())
+          s.push(a), L < I.length - 1 && s.push(new d(", "));
         return s.push(new d(")")), this.buildQueryFromSourceParams(s, A);
       }
-      if (H(O, u))
-        return this.buildQueryFromSourceParams(O.queryChunks, {
+      if (m(I, u))
+        return this.buildQueryFromSourceParams(I.queryChunks, {
           ...A,
-          inlineParams: r || O.shouldInlineParams
+          inlineParams: r || I.shouldInlineParams
         });
-      if (H(O, W)) {
-        const s = O[W.Symbol.Schema], L = O[W.Symbol.Name];
+      if (m(I, W)) {
+        const s = I[W.Symbol.Schema], L = I[W.Symbol.Name];
         return {
-          sql: s === void 0 || O[IE] ? S(L) : S(s) + "." + S(L),
+          sql: s === void 0 || I[IE] ? S(L) : S(s) + "." + S(L),
           params: []
         };
       }
-      if (H(O, TE)) {
-        const s = e.getColumnCasing(O);
+      if (m(I, TE)) {
+        const s = e.getColumnCasing(I);
         if (R.invokeSource === "indexes")
           return { sql: S(s), params: [] };
-        const L = O.table[W.Symbol.Schema];
+        const L = I.table[W.Symbol.Schema];
         return {
-          sql: O.table[IE] || L === void 0 ? S(O.table[W.Symbol.Name]) + "." + S(s) : S(L) + "." + S(O.table[W.Symbol.Name]) + "." + S(s),
+          sql: I.table[IE] || L === void 0 ? S(I.table[W.Symbol.Name]) + "." + S(s) : S(L) + "." + S(I.table[W.Symbol.Name]) + "." + S(s),
           params: []
         };
       }
-      if (H(O, vT)) {
-        const s = O[z].schema, L = O[z].name;
+      if (m(I, vT)) {
+        const s = I[z].schema, L = I[z].name;
         return {
-          sql: s === void 0 || O[z].isAlias ? S(L) : S(s) + "." + S(L),
+          sql: s === void 0 || I[z].isAlias ? S(L) : S(s) + "." + S(L),
           params: []
         };
       }
-      if (H(O, OE)) {
-        if (H(O.value, NE))
-          return { sql: N(I.value++, O), params: [O], typings: ["none"] };
-        const s = O.value === null ? null : O.encoder.mapToDriverValue(O.value);
-        if (H(s, u))
+      if (m(I, OE)) {
+        if (m(I.value, NE))
+          return { sql: N(O.value++, I), params: [I], typings: ["none"] };
+        const s = I.value === null ? null : I.encoder.mapToDriverValue(I.value);
+        if (m(s, u))
           return this.buildQueryFromSourceParams([s], A);
         if (r)
           return { sql: this.mapInlineParam(s, A), params: [] };
         let L = ["none"];
-        return t && (L = [t(O.encoder)]), { sql: N(I.value++, s), params: [s], typings: L };
+        return t && (L = [t(I.encoder)]), { sql: N(O.value++, s), params: [s], typings: L };
       }
-      return H(O, NE) ? { sql: N(I.value++, O), params: [O], typings: ["none"] } : H(O, u.Aliased) && O.fieldAlias !== void 0 ? { sql: S(O.fieldAlias), params: [] } : H(O, gT) ? O._.isWith ? { sql: S(O._.alias), params: [] } : this.buildQueryFromSourceParams([
+      return m(I, NE) ? { sql: N(O.value++, I), params: [I], typings: ["none"] } : m(I, u.Aliased) && I.fieldAlias !== void 0 ? { sql: S(I.fieldAlias), params: [] } : m(I, gT) ? I._.isWith ? { sql: S(I._.alias), params: [] } : this.buildQueryFromSourceParams([
         new d("("),
-        O._.sql,
+        I._.sql,
         new d(") "),
-        new JE(O._.alias)
-      ], A) : _R(O) ? O.schema ? { sql: S(O.schema) + "." + S(O.enumName), params: [] } : { sql: S(O.enumName), params: [] } : wT(O) ? O.shouldOmitSQLParens?.() ? this.buildQueryFromSourceParams([O.getSQL()], A) : this.buildQueryFromSourceParams([
+        new JE(I._.alias)
+      ], A) : _R(I) ? I.schema ? { sql: S(I.schema) + "." + S(I.enumName), params: [] } : { sql: S(I.enumName), params: [] } : wT(I) ? I.shouldOmitSQLParens?.() ? this.buildQueryFromSourceParams([I.getSQL()], A) : this.buildQueryFromSourceParams([
         new d("("),
-        O.getSQL(),
+        I.getSQL(),
         new d(")")
-      ], A) : r ? { sql: this.mapInlineParam(O, A), params: [] } : { sql: N(I.value++, O), params: [O], typings: ["none"] };
+      ], A) : r ? { sql: this.mapInlineParam(I, A), params: [] } : { sql: N(O.value++, I), params: [I], typings: ["none"] };
     }));
   }
   mapInlineParam(E, { escapeString: R }) {
@@ -335,11 +335,11 @@ function C(T, ...E) {
     return new u([new d(r)]);
   }
   T.raw = A;
-  function e(r, I) {
-    const O = [];
+  function e(r, O) {
+    const I = [];
     for (const [s, L] of r.entries())
-      s > 0 && I !== void 0 && O.push(I), O.push(L);
-    return new u(O);
+      s > 0 && O !== void 0 && I.push(O), I.push(L);
+    return new u(I);
   }
   T.join = e;
   function S(r) {
@@ -350,8 +350,8 @@ function C(T, ...E) {
     return new NE(r);
   }
   T.placeholder = N;
-  function t(r, I) {
-    return new OE(r, I);
+  function t(r, O) {
+    return new OE(r, O);
   }
   T.param = t;
 })(C || (C = {}));
@@ -414,7 +414,7 @@ gT.prototype.getSQL = function() {
   return new u([this]);
 };
 function b(T, E) {
-  return DR(E) && !wT(T) && !H(T, OE) && !H(T, NE) && !H(T, TE) && !H(T, W) && !H(T, vT) ? new OE(T, E) : T;
+  return DR(E) && !wT(T) && !m(T, OE) && !m(T, NE) && !m(T, TE) && !m(T, W) && !m(T, vT) ? new OE(T, E) : T;
 }
 const sE = (T, E) => C`${T} = ${b(E, T)}`, RT = (T, E) => C`${T} <> ${b(E, T)}`;
 function f(...T) {
@@ -468,10 +468,10 @@ function g(T) {
   return C`sum(${T})`.mapWith(String);
 }
 function xE(T) {
-  return C`max(${T})`.mapWith(H(T, TE) ? T : String);
+  return C`max(${T})`.mapWith(m(T, TE) ? T : String);
 }
 function vE(T) {
-  return C`min(${T})`.mapWith(H(T, TE) ? T : String);
+  return C`min(${T})`.mapWith(m(T, TE) ? T : String);
 }
 class ZE {
   /**
@@ -1100,6 +1100,9 @@ function FR(T, E) {
     case "hasMany":
       return "left";
     // Parent may have no children
+    case "belongsToMany":
+      return "left";
+    // Many-to-many through junction table
     default:
       return "left";
   }
@@ -1119,26 +1122,26 @@ class YR {
     const e = {}, S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
       for (const N of R.dimensions) {
-        const [t, r] = N.split("."), I = S.get(t);
-        if (I && I.dimensions && I.dimensions[r]) {
-          const O = I.dimensions[r], s = $(O.sql, A);
+        const [t, r] = N.split("."), O = S.get(t);
+        if (O && O.dimensions && O.dimensions[r]) {
+          const I = O.dimensions[r], s = $(I.sql, A);
           e[N] = C`${s}`.as(N);
         }
       }
     if (R.measures)
       for (const N of R.measures) {
-        const [t, r] = N.split("."), I = S.get(t);
-        if (I && I.measures && I.measures[r]) {
-          const O = I.measures[r], s = this.buildMeasureExpression(O, A);
+        const [t, r] = N.split("."), O = S.get(t);
+        if (O && O.measures && O.measures[r]) {
+          const I = O.measures[r], s = this.buildMeasureExpression(I, A);
           e[N] = C`${s}`.as(N);
         }
       }
     if (R.timeDimensions)
       for (const N of R.timeDimensions) {
-        const [t, r] = N.dimension.split("."), I = S.get(t);
-        if (I && I.dimensions && I.dimensions[r]) {
-          const O = I.dimensions[r], s = this.buildTimeDimensionExpression(
-            O.sql,
+        const [t, r] = N.dimension.split("."), O = S.get(t);
+        if (O && O.dimensions && O.dimensions[r]) {
+          const I = O.dimensions[r], s = this.buildTimeDimensionExpression(
+            I.sql,
             N.granularity,
             A
           );
@@ -1228,11 +1231,11 @@ class YR {
       }
     if (R.timeDimensions)
       for (const t of R.timeDimensions) {
-        const [r, I] = t.dimension.split("."), O = N.get(r);
-        if (O && O.dimensions[I] && t.dateRange) {
+        const [r, O] = t.dimension.split("."), I = N.get(r);
+        if (I && I.dimensions[O] && t.dateRange) {
           if (e?.preAggregationCTEs && e.preAggregationCTEs.some((n) => n.cube.name === r))
             continue;
-          const s = O.dimensions[I], L = $(s.sql, A), a = this.buildDateRangeCondition(L, t.dateRange);
+          const s = I.dimensions[O], L = $(s.sql, A), a = this.buildDateRangeCondition(L, t.dateRange);
           a && S.push(a);
         }
       }
@@ -1267,14 +1270,14 @@ class YR {
         return o.length > 0 ? DE(...o) : null;
       }
     }
-    const N = E, [t, r] = N.member.split("."), I = R.get(t);
-    if (!I) return null;
-    const O = I.dimensions[r], s = I.measures[r], L = O || s;
+    const N = E, [t, r] = N.member.split("."), O = R.get(t);
+    if (!O) return null;
+    const I = O.dimensions[r], s = O.measures[r], L = I || s;
     if (!L) return null;
-    if (e === "where" && O) {
+    if (e === "where" && I) {
       if (S?.preAggregationCTEs && S.preAggregationCTEs.some((n) => n.cube.name === t))
         return null;
-      const a = $(O.sql, A);
+      const a = $(I.sql, A);
       return this.buildFilterCondition(a, N.operator, N.values, L);
     } else {
       if (e === "where" && s)
@@ -1483,14 +1486,14 @@ class YR {
       const s = new Date(Date.UTC(e, S - 11, 1, 0, 0, 0, 0)), L = new Date(R);
       return L.setUTCHours(23, 59, 59, 999), { start: s, end: L };
     }
-    const I = A.match(/^last\s+(\d+)\s+months?$/);
-    if (I) {
-      const s = parseInt(I[1], 10), L = new Date(Date.UTC(e, S - s + 1, 1, 0, 0, 0, 0)), a = new Date(R);
+    const O = A.match(/^last\s+(\d+)\s+months?$/);
+    if (O) {
+      const s = parseInt(O[1], 10), L = new Date(Date.UTC(e, S - s + 1, 1, 0, 0, 0, 0)), a = new Date(R);
       return a.setUTCHours(23, 59, 59, 999), { start: L, end: a };
     }
-    const O = A.match(/^last\s+(\d+)\s+years?$/);
-    if (O) {
-      const s = parseInt(O[1], 10), L = new Date(Date.UTC(e - s, 0, 1, 0, 0, 0, 0)), a = new Date(R);
+    const I = A.match(/^last\s+(\d+)\s+years?$/);
+    if (I) {
+      const s = parseInt(I[1], 10), L = new Date(Date.UTC(e - s, 0, 1, 0, 0, 0, 0)), a = new Date(R);
       return a.setUTCHours(23, 59, 59, 999), { start: L, end: a };
     }
     return null;
@@ -1526,27 +1529,27 @@ class YR {
     const t = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
       for (const r of R.dimensions) {
-        const [I, O] = r.split("."), s = t.get(I);
-        if (s && s.dimensions && s.dimensions[O])
-          if (e?.preAggregationCTEs?.some((a) => a.cube.name === I)) {
-            const a = e.preAggregationCTEs.find((n) => n.cube.name === I), o = a.joinKeys.find((n) => n.targetColumn === O);
+        const [O, I] = r.split("."), s = t.get(O);
+        if (s && s.dimensions && s.dimensions[I])
+          if (e?.preAggregationCTEs?.some((a) => a.cube.name === O)) {
+            const a = e.preAggregationCTEs.find((n) => n.cube.name === O), o = a.joinKeys.find((n) => n.targetColumn === I);
             if (o && o.sourceColumnObj)
               S.push(o.sourceColumnObj);
             else {
-              const n = C`${C.identifier(a.cteAlias)}.${C.identifier(O)}`;
+              const n = C`${C.identifier(a.cteAlias)}.${C.identifier(I)}`;
               S.push(n);
             }
           } else {
-            const a = s.dimensions[O], o = $(a.sql, A);
+            const a = s.dimensions[I], o = $(a.sql, A);
             S.push(o);
           }
       }
     if (R.timeDimensions)
       for (const r of R.timeDimensions) {
-        const [I, O] = r.dimension.split("."), s = t.get(I);
-        if (s && s.dimensions && s.dimensions[O])
-          if (e?.preAggregationCTEs?.some((a) => a.cube.name === I)) {
-            const a = e.preAggregationCTEs.find((n) => n.cube.name === I), o = a.joinKeys.find((n) => n.targetColumn === O);
+        const [O, I] = r.dimension.split("."), s = t.get(O);
+        if (s && s.dimensions && s.dimensions[I])
+          if (e?.preAggregationCTEs?.some((a) => a.cube.name === O)) {
+            const a = e.preAggregationCTEs.find((n) => n.cube.name === O), o = a.joinKeys.find((n) => n.targetColumn === I);
             if (o && o.sourceColumnObj) {
               const n = this.buildTimeDimensionExpression(
                 o.sourceColumnObj,
@@ -1555,11 +1558,11 @@ class YR {
               );
               S.push(n);
             } else {
-              const n = C`${C.identifier(a.cteAlias)}.${C.identifier(O)}`;
+              const n = C`${C.identifier(a.cteAlias)}.${C.identifier(I)}`;
               S.push(n);
             }
           } else {
-            const a = s.dimensions[O], o = this.buildTimeDimensionExpression(
+            const a = s.dimensions[I], o = this.buildTimeDimensionExpression(
               a.sql,
               r.granularity,
               A
@@ -1604,8 +1607,8 @@ class YR {
       for (const S of R.dimensions) {
         const [N, t] = S.split("."), r = e.get(N);
         if (r) {
-          const I = r.dimensions[t];
-          I && I.type === "number" && A.push(S);
+          const O = r.dimensions[t];
+          O && O.type === "number" && A.push(S);
         }
       }
     return A;
@@ -1720,7 +1723,7 @@ class pR {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const r = this.buildJoinPlan(E, t, S), I = this.planPreAggregationCTEs(E, t, r, R);
+    const r = this.buildJoinPlan(E, t, S), O = this.planPreAggregationCTEs(E, t, r, R);
     return {
       primaryCube: t,
       joinCubes: r,
@@ -1730,7 +1733,7 @@ class pR {
       // Will be built by QueryBuilder
       groupByFields: [],
       // Will be built by QueryBuilder
-      preAggregationCTEs: I
+      preAggregationCTEs: O
     };
   }
   /**
@@ -1787,25 +1790,25 @@ class pR {
       const r = this.findJoinPath(E, R.name, t, S);
       if (!r || r.length === 0)
         throw new Error(`No join path found from '${R.name}' to '${t}'`);
-      for (const { toCube: I, joinDef: O } of r) {
-        if (S.has(I))
+      for (const { toCube: O, joinDef: I } of r) {
+        if (S.has(O))
           continue;
-        const s = E.get(I);
+        const s = E.get(O);
         if (!s)
-          throw new Error(`Cube '${I}' not found`);
+          throw new Error(`Cube '${O}' not found`);
         const L = this.buildJoinCondition(
-          O,
+          I,
           null,
           // No source alias needed - use the actual column
           null
           // No target alias needed - use the actual column 
-        ), a = FR(O.relationship, O.sqlJoinType);
+        ), a = FR(I.relationship, I.sqlJoinType);
         e.push({
           cube: s,
-          alias: `${I.toLowerCase()}_cube`,
+          alias: `${O.toLowerCase()}_cube`,
           joinType: a,
           joinCondition: L
-        }), S.add(I);
+        }), S.add(O);
       }
     }
     return e;
@@ -1832,16 +1835,16 @@ class pR {
       { cube: R, path: [] }
     ], N = /* @__PURE__ */ new Set([R, ...e]);
     for (; S.length > 0; ) {
-      const { cube: t, path: r } = S.shift(), I = E.get(t);
-      if (I?.joins)
-        for (const [, O] of Object.entries(I.joins)) {
-          const L = tT(O.targetCube).name;
+      const { cube: t, path: r } = S.shift(), O = E.get(t);
+      if (O?.joins)
+        for (const [, I] of Object.entries(O.joins)) {
+          const L = tT(I.targetCube).name;
           if (N.has(L))
             continue;
           const a = [...r, {
             fromCube: t,
             toCube: L,
-            joinDef: O
+            joinDef: I
           }];
           if (L === A)
             return a;
@@ -1863,8 +1866,8 @@ class pR {
         continue;
       const r = e.measures ? e.measures.filter(
         (L) => L.startsWith(N.cube.name + ".")
-      ) : [], I = this.extractMeasuresFromFilters(e, N.cube.name), O = [.../* @__PURE__ */ new Set([...r, ...I])];
-      if (O.length === 0)
+      ) : [], O = this.extractMeasuresFromFilters(e, N.cube.name), I = [.../* @__PURE__ */ new Set([...r, ...O])];
+      if (I.length === 0)
         continue;
       const s = t.on.map((L) => ({
         sourceColumn: L.source.name,
@@ -1877,7 +1880,7 @@ class pR {
         alias: N.alias,
         cteAlias: `${N.cube.name.toLowerCase()}_agg`,
         joinKeys: s,
-        measures: O
+        measures: I
       });
     }
     return S;
@@ -1915,7 +1918,7 @@ class UE {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: A
-      }, N = this.queryPlanner.createQueryPlan(E, R, S), t = this.buildUnifiedQuery(N, R, S), r = this.queryBuilder.collectNumericFields(E, R), I = await this.dbExecutor.execute(t, r), O = Array.isArray(I) ? I.map((L) => {
+      }, N = this.queryPlanner.createQueryPlan(E, R, S), t = this.buildUnifiedQuery(N, R, S), r = this.queryBuilder.collectNumericFields(E, R), O = await this.dbExecutor.execute(t, r), I = Array.isArray(O) ? O.map((L) => {
         const a = { ...L };
         if (R.timeDimensions) {
           for (const o of R.timeDimensions)
@@ -1929,9 +1932,9 @@ class UE {
             }
         }
         return a;
-      }) : [I], s = this.generateAnnotations(N, R);
+      }) : [O], s = this.generateAnnotations(N, R);
       return {
-        data: O,
+        data: I,
         annotation: s
       };
     } catch (e) {
@@ -1959,8 +1962,8 @@ class UE {
     for (const n of E.measures) {
       const [, U] = n.split(".");
       if (S.measures && S.measures[U]) {
-        const P = S.measures[U], l = this.queryBuilder.buildMeasureExpression(P, A);
-        t[U] = C`${l}`.as(U);
+        const P = S.measures[U], c = this.queryBuilder.buildMeasureExpression(P, A);
+        t[U] = C`${c}`.as(U);
       }
     }
     const r = S.name;
@@ -1968,42 +1971,42 @@ class UE {
       for (const n of R.dimensions) {
         const [U, P] = n.split(".");
         if (U === r && S.dimensions && S.dimensions[P]) {
-          const l = S.dimensions[P], c = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A);
-          t[P] = C`${c}`.as(P);
+          const c = S.dimensions[P], l = this.queryBuilder.buildMeasureExpression({ sql: c.sql, type: "number" }, A);
+          t[P] = C`${l}`.as(P);
         }
       }
     if (R.timeDimensions)
       for (const n of R.timeDimensions) {
         const [U, P] = n.dimension.split(".");
         if (U === r && S.dimensions && S.dimensions[P]) {
-          const l = S.dimensions[P], c = this.queryBuilder.buildTimeDimensionExpression(l.sql, n.granularity, A);
-          t[P] = C`${c}`.as(P);
+          const c = S.dimensions[P], l = this.queryBuilder.buildTimeDimensionExpression(c.sql, n.granularity, A);
+          t[P] = C`${l}`.as(P);
         }
       }
     if (Object.keys(t).length === 0)
       return null;
-    let I = A.db.select(t).from(N.from);
-    const O = e ? {
+    let O = A.db.select(t).from(N.from);
+    const I = e ? {
       ...e,
       preAggregationCTEs: e.preAggregationCTEs?.filter((n) => n.cube.name !== S.name)
-    } : void 0, s = this.queryBuilder.buildWhereConditions(S, R, A, O), L = [];
+    } : void 0, s = this.queryBuilder.buildWhereConditions(S, R, A, I), L = [];
     if (R.timeDimensions)
       for (const n of R.timeDimensions) {
         const [U, P] = n.dimension.split(".");
         if (U === r && S.dimensions && S.dimensions[P] && n.dateRange) {
-          const l = S.dimensions[P], c = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A), m = this.queryBuilder.buildDateRangeCondition(c, n.dateRange);
-          m && L.push(m);
+          const c = S.dimensions[P], l = this.queryBuilder.buildMeasureExpression({ sql: c.sql, type: "number" }, A), H = this.queryBuilder.buildDateRangeCondition(l, n.dateRange);
+          H && L.push(H);
         }
       }
     if (R.filters) {
       for (const n of R.filters)
         if (!("and" in n) && !("or" in n) && "member" in n && "operator" in n) {
-          const U = n, [P, l] = U.member.split(".");
-          if (P === r && S.dimensions && S.dimensions[l]) {
-            const c = S.dimensions[l];
+          const U = n, [P, c] = U.member.split(".");
+          if (P === r && S.dimensions && S.dimensions[c]) {
+            const l = S.dimensions[c];
             if (U.operator === "inDateRange") {
-              const m = this.queryBuilder.buildMeasureExpression({ sql: c.sql, type: "number" }, A), p = this.queryBuilder.buildDateRangeCondition(m, U.values);
-              p && L.push(p);
+              const H = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(H, U.values);
+              B && L.push(B);
             }
           }
         }
@@ -2011,7 +2014,7 @@ class UE {
     const a = [];
     if (N.where && a.push(N.where), a.push(...s, ...L), a.length > 0) {
       const n = a.length === 1 ? a[0] : f(...a);
-      I = I.where(n);
+      O = O.where(n);
     }
     const o = [];
     for (const n of E.joinKeys)
@@ -2020,19 +2023,19 @@ class UE {
       for (const n of R.dimensions) {
         const [U, P] = n.split(".");
         if (U === r && S.dimensions && S.dimensions[P]) {
-          const l = S.dimensions[P], c = $(l.sql, A);
-          o.push(c);
+          const c = S.dimensions[P], l = $(c.sql, A);
+          o.push(l);
         }
       }
     if (R.timeDimensions)
       for (const n of R.timeDimensions) {
         const [U, P] = n.dimension.split(".");
         if (U === r && S.dimensions && S.dimensions[P]) {
-          const l = S.dimensions[P], c = this.queryBuilder.buildTimeDimensionExpression(l.sql, n.granularity, A);
-          o.push(c);
+          const c = S.dimensions[P], l = this.queryBuilder.buildTimeDimensionExpression(c.sql, n.granularity, A);
+          o.push(l);
         }
       }
-    return o.length > 0 && (I = I.groupBy(...o)), A.db.$with(E.cteAlias).as(I);
+    return o.length > 0 && (O = O.groupBy(...o)), A.db.$with(E.cteAlias).as(O);
   }
   // Removed unused getActualJoinTargetColumn method
   /**
@@ -2070,49 +2073,50 @@ class UE {
         const U = n.cube.name;
         for (const P of n.measures)
           if (r[P]) {
-            const [, l] = P.split("."), c = this.getCubesFromPlan(E).get(U);
-            if (c && c.measures && c.measures[l]) {
-              const m = c.measures[l], p = C`${C.identifier(n.cteAlias)}.${C.identifier(l)}`;
+            const [, c] = P.split("."), l = this.getCubesFromPlan(E).get(U);
+            if (l && l.measures && l.measures[c]) {
+              const H = l.measures[c], B = C`${C.identifier(n.cteAlias)}.${C.identifier(c)}`;
               let V;
-              switch (m.type) {
+              switch (H.type) {
                 case "count":
                 case "countDistinct":
                 case "sum":
-                  V = g(p);
+                  V = g(B);
                   break;
                 case "avg":
-                  V = this.databaseAdapter.buildAvg(p);
+                  V = this.databaseAdapter.buildAvg(B);
                   break;
                 case "min":
-                  V = vE(p);
+                  V = vE(B);
                   break;
                 case "max":
-                  V = xE(p);
+                  V = xE(B);
                   break;
                 case "number":
-                  V = g(p);
+                  V = g(B);
                   break;
                 default:
-                  V = g(p);
+                  V = g(B);
               }
               r[P] = C`${V}`.as(P);
             }
           }
         for (const P in r) {
-          const [l, c] = P.split(".");
-          if (l === U) {
-            const m = this.getCubesFromPlan(E).get(U), p = m && m.dimensions?.[c], V = P.startsWith(U + ".");
-            if (p || V) {
-              let x = n.joinKeys.find((LE) => LE.targetColumn === c);
-              if (!x && m?.dimensions?.[c]) {
-                const LE = m.dimensions[c].sql;
+          const [c, l] = P.split(".");
+          if (c === U) {
+            const H = this.getCubesFromPlan(E).get(U), B = H && H.dimensions?.[l], V = P.startsWith(U + ".");
+            if (B || V) {
+              let x = n.joinKeys.find((LE) => LE.targetColumn === l);
+              if (!x && H?.dimensions?.[l]) {
+                const LE = H.dimensions[l].sql;
                 x = n.joinKeys.find((LR) => LR.targetColumnObj === LE);
               }
-              x ? r[P] = C`${C.identifier(n.cteAlias)}.${C.identifier(c)}`.as(P) : V && m?.dimensions?.[c] && (r[P] = C`${C.identifier(n.cteAlias)}.${C.identifier(c)}`.as(P));
+              x ? r[P] = C`${C.identifier(n.cteAlias)}.${C.identifier(l)}`.as(P) : V && H?.dimensions?.[l] && (r[P] = C`${C.identifier(n.cteAlias)}.${C.identifier(l)}`.as(P));
             }
           }
         }
       }
+    const O = [];
     let I = A.db.select(r).from(N.from);
     if (e.length > 0 && (I = A.db.with(...e).select(r).from(N.from)), N.joins)
       for (const n of N.joins)
@@ -2133,27 +2137,51 @@ class UE {
     if (E.joinCubes && E.joinCubes.length > 0)
       for (const n of E.joinCubes) {
         const U = S.get(n.cube.name);
-        let P, l;
-        U ? (P = C`${C.identifier(U)}`, l = this.buildCTEJoinCondition(n, U, E)) : (P = n.cube.sql(A).from, l = n.joinCondition);
+        if (n.junctionTable) {
+          const l = n.junctionTable, H = [];
+          if (l.securitySql) {
+            const B = l.securitySql(A.securityContext);
+            Array.isArray(B) ? H.push(...B) : H.push(B);
+          }
+          try {
+            switch (l.joinType || "left") {
+              case "left":
+                I = I.leftJoin(l.table, l.joinCondition);
+                break;
+              case "inner":
+                I = I.innerJoin(l.table, l.joinCondition);
+                break;
+              case "right":
+                I = I.rightJoin(l.table, l.joinCondition);
+                break;
+              case "full":
+                I = I.fullJoin(l.table, l.joinCondition);
+                break;
+            }
+            H.length > 0 && O.push(...H);
+          } catch {
+          }
+        }
+        let P, c;
+        U ? (P = C`${C.identifier(U)}`, c = this.buildCTEJoinCondition(n, U, E)) : (P = n.cube.sql(A).from, c = n.joinCondition);
         try {
           switch (n.joinType || "left") {
             case "left":
-              I = I.leftJoin(P, l);
+              I = I.leftJoin(P, c);
               break;
             case "inner":
-              I = I.innerJoin(P, l);
+              I = I.innerJoin(P, c);
               break;
             case "right":
-              I = I.rightJoin(P, l);
+              I = I.rightJoin(P, c);
               break;
             case "full":
-              I = I.fullJoin(P, l);
+              I = I.fullJoin(P, c);
               break;
           }
         } catch {
         }
       }
-    const O = [];
     if (N.where && O.push(N.where), E.joinCubes && E.joinCubes.length > 0)
       for (const n of E.joinCubes) {
         if (S.get(n.cube.name))
@@ -2241,36 +2269,36 @@ class UE {
     const A = {}, e = {}, S = {}, N = [E.primaryCube];
     if (E.joinCubes && E.joinCubes.length > 0 && N.push(...E.joinCubes.map((t) => t.cube)), R.measures)
       for (const t of R.measures) {
-        const [r, I] = t.split("."), O = N.find((s) => s.name === r);
-        if (O && O.measures[I]) {
-          const s = O.measures[I];
+        const [r, O] = t.split("."), I = N.find((s) => s.name === r);
+        if (I && I.measures[O]) {
+          const s = I.measures[O];
           A[t] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
+            title: s.title || O,
+            shortTitle: s.title || O,
             type: s.type
           };
         }
       }
     if (R.dimensions)
       for (const t of R.dimensions) {
-        const [r, I] = t.split("."), O = N.find((s) => s.name === r);
-        if (O && O.dimensions[I]) {
-          const s = O.dimensions[I];
+        const [r, O] = t.split("."), I = N.find((s) => s.name === r);
+        if (I && I.dimensions[O]) {
+          const s = I.dimensions[O];
           e[t] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
+            title: s.title || O,
+            shortTitle: s.title || O,
             type: s.type
           };
         }
       }
     if (R.timeDimensions)
       for (const t of R.timeDimensions) {
-        const [r, I] = t.dimension.split("."), O = N.find((s) => s.name === r);
-        if (O && O.dimensions && O.dimensions[I]) {
-          const s = O.dimensions[I];
+        const [r, O] = t.dimension.split("."), I = N.find((s) => s.name === r);
+        if (I && I.dimensions && I.dimensions[O]) {
+          const s = I.dimensions[O];
           S[t.dimension] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
+            title: s.title || O,
+            shortTitle: s.title || O,
             type: s.type,
             granularity: t.granularity
           };
@@ -17987,82 +18015,82 @@ class fI {
       {
         type: D.RESERVED_KEYWORD_PHRASE,
         regex: y((A = E.reservedKeywordPhrases) !== null && A !== void 0 ? A : [], E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_DATA_TYPE_PHRASE,
         regex: y((e = E.reservedDataTypePhrases) !== null && e !== void 0 ? e : [], E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.CASE,
         regex: /CASE\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.END,
         regex: /END\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.BETWEEN,
         regex: /BETWEEN\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.LIMIT,
         regex: E.reservedClauses.includes("LIMIT") ? /LIMIT\b/iuy : void 0,
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_CLAUSE,
         regex: y(E.reservedClauses, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_SELECT,
         regex: y(E.reservedSelect, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_SET_OPERATION,
         regex: y(E.reservedSetOperations, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.WHEN,
         regex: /WHEN\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.ELSE,
         regex: /ELSE\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.THEN,
         regex: /THEN\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_JOIN,
         regex: y(E.reservedJoins, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.AND,
         regex: /AND\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.OR,
         regex: /OR\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.XOR,
         regex: E.supportsXor ? /XOR\b/iuy : void 0,
-        text: B
+        text: F
       },
       ...E.operatorKeyword ? [
         {
@@ -18073,17 +18101,17 @@ class fI {
       {
         type: D.RESERVED_FUNCTION_NAME,
         regex: y(E.reservedFunctionNames, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_DATA_TYPE,
         regex: y(E.reservedDataTypes, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_KEYWORD,
         regex: y(E.reservedKeywords, E.identChars),
-        text: B
+        text: F
       }
     ]);
   }
@@ -18150,31 +18178,31 @@ class fI {
       {
         type: D.NAMED_PARAMETER,
         regex: $E(r.named, TR(E.paramChars || E.identChars)),
-        key: (I) => I.slice(1)
+        key: (O) => O.slice(1)
       },
       {
         type: D.QUOTED_PARAMETER,
         regex: $E(r.quoted, ER(E.identTypes)),
-        key: (I) => (({ tokenKey: O, quoteChar: s }) => O.replace(new RegExp(X("\\" + s), "gu"), s))({
-          tokenKey: I.slice(2, -1),
-          quoteChar: I.slice(-1)
+        key: (O) => (({ tokenKey: I, quoteChar: s }) => I.replace(new RegExp(X("\\" + s), "gu"), s))({
+          tokenKey: O.slice(2, -1),
+          quoteChar: O.slice(-1)
         })
       },
       {
         type: D.NUMBERED_PARAMETER,
         regex: $E(r.numbered, "[0-9]+"),
-        key: (I) => I.slice(1)
+        key: (O) => O.slice(1)
       },
       {
         type: D.POSITIONAL_PARAMETER,
         regex: r.positional ? /[?]/y : void 0
       },
-      ...r.custom.map((I) => {
-        var O;
+      ...r.custom.map((O) => {
+        var I;
         return {
           type: D.CUSTOM_PARAMETER,
-          regex: J(I.regex),
-          key: (O = I.key) !== null && O !== void 0 ? O : ((s) => s)
+          regex: J(O.regex),
+          key: (I = O.key) !== null && I !== void 0 ? I : ((s) => s)
         };
       })
     ]);
@@ -18184,7 +18212,7 @@ class fI {
     return E.filter((R) => !!R.regex);
   }
 }
-const B = (T) => AE(T.toUpperCase()), WT = /* @__PURE__ */ new Map(), VI = (T) => {
+const F = (T) => AE(T.toUpperCase()), WT = /* @__PURE__ */ new Map(), VI = (T) => {
   let E = WT.get(T);
   return E || (E = WI(T), WT.set(T, E)), E;
 }, WI = (T) => ({
@@ -18236,36 +18264,36 @@ function gI() {
     (function(E, R) {
       T.exports ? T.exports = R() : E.nearley = R();
     })($I, function() {
-      function E(I, O, s) {
-        return this.id = ++E.highestId, this.name = I, this.symbols = O, this.postprocess = s, this;
+      function E(O, I, s) {
+        return this.id = ++E.highestId, this.name = O, this.symbols = I, this.postprocess = s, this;
       }
-      E.highestId = 0, E.prototype.toString = function(I) {
-        var O = typeof I > "u" ? this.symbols.map(r).join(" ") : this.symbols.slice(0, I).map(r).join(" ") + " ● " + this.symbols.slice(I).map(r).join(" ");
-        return this.name + " → " + O;
+      E.highestId = 0, E.prototype.toString = function(O) {
+        var I = typeof O > "u" ? this.symbols.map(r).join(" ") : this.symbols.slice(0, O).map(r).join(" ") + " ● " + this.symbols.slice(O).map(r).join(" ");
+        return this.name + " → " + I;
       };
-      function R(I, O, s, L) {
-        this.rule = I, this.dot = O, this.reference = s, this.data = [], this.wantedBy = L, this.isComplete = this.dot === I.symbols.length;
+      function R(O, I, s, L) {
+        this.rule = O, this.dot = I, this.reference = s, this.data = [], this.wantedBy = L, this.isComplete = this.dot === O.symbols.length;
       }
       R.prototype.toString = function() {
         return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
-      }, R.prototype.nextState = function(I) {
-        var O = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
-        return O.left = this, O.right = I, O.isComplete && (O.data = O.build(), O.right = void 0), O;
+      }, R.prototype.nextState = function(O) {
+        var I = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
+        return I.left = this, I.right = O, I.isComplete && (I.data = I.build(), I.right = void 0), I;
       }, R.prototype.build = function() {
-        var I = [], O = this;
+        var O = [], I = this;
         do
-          I.push(O.right.data), O = O.left;
-        while (O.left);
-        return I.reverse(), I;
+          O.push(I.right.data), I = I.left;
+        while (I.left);
+        return O.reverse(), O;
       }, R.prototype.finish = function() {
         this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, N.fail));
       };
-      function A(I, O) {
-        this.grammar = I, this.index = O, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
+      function A(O, I) {
+        this.grammar = O, this.index = I, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
       }
-      A.prototype.process = function(I) {
-        for (var O = this.states, s = this.wants, L = this.completed, a = 0; a < O.length; a++) {
-          var o = O[a];
+      A.prototype.process = function(O) {
+        for (var I = this.states, s = this.wants, L = this.completed, a = 0; a < I.length; a++) {
+          var o = I[a];
           if (o.isComplete) {
             if (o.finish(), o.data !== N.fail) {
               for (var n = o.wantedBy, U = n.length; U--; ) {
@@ -18273,67 +18301,67 @@ function gI() {
                 this.complete(P, o);
               }
               if (o.reference === this.index) {
-                var l = o.rule.name;
-                (this.completed[l] = this.completed[l] || []).push(o);
+                var c = o.rule.name;
+                (this.completed[c] = this.completed[c] || []).push(o);
               }
             }
           } else {
-            var l = o.rule.symbols[o.dot];
-            if (typeof l != "string") {
+            var c = o.rule.symbols[o.dot];
+            if (typeof c != "string") {
               this.scannable.push(o);
               continue;
             }
-            if (s[l]) {
-              if (s[l].push(o), L.hasOwnProperty(l))
-                for (var c = L[l], U = 0; U < c.length; U++) {
-                  var m = c[U];
-                  this.complete(o, m);
+            if (s[c]) {
+              if (s[c].push(o), L.hasOwnProperty(c))
+                for (var l = L[c], U = 0; U < l.length; U++) {
+                  var H = l[U];
+                  this.complete(o, H);
                 }
             } else
-              s[l] = [o], this.predict(l);
+              s[c] = [o], this.predict(c);
           }
         }
-      }, A.prototype.predict = function(I) {
-        for (var O = this.grammar.byName[I] || [], s = 0; s < O.length; s++) {
-          var L = O[s], a = this.wants[I], o = new R(L, 0, this.index, a);
+      }, A.prototype.predict = function(O) {
+        for (var I = this.grammar.byName[O] || [], s = 0; s < I.length; s++) {
+          var L = I[s], a = this.wants[O], o = new R(L, 0, this.index, a);
           this.states.push(o);
         }
-      }, A.prototype.complete = function(I, O) {
-        var s = I.nextState(O);
+      }, A.prototype.complete = function(O, I) {
+        var s = O.nextState(I);
         this.states.push(s);
       };
-      function e(I, O) {
-        this.rules = I, this.start = O || this.rules[0].name;
+      function e(O, I) {
+        this.rules = O, this.start = I || this.rules[0].name;
         var s = this.byName = {};
         this.rules.forEach(function(L) {
           s.hasOwnProperty(L.name) || (s[L.name] = []), s[L.name].push(L);
         });
       }
-      e.fromCompiled = function(L, O) {
+      e.fromCompiled = function(L, I) {
         var s = L.Lexer;
-        L.ParserStart && (O = L.ParserStart, L = L.ParserRules);
+        L.ParserStart && (I = L.ParserStart, L = L.ParserRules);
         var L = L.map(function(o) {
           return new E(o.name, o.symbols, o.postprocess);
-        }), a = new e(L, O);
+        }), a = new e(L, I);
         return a.lexer = s, a;
       };
       function S() {
         this.reset("");
       }
-      S.prototype.reset = function(I, O) {
-        this.buffer = I, this.index = 0, this.line = O ? O.line : 1, this.lastLineBreak = O ? -O.col : 0;
+      S.prototype.reset = function(O, I) {
+        this.buffer = O, this.index = 0, this.line = I ? I.line : 1, this.lastLineBreak = I ? -I.col : 0;
       }, S.prototype.next = function() {
         if (this.index < this.buffer.length) {
-          var I = this.buffer[this.index++];
-          return I === `
-` && (this.line += 1, this.lastLineBreak = this.index), { value: I };
+          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(I, O) {
+      }, S.prototype.formatError = function(O, I) {
         var s = this.buffer;
         if (typeof s == "string") {
           var L = s.split(`
@@ -18344,26 +18372,26 @@ function gI() {
 `, this.index);
           a === -1 && (a = s.length);
           var o = this.index - this.lastLineBreak, n = String(this.line).length;
-          return O += " at line " + this.line + " col " + o + `:
+          return I += " at line " + this.line + " col " + o + `:
 
-`, O += L.map(function(P, l) {
-            return U(this.line - L.length + l + 1, n) + " " + P;
+`, I += L.map(function(P, c) {
+            return U(this.line - L.length + c + 1, n) + " " + P;
           }, this).join(`
-`), O += `
+`), I += `
 ` + U("", n + o) + `^
-`, O;
+`, I;
         } else
-          return O + " at index " + (this.index - 1);
-        function U(P, l) {
-          var c = String(P);
-          return Array(l - c.length + 1).join(" ") + c;
+          return I + " at index " + (this.index - 1);
+        function U(P, c) {
+          var l = String(P);
+          return Array(c - l.length + 1).join(" ") + l;
         }
       };
-      function N(I, O, s) {
-        if (I instanceof e)
-          var L = I, s = O;
+      function N(O, I, s) {
+        if (O instanceof e)
+          var L = O, s = I;
         else
-          var L = e.fromCompiled(I, O);
+          var L = e.fromCompiled(O, I);
         this.grammar = L, this.options = {
           keepHistory: !1,
           lexer: L.lexer || new S()
@@ -18374,12 +18402,12 @@ function gI() {
         var o = new A(L, 0);
         this.table = [o], o.wants[L.start] = [], o.predict(L.start), o.process(), this.current = 0;
       }
-      N.fail = {}, N.prototype.feed = function(I) {
-        var O = this.lexer;
-        O.reset(I, this.lexerState);
+      N.fail = {}, N.prototype.feed = function(O) {
+        var I = this.lexer;
+        I.reset(O, this.lexerState);
         for (var s; ; ) {
           try {
-            if (s = O.next(), !s)
+            if (s = I.next(), !s)
               break;
           } catch (x) {
             var n = new A(this.grammar, this.current + 1);
@@ -18391,10 +18419,10 @@ function gI() {
           this.options.keepHistory || delete this.table[this.current - 1];
           var o = this.current + 1, n = new A(this.grammar, o);
           this.table.push(n);
-          for (var U = s.text !== void 0 ? s.text : s.value, P = O.constructor === S ? s.value : s, l = a.scannable, c = l.length; c--; ) {
-            var m = l[c], p = m.rule.symbols[m.dot];
-            if (p.test ? p.test(P) : p.type ? p.type === s.type : p.literal === U) {
-              var V = m.nextState({ data: P, token: s, isToken: !0, reference: o - 1 });
+          for (var U = s.text !== void 0 ? s.text : s.value, P = I.constructor === S ? s.value : s, c = a.scannable, l = c.length; l--; ) {
+            var H = c[l], B = H.rule.symbols[H.dot];
+            if (B.test ? B.test(P) : B.type ? B.type === s.type : B.literal === U) {
+              var V = H.nextState({ data: P, token: s, isToken: !0, reference: o - 1 });
               n.states.push(V);
             }
           }
@@ -18402,100 +18430,100 @@ function gI() {
             var L = new Error(this.reportError(s));
             throw L.offset = this.current, L.token = s, L;
           }
-          this.options.keepHistory && (a.lexerState = O.save()), this.current++;
+          this.options.keepHistory && (a.lexerState = I.save()), this.current++;
         }
-        return a && (this.lexerState = O.save()), this.results = this.finish(), this;
-      }, N.prototype.reportLexerError = function(I) {
-        var O, s, L = I.token;
-        return L ? (O = "input " + JSON.stringify(L.text[0]) + " (lexer error)", s = this.lexer.formatError(L, "Syntax error")) : (O = "input (lexer error)", s = I.message), this.reportErrorCommon(s, O);
-      }, N.prototype.reportError = function(I) {
-        var O = (I.type ? I.type + " token: " : "") + JSON.stringify(I.value !== void 0 ? I.value : I), s = this.lexer.formatError(I, "Syntax error");
-        return this.reportErrorCommon(s, O);
-      }, N.prototype.reportErrorCommon = function(I, O) {
+        return a && (this.lexerState = I.save()), this.results = this.finish(), this;
+      }, N.prototype.reportLexerError = function(O) {
+        var I, s, L = O.token;
+        return L ? (I = "input " + JSON.stringify(L.text[0]) + " (lexer error)", s = this.lexer.formatError(L, "Syntax error")) : (I = "input (lexer error)", s = O.message), this.reportErrorCommon(s, I);
+      }, N.prototype.reportError = function(O) {
+        var I = (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, I);
+      }, N.prototype.reportErrorCommon = function(O, I) {
         var s = [];
-        s.push(I);
+        s.push(O);
         var L = this.table.length - 2, a = this.table[L], o = a.states.filter(function(U) {
           var P = U.rule.symbols[U.dot];
           return P && typeof P != "string";
         });
         if (o.length === 0)
-          s.push("Unexpected " + O + `. I did not expect any more input. Here is the state of my parse table:
+          s.push("Unexpected " + I + `. I did not expect any more input. Here is the state of my parse table:
 `), this.displayStateStack(a.states, s);
         else {
-          s.push("Unexpected " + O + `. Instead, I was expecting to see one of the following:
+          s.push("Unexpected " + I + `. Instead, I was expecting to see one of the following:
 `);
           var n = o.map(function(U) {
             return this.buildFirstStateStack(U, []) || [U];
           }, this);
           n.forEach(function(U) {
-            var P = U[0], l = P.rule.symbols[P.dot], c = this.getSymbolDisplay(l);
-            s.push("A " + c + " based on:"), this.displayStateStack(U, s);
+            var P = U[0], c = P.rule.symbols[P.dot], l = this.getSymbolDisplay(c);
+            s.push("A " + l + " based on:"), this.displayStateStack(U, s);
           }, this);
         }
         return s.push(""), s.join(`
 `);
-      }, N.prototype.displayStateStack = function(I, O) {
-        for (var s, L = 0, a = 0; a < I.length; a++) {
-          var o = I[a], n = o.rule.toString(o.dot);
-          n === s ? L++ : (L > 0 && O.push("    ^ " + L + " more lines identical to this"), L = 0, O.push("    " + n)), s = n;
+      }, N.prototype.displayStateStack = function(O, I) {
+        for (var s, L = 0, a = 0; a < O.length; a++) {
+          var o = O[a], n = o.rule.toString(o.dot);
+          n === s ? L++ : (L > 0 && I.push("    ^ " + L + " more lines identical to this"), L = 0, I.push("    " + n)), s = n;
         }
-      }, N.prototype.getSymbolDisplay = function(I) {
-        return t(I);
-      }, N.prototype.buildFirstStateStack = function(I, O) {
-        if (O.indexOf(I) !== -1)
+      }, N.prototype.getSymbolDisplay = function(O) {
+        return t(O);
+      }, N.prototype.buildFirstStateStack = function(O, I) {
+        if (I.indexOf(O) !== -1)
           return null;
-        if (I.wantedBy.length === 0)
-          return [I];
-        var s = I.wantedBy[0], L = [I].concat(O), a = this.buildFirstStateStack(s, L);
-        return a === null ? null : [I].concat(a);
+        if (O.wantedBy.length === 0)
+          return [O];
+        var s = O.wantedBy[0], L = [O].concat(I), a = this.buildFirstStateStack(s, L);
+        return a === null ? null : [O].concat(a);
       }, N.prototype.save = function() {
-        var I = this.table[this.current];
-        return I.lexerState = this.lexerState, I;
-      }, N.prototype.restore = function(I) {
-        var O = I.index;
-        this.current = O, this.table[O] = I, this.table.splice(O + 1), this.lexerState = I.lexerState, this.results = this.finish();
-      }, N.prototype.rewind = function(I) {
+        var O = this.table[this.current];
+        return O.lexerState = this.lexerState, O;
+      }, N.prototype.restore = function(O) {
+        var I = O.index;
+        this.current = I, this.table[I] = O, this.table.splice(I + 1), this.lexerState = O.lexerState, this.results = this.finish();
+      }, N.prototype.rewind = function(O) {
         if (!this.options.keepHistory)
           throw new Error("set option `keepHistory` to enable rewinding");
-        this.restore(this.table[I]);
+        this.restore(this.table[O]);
       }, N.prototype.finish = function() {
-        var I = [], O = this.grammar.start, s = this.table[this.table.length - 1];
+        var O = [], I = this.grammar.start, s = this.table[this.table.length - 1];
         return s.states.forEach(function(L) {
-          L.rule.name === O && L.dot === L.rule.symbols.length && L.reference === 0 && L.data !== N.fail && I.push(L);
-        }), I.map(function(L) {
+          L.rule.name === I && L.dot === L.rule.symbols.length && L.reference === 0 && L.data !== N.fail && O.push(L);
+        }), O.map(function(L) {
           return L.data;
         });
       };
-      function t(I) {
-        var O = typeof I;
-        if (O === "string")
-          return I;
-        if (O === "object") {
-          if (I.literal)
-            return JSON.stringify(I.literal);
-          if (I instanceof RegExp)
-            return "character matching " + I;
-          if (I.type)
-            return I.type + " token";
-          if (I.test)
-            return "token matching " + String(I.test);
-          throw new Error("Unknown symbol type: " + I);
+      function t(O) {
+        var I = typeof O;
+        if (I === "string")
+          return O;
+        if (I === "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 r(I) {
-        var O = typeof I;
-        if (O === "string")
-          return I;
-        if (O === "object") {
-          if (I.literal)
-            return JSON.stringify(I.literal);
-          if (I instanceof RegExp)
-            return I.toString();
-          if (I.type)
-            return "%" + I.type;
-          if (I.test)
-            return "<" + String(I.test) + ">";
-          throw new Error("Unknown symbol type: " + I);
+      function r(O) {
+        var I = typeof O;
+        if (I === "string")
+          return O;
+        if (I === "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 {
@@ -18582,7 +18610,7 @@ var M;
 function gE(T) {
   return T[0];
 }
-const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
+const G = new SR((T) => []), K = ([[T]]) => T, Y = (T) => ({
   type: M.keyword,
   tokenType: T.type,
   text: T.text,
@@ -18591,14 +18619,14 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
   type: M.data_type,
   text: T.text,
   raw: T.raw
-}), Y = (T, { leading: E, trailing: R }) => (E?.length && (T = Object.assign(Object.assign({}, T), { leadingComments: E })), R?.length && (T = Object.assign(Object.assign({}, T), { trailingComments: R })), T), EO = (T, { leading: E, trailing: R }) => {
+}), p = (T, { leading: E, trailing: R }) => (E?.length && (T = Object.assign(Object.assign({}, T), { leadingComments: E })), R?.length && (T = Object.assign(Object.assign({}, T), { trailingComments: R })), T), EO = (T, { leading: E, trailing: R }) => {
   if (E?.length) {
     const [A, ...e] = T;
-    T = [Y(A, { leading: E }), ...e];
+    T = [p(A, { leading: E }), ...e];
   }
   if (R?.length) {
     const A = T.slice(0, -1), e = T[T.length - 1];
-    T = [...A, Y(e, { trailing: R })];
+    T = [...A, p(e, { trailing: R })];
   }
   return T;
 }, TO = {
@@ -18652,14 +18680,14 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
           const [e, S] = A;
           return {
             type: M.limit_clause,
-            limitKw: Y(F(T), { trailing: E }),
+            limitKw: p(Y(T), { trailing: E }),
             offset: R,
             count: S
           };
         } else
           return {
             type: M.limit_clause,
-            limitKw: Y(F(T), { trailing: E }),
+            limitKw: p(Y(T), { trailing: E }),
             count: R
           };
       }
@@ -18675,7 +18703,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT, "select_clause$subexpression$1"],
       postprocess: ([T, [E, R]]) => ({
         type: M.clause,
-        nameKw: F(T),
+        nameKw: Y(T),
         children: [E, ...R]
       })
     },
@@ -18684,7 +18712,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT],
       postprocess: ([T]) => ({
         type: M.clause,
-        nameKw: F(T),
+        nameKw: Y(T),
         children: []
       })
     },
@@ -18700,7 +18728,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_CLAUSE") ? { type: "RESERVED_CLAUSE" } : RESERVED_CLAUSE, "other_clause$ebnf$1"],
       postprocess: ([T, E]) => ({
         type: M.clause,
-        nameKw: F(T),
+        nameKw: Y(T),
         children: E
       })
     },
@@ -18711,7 +18739,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_SET_OPERATION") ? { type: "RESERVED_SET_OPERATION" } : RESERVED_SET_OPERATION, "set_operation$ebnf$1"],
       postprocess: ([T, E]) => ({
         type: M.set_operation,
-        nameKw: F(T),
+        nameKw: Y(T),
         children: E
       })
     },
@@ -18735,17 +18763,17 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     {
       name: "expression_with_comments_",
       symbols: ["expression", "_"],
-      postprocess: ([T, E]) => Y(T, { trailing: E })
+      postprocess: ([T, E]) => p(T, { trailing: E })
     },
     {
       name: "_expression_with_comments",
       symbols: ["_", "expression"],
-      postprocess: ([T, E]) => Y(E, { leading: T })
+      postprocess: ([T, E]) => p(E, { leading: T })
     },
     {
       name: "_andless_expression_with_comments",
       symbols: ["_", "andless_expression"],
-      postprocess: ([T, E]) => Y(E, { leading: T })
+      postprocess: ([T, E]) => p(E, { leading: T })
     },
     { name: "free_form_sql$subexpression$1", symbols: ["asteriskless_free_form_sql"] },
     { name: "free_form_sql$subexpression$1", symbols: ["asterisk"] },
@@ -18784,7 +18812,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("ARRAY_IDENTIFIER") ? { type: "ARRAY_IDENTIFIER" } : ARRAY_IDENTIFIER, "_", "square_brackets"],
       postprocess: ([T, E, R]) => ({
         type: M.array_subscript,
-        array: Y({ type: M.identifier, quoted: !1, text: T.text }, { trailing: E }),
+        array: p({ type: M.identifier, quoted: !1, text: T.text }, { trailing: E }),
         parenthesis: R
       })
     },
@@ -18793,7 +18821,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("ARRAY_KEYWORD") ? { type: "ARRAY_KEYWORD" } : ARRAY_KEYWORD, "_", "square_brackets"],
       postprocess: ([T, E, R]) => ({
         type: M.array_subscript,
-        array: Y(F(T), { trailing: E }),
+        array: p(Y(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18802,7 +18830,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_FUNCTION_NAME") ? { type: "RESERVED_FUNCTION_NAME" } : RESERVED_FUNCTION_NAME, "_", "parenthesis"],
       postprocess: ([T, E, R]) => ({
         type: M.function_call,
-        nameKw: Y(F(T), { trailing: E }),
+        nameKw: p(Y(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18854,9 +18882,9 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
         // %ARRAY_IDENTIFIER on the left side of <array_subscript>.
         ([T, E, R, A, [e]]) => ({
           type: M.property_access,
-          object: Y(T, { trailing: E }),
+          object: p(T, { trailing: E }),
           operator: R.text,
-          property: Y(e, { leading: A })
+          property: p(e, { leading: A })
         })
       )
     },
@@ -18865,10 +18893,10 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", G.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
       postprocess: ([T, E, R, A, e, S, N]) => ({
         type: M.between_predicate,
-        betweenKw: F(T),
+        betweenKw: Y(T),
         expr1: EO(R, { leading: E, trailing: A }),
-        andKw: F(e),
-        expr2: [Y(N, { leading: S })]
+        andKw: Y(e),
+        expr2: [p(N, { leading: S })]
       })
     },
     { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: gE },
@@ -18880,8 +18908,8 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", G.has("END") ? { type: "END" } : END],
       postprocess: ([T, E, R, A, e]) => ({
         type: M.case_expression,
-        caseKw: Y(F(T), { trailing: E }),
-        endKw: F(e),
+        caseKw: p(Y(T), { trailing: E }),
+        endKw: Y(e),
         expr: R || [],
         clauses: A
       })
@@ -18891,8 +18919,8 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", G.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
       postprocess: ([T, E, R, A, e, S]) => ({
         type: M.case_when,
-        whenKw: Y(F(T), { trailing: E }),
-        thenKw: Y(F(A), { trailing: e }),
+        whenKw: p(Y(T), { trailing: E }),
+        thenKw: p(Y(A), { trailing: e }),
         condition: R,
         result: S
       })
@@ -18902,7 +18930,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("ELSE") ? { type: "ELSE" } : ELSE, "_", "expression_chain_"],
       postprocess: ([T, E, R]) => ({
         type: M.case_else,
-        elseKw: Y(F(T), { trailing: E }),
+        elseKw: p(Y(T), { trailing: E }),
         result: R
       })
     },
@@ -18931,7 +18959,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     {
       name: "keyword",
       symbols: ["keyword$subexpression$1"],
-      postprocess: ([[T]]) => F(T)
+      postprocess: ([[T]]) => Y(T)
     },
     { name: "data_type$subexpression$1", symbols: [G.has("RESERVED_DATA_TYPE") ? { type: "RESERVED_DATA_TYPE" } : RESERVED_DATA_TYPE] },
     { name: "data_type$subexpression$1", symbols: [G.has("RESERVED_DATA_TYPE_PHRASE") ? { type: "RESERVED_DATA_TYPE_PHRASE" } : RESERVED_DATA_TYPE_PHRASE] },
@@ -18945,7 +18973,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
       postprocess: ([T, E, R]) => ({
         type: M.parameterized_data_type,
-        dataType: Y(bT(T), { trailing: E }),
+        dataType: p(bT(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18955,7 +18983,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     {
       name: "logic_operator",
       symbols: ["logic_operator$subexpression$1"],
-      postprocess: ([[T]]) => F(T)
+      postprocess: ([[T]]) => Y(T)
     },
     { name: "other_keyword$subexpression$1", symbols: [G.has("WHEN") ? { type: "WHEN" } : WHEN] },
     { name: "other_keyword$subexpression$1", symbols: [G.has("THEN") ? { type: "THEN" } : THEN] },
@@ -18964,7 +18992,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     {
       name: "other_keyword",
       symbols: ["other_keyword$subexpression$1"],
-      postprocess: ([[T]]) => F(T)
+      postprocess: ([[T]]) => Y(T)
     },
     { name: "_$ebnf$1", symbols: [] },
     { name: "_$ebnf$1", symbols: ["_$ebnf$1", "comment"], postprocess: (T) => T[0].concat([T[1]]) },
@@ -19653,18 +19681,18 @@ async function GO(T, E, R) {
     throw new Error(`Query validation failed: ${A.errors.join(", ")}`);
   const e = /* @__PURE__ */ new Set();
   T.measures?.forEach((r) => {
-    const I = r.split(".")[0];
-    e.add(I);
+    const O = r.split(".")[0];
+    e.add(O);
   }), T.dimensions?.forEach((r) => {
-    const I = r.split(".")[0];
-    e.add(I);
+    const O = r.split(".")[0];
+    e.add(O);
   }), T.timeDimensions?.forEach((r) => {
-    const I = r.dimension.split(".")[0];
-    e.add(I);
+    const O = r.dimension.split(".")[0];
+    e.add(O);
   }), T.filters?.forEach((r) => {
     if ("member" in r) {
-      const I = r.member.split(".")[0];
-      e.add(I);
+      const O = r.member.split(".")[0];
+      e.add(O);
     }
   });
   const S = e.size > 1;
@@ -19678,8 +19706,8 @@ async function GO(T, E, R) {
   const t = Array.from(e).map((r) => ({
     cube: r,
     query: {
-      measures: T.measures?.filter((I) => I.startsWith(r + ".")) || [],
-      dimensions: T.dimensions?.filter((I) => I.startsWith(r + ".")) || [],
+      measures: T.measures?.filter((O) => O.startsWith(r + ".")) || [],
+      dimensions: T.dimensions?.filter((O) => O.startsWith(r + ".")) || [],
       filters: T.filters || [],
       timeDimensions: T.timeDimensions || [],
       order: T.order || {},
@@ -19886,27 +19914,27 @@ class UO {
   generateCubeMetadata(E) {
     const R = Object.keys(E.measures), A = Object.keys(E.dimensions), e = new Array(R.length), S = new Array(A.length);
     for (let t = 0; t < R.length; t++) {
-      const r = R[t], I = E.measures[r];
+      const r = R[t], O = E.measures[r];
       e[t] = {
         name: `${E.name}.${r}`,
-        title: I.title || r,
-        shortTitle: I.title || r,
-        type: I.type,
+        title: O.title || r,
+        shortTitle: O.title || r,
+        type: O.type,
         format: void 0,
         // Measure doesn't have format field
-        description: I.description
+        description: O.description
       };
     }
     for (let t = 0; t < A.length; t++) {
-      const r = A[t], I = E.dimensions[r];
+      const r = A[t], O = E.dimensions[r];
       S[t] = {
         name: `${E.name}.${r}`,
-        title: I.title || r,
-        shortTitle: I.title || r,
-        type: I.type,
+        title: O.title || r,
+        shortTitle: O.title || r,
+        type: O.type,
         format: void 0,
         // Dimension doesn't have format field
-        description: I.description
+        description: O.description
       };
     }
     const N = [];
@@ -19916,9 +19944,9 @@ class UO {
         N.push({
           targetCube: r.name,
           relationship: t.relationship,
-          joinFields: t.on.map((I) => ({
-            sourceField: this.getColumnName(I.source),
-            targetField: this.getColumnName(I.target)
+          joinFields: t.on.map((O) => ({
+            sourceField: this.getColumnName(O.source),
+            targetField: this.getColumnName(O.target)
           }))
         });
       }