drizzle-cube 0.1.8 → 0.1.9

package/dist/server/index.js

@@ -1,34 +1,34 @@
-var z = Object.defineProperty;
-var U = (s, e, t) => e in s ? z(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
-var C = (s, e, t) => U(s, typeof e != "symbol" ? e + "" : e, t);
-import { sql as f, and as p, eq as v, count as y, max as B, min as O, avg as R, sum as I, countDistinct as Y, or as J, gt as A, lt as F, gte as w, lte as N, isNull as W, isNotNull as K, notInArray as H, ne as V, inArray as Z } from "drizzle-orm";
+var O = Object.defineProperty;
+var B = (o, e, t) => e in o ? O(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
+var D = (o, e, t) => B(o, typeof e != "symbol" ? e + "" : e, t);
+import { sql as f, and as h, or as j, gt as E, lt as $, gte as C, lte as w, isNull as L, isNotNull as z, eq as v, count as T, max as R, min as Y, avg as W, sum as J, countDistinct as K, notInArray as H, ne as V, inArray as Z } from "drizzle-orm";
 import { parse as G, stringify as P } from "yaml";
-function we(s, e) {
+function we(o, e) {
   return {
     ...e,
     name: e.name
   };
 }
-class x {
+class A {
   constructor(e, t) {
     this.db = e, this.schema = t;
   }
 }
-class X extends x {
+class X extends A {
   async execute(e, t) {
     if (e && typeof e == "object") {
       if (typeof e.execute == "function") {
         const n = await e.execute();
-        return Array.isArray(n) ? n.map((o) => this.convertNumericFields(o, t)) : n;
+        return Array.isArray(n) ? n.map((r) => this.convertNumericFields(r, t)) : n;
       }
       if (this.db && typeof this.db.execute == "function")
         try {
           const n = await this.db.execute(e);
-          return Array.isArray(n) ? n.map((o) => this.convertNumericFields(o, t)) : n;
+          return Array.isArray(n) ? n.map((r) => this.convertNumericFields(r, t)) : n;
         } catch (n) {
           if (typeof e.getSQL == "function") {
-            const o = e.getSQL(), a = await this.db.execute(o);
-            return Array.isArray(a) ? a.map((r) => this.convertNumericFields(r, t)) : a;
+            const r = e.getSQL(), a = await this.db.execute(r);
+            return Array.isArray(a) ? a.map((s) => this.convertNumericFields(s, t)) : a;
           }
           throw n;
         }
@@ -44,8 +44,8 @@ class X extends x {
   convertNumericFields(e, t) {
     if (!e || typeof e != "object") return e;
     const i = {};
-    for (const [n, o] of Object.entries(e))
-      t && t.includes(n) ? i[n] = this.coerceToNumber(o) : i[n] = o;
+    for (const [n, r] of Object.entries(e))
+      t && t.includes(n) ? i[n] = this.coerceToNumber(r) : i[n] = r;
     return i;
   }
   /**
@@ -79,7 +79,7 @@ class X extends x {
     return "postgres";
   }
 }
-class q extends x {
+class q extends A {
   async execute(e, t) {
     if (e && typeof e == "object" && typeof e.execute == "function") {
       const i = await e.execute();
@@ -104,8 +104,8 @@ class q extends x {
   convertNumericFields(e, t) {
     if (!e || typeof e != "object") return e;
     const i = {};
-    for (const [n, o] of Object.entries(e))
-      t && t.includes(n) ? i[n] = this.coerceToNumber(o) : i[n] = o;
+    for (const [n, r] of Object.entries(e))
+      t && t.includes(n) ? i[n] = this.coerceToNumber(r) : i[n] = r;
     return i;
   }
   /**
@@ -125,11 +125,11 @@ class q extends x {
     return "sqlite";
   }
 }
-class ee extends x {
+class ee extends A {
   async execute(e, t) {
     if (e && typeof e == "object" && typeof e.execute == "function") {
       const n = await e.execute();
-      return Array.isArray(n) ? n.map((o) => this.convertNumericFields(o, t)) : n;
+      return Array.isArray(n) ? n.map((r) => this.convertNumericFields(r, t)) : n;
     }
     if (!this.db.execute)
       throw new Error("MySQL database instance must have an execute method");
@@ -142,8 +142,8 @@ class ee extends x {
   convertNumericFields(e, t) {
     if (!e || typeof e != "object") return e;
     const i = {};
-    for (const [n, o] of Object.entries(e))
-      t && t.includes(n) ? i[n] = this.coerceToNumber(o) : i[n] = o;
+    for (const [n, r] of Object.entries(e))
+      t && t.includes(n) ? i[n] = this.coerceToNumber(r) : i[n] = r;
     return i;
   }
   /**
@@ -163,43 +163,43 @@ class ee extends x {
     return "mysql";
   }
 }
-function S(s, e) {
-  return new X(s, e);
+function S(o, e) {
+  return new X(o, e);
 }
-function M(s, e) {
-  return new q(s, e);
+function M(o, e) {
+  return new q(o, e);
 }
-function te(s, e) {
-  return new ee(s, e);
+function te(o, e) {
+  return new ee(o, e);
 }
-function _(s, e, t) {
+function _(o, e, t) {
   if (t)
     switch (t) {
       case "postgres":
-        return S(s, e);
+        return S(o, e);
       case "mysql":
-        return te(s, e);
+        return te(o, e);
       case "sqlite":
-        return M(s, e);
+        return M(o, e);
     }
-  if (s.all && s.run)
-    return M(s, e);
-  if (s.execute)
-    return S(s, e);
+  if (o.all && o.run)
+    return M(o, e);
+  if (o.execute)
+    return S(o, e);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
-function Ne(s, e) {
+function De(o, e) {
   return {
-    name: s,
+    name: o,
     ...e
   };
 }
-function b(s, e) {
-  return typeof s == "function" ? s(e) : s;
+function b(o, e) {
+  return typeof o == "function" ? o(e) : o;
 }
-function ne(s, e, t) {
+function ne(o, e, t) {
   return {
-    ...s,
+    ...o,
     cubes: e,
     currentCube: t
   };
@@ -231,15 +231,15 @@ class ie {
    * Build a multi-cube query plan
    */
   buildMultiCubeQueryPlan(e, t, i) {
-    const n = this.analyzeCubeUsage(t), o = Array.from(n);
-    if (o.length === 1)
+    const n = this.analyzeCubeUsage(t), r = Array.from(n);
+    if (r.length === 1)
       throw new Error("Single cube query should use QueryExecutor directly");
-    const a = this.choosePrimaryCube(o, t), r = e.get(a);
-    if (!r)
+    const a = this.choosePrimaryCube(r, t), s = e.get(a);
+    if (!s)
       throw new Error(`Primary cube '${a}' not found`);
-    const c = this.buildJoinPlan(e, r, o, i.securityContext), l = this.buildMultiCubeSelections(e, t, i.securityContext), u = this.buildMultiCubeWhereConditions(e, t, i), m = this.buildMultiCubeGroupByFields(e, t, i.securityContext);
+    const c = this.buildJoinPlan(e, s, r, i.securityContext), l = this.buildMultiCubeSelections(e, t, i.securityContext), u = this.buildMultiCubeWhereConditions(e, t, i), m = this.buildMultiCubeGroupByFields(e, t, i.securityContext);
     return {
-      primaryCube: r,
+      primaryCube: s,
       joinCubes: c,
       selections: l,
       whereConditions: u,
@@ -264,13 +264,13 @@ class ie {
    * Build join plan for multi-cube query
    */
   buildJoinPlan(e, t, i, n) {
-    var r;
-    const o = [], a = i.filter((c) => c !== t.name);
+    var s;
+    const r = [], a = i.filter((c) => c !== t.name);
     for (const c of a) {
       const l = e.get(c);
       if (!l)
         throw new Error(`Cube '${c}' not found`);
-      const u = (r = t.joins) == null ? void 0 : r[c];
+      const u = (s = t.joins) == null ? void 0 : s[c];
       if (!u)
         throw new Error(`No join definition found from '${t.name}' to '${c}'`);
       const m = ne(
@@ -284,20 +284,20 @@ class ie {
         e,
         l
       ), d = u.condition(m);
-      o.push({
+      r.push({
         cube: l,
         alias: `${c.toLowerCase()}_cube`,
         joinType: u.type || "left",
         joinCondition: d
       });
     }
-    return o;
+    return r;
   }
   /**
    * Build selections across multiple cubes
    */
   buildMultiCubeSelections(e, t, i) {
-    const n = {}, o = {
+    const n = {}, r = {
       db: {},
       // Filled during execution
       schema: {},
@@ -306,28 +306,28 @@ class ie {
     };
     if (t.dimensions)
       for (const a of t.dimensions) {
-        const [r, c] = a.split("."), l = e.get(r);
+        const [s, c] = a.split("."), l = e.get(s);
         if (l && l.dimensions[c]) {
-          const u = l.dimensions[c], m = b(u.sql, o);
+          const u = l.dimensions[c], m = b(u.sql, r);
           n[a] = f`${m}`.as(a);
         }
       }
     if (t.measures)
       for (const a of t.measures) {
-        const [r, c] = a.split("."), l = e.get(r);
+        const [s, c] = a.split("."), l = e.get(s);
         if (l && l.measures[c]) {
-          const u = l.measures[c], m = this.buildMeasureExpression(u, o);
+          const u = l.measures[c], m = this.buildMeasureExpression(u, r);
           n[a] = f`${m}`.as(a);
         }
       }
     if (t.timeDimensions)
       for (const a of t.timeDimensions) {
-        const [r, c] = a.dimension.split("."), l = e.get(r);
+        const [s, c] = a.dimension.split("."), l = e.get(s);
         if (l && l.dimensions[c]) {
           const u = l.dimensions[c], m = this.buildTimeDimensionExpression(
             u.sql,
             a.granularity,
-            o
+            r
           );
           n[a.dimension] = f`${m}`.as(a.dimension);
         }
@@ -340,8 +340,8 @@ class ie {
   buildMeasureExpression(e, t) {
     let i = b(e.sql, t);
     if (e.filters && e.filters.length > 0) {
-      const n = e.filters.map((o) => o(t));
-      i = f`CASE WHEN ${p(...n)} THEN ${i} END`;
+      const n = e.filters.map((r) => r(t));
+      i = f`CASE WHEN ${h(...n)} THEN ${i} END`;
     }
     switch (e.type) {
       case "count":
@@ -395,31 +395,158 @@ class ie {
    */
   buildMultiCubeWhereConditions(e, t, i) {
     const n = [];
-    if (t.filters) {
-      for (const o of t.filters)
-        if ("member" in o) {
-          const [a] = o.member.split("."), r = e.get(a);
-          if (r) {
-            const c = this.buildFilterCondition(o, r, i);
-            c && n.push(c);
+    if (t.filters)
+      for (const r of t.filters) {
+        const a = this.processMultiCubeFilter(r, e, i);
+        a && n.push(a);
+      }
+    if (t.timeDimensions) {
+      for (const r of t.timeDimensions)
+        if (r.dateRange) {
+          const [a, s] = r.dimension.split("."), c = e.get(a);
+          if (c && c.dimensions[s]) {
+            const l = c.dimensions[s], u = b(l.sql, i), m = this.buildDateRangeCondition(u, r.dateRange);
+            m && n.push(m);
           }
         }
     }
     return n;
   }
   /**
-   * Filter condition builder (would reuse logic from DrizzleExecutor)
+   * Process a single filter for multi-cube queries (handles logical and simple filters)
+   */
+  processMultiCubeFilter(e, t, i) {
+    if ("and" in e || "or" in e) {
+      if (e.and) {
+        const n = e.and.map((r) => this.processMultiCubeFilter(r, t, i)).filter((r) => r !== null);
+        return n.length > 0 ? h(...n) : null;
+      }
+      if (e.or) {
+        const n = e.or.map((r) => this.processMultiCubeFilter(r, t, i)).filter((r) => r !== null);
+        return n.length > 0 ? j(...n) : null;
+      }
+    }
+    if ("member" in e) {
+      const [n] = e.member.split("."), r = t.get(n);
+      if (r)
+        return this.buildFilterCondition(e, r, i);
+    }
+    return null;
+  }
+  /**
+   * Filter condition builder with comprehensive operator support
    */
   buildFilterCondition(e, t, i) {
-    if (e.operator === "equals" && e.values && e.values.length > 0) {
-      const [n, o] = e.member.split(".");
-      if (n === t.name) {
-        const a = t.dimensions[o] || t.measures[o];
-        if (a) {
-          const r = typeof a.sql == "function" ? a.sql(i) : a.sql;
-          return v(r, e.values[0]);
+    if (!e.member || !e.operator)
+      return null;
+    const [n, r] = e.member.split(".");
+    if (n !== t.name)
+      return null;
+    const a = t.dimensions[r] || t.measures[r];
+    if (!a)
+      return null;
+    const s = b(a.sql, i), l = (e.values || []).filter((m) => m != null);
+    if (l.length === 0 && !["set", "notSet"].includes(e.operator))
+      return null;
+    const u = l[0];
+    switch (e.operator) {
+      case "equals":
+        if (l.length === 0)
+          return f`1 = 0`;
+        if (l.length === 1) {
+          const m = a.type === "time" && this.normalizeDate(u) || u;
+          return v(s, m);
+        } else if (a.type === "time") {
+          const m = l.map((d) => this.normalizeDate(d) || d);
+          return f`${s} IN (${f.join(m.map((d) => f`${d}`), f`, `)})`;
+        } else
+          return f`${s} IN (${f.join(l.map((m) => f`${m}`), f`, `)})`;
+      case "notEquals":
+        return l.length === 1 ? f`${s} <> ${u}` : l.length > 1 ? f`${s} NOT IN (${f.join(l.map((m) => f`${m}`), f`, `)})` : null;
+      case "contains":
+        return f`${s} ILIKE ${"%" + u + "%"}`;
+      case "notContains":
+        return f`${s} NOT ILIKE ${"%" + u + "%"}`;
+      case "startsWith":
+        return f`${s} ILIKE ${u + "%"}`;
+      case "endsWith":
+        return f`${s} ILIKE ${"%" + u}`;
+      case "gt":
+        return E(s, u);
+      case "gte":
+        return C(s, u);
+      case "lt":
+        return $(s, u);
+      case "lte":
+        return w(s, u);
+      case "set":
+        return z(s);
+      case "notSet":
+        return L(s);
+      case "inDateRange":
+        if (l.length >= 2) {
+          const m = this.normalizeDate(l[0]), d = this.normalizeDate(l[1]);
+          if (m && d)
+            return h(
+              C(s, m),
+              w(s, d)
+            );
         }
+        return null;
+      case "beforeDate": {
+        const m = this.normalizeDate(u);
+        return m ? $(s, m) : null;
+      }
+      case "afterDate": {
+        const m = this.normalizeDate(u);
+        return m ? E(s, m) : null;
       }
+      default:
+        return null;
+    }
+  }
+  /**
+   * Build date range condition for time dimensions
+   */
+  buildDateRangeCondition(e, t) {
+    if (!t) return null;
+    if (Array.isArray(t) && t.length >= 2) {
+      const i = this.normalizeDate(t[0]), n = this.normalizeDate(t[1]);
+      return !i || !n ? null : h(
+        C(e, i),
+        w(e, n)
+      );
+    }
+    if (typeof t == "string") {
+      const i = this.normalizeDate(t);
+      if (!i) return null;
+      const n = new Date(i);
+      n.setUTCHours(0, 0, 0, 0);
+      const r = new Date(i);
+      return r.setUTCHours(23, 59, 59, 999), h(
+        C(e, n),
+        w(e, r)
+      );
+    }
+    return null;
+  }
+  /**
+   * Normalize date values to handle both string and Date objects
+   * For PostgreSQL timestamp fields, Drizzle expects Date objects
+   */
+  normalizeDate(e) {
+    if (!e) return null;
+    if (e instanceof Date)
+      return isNaN(e.getTime()) ? null : e;
+    if (typeof e == "string") {
+      const t = new Date(e);
+      return isNaN(t.getTime()) ? null : t;
+    }
+    try {
+      const t = new Date(e);
+      if (!isNaN(t.getTime()))
+        return t;
+    } catch {
     }
     return null;
   }
@@ -436,20 +563,20 @@ class ie {
       securityContext: i
     };
     if (t.dimensions)
-      for (const r of t.dimensions) {
-        const [c, l] = r.split("."), u = e.get(c);
+      for (const s of t.dimensions) {
+        const [c, l] = s.split("."), u = e.get(c);
         if (u && u.dimensions[l]) {
           const m = u.dimensions[l], d = b(m.sql, a);
           n.push(d);
         }
       }
     if (t.timeDimensions)
-      for (const r of t.timeDimensions) {
-        const [c, l] = r.dimension.split("."), u = e.get(c);
+      for (const s of t.timeDimensions) {
+        const [c, l] = s.dimension.split("."), u = e.get(c);
         if (u && u.dimensions[l]) {
           const m = u.dimensions[l], d = this.buildTimeDimensionExpression(
             m.sql,
-            r.granularity,
+            s.granularity,
             a
           );
           n.push(d);
@@ -458,9 +585,9 @@ class ie {
     return n;
   }
 }
-class $ {
+class x {
   constructor(e) {
-    C(this, "multiCubeBuilder");
+    D(this, "multiCubeBuilder");
     this.dbExecutor = e, this.multiCubeBuilder = new ie();
   }
   /**
@@ -468,17 +595,17 @@ class $ {
    */
   async execute(e, t, i) {
     try {
-      const n = j(e, t);
+      const n = Q(e, t);
       if (!n.isValid)
         throw new Error(`Query validation failed: ${n.errors.join(", ")}`);
-      const o = this.multiCubeBuilder.analyzeCubeUsage(t);
-      if (o.size === 0)
+      const r = this.multiCubeBuilder.analyzeCubeUsage(t);
+      if (r.size === 0)
         throw new Error("No cubes found for query");
-      if (o.size === 1) {
-        const a = Array.from(o)[0], r = e.get(a);
-        if (!r)
+      if (r.size === 1) {
+        const a = Array.from(r)[0], s = e.get(a);
+        if (!s)
           throw new Error(`Cube '${a}' not found`);
-        return this.executeSingleCube(r, t, i);
+        return this.executeSingleCube(s, t, i);
       } else
         return this.executeMultiCube(e, t, i);
     } catch (n) {
@@ -507,57 +634,57 @@ class $ {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: i
-      }, o = e.sql(n), a = this.buildSelections(e, t, n);
-      let r = n.db.select(a).from(o.from);
-      if (o.joins)
-        for (const h of o.joins)
-          switch (h.type || "left") {
+      }, r = e.sql(n), a = this.buildSelections(e, t, n);
+      let s = n.db.select(a).from(r.from);
+      if (r.joins)
+        for (const p of r.joins)
+          switch (p.type || "left") {
             case "left":
-              r = r.leftJoin(h.table, h.on);
+              s = s.leftJoin(p.table, p.on);
               break;
             case "inner":
-              r = r.innerJoin(h.table, h.on);
+              s = s.innerJoin(p.table, p.on);
               break;
             case "right":
-              r = r.rightJoin(h.table, h.on);
+              s = s.rightJoin(p.table, p.on);
               break;
             case "full":
-              r = r.fullJoin(h.table, h.on);
+              s = s.fullJoin(p.table, p.on);
               break;
           }
-      o.where && (r = r.where(o.where));
+      r.where && (s = s.where(r.where));
       const c = this.buildWhereConditions(e, t, n);
       if (c.length > 0) {
-        const h = c.length === 1 ? c[0] : p(...c);
-        r = r.where(h);
+        const p = c.length === 1 ? c[0] : h(...c);
+        s = s.where(p);
       }
       const l = this.buildGroupByFields(e, t, n);
-      l.length > 0 && (r = r.groupBy(...l));
+      l.length > 0 && (s = s.groupBy(...l));
       const u = this.buildOrderBy(t);
-      if (u.length > 0 && (r = r.orderBy(...u)), t.limit !== void 0) {
+      if (u.length > 0 && (s = s.orderBy(...u)), t.limit !== void 0) {
         if (t.limit < 0)
           throw new Error("Limit must be non-negative");
-        r = r.limit(t.limit);
+        s = s.limit(t.limit);
       }
       if (t.offset !== void 0) {
         if (t.offset < 0)
           throw new Error("Offset must be non-negative");
-        r = r.offset(t.offset);
+        s = s.offset(t.offset);
       }
-      const m = t.measures || [], d = await this.dbExecutor.execute(r, m), Q = Array.isArray(d) ? d.map((h) => {
-        const E = { ...h };
+      const m = t.measures || [], d = await this.dbExecutor.execute(s, m), U = Array.isArray(d) ? d.map((p) => {
+        const N = { ...p };
         if (t.timeDimensions) {
-          for (const D of t.timeDimensions)
-            if (D.dimension in E) {
-              let g = E[D.dimension];
-              typeof g == "string" && g.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/) && (g = g.replace(" ", "T"), !g.endsWith("Z") && !g.includes("+") && (g = g + "Z")), E[D.dimension] = g;
+          for (const y of t.timeDimensions)
+            if (y.dimension in N) {
+              let g = N[y.dimension];
+              typeof g == "string" && g.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/) && (g = g.replace(" ", "T"), !g.endsWith("Z") && !g.includes("+") && (g = g + "Z")), N[y.dimension] = g;
             }
         }
-        return E;
-      }) : [d], k = this.generateAnnotations(e, t);
+        return N;
+      }) : [d], I = this.generateAnnotations(e, t);
       return {
-        data: Q,
-        annotation: k
+        data: U,
+        annotation: I
       };
     } catch (n) {
       throw new Error(`Cube query execution failed: ${n instanceof Error ? n.message : "Unknown error"}`);
@@ -567,11 +694,11 @@ class $ {
    * Execute multi-cube query using JOIN resolution
    */
   async executeMultiCube(e, t, i) {
-    const n = this.buildMultiCubeQuery(e, t, i), o = t.measures || [], a = await this.dbExecutor.execute(n, o), r = {
+    const n = this.buildMultiCubeQuery(e, t, i), r = t.measures || [], a = await this.dbExecutor.execute(n, r), s = {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: i
-    }, c = this.multiCubeBuilder.buildMultiCubeQueryPlan(e, t, r), l = this.generateMultiCubeAnnotations(c, t);
+    }, c = this.multiCubeBuilder.buildMultiCubeQueryPlan(e, t, s), l = this.generateMultiCubeAnnotations(c, t);
     return {
       data: Array.isArray(a) ? a : [a],
       annotation: l
@@ -587,10 +714,10 @@ class $ {
    * Generate raw SQL for multi-cube queries without execution
    */
   async generateMultiCubeSQL(e, t, i) {
-    const o = this.buildMultiCubeQuery(e, t, i).toSQL();
+    const r = this.buildMultiCubeQuery(e, t, i).toSQL();
     return {
-      sql: o.sql,
-      params: o.params
+      sql: r.sql,
+      params: r.params
     };
   }
   /**
@@ -601,42 +728,42 @@ class $ {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: i
-    }, o = this.multiCubeBuilder.buildMultiCubeQueryPlan(e, t, n), a = o.primaryCube.sql(n);
-    let r = n.db.select(o.selections).from(a.from);
+    }, r = this.multiCubeBuilder.buildMultiCubeQueryPlan(e, t, n), a = r.primaryCube.sql(n);
+    let s = n.db.select(r.selections).from(a.from);
     if (a.joins)
       for (const u of a.joins)
         switch (u.type || "left") {
           case "left":
-            r = r.leftJoin(u.table, u.on);
+            s = s.leftJoin(u.table, u.on);
             break;
           case "inner":
-            r = r.innerJoin(u.table, u.on);
+            s = s.innerJoin(u.table, u.on);
             break;
           case "right":
-            r = r.rightJoin(u.table, u.on);
+            s = s.rightJoin(u.table, u.on);
             break;
           case "full":
-            r = r.fullJoin(u.table, u.on);
+            s = s.fullJoin(u.table, u.on);
             break;
           default:
-            r = r.leftJoin(u.table, u.on);
+            s = s.leftJoin(u.table, u.on);
         }
-    if (o.joinCubes && o.joinCubes.length > 0)
-      for (const u of o.joinCubes) {
+    if (r.joinCubes && r.joinCubes.length > 0)
+      for (const u of r.joinCubes) {
         const m = u.cube.sql(n);
         try {
           switch (u.joinType || "left") {
             case "left":
-              r = r.leftJoin(m.from, u.joinCondition);
+              s = s.leftJoin(m.from, u.joinCondition);
               break;
             case "inner":
-              r = r.innerJoin(m.from, u.joinCondition);
+              s = s.innerJoin(m.from, u.joinCondition);
               break;
             case "right":
-              r = r.rightJoin(m.from, u.joinCondition);
+              s = s.rightJoin(m.from, u.joinCondition);
               break;
             case "full":
-              r = r.fullJoin(m.from, u.joinCondition);
+              s = s.fullJoin(m.from, u.joinCondition);
               break;
           }
         } catch (d) {
@@ -644,23 +771,23 @@ class $ {
         }
       }
     const c = [];
-    if (a.where && c.push(a.where), o.whereConditions.length > 0 && c.push(...o.whereConditions), c.length > 0) {
-      const u = c.length === 1 ? c[0] : p(...c);
-      r = r.where(u);
+    if (a.where && c.push(a.where), r.whereConditions.length > 0 && c.push(...r.whereConditions), c.length > 0) {
+      const u = c.length === 1 ? c[0] : h(...c);
+      s = s.where(u);
     }
-    o.groupByFields.length > 0 && (r = r.groupBy(...o.groupByFields));
+    r.groupByFields.length > 0 && (s = s.groupBy(...r.groupByFields));
     const l = this.buildOrderBy(t);
-    if (l.length > 0 && (r = r.orderBy(...l)), t.limit !== void 0) {
+    if (l.length > 0 && (s = s.orderBy(...l)), t.limit !== void 0) {
       if (t.limit < 0)
         throw new Error("Limit must be non-negative");
-      r = r.limit(t.limit);
+      s = s.limit(t.limit);
     }
     if (t.offset !== void 0) {
       if (t.offset < 0)
         throw new Error("Offset must be non-negative");
-      r = r.offset(t.offset);
+      s = s.offset(t.offset);
     }
-    return r;
+    return s;
   }
   /**
    * Generate SQL for Cube
@@ -670,44 +797,44 @@ class $ {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: i
-    }, o = e.sql(n), a = this.buildSelections(e, t, n);
-    let r = n.db.select(a).from(o.from);
-    if (o.joins)
-      for (const d of o.joins)
+    }, r = e.sql(n), a = this.buildSelections(e, t, n);
+    let s = n.db.select(a).from(r.from);
+    if (r.joins)
+      for (const d of r.joins)
         switch (d.type || "left") {
           case "left":
-            r = r.leftJoin(d.table, d.on);
+            s = s.leftJoin(d.table, d.on);
             break;
           case "inner":
-            r = r.innerJoin(d.table, d.on);
+            s = s.innerJoin(d.table, d.on);
             break;
           case "right":
-            r = r.rightJoin(d.table, d.on);
+            s = s.rightJoin(d.table, d.on);
             break;
           case "full":
-            r = r.fullJoin(d.table, d.on);
+            s = s.fullJoin(d.table, d.on);
             break;
         }
-    o.where && (r = r.where(o.where));
+    r.where && (s = s.where(r.where));
     const c = this.buildWhereConditions(e, t, n);
     if (c.length > 0) {
-      const d = c.length === 1 ? c[0] : p(...c);
-      r = r.where(d);
+      const d = c.length === 1 ? c[0] : h(...c);
+      s = s.where(d);
     }
     const l = this.buildGroupByFields(e, t, n);
-    l.length > 0 && (r = r.groupBy(...l));
+    l.length > 0 && (s = s.groupBy(...l));
     const u = this.buildOrderBy(t);
-    if (u.length > 0 && (r = r.orderBy(...u)), t.limit !== void 0) {
+    if (u.length > 0 && (s = s.orderBy(...u)), t.limit !== void 0) {
       if (t.limit < 0)
         throw new Error("Limit must be non-negative");
-      r = r.limit(t.limit);
+      s = s.limit(t.limit);
     }
     if (t.offset !== void 0) {
       if (t.offset < 0)
         throw new Error("Offset must be non-negative");
-      r = r.offset(t.offset);
+      s = s.offset(t.offset);
     }
-    const m = r.toSQL();
+    const m = s.toSQL();
     return {
       sql: m.sql,
       params: m.params
@@ -719,34 +846,34 @@ class $ {
   buildSelections(e, t, i) {
     const n = {};
     if (t.dimensions)
-      for (const o of t.dimensions) {
-        const [a, r] = o.split(".");
-        if (a === e.name && e.dimensions[r]) {
-          const c = e.dimensions[r], l = b(c.sql, i);
-          n[o] = f`${l}`.as(o);
+      for (const r of t.dimensions) {
+        const [a, s] = r.split(".");
+        if (a === e.name && e.dimensions[s]) {
+          const c = e.dimensions[s], l = b(c.sql, i);
+          n[r] = f`${l}`.as(r);
         }
       }
     if (t.measures)
-      for (const o of t.measures) {
-        const [a, r] = o.split(".");
-        if (a === e.name && e.measures[r]) {
-          const c = e.measures[r], l = this.buildMeasureExpression(c, i);
-          n[o] = f`${l}`.as(o);
+      for (const r of t.measures) {
+        const [a, s] = r.split(".");
+        if (a === e.name && e.measures[s]) {
+          const c = e.measures[s], l = this.buildMeasureExpression(c, i);
+          n[r] = f`${l}`.as(r);
         }
       }
     if (t.timeDimensions)
-      for (const o of t.timeDimensions) {
-        const [a, r] = o.dimension.split(".");
-        if (a === e.name && e.dimensions[r]) {
-          const c = e.dimensions[r], l = this.buildTimeDimensionExpression(
+      for (const r of t.timeDimensions) {
+        const [a, s] = r.dimension.split(".");
+        if (a === e.name && e.dimensions[s]) {
+          const c = e.dimensions[s], l = this.buildTimeDimensionExpression(
             c.sql,
-            o.granularity,
+            r.granularity,
             i
           );
-          n[o.dimension] = f`${l}`.as(o.dimension);
+          n[r.dimension] = f`${l}`.as(r.dimension);
         }
       }
-    return Object.keys(n).length === 0 && (n.count = y()), n;
+    return Object.keys(n).length === 0 && (n.count = T()), n;
   }
   /**
    * Build measure expression with aggregation and filters for Cube
@@ -754,26 +881,26 @@ class $ {
   buildMeasureExpression(e, t) {
     let i = b(e.sql, t);
     if (e.filters && e.filters.length > 0) {
-      const n = e.filters.map((o) => o(t));
-      i = f`CASE WHEN ${p(...n)} THEN ${i} END`;
+      const n = e.filters.map((r) => r(t));
+      i = f`CASE WHEN ${h(...n)} THEN ${i} END`;
     }
     switch (e.type) {
       case "count":
-        return y(i);
+        return T(i);
       case "countDistinct":
-        return Y(i);
+        return K(i);
       case "sum":
-        return I(i);
+        return J(i);
       case "avg":
-        return R(i);
+        return W(i);
       case "min":
-        return O(i);
+        return Y(i);
       case "max":
-        return B(i);
+        return R(i);
       case "number":
         return i;
       default:
-        return y(i);
+        return T(i);
     }
   }
   /**
@@ -810,15 +937,15 @@ class $ {
   buildWhereConditions(e, t, i) {
     const n = [];
     if (t.filters && t.filters.length > 0)
-      for (const o of t.filters) {
-        const a = this.processFilter(o, e, i);
+      for (const r of t.filters) {
+        const a = this.processFilter(r, e, i);
         a && n.push(a);
       }
     if (t.timeDimensions)
-      for (const o of t.timeDimensions) {
-        const [a, r] = o.dimension.split(".");
-        if (a === e.name && e.dimensions[r] && o.dateRange) {
-          const c = e.dimensions[r], l = b(c.sql, i), u = this.buildDateRangeCondition(l, o.dateRange);
+      for (const r of t.timeDimensions) {
+        const [a, s] = r.dimension.split(".");
+        if (a === e.name && e.dimensions[s] && r.dateRange) {
+          const c = e.dimensions[s], l = b(c.sql, i), u = this.buildDateRangeCondition(l, r.dateRange);
           u && n.push(u);
         }
       }
@@ -832,18 +959,18 @@ class $ {
       const l = e;
       if (l.and) {
         const u = l.and.map((m) => this.processFilter(m, t, i)).filter((m) => m !== null);
-        return u.length > 0 ? p(...u) : null;
+        return u.length > 0 ? h(...u) : null;
       }
       if (l.or) {
         const u = l.or.map((m) => this.processFilter(m, t, i)).filter((m) => m !== null);
-        return u.length > 0 ? J(...u) : null;
+        return u.length > 0 ? j(...u) : null;
       }
     }
-    const n = e, [o, a] = n.member.split(".");
-    if (o !== t.name) return null;
-    const r = t.dimensions[a] || t.measures[a];
-    if (!r) return null;
-    const c = b(r.sql, i);
+    const n = e, [r, a] = n.member.split(".");
+    if (r !== t.name) return null;
+    const s = t.dimensions[a] || t.measures[a];
+    if (!s) return null;
+    const c = b(s.sql, i);
     return this.buildFilterCondition(c, n.operator, n.values);
   }
   /**
@@ -855,49 +982,49 @@ class $ {
     const n = i.filter((a) => !(a == null || a === "" || typeof a == "string" && a.includes("\0")));
     if (n.length === 0 && !["set", "notSet"].includes(t))
       return t === "equals" ? f`FALSE` : null;
-    const o = n[0];
+    const r = n[0];
     switch (t) {
       case "equals":
-        return n.length > 1 ? Z(e, n) : n.length === 1 ? v(e, o) : f`FALSE`;
+        return n.length > 1 ? Z(e, n) : n.length === 1 ? v(e, r) : f`FALSE`;
       case "notEquals":
-        return n.length > 1 ? H(e, n) : n.length === 1 ? V(e, o) : null;
+        return n.length > 1 ? H(e, n) : n.length === 1 ? V(e, r) : null;
       case "contains":
-        return f`${e} ILIKE ${"%" + o + "%"}`;
+        return f`${e} ILIKE ${"%" + r + "%"}`;
       case "notContains":
-        return f`${e} NOT ILIKE ${"%" + o + "%"}`;
+        return f`${e} NOT ILIKE ${"%" + r + "%"}`;
       case "startsWith":
-        return f`${e} ILIKE ${o + "%"}`;
+        return f`${e} ILIKE ${r + "%"}`;
       case "endsWith":
-        return f`${e} ILIKE ${"%" + o}`;
+        return f`${e} ILIKE ${"%" + r}`;
       case "gt":
-        return A(e, o);
+        return E(e, r);
       case "gte":
-        return w(e, o);
+        return C(e, r);
       case "lt":
-        return F(e, o);
+        return $(e, r);
       case "lte":
-        return N(e, o);
+        return w(e, r);
       case "set":
-        return K(e);
+        return z(e);
       case "notSet":
-        return W(e);
+        return L(e);
       case "inDateRange":
         if (n.length >= 2) {
-          const a = this.normalizeDate(n[0]), r = this.normalizeDate(n[1]);
-          if (a && r)
-            return p(
-              w(e, a),
-              N(e, r)
+          const a = this.normalizeDate(n[0]), s = this.normalizeDate(n[1]);
+          if (a && s)
+            return h(
+              C(e, a),
+              w(e, s)
             );
         }
         return null;
       case "beforeDate": {
-        const a = this.normalizeDate(o);
-        return a ? F(e, a) : null;
+        const a = this.normalizeDate(r);
+        return a ? $(e, a) : null;
       }
       case "afterDate": {
-        const a = this.normalizeDate(o);
-        return a ? A(e, a) : null;
+        const a = this.normalizeDate(r);
+        return a ? E(e, a) : null;
       }
       default:
         return null;
@@ -910,26 +1037,26 @@ class $ {
     if (!t) return null;
     if (Array.isArray(t) && t.length >= 2) {
       const i = this.normalizeDate(t[0]), n = this.normalizeDate(t[1]);
-      return !i || !n ? null : p(
-        w(e, i),
-        N(e, n)
+      return !i || !n ? null : h(
+        C(e, i),
+        w(e, n)
       );
     }
     if (typeof t == "string") {
       const i = this.parseRelativeDateRange(t);
       if (i)
-        return p(
-          w(e, i.start),
-          N(e, i.end)
+        return h(
+          C(e, i.start),
+          w(e, i.end)
         );
       const n = this.normalizeDate(t);
       if (!n) return null;
-      const o = new Date(n);
-      o.setUTCHours(0, 0, 0, 0);
+      const r = new Date(n);
+      r.setUTCHours(0, 0, 0, 0);
       const a = new Date(n);
-      return a.setUTCHours(23, 59, 59, 999), p(
-        w(e, o),
-        N(e, a)
+      return a.setUTCHours(23, 59, 59, 999), h(
+        C(e, r),
+        w(e, a)
       );
     }
     return null;
@@ -940,27 +1067,27 @@ class $ {
   parseRelativeDateRange(e) {
     const t = /* @__PURE__ */ new Date(), i = e.toLowerCase().trim(), n = i.match(/^last\s+(\d+)\s+days?$/);
     if (n) {
-      const r = parseInt(n[1], 10), c = new Date(t);
-      c.setDate(t.getDate() - r), c.setHours(0, 0, 0, 0);
+      const s = parseInt(n[1], 10), c = new Date(t);
+      c.setDate(t.getDate() - s), c.setHours(0, 0, 0, 0);
       const l = new Date(t);
       return l.setHours(23, 59, 59, 999), { start: c, end: l };
     }
     if (i === "this month") {
-      const r = new Date(t.getFullYear(), t.getMonth(), 1, 0, 0, 0, 0), c = new Date(t.getFullYear(), t.getMonth() + 1, 0, 23, 59, 59, 999);
-      return { start: r, end: c };
+      const s = new Date(t.getFullYear(), t.getMonth(), 1, 0, 0, 0, 0), c = new Date(t.getFullYear(), t.getMonth() + 1, 0, 23, 59, 59, 999);
+      return { start: s, end: c };
     }
-    const o = i.match(/^last\s+(\d+)\s+months?$/);
-    if (o) {
-      const r = parseInt(o[1], 10), c = new Date(t.getFullYear(), t.getMonth() - r, 1, 0, 0, 0, 0), l = new Date(t);
+    const r = i.match(/^last\s+(\d+)\s+months?$/);
+    if (r) {
+      const s = parseInt(r[1], 10), c = new Date(t.getFullYear(), t.getMonth() - s, 1, 0, 0, 0, 0), l = new Date(t);
       return l.setHours(23, 59, 59, 999), { start: c, end: l };
     }
     if (i === "this year") {
-      const r = new Date(t.getFullYear(), 0, 1, 0, 0, 0, 0), c = new Date(t.getFullYear(), 11, 31, 23, 59, 59, 999);
-      return { start: r, end: c };
+      const s = new Date(t.getFullYear(), 0, 1, 0, 0, 0, 0), c = new Date(t.getFullYear(), 11, 31, 23, 59, 59, 999);
+      return { start: s, end: c };
     }
     const a = i.match(/^last\s+(\d+)\s+years?$/);
     if (a) {
-      const r = parseInt(a[1], 10), c = new Date(t.getFullYear() - r, 0, 1, 0, 0, 0, 0), l = new Date(t);
+      const s = parseInt(a[1], 10), c = new Date(t.getFullYear() - s, 0, 1, 0, 0, 0, 0), l = new Date(t);
       return l.setHours(23, 59, 59, 999), { start: c, end: l };
     }
     return null;
@@ -986,20 +1113,20 @@ class $ {
   buildGroupByFields(e, t, i) {
     const n = [];
     if (t.dimensions)
-      for (const o of t.dimensions) {
-        const [a, r] = o.split(".");
-        if (a === e.name && e.dimensions[r]) {
-          const c = e.dimensions[r], l = b(c.sql, i);
+      for (const r of t.dimensions) {
+        const [a, s] = r.split(".");
+        if (a === e.name && e.dimensions[s]) {
+          const c = e.dimensions[s], l = b(c.sql, i);
           n.push(l);
         }
       }
     if (t.timeDimensions)
-      for (const o of t.timeDimensions) {
-        const [a, r] = o.dimension.split(".");
-        if (a === e.name && e.dimensions[r]) {
-          const c = e.dimensions[r], l = this.buildTimeDimensionExpression(
+      for (const r of t.timeDimensions) {
+        const [a, s] = r.dimension.split(".");
+        if (a === e.name && e.dimensions[s]) {
+          const c = e.dimensions[s], l = this.buildTimeDimensionExpression(
             c.sql,
-            o.granularity,
+            r.granularity,
             i
           );
           n.push(l);
@@ -1011,24 +1138,24 @@ class $ {
    * Build ORDER BY clause with automatic time dimension sorting
    */
   buildOrderBy(e, t) {
-    var o;
+    var r;
     const i = [], n = t || [
       ...e.measures || [],
       ...e.dimensions || [],
-      ...((o = e.timeDimensions) == null ? void 0 : o.map((a) => a.dimension)) || []
+      ...((r = e.timeDimensions) == null ? void 0 : r.map((a) => a.dimension)) || []
     ];
     if (e.order && Object.keys(e.order).length > 0)
-      for (const [a, r] of Object.entries(e.order)) {
+      for (const [a, s] of Object.entries(e.order)) {
         if (!n.includes(a))
           throw new Error(`Cannot order by '${a}': field is not selected in the query`);
-        const c = r === "desc" ? f`DESC` : f`ASC`;
+        const c = s === "desc" ? f`DESC` : f`ASC`;
         i.push(f`${f.identifier(a)} ${c}`);
       }
     if (e.timeDimensions && e.timeDimensions.length > 0) {
-      const a = new Set(Object.keys(e.order || {})), r = [...e.timeDimensions].sort(
+      const a = new Set(Object.keys(e.order || {})), s = [...e.timeDimensions].sort(
         (c, l) => c.dimension.localeCompare(l.dimension)
       );
-      for (const c of r)
+      for (const c of s)
         a.has(c.dimension) || i.push(f`${f.identifier(c.dimension)} ASC`);
     }
     return i;
@@ -1037,11 +1164,11 @@ class $ {
    * Generate annotations for UI metadata
    */
   generateAnnotations(e, t) {
-    const i = {}, n = {}, o = {};
+    const i = {}, n = {}, r = {};
     if (t.measures)
       for (const a of t.measures) {
-        const [r, c] = a.split(".");
-        if (r === e.name && e.measures[c]) {
+        const [s, c] = a.split(".");
+        if (s === e.name && e.measures[c]) {
           const l = e.measures[c];
           i[a] = {
             title: l.title || c,
@@ -1052,8 +1179,8 @@ class $ {
       }
     if (t.dimensions)
       for (const a of t.dimensions) {
-        const [r, c] = a.split(".");
-        if (r === e.name && e.dimensions[c]) {
+        const [s, c] = a.split(".");
+        if (s === e.name && e.dimensions[c]) {
           const l = e.dimensions[c];
           n[a] = {
             title: l.title || c,
@@ -1064,10 +1191,10 @@ class $ {
       }
     if (t.timeDimensions)
       for (const a of t.timeDimensions) {
-        const [r, c] = a.dimension.split(".");
-        if (r === e.name && e.dimensions[c]) {
+        const [s, c] = a.dimension.split(".");
+        if (s === e.name && e.dimensions[c]) {
           const l = e.dimensions[c];
-          o[a.dimension] = {
+          r[a.dimension] = {
             title: l.title || c,
             shortTitle: l.title || c,
             type: l.type,
@@ -1079,20 +1206,20 @@ class $ {
       measures: i,
       dimensions: n,
       segments: {},
-      timeDimensions: o
+      timeDimensions: r
     };
   }
   /**
    * Generate annotations for multi-cube queries
    */
   generateMultiCubeAnnotations(e, t) {
-    const i = {}, n = {}, o = {}, a = [e.primaryCube];
-    if (e.joinCubes && a.push(...e.joinCubes.map((r) => r.cube)), t.measures)
-      for (const r of t.measures) {
-        const [c, l] = r.split("."), u = a.find((m) => m.name === c);
+    const i = {}, n = {}, r = {}, a = [e.primaryCube];
+    if (e.joinCubes && a.push(...e.joinCubes.map((s) => s.cube)), t.measures)
+      for (const s of t.measures) {
+        const [c, l] = s.split("."), u = a.find((m) => m.name === c);
         if (u && u.measures[l]) {
           const m = u.measures[l];
-          i[r] = {
+          i[s] = {
             title: m.title || l,
             shortTitle: m.title || l,
             type: m.type
@@ -1100,11 +1227,11 @@ class $ {
         }
       }
     if (t.dimensions)
-      for (const r of t.dimensions) {
-        const [c, l] = r.split("."), u = a.find((m) => m.name === c);
+      for (const s of t.dimensions) {
+        const [c, l] = s.split("."), u = a.find((m) => m.name === c);
         if (u && u.dimensions[l]) {
           const m = u.dimensions[l];
-          n[r] = {
+          n[s] = {
             title: m.title || l,
             shortTitle: m.title || l,
             type: m.type
@@ -1112,15 +1239,15 @@ class $ {
         }
       }
     if (t.timeDimensions)
-      for (const r of t.timeDimensions) {
-        const [c, l] = r.dimension.split("."), u = a.find((m) => m.name === c);
+      for (const s of t.timeDimensions) {
+        const [c, l] = s.dimension.split("."), u = a.find((m) => m.name === c);
         if (u && u.dimensions && u.dimensions[l]) {
           const m = u.dimensions[l];
-          o[r.dimension] = {
+          r[s.dimension] = {
             title: m.title || l,
             shortTitle: m.title || l,
             type: m.type,
-            granularity: r.granularity
+            granularity: s.granularity
           };
         }
       }
@@ -1128,18 +1255,18 @@ class $ {
       measures: i,
       dimensions: n,
       segments: {},
-      timeDimensions: o
+      timeDimensions: r
     };
   }
 }
-class T {
+class F {
   // 5 minutes in milliseconds
   constructor(e) {
-    C(this, "cubes", /* @__PURE__ */ new Map());
-    C(this, "dbExecutor");
-    C(this, "metadataCache");
-    C(this, "metadataCacheTimestamp");
-    C(this, "METADATA_CACHE_TTL", 5 * 60 * 1e3);
+    D(this, "cubes", /* @__PURE__ */ new Map());
+    D(this, "dbExecutor");
+    D(this, "metadataCache");
+    D(this, "metadataCacheTimestamp");
+    D(this, "METADATA_CACHE_TTL", 5 * 60 * 1e3);
     e != null && e.databaseExecutor ? this.dbExecutor = e.databaseExecutor : e != null && e.drizzle && (this.dbExecutor = _(
       e.drizzle,
       e.schema,
@@ -1194,7 +1321,7 @@ class T {
   async execute(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new $(this.dbExecutor).execute(this.cubes, e, t);
+    return new x(this.dbExecutor).execute(this.cubes, e, t);
   }
   /**
    * Execute a multi-cube query
@@ -1226,13 +1353,13 @@ class T {
    * Optimized version that minimizes object iterations
    */
   generateCubeMetadata(e) {
-    const t = Object.keys(e.measures), i = Object.keys(e.dimensions), n = new Array(t.length), o = new Array(i.length);
+    const t = Object.keys(e.measures), i = Object.keys(e.dimensions), n = new Array(t.length), r = new Array(i.length);
     for (let a = 0; a < t.length; a++) {
-      const r = t[a], c = e.measures[r];
+      const s = t[a], c = e.measures[s];
       n[a] = {
-        name: `${e.name}.${r}`,
-        title: c.title || r,
-        shortTitle: c.title || r,
+        name: `${e.name}.${s}`,
+        title: c.title || s,
+        shortTitle: c.title || s,
         type: c.type,
         format: void 0,
         // Measure doesn't have format field
@@ -1240,11 +1367,11 @@ class T {
       };
     }
     for (let a = 0; a < i.length; a++) {
-      const r = i[a], c = e.dimensions[r];
-      o[a] = {
-        name: `${e.name}.${r}`,
-        title: c.title || r,
-        shortTitle: c.title || r,
+      const s = i[a], c = e.dimensions[s];
+      r[a] = {
+        name: `${e.name}.${s}`,
+        title: c.title || s,
+        shortTitle: c.title || s,
         type: c.type,
         format: void 0,
         // Dimension doesn't have format field
@@ -1256,7 +1383,7 @@ class T {
       title: e.title || e.name,
       description: e.description,
       measures: n,
-      dimensions: o,
+      dimensions: r,
       segments: []
       // Add segments support later if needed
     };
@@ -1270,7 +1397,7 @@ class T {
       throw new Error(`Cube '${e}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new $(this.dbExecutor).generateSQL(n, t, i);
+    return new x(this.dbExecutor).generateSQL(n, t, i);
   }
   /**
    * Get SQL for a multi-cube query without executing it (debugging)
@@ -1278,7 +1405,7 @@ class T {
   async generateMultiCubeSQL(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new $(this.dbExecutor).generateMultiCubeSQL(this.cubes, e, t);
+    return new x(this.dbExecutor).generateMultiCubeSQL(this.cubes, e, t);
   }
   /**
    * Check if a cube exists
@@ -1317,93 +1444,93 @@ class T {
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(e) {
-    return j(this.cubes, e);
+    return Q(this.cubes, e);
   }
 }
-function j(s, e) {
+function Q(o, e) {
   const t = [], i = /* @__PURE__ */ new Set();
   if (e.measures)
     for (const n of e.measures) {
-      const [o, a] = n.split(".");
-      if (!o || !a) {
+      const [r, a] = n.split(".");
+      if (!r || !a) {
         t.push(`Invalid measure format: ${n}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
-      i.add(o);
-      const r = s.get(o);
-      if (!r) {
-        t.push(`Cube '${o}' not found (referenced in measure '${n}')`);
+      i.add(r);
+      const s = o.get(r);
+      if (!s) {
+        t.push(`Cube '${r}' not found (referenced in measure '${n}')`);
         continue;
       }
-      r.measures[a] || t.push(`Measure '${a}' not found on cube '${o}'`);
+      s.measures[a] || t.push(`Measure '${a}' not found on cube '${r}'`);
     }
   if (e.dimensions)
     for (const n of e.dimensions) {
-      const [o, a] = n.split(".");
-      if (!o || !a) {
+      const [r, a] = n.split(".");
+      if (!r || !a) {
         t.push(`Invalid dimension format: ${n}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
-      i.add(o);
-      const r = s.get(o);
-      if (!r) {
-        t.push(`Cube '${o}' not found (referenced in dimension '${n}')`);
+      i.add(r);
+      const s = o.get(r);
+      if (!s) {
+        t.push(`Cube '${r}' not found (referenced in dimension '${n}')`);
         continue;
       }
-      r.dimensions[a] || t.push(`Dimension '${a}' not found on cube '${o}'`);
+      s.dimensions[a] || t.push(`Dimension '${a}' not found on cube '${r}'`);
     }
   if (e.timeDimensions)
     for (const n of e.timeDimensions) {
-      const [o, a] = n.dimension.split(".");
-      if (!o || !a) {
+      const [r, a] = n.dimension.split(".");
+      if (!r || !a) {
         t.push(`Invalid timeDimension format: ${n.dimension}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
-      i.add(o);
-      const r = s.get(o);
-      if (!r) {
-        t.push(`Cube '${o}' not found (referenced in timeDimension '${n.dimension}')`);
+      i.add(r);
+      const s = o.get(r);
+      if (!s) {
+        t.push(`Cube '${r}' not found (referenced in timeDimension '${n.dimension}')`);
         continue;
       }
-      r.dimensions[a] || t.push(`TimeDimension '${a}' not found on cube '${o}' (must be a dimension with time type)`);
+      s.dimensions[a] || t.push(`TimeDimension '${a}' not found on cube '${r}' (must be a dimension with time type)`);
     }
   if (e.filters)
     for (const n of e.filters)
-      L(n, s, t, i);
+      k(n, o, t, i);
   return i.size === 0 && t.push("Query must reference at least one cube through measures, dimensions, or filters"), {
     isValid: t.length === 0,
     errors: t
   };
 }
-function L(s, e, t, i) {
-  if ("and" in s || "or" in s) {
-    const r = s.and || s.or || [];
-    for (const c of r)
-      L(c, e, t, i);
+function k(o, e, t, i) {
+  if ("and" in o || "or" in o) {
+    const s = o.and || o.or || [];
+    for (const c of s)
+      k(c, e, t, i);
     return;
   }
-  if (!("member" in s)) {
+  if (!("member" in o)) {
     t.push("Filter must have a member field");
     return;
   }
-  const [n, o] = s.member.split(".");
-  if (!n || !o) {
-    t.push(`Invalid filter member format: ${s.member}. Expected format: 'CubeName.fieldName'`);
+  const [n, r] = o.member.split(".");
+  if (!n || !r) {
+    t.push(`Invalid filter member format: ${o.member}. Expected format: 'CubeName.fieldName'`);
     return;
   }
   i.add(n);
   const a = e.get(n);
   if (!a) {
-    t.push(`Cube '${n}' not found (referenced in filter '${s.member}')`);
+    t.push(`Cube '${n}' not found (referenced in filter '${o.member}')`);
     return;
   }
-  !a.dimensions[o] && !a.measures[o] && t.push(`Filter field '${o}' not found on cube '${n}' (must be a dimension or measure)`);
+  !a.dimensions[r] && !a.measures[r] && t.push(`Filter field '${r}' not found on cube '${n}' (must be a dimension or measure)`);
 }
-function Ee(s) {
-  return new T(s);
+function Ne(o) {
+  return new F(o);
 }
-const se = new T();
-function re(s) {
+const se = new F();
+function re(o) {
   const e = {
     valid: !0,
     errors: [],
@@ -1411,7 +1538,7 @@ function re(s) {
     cubes: []
   };
   try {
-    const t = G(s);
+    const t = G(o);
     if (!t)
       return e.valid = !1, e.errors.push("Invalid YAML: empty or malformed content"), e;
     if (t.cubes && Array.isArray(t.cubes))
@@ -1430,43 +1557,43 @@ function re(s) {
   }
   return e;
 }
-function oe(s) {
+function oe(o) {
   const e = [];
-  return s.name || e.push("Cube name is required"), !s.sql && !s.sql_table && !s.sqlTable && e.push('Cube must have either "sql", "sql_table", or "sqlTable" property'), s.dimensions && s.dimensions.forEach((t, i) => {
+  return o.name || e.push("Cube name is required"), !o.sql && !o.sql_table && !o.sqlTable && e.push('Cube must have either "sql", "sql_table", or "sqlTable" property'), o.dimensions && o.dimensions.forEach((t, i) => {
     t.name || e.push(`Dimension at index ${i} is missing name`), t.type || e.push(`Dimension "${t.name}" is missing type`), t.sql || e.push(`Dimension "${t.name}" is missing sql`);
-  }), s.measures && s.measures.forEach((t, i) => {
+  }), o.measures && o.measures.forEach((t, i) => {
     t.name || e.push(`Measure at index ${i} is missing name`), t.type || e.push(`Measure "${t.name}" is missing type`), t.sql || e.push(`Measure "${t.name}" is missing sql`);
-  }), s.joins && s.joins.forEach((t, i) => {
+  }), o.joins && o.joins.forEach((t, i) => {
     t.name || e.push(`Join at index ${i} is missing name`), t.relationship || e.push(`Join "${t.name}" is missing relationship`), t.sql || e.push(`Join "${t.name}" is missing sql`);
   }), e;
 }
-function ae(s) {
+function ae(o) {
   const e = {};
-  s.dimensions && s.dimensions.forEach((r) => {
-    e[r.name] = ce(r);
+  o.dimensions && o.dimensions.forEach((s) => {
+    e[s.name] = ce(s);
   });
   const t = {};
-  s.measures && s.measures.forEach((r) => {
-    t[r.name] = le(r);
+  o.measures && o.measures.forEach((s) => {
+    t[s.name] = le(s);
   });
   const i = {};
-  s.joins && s.joins.forEach((r) => {
-    i[r.name] = fe(r);
+  o.joins && o.joins.forEach((s) => {
+    i[s.name] = fe(s);
   });
   const n = {};
-  (s.pre_aggregations || s.preAggregations) && (s.pre_aggregations || s.preAggregations || []).forEach((c) => {
+  (o.pre_aggregations || o.preAggregations) && (o.pre_aggregations || o.preAggregations || []).forEach((c) => {
     n[c.name] = de(c);
   });
-  let o = s.sql;
-  !o && (s.sql_table || s.sqlTable) && (o = `SELECT * FROM ${s.sql_table || s.sqlTable}`);
-  const a = s.refresh_key || s.refreshKey;
+  let r = o.sql;
+  !r && (o.sql_table || o.sqlTable) && (r = `SELECT * FROM ${o.sql_table || o.sqlTable}`);
+  const a = o.refresh_key || o.refreshKey;
   return {
-    name: s.name,
-    title: s.title,
-    description: s.description,
-    sql: o || "",
-    sqlAlias: s.sql_alias || s.sqlAlias,
-    dataSource: s.data_source || s.dataSource,
+    name: o.name,
+    title: o.title,
+    description: o.description,
+    sql: r || "",
+    sqlAlias: o.sql_alias || o.sqlAlias,
+    dataSource: o.data_source || o.dataSource,
     refreshKey: a ? {
       every: a.every,
       sql: a.sql
@@ -1475,42 +1602,42 @@ function ae(s) {
     measures: t,
     joins: Object.keys(i).length > 0 ? i : void 0,
     preAggregations: Object.keys(n).length > 0 ? n : void 0,
-    meta: s.meta
+    meta: o.meta
   };
 }
-function ce(s) {
+function ce(o) {
   return {
-    name: s.name,
-    title: s.title,
-    description: s.description,
-    type: s.type,
-    sql: s.sql,
-    primaryKey: s.primary_key || s.primaryKey,
-    shown: s.shown,
-    format: s.format,
-    meta: s.meta
+    name: o.name,
+    title: o.title,
+    description: o.description,
+    type: o.type,
+    sql: o.sql,
+    primaryKey: o.primary_key || o.primaryKey,
+    shown: o.shown,
+    format: o.format,
+    meta: o.meta
   };
 }
-function le(s) {
+function le(o) {
   var i;
-  const e = (i = s.filters) == null ? void 0 : i.map((n) => ({
+  const e = (i = o.filters) == null ? void 0 : i.map((n) => ({
     sql: n.sql
-  })), t = s.rolling_window || s.rollingWindow;
+  })), t = o.rolling_window || o.rollingWindow;
   return {
-    name: s.name,
-    title: s.title,
-    description: s.description,
-    type: s.type,
-    sql: s.sql,
-    format: s.format,
-    shown: s.shown,
+    name: o.name,
+    title: o.title,
+    description: o.description,
+    type: o.type,
+    sql: o.sql,
+    format: o.format,
+    shown: o.shown,
     filters: e,
     rollingWindow: t,
-    meta: s.meta
+    meta: o.meta
   };
 }
-function ue(s) {
-  switch (s) {
+function ue(o) {
+  switch (o) {
     case "one_to_one":
       return "hasOne";
     case "one_to_many":
@@ -1521,8 +1648,8 @@ function ue(s) {
       return "belongsTo";
   }
 }
-function me(s) {
-  switch (s) {
+function me(o) {
+  switch (o) {
     case "hasOne":
       return "one_to_one";
     case "hasMany":
@@ -1533,62 +1660,62 @@ function me(s) {
       return "many_to_one";
   }
 }
-function fe(s) {
+function fe(o) {
   return {
-    name: s.name,
-    type: s.type,
-    relationship: ue(s.relationship),
-    sql: s.sql
+    name: o.name,
+    type: o.type,
+    relationship: ue(o.relationship),
+    sql: o.sql
   };
 }
-function de(s) {
-  const e = s.time_dimension || s.timeDimension, t = s.refresh_key || s.refreshKey;
+function de(o) {
+  const e = o.time_dimension || o.timeDimension, t = o.refresh_key || o.refreshKey;
   return {
-    name: s.name,
-    measures: s.measures,
-    dimensions: s.dimensions,
+    name: o.name,
+    measures: o.measures,
+    dimensions: o.dimensions,
     timeDimension: e,
     refreshKey: t,
-    indexes: s.indexes
+    indexes: o.indexes
   };
 }
 async function he() {
   try {
-    const { promises: s } = await import("fs"), e = await s.readFile("non-existent-file.txt", "utf-8").catch((t) => t.message);
+    const { promises: o } = await import("fs"), e = await o.readFile("non-existent-file.txt", "utf-8").catch((t) => t.message);
     return !(typeof e == "string" && e.includes("not implemented"));
   } catch {
     return !1;
   }
 }
-function pe(s) {
-  const e = re(s);
+function pe(o) {
+  const e = re(o);
   if (!e.valid)
     throw new Error(`Invalid YAML cube definition:
 ${e.errors.join(`
 `)}`);
   return e.cubes.map((t) => ae(t));
 }
-async function De(s) {
+async function Ee(o) {
   if (!await he())
     return console.log("ℹ️ YAML file loading not supported in this environment (Cloudflare Workers/Edge Runtime). Use inline YAML strings or build-time transformations instead."), [];
   try {
-    const { promises: t } = await import("fs"), i = await t.readFile(s, "utf-8");
+    const { promises: t } = await import("fs"), i = await t.readFile(o, "utf-8");
     return pe(i);
   } catch (t) {
-    return console.log(`ℹ️ Could not load YAML file ${s}:`, t instanceof Error ? t.message : t), [];
+    return console.log(`ℹ️ Could not load YAML file ${o}:`, t instanceof Error ? t.message : t), [];
   }
 }
-function ye(s) {
-  let e = s;
+function $e(o) {
+  let e = o;
   return e = e.replace(/\{CUBE\}/g, "${CUBE}"), e = e.replace(/\{([A-Za-z_][A-Za-z0-9_]*\.[A-Za-z_][A-Za-z0-9_]*)\}/g, "${$1}"), e = e.replace(/\{([A-Za-z_][A-Za-z0-9_]*)\}/g, "${$1}"), e = e.replace(/\$\$\{/g, "${"), e;
 }
-function $e(s) {
+function ye(o) {
   const e = {
-    name: s.name,
-    title: s.title,
-    description: s.description,
-    sql: typeof s.sql == "string" ? s.sql : void 0,
-    dimensions: Object.values(s.dimensions).map((t) => ({
+    name: o.name,
+    title: o.title,
+    description: o.description,
+    sql: typeof o.sql == "string" ? o.sql : void 0,
+    dimensions: Object.values(o.dimensions).map((t) => ({
       name: t.name,
       title: t.title,
       description: t.description,
@@ -1599,7 +1726,7 @@ function $e(s) {
       format: t.format,
       meta: t.meta
     })),
-    measures: Object.values(s.measures).map((t) => {
+    measures: Object.values(o.measures).map((t) => {
       var i;
       return {
         name: t.name,
@@ -1616,13 +1743,13 @@ function $e(s) {
         meta: t.meta
       };
     }),
-    joins: s.joins ? Object.values(s.joins).map((t) => ({
+    joins: o.joins ? Object.values(o.joins).map((t) => ({
       name: t.name || "",
       type: t.type,
       relationship: me(t.relationship),
       sql: typeof t.sql == "string" ? t.sql : ""
     })) : void 0,
-    meta: s.meta
+    meta: o.meta
   };
   return P(e, {
     indent: 2,
@@ -1630,11 +1757,11 @@ function $e(s) {
     minContentWidth: 40
   });
 }
-const xe = se;
-function Te(s) {
-  return new T({
-    drizzle: s.drizzle,
-    schema: s.schema
+const Te = se;
+function xe(o) {
+  return new F({
+    drizzle: o.drizzle,
+    schema: o.schema
   });
 }
 const Ae = {
@@ -1642,12 +1769,12 @@ const Ae = {
    * Create a simple query builder
    */
   query: () => {
-    const s = (e, t = [], i = [], n = [], o, a) => ({
+    const o = (e, t = [], i = [], n = [], r, a) => ({
       measures: e,
       dimensions: t,
       filters: i,
       timeDimensions: n,
-      limit: o,
+      limit: r,
       order: a
     });
     return {
@@ -1655,62 +1782,62 @@ const Ae = {
         dimensions: (t = []) => ({
           filters: (i = []) => ({
             timeDimensions: (n = []) => ({
-              limit: (o) => ({
-                order: (a) => s(e, t, i, n, o, a)
+              limit: (r) => ({
+                order: (a) => o(e, t, i, n, r, a)
               }),
-              order: (o) => s(e, t, i, n, void 0, o)
+              order: (r) => o(e, t, i, n, void 0, r)
             }),
             limit: (n) => ({
-              order: (o) => s(e, t, i, [], n, o)
+              order: (r) => o(e, t, i, [], n, r)
             }),
-            order: (n) => s(e, t, i, [], void 0, n)
+            order: (n) => o(e, t, i, [], void 0, n)
           }),
           timeDimensions: (i = []) => ({
             filters: (n = []) => ({
-              limit: (o) => ({
-                order: (a) => s(e, t, n, i, o, a)
+              limit: (r) => ({
+                order: (a) => o(e, t, n, i, r, a)
               }),
-              order: (o) => s(e, t, n, i, void 0, o)
+              order: (r) => o(e, t, n, i, void 0, r)
             }),
             limit: (n) => ({
-              order: (o) => s(e, t, [], i, n, o)
+              order: (r) => o(e, t, [], i, n, r)
             }),
-            order: (n) => s(e, t, [], i, void 0, n)
+            order: (n) => o(e, t, [], i, void 0, n)
           }),
           limit: (i) => ({
-            order: (n) => s(e, t, [], [], i, n)
+            order: (n) => o(e, t, [], [], i, n)
           }),
-          order: (i) => s(e, t, [], [], void 0, i)
+          order: (i) => o(e, t, [], [], void 0, i)
         }),
         filters: (t = []) => ({
           dimensions: (i = []) => ({
             timeDimensions: (n = []) => ({
-              limit: (o) => ({
-                order: (a) => s(e, i, t, n, o, a)
+              limit: (r) => ({
+                order: (a) => o(e, i, t, n, r, a)
               }),
-              order: (o) => s(e, i, t, n, void 0, o)
+              order: (r) => o(e, i, t, n, void 0, r)
             }),
             limit: (n) => ({
-              order: (o) => s(e, i, t, [], n, o)
+              order: (r) => o(e, i, t, [], n, r)
             }),
-            order: (n) => s(e, i, t, [], void 0, n)
+            order: (n) => o(e, i, t, [], void 0, n)
           }),
           timeDimensions: (i = []) => ({
             dimensions: (n = []) => ({
-              limit: (o) => ({
-                order: (a) => s(e, n, t, i, o, a)
+              limit: (r) => ({
+                order: (a) => o(e, n, t, i, r, a)
               }),
-              order: (o) => s(e, n, t, i, void 0, o)
+              order: (r) => o(e, n, t, i, void 0, r)
             }),
             limit: (n) => ({
-              order: (o) => s(e, [], t, i, n, o)
+              order: (r) => o(e, [], t, i, n, r)
             }),
-            order: (n) => s(e, [], t, i, void 0, n)
+            order: (n) => o(e, [], t, i, void 0, n)
           }),
           limit: (i) => ({
-            order: (n) => s(e, [], t, [], i, n)
+            order: (n) => o(e, [], t, [], i, n)
           }),
-          order: (i) => s(e, [], t, [], void 0, i)
+          order: (i) => o(e, [], t, [], void 0, i)
         })
       })
     };
@@ -1719,55 +1846,55 @@ const Ae = {
    * Create filters
    */
   filters: {
-    equals: (s, e) => ({ member: s, operator: "equals", values: [e] }),
-    notEquals: (s, e) => ({ member: s, operator: "notEquals", values: [e] }),
-    contains: (s, e) => ({ member: s, operator: "contains", values: [e] }),
-    greaterThan: (s, e) => ({ member: s, operator: "gt", values: [e] }),
-    lessThan: (s, e) => ({ member: s, operator: "lt", values: [e] }),
-    inDateRange: (s, e, t) => ({
-      member: s,
+    equals: (o, e) => ({ member: o, operator: "equals", values: [e] }),
+    notEquals: (o, e) => ({ member: o, operator: "notEquals", values: [e] }),
+    contains: (o, e) => ({ member: o, operator: "contains", values: [e] }),
+    greaterThan: (o, e) => ({ member: o, operator: "gt", values: [e] }),
+    lessThan: (o, e) => ({ member: o, operator: "lt", values: [e] }),
+    inDateRange: (o, e, t) => ({
+      member: o,
       operator: "inDateRange",
       values: [e, t]
     }),
-    set: (s) => ({ member: s, operator: "set", values: [] }),
-    notSet: (s) => ({ member: s, operator: "notSet", values: [] })
+    set: (o) => ({ member: o, operator: "set", values: [] }),
+    notSet: (o) => ({ member: o, operator: "notSet", values: [] })
   },
   /**
    * Create time dimensions
    */
   timeDimensions: {
-    create: (s, e, t) => ({
-      dimension: s,
+    create: (o, e, t) => ({
+      dimension: o,
       granularity: e,
       dateRange: t
     })
   }
 };
 export {
-  x as BaseDatabaseExecutor,
+  A as BaseDatabaseExecutor,
   ie as MultiCubeBuilder,
   ee as MySQLExecutor,
   X as PostgresExecutor,
-  $ as QueryExecutor,
+  x as QueryExecutor,
   q as SQLiteExecutor,
-  T as SemanticLayerCompiler,
+  F as SemanticLayerCompiler,
   Ae as SemanticLayerUtils,
-  ye as convertCubeReferences,
+  $e as convertCubeReferences,
   _ as createDatabaseExecutor,
-  Te as createDrizzleSemanticLayer,
+  xe as createDrizzleSemanticLayer,
   ne as createMultiCubeContext,
   te as createMySQLExecutor,
   S as createPostgresExecutor,
   M as createSQLiteExecutor,
-  Ee as createSemanticLayer,
-  xe as defaultSemanticLayer,
-  Ne as defineCube,
+  Ne as createSemanticLayer,
+  Te as defaultSemanticLayer,
+  De as defineCube,
   we as defineLegacyCube,
   pe as loadYamlCubes,
-  De as loadYamlCubesFromFile,
+  Ee as loadYamlCubesFromFile,
   re as parseYamlCubes,
   b as resolveSqlExpression,
-  $e as semanticCubeToYaml,
+  ye as semanticCubeToYaml,
   se as semanticLayer,
   ae as yamlCubeToSemanticCube
 };