drizzle-cube 0.5.0 → 0.5.3

package/dist/adapters/{locale-DTnJrxm1.js → locale-D9VQkLXt.js}

@@ -1,4 +1,4 @@
-import { _ as e, s as t } from "./utils-DOg9oGdt.js";
+import { _ as e, s as t } from "./utils-CTYvfZ3I.js";
 //#region node_modules/drizzle-orm/entity.js
 var n = Symbol.for("drizzle:entityKind");
 function r(e, t) {
@@ -397,7 +397,7 @@ function P(...e) {
 		new S(")")
 	]);
 }
-function F(...e) {
+function ne(...e) {
 	let t = e.filter((e) => e !== void 0);
 	if (t.length !== 0) return t.length === 1 ? new C(t) : new C([
 		new S("("),
@@ -405,34 +405,34 @@ function F(...e) {
 		new S(")")
 	]);
 }
-var ne = (e, t) => O`${e} > ${j(t, e)}`, I = (e, t) => O`${e} >= ${j(t, e)}`, re = (e, t) => O`${e} < ${j(t, e)}`, L = (e, t) => O`${e} <= ${j(t, e)}`;
-function ie(e, t) {
+var re = (e, t) => O`${e} > ${j(t, e)}`, F = (e, t) => O`${e} >= ${j(t, e)}`, ie = (e, t) => O`${e} < ${j(t, e)}`, I = (e, t) => O`${e} <= ${j(t, e)}`;
+function ae(e, t) {
 	return Array.isArray(t) ? t.length === 0 ? O`false` : O`${e} in ${t.map((t) => j(t, e))}` : O`${e} in ${j(t, e)}`;
 }
-function ae(e, t) {
+function oe(e, t) {
 	return Array.isArray(t) ? t.length === 0 ? O`true` : O`${e} not in ${t.map((t) => j(t, e))}` : O`${e} not in ${j(t, e)}`;
 }
-function oe(e) {
+function se(e) {
 	return O`${e} is null`;
 }
-function se(e) {
+function ce(e) {
 	return O`${e} is not null`;
 }
-function ce(e, t) {
+function le(e, t) {
 	if (Array.isArray(t)) {
 		if (t.length === 0) throw Error("arrayContains requires at least one value");
 		return O`${e} @> ${O`${j(t, e)}`}`;
 	}
 	return O`${e} @> ${j(t, e)}`;
 }
-function le(e, t) {
+function ue(e, t) {
 	if (Array.isArray(t)) {
 		if (t.length === 0) throw Error("arrayContained requires at least one value");
 		return O`${e} <@ ${O`${j(t, e)}`}`;
 	}
 	return O`${e} <@ ${j(t, e)}`;
 }
-function ue(e, t) {
+function de(e, t) {
 	if (Array.isArray(t)) {
 		if (t.length === 0) throw Error("arrayOverlaps requires at least one value");
 		return O`${e} && ${O`${j(t, e)}`}`;
@@ -441,32 +441,32 @@ function ue(e, t) {
 }
 //#endregion
 //#region node_modules/drizzle-orm/sql/expressions/select.js
-function de(e) {
+function fe(e) {
 	return O`${e} asc`;
 }
-function fe(e) {
+function pe(e) {
 	return O`${e} desc`;
 }
 //#endregion
 //#region node_modules/drizzle-orm/sql/functions/aggregate.js
-function pe(e) {
+function me(e) {
 	return O`count(${e || O.raw("*")})`.mapWith(Number);
 }
-function me(e) {
+function he(e) {
 	return O`count(distinct ${e})`.mapWith(Number);
 }
-function R(e) {
+function L(e) {
 	return O`sum(${e})`.mapWith(String);
 }
-function z(e) {
+function R(e) {
 	return O`max(${e})`.mapWith(r(e, i) ? e : String);
 }
-function B(e) {
+function ge(e) {
 	return O`min(${e})`.mapWith(r(e, i) ? e : String);
 }
 //#endregion
 //#region src/server/adapters/base-adapter.ts
-var V = class {
+var z = class {
 	preprocessCalculatedTemplate(e) {
 		return e;
 	}
@@ -495,7 +495,7 @@ var V = class {
 		let t = this.parseISODuration(e);
 		return t.years * 365 * 24 * 60 * 60 + t.months * 30 * 24 * 60 * 60 + t.days * 24 * 60 * 60 + t.hours * 60 * 60 + t.minutes * 60 + t.seconds;
 	}
-}, he = class extends V {
+}, _e = class extends z {
 	getEngineType() {
 		return "postgres";
 	}
@@ -633,7 +633,7 @@ var V = class {
 			default: throw Error(`Unsupported window function: ${e}`);
 		}
 	}
-}, ge = class extends V {
+}, ve = class extends z {
 	getEngineType() {
 		return "mysql";
 	}
@@ -780,7 +780,7 @@ var V = class {
 			default: throw Error(`Unsupported window function: ${e}`);
 		}
 	}
-}, _e = class extends V {
+}, ye = class extends z {
 	getEngineType() {
 		return "sqlite";
 	}
@@ -871,7 +871,7 @@ var V = class {
 		return e.length > 1e3 ? e : e.replace(/(\{[^}]+\})\s*\/\s*/g, (e, t) => `${t.replace(/\{([^}]+)\}/, "CAST({$1} AS REAL)")} / `);
 	}
 	convertFilterValue(e) {
-		return typeof e == "boolean" ? e ? 1 : 0 : e instanceof Date ? e.getTime() : Array.isArray(e) ? e.map((e) => this.convertFilterValue(e)) : e;
+		return typeof e == "boolean" ? +!!e : e instanceof Date ? e.getTime() : Array.isArray(e) ? e.map((e) => this.convertFilterValue(e)) : e;
 	}
 	prepareDateValue(e) {
 		if (!(e instanceof Date)) {
@@ -932,11 +932,11 @@ var V = class {
 			default: throw Error(`Unsupported window function: ${e}`);
 		}
 	}
-}, ve = class extends ge {
+}, be = class extends ve {
 	getEngineType() {
 		return "singlestore";
 	}
-}, ye = class extends V {
+}, xe = class extends z {
 	getEngineType() {
 		return "duckdb";
 	}
@@ -1069,7 +1069,7 @@ var V = class {
 			default: throw Error(`Unsupported window function: ${e}`);
 		}
 	}
-}, be = class extends V {
+}, Se = class extends z {
 	getEngineType() {
 		return "databend";
 	}
@@ -1203,7 +1203,7 @@ var V = class {
 			default: throw Error(`Unsupported window function: ${e}`);
 		}
 	}
-}, xe = class extends V {
+}, Ce = class extends z {
 	getEngineType() {
 		return "snowflake";
 	}
@@ -1339,29 +1339,29 @@ var V = class {
 };
 //#endregion
 //#region src/server/database-utils.ts
-function Se(e) {
+function we(e) {
 	switch (e) {
-		case "postgres": return new he();
-		case "mysql": return new ge();
-		case "sqlite": return new _e();
-		case "singlestore": return new ve();
-		case "duckdb": return new ye();
-		case "databend": return new be();
-		case "snowflake": return new xe();
+		case "postgres": return new _e();
+		case "mysql": return new ve();
+		case "sqlite": return new ye();
+		case "singlestore": return new be();
+		case "duckdb": return new xe();
+		case "databend": return new Se();
+		case "snowflake": return new Ce();
 		default: throw Error(`Unsupported database engine: ${e}`);
 	}
 }
 //#endregion
 //#region src/server/executors/base-executor.ts
-var H = class {
+var B = class {
 	databaseAdapter;
 	constructor(e, t, n) {
-		this.db = e, this.schema = t, this.databaseAdapter = Se(n || this.getEngineType());
+		this.db = e, this.schema = t, this.databaseAdapter = we(n || this.getEngineType());
 	}
 };
 //#endregion
 //#region src/server/explain/postgres-parser.ts
-function Ce(e, t) {
+function Te(e, t) {
 	let n = [], r = [], i = !1, a, o, s, c = [];
 	for (let t of e) {
 		let e = t.match(/Planning Time:\s*([\d.]+)\s*ms/i);
@@ -1374,7 +1374,7 @@ function Ce(e, t) {
 			o = parseFloat(l[1]);
 			continue;
 		}
-		let u = we(t);
+		let u = Ee(t);
 		if (u) {
 			u.type.includes("Seq Scan") && (i = !0), u.index && r.push(u.index), n.length === 0 && u.estimatedCost !== void 0 && (s = u.estimatedCost);
 			let e = t.search(/\S/);
@@ -1404,7 +1404,7 @@ function Ce(e, t) {
 		sql: t
 	};
 }
-function we(e) {
+function Ee(e) {
 	let t = e.replace(/^[\s->]+/, "").trim();
 	if (!t) return null;
 	let n = t.match(/^([A-Za-z][A-Za-z0-9 ]+?)(?:\s+using\s+(\S+))?(?:\s+on\s+(\S+))?(?:\s+\w+)?(?:\s+\(cost=([\d.]+)\.\.([\d.]+)\s+rows=(\d+)(?:\s+width=\d+)?\))?(?:\s+\(actual time=([\d.]+)\.\.([\d.]+)\s+rows=(\d+)\s+loops=(\d+)\))?/i);
@@ -1422,17 +1422,17 @@ function we(e) {
 }
 //#endregion
 //#region src/server/executors/postgres-executor.ts
-function Te(e) {
+function De(e) {
 	return Array.isArray(e) ? e : e && typeof e == "object" && "rows" in e && Array.isArray(e.rows) ? e.rows : [];
 }
-var Ee = class extends H {
+var Oe = class extends B {
 	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), r = Te(n);
+		let n = await this.db.execute(e), r = De(n);
 		return r.length > 0 ? r.map((e) => this.convertNumericFields(e, t)) : n;
 	}
 	convertNumericFields(e, t) {
@@ -1471,11 +1471,11 @@ var Ee = 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 = [];
-		for (let e of Te(i)) if (e && typeof e == "object") {
+		for (let e of De(i)) if (e && typeof e == "object") {
 			let t = e["QUERY PLAN"] || e["query plan"] || e.queryplan;
 			typeof t == "string" && a.push(t);
 		}
-		return Ce(a, {
+		return Te(a, {
 			sql: e,
 			params: t
 		});
@@ -1484,7 +1484,7 @@ var Ee = 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 = Te(await this.db.execute(O`
+			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = De(await this.db.execute(O`
         SELECT
           t.relname as table_name,
           i.relname as index_name,
@@ -1514,12 +1514,12 @@ var Ee = class extends H {
 		}
 	}
 };
-function De(e, t) {
-	return new Ee(e, t, "postgres");
+function ke(e, t) {
+	return new Oe(e, t, "postgres");
 }
 //#endregion
 //#region src/server/explain/mysql-parser.ts
-function Oe(e, t) {
+function Ae(e, t) {
 	let n = t?.toLowerCase() || "";
 	switch (e.toLowerCase()) {
 		case "all": return "Seq Scan";
@@ -1533,10 +1533,10 @@ function Oe(e, t) {
 		default: return `MySQL ${e}`;
 	}
 }
-function ke(e, t) {
+function je(e, t) {
 	let n = [], r = [], i = !1, a = 0;
 	for (let t of e) {
-		let e = Oe(t.type, t.Extra);
+		let e = Ae(t.type, t.Extra);
 		t.type.toLowerCase() === "all" && (i = !0), t.key && r.push(t.key);
 		let o = {
 			type: e,
@@ -1567,7 +1567,7 @@ function ke(e, t) {
 }
 //#endregion
 //#region src/server/executors/mysql-executor.ts
-var Ae = class extends H {
+var Me = class extends B {
 	async execute(e, t) {
 		if (e && typeof e == "object" && typeof e.execute == "function") {
 			let n = await e.execute();
@@ -1617,7 +1617,7 @@ var Ae = class extends H {
 			filtered: Number(e.filtered) || 100,
 			Extra: e.Extra || null
 		});
-		return ke(s, {
+		return je(s, {
 			sql: e,
 			params: t
 		});
@@ -1651,12 +1651,12 @@ var Ae = class extends H {
 		}
 	}
 };
-function je(e, t) {
-	return new Ae(e, t, "mysql");
+function Ne(e, t) {
+	return new Me(e, t, "mysql");
 }
 //#endregion
 //#region src/server/explain/sqlite-parser.ts
-function Me(e) {
+function Pe(e) {
 	let t = e.toLowerCase(), n = e.match(/^SCAN\s+(\S+)/i);
 	if (n) return {
 		type: "Seq Scan",
@@ -1681,10 +1681,10 @@ function Me(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 Ne(e, t) {
+function Fe(e, t) {
 	let n = [], r = [], i = !1, a = /* @__PURE__ */ new Map();
 	for (let t of e) {
-		let e = Me(t.detail);
+		let e = Pe(t.detail);
 		e.type === "Seq Scan" && (i = !0), e.index && r.push(e.index);
 		let o = {
 			type: e.type,
@@ -1715,7 +1715,7 @@ function Ne(e, t) {
 }
 //#endregion
 //#region src/server/executors/sqlite-executor.ts
-var Pe = class extends H {
+var Ie = class extends B {
 	async execute(e, t) {
 		if (e && typeof e == "object" && typeof e.execute == "function") {
 			let n = await e.execute();
@@ -1764,7 +1764,7 @@ var Pe = class extends H {
 			notused: Number(e.notused) || 0,
 			detail: String(e.detail || "")
 		});
-		return Ne(s, {
+		return Fe(s, {
 			sql: e,
 			params: t
 		});
@@ -1797,29 +1797,29 @@ var Pe = class extends H {
 		}
 	}
 };
-function Fe(e, t) {
-	return new Pe(e, t, "sqlite");
+function Le(e, t) {
+	return new Ie(e, t, "sqlite");
 }
 //#endregion
 //#region src/server/executors/singlestore-executor.ts
-var Ie = class extends Ae {
+var Re = class extends Me {
 	getEngineType() {
 		return "singlestore";
 	}
 };
-function Le(e, t) {
-	return new Ie(e, t);
+function ze(e, t) {
+	return new Re(e, t);
 }
 //#endregion
 //#region src/server/explain/duckdb-parser.ts
-function Re(e, t) {
+function Be(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 = Be(t);
+		let e = He(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 = ze(t);
+			let s = Ve(t);
 			for (; o.length > 0 && o[o.length - 1].indent >= s;) o.pop();
 			if (o.length === 0) n.push(e);
 			else {
@@ -1846,13 +1846,13 @@ function Re(e, t) {
 		sql: t
 	};
 }
-function ze(e) {
+function Ve(e) {
 	let t = 0;
 	for (let n of e) if (n === " " || n === "│" || n === "├" || n === "└" || n === "─") t++;
 	else break;
 	return t;
 }
-function Be(e) {
+function He(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);
@@ -1878,7 +1878,7 @@ function Be(e) {
 }
 //#endregion
 //#region src/server/executors/duckdb-executor.ts
-var Ve = class extends H {
+var Ue = class extends B {
 	async execute(e, t) {
 		if (e && typeof e == "object" && typeof e.execute == "function") try {
 			let n = await e.execute();
@@ -1972,7 +1972,7 @@ var Ve = class extends H {
 				typeof t == "string" && a.push(t);
 			}
 		}
-		return Re(a, {
+		return Be(a, {
 			sql: e,
 			params: t
 		});
@@ -2005,19 +2005,19 @@ var Ve = class extends H {
 		}
 	}
 };
-function He(e, t) {
-	return new Ve(e, t, "duckdb");
+function We(e, t) {
+	return new Ue(e, t, "duckdb");
 }
 //#endregion
 //#region src/server/explain/databend-parser.ts
-function Ue(e, t) {
+function Ge(e, t) {
 	let n = [], r = [], i = !1, a, o = [];
 	for (let t of e) {
 		if (!t.trim()) continue;
-		let e = Ge(t);
+		let e = qe(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 = We(t);
+			let s = Ke(t);
 			for (; o.length > 0 && o[o.length - 1].indent >= s;) o.pop();
 			if (o.length === 0) n.push(e);
 			else {
@@ -2044,13 +2044,13 @@ function Ue(e, t) {
 		sql: t
 	};
 }
-function We(e) {
+function Ke(e) {
 	let t = 0;
 	for (let n of e) if (n === " " || n === "│" || n === "├" || n === "└" || n === "─") t++;
 	else break;
 	return t;
 }
-function Ge(e) {
+function qe(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+))?/);
@@ -2064,7 +2064,7 @@ function Ge(e) {
 }
 //#endregion
 //#region src/server/executors/databend-executor.ts
-var Ke = class extends H {
+var Je = class extends B {
 	async execute(e, t) {
 		if (e && typeof e == "object" && typeof e.execute == "function") try {
 			let n = await e.execute();
@@ -2158,7 +2158,7 @@ var Ke = class extends H {
 				typeof t == "string" && a.push(t);
 			}
 		}
-		return Ue(a, {
+		return Ge(a, {
 			sql: e,
 			params: t
 		});
@@ -2167,19 +2167,19 @@ var Ke = class extends H {
 		return !e || e.length, [];
 	}
 };
-function qe(e, t) {
-	return new Ke(e, t, "databend");
+function Ye(e, t) {
+	return new Je(e, t, "databend");
 }
 //#endregion
 //#region src/server/explain/snowflake-parser.ts
-function Je(e, t) {
+function Xe(e, t) {
 	let n = [], r = [], i = !1, a, o = [];
 	for (let t of e) {
 		if (!t.trim()) continue;
-		let e = Xe(t);
+		let e = Qe(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 = Ye(t);
+			let r = Ze(t);
 			for (; o.length > 0 && o[o.length - 1].indent >= r;) o.pop();
 			if (o.length === 0) n.push(e);
 			else {
@@ -2206,13 +2206,13 @@ function Je(e, t) {
 		sql: t
 	};
 }
-function Ye(e) {
+function Ze(e) {
 	let t = 0;
 	for (let n of e) if (n === " " || n === "-" || n === ">") t++;
 	else break;
 	return t;
 }
-function Xe(e) {
+function Qe(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+))?/);
@@ -2226,7 +2226,7 @@ function Xe(e) {
 }
 //#endregion
 //#region src/server/executors/snowflake-executor.ts
-var Ze = class extends H {
+var $e = class extends B {
 	async execute(e, t) {
 		if (e && typeof e == "object" && typeof e.execute == "function") try {
 			let n = await e.execute();
@@ -2319,7 +2319,7 @@ var Ze = class extends H {
 				typeof t == "string" && i.push(t);
 			}
 		}
-		return Je(i, {
+		return Xe(i, {
 			sql: e,
 			params: t
 		});
@@ -2328,31 +2328,31 @@ var Ze = class extends H {
 		return [];
 	}
 };
-function Qe(e, t) {
-	return new Ze(e, t, "snowflake");
+function et(e, t) {
+	return new $e(e, t, "snowflake");
 }
 //#endregion
 //#region src/server/executors/index.ts
-function $e(e, t, n) {
+function tt(e, t, n) {
 	if (n) switch (n) {
-		case "postgres": return De(e, t);
-		case "mysql": return je(e, t);
-		case "sqlite": return Fe(e, t);
-		case "singlestore": return Le(e, t);
-		case "duckdb": return He(e, t);
-		case "databend": return qe(e, t);
-		case "snowflake": return Qe(e, t);
-	}
-	if (e.all && e.run) return Fe(e, t);
-	if (e.execute) return De(e, t);
+		case "postgres": return ke(e, t);
+		case "mysql": return Ne(e, t);
+		case "sqlite": return Le(e, t);
+		case "singlestore": return ze(e, t);
+		case "duckdb": return We(e, t);
+		case "databend": return Ye(e, t);
+		case "snowflake": return et(e, t);
+	}
+	if (e.all && e.run) return Le(e, t);
+	if (e.execute) return ke(e, t);
 	throw Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
 //#endregion
 //#region src/server/cube-utils.ts
-function U(e, t) {
+function V(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 et(e) {
+function nt(e) {
 	switch (e) {
 		case "belongsTo": return "hasMany";
 		case "hasMany": return "belongsTo";
@@ -2361,7 +2361,7 @@ function et(e) {
 		default: return e;
 	}
 }
-function tt(e, t) {
+function rt(e, t) {
 	if (t) return t;
 	switch (e) {
 		case "belongsTo": return "inner";
@@ -2371,17 +2371,17 @@ function tt(e, t) {
 		default: return "left";
 	}
 }
-function nt(e) {
+function it(e) {
 	return e && typeof e == "object" ? O`${O`${e}`}` : e;
 }
-function rt(e) {
+function at(e) {
 	if (e === "__proto__" || e === "constructor" || e === "prototype") throw Error(`Unsafe property key: ${e}`);
 	return e;
 }
-function W(e, t) {
-	return nt(typeof e == "function" ? e(t) : e);
+function H(e, t) {
+	return it(typeof e == "function" ? e(t) : e);
 }
-function it(e, t) {
+function ot(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) {
@@ -2398,7 +2398,7 @@ function it(e, t) {
 		let e = a(t);
 		c = Array.isArray(e) ? e : [e];
 	}
-	let l = tt("belongsToMany", e.sqlJoinType);
+	let l = rt("belongsToMany", e.sqlJoinType);
 	return {
 		junctionJoins: [{
 			joinType: l,
@@ -2414,16 +2414,16 @@ function it(e, t) {
 }
 //#endregion
 //#region src/server/filter-cache.ts
-function G(e) {
-	if ("and" in e) return `and:[${e.and.map(G).sort().join(",")}]`;
-	if ("or" in e) return `or:[${e.or.map(G).sort().join(",")}]`;
+function U(e) {
+	if ("and" in e) return `and:[${e.and.map(U).sort().join(",")}]`;
+	if ("or" in e) return `or:[${e.or.map(U).sort().join(",")}]`;
 	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 at(e, t) {
+function st(e, t) {
 	return `timeDim:${e}:${JSON.stringify(t)}`;
 }
-var K = class {
+var W = class {
 	cache = /* @__PURE__ */ new Map();
 	stats = {
 		hits: 0,
@@ -2461,44 +2461,44 @@ var K = class {
 		};
 	}
 };
-function ot(e) {
+function ct(e) {
 	let t = [];
-	for (let n of e) "and" in n && n.and ? t.push(...ot(n.and)) : "or" in n && n.or ? t.push(...ot(n.or)) : "member" in n && t.push(n);
+	for (let n of e) "and" in n && n.and ? t.push(...ct(n.and)) : "or" in n && n.or ? t.push(...ct(n.or)) : "member" in n && t.push(n);
 	return t;
 }
 //#endregion
 //#region src/server/cache-utils.ts
-function st(e, t, n = {}) {
-	let r = n.keyPrefix ?? "drizzle-cube:", i = ct(e), a = `${r}query:${pt(JSON.stringify(i))}`;
+function lt(e, t, n = {}) {
+	let r = n.keyPrefix ?? "drizzle-cube:", i = ut(e), a = `${r}query:${ht(JSON.stringify(i))}`;
 	if (n.includeSecurityContext !== !1) {
-		let e = pt(n.securityContextSerializer ? n.securityContextSerializer(t) : JSON.stringify(J(t)));
+		let e = ht(n.securityContextSerializer ? n.securityContextSerializer(t) : JSON.stringify(K(t)));
 		a += `:ctx:${e}`;
 	}
 	return a;
 }
-function ct(e) {
+function ut(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 ? ft(e.timeDimensions) : void 0,
+		filters: e.filters ? G(e.filters) : void 0,
+		timeDimensions: e.timeDimensions ? mt(e.timeDimensions) : void 0,
 		limit: e.limit,
 		offset: e.offset,
-		order: e.order ? J(e.order) : void 0,
+		order: e.order ? K(e.order) : void 0,
 		fillMissingDatesValue: e.fillMissingDatesValue,
-		funnel: e.funnel ? lt(e.funnel) : void 0,
-		flow: e.flow ? ut(e.flow) : void 0,
-		retention: e.retention ? dt(e.retention) : void 0
+		funnel: e.funnel ? dt(e.funnel) : void 0,
+		flow: e.flow ? ft(e.flow) : void 0,
+		retention: e.retention ? pt(e.retention) : void 0
 	};
 }
-function lt(e) {
+function dt(e) {
 	return {
 		bindingKey: e.bindingKey,
 		timeDimension: e.timeDimension,
 		steps: e.steps.map((e) => {
 			let t = {
 				name: e.name,
-				filter: e.filter ? Array.isArray(e.filter) ? q(e.filter) : q([e.filter])[0] : void 0,
+				filter: e.filter ? Array.isArray(e.filter) ? G(e.filter) : G([e.filter])[0] : void 0,
 				timeToConvert: e.timeToConvert
 			};
 			return "cube" in e && e.cube && (t.cube = e.cube), t;
@@ -2507,14 +2507,14 @@ function lt(e) {
 		globalTimeWindow: e.globalTimeWindow
 	};
 }
-function ut(e) {
+function ft(e) {
 	return {
 		bindingKey: e.bindingKey,
 		timeDimension: e.timeDimension,
 		eventDimension: e.eventDimension,
 		startingStep: {
 			name: e.startingStep.name,
-			filter: e.startingStep.filter ? Array.isArray(e.startingStep.filter) ? q(e.startingStep.filter) : q([e.startingStep.filter])[0] : void 0
+			filter: e.startingStep.filter ? Array.isArray(e.startingStep.filter) ? G(e.startingStep.filter) : G([e.startingStep.filter])[0] : void 0
 		},
 		stepsBefore: e.stepsBefore,
 		stepsAfter: e.stepsAfter,
@@ -2523,7 +2523,7 @@ function ut(e) {
 		joinStrategy: e.joinStrategy
 	};
 }
-function dt(e) {
+function pt(e) {
 	return {
 		timeDimension: e.timeDimension,
 		bindingKey: e.bindingKey,
@@ -2531,15 +2531,15 @@ function dt(e) {
 		granularity: e.granularity,
 		periods: e.periods,
 		retentionType: e.retentionType,
-		cohortFilters: e.cohortFilters ? Array.isArray(e.cohortFilters) ? q(e.cohortFilters) : q([e.cohortFilters])[0] : void 0,
-		activityFilters: e.activityFilters ? Array.isArray(e.activityFilters) ? q(e.activityFilters) : q([e.activityFilters])[0] : void 0,
+		cohortFilters: e.cohortFilters ? Array.isArray(e.cohortFilters) ? G(e.cohortFilters) : G([e.cohortFilters])[0] : void 0,
+		activityFilters: e.activityFilters ? Array.isArray(e.activityFilters) ? G(e.activityFilters) : G([e.activityFilters])[0] : void 0,
 		breakdownDimensions: e.breakdownDimensions
 	};
 }
-function q(e) {
+function G(e) {
 	return [...e].map((e) => {
-		if ("and" in e && e.and) return { and: q(e.and) };
-		if ("or" in e && e.or) return { or: q(e.or) };
+		if ("and" in e && e.and) return { and: G(e.and) };
+		if ("or" in e && e.or) return { or: G(e.or) };
 		let t = e;
 		return {
 			...t,
@@ -2547,7 +2547,7 @@ function q(e) {
 		};
 	}).sort((e, t) => JSON.stringify(e).localeCompare(JSON.stringify(t)));
 }
-function ft(e) {
+function mt(e) {
 	return [...e].map((e) => ({
 		dimension: e.dimension,
 		granularity: e.granularity,
@@ -2559,22 +2559,22 @@ function ft(e) {
 		}) : void 0
 	})).sort((e, t) => e.dimension.localeCompare(t.dimension));
 }
-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 K(e) {
+	return typeof e != "object" || !e ? e : Array.isArray(e) ? e.map(K) : Object.keys(e).sort().reduce((t, n) => (t[n] = K(e[n]), t), {});
 }
-function pt(e) {
+function ht(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");
 }
 //#endregion
 //#region src/server/builders/date-time-builder.ts
-var Y = class {
+var q = class {
 	constructor(e) {
 		this.databaseAdapter = e;
 	}
 	buildTimeDimensionExpression(e, t, n) {
-		let r = W(e, n);
+		let r = H(e, n);
 		return t ? this.databaseAdapter.buildTimeDimension(t, r) : r instanceof C ? r : O`${r}`;
 	}
 	buildDateRangeCondition(e, t) {
@@ -2586,13 +2586,13 @@ var Y = class {
 				let e = typeof r == "number" ? /* @__PURE__ */ new Date(r * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(r), t = new Date(e);
 				t.setUTCHours(23, 59, 59, 999), r = this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(t.getTime() / 1e3) : t.getTime() : t.toISOString();
 			}
-			return P(I(e, n), L(e, r));
+			return P(F(e, n), I(e, r));
 		}
 		if (typeof t == "string") {
 			let n = this.parseRelativeDateRange(t);
 			if (n) {
 				let t, r;
-				return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (t = Math.floor(n.start.getTime() / 1e3), r = Math.floor(n.end.getTime() / 1e3)) : (t = n.start.getTime(), r = n.end.getTime()) : (t = n.start.toISOString(), r = n.end.toISOString()), P(I(e, t), L(e, r));
+				return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (t = Math.floor(n.start.getTime() / 1e3), r = Math.floor(n.end.getTime() / 1e3)) : (t = n.start.getTime(), r = n.end.getTime()) : (t = n.start.toISOString(), r = n.end.toISOString()), P(F(e, t), I(e, r));
 			}
 			let r = this.normalizeDate(t);
 			if (!r) return null;
@@ -2601,7 +2601,7 @@ var Y = class {
 			let o = new Date(i);
 			o.setUTCHours(23, 59, 59, 999);
 			let s, c;
-			return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (s = Math.floor(a.getTime() / 1e3), c = Math.floor(o.getTime() / 1e3)) : (s = a.getTime(), c = o.getTime()) : (s = a.toISOString(), c = o.toISOString()), P(I(e, s), L(e, c));
+			return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (s = Math.floor(a.getTime() / 1e3), c = Math.floor(o.getTime() / 1e3)) : (s = a.getTime(), c = o.getTime()) : (s = a.toISOString(), c = o.toISOString()), P(F(e, s), I(e, c));
 		}
 		return null;
 	}
@@ -2736,7 +2736,7 @@ var Y = class {
 		let t = new Date(e);
 		return isNaN(t.getTime()) ? null : this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(t.getTime() / 1e3) : t.getTime() : t.toISOString();
 	}
-}, X = class {
+}, J = class {
 	constructor(e, t) {
 		this.databaseAdapter = e, this.dateTimeBuilder = t;
 	}
@@ -2751,18 +2751,18 @@ var Y = class {
 		if (a.length === 0 && !["set", "notSet"].includes(t)) return t === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
 		let o = a[0];
 		switch (t) {
-			case "equals": return a.length > 1 ? r?.type === "time" ? ie(e, a.map((e) => this.dateTimeBuilder.normalizeDate(e) || e)) : ie(e, a) : a.length === 1 ? M(e, r?.type === "time" && this.dateTimeBuilder.normalizeDate(o) || o) : this.databaseAdapter.buildBooleanLiteral(!1);
-			case "notEquals": return a.length > 1 ? ae(e, a) : a.length === 1 ? N(e, o) : null;
+			case "equals": return a.length > 1 ? r?.type === "time" ? ae(e, a.map((e) => this.dateTimeBuilder.normalizeDate(e) || e)) : ae(e, a) : a.length === 1 ? M(e, r?.type === "time" && this.dateTimeBuilder.normalizeDate(o) || o) : this.databaseAdapter.buildBooleanLiteral(!1);
+			case "notEquals": return a.length > 1 ? oe(e, a) : a.length === 1 ? N(e, o) : null;
 			case "contains": return this.databaseAdapter.buildStringCondition(e, "contains", o);
 			case "notContains": return this.databaseAdapter.buildStringCondition(e, "notContains", o);
 			case "startsWith": return this.databaseAdapter.buildStringCondition(e, "startsWith", o);
 			case "endsWith": return this.databaseAdapter.buildStringCondition(e, "endsWith", o);
-			case "gt": return ne(e, o);
-			case "gte": return I(e, o);
-			case "lt": return re(e, o);
-			case "lte": return L(e, o);
-			case "set": return se(e);
-			case "notSet": return oe(e);
+			case "gt": return re(e, o);
+			case "gte": return F(e, o);
+			case "lt": return ie(e, o);
+			case "lte": return I(e, o);
+			case "set": return ce(e);
+			case "notSet": return se(e);
 			case "inDateRange":
 				if (a.length >= 2) {
 					let t = this.dateTimeBuilder.normalizeDate(a[0]), r = this.dateTimeBuilder.normalizeDate(a[1]);
@@ -2772,32 +2772,32 @@ var Y = class {
 							let e = typeof r == "number" ? /* @__PURE__ */ new Date(r * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(r), t = new Date(e);
 							t.setUTCHours(23, 59, 59, 999), r = this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(t.getTime() / 1e3) : t.getTime() : t.toISOString();
 						}
-						return P(I(e, t), L(e, r));
+						return P(F(e, t), I(e, r));
 					}
 				}
 				return null;
 			case "beforeDate": {
 				let t = this.dateTimeBuilder.normalizeDate(o);
-				return t ? re(e, t) : null;
+				return t ? ie(e, t) : null;
 			}
 			case "afterDate": {
 				let t = this.dateTimeBuilder.normalizeDate(o);
-				return t ? ne(e, t) : null;
+				return t ? re(e, t) : null;
 			}
-			case "between": return a.length >= 2 ? P(I(e, a[0]), L(e, a[1])) : null;
-			case "notBetween": return a.length >= 2 ? F(re(e, a[0]), ne(e, a[1])) : null;
-			case "in": return a.length > 0 ? ie(e, a) : null;
-			case "notIn": return a.length > 0 ? ae(e, a) : null;
+			case "between": return a.length >= 2 ? P(F(e, a[0]), I(e, a[1])) : null;
+			case "notBetween": return a.length >= 2 ? ne(ie(e, a[0]), re(e, a[1])) : null;
+			case "in": return a.length > 0 ? ae(e, a) : null;
+			case "notIn": return a.length > 0 ? oe(e, a) : null;
 			case "like": return this.databaseAdapter.buildStringCondition(e, "like", o);
 			case "notLike": return this.databaseAdapter.buildStringCondition(e, "notLike", o);
 			case "ilike": return this.databaseAdapter.buildStringCondition(e, "ilike", o);
 			case "regex": return this.databaseAdapter.buildStringCondition(e, "regex", o);
 			case "notRegex": return this.databaseAdapter.buildStringCondition(e, "notRegex", o);
-			case "isEmpty": return F(oe(e), M(e, ""));
-			case "isNotEmpty": return P(se(e), N(e, ""));
-			case "arrayContains": return this.databaseAdapter.getEngineType() === "postgres" ? ce(e, a) : null;
-			case "arrayOverlaps": return this.databaseAdapter.getEngineType() === "postgres" ? ue(e, a) : null;
-			case "arrayContained": return this.databaseAdapter.getEngineType() === "postgres" ? le(e, a) : null;
+			case "isEmpty": return ne(se(e), M(e, ""));
+			case "isNotEmpty": return P(ce(e), N(e, ""));
+			case "arrayContains": return this.databaseAdapter.getEngineType() === "postgres" ? le(e, a) : null;
+			case "arrayOverlaps": return this.databaseAdapter.getEngineType() === "postgres" ? de(e, a) : null;
+			case "arrayContained": return this.databaseAdapter.getEngineType() === "postgres" ? ue(e, a) : null;
 			default: return null;
 		}
 	}
@@ -2808,7 +2808,7 @@ var Y = class {
 		}
 		if ("or" in e && e.or) {
 			let r = e.or.map((e) => this.buildSingleFilter(e, t, n)).filter((e) => e !== null);
-			return r.length > 0 ? r.length === 1 ? r[0] : F(...r) : null;
+			return r.length > 0 ? r.length === 1 ? r[0] : ne(...r) : null;
 		}
 		return null;
 	}
@@ -2818,10 +2818,10 @@ var Y = class {
 		if (!o) return null;
 		let s = o.dimensions?.[a];
 		if (!s) return null;
-		let c = s.type === "time" ? W(s.sql, n) : typeof s.sql == "function" ? s.sql(n) : s.sql;
+		let c = s.type === "time" ? H(s.sql, n) : typeof s.sql == "function" ? s.sql(n) : s.sql;
 		return this.buildFilterCondition(c, r.operator, r.values, s, r.dateRange);
 	}
-}, Z = class {
+}, Y = class {
 	dependencyGraph;
 	cubes;
 	constructor(e) {
@@ -2949,8 +2949,8 @@ var Y = class {
 };
 //#endregion
 //#region src/server/template-substitution.ts
-function mt(t, n) {
-	let { cube: r, allCubes: i, resolvedMeasures: a } = n, o = ht(t), s = /* @__PURE__ */ new Map();
+function gt(t, n) {
+	let { cube: r, allCubes: i, resolvedMeasures: a } = n, o = _t(t), s = /* @__PURE__ */ new Map();
 	for (let t of o) {
 		let { originalRef: n, cubeName: o, fieldName: c } = t, l = o || r.name;
 		if (!i.get(l)) throw Error(e("server.validation.template.substituteTargetCubeNotFound", {
@@ -2979,7 +2979,7 @@ function mt(t, n) {
 	for (let e = 0; e < c.length; e++) c[e] && d.push(new S(c[e])), e < l.length && d.push(l[e]);
 	return O.join(d, O.raw(""));
 }
-function ht(e) {
+function _t(e) {
 	if (e.length > 1e3) return [];
 	let t = e.matchAll(/\{([^}]+)\}/g), n = [];
 	for (let e of t) {
@@ -2999,7 +2999,7 @@ function ht(e) {
 	}
 	return n;
 }
-function gt(t) {
+function vt(t) {
 	let n = [], r = 0;
 	for (let i = 0; i < t.length; i++) if (t[i] === "{") r++;
 	else if (t[i] === "}" && (r--, r < 0)) {
@@ -3007,7 +3007,7 @@ function gt(t) {
 		break;
 	}
 	r > 0 && n.push(e("server.validation.template.unmatchedOpeningBrace")), /\{\s*\}/.test(t) && n.push(e("server.validation.template.emptyReference")), /\{[^}]*\{/.test(t) && n.push(e("server.validation.template.nestedBraces"));
-	let i = ht(t);
+	let i = _t(t);
 	for (let t of i) {
 		let r = t.cubeName ? `${t.cubeName}.${t.fieldName}` : t.fieldName;
 		/^[a-zA-Z_][a-zA-Z0-9_.]*$/.test(r) || n.push(e("server.validation.template.invalidMemberReference", { ref: `{${t.originalRef}}` })), r.split(".").length > 2 && n.push(e("server.validation.template.multipleDots", { ref: `{${t.originalRef}}` }));
@@ -3017,8 +3017,8 @@ function gt(t) {
 		errors: n
 	};
 }
-function _t(e, t) {
-	let n = ht(e), r = /* @__PURE__ */ new Set();
+function yt(e, t) {
+	let n = _t(e), r = /* @__PURE__ */ new Set();
 	for (let e of n) {
 		let n = `${e.cubeName || t}.${e.fieldName}`;
 		r.add(n);
@@ -3027,12 +3027,12 @@ function _t(e, t) {
 }
 //#endregion
 //#region src/server/builders/measure-builder.ts
-var Q = class e {
+var X = class e {
 	constructor(e) {
 		this.databaseAdapter = e;
 	}
 	buildResolvedMeasures(t, n, r, i) {
-		let a = /* @__PURE__ */ new Map(), o = [], s = [], c = new Set(t), l = new Z(n);
+		let a = /* @__PURE__ */ new Map(), o = [], s = [], c = new Set(t), l = new Y(n);
 		for (let e of n.values()) l.buildGraph(e);
 		let u = [];
 		for (let r of t) {
@@ -3045,11 +3045,11 @@ var Q = class e {
 					n && c.add(n);
 					continue;
 				}
-				Z.isCalculatedMeasure(d) ? (s.push(r), _t(d.calculatedSql, t).forEach((e) => c.add(e)), l.getAllDependencies(r).forEach((e) => {
+				Y.isCalculatedMeasure(d) ? (s.push(r), yt(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) && _t(e.calculatedSql, t).forEach((e) => c.add(e));
+						Y.isCalculatedMeasure(e) && yt(e.calculatedSql, t).forEach((e) => c.add(e));
 					}
 				})) : o.push(r);
 			}
@@ -3059,7 +3059,7 @@ var Q = class e {
 			if (a && a.measures && a.measures[i]) {
 				let n = a.measures[i];
 				if (e.isPostAggregationWindow(n)) continue;
-				Z.isCalculatedMeasure(n) ? s.includes(t) || s.push(t) : o.includes(t) || o.push(t);
+				Y.isCalculatedMeasure(n) ? s.includes(t) || s.push(t) : o.includes(t) || o.push(t);
 			}
 		}
 		for (let e of o) {
@@ -3080,7 +3080,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 mt(this.databaseAdapter.preprocessCalculatedTemplate(e.calculatedSql), {
+		return gt(this.databaseAdapter.preprocessCalculatedTemplate(e.calculatedSql), {
 			cube: t,
 			allCubes: n,
 			resolvedMeasures: r,
@@ -3089,7 +3089,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 = _t(e.calculatedSql, t.name);
+		let a = /* @__PURE__ */ new Map(), o = yt(e.calculatedSql, t.name);
 		for (let e of o) {
 			let [t, i] = e.split("."), o = r.get(t);
 			if (o && o.measures[i]) {
@@ -3100,21 +3100,21 @@ var Q = class e {
 						case "count":
 						case "countDistinct":
 						case "sum":
-							o = R(r);
+							o = L(r);
 							break;
 						case "avg":
 							o = this.databaseAdapter.buildAvg(r);
 							break;
 						case "min":
-							o = B(r);
+							o = ge(r);
 							break;
 						case "max":
-							o = z(r);
+							o = R(r);
 							break;
 						case "number":
-							o = R(r);
+							o = L(r);
 							break;
-						default: o = R(r);
+						default: o = L(r);
 					}
 					a.set(e, () => o);
 				}
@@ -3136,12 +3136,12 @@ var Q = class e {
 				switch (n.type) {
 					case "count":
 					case "countDistinct":
-					case "sum": return R(e);
+					case "sum": return L(e);
 					case "avg": return this.databaseAdapter.buildAvg(e);
-					case "min": return B(e);
-					case "max": return z(e);
-					case "number": return R(e);
-					default: return R(e);
+					case "min": return ge(e);
+					case "max": return R(e);
+					case "number": return L(e);
+					default: return L(e);
 				}
 			}
 		}
@@ -3151,7 +3151,7 @@ var Q = class e {
 		if (t.type === "calculated") throw Error(`Cannot build calculated measure '${t.name}' directly. Use buildCalculatedMeasure instead.`);
 		if (e.isPostAggregationWindow(t)) throw Error(`Post-aggregation window measure '${t.name}' should be built via buildPostAggregationWindowExpression, not buildMeasureExpression.`);
 		if (!t.sql) throw Error(`Measure '${t.name}' of type '${t.type}' is missing required 'sql' property. Only calculated measures and post-aggregation window functions can omit 'sql'.`);
-		let i = W(t.sql, n);
+		let i = H(t.sql, n);
 		if (n.ungrouped) return i;
 		if (t.filters && t.filters.length > 0) {
 			let e = t.filters.map((e) => {
@@ -3167,12 +3167,12 @@ var Q = class e {
 			}
 		}
 		switch (t.type) {
-			case "count": return pe(i);
-			case "countDistinct": return me(i);
-			case "sum": return R(i);
+			case "count": return me(i);
+			case "countDistinct": return he(i);
+			case "sum": return L(i);
 			case "avg": return this.databaseAdapter.buildAvg(i);
-			case "min": return B(i);
-			case "max": return z(i);
+			case "min": return ge(i);
+			case "max": return R(i);
 			case "number": return i;
 			case "stddev":
 			case "stddevSamp": {
@@ -3218,7 +3218,7 @@ var Q = class e {
 				if (e.partitionBy && e.partitionBy.length > 0 && r) {
 					let t = e.partitionBy.map((e) => {
 						let t = e.includes(".") ? e.split(".")[1] : e, i = r.dimensions?.[t];
-						return i ? W(i.sql, n) : (console.warn(`[drizzle-cube] Window function partition dimension '${e}' not found in cube '${r.name}'`), null);
+						return i ? H(i.sql, n) : (console.warn(`[drizzle-cube] Window function partition dimension '${e}' not found in cube '${r.name}'`), null);
 					}).filter((e) => e !== null);
 					t.length > 0 && (a = t);
 				}
@@ -3227,12 +3227,12 @@ var Q = class e {
 					let t = e.orderBy.map((e) => {
 						let t = e.field.includes(".") ? e.field.split(".")[1] : e.field, i = r.dimensions?.[t];
 						if (i) return {
-							field: W(i.sql, n),
+							field: H(i.sql, n),
 							direction: e.direction
 						};
 						let a = r.measures?.[t];
 						return a && a.sql ? {
-							field: W(a.sql, n),
+							field: H(a.sql, n),
 							direction: e.direction
 						} : (console.warn(`[drizzle-cube] Window function order field '${e.field}' not found in cube '${r.name}'`), null);
 					}).filter((e) => e !== null);
@@ -3250,7 +3250,7 @@ var Q = class e {
 				});
 				return s === null ? (console.warn(`[drizzle-cube] ${t.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), O`NULL`) : s;
 			}
-			default: return pe(i);
+			default: return me(i);
 		}
 	}
 	static WINDOW_FUNCTION_TYPES = [
@@ -3324,7 +3324,7 @@ var Q = class e {
 		let { postAggWindowMeasures: r } = e.categorizeForPostAggregation(t, n);
 		return r.length > 0;
 	}
-}, vt = class {
+}, bt = class {
 	constructor(e) {
 		this.dateTimeBuilder = e;
 	}
@@ -3372,8 +3372,8 @@ var Q = class e {
 					l = !0;
 					break;
 				}
-				if (Q.isPostAggregationWindow(e)) {
-					let n = Q.getWindowBaseMeasure(e, t);
+				if (X.isPostAggregationWindow(e)) {
+					let n = X.getWindowBaseMeasure(e, t);
 					if (n) {
 						let [e, t] = n.split("."), r = a.get(e)?.measures?.[t];
 						if (r && this.isAggregateFunctionType(r.type)) {
@@ -3397,7 +3397,7 @@ var Q = class e {
 						i.push(t);
 					}
 				} else {
-					let e = s.dimensions[o], t = W(e.sql, n);
+					let e = s.dimensions[o], t = H(e.sql, n);
 					i.push(t);
 				}
 			}
@@ -3423,13 +3423,13 @@ var Q = class e {
 		}
 		return i;
 	}
-}, yt = class {
+}, xt = class {
 	dateTimeBuilder;
 	filterBuilder;
 	groupByBuilder;
 	measureBuilder;
 	constructor(e) {
-		this.dateTimeBuilder = new Y(e), this.filterBuilder = new X(e, this.dateTimeBuilder), this.groupByBuilder = new vt(this.dateTimeBuilder), this.measureBuilder = new Q(e);
+		this.dateTimeBuilder = new q(e), this.filterBuilder = new J(e, this.dateTimeBuilder), this.groupByBuilder = new bt(this.dateTimeBuilder), this.measureBuilder = new X(e);
 	}
 	buildResolvedMeasures(e, t, n, r) {
 		return this.measureBuilder.buildResolvedMeasures(e, t, n, r);
@@ -3440,7 +3440,7 @@ var Q = class e {
 			let [t, a] = e.split("."), o = i.get(t);
 			if (o && o.dimensions && o.dimensions[a]) {
 				let t = o.dimensions[a];
-				r[e] = O`${W(t.sql, n)}`.as(e);
+				r[e] = O`${H(t.sql, n)}`.as(e);
 			}
 		}
 		if (t.measures) {
@@ -3457,7 +3457,7 @@ var Q = class e {
 				r[e.dimension] = O`${i}`.as(e.dimension);
 			}
 		}
-		return Object.keys(r).length === 0 && (r.count = pe()), r;
+		return Object.keys(r).length === 0 && (r.count = me()), r;
 	}
 	buildCalculatedMeasure(e, t, n, r, i) {
 		return this.measureBuilder.buildCalculatedMeasure(e, t, n, r, i);
@@ -3494,13 +3494,13 @@ 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 = at(e.dimension, e.dateRange), r = n.filterCache.get(t);
+					let t = st(e.dimension, e.dateRange), r = n.filterCache.get(t);
 					if (r) {
 						a.push(r);
 						continue;
 					}
 				}
-				let o = s.dimensions[i], c = W(o.sql, n), l = this.buildDateRangeCondition(c, e.dateRange);
+				let o = s.dimensions[i], c = H(o.sql, n), l = this.buildDateRangeCondition(c, e.dateRange);
 				l && a.push(l);
 			}
 		}
@@ -3523,7 +3523,7 @@ var Q = class e {
 			}
 			if (a.or) {
 				let e = a.or.map((e) => this.processFilter(e, t, n, r, i)).filter((e) => e !== null);
-				return e.length > 0 ? F(...e) : null;
+				return e.length > 0 ? ne(...e) : null;
 			}
 		}
 		let a = e, [o, s] = a.member.split("."), c = t.get(o);
@@ -3534,10 +3534,10 @@ var Q = class e {
 			if (i?.preAggregationCTEs && i.preAggregationCTEs.some((e) => e.cube.name === o)) return null;
 			let t = l.type === "time";
 			if (n.filterCache) {
-				let t = G(e), r = n.filterCache.get(t);
+				let t = U(e), r = n.filterCache.get(t);
 				if (r) return r;
 			}
-			let r = t ? W(l.sql, n) : typeof l.sql == "function" ? l.sql(n) : l.sql;
+			let r = t ? H(l.sql, n) : typeof l.sql == "function" ? l.sql(n) : l.sql;
 			return this.buildFilterCondition(r, a.operator, a.values, d, a.dateRange);
 		} else if (r === "where" && u) return null;
 		else if (r === "having" && u) {
@@ -3563,12 +3563,12 @@ var Q = class e {
 		];
 		if (e.order && Object.keys(e.order).length > 0) for (let [t, i] of Object.entries(e.order)) {
 			if (!r.includes(t)) throw Error(`Cannot order by '${t}': field is not selected in the query`);
-			let e = i === "desc" ? fe(O.identifier(t)) : de(O.identifier(t));
+			let e = i === "desc" ? pe(O.identifier(t)) : fe(O.identifier(t));
 			n.push(e);
 		}
 		if (e.timeDimensions && e.timeDimensions.length > 0) {
 			let t = new Set(Object.keys(e.order || {})), r = [...e.timeDimensions].sort((e, t) => e.dimension.localeCompare(t.dimension));
-			for (let e of r) t.has(e.dimension) || n.push(de(O.identifier(e.dimension)));
+			for (let e of r) t.has(e.dimension) || n.push(fe(O.identifier(e.dimension)));
 		}
 		return n;
 	}
@@ -3603,7 +3603,7 @@ var Q = class e {
 	buildLogicalFilter(e, t, n) {
 		return this.filterBuilder.buildLogicalFilter(e, t, n);
 	}
-}, bt = class {
+}, Z = class {
 	cubes;
 	connectivityCache = /* @__PURE__ */ new Map();
 	reverseIndex;
@@ -3614,7 +3614,7 @@ var Q = class e {
 		let e = /* @__PURE__ */ new Map();
 		for (let [t, n] of this.cubes) if (n.joins) for (let [, r] of Object.entries(n.joins)) {
 			if (r.relationship === "belongsToMany") continue;
-			let n = U(r.targetCube, this.cubes);
+			let n = V(r.targetCube, this.cubes);
 			if (!n) continue;
 			let i = n.name, a = e.get(i);
 			a || (a = [], e.set(i, a)), a.push({
@@ -3635,7 +3635,7 @@ var Q = class e {
 		for (; a.length > 0;) {
 			let { cube: e, path: n } = a.shift(), i = this.cubes.get(e);
 			if (i?.joins) for (let [, s] of Object.entries(i.joins)) {
-				let i = U(s.targetCube, this.cubes);
+				let i = V(s.targetCube, this.cubes);
 				if (!i) continue;
 				let c = i.name;
 				if (o.has(c)) continue;
@@ -3731,7 +3731,7 @@ var Q = class e {
 			if (n.length >= r) continue;
 			let s = this.cubes.get(e);
 			if (s?.joins) for (let [, r] of Object.entries(s.joins)) {
-				let s = U(r.targetCube, this.cubes);
+				let s = V(r.targetCube, this.cubes);
 				if (!s) continue;
 				let c = s.name;
 				if (o.has(c)) continue;
@@ -3789,7 +3789,7 @@ var Q = class e {
 		for (; r.length > 0;) {
 			let { cube: e, path: n } = r.shift(), a = this.cubes.get(e);
 			if (a?.joins) for (let [, o] of Object.entries(a.joins)) {
-				let a = U(o.targetCube, this.cubes);
+				let a = V(o.targetCube, this.cubes);
 				if (!a) continue;
 				let s = a.name;
 				if (i.has(s)) continue;
@@ -3810,7 +3810,7 @@ var Q = class e {
 	buildJoinCondition(e, t, n) {
 		let r = [];
 		for (let i of e.on) {
-			let e = t ? O`${O.identifier(t)}.${O.identifier(i.source.name)}` : nt(i.source), a = n ? O`${O.identifier(n)}.${O.identifier(i.target.name)}` : nt(i.target), o = i.as || M;
+			let e = t ? O`${O.identifier(t)}.${O.identifier(i.source.name)}` : it(i.source), a = n ? O`${O.identifier(n)}.${O.identifier(i.target.name)}` : it(i.target), o = i.as || M;
 			r.push(o(e, a));
 		}
 		return P(...r);
@@ -3820,7 +3820,7 @@ var Q = class e {
 		for (; n.length > 0;) {
 			let e = n.shift(), r = this.cubes.get(e);
 			if (r?.joins) for (let [, e] of Object.entries(r.joins)) {
-				let r = U(e.targetCube, this.cubes);
+				let r = V(e.targetCube, this.cubes);
 				if (!r) continue;
 				let i = r.name;
 				t.has(i) || (t.add(i), n.push(i));
@@ -3840,11 +3840,11 @@ var Q = class e {
 	setInCache(e, t) {
 		this.connectivityCache.set(e, { path: t });
 	}
-}, xt = class {
+}, St = class {
 	resolverCache = /* @__PURE__ */ new WeakMap();
 	getResolver(e) {
 		let t = this.resolverCache.get(e);
-		return t || (t = new bt(e), this.resolverCache.set(e, t)), t;
+		return t || (t = new Z(e), this.resolverCache.set(e, t)), t;
 	}
 	analyzeCubeUsage(e) {
 		let t = /* @__PURE__ */ new Set();
@@ -3936,9 +3936,9 @@ var Q = class e {
 				if (c.has(r)) continue;
 				let l = t.get(r);
 				if (!l) throw Error(e("server.errors.cubeNotFound", { cubeName: r }));
-				let d = u ? et(a.relationship) : a.relationship;
+				let d = u ? nt(a.relationship) : a.relationship;
 				if (d === "belongsToMany" && a.through) {
-					let e = it(a, i.securityContext);
+					let e = ot(a, i.securityContext);
 					s.push({
 						cube: l,
 						alias: `${r.toLowerCase()}_cube`,
@@ -3955,7 +3955,7 @@ var Q = class e {
 						}
 					});
 				} else {
-					let e = o.buildJoinCondition(a, null, null), t = tt(d, a.sqlJoinType);
+					let e = o.buildJoinCondition(a, null, null), t = rt(d, a.sqlJoinType);
 					s.push({
 						cube: l,
 						alias: `${r.toLowerCase()}_cube`,
@@ -4013,7 +4013,7 @@ var Q = class e {
 					targetColumnObj: e.target
 				})), h = void 0;
 			}
-			let g = this.findPropagatingFilters(r, c, e), _ = new Map([[c.name, c]]), { aggregateMeasures: v, requiredBaseMeasures: y } = Q.categorizeForPostAggregation(f, _), b = [...new Set([...v, ...Array.from(y).filter((e) => e.startsWith(c.name + "."))])];
+			let g = this.findPropagatingFilters(r, c, e), _ = new Map([[c.name, c]]), { aggregateMeasures: v, requiredBaseMeasures: y } = X.categorizeForPostAggregation(f, _), b = [...new Set([...v, ...Array.from(y).filter((e) => e.startsWith(c.name + "."))])];
 			if (b.length > 0) {
 				let t = this.expandCalculatedMeasureDependencies(c, b), i = this.findDownstreamJoinKeys(c, r, e);
 				a.push({
@@ -4034,7 +4034,7 @@ var Q = class e {
 	}
 	findJoinInfoToCube(e, t) {
 		for (let [, n] of e) if (n.name !== t && n.joins) for (let [, r] of Object.entries(n.joins)) {
-			let i = U(r.targetCube, e);
+			let i = V(r.targetCube, e);
 			if (i && i.name === t) return {
 				sourceCube: n,
 				joinDef: r
@@ -4051,7 +4051,7 @@ var Q = class e {
 			joinDef: e.joinDef,
 			reversed: e.reversed
 		}));
-		if (!c.slice(0, -1).some((e) => (e.reversed ? et(e.joinDef.relationship) : e.joinDef.relationship) === "hasMany")) return {
+		if (!c.slice(0, -1).some((e) => (e.reversed ? nt(e.joinDef.relationship) : e.joinDef.relationship) === "hasMany")) return {
 			path: c,
 			hasIntermediateHasMany: !1,
 			intermediateJoins: [],
@@ -4095,7 +4095,7 @@ var Q = class e {
 	}
 	findJoinInfoForCube(e, t, n) {
 		if (t.joins) for (let [, r] of Object.entries(t.joins)) {
-			let i = U(r.targetCube, e);
+			let i = V(r.targetCube, e);
 			if (i && i.name === n) return {
 				sourceCube: t,
 				joinDef: r
@@ -4103,7 +4103,7 @@ var Q = class e {
 		}
 		let r = e.get(n);
 		if (r?.joins) for (let [, n] of Object.entries(r.joins)) {
-			let i = U(n.targetCube, e);
+			let i = V(n.targetCube, e);
 			if (i && i.name === t.name) return {
 				sourceCube: r,
 				joinDef: n,
@@ -4111,7 +4111,7 @@ var Q = class e {
 			};
 		}
 		for (let [, r] of e) if (!(r.name === t.name || r.name === n) && r.joins) for (let [, t] of Object.entries(r.joins)) {
-			let i = U(t.targetCube, e);
+			let i = V(t.targetCube, e);
 			if (i && i.name === n) return {
 				sourceCube: r,
 				joinDef: t
@@ -4134,7 +4134,7 @@ var Q = class e {
 			i.delete(e.name);
 		}
 		if (e.joins) for (let [, t] of Object.entries(e.joins)) {
-			let e = U(t.targetCube, n);
+			let e = V(t.targetCube, n);
 			if (!e) continue;
 			let a = e.name;
 			if (i.has(a)) {
@@ -4185,7 +4185,7 @@ var Q = class e {
 	findHasManyJoinDef(e, t, n) {
 		if (!e.joins) return null;
 		for (let [, r] of Object.entries(e.joins)) {
-			let e = U(r.targetCube, n);
+			let e = V(r.targetCube, n);
 			if (e && e.name === t && r.relationship === "hasMany") return r;
 		}
 		return null;
@@ -4204,7 +4204,7 @@ var Q = class e {
 			if (a === t.name) continue;
 			let i = n.get(a);
 			if (i?.joins) for (let [, o] of Object.entries(i.joins)) {
-				let s = U(o.targetCube, n);
+				let s = V(o.targetCube, n);
 				if (s && s.name === t.name && o.relationship === "hasMany") {
 					let t = this.extractFiltersForCube(e.filters, a), n = this.extractTimeDimensionFiltersForCube(e, a), s = [...t, ...n];
 					s.length > 0 && o.on.length > 0 && r.push({
@@ -4355,7 +4355,7 @@ var Q = class e {
 	}
 	convertInternalPathToJoinPathSteps(e) {
 		return e.map((e) => {
-			let t = e.reversed ? et(e.joinDef.relationship) : e.joinDef.relationship, n = tt(t, e.joinDef.sqlJoinType), r = e.joinDef.on.map((e) => ({
+			let t = e.reversed ? nt(e.joinDef.relationship) : e.joinDef.relationship, n = rt(t, e.joinDef.sqlJoinType), r = e.joinDef.on.map((e) => ({
 				sourceColumn: e.source.name,
 				targetColumn: e.target.name
 			})), i = {
@@ -4420,7 +4420,28 @@ var Q = class e {
 			suggestion: "Add a dimension to see per-group breakdowns, or add a time dimension with granularity."
 		};
 	}
-}, St = class {
+};
+//#endregion
+//#region src/server/builders/cte-builder.ts
+function Ct(e, t) {
+	if (!t.joins) return e;
+	for (let n of t.joins) switch (n.type || "left") {
+		case "left":
+			e = e.leftJoin(n.table, n.on);
+			break;
+		case "inner":
+			e = e.innerJoin(n.table, n.on);
+			break;
+		case "right":
+			e = e.rightJoin(n.table, n.on);
+			break;
+		case "full":
+			e = e.fullJoin(n.table, n.on);
+			break;
+	}
+	return e;
+}
+var wt = class {
 	constructor(e) {
 		this.queryBuilder = e;
 	}
@@ -4461,7 +4482,7 @@ var Q = class e {
 		}
 		if (Object.keys(c).length === 0) return null;
 		let f = n.db.select(c).from(o.from);
-		if (s && e.intermediateJoins) {
+		if (f = Ct(f, o), s && e.intermediateJoins) {
 			let t = [...e.intermediateJoins].reverse();
 			for (let e of t) {
 				let t = e.cube.sql(n), r = [M(e.cteJoinColumn, e.joinDef.on[0]?.target)];
@@ -4518,7 +4539,7 @@ var Q = class e {
 		if (t.dimensions) for (let e of t.dimensions) {
 			let [t, r] = e.split(".");
 			if (t === l && a.dimensions && a.dimensions[r]) {
-				let e = a.dimensions[r], t = W(e.sql, n);
+				let e = a.dimensions[r], t = H(e.sql, n);
 				_.push(t);
 			}
 		}
@@ -4563,17 +4584,17 @@ var Q = class e {
 		if (i.length === 0) return null;
 		let a = i.length === 1 ? i[0] : P(...i), o = e.joinConditions;
 		if (o.length === 1) {
-			let { source: e, target: n } = o[0];
-			return O`${n} IN ${t.db.select({ pk: e }).from(r.from).where(a)}`;
+			let { source: e, target: n } = o[0], i = t.db.select({ pk: e }).from(r.from);
+			return i = Ct(i, r), i = i.where(a), O`${n} IN ${i}`;
 		} else {
-			let e = P(...o.map((e) => M(e.source, e.target)), a);
-			return O`EXISTS ${t.db.select({ one: O`1` }).from(r.from).where(e)}`;
+			let e = P(...o.map((e) => M(e.source, e.target)), a), n = t.db.select({ one: O`1` }).from(r.from);
+			return n = Ct(n, r), n = n.where(e), O`EXISTS ${n}`;
 		}
 	}
 };
 //#endregion
 //#region src/shared/date-utils.ts
-function Ct(e) {
+function Tt(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);
@@ -4688,12 +4709,12 @@ function Ct(e) {
 }
 //#endregion
 //#region src/server/gap-filler.ts
-function wt(e, t, n) {
-	let r = [], i = Tt(new Date(e), n), a = Tt(new Date(t), n);
-	for (; i <= a && r.length < 1e4;) r.push(new Date(i)), i = Et(i, n);
+function Et(e, t, n) {
+	let r = [], i = Dt(new Date(e), n), a = Dt(new Date(t), n);
+	for (; i <= a && r.length < 1e4;) r.push(new Date(i)), i = Ot(i, n);
 	return r;
 }
-function Tt(e, t) {
+function Dt(e, t) {
 	let n = new Date(e);
 	switch (t) {
 		case "second":
@@ -4727,7 +4748,7 @@ function Tt(e, t) {
 	}
 	return n;
 }
-function Et(e, t) {
+function Ot(e, t) {
 	let n = new Date(e);
 	switch (t) {
 		case "second":
@@ -4757,7 +4778,7 @@ function Et(e, t) {
 	}
 	return n;
 }
-function Dt(e) {
+function kt(e) {
 	if (e instanceof Date) return e.toISOString();
 	if (typeof e == "string") {
 		let t = new Date(e);
@@ -4765,15 +4786,15 @@ function Dt(e) {
 	}
 	return String(e);
 }
-function Ot(e, t) {
+function At(e, t) {
 	return t.length === 0 ? "__all__" : t.map((t) => String(e[t] ?? "")).join("|||");
 }
-function kt(e, t) {
-	let { timeDimensionKey: n, granularity: r, dateRange: i, fillValue: a, measures: o, dimensions: s } = t, c = wt(i[0], i[1], r);
+function jt(e, t) {
+	let { timeDimensionKey: n, granularity: r, dateRange: i, fillValue: a, measures: o, dimensions: s } = t, c = Et(i[0], i[1], r);
 	if (c.length === 0) return e;
 	let l = /* @__PURE__ */ new Map();
 	for (let t of e) {
-		let e = Ot(t, s), r = Dt(t[n]);
+		let e = At(t, s), r = kt(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());
@@ -4793,28 +4814,28 @@ function kt(e, t) {
 	}
 	return u;
 }
-function At(e) {
+function Q(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 = Ct(e);
+	let t = Tt(e);
 	if (t) return [t.start, t.end];
 	let n = new Date(e);
 	return isNaN(n.getTime()) ? null : [n, n];
 }
-function jt(e, t, n) {
+function Mt(e, t, n) {
 	if (!t.timeDimensions || t.timeDimensions.length === 0) return e;
 	let r = t.timeDimensions.filter((e) => {
-		let n = e.fillMissingDates !== !1, r = !!e.granularity, i = e.dateRange || Mt(e.dimension, t.filters);
+		let n = e.fillMissingDates !== !1, r = !!e.granularity, i = e.dateRange || Nt(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 r = At(e.dateRange) || Nt(e.dimension, t.filters);
+		let r = Q(e.dateRange) || Pt(e.dimension, t.filters);
 		if (!r) continue;
 		let a = {
 			timeDimensionKey: e.dimension,
@@ -4824,46 +4845,46 @@ function jt(e, t, n) {
 			measures: n,
 			dimensions: o
 		};
-		s = kt(s, a);
+		s = jt(s, a);
 	}
 	return s;
 }
-function Mt(e, t) {
+function Nt(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 = Mt(e, n.and);
+			let t = Nt(e, n.and);
 			if (t) return t;
 		}
 		if ("or" in n && n.or) {
-			let t = Mt(e, n.or);
+			let t = Nt(e, n.or);
 			if (t) return t;
 		}
 	}
 	return null;
 }
-function Nt(e, t) {
-	let n = Mt(e, t);
+function Pt(e, t) {
+	let n = Nt(e, t);
 	if (!n) return null;
 	if (n.dateRange) {
-		let e = At(n.dateRange);
+		let e = Q(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 = Ct(r[0]);
-		return e ? [e.start, e.end] : At(r);
+		let e = Tt(r[0]);
+		return e ? [e.start, e.end] : Q(r);
 	}
-	return r.length >= 2 ? At(r) : null;
+	return r.length >= 2 ? Q(r) : null;
 }
 //#endregion
 //#region src/server/builders/comparison-query-builder.ts
-var Pt = class {
+var Ft = class {
 	dateTimeBuilder;
 	constructor(e) {
-		this.dateTimeBuilder = new Y(e);
+		this.dateTimeBuilder = new q(e);
 	}
 	hasComparison(e) {
 		return e.timeDimensions?.some((e) => e.compareDateRange && e.compareDateRange.length >= 2) ?? !1;
@@ -4991,11 +5012,11 @@ var Pt = class {
 			return typeof i == "string" && typeof a == "string" ? new Date(i).getTime() - new Date(a).getTime() : 0;
 		});
 	}
-}, Ft = class {
+}, It = class {
 	filterBuilder;
 	dateTimeBuilder;
 	constructor(e) {
-		this.databaseAdapter = e, this.dateTimeBuilder = new Y(e), this.filterBuilder = new X(e, this.dateTimeBuilder);
+		this.databaseAdapter = e, this.dateTimeBuilder = new q(e), this.filterBuilder = new J(e, this.dateTimeBuilder);
 	}
 	hasFunnel(e) {
 		return e.funnel !== void 0 && e.funnel.steps.length >= 2;
@@ -5042,7 +5063,7 @@ var Pt = class {
 			}))), a.filter) {
 				let o;
 				"cube" in a && a.cube ? o = a.cube : typeof t.bindingKey == "string" && ([o] = t.bindingKey.split("."));
-				let s = o ? new bt(n) : null, c = Array.isArray(a.filter) ? a.filter : [a.filter];
+				let s = o ? new Z(n) : null, c = Array.isArray(a.filter) ? a.filter : [a.filter];
 				for (let t of c) if ("member" in t) {
 					let [a, c] = t.member.split("."), l = n.get(a);
 					if (!l) r.push(e("server.validation.funnel.stepFilterCubeNotFound", {
@@ -5122,7 +5143,7 @@ var Pt = class {
 		return t;
 	}
 	resolveSteps(e, t, n) {
-		let r = new bt(t);
+		let r = new Z(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) {
@@ -5164,25 +5185,25 @@ var Pt = class {
 		if (typeof t.bindingKey == "string") {
 			let [, i] = t.bindingKey.split("."), a = n.dimensions?.[i];
 			if (!a) throw Error(e("server.errors.funnel.bindingKeyDimNotFound", { bindingKey: t.bindingKey }));
-			return W(a.sql, r);
+			return H(a.sql, r);
 		}
 		let i = t.bindingKey.find((e) => e.cube === n.name);
 		if (!i) throw Error(e("server.errors.funnel.noBindingKeyMapping", { cubeName: n.name }));
 		let [, a] = i.dimension.split("."), o = n.dimensions?.[a];
 		if (!o) throw Error(e("server.errors.funnel.bindingKeyMappingDimNotFound", { dimension: i.dimension }));
-		return W(o.sql, r);
+		return H(o.sql, r);
 	}
 	resolveTimeDimension(t, n, r) {
 		if (typeof t.timeDimension == "string") {
 			let [, i] = t.timeDimension.split("."), a = n.dimensions?.[i];
 			if (!a) throw Error(e("server.errors.funnel.timeDimNotFound", { timeDimension: t.timeDimension }));
-			return W(a.sql, r);
+			return H(a.sql, r);
 		}
 		let i = t.timeDimension.find((e) => e.cube === n.name);
 		if (!i) throw Error(e("server.errors.funnel.noTimeDimMapping", { cubeName: n.name }));
 		let [, a] = i.dimension.split("."), o = n.dimensions?.[a];
 		if (!o) throw Error(e("server.errors.funnel.timeDimMappingNotFound", { dimension: i.dimension }));
-		return W(o.sql, r);
+		return H(o.sql, r);
 	}
 	buildStepFilters(e, t, n, r) {
 		if (!e.filter) return [];
@@ -5220,12 +5241,12 @@ var Pt = class {
 		let u = n.get(s);
 		if (!u) return null;
 		if (s !== t.name) {
-			let e = new bt(n).findPath(t.name, s);
+			let e = new Z(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];
 		if (!d) return null;
-		let f = d.type === "time" ? W(d.sql, r) : typeof d.sql == "function" ? d.sql(r) : d.sql;
+		let f = d.type === "time" ? H(d.sql, r) : typeof d.sql == "function" ? d.sql(r) : d.sql;
 		return this.filterBuilder.buildFilterCondition(f, o.operator, o.values || [], d, o.dateRange);
 	}
 	buildStepCTE(e, t, n) {
@@ -5301,12 +5322,12 @@ var Pt = class {
 		let o = i.db.select(a).from(e);
 		return i.db.$with("funnel_metrics").as(o);
 	}
-}, It = class {
+}, Lt = class {
 	filterBuilder;
 	dateTimeBuilder;
 	databaseAdapter;
 	constructor(e) {
-		this.databaseAdapter = e, this.dateTimeBuilder = new Y(e), this.filterBuilder = new X(e, this.dateTimeBuilder);
+		this.databaseAdapter = e, this.dateTimeBuilder = new q(e), this.filterBuilder = new J(e, this.dateTimeBuilder);
 	}
 	hasFlow(e) {
 		return e.flow !== void 0 && e.flow.startingStep !== void 0 && e.flow.eventDimension !== void 0;
@@ -5439,30 +5460,30 @@ var Pt = class {
 		if (typeof t.bindingKey == "string") {
 			let [, i] = t.bindingKey.split("."), a = n.dimensions?.[i];
 			if (!a) throw Error(e("server.errors.flow.bindingKeyDimNotFound", { bindingKey: t.bindingKey }));
-			return W(a.sql, r);
+			return H(a.sql, r);
 		}
 		let i = t.bindingKey.find((e) => e.cube === n.name);
 		if (!i) throw Error(e("server.errors.flow.noBindingKeyMapping", { cubeName: n.name }));
 		let [, a] = i.dimension.split("."), o = n.dimensions?.[a];
 		if (!o) throw Error(e("server.errors.flow.bindingKeyMappingDimNotFound", { dimension: i.dimension }));
-		return W(o.sql, r);
+		return H(o.sql, r);
 	}
 	resolveTimeDimension(t, n, r) {
 		if (typeof t.timeDimension == "string") {
 			let [, i] = t.timeDimension.split("."), a = n.dimensions?.[i];
 			if (!a) throw Error(e("server.errors.flow.timeDimNotFound", { timeDimension: t.timeDimension }));
-			return W(a.sql, r);
+			return H(a.sql, r);
 		}
 		let i = t.timeDimension.find((e) => e.cube === n.name);
 		if (!i) throw Error(e("server.errors.flow.noTimeDimMapping", { cubeName: n.name }));
 		let [, a] = i.dimension.split("."), o = n.dimensions?.[a];
 		if (!o) throw Error(e("server.errors.flow.timeDimMappingNotFound", { dimension: i.dimension }));
-		return W(o.sql, r);
+		return H(o.sql, r);
 	}
 	resolveEventDimension(t, n, r) {
 		let [, i] = t.eventDimension.split("."), a = n.dimensions?.[i];
 		if (!a) throw Error(e("server.errors.flow.eventDimNotFound", { eventDimension: t.eventDimension }));
-		return W(a.sql, r);
+		return H(a.sql, r);
 	}
 	buildStartingStepFilters(e, t, n) {
 		if (!e.startingStep.filter) return [];
@@ -5492,7 +5513,7 @@ var Pt = class {
 		}
 		let r = e, [, i] = r.member.split("."), a = t.dimensions?.[i];
 		if (!a) return null;
-		let o = a.type === "time" ? W(a.sql, n) : typeof a.sql == "function" ? a.sql(n) : a.sql;
+		let o = a.type === "time" ? H(a.sql, n) : typeof a.sql == "function" ? a.sql(n) : a.sql;
 		return this.filterBuilder.buildFilterCondition(o, r.operator, r.values || [], a, r.dateRange);
 	}
 	buildStartingEntitiesCTE(e, t, n) {
@@ -5777,31 +5798,31 @@ var Pt = class {
 };
 //#endregion
 //#region src/server/types/retention.ts
-function Lt(e) {
+function Rt(e) {
 	return Array.isArray(e);
 }
-function Rt(e) {
+function zt(e) {
 	return typeof e == "object" && !!e && "cube" in e;
 }
-function zt(e) {
-	if (Rt(e)) return e.cube;
+function Bt(e) {
+	if (zt(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 Bt(e) {
-	if (Rt(e)) return e.dimension;
+function Vt(e) {
+	if (zt(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 Vt = class {
+var Ht = class {
 	filterBuilder;
 	dateTimeBuilder;
 	constructor(e) {
-		this.databaseAdapter = e, this.dateTimeBuilder = new Y(e), this.filterBuilder = new X(e, this.dateTimeBuilder);
+		this.databaseAdapter = e, this.dateTimeBuilder = new q(e), this.filterBuilder = new J(e, this.dateTimeBuilder);
 	}
 	hasRetention(e) {
 		return e.retention !== void 0 && e.retention.timeDimension != null && e.retention.bindingKey != null;
@@ -5809,12 +5830,12 @@ var Vt = class {
 	validateConfig(t, n) {
 		let r = [];
 		try {
-			let i = zt(t.timeDimension), a = Bt(t.timeDimension), o = n.get(i);
+			let i = Bt(t.timeDimension), a = Vt(t.timeDimension), o = n.get(i);
 			o ? o.dimensions?.[a] || r.push(e("server.validation.retention.timeDimNotFound", { dimName: a })) : r.push(e("server.validation.retention.cubeNotFound", { cubeName: i }));
 		} catch {
 			r.push(e("server.validation.retention.invalidTimeDimFormat", { timeDimension: t.timeDimension }));
 		}
-		if (Lt(t.bindingKey)) for (let i of t.bindingKey) {
+		if (Rt(t.bindingKey)) for (let i of t.bindingKey) {
 			let t = n.get(i.cube);
 			if (!t) r.push(e("server.validation.retention.bindingKeyMappingCubeNotFound", { cubeName: i.cube }));
 			else {
@@ -5911,15 +5932,15 @@ var Vt = class {
 		});
 	}
 	resolveConfig(t, n, r) {
-		let i = zt(t.timeDimension), a = Bt(t.timeDimension), o = n.get(i);
+		let i = Bt(t.timeDimension), a = Vt(t.timeDimension), o = n.get(i);
 		if (!o) throw Error(e("server.validation.retention.cubeNotFound", { cubeName: i }));
 		let s = o.dimensions?.[a];
 		if (!s) throw Error(e("server.validation.retention.timeDimNotFound", { dimName: a }));
-		let c = W(s.sql, r), l = this.resolveBindingKey(t.bindingKey, o, n, r), u = this.buildFilterConditions(t.cohortFilters, o, n, r), d = this.buildFilterConditions(t.activityFilters, o, n, r), f = [];
+		let c = H(s.sql, r), l = this.resolveBindingKey(t.bindingKey, o, n, r), u = this.buildFilterConditions(t.cohortFilters, o, n, r), d = this.buildFilterConditions(t.activityFilters, o, n, r), f = [];
 		if (t.breakdownDimensions && t.breakdownDimensions.length > 0) for (let e of t.breakdownDimensions) {
 			let [t, i] = e.split("."), a = n.get(t);
 			if (a && a.dimensions?.[i]) {
-				let t = W(a.dimensions[i].sql, r);
+				let t = H(a.dimensions[i].sql, r);
 				f.push({
 					dimension: e,
 					expr: t
@@ -5936,7 +5957,7 @@ var Vt = class {
 		};
 	}
 	resolveBindingKey(t, n, r, i) {
-		if (Lt(t)) {
+		if (Rt(t)) {
 			let a = t.find((e) => e.cube === n.name);
 			if (!a) throw Error(e("server.validation.retention.noBindingKeyMapping", { cubeName: n.name }));
 			let o = this.extractDimensionName(a.dimension), s = r.get(a.cube);
@@ -5946,7 +5967,7 @@ var Vt = class {
 				dimName: a.dimension,
 				cubeName: a.cube
 			}));
-			return W(c.sql, i);
+			return H(c.sql, i);
 		}
 		let [a, o] = t.split("."), s = r.get(a);
 		if (!s) throw Error(e("server.validation.retention.bindingKeyCubeNotFound", { cubeName: a }));
@@ -5955,7 +5976,7 @@ var Vt = class {
 			dimName: t,
 			cubeName: a
 		}));
-		return W(c.sql, i);
+		return H(c.sql, i);
 	}
 	buildFilterConditions(e, t, n, r) {
 		if (!e) return [];
@@ -5979,7 +6000,7 @@ var Vt = class {
 		if (!s) return null;
 		let c = s.dimensions?.[o];
 		if (!c) return null;
-		let l = c.type === "time" ? W(c.sql, r) : typeof c.sql == "function" ? c.sql(r) : c.sql;
+		let l = c.type === "time" ? H(c.sql, r) : typeof c.sql == "function" ? c.sql(r) : c.sql;
 		return this.filterBuilder.buildFilterCondition(l, i.operator, i.values || [], c, i.dateRange);
 	}
 	buildCohortBaseCTE(e, t, n) {
@@ -6081,7 +6102,7 @@ var Vt = class {
 		let t = e.split(".");
 		return t.length > 1 ? t[1] : t[0];
 	}
-}, Ht = class {
+}, Ut = class {
 	constructor(e) {
 		this.queryPlanner = e;
 	}
@@ -6098,7 +6119,7 @@ var Vt = class {
 			let n = t.get(e);
 			n && g.set(e, n);
 		}
-		let _ = Q.hasPostAggregationWindows(n.measures ?? [], g), v = [...c.filter((e) => !e.pathFound && e.error).map((e) => e.error), ...d.map((e) => e.message)];
+		let _ = X.hasPostAggregationWindows(n.measures ?? [], g), v = [...c.filter((e) => !e.pathFound && e.error).map((e) => e.error), ...d.map((e) => e.message)];
 		return {
 			plan: m,
 			analysis: {
@@ -6281,7 +6302,7 @@ var Vt = class {
 	hasDirectJoinToSharedDimension(e, t, n) {
 		if (!e?.joins) return !1;
 		for (let [, r] of Object.entries(e.joins)) {
-			let e = U(r.targetCube, n);
+			let e = V(r.targetCube, n);
 			if (!(!e || e.name !== t) && (r.relationship === "belongsTo" || r.relationship === "hasOne")) return !0;
 		}
 		return !1;
@@ -6525,7 +6546,7 @@ var Vt = class {
 			timeDimensions: []
 		};
 	}
-}, Ut = class {
+}, Wt = class {
 	name = "identity";
 	optimise(e) {
 		return e;
@@ -6533,7 +6554,7 @@ var Vt = class {
 };
 //#endregion
 //#region src/server/physical-plan/processors/cte-processor.ts
-function Wt(e, t, n, r) {
+function Gt(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) {
@@ -6563,23 +6584,23 @@ function Wt(e, t, n, r) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/window-processor.ts
-function Gt(e, t, n, r, i, a) {
+function Kt(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;
 		let u = l.measures[c];
-		if (!Q.isPostAggregationWindow(u)) continue;
-		let d = Q.getWindowBaseMeasure(u, s);
+		if (!X.isPostAggregationWindow(u)) continue;
+		let d = X.getWindowBaseMeasure(u, s);
 		if (!d) continue;
 		let [f, p] = d.split("."), m = i.get(f);
 		if (!m?.measures?.[p]) continue;
 		let h = m.measures[p], g = t.preAggregationCTEs?.find((e) => e.cube?.name === f && e.measures?.includes(d)), _;
 		_ = g ? O`sum(${O`${O.identifier(g.cteAlias)}.${O.identifier(p)}`})` : a.queryBuilder.buildMeasureExpression(h, r, m), e[d] || (e[d] = O`${_}`.as(d));
-		let v = Kt(u, _, n, r, l, t, a);
+		let v = qt(u, _, n, r, l, t, a);
 		v && (e[o] = O`${v}`.as(o));
 	}
 }
-function Kt(e, t, n, r, i, a, o) {
+function qt(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);
@@ -6604,7 +6625,7 @@ function Kt(e, t, n, r, i, a, o) {
 		}
 		let l = i.dimensions?.[a];
 		return l ? {
-			field: W(l.sql, r),
+			field: H(l.sql, r),
 			direction: e.direction
 		} : a === (s.measure?.includes(".") ? s.measure.split(".")[1] : s.measure) || e.field === s.measure ? {
 			field: t,
@@ -6631,7 +6652,7 @@ function Kt(e, t, n, r, i, a, o) {
 	let u;
 	s.partitionBy && s.partitionBy.length > 0 && (u = s.partitionBy.map((e) => {
 		let t = e.includes(".") ? e.split(".")[1] : e, n = i.dimensions?.[t];
-		return n ? W(n.sql, r) : null;
+		return n ? H(n.sql, r) : null;
 	}).filter((e) => e !== null));
 	let d = o.databaseAdapter.buildWindowFunction(e.type, t, u, l, {
 		offset: s.offset,
@@ -6640,7 +6661,7 @@ function Kt(e, t, n, r, i, a, o) {
 		frame: s.frame
 	});
 	if (!d) return null;
-	switch (s.operation || Q.getDefaultWindowOperation(e.type)) {
+	switch (s.operation || X.getDefaultWindowOperation(e.type)) {
 		case "difference": return O`${t} - ${d}`;
 		case "ratio": return O`${t} / NULLIF(${d}, 0)`;
 		case "percentChange": return O`((${t} - ${d}) / NULLIF(${d}, 0)) * 100`;
@@ -6649,7 +6670,7 @@ function Kt(e, t, n, r, i, a, o) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/selection-processor.ts
-function qt(e, t, n, r, i) {
+function Jt(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;
@@ -6660,26 +6681,26 @@ function qt(e, t, n, r, i) {
 			let u = l.measures[c], d = O`${O.identifier(o.cteAlias)}.${O.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 = Jt(o, t, r), a = e || n;
+				let e = o.cteReason === "fanOutPrevention", n = Yt(o, t, r), a = e || n;
 				switch (u.type) {
 					case "count":
 					case "countDistinct":
 					case "sum":
-						f = a ? z(d) : R(d);
+						f = a ? R(d) : L(d);
 						break;
 					case "avg":
-						f = a ? z(d) : i.databaseAdapter.buildAvg(d);
+						f = a ? R(d) : i.databaseAdapter.buildAvg(d);
 						break;
 					case "min":
-						f = B(d);
+						f = ge(d);
 						break;
 					case "max":
-						f = z(d);
+						f = R(d);
 						break;
 					case "number":
-						f = z(d);
+						f = R(d);
 						break;
-					default: f = a ? z(d) : R(d);
+					default: f = a ? R(d) : L(d);
 				}
 			}
 			a[s] = O`${f}`.as(s);
@@ -6697,12 +6718,12 @@ function qt(e, t, n, r, i) {
 			(u || l && s?.dimensions?.[i]) && (a[t] = O`${O.identifier(o.cteAlias)}.${O.identifier(i)}`.as(t));
 		}
 	}
-	return Gt(a, e, t, n, r, i), a;
-}
-function Jt(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 && Yt(e.sourceColumnObj, t, n));
+	return Kt(a, e, t, n, r, i), a;
 }
 function Yt(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 && Xt(e.sourceColumnObj, t, n));
+}
+function Xt(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;
@@ -6716,7 +6737,7 @@ function Yt(e, t, n) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/joins-processor.ts
-function Xt(e, t, n, r, i, a) {
+function Zt(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":
@@ -6776,11 +6797,11 @@ function Xt(e, t, n, r, i, a) {
 				l.length > 0 && o.push(...l);
 			} catch {}
 		}
-		let d, f, p;
+		let d, f, p, m;
 		if (u) d = O`${O.identifier(u)}`, f = a.cteBuilder.buildCTEJoinCondition(n, u, e), p = void 0;
 		else {
-			let e = i.downstreamCubeMap.get(n.cube.name), r = n.cube.sql(t);
-			if (d = r.from, p = r.where, e && !n.junctionTable) {
+			let e = i.downstreamCubeMap.get(n.cube.name);
+			if (m = n.cube.sql(t), d = m.from, p = m.where, e && !n.junctionTable) {
 				let t = [];
 				for (let n of e.joinKeys) {
 					let r = O`${O.identifier(e.cteAlias)}.${O.identifier(n.sourceColumn)}`, i = n.targetColumnObj || O.identifier(n.targetColumn);
@@ -6789,20 +6810,34 @@ function Xt(e, t, n, r, i, a) {
 				f = t.length === 1 ? t[0] : P(...t);
 			} else f = n.joinCondition;
 		}
-		let m = n.joinType || "left", h = m !== "inner" && p ? P(f, p) : f;
+		let h = n.joinType || "left", g = h !== "inner" && p ? P(f, p) : f;
 		try {
-			switch (m) {
+			switch (h) {
 				case "left":
-					s = s.leftJoin(d, h), p && c.add(n.cube.name);
+					s = s.leftJoin(d, g), p && c.add(n.cube.name);
 					break;
 				case "inner":
 					s = s.innerJoin(d, f);
 					break;
 				case "right":
-					s = s.rightJoin(d, h), p && c.add(n.cube.name);
+					s = s.rightJoin(d, g), p && c.add(n.cube.name);
 					break;
 				case "full":
-					s = s.fullJoin(d, h), p && c.add(n.cube.name);
+					s = s.fullJoin(d, g), p && c.add(n.cube.name);
+					break;
+			}
+			if (m?.joins) for (let e of m.joins) switch (e.type || "left") {
+				case "left":
+					s = s.leftJoin(e.table, e.on);
+					break;
+				case "inner":
+					s = s.innerJoin(e.table, e.on);
+					break;
+				case "right":
+					s = s.rightJoin(e.table, e.on);
+					break;
+				case "full":
+					s = s.fullJoin(e.table, e.on);
 					break;
 			}
 		} catch {}
@@ -6816,7 +6851,7 @@ function Xt(e, t, n, r, i, a) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/predicates-processor.ts
-function Zt(e, t, n, r, i, a, o, s) {
+function Qt(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;
@@ -6844,14 +6879,14 @@ function Zt(e, t, n, r, i, a, o, s) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/shared.ts
-function Qt(e) {
+function $t(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 $t = class {
+var en = class {
 	constructor(e, t, n) {
 		this.queryBuilder = e, this.cteBuilder = t, this.databaseAdapter = n;
 	}
@@ -6991,13 +7026,13 @@ var $t = class {
 		if (i) return i;
 		let a = this.tryBuildKeysDeduplicationQuery(e, t, n, r);
 		if (a) return a;
-		let o = Wt(e, t, n, r), s = e.primaryCube.sql(n), c = e.joinCubes.length > 0 ? Qt(e) : new Map([[e.primaryCube.name, e.primaryCube]]);
-		return Zt(e, t, n, c, s, o, Xt(e, n, s, qt(e, t, n, c, r), o, r), r);
+		let o = Gt(e, t, n, r), s = e.primaryCube.sql(n), c = e.joinCubes.length > 0 ? $t(e) : new Map([[e.primaryCube.name, e.primaryCube]]);
+		return Qt(e, t, n, c, s, o, Zt(e, n, s, Jt(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 ? $t(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;
@@ -7005,7 +7040,7 @@ var $t = class {
 		if (t.dimensions) for (let e of t.dimensions) {
 			let [t, r] = e.split("."), i = a.get(t), o = i?.dimensions?.[r];
 			if (!i || !o) return null;
-			let s = W(o.sql, n);
+			let s = H(o.sql, n);
 			u[e] = O`${s}`.as(e), d.push(s);
 		}
 		if (t.timeDimensions) for (let e of t.timeDimensions) {
@@ -7018,7 +7053,7 @@ var $t = class {
 		for (let e of s) {
 			let t = o.dimensions?.[e];
 			if (!t) return null;
-			let r = W(t.sql, n), i = `__pk__${e}`;
+			let r = H(t.sql, n), i = `__pk__${e}`;
 			u[i] = O`${r}`.as(i), d.push(r), f.push(i);
 		}
 		let p = i.regularMeasures ?? [], m = new Set(p), h = t.measures.filter((e) => !m.has(e));
@@ -7041,14 +7076,15 @@ var $t = class {
 				Array.isArray(e) ? _.push(...e) : _.push(e);
 			}
 			let e = t.cube.sql(n);
-			v = this.applyJoinByType(v, t.joinType ?? "left", e.from, t.joinCondition), e.where && _.push(e.where);
+			if (v = this.applyJoinByType(v, t.joinType ?? "left", e.from, t.joinCondition), e.joins) for (let t of e.joins) v = this.applyJoinByType(v, t.type ?? "left", t.table, t.on);
+			e.where && _.push(e.where);
 		}
 		_.push(...r.queryBuilder.buildWhereConditions(a, t, n)), _.length > 0 && (v = v.where(_.length === 1 ? _[0] : P(..._))), d.length > 0 && (v = v.groupBy(...d));
 		let y = n.db.$with(c).as(v), b = o.sql(n), x = {}, S = [];
 		for (let e of s) {
 			let t = o.dimensions?.[e];
 			if (!t) return null;
-			let r = W(t.sql, n);
+			let r = H(t.sql, n);
 			x[e] = O`${r}`.as(e), S.push(r);
 		}
 		let C = /* @__PURE__ */ new Set();
@@ -7073,10 +7109,12 @@ var $t = class {
 			if (!C.has(t)) continue;
 			let r = o.measures?.[t];
 			if (!r?.sql) return null;
-			let i = W(r.sql, n), a = `__avg_sum__${t}`, s = `__avg_count__${t}`;
+			let i = H(r.sql, n), a = `__avg_sum__${t}`, s = `__avg_count__${t}`;
 			x[a] = O`sum(${i})`.as(a), x[s] = O`count(${i})`.as(s);
 		}
-		let T = n.db.select(x).from(b.from), E = [];
+		let T = n.db.select(x).from(b.from);
+		if (b.joins) for (let e of b.joins) T = this.applyJoinByType(T, e.type ?? "left", e.table, e.on);
+		let E = [];
 		b.where && E.push(b.where), E.push(...r.queryBuilder.buildWhereConditions(o, t, n)), E.length > 0 && (T = T.where(E.length === 1 ? E[0] : P(...E))), S.length > 0 && (T = T.groupBy(...S));
 		let ee = n.db.$with(l).as(T), D = {};
 		for (let e of t.dimensions ?? []) D[e] = O`${O.identifier(c)}.${O.identifier(e)}`.as(e);
@@ -7216,7 +7254,7 @@ function $(e, t) {
 		console.log(`\n[DC_DEBUG] ${e}`), console.log(n), r.length > 0 && console.log("params:", r), console.log();
 	} catch {}
 }
-var en = class {
+var tn = class {
 	queryBuilder;
 	drizzlePlanBuilder;
 	databaseAdapter;
@@ -7230,9 +7268,9 @@ var en = class {
 	rlsSetup;
 	constructor(t, n, r) {
 		if (this.dbExecutor = t, this.databaseAdapter = t.databaseAdapter, !this.databaseAdapter) throw Error(e("server.errors.dbAdapterRequired"));
-		this.queryBuilder = new yt(this.databaseAdapter);
-		let i = new xt(), a = new St(this.queryBuilder);
-		this.drizzlePlanBuilder = new $t(this.queryBuilder, a, this.databaseAdapter), this.comparisonQueryBuilder = new Pt(this.databaseAdapter), this.funnelQueryBuilder = new Ft(this.databaseAdapter), this.flowQueryBuilder = new It(this.databaseAdapter), this.retentionQueryBuilder = new Vt(this.databaseAdapter), this.logicalPlanBuilder = new Ht(i), this.planOptimiser = new Ut(), this.cacheConfig = n, this.rlsSetup = r;
+		this.queryBuilder = new xt(this.databaseAdapter);
+		let i = new St(), a = new wt(this.queryBuilder);
+		this.drizzlePlanBuilder = new en(this.queryBuilder, a, this.databaseAdapter), this.comparisonQueryBuilder = new Ft(this.databaseAdapter), this.funnelQueryBuilder = new It(this.databaseAdapter), this.flowQueryBuilder = new Lt(this.databaseAdapter), this.retentionQueryBuilder = new Ht(this.databaseAdapter), this.logicalPlanBuilder = new Ut(i), this.planOptimiser = new Wt(), this.cacheConfig = n, this.rlsSetup = r;
 	}
 	async withRLSContext(t, n) {
 		if (!this.rlsSetup) return n();
@@ -7250,7 +7288,7 @@ var en = class {
 			let e = this.resolveQueryMode(n);
 			this.validateQueryForMode(e, t, n);
 			let a;
-			if (this.cacheConfig?.enabled !== !1 && this.cacheConfig?.provider) if (a = st(n, r, this.cacheConfig), i?.skipCache) this.cacheConfig.onCacheEvent?.({
+			if (this.cacheConfig?.enabled !== !1 && this.cacheConfig?.provider) if (a = lt(n, r, this.cacheConfig), i?.skipCache) this.cacheConfig.onCacheEvent?.({
 				type: "miss",
 				key: a,
 				durationMs: 0
@@ -7295,11 +7333,11 @@ var en = class {
 		}
 	}
 	buildLogicalPlan(e, t, n) {
-		let r = new K(), i = this.createQueryContext(n, r, t);
+		let r = new W(), i = this.createQueryContext(n, r, t);
 		return this.preloadFilterCache(t, r, e, i), this.buildRegularQueryArtifacts(e, t, i).optimisedPlan;
 	}
 	analyzeQuery(e, t, n) {
-		let r = new K(), i = this.createQueryContext(n, r, t);
+		let r = new W(), i = this.createQueryContext(n, r, t);
 		return this.preloadFilterCache(t, r, e, i), this.buildRegularQueryArtifacts(e, t, i).analysis;
 	}
 	async executeQuery(e, t, n) {
@@ -7430,13 +7468,13 @@ var en = class {
 		};
 	}
 	async executeStandardQuery(e, t, n) {
-		let r = new K(), i = this.createQueryContext(n, r, t);
+		let r = new W(), i = this.createQueryContext(n, r, t);
 		this.preloadFilterCache(t, r, e, i);
 		let { optimisedPlan: a } = this.buildRegularQueryArtifacts(e, t, i), o = this.drizzlePlanBuilder.derivePhysicalPlanContext(a), s = this.drizzlePlanBuilder.build(o, t, i);
 		$("query", s);
 		let c = this.queryBuilder.collectNumericFields(e, t), l = await this.dbExecutor.execute(s, c);
 		return {
-			data: jt(Array.isArray(l) ? l.map((e) => {
+			data: Mt(Array.isArray(l) ? l.map((e) => {
 				let n = { ...e };
 				if (t.timeDimensions) {
 					for (let e of t.timeDimensions) if (e.dimension in n) {
@@ -7547,7 +7585,7 @@ var en = class {
 		return this.validateQueryForMode(r, e, t), this.generateSqlForMode(r, e, t, n);
 	}
 	async generateUnifiedSQL(e, t, n) {
-		let r = new K(), i = this.createQueryContext(n, r, t);
+		let r = new W(), i = this.createQueryContext(n, r, t);
 		this.preloadFilterCache(t, r, e, i);
 		let { optimisedPlan: a } = this.buildRegularQueryArtifacts(e, t, i), o = this.drizzlePlanBuilder.derivePhysicalPlanContext(a), s = this.drizzlePlanBuilder.build(o, t, i).toSQL();
 		return {
@@ -7563,7 +7601,7 @@ var en = class {
 	}
 	validateQueryForMode(t, n, r) {
 		let i = () => {
-			let t = rn(n, r);
+			let t = an(n, r);
 			if (!t.isValid) throw Error(e("server.errors.queryValidationFailed", { errors: t.errors.join(", ") }));
 		};
 		({
@@ -7581,7 +7619,7 @@ var en = class {
 				let t = this.retentionQueryBuilder.validateConfig(r.retention, n);
 				if (!t.isValid) throw Error(e("server.errors.retentionValidationFailed", { errors: t.errors.join(", ") }));
 			}
-		})[rt(t)]();
+		})[at(t)]();
 	}
 	async executeQueryByModeWithCache(e, t, n, r, i) {
 		return {
@@ -7590,17 +7628,17 @@ var en = class {
 			funnel: () => this.executeFunnelQueryWithCache(t, n, r, i),
 			flow: () => this.executeFlowQueryWithCache(t, n, r, i),
 			retention: () => this.executeRetentionQueryWithCache(t, n, r, i)
-		}[rt(e)]();
+		}[at(e)]();
 	}
 	async executeRegularQueryWithCache(e, t, n, r) {
-		let i = new K(), a = this.createQueryContext(n, i, t);
+		let i = new W(), a = this.createQueryContext(n, i, t);
 		this.preloadFilterCache(t, i, e, a);
 		let { optimisedPlan: o } = this.buildRegularQueryArtifacts(e, t, a), s = this.drizzlePlanBuilder.derivePhysicalPlanContext(o);
 		this.validateSecurityContext(s, a);
 		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: jt(Array.isArray(u) ? u.map((e) => {
+			data: Mt(Array.isArray(u) ? u.map((e) => {
 				let n = { ...e };
 				if (t.timeDimensions) {
 					for (let e of t.timeDimensions) if (e.dimension in n) {
@@ -7638,7 +7676,7 @@ var en = class {
 			funnel: () => this.dryRunFunnel(t, n, r),
 			flow: () => this.dryRunFlow(t, n, r),
 			retention: () => this.dryRunRetention(t, n, r)
-		}[rt(e)]();
+		}[at(e)]();
 	}
 	async generateComparisonSQL(e, t, n) {
 		let r = this.buildComparisonExecutionPlan(t).periodQueries[0];
@@ -7690,9 +7728,9 @@ var en = class {
 	}
 	preloadFilterCache(e, t, n, r) {
 		if (e.filters && e.filters.length > 0) {
-			let i = ot(e.filters);
+			let i = ct(e.filters);
 			for (let e of i) {
-				let i = G(e);
+				let i = U(e);
 				if (t.has(i)) continue;
 				let [a, o] = e.member.split("."), s = n.get(a);
 				if (!s) continue;
@@ -7702,24 +7740,24 @@ var en = class {
 					"arrayOverlaps",
 					"arrayContained"
 				].includes(e.operator)) continue;
-				let l = c.type === "time" ? W(c.sql, r) : typeof c.sql == "function" ? c.sql(r) : c.sql, u = this.queryBuilder.buildFilterConditionPublic(l, e.operator, e.values, c, e.dateRange);
+				let l = c.type === "time" ? H(c.sql, r) : typeof c.sql == "function" ? c.sql(r) : c.sql, u = this.queryBuilder.buildFilterConditionPublic(l, e.operator, e.values, c, e.dateRange);
 				u && t.set(i, u);
 			}
 		}
 		if (e.timeDimensions) {
 			for (let i of e.timeDimensions) if (i.dateRange) {
-				let e = at(i.dimension, i.dateRange);
+				let e = st(i.dimension, i.dateRange);
 				if (t.has(e)) continue;
 				let [a, o] = i.dimension.split("."), s = n.get(a);
 				if (!s) continue;
 				let c = s.dimensions?.[o];
 				if (!c) continue;
-				let l = W(c.sql, r), u = this.queryBuilder.buildDateRangeCondition(l, i.dateRange);
+				let l = H(c.sql, r), u = this.queryBuilder.buildDateRangeCondition(l, i.dateRange);
 				u && t.set(e, u);
 			}
 		}
 	}
-}, tn = class n {
+}, nn = class n {
 	cubes = /* @__PURE__ */ new Map();
 	metadataCache;
 	cacheConfig;
@@ -7744,10 +7782,10 @@ var en = class {
 	}
 	createDbExecutor() {
 		if (!this.db) throw Error(e("server.errors.dbNotConfigured"));
-		return $e(this.db, this.schema, this.engineType);
+		return tt(this.db, this.schema, this.engineType);
 	}
 	createQueryExecutor(e = !1) {
-		return new en(this.createDbExecutor(), e ? this.cacheConfig : void 0, this.rlsSetup);
+		return new tn(this.createDbExecutor(), e ? this.cacheConfig : void 0, this.rlsSetup);
 	}
 	formatSqlResult(e) {
 		let n = this.getEngineType() ?? "postgres";
@@ -7757,7 +7795,7 @@ var en = class {
 		};
 	}
 	registerCube(e) {
-		this.validateCalculatedMeasures(e), new Z(this.cubes).populateDependencies(e), this.cubes.set(e.name, e), this.invalidateMetadataCache();
+		this.validateCalculatedMeasures(e), new Y(this.cubes).populateDependencies(e), this.cubes.set(e.name, e), this.invalidateMetadataCache();
 	}
 	validateCubeReferences() {
 		let t = [];
@@ -7778,7 +7816,7 @@ var en = class {
 				}));
 				continue;
 			}
-			let a = gt(i.calculatedSql);
+			let a = vt(i.calculatedSql);
 			if (!a.isValid) {
 				n.push(e("server.validation.calculatedMeasure.invalidSyntax", {
 					cubeName: t.name,
@@ -7789,7 +7827,7 @@ var en = class {
 			}
 			let o = new Map(this.cubes);
 			o.set(t.name, t);
-			let s = new Z(o);
+			let s = new Y(o);
 			try {
 				s.validateDependencies(t);
 			} catch (e) {
@@ -7799,7 +7837,7 @@ var en = class {
 		if (n.length === 0) {
 			let r = new Map(this.cubes);
 			r.set(t.name, t);
-			let i = new Z(r);
+			let i = new Y(r);
 			i.buildGraph(t);
 			let a = i.detectCycle();
 			a && n.push(e("server.validation.calculatedMeasure.circularDependency", { cycle: a.join(" -> ") }));
@@ -7879,7 +7917,7 @@ var en = class {
 		}
 		let o = [];
 		if (e.joins) for (let [, t] of Object.entries(e.joins)) {
-			let e = U(t.targetCube, this.cubes);
+			let e = V(t.targetCube, this.cubes);
 			e && o.push({
 				targetCube: e.name,
 				relationship: t.relationship,
@@ -7955,18 +7993,18 @@ var en = class {
 		return Array.from(this.cubes.keys());
 	}
 	validateQuery(e) {
-		return rn(this.cubes, e);
+		return an(this.cubes, e);
 	}
 	analyzeQuery(e, t) {
 		return this.createQueryExecutor(!0).analyzeQuery(this.cubes, e, t);
 	}
 };
-function nn(e) {
+function rn(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 rn(t, n) {
-	let r = [], i = nn(n);
+function an(t, n) {
+	let r = [], i = rn(n);
 	if (i.length > 1) return r.push(e("server.validation.query.multipleQueryModes", { modes: i.join(", ") })), {
 		isValid: !1,
 		errors: r
@@ -7987,7 +8025,7 @@ function rn(t, n) {
 			}
 		},
 		retention: () => {
-			let i = n.retention, a = on(i.timeDimension);
+			let i = n.retention, a = sn(i.timeDimension);
 			a && !t.has(a) && r.push(e("server.validation.query.retentionCubeNotFound", { cubeName: a }));
 			let o = i.bindingKey;
 			if (typeof o == "string") {
@@ -8073,7 +8111,7 @@ function rn(t, n) {
 			cubeName: n
 		}));
 	}
-	if (n.filters) for (let e of n.filters) an(e, t, r, o);
+	if (n.filters) for (let e of n.filters) on(e, t, r, o);
 	if (o.size === 0 && r.push(e("server.validation.query.mustReferenceAtLeastOneCube")), n.ungrouped) {
 		n.dimensions && n.dimensions.length > 0 || n.timeDimensions && n.timeDimensions.length > 0 || r.push(e("server.validation.query.ungroupedRequiresDimension")), n.funnel && r.push(e("server.validation.query.ungroupedIncompatibleFunnel")), n.flow && r.push(e("server.validation.query.ungroupedIncompatibleFlow")), n.retention && r.push(e("server.validation.query.ungroupedIncompatibleRetention")), n.timeDimensions?.some((e) => e.compareDateRange && e.compareDateRange.length > 0) && r.push(e("server.validation.query.ungroupedIncompatibleCompareDateRange")), n.timeDimensions?.some((e) => e.fillMissingDates === !0) && r.push(e("server.validation.query.ungroupedIncompatibleFillMissingDates"));
 		let i = new Set([
@@ -8117,7 +8155,7 @@ function rn(t, n) {
 			let n = t.get(e);
 			if (n && n.joins) {
 				for (let [i, a] of Object.entries(n.joins)) if (a.relationship === "hasMany") {
-					let n = U(a.targetCube, t);
+					let n = V(a.targetCube, t);
 					n && o.has(n.name) && r.push(`Ungrouped queries are incompatible with hasMany relationships (${e} → ${i} is hasMany)`);
 				}
 			}
@@ -8128,10 +8166,10 @@ function rn(t, n) {
 		errors: r
 	};
 }
-function an(t, n, r, i) {
+function on(t, n, r, i) {
 	if ("and" in t || "or" in t) {
 		let e = t.and || t.or || [];
-		for (let t of e) an(t, n, r, i);
+		for (let t of e) on(t, n, r, i);
 		return;
 	}
 	if (!("member" in t)) {
@@ -8161,7 +8199,7 @@ function an(t, n, r, i) {
 		}));
 	}
 }
-function on(e) {
+function sn(e) {
 	if (typeof e == "string") {
 		let [t] = e.split(".");
 		return t || null;
@@ -8170,25 +8208,25 @@ function on(e) {
 }
 //#endregion
 //#region src/adapters/locale.ts
-var sn = "x-dc-locale";
-function cn(e) {
+var cn = "x-dc-locale";
+function ln(e) {
 	if (!e) return;
 	let t = (Array.isArray(e) ? e[0] : e).split(",")[0]?.trim();
 	if (t && /^[A-Za-z0-9-]{2,35}$/.test(t)) return t;
 }
-function ln(e) {
-	return cn(e(sn));
+function un(e) {
+	return ln(e(cn));
 }
-function un(e, t) {
+function dn(e, t) {
 	let n = e && typeof e == "object" ? e : {}, r = typeof n.locale == "string" ? n.locale : void 0, i = t ?? r ?? "en-GB";
 	return r === i ? n : {
 		...n,
 		locale: i
 	};
 }
-function dn(e) {
+function fn(e) {
 	let t = Array.isArray(e) ? [...e] : (e ?? "").split(",").map((e) => e.trim()).filter(Boolean);
 	return t.some((e) => e.toLowerCase() === "x-dc-locale") || t.push("X-DC-Locale"), t;
 }
 //#endregion
-export { tn as i, ln as n, un as r, dn as t };
+export { nn as i, un as n, dn as r, fn as t };