drizzle-cube 0.1.4 → 0.1.6

package/dist/server/index.js

@@ -1,9 +1,9 @@
-var U = Object.defineProperty;
-var k = (s, e, t) => e in s ? U(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
-var E = (s, e, t) => k(s, typeof e != "symbol" ? e + "" : e, t);
-import { sql as f, and as p, eq as _, count as $, 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 C, isNull as W, isNotNull as K, notInArray as H, ne as V, inArray as Z } from "drizzle-orm";
+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";
 import { parse as G, stringify as P } from "yaml";
-function Ce(s, e) {
+function we(s, e) {
   return {
     ...e,
     name: e.name
@@ -19,16 +19,16 @@ class X extends x {
     if (e && typeof e == "object") {
       if (typeof e.execute == "function") {
         const n = await e.execute();
-        return Array.isArray(n) ? n.map((r) => this.convertNumericFields(r, t)) : n;
+        return Array.isArray(n) ? n.map((o) => this.convertNumericFields(o, t)) : n;
       }
       if (this.db && typeof this.db.execute == "function")
         try {
           const n = await this.db.execute(e);
-          return Array.isArray(n) ? n.map((r) => this.convertNumericFields(r, t)) : n;
+          return Array.isArray(n) ? n.map((o) => this.convertNumericFields(o, t)) : n;
         } catch (n) {
           if (typeof e.getSQL == "function") {
-            const r = e.getSQL(), a = await this.db.execute(r);
-            return Array.isArray(a) ? a.map((o) => this.convertNumericFields(o, t)) : a;
+            const o = e.getSQL(), a = await this.db.execute(o);
+            return Array.isArray(a) ? a.map((r) => this.convertNumericFields(r, 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, r] of Object.entries(e))
-      t && t.includes(n) ? i[n] = this.coerceToNumber(r) : i[n] = r;
+    for (const [n, o] of Object.entries(e))
+      t && t.includes(n) ? i[n] = this.coerceToNumber(o) : i[n] = o;
     return i;
   }
   /**
@@ -104,8 +104,8 @@ class q extends x {
   convertNumericFields(e, t) {
     if (!e || typeof e != "object") return e;
     const i = {};
-    for (const [n, r] of Object.entries(e))
-      t && t.includes(n) ? i[n] = this.coerceToNumber(r) : i[n] = r;
+    for (const [n, o] of Object.entries(e))
+      t && t.includes(n) ? i[n] = this.coerceToNumber(o) : i[n] = o;
     return i;
   }
   /**
@@ -129,7 +129,7 @@ class ee extends x {
   async execute(e, t) {
     if (e && typeof e == "object" && typeof e.execute == "function") {
       const n = await e.execute();
-      return Array.isArray(n) ? n.map((r) => this.convertNumericFields(r, t)) : n;
+      return Array.isArray(n) ? n.map((o) => this.convertNumericFields(o, 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, r] of Object.entries(e))
-      t && t.includes(n) ? i[n] = this.coerceToNumber(r) : i[n] = r;
+    for (const [n, o] of Object.entries(e))
+      t && t.includes(n) ? i[n] = this.coerceToNumber(o) : i[n] = o;
     return i;
   }
   /**
@@ -172,7 +172,7 @@ function M(s, e) {
 function te(s, e) {
   return new ee(s, e);
 }
-function j(s, e, t) {
+function _(s, e, t) {
   if (t)
     switch (t) {
       case "postgres":
@@ -231,15 +231,15 @@ class ie {
    * Build a multi-cube query plan
    */
   buildMultiCubeQueryPlan(e, t, i) {
-    const n = this.analyzeCubeUsage(t), r = Array.from(n);
-    if (r.length === 1)
+    const n = this.analyzeCubeUsage(t), o = Array.from(n);
+    if (o.length === 1)
       throw new Error("Single cube query should use QueryExecutor directly");
-    const a = this.choosePrimaryCube(r, t), o = e.get(a);
-    if (!o)
+    const a = this.choosePrimaryCube(o, t), r = e.get(a);
+    if (!r)
       throw new Error(`Primary cube '${a}' not found`);
-    const c = this.buildJoinPlan(e, o, r, 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, r, o, i.securityContext), l = this.buildMultiCubeSelections(e, t, i.securityContext), u = this.buildMultiCubeWhereConditions(e, t, i), m = this.buildMultiCubeGroupByFields(e, t, i.securityContext);
     return {
-      primaryCube: o,
+      primaryCube: r,
       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 o;
-    const r = [], a = i.filter((c) => c !== t.name);
+    var r;
+    const o = [], 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 = (o = t.joins) == null ? void 0 : o[c];
+      const u = (r = t.joins) == null ? void 0 : r[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);
-      r.push({
+      o.push({
         cube: l,
         alias: `${c.toLowerCase()}_cube`,
         joinType: u.type || "left",
         joinCondition: d
       });
     }
-    return r;
+    return o;
   }
   /**
    * Build selections across multiple cubes
    */
   buildMultiCubeSelections(e, t, i) {
-    const n = {}, r = {
+    const n = {}, o = {
       db: {},
       // Filled during execution
       schema: {},
@@ -306,28 +306,28 @@ class ie {
     };
     if (t.dimensions)
       for (const a of t.dimensions) {
-        const [o, c] = a.split("."), l = e.get(o);
+        const [r, c] = a.split("."), l = e.get(r);
         if (l && l.dimensions[c]) {
-          const u = l.dimensions[c], m = b(u.sql, r);
+          const u = l.dimensions[c], m = b(u.sql, o);
           n[a] = f`${m}`.as(a);
         }
       }
     if (t.measures)
       for (const a of t.measures) {
-        const [o, c] = a.split("."), l = e.get(o);
+        const [r, c] = a.split("."), l = e.get(r);
         if (l && l.measures[c]) {
-          const u = l.measures[c], m = this.buildMeasureExpression(u, r);
+          const u = l.measures[c], m = this.buildMeasureExpression(u, o);
           n[a] = f`${m}`.as(a);
         }
       }
     if (t.timeDimensions)
       for (const a of t.timeDimensions) {
-        const [o, c] = a.dimension.split("."), l = e.get(o);
+        const [r, c] = a.dimension.split("."), l = e.get(r);
         if (l && l.dimensions[c]) {
           const u = l.dimensions[c], m = this.buildTimeDimensionExpression(
             u.sql,
             a.granularity,
-            r
+            o
           );
           n[a.dimension] = f`${m}`.as(a.dimension);
         }
@@ -340,7 +340,7 @@ class ie {
   buildMeasureExpression(e, t) {
     let i = b(e.sql, t);
     if (e.filters && e.filters.length > 0) {
-      const n = e.filters.map((r) => r(t));
+      const n = e.filters.map((o) => o(t));
       i = f`CASE WHEN ${p(...n)} THEN ${i} END`;
     }
     switch (e.type) {
@@ -396,11 +396,11 @@ class ie {
   buildMultiCubeWhereConditions(e, t, i) {
     const n = [];
     if (t.filters) {
-      for (const r of t.filters)
-        if ("member" in r) {
-          const [a] = r.member.split("."), o = e.get(a);
-          if (o) {
-            const c = this.buildFilterCondition(r, o, i);
+      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);
           }
         }
@@ -412,12 +412,12 @@ class ie {
    */
   buildFilterCondition(e, t, i) {
     if (e.operator === "equals" && e.values && e.values.length > 0) {
-      const [n, r] = e.member.split(".");
+      const [n, o] = e.member.split(".");
       if (n === t.name) {
-        const a = t.dimensions[r] || t.measures[r];
+        const a = t.dimensions[o] || t.measures[o];
         if (a) {
-          const o = typeof a.sql == "function" ? a.sql(i) : a.sql;
-          return _(o, e.values[0]);
+          const r = typeof a.sql == "function" ? a.sql(i) : a.sql;
+          return v(r, e.values[0]);
         }
       }
     }
@@ -436,20 +436,20 @@ class ie {
       securityContext: i
     };
     if (t.dimensions)
-      for (const o of t.dimensions) {
-        const [c, l] = o.split("."), u = e.get(c);
+      for (const r of t.dimensions) {
+        const [c, l] = r.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 o of t.timeDimensions) {
-        const [c, l] = o.dimension.split("."), u = e.get(c);
+      for (const r of t.timeDimensions) {
+        const [c, l] = r.dimension.split("."), u = e.get(c);
         if (u && u.dimensions[l]) {
           const m = u.dimensions[l], d = this.buildTimeDimensionExpression(
             m.sql,
-            o.granularity,
+            r.granularity,
             a
           );
           n.push(d);
@@ -458,9 +458,9 @@ class ie {
     return n;
   }
 }
-class y {
+class $ {
   constructor(e) {
-    E(this, "multiCubeBuilder");
+    C(this, "multiCubeBuilder");
     this.dbExecutor = e, this.multiCubeBuilder = new ie();
   }
   /**
@@ -468,17 +468,17 @@ class y {
    */
   async execute(e, t, i) {
     try {
-      const n = v(e, t);
+      const n = j(e, t);
       if (!n.isValid)
         throw new Error(`Query validation failed: ${n.errors.join(", ")}`);
-      const r = this.multiCubeBuilder.analyzeCubeUsage(t);
-      if (r.size === 0)
+      const o = this.multiCubeBuilder.analyzeCubeUsage(t);
+      if (o.size === 0)
         throw new Error("No cubes found for query");
-      if (r.size === 1) {
-        const a = Array.from(r)[0], o = e.get(a);
-        if (!o)
+      if (o.size === 1) {
+        const a = Array.from(o)[0], r = e.get(a);
+        if (!r)
           throw new Error(`Cube '${a}' not found`);
-        return this.executeSingleCube(o, t, i);
+        return this.executeSingleCube(r, t, i);
       } else
         return this.executeMultiCube(e, t, i);
     } catch (n) {
@@ -507,57 +507,57 @@ class y {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: i
-      }, r = e.sql(n), a = this.buildSelections(e, t, n);
-      let o = n.db.select(a).from(r.from);
-      if (r.joins)
-        for (const h of r.joins)
+      }, 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") {
             case "left":
-              o = o.leftJoin(h.table, h.on);
+              r = r.leftJoin(h.table, h.on);
               break;
             case "inner":
-              o = o.innerJoin(h.table, h.on);
+              r = r.innerJoin(h.table, h.on);
               break;
             case "right":
-              o = o.rightJoin(h.table, h.on);
+              r = r.rightJoin(h.table, h.on);
               break;
             case "full":
-              o = o.fullJoin(h.table, h.on);
+              r = r.fullJoin(h.table, h.on);
               break;
           }
-      r.where && (o = o.where(r.where));
+      o.where && (r = r.where(o.where));
       const c = this.buildWhereConditions(e, t, n);
       if (c.length > 0) {
         const h = c.length === 1 ? c[0] : p(...c);
-        o = o.where(h);
+        r = r.where(h);
       }
       const l = this.buildGroupByFields(e, t, n);
-      l.length > 0 && (o = o.groupBy(...l));
+      l.length > 0 && (r = r.groupBy(...l));
       const u = this.buildOrderBy(t);
-      if (u.length > 0 && (o = o.orderBy(...u)), t.limit !== void 0) {
+      if (u.length > 0 && (r = r.orderBy(...u)), t.limit !== void 0) {
         if (t.limit < 0)
           throw new Error("Limit must be non-negative");
-        o = o.limit(t.limit);
+        r = r.limit(t.limit);
       }
       if (t.offset !== void 0) {
         if (t.offset < 0)
           throw new Error("Offset must be non-negative");
-        o = o.offset(t.offset);
+        r = r.offset(t.offset);
       }
-      const m = t.measures || [], d = await this.dbExecutor.execute(o, m), Q = Array.isArray(d) ? d.map((h) => {
-        const N = { ...h };
+      const m = t.measures || [], d = await this.dbExecutor.execute(r, m), Q = Array.isArray(d) ? d.map((h) => {
+        const E = { ...h };
         if (t.timeDimensions) {
           for (const D of t.timeDimensions)
-            if (D.dimension in N) {
-              let g = N[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")), N[D.dimension] = g;
+            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;
             }
         }
-        return N;
-      }) : [d], z = this.generateAnnotations(e, t);
+        return E;
+      }) : [d], k = this.generateAnnotations(e, t);
       return {
         data: Q,
-        annotation: z
+        annotation: k
       };
     } catch (n) {
       throw new Error(`Cube query execution failed: ${n instanceof Error ? n.message : "Unknown error"}`);
@@ -567,11 +567,11 @@ class y {
    * Execute multi-cube query using JOIN resolution
    */
   async executeMultiCube(e, t, i) {
-    const n = this.buildMultiCubeQuery(e, t, i), r = t.measures || [], a = await this.dbExecutor.execute(n, r), o = {
+    const n = this.buildMultiCubeQuery(e, t, i), o = t.measures || [], a = await this.dbExecutor.execute(n, o), r = {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: i
-    }, c = this.multiCubeBuilder.buildMultiCubeQueryPlan(e, t, o), l = this.generateMultiCubeAnnotations(c, t);
+    }, c = this.multiCubeBuilder.buildMultiCubeQueryPlan(e, t, r), l = this.generateMultiCubeAnnotations(c, t);
     return {
       data: Array.isArray(a) ? a : [a],
       annotation: l
@@ -587,10 +587,10 @@ class y {
    * Generate raw SQL for multi-cube queries without execution
    */
   async generateMultiCubeSQL(e, t, i) {
-    const r = this.buildMultiCubeQuery(e, t, i).toSQL();
+    const o = this.buildMultiCubeQuery(e, t, i).toSQL();
     return {
-      sql: r.sql,
-      params: r.params
+      sql: o.sql,
+      params: o.params
     };
   }
   /**
@@ -601,42 +601,42 @@ class y {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: i
-    }, r = this.multiCubeBuilder.buildMultiCubeQueryPlan(e, t, n), a = r.primaryCube.sql(n);
-    let o = n.db.select(r.selections).from(a.from);
+    }, o = this.multiCubeBuilder.buildMultiCubeQueryPlan(e, t, n), a = o.primaryCube.sql(n);
+    let r = n.db.select(o.selections).from(a.from);
     if (a.joins)
       for (const u of a.joins)
         switch (u.type || "left") {
           case "left":
-            o = o.leftJoin(u.table, u.on);
+            r = r.leftJoin(u.table, u.on);
             break;
           case "inner":
-            o = o.innerJoin(u.table, u.on);
+            r = r.innerJoin(u.table, u.on);
             break;
           case "right":
-            o = o.rightJoin(u.table, u.on);
+            r = r.rightJoin(u.table, u.on);
             break;
           case "full":
-            o = o.fullJoin(u.table, u.on);
+            r = r.fullJoin(u.table, u.on);
             break;
           default:
-            o = o.leftJoin(u.table, u.on);
+            r = r.leftJoin(u.table, u.on);
         }
-    if (r.joinCubes && r.joinCubes.length > 0)
-      for (const u of r.joinCubes) {
+    if (o.joinCubes && o.joinCubes.length > 0)
+      for (const u of o.joinCubes) {
         const m = u.cube.sql(n);
         try {
           switch (u.joinType || "left") {
             case "left":
-              o = o.leftJoin(m.from, u.joinCondition);
+              r = r.leftJoin(m.from, u.joinCondition);
               break;
             case "inner":
-              o = o.innerJoin(m.from, u.joinCondition);
+              r = r.innerJoin(m.from, u.joinCondition);
               break;
             case "right":
-              o = o.rightJoin(m.from, u.joinCondition);
+              r = r.rightJoin(m.from, u.joinCondition);
               break;
             case "full":
-              o = o.fullJoin(m.from, u.joinCondition);
+              r = r.fullJoin(m.from, u.joinCondition);
               break;
           }
         } catch (d) {
@@ -644,23 +644,23 @@ class y {
         }
       }
     const c = [];
-    if (a.where && c.push(a.where), r.whereConditions.length > 0 && c.push(...r.whereConditions), c.length > 0) {
+    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);
-      o = o.where(u);
+      r = r.where(u);
     }
-    r.groupByFields.length > 0 && (o = o.groupBy(...r.groupByFields));
+    o.groupByFields.length > 0 && (r = r.groupBy(...o.groupByFields));
     const l = this.buildOrderBy(t);
-    if (l.length > 0 && (o = o.orderBy(...l)), t.limit !== void 0) {
+    if (l.length > 0 && (r = r.orderBy(...l)), t.limit !== void 0) {
       if (t.limit < 0)
         throw new Error("Limit must be non-negative");
-      o = o.limit(t.limit);
+      r = r.limit(t.limit);
     }
     if (t.offset !== void 0) {
       if (t.offset < 0)
         throw new Error("Offset must be non-negative");
-      o = o.offset(t.offset);
+      r = r.offset(t.offset);
     }
-    return o;
+    return r;
   }
   /**
    * Generate SQL for Cube
@@ -670,44 +670,44 @@ class y {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: i
-    }, r = e.sql(n), a = this.buildSelections(e, t, n);
-    let o = n.db.select(a).from(r.from);
-    if (r.joins)
-      for (const d of r.joins)
+    }, 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)
         switch (d.type || "left") {
           case "left":
-            o = o.leftJoin(d.table, d.on);
+            r = r.leftJoin(d.table, d.on);
             break;
           case "inner":
-            o = o.innerJoin(d.table, d.on);
+            r = r.innerJoin(d.table, d.on);
             break;
           case "right":
-            o = o.rightJoin(d.table, d.on);
+            r = r.rightJoin(d.table, d.on);
             break;
           case "full":
-            o = o.fullJoin(d.table, d.on);
+            r = r.fullJoin(d.table, d.on);
             break;
         }
-    r.where && (o = o.where(r.where));
+    o.where && (r = r.where(o.where));
     const c = this.buildWhereConditions(e, t, n);
     if (c.length > 0) {
       const d = c.length === 1 ? c[0] : p(...c);
-      o = o.where(d);
+      r = r.where(d);
     }
     const l = this.buildGroupByFields(e, t, n);
-    l.length > 0 && (o = o.groupBy(...l));
+    l.length > 0 && (r = r.groupBy(...l));
     const u = this.buildOrderBy(t);
-    if (u.length > 0 && (o = o.orderBy(...u)), t.limit !== void 0) {
+    if (u.length > 0 && (r = r.orderBy(...u)), t.limit !== void 0) {
       if (t.limit < 0)
         throw new Error("Limit must be non-negative");
-      o = o.limit(t.limit);
+      r = r.limit(t.limit);
     }
     if (t.offset !== void 0) {
       if (t.offset < 0)
         throw new Error("Offset must be non-negative");
-      o = o.offset(t.offset);
+      r = r.offset(t.offset);
     }
-    const m = o.toSQL();
+    const m = r.toSQL();
     return {
       sql: m.sql,
       params: m.params
@@ -719,34 +719,34 @@ class y {
   buildSelections(e, t, i) {
     const n = {};
     if (t.dimensions)
-      for (const r of t.dimensions) {
-        const [a, o] = r.split(".");
-        if (a === e.name && e.dimensions[o]) {
-          const c = e.dimensions[o], l = b(c.sql, i);
-          n[r] = f`${l}`.as(r);
+      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);
         }
       }
     if (t.measures)
-      for (const r of t.measures) {
-        const [a, o] = r.split(".");
-        if (a === e.name && e.measures[o]) {
-          const c = e.measures[o], l = this.buildMeasureExpression(c, i);
-          n[r] = f`${l}`.as(r);
+      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);
         }
       }
     if (t.timeDimensions)
-      for (const r of t.timeDimensions) {
-        const [a, o] = r.dimension.split(".");
-        if (a === e.name && e.dimensions[o]) {
-          const c = e.dimensions[o], l = this.buildTimeDimensionExpression(
+      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(
             c.sql,
-            r.granularity,
+            o.granularity,
             i
           );
-          n[r.dimension] = f`${l}`.as(r.dimension);
+          n[o.dimension] = f`${l}`.as(o.dimension);
         }
       }
-    return Object.keys(n).length === 0 && (n.count = $()), n;
+    return Object.keys(n).length === 0 && (n.count = y()), n;
   }
   /**
    * Build measure expression with aggregation and filters for Cube
@@ -754,12 +754,12 @@ class y {
   buildMeasureExpression(e, t) {
     let i = b(e.sql, t);
     if (e.filters && e.filters.length > 0) {
-      const n = e.filters.map((r) => r(t));
+      const n = e.filters.map((o) => o(t));
       i = f`CASE WHEN ${p(...n)} THEN ${i} END`;
     }
     switch (e.type) {
       case "count":
-        return $(i);
+        return y(i);
       case "countDistinct":
         return Y(i);
       case "sum":
@@ -773,7 +773,7 @@ class y {
       case "number":
         return i;
       default:
-        return $(i);
+        return y(i);
     }
   }
   /**
@@ -810,15 +810,15 @@ class y {
   buildWhereConditions(e, t, i) {
     const n = [];
     if (t.filters && t.filters.length > 0)
-      for (const r of t.filters) {
-        const a = this.processFilter(r, e, i);
+      for (const o of t.filters) {
+        const a = this.processFilter(o, e, i);
         a && n.push(a);
       }
     if (t.timeDimensions)
-      for (const r of t.timeDimensions) {
-        const [a, o] = r.dimension.split(".");
-        if (a === e.name && e.dimensions[o] && r.dateRange) {
-          const c = e.dimensions[o], l = b(c.sql, i), u = this.buildDateRangeCondition(l, r.dateRange);
+      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);
           u && n.push(u);
         }
       }
@@ -839,11 +839,11 @@ class y {
         return u.length > 0 ? J(...u) : null;
       }
     }
-    const n = e, [r, a] = n.member.split(".");
-    if (r !== t.name) return null;
-    const o = t.dimensions[a] || t.measures[a];
-    if (!o) return null;
-    const c = b(o.sql, i);
+    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);
     return this.buildFilterCondition(c, n.operator, n.values);
   }
   /**
@@ -855,48 +855,48 @@ class y {
     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 r = n[0];
+    const o = n[0];
     switch (t) {
       case "equals":
-        return n.length > 1 ? Z(e, n) : n.length === 1 ? _(e, r) : f`FALSE`;
+        return n.length > 1 ? Z(e, n) : n.length === 1 ? v(e, o) : f`FALSE`;
       case "notEquals":
-        return n.length > 1 ? H(e, n) : n.length === 1 ? V(e, r) : null;
+        return n.length > 1 ? H(e, n) : n.length === 1 ? V(e, o) : null;
       case "contains":
-        return f`${e} ILIKE ${"%" + r + "%"}`;
+        return f`${e} ILIKE ${"%" + o + "%"}`;
       case "notContains":
-        return f`${e} NOT ILIKE ${"%" + r + "%"}`;
+        return f`${e} NOT ILIKE ${"%" + o + "%"}`;
       case "startsWith":
-        return f`${e} ILIKE ${r + "%"}`;
+        return f`${e} ILIKE ${o + "%"}`;
       case "endsWith":
-        return f`${e} ILIKE ${"%" + r}`;
+        return f`${e} ILIKE ${"%" + o}`;
       case "gt":
-        return A(e, r);
+        return A(e, o);
       case "gte":
-        return w(e, r);
+        return w(e, o);
       case "lt":
-        return F(e, r);
+        return F(e, o);
       case "lte":
-        return C(e, r);
+        return N(e, o);
       case "set":
         return K(e);
       case "notSet":
         return W(e);
       case "inDateRange":
         if (n.length >= 2) {
-          const a = this.normalizeDate(n[0]), o = this.normalizeDate(n[1]);
-          if (a && o)
+          const a = this.normalizeDate(n[0]), r = this.normalizeDate(n[1]);
+          if (a && r)
             return p(
               w(e, a),
-              C(e, o)
+              N(e, r)
             );
         }
         return null;
       case "beforeDate": {
-        const a = this.normalizeDate(r);
+        const a = this.normalizeDate(o);
         return a ? F(e, a) : null;
       }
       case "afterDate": {
-        const a = this.normalizeDate(r);
+        const a = this.normalizeDate(o);
         return a ? A(e, a) : null;
       }
       default:
@@ -912,7 +912,7 @@ class y {
       const i = this.normalizeDate(t[0]), n = this.normalizeDate(t[1]);
       return !i || !n ? null : p(
         w(e, i),
-        C(e, n)
+        N(e, n)
       );
     }
     if (typeof t == "string") {
@@ -920,16 +920,16 @@ class y {
       if (i)
         return p(
           w(e, i.start),
-          C(e, i.end)
+          N(e, i.end)
         );
       const n = this.normalizeDate(t);
       if (!n) return null;
-      const r = new Date(n);
-      r.setUTCHours(0, 0, 0, 0);
+      const o = new Date(n);
+      o.setUTCHours(0, 0, 0, 0);
       const a = new Date(n);
       return a.setUTCHours(23, 59, 59, 999), p(
-        w(e, r),
-        C(e, a)
+        w(e, o),
+        N(e, a)
       );
     }
     return null;
@@ -940,27 +940,27 @@ class y {
   parseRelativeDateRange(e) {
     const t = /* @__PURE__ */ new Date(), i = e.toLowerCase().trim(), n = i.match(/^last\s+(\d+)\s+days?$/);
     if (n) {
-      const o = parseInt(n[1], 10), c = new Date(t);
-      c.setDate(t.getDate() - o), c.setHours(0, 0, 0, 0);
+      const r = parseInt(n[1], 10), c = new Date(t);
+      c.setDate(t.getDate() - r), 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 o = 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: o, end: c };
+      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 r = i.match(/^last\s+(\d+)\s+months?$/);
-    if (r) {
-      const o = parseInt(r[1], 10), c = new Date(t.getFullYear(), t.getMonth() - o, 1, 0, 0, 0, 0), l = new Date(t);
+    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);
       return l.setHours(23, 59, 59, 999), { start: c, end: l };
     }
     if (i === "this year") {
-      const o = new Date(t.getFullYear(), 0, 1, 0, 0, 0, 0), c = new Date(t.getFullYear(), 11, 31, 23, 59, 59, 999);
-      return { start: o, end: c };
+      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 a = i.match(/^last\s+(\d+)\s+years?$/);
     if (a) {
-      const o = parseInt(a[1], 10), c = new Date(t.getFullYear() - o, 0, 1, 0, 0, 0, 0), l = new Date(t);
+      const r = parseInt(a[1], 10), c = new Date(t.getFullYear() - r, 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 +986,20 @@ class y {
   buildGroupByFields(e, t, i) {
     const n = [];
     if (t.dimensions)
-      for (const r of t.dimensions) {
-        const [a, o] = r.split(".");
-        if (a === e.name && e.dimensions[o]) {
-          const c = e.dimensions[o], l = b(c.sql, i);
+      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.push(l);
         }
       }
     if (t.timeDimensions)
-      for (const r of t.timeDimensions) {
-        const [a, o] = r.dimension.split(".");
-        if (a === e.name && e.dimensions[o]) {
-          const c = e.dimensions[o], l = this.buildTimeDimensionExpression(
+      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(
             c.sql,
-            r.granularity,
+            o.granularity,
             i
           );
           n.push(l);
@@ -1011,24 +1011,24 @@ class y {
    * Build ORDER BY clause with automatic time dimension sorting
    */
   buildOrderBy(e, t) {
-    var r;
+    var o;
     const i = [], n = t || [
       ...e.measures || [],
       ...e.dimensions || [],
-      ...((r = e.timeDimensions) == null ? void 0 : r.map((a) => a.dimension)) || []
+      ...((o = e.timeDimensions) == null ? void 0 : o.map((a) => a.dimension)) || []
     ];
     if (e.order && Object.keys(e.order).length > 0)
-      for (const [a, o] of Object.entries(e.order)) {
+      for (const [a, r] 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 = o === "desc" ? f`DESC` : f`ASC`;
+        const c = r === "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 || {})), o = [...e.timeDimensions].sort(
+      const a = new Set(Object.keys(e.order || {})), r = [...e.timeDimensions].sort(
         (c, l) => c.dimension.localeCompare(l.dimension)
       );
-      for (const c of o)
+      for (const c of r)
         a.has(c.dimension) || i.push(f`${f.identifier(c.dimension)} ASC`);
     }
     return i;
@@ -1037,11 +1037,11 @@ class y {
    * Generate annotations for UI metadata
    */
   generateAnnotations(e, t) {
-    const i = {}, n = {}, r = {};
+    const i = {}, n = {}, o = {};
     if (t.measures)
       for (const a of t.measures) {
-        const [o, c] = a.split(".");
-        if (o === e.name && e.measures[c]) {
+        const [r, c] = a.split(".");
+        if (r === e.name && e.measures[c]) {
           const l = e.measures[c];
           i[a] = {
             title: l.title || c,
@@ -1052,8 +1052,8 @@ class y {
       }
     if (t.dimensions)
       for (const a of t.dimensions) {
-        const [o, c] = a.split(".");
-        if (o === e.name && e.dimensions[c]) {
+        const [r, c] = a.split(".");
+        if (r === e.name && e.dimensions[c]) {
           const l = e.dimensions[c];
           n[a] = {
             title: l.title || c,
@@ -1064,10 +1064,10 @@ class y {
       }
     if (t.timeDimensions)
       for (const a of t.timeDimensions) {
-        const [o, c] = a.dimension.split(".");
-        if (o === e.name && e.dimensions[c]) {
+        const [r, c] = a.dimension.split(".");
+        if (r === e.name && e.dimensions[c]) {
           const l = e.dimensions[c];
-          r[a.dimension] = {
+          o[a.dimension] = {
             title: l.title || c,
             shortTitle: l.title || c,
             type: l.type,
@@ -1079,20 +1079,20 @@ class y {
       measures: i,
       dimensions: n,
       segments: {},
-      timeDimensions: r
+      timeDimensions: o
     };
   }
   /**
    * Generate annotations for multi-cube queries
    */
   generateMultiCubeAnnotations(e, t) {
-    const i = {}, n = {}, r = {}, a = [e.primaryCube];
-    if (e.joinCubes && a.push(...e.joinCubes.map((o) => o.cube)), t.measures)
-      for (const o of t.measures) {
-        const [c, l] = o.split("."), u = a.find((m) => m.name === c);
+    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);
         if (u && u.measures[l]) {
           const m = u.measures[l];
-          i[o] = {
+          i[r] = {
             title: m.title || l,
             shortTitle: m.title || l,
             type: m.type
@@ -1100,11 +1100,11 @@ class y {
         }
       }
     if (t.dimensions)
-      for (const o of t.dimensions) {
-        const [c, l] = o.split("."), u = a.find((m) => m.name === c);
+      for (const r of t.dimensions) {
+        const [c, l] = r.split("."), u = a.find((m) => m.name === c);
         if (u && u.dimensions[l]) {
           const m = u.dimensions[l];
-          n[o] = {
+          n[r] = {
             title: m.title || l,
             shortTitle: m.title || l,
             type: m.type
@@ -1112,15 +1112,15 @@ class y {
         }
       }
     if (t.timeDimensions)
-      for (const o of t.timeDimensions) {
-        const [c, l] = o.dimension.split("."), u = a.find((m) => m.name === c);
+      for (const r of t.timeDimensions) {
+        const [c, l] = r.dimension.split("."), u = a.find((m) => m.name === c);
         if (u && u.dimensions && u.dimensions[l]) {
           const m = u.dimensions[l];
-          r[o.dimension] = {
+          o[r.dimension] = {
             title: m.title || l,
             shortTitle: m.title || l,
             type: m.type,
-            granularity: o.granularity
+            granularity: r.granularity
           };
         }
       }
@@ -1128,15 +1128,19 @@ class y {
       measures: i,
       dimensions: n,
       segments: {},
-      timeDimensions: r
+      timeDimensions: o
     };
   }
 }
 class T {
+  // 5 minutes in milliseconds
   constructor(e) {
-    E(this, "cubes", /* @__PURE__ */ new Map());
-    E(this, "dbExecutor");
-    e != null && e.databaseExecutor ? this.dbExecutor = e.databaseExecutor : e != null && e.drizzle && (this.dbExecutor = j(
+    C(this, "cubes", /* @__PURE__ */ new Map());
+    C(this, "dbExecutor");
+    C(this, "metadataCache");
+    C(this, "metadataCacheTimestamp");
+    C(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,
       e.engineType
@@ -1152,7 +1156,7 @@ class T {
    * Set Drizzle instance and schema directly
    */
   setDrizzle(e, t, i) {
-    this.dbExecutor = j(e, t, i);
+    this.dbExecutor = _(e, t, i);
   }
   /**
    * Check if database executor is configured
@@ -1164,7 +1168,7 @@ class T {
    * Register a simplified cube with dynamic query building
    */
   registerCube(e) {
-    this.cubes.set(e.name, e);
+    this.cubes.set(e.name, e), this.invalidateMetadataCache();
   }
   /**
    * Get a cube by name
@@ -1190,7 +1194,7 @@ class T {
   async execute(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new y(this.dbExecutor).execute(this.cubes, e, t);
+    return new $(this.dbExecutor).execute(this.cubes, e, t);
   }
   /**
    * Execute a multi-cube query
@@ -1208,37 +1212,51 @@ class T {
   }
   /**
    * Get metadata for all cubes (for API responses)
+   * Uses caching to improve performance for repeated requests
    */
   getMetadata() {
-    return Array.from(this.cubes.values()).map((e) => this.generateCubeMetadata(e));
+    const e = Date.now();
+    if (this.metadataCache && this.metadataCacheTimestamp && e - this.metadataCacheTimestamp < this.METADATA_CACHE_TTL)
+      return this.metadataCache;
+    const t = Array.from(this.cubes.values()).map((i) => this.generateCubeMetadata(i));
+    return this.metadataCache = t, this.metadataCacheTimestamp = e, t;
   }
   /**
    * Generate cube metadata for API responses from cubes
+   * Optimized version that minimizes object iterations
    */
   generateCubeMetadata(e) {
-    const t = Object.entries(e.measures).map(([n, r]) => ({
-      name: `${e.name}.${n}`,
-      title: r.title || n,
-      shortTitle: r.title || n,
-      type: r.type,
-      format: void 0,
-      // Measure doesn't have format field
-      description: r.description
-    })), i = Object.entries(e.dimensions).map(([n, r]) => ({
-      name: `${e.name}.${n}`,
-      title: r.title || n,
-      shortTitle: r.title || n,
-      type: r.type,
-      format: void 0,
-      // Dimension doesn't have format field
-      description: r.description
-    }));
+    const t = Object.keys(e.measures), i = Object.keys(e.dimensions), n = new Array(t.length), o = new Array(i.length);
+    for (let a = 0; a < t.length; a++) {
+      const r = t[a], c = e.measures[r];
+      n[a] = {
+        name: `${e.name}.${r}`,
+        title: c.title || r,
+        shortTitle: c.title || r,
+        type: c.type,
+        format: void 0,
+        // Measure doesn't have format field
+        description: c.description
+      };
+    }
+    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,
+        type: c.type,
+        format: void 0,
+        // Dimension doesn't have format field
+        description: c.description
+      };
+    }
     return {
       name: e.name,
       title: e.title || e.name,
       description: e.description,
-      measures: t,
-      dimensions: i,
+      measures: n,
+      dimensions: o,
       segments: []
       // Add segments support later if needed
     };
@@ -1252,7 +1270,7 @@ class T {
       throw new Error(`Cube '${e}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new y(this.dbExecutor).generateSQL(n, t, i);
+    return new $(this.dbExecutor).generateSQL(n, t, i);
   }
   /**
    * Get SQL for a multi-cube query without executing it (debugging)
@@ -1260,7 +1278,7 @@ class T {
   async generateMultiCubeSQL(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new y(this.dbExecutor).generateMultiCubeSQL(this.cubes, e, t);
+    return new $(this.dbExecutor).generateMultiCubeSQL(this.cubes, e, t);
   }
   /**
    * Check if a cube exists
@@ -1272,13 +1290,21 @@ class T {
    * Remove a cube
    */
   removeCube(e) {
-    return this.cubes.delete(e);
+    const t = this.cubes.delete(e);
+    return t && this.invalidateMetadataCache(), t;
   }
   /**
    * Clear all cubes
    */
   clearCubes() {
-    this.cubes.clear();
+    this.cubes.clear(), this.invalidateMetadataCache();
+  }
+  /**
+   * Invalidate the metadata cache
+   * Called whenever cubes are modified
+   */
+  invalidateMetadataCache() {
+    this.metadataCache = void 0, this.metadataCacheTimestamp = void 0;
   }
   /**
    * Get cube names
@@ -1291,55 +1317,55 @@ class T {
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(e) {
-    return v(this.cubes, e);
+    return j(this.cubes, e);
   }
 }
-function v(s, e) {
+function j(s, e) {
   const t = [], i = /* @__PURE__ */ new Set();
   if (e.measures)
     for (const n of e.measures) {
-      const [r, a] = n.split(".");
-      if (!r || !a) {
+      const [o, a] = n.split(".");
+      if (!o || !a) {
         t.push(`Invalid measure format: ${n}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
-      i.add(r);
-      const o = s.get(r);
-      if (!o) {
-        t.push(`Cube '${r}' not found (referenced in measure '${n}')`);
+      i.add(o);
+      const r = s.get(o);
+      if (!r) {
+        t.push(`Cube '${o}' not found (referenced in measure '${n}')`);
         continue;
       }
-      o.measures[a] || t.push(`Measure '${a}' not found on cube '${r}'`);
+      r.measures[a] || t.push(`Measure '${a}' not found on cube '${o}'`);
     }
   if (e.dimensions)
     for (const n of e.dimensions) {
-      const [r, a] = n.split(".");
-      if (!r || !a) {
+      const [o, a] = n.split(".");
+      if (!o || !a) {
         t.push(`Invalid dimension format: ${n}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
-      i.add(r);
-      const o = s.get(r);
-      if (!o) {
-        t.push(`Cube '${r}' not found (referenced in dimension '${n}')`);
+      i.add(o);
+      const r = s.get(o);
+      if (!r) {
+        t.push(`Cube '${o}' not found (referenced in dimension '${n}')`);
         continue;
       }
-      o.dimensions[a] || t.push(`Dimension '${a}' not found on cube '${r}'`);
+      r.dimensions[a] || t.push(`Dimension '${a}' not found on cube '${o}'`);
     }
   if (e.timeDimensions)
     for (const n of e.timeDimensions) {
-      const [r, a] = n.dimension.split(".");
-      if (!r || !a) {
+      const [o, a] = n.dimension.split(".");
+      if (!o || !a) {
         t.push(`Invalid timeDimension format: ${n.dimension}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
-      i.add(r);
-      const o = s.get(r);
-      if (!o) {
-        t.push(`Cube '${r}' not found (referenced in timeDimension '${n.dimension}')`);
+      i.add(o);
+      const r = s.get(o);
+      if (!r) {
+        t.push(`Cube '${o}' not found (referenced in timeDimension '${n.dimension}')`);
         continue;
       }
-      o.dimensions[a] || t.push(`TimeDimension '${a}' not found on cube '${r}' (must be a dimension with time type)`);
+      r.dimensions[a] || t.push(`TimeDimension '${a}' not found on cube '${o}' (must be a dimension with time type)`);
     }
   if (e.filters)
     for (const n of e.filters)
@@ -1351,8 +1377,8 @@ function v(s, e) {
 }
 function L(s, e, t, i) {
   if ("and" in s || "or" in s) {
-    const o = s.and || s.or || [];
-    for (const c of o)
+    const r = s.and || s.or || [];
+    for (const c of r)
       L(c, e, t, i);
     return;
   }
@@ -1360,8 +1386,8 @@ function L(s, e, t, i) {
     t.push("Filter must have a member field");
     return;
   }
-  const [n, r] = s.member.split(".");
-  if (!n || !r) {
+  const [n, o] = s.member.split(".");
+  if (!n || !o) {
     t.push(`Invalid filter member format: ${s.member}. Expected format: 'CubeName.fieldName'`);
     return;
   }
@@ -1371,7 +1397,7 @@ function L(s, e, t, i) {
     t.push(`Cube '${n}' not found (referenced in filter '${s.member}')`);
     return;
   }
-  !a.dimensions[r] && !a.measures[r] && t.push(`Filter field '${r}' not found on cube '${n}' (must be a dimension or measure)`);
+  !a.dimensions[o] && !a.measures[o] && t.push(`Filter field '${o}' not found on cube '${n}' (must be a dimension or measure)`);
 }
 function Ee(s) {
   return new T(s);
@@ -1416,29 +1442,29 @@ function oe(s) {
 }
 function ae(s) {
   const e = {};
-  s.dimensions && s.dimensions.forEach((o) => {
-    e[o.name] = ce(o);
+  s.dimensions && s.dimensions.forEach((r) => {
+    e[r.name] = ce(r);
   });
   const t = {};
-  s.measures && s.measures.forEach((o) => {
-    t[o.name] = le(o);
+  s.measures && s.measures.forEach((r) => {
+    t[r.name] = le(r);
   });
   const i = {};
-  s.joins && s.joins.forEach((o) => {
-    i[o.name] = fe(o);
+  s.joins && s.joins.forEach((r) => {
+    i[r.name] = fe(r);
   });
   const n = {};
   (s.pre_aggregations || s.preAggregations) && (s.pre_aggregations || s.preAggregations || []).forEach((c) => {
     n[c.name] = de(c);
   });
-  let r = s.sql;
-  !r && (s.sql_table || s.sqlTable) && (r = `SELECT * FROM ${s.sql_table || s.sqlTable}`);
+  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;
   return {
     name: s.name,
     title: s.title,
     description: s.description,
-    sql: r || "",
+    sql: o || "",
     sqlAlias: s.sql_alias || s.sqlAlias,
     dataSource: s.data_source || s.dataSource,
     refreshKey: a ? {
@@ -1552,11 +1578,11 @@ async function De(s) {
     return console.log(`ℹ️ Could not load YAML file ${s}:`, t instanceof Error ? t.message : t), [];
   }
 }
-function $e(s) {
+function ye(s) {
   let e = s;
   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 ye(s) {
+function $e(s) {
   const e = {
     name: s.name,
     title: s.title,
@@ -1616,12 +1642,12 @@ const Ae = {
    * Create a simple query builder
    */
   query: () => {
-    const s = (e, t = [], i = [], n = [], r, a) => ({
+    const s = (e, t = [], i = [], n = [], o, a) => ({
       measures: e,
       dimensions: t,
       filters: i,
       timeDimensions: n,
-      limit: r,
+      limit: o,
       order: a
     });
     return {
@@ -1629,25 +1655,25 @@ const Ae = {
         dimensions: (t = []) => ({
           filters: (i = []) => ({
             timeDimensions: (n = []) => ({
-              limit: (r) => ({
-                order: (a) => s(e, t, i, n, r, a)
+              limit: (o) => ({
+                order: (a) => s(e, t, i, n, o, a)
               }),
-              order: (r) => s(e, t, i, n, void 0, r)
+              order: (o) => s(e, t, i, n, void 0, o)
             }),
             limit: (n) => ({
-              order: (r) => s(e, t, i, [], n, r)
+              order: (o) => s(e, t, i, [], n, o)
             }),
             order: (n) => s(e, t, i, [], void 0, n)
           }),
           timeDimensions: (i = []) => ({
             filters: (n = []) => ({
-              limit: (r) => ({
-                order: (a) => s(e, t, n, i, r, a)
+              limit: (o) => ({
+                order: (a) => s(e, t, n, i, o, a)
               }),
-              order: (r) => s(e, t, n, i, void 0, r)
+              order: (o) => s(e, t, n, i, void 0, o)
             }),
             limit: (n) => ({
-              order: (r) => s(e, t, [], i, n, r)
+              order: (o) => s(e, t, [], i, n, o)
             }),
             order: (n) => s(e, t, [], i, void 0, n)
           }),
@@ -1659,25 +1685,25 @@ const Ae = {
         filters: (t = []) => ({
           dimensions: (i = []) => ({
             timeDimensions: (n = []) => ({
-              limit: (r) => ({
-                order: (a) => s(e, i, t, n, r, a)
+              limit: (o) => ({
+                order: (a) => s(e, i, t, n, o, a)
               }),
-              order: (r) => s(e, i, t, n, void 0, r)
+              order: (o) => s(e, i, t, n, void 0, o)
             }),
             limit: (n) => ({
-              order: (r) => s(e, i, t, [], n, r)
+              order: (o) => s(e, i, t, [], n, o)
             }),
             order: (n) => s(e, i, t, [], void 0, n)
           }),
           timeDimensions: (i = []) => ({
             dimensions: (n = []) => ({
-              limit: (r) => ({
-                order: (a) => s(e, n, t, i, r, a)
+              limit: (o) => ({
+                order: (a) => s(e, n, t, i, o, a)
               }),
-              order: (r) => s(e, n, t, i, void 0, r)
+              order: (o) => s(e, n, t, i, void 0, o)
             }),
             limit: (n) => ({
-              order: (r) => s(e, [], t, i, n, r)
+              order: (o) => s(e, [], t, i, n, o)
             }),
             order: (n) => s(e, [], t, i, void 0, n)
           }),
@@ -1722,12 +1748,12 @@ export {
   ie as MultiCubeBuilder,
   ee as MySQLExecutor,
   X as PostgresExecutor,
-  y as QueryExecutor,
+  $ as QueryExecutor,
   q as SQLiteExecutor,
   T as SemanticLayerCompiler,
   Ae as SemanticLayerUtils,
-  $e as convertCubeReferences,
-  j as createDatabaseExecutor,
+  ye as convertCubeReferences,
+  _ as createDatabaseExecutor,
   Te as createDrizzleSemanticLayer,
   ne as createMultiCubeContext,
   te as createMySQLExecutor,
@@ -1736,12 +1762,12 @@ export {
   Ee as createSemanticLayer,
   xe as defaultSemanticLayer,
   Ne as defineCube,
-  Ce as defineLegacyCube,
+  we as defineLegacyCube,
   pe as loadYamlCubes,
   De as loadYamlCubesFromFile,
   re as parseYamlCubes,
   b as resolveSqlExpression,
-  ye as semanticCubeToYaml,
+  $e as semanticCubeToYaml,
   se as semanticLayer,
   ae as yamlCubeToSemanticCube
 };