drizzle-cube 0.4.51 → 0.4.53

package/dist/adapters/{compiler-BXfrvebp.js → compiler-S6KHiOY6.js}

@@ -1422,15 +1422,18 @@ function Ce(e) {
 }
 //#endregion
 //#region src/server/executors/postgres-executor.ts
-var we = class extends H {
+function we(e) {
+	return Array.isArray(e) ? e : e && typeof e == "object" && "rows" in e && Array.isArray(e.rows) ? e.rows : [];
+}
+var Te = class extends H {
 	async execute(e, t) {
 		if (e && typeof e == "object" && typeof e.execute == "function") {
 			let n = await e.execute();
 			return Array.isArray(n) ? n.map((e) => this.convertNumericFields(e, t)) : n;
 		}
 		if (!this.db.execute) throw Error("PostgreSQL database instance must have an execute method");
-		let n = await this.db.execute(e);
-		return Array.isArray(n) ? n.map((e) => this.convertNumericFields(e, t)) : n;
+		let n = await this.db.execute(e), r = we(n);
+		return r.length > 0 ? r.map((e) => this.convertNumericFields(e, t)) : n;
 	}
 	convertNumericFields(e, t) {
 		if (!e || typeof e != "object") return e;
@@ -1468,11 +1471,9 @@ var we = class extends H {
 			let r = t[parseInt(n, 10) - 1];
 			return r === null ? "NULL" : typeof r == "number" ? String(r) : typeof r == "boolean" ? r ? "TRUE" : "FALSE" : r instanceof Date ? `'${r.toISOString()}'` : `'${String(r).replace(/'/g, "''")}'`;
 		}))}`), a = [];
-		if (Array.isArray(i)) {
-			for (let e of i) if (e && typeof e == "object") {
-				let t = e["QUERY PLAN"] || e["query plan"] || e.queryplan;
-				typeof t == "string" && a.push(t);
-			}
+		for (let e of we(i)) if (e && typeof e == "object") {
+			let t = e["QUERY PLAN"] || e["query plan"] || e.queryplan;
+			typeof t == "string" && a.push(t);
 		}
 		return Se(a, {
 			sql: e,
@@ -1483,7 +1484,7 @@ var we = class extends H {
 		if (!e || e.length === 0) return [];
 		if (!this.db.execute) throw Error("PostgreSQL database instance must have an execute method");
 		try {
-			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = await this.db.execute(D`
+			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = we(await this.db.execute(D`
         SELECT
           t.relname as table_name,
           i.relname as index_name,
@@ -1500,25 +1501,25 @@ var we = class extends H {
           AND t.relname IN (${D.raw(t)})
         GROUP BY t.relname, i.relname, ix.indisunique, ix.indisprimary
         ORDER BY t.relname, i.relname
-      `);
-			return Array.isArray(n) ? n.map((e) => ({
+      `));
+			return n.length === 0 ? [] : n.map((e) => ({
 				table_name: e.table_name,
 				index_name: e.index_name,
 				columns: e.columns.split(","),
 				is_unique: e.is_unique,
 				is_primary: e.is_primary
-			})) : [];
+			}));
 		} catch (e) {
 			return console.warn("Failed to get table indexes:", e), [];
 		}
 	}
 };
-function Te(e, t) {
-	return new we(e, t, "postgres");
+function Ee(e, t) {
+	return new Te(e, t, "postgres");
 }
 //#endregion
 //#region src/server/explain/mysql-parser.ts
-function Ee(e, t) {
+function De(e, t) {
 	let n = t?.toLowerCase() || "";
 	switch (e.toLowerCase()) {
 		case "all": return "Seq Scan";
@@ -1532,10 +1533,10 @@ function Ee(e, t) {
 		default: return `MySQL ${e}`;
 	}
 }
-function De(e, t) {
+function Oe(e, t) {
 	let n = [], r = [], i = !1, a = 0;
 	for (let t of e) {
-		let e = Ee(t.type, t.Extra);
+		let e = De(t.type, t.Extra);
 		t.type.toLowerCase() === "all" && (i = !0), t.key && r.push(t.key);
 		let o = {
 			type: e,
@@ -1566,7 +1567,7 @@ function De(e, t) {
 }
 //#endregion
 //#region src/server/executors/mysql-executor.ts
-var Oe = class extends H {
+var ke = class extends H {
 	async execute(e, t) {
 		if (e && typeof e == "object" && typeof e.execute == "function") {
 			let n = await e.execute();
@@ -1616,7 +1617,7 @@ var Oe = class extends H {
 			filtered: Number(e.filtered) || 100,
 			Extra: e.Extra || null
 		});
-		return De(s, {
+		return Oe(s, {
 			sql: e,
 			params: t
 		});
@@ -1650,12 +1651,12 @@ var Oe = class extends H {
 		}
 	}
 };
-function ke(e, t) {
-	return new Oe(e, t, "mysql");
+function Ae(e, t) {
+	return new ke(e, t, "mysql");
 }
 //#endregion
 //#region src/server/explain/sqlite-parser.ts
-function Ae(e) {
+function je(e) {
 	let t = e.toLowerCase(), n = e.match(/^SCAN\s+(\S+)/i);
 	if (n) return {
 		type: "Seq Scan",
@@ -1680,10 +1681,10 @@ function Ae(e) {
 		table: a[1]
 	} : t.includes("temp b-tree") ? t.includes("order by") ? { type: "Sort" } : t.includes("group by") ? { type: "Group" } : t.includes("distinct") ? { type: "Distinct" } : { type: "Temp B-Tree" } : t.includes("compound") ? { type: "Compound Query" } : t.includes("subquery") ? { type: "Subquery" } : t.includes("co-routine") ? { type: "Coroutine" } : { type: e };
 }
-function je(e, t) {
+function Me(e, t) {
 	let n = [], r = [], i = !1, a = /* @__PURE__ */ new Map();
 	for (let t of e) {
-		let e = Ae(t.detail);
+		let e = je(t.detail);
 		e.type === "Seq Scan" && (i = !0), e.index && r.push(e.index);
 		let o = {
 			type: e.type,
@@ -1714,7 +1715,7 @@ function je(e, t) {
 }
 //#endregion
 //#region src/server/executors/sqlite-executor.ts
-var Me = class extends H {
+var Ne = class extends H {
 	async execute(e, t) {
 		if (e && typeof e == "object" && typeof e.execute == "function") {
 			let n = await e.execute();
@@ -1763,7 +1764,7 @@ var Me = class extends H {
 			notused: Number(e.notused) || 0,
 			detail: String(e.detail || "")
 		});
-		return je(s, {
+		return Me(s, {
 			sql: e,
 			params: t
 		});
@@ -1796,29 +1797,29 @@ var Me = class extends H {
 		}
 	}
 };
-function Ne(e, t) {
-	return new Me(e, t, "sqlite");
+function Pe(e, t) {
+	return new Ne(e, t, "sqlite");
 }
 //#endregion
 //#region src/server/executors/singlestore-executor.ts
-var Pe = class extends Oe {
+var Fe = class extends ke {
 	getEngineType() {
 		return "singlestore";
 	}
 };
-function Fe(e, t) {
-	return new Pe(e, t);
+function Ie(e, t) {
+	return new Fe(e, t);
 }
 //#endregion
 //#region src/server/explain/duckdb-parser.ts
-function Ie(e, t) {
+function Le(e, t) {
 	let n = [], r = [], i = !1, a, o = [];
 	for (let t of e) {
 		if (/^[┌├└│─┐┤┘]+$/.test(t.trim()) || /EXPLANATION|QUERY PLAN/i.test(t)) continue;
-		let e = Re(t);
+		let e = ze(t);
 		if (e) {
 			(e.type.includes("SEQ_SCAN") || e.type.includes("TABLE_SCAN")) && (i = !0), e.type.includes("INDEX_SCAN") && e.index && r.push(e.index), n.length === 0 && e.estimatedCost !== void 0 && (a = e.estimatedCost);
-			let s = Le(t);
+			let s = Re(t);
 			for (; o.length > 0 && o[o.length - 1].indent >= s;) o.pop();
 			if (o.length === 0) n.push(e);
 			else {
@@ -1845,13 +1846,13 @@ function Ie(e, t) {
 		sql: t
 	};
 }
-function Le(e) {
+function Re(e) {
 	let t = 0;
 	for (let n of e) if (n === " " || n === "│" || n === "├" || n === "└" || n === "─") t++;
 	else break;
 	return t;
 }
-function Re(e) {
+function ze(e) {
 	let t = e.replace(/[┌├└│─┐┤┘]/g, "").replace(/^\s*/, "").trim();
 	if (!t || t.match(/^\(cost=([\d.]+)\s+rows=(\d+)\)$/i)) return null;
 	let n = t.match(/^([A-Z_]+)(?:\s+(\S+))?(?:\s+on\s+(\S+))?(?:\s+\(cost=([\d.]+)\s+rows=(\d+)\))?/i);
@@ -1877,7 +1878,7 @@ function Re(e) {
 }
 //#endregion
 //#region src/server/executors/duckdb-executor.ts
-var ze = class extends H {
+var Be = class extends H {
 	async execute(e, t) {
 		if (e && typeof e == "object" && typeof e.execute == "function") try {
 			let n = await e.execute();
@@ -1971,7 +1972,7 @@ var ze = class extends H {
 				typeof t == "string" && a.push(t);
 			}
 		}
-		return Ie(a, {
+		return Le(a, {
 			sql: e,
 			params: t
 		});
@@ -2004,19 +2005,19 @@ var ze = class extends H {
 		}
 	}
 };
-function Be(e, t) {
-	return new ze(e, t, "duckdb");
+function Ve(e, t) {
+	return new Be(e, t, "duckdb");
 }
 //#endregion
 //#region src/server/explain/databend-parser.ts
-function Ve(e, t) {
+function He(e, t) {
 	let n = [], r = [], i = !1, a, o = [];
 	for (let t of e) {
 		if (!t.trim()) continue;
-		let e = Ue(t);
+		let e = We(t);
 		if (e) {
 			(e.type.includes("TableScan") || e.type.includes("SCAN")) && (i = !0), e.type.includes("IndexScan") && e.index && r.push(e.index), n.length === 0 && e.estimatedCost !== void 0 && (a = e.estimatedCost);
-			let s = He(t);
+			let s = Ue(t);
 			for (; o.length > 0 && o[o.length - 1].indent >= s;) o.pop();
 			if (o.length === 0) n.push(e);
 			else {
@@ -2043,13 +2044,13 @@ function Ve(e, t) {
 		sql: t
 	};
 }
-function He(e) {
+function Ue(e) {
 	let t = 0;
 	for (let n of e) if (n === " " || n === "│" || n === "├" || n === "└" || n === "─") t++;
 	else break;
 	return t;
 }
-function Ue(e) {
+function We(e) {
 	let t = e.replace(/[┌├└│─┐┤┘]/g, "").replace(/^\s*/, "").trim();
 	if (!t || /^(filters|table|estimated rows|output columns|push downs):/.test(t)) return null;
 	let n = t.match(/^([A-Z][A-Za-z_]+(?:\s+[A-Z][A-Za-z_]+)*)(?:\s+(\S+))?/);
@@ -2063,7 +2064,7 @@ function Ue(e) {
 }
 //#endregion
 //#region src/server/executors/databend-executor.ts
-var We = class extends H {
+var Ge = class extends H {
 	async execute(e, t) {
 		if (e && typeof e == "object" && typeof e.execute == "function") try {
 			let n = await e.execute();
@@ -2157,7 +2158,7 @@ var We = class extends H {
 				typeof t == "string" && a.push(t);
 			}
 		}
-		return Ve(a, {
+		return He(a, {
 			sql: e,
 			params: t
 		});
@@ -2166,19 +2167,19 @@ var We = class extends H {
 		return !e || e.length, [];
 	}
 };
-function Ge(e, t) {
-	return new We(e, t, "databend");
+function Ke(e, t) {
+	return new Ge(e, t, "databend");
 }
 //#endregion
 //#region src/server/explain/snowflake-parser.ts
-function Ke(e, t) {
+function qe(e, t) {
 	let n = [], r = [], i = !1, a, o = [];
 	for (let t of e) {
 		if (!t.trim()) continue;
-		let e = Je(t);
+		let e = Ye(t);
 		if (e) {
 			(e.type.includes("TableScan") || e.type.includes("SCAN")) && (i = !0), n.length === 0 && e.estimatedCost !== void 0 && (a = e.estimatedCost);
-			let r = qe(t);
+			let r = Je(t);
 			for (; o.length > 0 && o[o.length - 1].indent >= r;) o.pop();
 			if (o.length === 0) n.push(e);
 			else {
@@ -2205,13 +2206,13 @@ function Ke(e, t) {
 		sql: t
 	};
 }
-function qe(e) {
+function Je(e) {
 	let t = 0;
 	for (let n of e) if (n === " " || n === "-" || n === ">") t++;
 	else break;
 	return t;
 }
-function Je(e) {
+function Ye(e) {
 	let t = e.replace(/^[\s\d:]*->/, "").trim();
 	if (!t || /^(GlobalStats|partitions|bytes):/i.test(t) || /^\w+=\d+/.test(t)) return null;
 	let n = t.match(/^([A-Z][A-Za-z_]+(?:\s+[A-Z][A-Za-z_]+)*)(?:\s+(\S+))?/);
@@ -2225,7 +2226,7 @@ function Je(e) {
 }
 //#endregion
 //#region src/server/executors/snowflake-executor.ts
-var Ye = class extends H {
+var Xe = class extends H {
 	async execute(e, t) {
 		if (e && typeof e == "object" && typeof e.execute == "function") try {
 			let n = await e.execute();
@@ -2318,7 +2319,7 @@ var Ye = class extends H {
 				typeof t == "string" && i.push(t);
 			}
 		}
-		return Ke(i, {
+		return qe(i, {
 			sql: e,
 			params: t
 		});
@@ -2327,23 +2328,23 @@ var Ye = class extends H {
 		return [];
 	}
 };
-function Xe(e, t) {
-	return new Ye(e, t, "snowflake");
+function Ze(e, t) {
+	return new Xe(e, t, "snowflake");
 }
 //#endregion
 //#region src/server/executors/index.ts
-function Ze(e, t, n) {
+function Qe(e, t, n) {
 	if (n) switch (n) {
-		case "postgres": return Te(e, t);
-		case "mysql": return ke(e, t);
-		case "sqlite": return Ne(e, t);
-		case "singlestore": return Fe(e, t);
-		case "duckdb": return Be(e, t);
-		case "databend": return Ge(e, t);
-		case "snowflake": return Xe(e, t);
-	}
-	if (e.all && e.run) return Ne(e, t);
-	if (e.execute) return Te(e, t);
+		case "postgres": return Ee(e, t);
+		case "mysql": return Ae(e, t);
+		case "sqlite": return Pe(e, t);
+		case "singlestore": return Ie(e, t);
+		case "duckdb": return Ve(e, t);
+		case "databend": return Ke(e, t);
+		case "snowflake": return Ze(e, t);
+	}
+	if (e.all && e.run) return Pe(e, t);
+	if (e.execute) return Ee(e, t);
 	throw Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
 //#endregion
@@ -2351,7 +2352,7 @@ function Ze(e, t, n) {
 function U(e, t) {
 	return typeof e == "string" ? t ? t.get(e) || (console.warn(`[drizzle-cube] Cannot resolve cube reference '${e}': no cube with that name is registered. Registered cubes: ${Array.from(t.keys()).join(", ") || "(none)"}. Join will be skipped.`), null) : (console.warn(`[drizzle-cube] Cannot resolve string cube reference '${e}': no cube registry provided. Join will be skipped.`), null) : typeof e == "function" ? e() : e;
 }
-function Qe(e) {
+function $e(e) {
 	switch (e) {
 		case "belongsTo": return "hasMany";
 		case "hasMany": return "belongsTo";
@@ -2360,7 +2361,7 @@ function Qe(e) {
 		default: return e;
 	}
 }
-function $e(e, t) {
+function et(e, t) {
 	if (t) return t;
 	switch (e) {
 		case "belongsTo": return "inner";
@@ -2370,17 +2371,17 @@ function $e(e, t) {
 		default: return "left";
 	}
 }
-function et(e) {
+function tt(e) {
 	return e && typeof e == "object" ? D`${D`${e}`}` : e;
 }
-function tt(e) {
+function nt(e) {
 	if (e === "__proto__" || e === "constructor" || e === "prototype") throw Error(`Unsafe property key: ${e}`);
 	return e;
 }
 function W(e, t) {
-	return et(typeof e == "function" ? e(t) : e);
+	return tt(typeof e == "function" ? e(t) : e);
 }
-function nt(e, t) {
+function rt(e, t) {
 	if (e.relationship !== "belongsToMany" || !e.through) throw Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
 	let { table: n, sourceKey: r, targetKey: i, securitySql: a } = e.through, o = [];
 	for (let e of r) {
@@ -2397,7 +2398,7 @@ function nt(e, t) {
 		let e = a(t);
 		c = Array.isArray(e) ? e : [e];
 	}
-	let l = $e("belongsToMany", e.sqlJoinType);
+	let l = et("belongsToMany", e.sqlJoinType);
 	return {
 		junctionJoins: [{
 			joinType: l,
@@ -2419,7 +2420,7 @@ function G(e) {
 	let t = e, n = JSON.stringify(Array.isArray(t.values) ? [...t.values].sort() : t.values), r = t.dateRange ? `:dr:${JSON.stringify(t.dateRange)}` : "";
 	return `${t.member}:${t.operator}:${n}${r}`;
 }
-function rt(e, t) {
+function it(e, t) {
 	return `timeDim:${e}:${JSON.stringify(t)}`;
 }
 var K = class {
@@ -2460,37 +2461,37 @@ var K = class {
 		};
 	}
 };
-function it(e) {
+function at(e) {
 	let t = [];
-	for (let n of e) "and" in n && n.and ? t.push(...it(n.and)) : "or" in n && n.or ? t.push(...it(n.or)) : "member" in n && t.push(n);
+	for (let n of e) "and" in n && n.and ? t.push(...at(n.and)) : "or" in n && n.or ? t.push(...at(n.or)) : "member" in n && t.push(n);
 	return t;
 }
 //#endregion
 //#region src/server/cache-utils.ts
-function at(e, t, n = {}) {
-	let r = n.keyPrefix ?? "drizzle-cube:", i = ot(e), a = `${r}query:${dt(JSON.stringify(i))}`;
+function ot(e, t, n = {}) {
+	let r = n.keyPrefix ?? "drizzle-cube:", i = st(e), a = `${r}query:${ft(JSON.stringify(i))}`;
 	if (n.includeSecurityContext !== !1) {
-		let e = dt(n.securityContextSerializer ? n.securityContextSerializer(t) : JSON.stringify(J(t)));
+		let e = ft(n.securityContextSerializer ? n.securityContextSerializer(t) : JSON.stringify(J(t)));
 		a += `:ctx:${e}`;
 	}
 	return a;
 }
-function ot(e) {
+function st(e) {
 	return {
 		measures: e.measures ? [...e.measures].sort() : void 0,
 		dimensions: e.dimensions ? [...e.dimensions].sort() : void 0,
 		filters: e.filters ? q(e.filters) : void 0,
-		timeDimensions: e.timeDimensions ? ut(e.timeDimensions) : void 0,
+		timeDimensions: e.timeDimensions ? dt(e.timeDimensions) : void 0,
 		limit: e.limit,
 		offset: e.offset,
 		order: e.order ? J(e.order) : void 0,
 		fillMissingDatesValue: e.fillMissingDatesValue,
-		funnel: e.funnel ? st(e.funnel) : void 0,
-		flow: e.flow ? ct(e.flow) : void 0,
-		retention: e.retention ? lt(e.retention) : void 0
+		funnel: e.funnel ? ct(e.funnel) : void 0,
+		flow: e.flow ? lt(e.flow) : void 0,
+		retention: e.retention ? ut(e.retention) : void 0
 	};
 }
-function st(e) {
+function ct(e) {
 	return {
 		bindingKey: e.bindingKey,
 		timeDimension: e.timeDimension,
@@ -2506,7 +2507,7 @@ function st(e) {
 		globalTimeWindow: e.globalTimeWindow
 	};
 }
-function ct(e) {
+function lt(e) {
 	return {
 		bindingKey: e.bindingKey,
 		timeDimension: e.timeDimension,
@@ -2522,7 +2523,7 @@ function ct(e) {
 		joinStrategy: e.joinStrategy
 	};
 }
-function lt(e) {
+function ut(e) {
 	return {
 		timeDimension: e.timeDimension,
 		bindingKey: e.bindingKey,
@@ -2546,7 +2547,7 @@ function q(e) {
 		};
 	}).sort((e, t) => JSON.stringify(e).localeCompare(JSON.stringify(t)));
 }
-function ut(e) {
+function dt(e) {
 	return [...e].map((e) => ({
 		dimension: e.dimension,
 		granularity: e.granularity,
@@ -2561,7 +2562,7 @@ function ut(e) {
 function J(e) {
 	return typeof e != "object" || !e ? e : Array.isArray(e) ? e.map(J) : Object.keys(e).sort().reduce((t, n) => (t[n] = J(e[n]), t), {});
 }
-function dt(e) {
+function ft(e) {
 	let t = 2166136261, n = Math.min(e.length, 65536);
 	for (let r = 0; r < n; r++) t ^= e.charCodeAt(r), t = t * 16777619 >>> 0;
 	return t.toString(16).padStart(8, "0");
@@ -2948,8 +2949,8 @@ var Y = class {
 };
 //#endregion
 //#region src/server/template-substitution.ts
-function ft(e, t) {
-	let { cube: n, allCubes: r, resolvedMeasures: i } = t, a = pt(e), o = /* @__PURE__ */ new Map();
+function pt(e, t) {
+	let { cube: n, allCubes: r, resolvedMeasures: i } = t, a = mt(e), o = /* @__PURE__ */ new Map();
 	for (let e of a) {
 		let { originalRef: t, cubeName: a, fieldName: s } = e, c = a || n.name;
 		if (!r.get(c)) throw Error(`Cannot substitute {${t}}: cube '${c}' not found`);
@@ -2972,7 +2973,7 @@ function ft(e, t) {
 	for (let e = 0; e < s.length; e++) s[e] && u.push(new x(s[e])), e < c.length && u.push(c[e]);
 	return D.join(u, D.raw(""));
 }
-function pt(e) {
+function mt(e) {
 	if (e.length > 1e3) return [];
 	let t = e.matchAll(/\{([^}]+)\}/g), n = [];
 	for (let e of t) {
@@ -2992,7 +2993,7 @@ function pt(e) {
 	}
 	return n;
 }
-function mt(e) {
+function ht(e) {
 	let t = [], n = 0;
 	for (let r = 0; r < e.length; r++) if (e[r] === "{") n++;
 	else if (e[r] === "}" && (n--, n < 0)) {
@@ -3000,7 +3001,7 @@ function mt(e) {
 		break;
 	}
 	n > 0 && t.push("Unmatched opening brace in template"), /\{\s*\}/.test(e) && t.push("Empty member reference {} found in template"), /\{[^}]*\{/.test(e) && t.push("Nested braces are not allowed in member references");
-	let r = pt(e);
+	let r = mt(e);
 	for (let e of r) {
 		let n = e.cubeName ? `${e.cubeName}.${e.fieldName}` : e.fieldName;
 		/^[a-zA-Z_][a-zA-Z0-9_.]*$/.test(n) || t.push(`Invalid member reference {${e.originalRef}}: must start with letter or underscore, and contain only letters, numbers, underscores, and dots`), n.split(".").length > 2 && t.push(`Invalid member reference {${e.originalRef}}: only one dot allowed (Cube.measure format)`);
@@ -3010,8 +3011,8 @@ function mt(e) {
 		errors: t
 	};
 }
-function ht(e, t) {
-	let n = pt(e), r = /* @__PURE__ */ new Set();
+function gt(e, t) {
+	let n = mt(e), r = /* @__PURE__ */ new Set();
 	for (let e of n) {
 		let n = `${e.cubeName || t}.${e.fieldName}`;
 		r.add(n);
@@ -3038,11 +3039,11 @@ var Q = class e {
 					n && c.add(n);
 					continue;
 				}
-				Z.isCalculatedMeasure(d) ? (s.push(r), ht(d.calculatedSql, t).forEach((e) => c.add(e)), l.getAllDependencies(r).forEach((e) => {
+				Z.isCalculatedMeasure(d) ? (s.push(r), gt(d.calculatedSql, t).forEach((e) => c.add(e)), l.getAllDependencies(r).forEach((e) => {
 					let [t, r] = e.split("."), i = n.get(t);
 					if (i && i.measures[r]) {
 						let e = i.measures[r];
-						Z.isCalculatedMeasure(e) && ht(e.calculatedSql, t).forEach((e) => c.add(e));
+						Z.isCalculatedMeasure(e) && gt(e.calculatedSql, t).forEach((e) => c.add(e));
 					}
 				})) : o.push(r);
 			}
@@ -3073,7 +3074,7 @@ var Q = class e {
 	}
 	buildCalculatedMeasure(e, t, n, r, i) {
 		if (!e.calculatedSql) throw Error(`Calculated measure '${t.name}.${e.name}' missing calculatedSql property`);
-		return ft(this.databaseAdapter.preprocessCalculatedTemplate(e.calculatedSql), {
+		return pt(this.databaseAdapter.preprocessCalculatedTemplate(e.calculatedSql), {
 			cube: t,
 			allCubes: n,
 			resolvedMeasures: r,
@@ -3082,7 +3083,7 @@ var Q = class e {
 	}
 	buildCTECalculatedMeasure(e, t, n, r, i) {
 		if (!e.calculatedSql) throw Error(`Calculated measure '${t.name}.${e.name || "unknown"}' missing calculatedSql property`);
-		let a = /* @__PURE__ */ new Map(), o = ht(e.calculatedSql, t.name);
+		let a = /* @__PURE__ */ new Map(), o = gt(e.calculatedSql, t.name);
 		for (let e of o) {
 			let [t, i] = e.split("."), o = r.get(t);
 			if (o && o.measures[i]) {
@@ -3317,7 +3318,7 @@ var Q = class e {
 		let { postAggWindowMeasures: r } = e.categorizeForPostAggregation(t, n);
 		return r.length > 0;
 	}
-}, gt = class {
+}, _t = class {
 	constructor(e) {
 		this.dateTimeBuilder = e;
 	}
@@ -3416,13 +3417,13 @@ var Q = class e {
 		}
 		return i;
 	}
-}, _t = class {
+}, vt = class {
 	dateTimeBuilder;
 	filterBuilder;
 	groupByBuilder;
 	measureBuilder;
 	constructor(e) {
-		this.dateTimeBuilder = new Y(e), this.filterBuilder = new X(e, this.dateTimeBuilder), this.groupByBuilder = new gt(this.dateTimeBuilder), this.measureBuilder = new Q(e);
+		this.dateTimeBuilder = new Y(e), this.filterBuilder = new X(e, this.dateTimeBuilder), this.groupByBuilder = new _t(this.dateTimeBuilder), this.measureBuilder = new Q(e);
 	}
 	buildResolvedMeasures(e, t, n, r) {
 		return this.measureBuilder.buildResolvedMeasures(e, t, n, r);
@@ -3487,7 +3488,7 @@ var Q = class e {
 			if (s && s.dimensions[i] && e.dateRange) {
 				if (r?.preAggregationCTEs && r.preAggregationCTEs.some((e) => e.cube.name === t)) continue;
 				if (n.filterCache) {
-					let t = rt(e.dimension, e.dateRange), r = n.filterCache.get(t);
+					let t = it(e.dimension, e.dateRange), r = n.filterCache.get(t);
 					if (r) {
 						a.push(r);
 						continue;
@@ -3596,7 +3597,7 @@ var Q = class e {
 	buildLogicalFilter(e, t, n) {
 		return this.filterBuilder.buildLogicalFilter(e, t, n);
 	}
-}, vt = class {
+}, yt = class {
 	cubes;
 	connectivityCache = /* @__PURE__ */ new Map();
 	reverseIndex;
@@ -3803,7 +3804,7 @@ var Q = class e {
 	buildJoinCondition(e, t, n) {
 		let r = [];
 		for (let i of e.on) {
-			let e = t ? D`${D.identifier(t)}.${D.identifier(i.source.name)}` : et(i.source), a = n ? D`${D.identifier(n)}.${D.identifier(i.target.name)}` : et(i.target), o = i.as || M;
+			let e = t ? D`${D.identifier(t)}.${D.identifier(i.source.name)}` : tt(i.source), a = n ? D`${D.identifier(n)}.${D.identifier(i.target.name)}` : tt(i.target), o = i.as || M;
 			r.push(o(e, a));
 		}
 		return P(...r);
@@ -3833,11 +3834,11 @@ var Q = class e {
 	setInCache(e, t) {
 		this.connectivityCache.set(e, { path: t });
 	}
-}, yt = class {
+}, bt = class {
 	resolverCache = /* @__PURE__ */ new WeakMap();
 	getResolver(e) {
 		let t = this.resolverCache.get(e);
-		return t || (t = new vt(e), this.resolverCache.set(e, t)), t;
+		return t || (t = new yt(e), this.resolverCache.set(e, t)), t;
 	}
 	analyzeCubeUsage(e) {
 		let t = /* @__PURE__ */ new Set();
@@ -3926,9 +3927,9 @@ var Q = class e {
 				if (s.has(n)) continue;
 				let c = e.get(n);
 				if (!c) throw Error(`Cube '${n}' not found`);
-				let u = l ? Qe(i.relationship) : i.relationship;
+				let u = l ? $e(i.relationship) : i.relationship;
 				if (u === "belongsToMany" && i.through) {
-					let e = nt(i, r.securityContext);
+					let e = rt(i, r.securityContext);
 					o.push({
 						cube: c,
 						alias: `${n.toLowerCase()}_cube`,
@@ -3945,7 +3946,7 @@ var Q = class e {
 						}
 					});
 				} else {
-					let e = a.buildJoinCondition(i, null, null), t = $e(u, i.sqlJoinType);
+					let e = a.buildJoinCondition(i, null, null), t = et(u, i.sqlJoinType);
 					o.push({
 						cube: c,
 						alias: `${n.toLowerCase()}_cube`,
@@ -4041,7 +4042,7 @@ var Q = class e {
 			joinDef: e.joinDef,
 			reversed: e.reversed
 		}));
-		if (!c.slice(0, -1).some((e) => (e.reversed ? Qe(e.joinDef.relationship) : e.joinDef.relationship) === "hasMany")) return {
+		if (!c.slice(0, -1).some((e) => (e.reversed ? $e(e.joinDef.relationship) : e.joinDef.relationship) === "hasMany")) return {
 			path: c,
 			hasIntermediateHasMany: !1,
 			intermediateJoins: [],
@@ -4345,7 +4346,7 @@ var Q = class e {
 	}
 	convertInternalPathToJoinPathSteps(e) {
 		return e.map((e) => {
-			let t = e.reversed ? Qe(e.joinDef.relationship) : e.joinDef.relationship, n = $e(t, e.joinDef.sqlJoinType), r = e.joinDef.on.map((e) => ({
+			let t = e.reversed ? $e(e.joinDef.relationship) : e.joinDef.relationship, n = et(t, e.joinDef.sqlJoinType), r = e.joinDef.on.map((e) => ({
 				sourceColumn: e.source.name,
 				targetColumn: e.target.name
 			})), i = {
@@ -4410,7 +4411,7 @@ var Q = class e {
 			suggestion: "Add a dimension to see per-group breakdowns, or add a time dimension with granularity."
 		};
 	}
-}, bt = class {
+}, xt = class {
 	constructor(e) {
 		this.queryBuilder = e;
 	}
@@ -4562,13 +4563,128 @@ var Q = class e {
 	}
 };
 //#endregion
+//#region src/shared/date-utils.ts
+function St(e) {
+	let t = /* @__PURE__ */ new Date(), n = e.toLowerCase().trim(), r = t.getUTCFullYear(), i = t.getUTCMonth(), a = t.getUTCDate(), o = t.getUTCDay();
+	if (n === "today") {
+		let e = new Date(t);
+		e.setUTCHours(0, 0, 0, 0);
+		let n = new Date(t);
+		return n.setUTCHours(23, 59, 59, 999), {
+			start: e,
+			end: n
+		};
+	}
+	if (n === "yesterday") {
+		let e = new Date(t);
+		e.setUTCDate(a - 1), e.setUTCHours(0, 0, 0, 0);
+		let n = new Date(t);
+		return n.setUTCDate(a - 1), n.setUTCHours(23, 59, 59, 999), {
+			start: e,
+			end: n
+		};
+	}
+	if (n === "this week") {
+		let e = o === 0 ? -6 : 1 - o, n = new Date(t);
+		n.setUTCDate(a + e), n.setUTCHours(0, 0, 0, 0);
+		let r = new Date(n);
+		return r.setUTCDate(n.getUTCDate() + 6), r.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: r
+		};
+	}
+	if (n === "this month") return {
+		start: new Date(Date.UTC(r, i, 1, 0, 0, 0, 0)),
+		end: new Date(Date.UTC(r, i + 1, 0, 23, 59, 59, 999))
+	};
+	if (n === "this quarter") {
+		let e = Math.floor(i / 3);
+		return {
+			start: new Date(Date.UTC(r, e * 3, 1, 0, 0, 0, 0)),
+			end: new Date(Date.UTC(r, e * 3 + 3, 0, 23, 59, 59, 999))
+		};
+	}
+	if (n === "this year") return {
+		start: new Date(Date.UTC(r, 0, 1, 0, 0, 0, 0)),
+		end: new Date(Date.UTC(r, 11, 31, 23, 59, 59, 999))
+	};
+	let s = n.match(/^last\s+(\d+)\s+days?$/);
+	if (s) {
+		let e = parseInt(s[1], 10), n = new Date(t);
+		n.setUTCDate(a - e + 1), n.setUTCHours(0, 0, 0, 0);
+		let r = new Date(t);
+		return r.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: r
+		};
+	}
+	let c = n.match(/^last\s+(\d+)\s+weeks?$/);
+	if (c) {
+		let e = parseInt(c[1], 10) * 7, n = new Date(t);
+		n.setUTCDate(a - e + 1), n.setUTCHours(0, 0, 0, 0);
+		let r = new Date(t);
+		return r.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: r
+		};
+	}
+	if (n === "last week") {
+		let e = o === 0 ? -13 : -6 - o, n = new Date(t);
+		n.setUTCDate(a + e), n.setUTCHours(0, 0, 0, 0);
+		let r = new Date(n);
+		return r.setUTCDate(n.getUTCDate() + 6), r.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: r
+		};
+	}
+	if (n === "last month") return {
+		start: new Date(Date.UTC(r, i - 1, 1, 0, 0, 0, 0)),
+		end: new Date(Date.UTC(r, i, 0, 23, 59, 59, 999))
+	};
+	if (n === "last quarter") {
+		let e = Math.floor(i / 3), t = e === 0 ? 3 : e - 1, n = e === 0 ? r - 1 : r;
+		return {
+			start: new Date(Date.UTC(n, t * 3, 1, 0, 0, 0, 0)),
+			end: new Date(Date.UTC(n, t * 3 + 3, 0, 23, 59, 59, 999))
+		};
+	}
+	if (n === "last year") return {
+		start: new Date(Date.UTC(r - 1, 0, 1, 0, 0, 0, 0)),
+		end: new Date(Date.UTC(r - 1, 11, 31, 23, 59, 59, 999))
+	};
+	if (n === "last 12 months") {
+		let e = new Date(Date.UTC(r, i - 11, 1, 0, 0, 0, 0)), n = new Date(t);
+		return n.setUTCHours(23, 59, 59, 999), {
+			start: e,
+			end: n
+		};
+	}
+	let l = n.match(/^last\s+(\d+)\s+months?$/);
+	if (l) {
+		let e = parseInt(l[1], 10), n = new Date(Date.UTC(r, i - e + 1, 1, 0, 0, 0, 0)), a = new Date(t);
+		return a.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: a
+		};
+	}
+	let u = n.match(/^last\s+(\d+)\s+years?$/);
+	if (u) {
+		let e = parseInt(u[1], 10), n = new Date(Date.UTC(r - e, 0, 1, 0, 0, 0, 0)), i = new Date(t);
+		return i.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: i
+		};
+	}
+	return null;
+}
+//#endregion
 //#region src/server/gap-filler.ts
-function xt(e, t, n) {
-	let r = [], i = St(new Date(e), n), a = St(new Date(t), n);
-	for (; i <= a && r.length < 1e4;) r.push(new Date(i)), i = Ct(i, n);
+function Ct(e, t, n) {
+	let r = [], i = wt(new Date(e), n), a = wt(new Date(t), n);
+	for (; i <= a && r.length < 1e4;) r.push(new Date(i)), i = Tt(i, n);
 	return r;
 }
-function St(e, t) {
+function wt(e, t) {
 	let n = new Date(e);
 	switch (t) {
 		case "second":
@@ -4602,7 +4718,7 @@ function St(e, t) {
 	}
 	return n;
 }
-function Ct(e, t) {
+function Tt(e, t) {
 	let n = new Date(e);
 	switch (t) {
 		case "second":
@@ -4632,7 +4748,7 @@ function Ct(e, t) {
 	}
 	return n;
 }
-function wt(e) {
+function Et(e) {
 	if (e instanceof Date) return e.toISOString();
 	if (typeof e == "string") {
 		let t = new Date(e);
@@ -4640,15 +4756,15 @@ function wt(e) {
 	}
 	return String(e);
 }
-function Tt(e, t) {
+function Dt(e, t) {
 	return t.length === 0 ? "__all__" : t.map((t) => String(e[t] ?? "")).join("|||");
 }
-function Et(e, t) {
-	let { timeDimensionKey: n, granularity: r, dateRange: i, fillValue: a, measures: o, dimensions: s } = t, c = xt(i[0], i[1], r);
+function Ot(e, t) {
+	let { timeDimensionKey: n, granularity: r, dateRange: i, fillValue: a, measures: o, dimensions: s } = t, c = Ct(i[0], i[1], r);
 	if (c.length === 0) return e;
 	let l = /* @__PURE__ */ new Map();
 	for (let t of e) {
-		let e = Tt(t, s), r = wt(t[n]);
+		let e = Dt(t, s), r = Et(t[n]);
 		l.has(e) || l.set(e, /* @__PURE__ */ new Map()), l.get(e).set(r, t);
 	}
 	l.size === 0 && s.length === 0 && l.set("__all__", /* @__PURE__ */ new Map());
@@ -4668,42 +4784,74 @@ function Et(e, t) {
 	}
 	return u;
 }
-function Dt(e) {
+function kt(e) {
 	if (!e) return null;
 	if (Array.isArray(e)) {
 		if (e.length < 2) return null;
 		let t = new Date(e[0]), n = new Date(e[1]);
 		return isNaN(t.getTime()) || isNaN(n.getTime()) ? null : [t, n];
 	}
-	let t = new Date(e);
-	return isNaN(t.getTime()) ? null : [t, t];
+	let t = St(e);
+	if (t) return [t.start, t.end];
+	let n = new Date(e);
+	return isNaN(n.getTime()) ? null : [n, n];
 }
-function Ot(e, t, n) {
+function At(e, t, n) {
 	if (!t.timeDimensions || t.timeDimensions.length === 0) return e;
 	let r = t.timeDimensions.filter((e) => {
-		let t = e.fillMissingDates !== !1, n = e.granularity && e.dateRange;
-		return t && n;
+		let n = e.fillMissingDates !== !1, r = !!e.granularity, i = e.dateRange || jt(e.dimension, t.filters);
+		return n && r && i;
 	});
 	if (r.length === 0) return e;
 	let i = t.fillMissingDatesValue === void 0 ? 0 : t.fillMissingDatesValue, a = new Set(t.timeDimensions.map((e) => e.dimension)), o = (t.dimensions || []).filter((e) => !a.has(e)), s = e;
 	for (let e of r) {
-		let t = Dt(e.dateRange);
-		if (!t) continue;
-		let r = {
+		let r = kt(e.dateRange) || Mt(e.dimension, t.filters);
+		if (!r) continue;
+		let a = {
 			timeDimensionKey: e.dimension,
 			granularity: e.granularity,
-			dateRange: t,
+			dateRange: r,
 			fillValue: i,
 			measures: n,
 			dimensions: o
 		};
-		s = Et(s, r);
+		s = Ot(s, a);
 	}
 	return s;
 }
+function jt(e, t) {
+	if (!t) return null;
+	for (let n of t) {
+		if ("member" in n && "operator" in n && n.member === e && n.operator === "inDateRange") return n;
+		if ("and" in n && n.and) {
+			let t = jt(e, n.and);
+			if (t) return t;
+		}
+		if ("or" in n && n.or) {
+			let t = jt(e, n.or);
+			if (t) return t;
+		}
+	}
+	return null;
+}
+function Mt(e, t) {
+	let n = jt(e, t);
+	if (!n) return null;
+	if (n.dateRange) {
+		let e = kt(n.dateRange);
+		if (e) return e;
+	}
+	let r = n.values;
+	if (!r || r.length === 0) return null;
+	if (r.length === 1 && typeof r[0] == "string") {
+		let e = St(r[0]);
+		return e ? [e.start, e.end] : kt(r);
+	}
+	return r.length >= 2 ? kt(r) : null;
+}
 //#endregion
 //#region src/server/builders/comparison-query-builder.ts
-var kt = class {
+var Nt = class {
 	dateTimeBuilder;
 	constructor(e) {
 		this.dateTimeBuilder = new Y(e);
@@ -4834,7 +4982,7 @@ var kt = class {
 			return typeof i == "string" && typeof a == "string" ? new Date(i).getTime() - new Date(a).getTime() : 0;
 		});
 	}
-}, At = class {
+}, Pt = class {
 	filterBuilder;
 	dateTimeBuilder;
 	constructor(e) {
@@ -4873,7 +5021,7 @@ var kt = class {
 			if (i.name || n.push(`Step ${r} must have a name`), "cube" in i && i.cube && (t.get(i.cube) || n.push(`Step ${r} cube not found: ${i.cube}`)), i.filter) {
 				let a;
 				"cube" in i && i.cube ? a = i.cube : typeof e.bindingKey == "string" && ([a] = e.bindingKey.split("."));
-				let o = a ? new vt(t) : null, s = Array.isArray(i.filter) ? i.filter : [i.filter];
+				let o = a ? new yt(t) : null, s = Array.isArray(i.filter) ? i.filter : [i.filter];
 				for (let e of s) if ("member" in e) {
 					let [i, s] = e.member.split("."), c = t.get(i);
 					if (!c) n.push(`Step ${r} filter cube not found: ${i}`);
@@ -4936,7 +5084,7 @@ var kt = class {
 		return t;
 	}
 	resolveSteps(e, t, n) {
-		let r = new vt(t);
+		let r = new yt(t);
 		return e.steps.map((i, a) => {
 			let o = this.resolveCubeForStep(i, e, t), s = this.resolveBindingKey(e, o, n), c = this.resolveTimeDimension(e, o, n), l = this.buildStepFilters(i, o, t, n), u = this.extractFilterCubeNames(i), d = [];
 			for (let e of u) if (e !== o.name) {
@@ -5034,7 +5182,7 @@ var kt = class {
 		let u = n.get(s);
 		if (!u) return null;
 		if (s !== t.name) {
-			let e = new vt(n).findPath(t.name, s);
+			let e = new yt(n).findPath(t.name, s);
 			if (!e || e.length === 0) return console.warn(`Funnel filter: Cannot filter by '${String(s).replace(/\n|\r/g, "")}.${String(c).replace(/\n|\r/g, "")}' in step using '${String(t.name).replace(/\n|\r/g, "")}'. No join path found. Filter will be skipped.`), null;
 		}
 		let d = u.dimensions?.[c];
@@ -5115,7 +5263,7 @@ var kt = class {
 		let o = i.db.select(a).from(e);
 		return i.db.$with("funnel_metrics").as(o);
 	}
-}, jt = class {
+}, Ft = class {
 	filterBuilder;
 	dateTimeBuilder;
 	databaseAdapter;
@@ -5579,27 +5727,27 @@ var kt = class {
 };
 //#endregion
 //#region src/server/types/retention.ts
-function Mt(e) {
+function It(e) {
 	return Array.isArray(e);
 }
-function Nt(e) {
+function Lt(e) {
 	return typeof e == "object" && !!e && "cube" in e;
 }
-function Pt(e) {
-	if (Nt(e)) return e.cube;
+function Rt(e) {
+	if (Lt(e)) return e.cube;
 	let t = e.indexOf(".");
 	if (t === -1) throw Error(`Invalid time dimension format: ${e}. Expected 'CubeName.dimensionName'`);
 	return e.substring(0, t);
 }
-function Ft(e) {
-	if (Nt(e)) return e.dimension;
+function zt(e) {
+	if (Lt(e)) return e.dimension;
 	let t = e.indexOf(".");
 	if (t === -1) throw Error(`Invalid time dimension format: ${e}. Expected 'CubeName.dimensionName'`);
 	return e.substring(t + 1);
 }
 //#endregion
 //#region src/server/builders/retention-query-builder.ts
-var It = class {
+var Bt = class {
 	filterBuilder;
 	dateTimeBuilder;
 	constructor(e) {
@@ -5611,12 +5759,12 @@ var It = class {
 	validateConfig(e, t) {
 		let n = [];
 		try {
-			let r = Pt(e.timeDimension), i = Ft(e.timeDimension), a = t.get(r);
+			let r = Rt(e.timeDimension), i = zt(e.timeDimension), a = t.get(r);
 			a ? a.dimensions?.[i] || n.push(`Time dimension not found: ${i} in cube ${r}`) : n.push(`Cube not found: ${r}`);
 		} catch {
 			n.push(`Invalid time dimension format: ${e.timeDimension}`);
 		}
-		if (Mt(e.bindingKey)) for (let r of e.bindingKey) {
+		if (It(e.bindingKey)) for (let r of e.bindingKey) {
 			let e = t.get(r.cube);
 			if (!e) n.push(`Binding key mapping cube not found: ${r.cube}`);
 			else {
@@ -5704,7 +5852,7 @@ var It = class {
 		});
 	}
 	resolveConfig(e, t, n) {
-		let r = Pt(e.timeDimension), i = Ft(e.timeDimension), a = t.get(r);
+		let r = Rt(e.timeDimension), i = zt(e.timeDimension), a = t.get(r);
 		if (!a) throw Error(`Cube not found: ${r}`);
 		let o = a.dimensions?.[i];
 		if (!o) throw Error(`Time dimension not found: ${i}`);
@@ -5729,7 +5877,7 @@ var It = class {
 		};
 	}
 	resolveBindingKey(e, t, n, r) {
-		if (Mt(e)) {
+		if (It(e)) {
 			let i = e.find((e) => e.cube === t.name);
 			if (!i) throw Error(`No binding key mapping found for cube: ${t.name}`);
 			let a = this.extractDimensionName(i.dimension), o = n.get(i.cube);
@@ -5868,7 +6016,7 @@ var It = class {
 		let t = e.split(".");
 		return t.length > 1 ? t[1] : t[0];
 	}
-}, Lt = class {
+}, Vt = class {
 	constructor(e) {
 		this.queryPlanner = e;
 	}
@@ -6303,7 +6451,7 @@ var It = class {
 			timeDimensions: []
 		};
 	}
-}, Rt = class {
+}, Ht = class {
 	name = "identity";
 	optimise(e) {
 		return e;
@@ -6311,7 +6459,7 @@ var It = class {
 };
 //#endregion
 //#region src/server/physical-plan/processors/cte-processor.ts
-function zt(e, t, n, r) {
+function Ut(e, t, n, r) {
 	let i = /* @__PURE__ */ new Map();
 	if (e.preAggregationCTEs && e.preAggregationCTEs.length > 0) {
 		for (let t of e.preAggregationCTEs) if (t.propagatingFilters && t.propagatingFilters.length > 0) for (let e of t.propagatingFilters) {
@@ -6341,7 +6489,7 @@ function zt(e, t, n, r) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/window-processor.ts
-function Bt(e, t, n, r, i, a) {
+function Wt(e, t, n, r, i, a) {
 	if (n.measures) for (let o of n.measures) {
 		let [s, c] = o.split("."), l = i.get(s);
 		if (!l?.measures?.[c]) continue;
@@ -6353,11 +6501,11 @@ function Bt(e, t, n, r, i, a) {
 		if (!m?.measures?.[p]) continue;
 		let h = m.measures[p], g = t.preAggregationCTEs?.find((e) => e.cube?.name === f && e.measures?.includes(d)), _;
 		_ = g ? D`sum(${D`${D.identifier(g.cteAlias)}.${D.identifier(p)}`})` : a.queryBuilder.buildMeasureExpression(h, r, m), e[d] || (e[d] = D`${_}`.as(d));
-		let v = Vt(u, _, n, r, l, t, a);
+		let v = Gt(u, _, n, r, l, t, a);
 		v && (e[o] = D`${v}`.as(o));
 	}
 }
-function Vt(e, t, n, r, i, a, o) {
+function Gt(e, t, n, r, i, a, o) {
 	let s = e.windowConfig || {}, c = (e, t) => {
 		if (!a.preAggregationCTEs) return null;
 		let n = a.preAggregationCTEs.find((t) => t.cube?.name === e);
@@ -6427,7 +6575,7 @@ function Vt(e, t, n, r, i, a, o) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/selection-processor.ts
-function Ht(e, t, n, r, i) {
+function Kt(e, t, n, r, i) {
 	let a = { ...i.queryBuilder.buildSelections(e.joinCubes.length > 0 ? r : e.primaryCube, t, n) };
 	if (e.preAggregationCTEs) for (let o of e.preAggregationCTEs) {
 		let e = o.cube.name;
@@ -6438,7 +6586,7 @@ function Ht(e, t, n, r, i) {
 			let u = l.measures[c], d = D`${D.identifier(o.cteAlias)}.${D.identifier(c)}`, f;
 			if (u.type === "calculated" && u.calculatedSql) f = i.queryBuilder.buildCTECalculatedMeasure(u, l, o, r, n);
 			else {
-				let e = o.cteReason === "fanOutPrevention", n = Ut(o, t, r), a = e || n;
+				let e = o.cteReason === "fanOutPrevention", n = qt(o, t, r), a = e || n;
 				switch (u.type) {
 					case "count":
 					case "countDistinct":
@@ -6475,12 +6623,12 @@ function Ht(e, t, n, r, i) {
 			(u || l && s?.dimensions?.[i]) && (a[t] = D`${D.identifier(o.cteAlias)}.${D.identifier(i)}`.as(t));
 		}
 	}
-	return Bt(a, e, t, n, r, i), a;
+	return Wt(a, e, t, n, r, i), a;
 }
-function Ut(e, t, n) {
-	return e.cteReason !== "hasMany" || e.downstreamJoinKeys && e.downstreamJoinKeys.length > 0 || e.intermediateJoins && e.intermediateJoins.length > 0 || !(t.dimensions && t.dimensions.length > 0 || t.timeDimensions && t.timeDimensions.length > 0) || t.dimensions?.some((t) => t.startsWith(`${e.cube.name}.`)) || t.timeDimensions?.some((t) => t.dimension.startsWith(`${e.cube.name}.`)) ? !1 : e.joinKeys.length > 0 && e.joinKeys.every((e) => !!e.sourceColumnObj && Wt(e.sourceColumnObj, t, n));
+function qt(e, t, n) {
+	return e.cteReason !== "hasMany" || e.downstreamJoinKeys && e.downstreamJoinKeys.length > 0 || e.intermediateJoins && e.intermediateJoins.length > 0 || !(t.dimensions && t.dimensions.length > 0 || t.timeDimensions && t.timeDimensions.length > 0) || t.dimensions?.some((t) => t.startsWith(`${e.cube.name}.`)) || t.timeDimensions?.some((t) => t.dimension.startsWith(`${e.cube.name}.`)) ? !1 : e.joinKeys.length > 0 && e.joinKeys.every((e) => !!e.sourceColumnObj && Jt(e.sourceColumnObj, t, n));
 }
-function Wt(e, t, n) {
+function Jt(e, t, n) {
 	if (t.dimensions) for (let r of t.dimensions) {
 		let [t, i] = r.split(".");
 		if (n.get(t)?.dimensions?.[i]?.sql === e) return !0;
@@ -6494,7 +6642,7 @@ function Wt(e, t, n) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/joins-processor.ts
-function Gt(e, t, n, r, i, a) {
+function Yt(e, t, n, r, i, a) {
 	let o = [], s = t.db.select(r).from(n.from);
 	if (i.ctes.length > 0 && (s = t.db.with(...i.ctes).select(r).from(n.from)), n.joins) for (let e of n.joins) switch (e.type || "left") {
 		case "left":
@@ -6594,7 +6742,7 @@ function Gt(e, t, n, r, i, a) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/predicates-processor.ts
-function Kt(e, t, n, r, i, a, o, s) {
+function Xt(e, t, n, r, i, a, o, s) {
 	let c = [...o.allWhereConditions];
 	if (i.where && c.push(i.where), e.joinCubes && e.joinCubes.length > 0) for (let t of e.joinCubes) {
 		let e = t.cube.name;
@@ -6622,14 +6770,14 @@ function Kt(e, t, n, r, i, a, o, s) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/shared.ts
-function qt(e) {
+function Zt(e) {
 	let t = /* @__PURE__ */ new Map();
 	if (t.set(e.primaryCube.name, e.primaryCube), e.joinCubes) for (let n of e.joinCubes) t.set(n.cube.name, n.cube);
 	return t;
 }
 //#endregion
 //#region src/server/physical-plan/drizzle-plan-builder.ts
-var Jt = class {
+var Qt = class {
 	constructor(e, t, n) {
 		this.queryBuilder = e, this.cteBuilder = t, this.databaseAdapter = n;
 	}
@@ -6769,13 +6917,13 @@ var Jt = class {
 		if (i) return i;
 		let a = this.tryBuildKeysDeduplicationQuery(e, t, n, r);
 		if (a) return a;
-		let o = zt(e, t, n, r), s = e.primaryCube.sql(n), c = e.joinCubes.length > 0 ? qt(e) : new Map([[e.primaryCube.name, e.primaryCube]]);
-		return Kt(e, t, n, c, s, o, Gt(e, n, s, Ht(e, t, n, c, r), o, r), r);
+		let o = Ut(e, t, n, r), s = e.primaryCube.sql(n), c = e.joinCubes.length > 0 ? Zt(e) : new Map([[e.primaryCube.name, e.primaryCube]]);
+		return Xt(e, t, n, c, s, o, Yt(e, n, s, Kt(e, t, n, c, r), o, r), r);
 	}
 	tryBuildKeysDeduplicationQuery(e, t, n, r) {
 		let i = e.keysDeduplication;
 		if (!i?.multipliedCubeName || !t.measures?.length) return null;
-		let a = e.joinCubes.length > 0 ? qt(e) : new Map([[e.primaryCube.name, e.primaryCube]]), o = a.get(i.multipliedCubeName);
+		let a = e.joinCubes.length > 0 ? Zt(e) : new Map([[e.primaryCube.name, e.primaryCube]]), o = a.get(i.multipliedCubeName);
 		if (!o || !this.canExecuteKeysDeduplication(t, o, i.multipliedCubeName)) return null;
 		let s = i.primaryKeyDimensions.length > 0 ? i.primaryKeyDimensions : this.getPrimaryKeyDimensions(o);
 		if (s.length === 0) return null;
@@ -6994,7 +7142,7 @@ function $(e, t) {
 		console.log(`\n[DC_DEBUG] ${e}`), console.log(n), r.length > 0 && console.log("params:", r), console.log();
 	} catch {}
 }
-var Yt = class {
+var $t = class {
 	queryBuilder;
 	drizzlePlanBuilder;
 	databaseAdapter;
@@ -7008,9 +7156,9 @@ var Yt = class {
 	rlsSetup;
 	constructor(e, t, n) {
 		if (this.dbExecutor = e, this.databaseAdapter = e.databaseAdapter, !this.databaseAdapter) throw Error("DatabaseExecutor must have a databaseAdapter property");
-		this.queryBuilder = new _t(this.databaseAdapter);
-		let r = new yt(), i = new bt(this.queryBuilder);
-		this.drizzlePlanBuilder = new Jt(this.queryBuilder, i, this.databaseAdapter), this.comparisonQueryBuilder = new kt(this.databaseAdapter), this.funnelQueryBuilder = new At(this.databaseAdapter), this.flowQueryBuilder = new jt(this.databaseAdapter), this.retentionQueryBuilder = new It(this.databaseAdapter), this.logicalPlanBuilder = new Lt(r), this.planOptimiser = new Rt(), this.cacheConfig = t, this.rlsSetup = n;
+		this.queryBuilder = new vt(this.databaseAdapter);
+		let r = new bt(), i = new xt(this.queryBuilder);
+		this.drizzlePlanBuilder = new Qt(this.queryBuilder, i, this.databaseAdapter), this.comparisonQueryBuilder = new Nt(this.databaseAdapter), this.funnelQueryBuilder = new Pt(this.databaseAdapter), this.flowQueryBuilder = new Ft(this.databaseAdapter), this.retentionQueryBuilder = new Bt(this.databaseAdapter), this.logicalPlanBuilder = new Vt(r), this.planOptimiser = new Ht(), this.cacheConfig = t, this.rlsSetup = n;
 	}
 	async withRLSContext(e, t) {
 		if (!this.rlsSetup) return t();
@@ -7028,7 +7176,7 @@ var Yt = class {
 			let i = this.resolveQueryMode(t);
 			this.validateQueryForMode(i, e, t);
 			let a;
-			if (this.cacheConfig?.enabled !== !1 && this.cacheConfig?.provider) if (a = at(t, n, this.cacheConfig), r?.skipCache) this.cacheConfig.onCacheEvent?.({
+			if (this.cacheConfig?.enabled !== !1 && this.cacheConfig?.provider) if (a = ot(t, n, this.cacheConfig), r?.skipCache) this.cacheConfig.onCacheEvent?.({
 				type: "miss",
 				key: a,
 				durationMs: 0
@@ -7214,7 +7362,7 @@ var Yt = class {
 		$("query", s);
 		let c = this.queryBuilder.collectNumericFields(e, t), l = await this.dbExecutor.execute(s, c);
 		return {
-			data: Ot(Array.isArray(l) ? l.map((e) => {
+			data: At(Array.isArray(l) ? l.map((e) => {
 				let n = { ...e };
 				if (t.timeDimensions) {
 					for (let e of t.timeDimensions) if (e.dimension in n) {
@@ -7341,7 +7489,7 @@ var Yt = class {
 	}
 	validateQueryForMode(e, t, n) {
 		let r = () => {
-			let e = Qt(t, n);
+			let e = nn(t, n);
 			if (!e.isValid) throw Error(`Query validation failed: ${e.errors.join(", ")}`);
 		};
 		({
@@ -7359,7 +7507,7 @@ var Yt = class {
 				let e = this.retentionQueryBuilder.validateConfig(n.retention, t);
 				if (!e.isValid) throw Error(`Retention validation failed: ${e.errors.join(", ")}`);
 			}
-		})[tt(e)]();
+		})[nt(e)]();
 	}
 	async executeQueryByModeWithCache(e, t, n, r, i) {
 		return {
@@ -7368,7 +7516,7 @@ var Yt = class {
 			funnel: () => this.executeFunnelQueryWithCache(t, n, r, i),
 			flow: () => this.executeFlowQueryWithCache(t, n, r, i),
 			retention: () => this.executeRetentionQueryWithCache(t, n, r, i)
-		}[tt(e)]();
+		}[nt(e)]();
 	}
 	async executeRegularQueryWithCache(e, t, n, r) {
 		let i = new K(), a = this.createQueryContext(n, i, t);
@@ -7378,7 +7526,7 @@ var Yt = class {
 		let c = this.drizzlePlanBuilder.build(s, t, a);
 		$("query", c);
 		let l = this.queryBuilder.collectNumericFields(e, t), u = await this.dbExecutor.execute(c, l), d = {
-			data: Ot(Array.isArray(u) ? u.map((e) => {
+			data: At(Array.isArray(u) ? u.map((e) => {
 				let n = { ...e };
 				if (t.timeDimensions) {
 					for (let e of t.timeDimensions) if (e.dimension in n) {
@@ -7416,7 +7564,7 @@ var Yt = class {
 			funnel: () => this.dryRunFunnel(t, n, r),
 			flow: () => this.dryRunFlow(t, n, r),
 			retention: () => this.dryRunRetention(t, n, r)
-		}[tt(e)]();
+		}[nt(e)]();
 	}
 	async generateComparisonSQL(e, t, n) {
 		let r = this.buildComparisonExecutionPlan(t).periodQueries[0];
@@ -7468,7 +7616,7 @@ var Yt = class {
 	}
 	preloadFilterCache(e, t, n, r) {
 		if (e.filters && e.filters.length > 0) {
-			let i = it(e.filters);
+			let i = at(e.filters);
 			for (let e of i) {
 				let i = G(e);
 				if (t.has(i)) continue;
@@ -7486,7 +7634,7 @@ var Yt = class {
 		}
 		if (e.timeDimensions) {
 			for (let i of e.timeDimensions) if (i.dateRange) {
-				let e = rt(i.dimension, i.dateRange);
+				let e = it(i.dimension, i.dateRange);
 				if (t.has(e)) continue;
 				let [a, o] = i.dimension.split("."), s = n.get(a);
 				if (!s) continue;
@@ -7497,7 +7645,7 @@ var Yt = class {
 			}
 		}
 	}
-}, Xt = class t {
+}, en = class t {
 	cubes = /* @__PURE__ */ new Map();
 	metadataCache;
 	cacheConfig;
@@ -7522,10 +7670,10 @@ var Yt = class {
 	}
 	createDbExecutor() {
 		if (!this.db) throw Error("Database executor not configured");
-		return Ze(this.db, this.schema, this.engineType);
+		return Qe(this.db, this.schema, this.engineType);
 	}
 	createQueryExecutor(e = !1) {
-		return new Yt(this.createDbExecutor(), e ? this.cacheConfig : void 0, this.rlsSetup);
+		return new $t(this.createDbExecutor(), e ? this.cacheConfig : void 0, this.rlsSetup);
 	}
 	formatSqlResult(t) {
 		let n = this.getEngineType() ?? "postgres";
@@ -7549,7 +7697,7 @@ var Yt = class {
 				t.push(`Calculated measure '${e.name}.${n}' must have calculatedSql property`);
 				continue;
 			}
-			let i = mt(r.calculatedSql);
+			let i = ht(r.calculatedSql);
 			if (!i.isValid) {
 				t.push(`Invalid calculatedSql syntax in '${e.name}.${n}': ${i.errors.join(", ")}`);
 				continue;
@@ -7719,18 +7867,18 @@ var Yt = class {
 		return Array.from(this.cubes.keys());
 	}
 	validateQuery(e) {
-		return Qt(this.cubes, e);
+		return nn(this.cubes, e);
 	}
 	analyzeQuery(e, t) {
 		return this.createQueryExecutor(!0).analyzeQuery(this.cubes, e, t);
 	}
 };
-function Zt(e) {
+function tn(e) {
 	let t = [];
 	return e.timeDimensions?.some((e) => e.compareDateRange && e.compareDateRange.length >= 2) && t.push("comparison"), e.funnel !== void 0 && e.funnel.steps?.length >= 2 && t.push("funnel"), e.flow !== void 0 && e.flow.startingStep !== void 0 && e.flow.eventDimension !== void 0 && t.push("flow"), e.retention !== void 0 && e.retention.timeDimension != null && e.retention.bindingKey != null && t.push("retention"), t.length === 0 ? [] : t;
 }
-function Qt(e, t) {
-	let n = [], r = Zt(t);
+function nn(e, t) {
+	let n = [], r = tn(t);
 	if (r.length > 1) return n.push(`Query contains multiple query modes: ${r.join(", ")}`), {
 		isValid: !1,
 		errors: n
@@ -7751,7 +7899,7 @@ function Qt(e, t) {
 			}
 		},
 		retention: () => {
-			let r = t.retention, i = en(r.timeDimension);
+			let r = t.retention, i = an(r.timeDimension);
 			i && !e.has(i) && n.push(`Retention cube not found: ${i}`);
 			let a = r.bindingKey;
 			if (typeof a == "string") {
@@ -7817,7 +7965,7 @@ function Qt(e, t) {
 		}
 		o.dimensions[i] || n.push(`TimeDimension '${i}' not found on cube '${t}' (must be a dimension with time type)`);
 	}
-	if (t.filters) for (let r of t.filters) $t(r, e, n, a);
+	if (t.filters) for (let r of t.filters) rn(r, e, n, a);
 	if (a.size === 0 && n.push("Query must reference at least one cube through measures, dimensions, or filters"), t.ungrouped) {
 		t.dimensions && t.dimensions.length > 0 || t.timeDimensions && t.timeDimensions.length > 0 || n.push("Ungrouped queries require at least one dimension or time dimension"), t.funnel && n.push("Ungrouped queries are incompatible with funnel analysis"), t.flow && n.push("Ungrouped queries are incompatible with flow analysis"), t.retention && n.push("Ungrouped queries are incompatible with retention analysis"), t.timeDimensions?.some((e) => e.compareDateRange && e.compareDateRange.length > 0) && n.push("Ungrouped queries are incompatible with compareDateRange"), t.timeDimensions?.some((e) => e.fillMissingDates === !0) && n.push("Ungrouped queries are incompatible with fillMissingDates");
 		let r = new Set([
@@ -7872,10 +8020,10 @@ function Qt(e, t) {
 		errors: n
 	};
 }
-function $t(e, t, n, r) {
+function rn(e, t, n, r) {
 	if ("and" in e || "or" in e) {
 		let i = e.and || e.or || [];
-		for (let e of i) $t(e, t, n, r);
+		for (let e of i) rn(e, t, n, r);
 		return;
 	}
 	if (!("member" in e)) {
@@ -7898,7 +8046,7 @@ function $t(e, t, n, r) {
 		n.push(`Filter field '${a}' not found on cube '${i}' (must be a dimension or measure)${e}`);
 	}
 }
-function en(e) {
+function an(e) {
 	if (typeof e == "string") {
 		let [t] = e.split(".");
 		return t || null;
@@ -7906,4 +8054,4 @@ function en(e) {
 	return e.cube;
 }
 //#endregion
-export { Xt as t };
+export { en as t };