drizzle-cube 0.7.0 → 0.8.0

package/dist/adapters/{compiler-Dq04wAjm.js → compiler-CQJ5GOwF.js}

@@ -1,4 +1,4 @@
-import { C as e, D as t, E as n, O as r, S as i, T as a, w as o } from "./utils-tjiwXFnP.js";
+import { C as e, D as t, E as n, O as r, S as i, T as a, w as o } from "./utils-DkmShl5f.js";
 //#region node_modules/drizzle-orm/entity.js
 var s = Symbol.for("drizzle:entityKind");
 function c(e, t) {
@@ -581,6 +581,15 @@ var N = class {
 	buildWindowFunction(e, t, n, r, i) {
 		return Le(e, t, Ne(n, r, i), i);
 	}
+	decimalTryCastPattern() {
+		return "^ *[+-]?([0-9]+(\\.[0-9]+)?|\\.[0-9]+) *$";
+	}
+	integerTryCastPattern() {
+		return "^ *[+-]?[0-9]+ *$";
+	}
+	timestampTryCastPattern() {
+		return "^ *[0-9]{4}-[0-9]{2}-[0-9]{2}([ T][0-9]{2}:[0-9]{2}(:[0-9]{2}(\\.[0-9]+)?)?([+-][0-9]{2}:?[0-9]{2}|Z)?)? *$";
+	}
 	buildPattern(e, t) {
 		switch (e) {
 			case "contains":
@@ -659,6 +668,14 @@ var N = class {
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
+	tryCastToType(e, t) {
+		switch (t) {
+			case "timestamp": return T`CASE WHEN ${e} ~ ${this.timestampTryCastPattern()} THEN ${e}::timestamp ELSE NULL END`;
+			case "decimal": return T`CASE WHEN ${e} ~ ${this.decimalTryCastPattern()} THEN ${e}::decimal ELSE NULL END`;
+			case "integer": return T`CASE WHEN ${e} ~ ${this.integerTryCastPattern()} THEN ${e}::integer ELSE NULL END`;
+			default: throw Error(`Unsupported cast type: ${t}`);
+		}
+	}
 	getCapabilities() {
 		return {
 			supportsPercentile: !0,
@@ -735,6 +752,14 @@ var N = class {
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
+	tryCastToType(e, t) {
+		switch (t) {
+			case "timestamp": return T`CASE WHEN ${e} REGEXP ${this.timestampTryCastPattern()} THEN CAST(${e} AS DATETIME) ELSE NULL END`;
+			case "decimal": return T`CASE WHEN ${e} REGEXP ${this.decimalTryCastPattern()} THEN CAST(${e} AS DECIMAL(10,2)) ELSE NULL END`;
+			case "integer": return T`CASE WHEN ${e} REGEXP ${this.integerTryCastPattern()} THEN CAST(${e} AS SIGNED INTEGER) ELSE NULL END`;
+			default: throw Error(`Unsupported cast type: ${t}`);
+		}
+	}
 	nullToZero(e) {
 		return T`IFNULL(${e}, 0)`;
 	}
@@ -823,6 +848,14 @@ var N = class {
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
+	tryCastToType(e, t) {
+		switch (t) {
+			case "timestamp": return T`CASE WHEN TRIM(${e}) = '' OR TRIM(${e}) GLOB '*[^0-9-]*' THEN NULL ELSE datetime(${e} / 1000, 'unixepoch') END`;
+			case "decimal": return T`CASE WHEN TRIM(${e}) = '' OR TRIM(${e}) GLOB '*[^0-9.+-]*' THEN NULL ELSE CAST(${e} AS REAL) END`;
+			case "integer": return T`CASE WHEN TRIM(${e}) = '' OR TRIM(${e}) GLOB '*[^0-9+-]*' THEN NULL ELSE CAST(${e} AS INTEGER) END`;
+			default: throw Error(`Unsupported cast type: ${t}`);
+		}
+	}
 	nullToZero(e) {
 		return T`IFNULL(${e}, 0)`;
 	}
@@ -922,6 +955,14 @@ var N = class {
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
+	tryCastToType(e, t) {
+		switch (t) {
+			case "timestamp": return T`TRY_CAST(${e} AS timestamp)`;
+			case "decimal": return T`TRY_CAST(${e} AS decimal)`;
+			case "integer": return T`TRY_CAST(${e} AS integer)`;
+			default: throw Error(`Unsupported cast type: ${t}`);
+		}
+	}
 	getCapabilities() {
 		return {
 			supportsPercentile: !0,
@@ -985,6 +1026,14 @@ var N = class {
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
+	tryCastToType(e, t) {
+		switch (t) {
+			case "timestamp": return T`TRY_CAST(${e} AS TIMESTAMP)`;
+			case "decimal": return T`TRY_CAST(${e} AS DECIMAL)`;
+			case "integer": return T`TRY_CAST(${e} AS INTEGER)`;
+			default: throw Error(`Unsupported cast type: ${t}`);
+		}
+	}
 	getCapabilities() {
 		return {
 			supportsPercentile: !1,
@@ -1046,6 +1095,14 @@ var N = class {
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
+	tryCastToType(e, t) {
+		switch (t) {
+			case "timestamp": return T`TRY_CAST(${e} AS TIMESTAMP)`;
+			case "decimal": return T`TRY_CAST(${e} AS DECIMAL)`;
+			case "integer": return T`TRY_CAST(${e} AS INTEGER)`;
+			default: throw Error(`Unsupported cast type: ${t}`);
+		}
+	}
 	getCapabilities() {
 		return {
 			supportsPercentile: !0,
@@ -5070,13 +5127,13 @@ var Rr = class {
 };
 //#endregion
 //#region src/server/cache-utils.ts
-function zr(e, t, n = {}) {
-	let r = n.keyPrefix ?? "drizzle-cube:", i = Br(e), a = `${r}query:${Kr(JSON.stringify(i))}`;
+function zr(e, t, n = {}, r) {
+	let i = n.keyPrefix ?? "drizzle-cube:", a = Br(e), o = `${i}query:${Kr(JSON.stringify(a))}`;
 	if (n.includeSecurityContext !== !1) {
 		let e = Kr(n.securityContextSerializer ? n.securityContextSerializer(t) : JSON.stringify(Gr(t)));
-		a += `:ctx:${e}`;
+		o += `:ctx:${e}`;
 	}
-	return a;
+	return r && (o += `:cubes:${r}`), o;
 }
 function Br(e) {
 	return {
@@ -5179,8 +5236,8 @@ var qr = class {
 	constructor(e) {
 		this.cacheConfig = e;
 	}
-	generateKey(e, t) {
-		if (this.cacheConfig?.enabled !== !1 && this.cacheConfig?.provider) return zr(e, t, this.cacheConfig);
+	generateKey(e, t, n) {
+		if (this.cacheConfig?.enabled !== !1 && this.cacheConfig?.provider) return zr(e, t, this.cacheConfig, n);
 	}
 	async lookup(e, t) {
 		if (!(!e || !this.cacheConfig?.provider)) {
@@ -7629,7 +7686,7 @@ var ra = class {
 		try {
 			let r = this.modeRouter.resolveMode(t);
 			this.modeRouter.validateForMode(r, e, t);
-			let a = this.resultCache.generateKey(t, n);
+			let a = this.resultCache.generateKey(t, n, i?.cubeSetKey);
 			return await this.resultCache.lookup(a, i?.skipCache ?? !1) || await this.withRLSContext(n, () => this.executeQueryByModeWithCache(r, e, t, n, a));
 		} catch (e) {
 			if (e instanceof Error) {
@@ -7682,11 +7739,7 @@ var ra = class {
 		return await this.resultCache.store(t, n), n;
 	}
 	async executeFunnelQuery(e, t, n) {
-		let r = t.funnel, i = {
-			db: this.dbExecutor.db,
-			schema: this.dbExecutor.schema,
-			securityContext: n
-		}, a = this.funnelQueryBuilder.buildFunnelQuery(r, e, i);
+		let r = t.funnel, i = this.createQueryContext(n), a = this.funnelQueryBuilder.buildFunnelQuery(r, e, i);
 		na("funnel query", a);
 		let o = await a, s = this.funnelQueryBuilder.transformResult(o, r), c = {
 			measures: {},
@@ -7707,11 +7760,7 @@ var ra = class {
 		};
 	}
 	async executeFlowQuery(e, t, n) {
-		let r = t.flow, i = {
-			db: this.dbExecutor.db,
-			schema: this.dbExecutor.schema,
-			securityContext: n
-		}, a = this.flowQueryBuilder.buildFlowQuery(r, e, i);
+		let r = t.flow, i = this.createQueryContext(n), a = this.flowQueryBuilder.buildFlowQuery(r, e, i);
 		na("flow query", a);
 		let o = await a, s = this.flowQueryBuilder.transformResult(o), c = {
 			measures: {},
@@ -7730,11 +7779,7 @@ var ra = class {
 		};
 	}
 	async executeRetentionQuery(e, t, n) {
-		let r = t.retention, i = {
-			db: this.dbExecutor.db,
-			schema: this.dbExecutor.schema,
-			securityContext: n
-		}, a = this.retentionQueryBuilder.buildRetentionQuery(r, e, i);
+		let r = t.retention, i = this.createQueryContext(n), a = this.retentionQueryBuilder.buildRetentionQuery(r, e, i);
 		na("retention query", a);
 		let o = await a, s = this.retentionQueryBuilder.transformResult(o, r), c = {
 			measures: {},
@@ -7773,7 +7818,9 @@ var ra = class {
 			schema: this.dbExecutor.schema,
 			securityContext: e,
 			filterCache: t,
-			ungrouped: n?.ungrouped
+			ungrouped: n?.ungrouped,
+			cast: (e, t) => this.databaseAdapter.castToType(e, t),
+			tryCast: (e, t) => this.databaseAdapter.tryCastToType(e, t)
 		};
 	}
 	getOptimiserEngineType() {
@@ -7843,11 +7890,7 @@ var ra = class {
 		if (!n.has(e)) throw Error(r(n.invalidConfigKey));
 		let i = n.getConfig(e), a = n.validate(i);
 		if (!a.isValid) throw Error(r(n.validationFailedKey, { errors: a.errors.join(", ") }));
-		let o = {
-			db: this.dbExecutor.db,
-			schema: this.dbExecutor.schema,
-			securityContext: t
-		}, s = n.build(i, o).toSQL();
+		let o = this.createQueryContext(t), s = n.build(i, o).toSQL();
 		return {
 			sql: s.sql,
 			params: s.params
@@ -7903,11 +7946,18 @@ var ra = class {
 function aa(e, t) {
 	return t.includes(".") ? t : `${e}.${t}`;
 }
-function oa(e) {
-	let t = Object.keys(e.measures), n = Array(t.length);
+function oa(e, t) {
+	if (!t.includes(".")) return t;
+	let n = `${e}.`;
+	return t.startsWith(n) ? t.slice(n.length) : null;
+}
+function sa(e) {
+	let t = Object.keys(e.measures), n = [];
 	for (let r = 0; r < t.length; r++) {
-		let i = t[r], a = e.measures[i], o;
-		a.drillMembers && a.drillMembers.length > 0 && (o = a.drillMembers.map((t) => aa(e.name, t))), n[r] = {
+		let i = t[r], a = e.measures[i];
+		if (a.shown === !1) continue;
+		let o;
+		a.drillMembers && a.drillMembers.length > 0 && (o = a.drillMembers.map((t) => aa(e.name, t))), n.push({
 			name: `${e.name}.${i}`,
 			title: a.title || i,
 			shortTitle: a.title || i,
@@ -7916,15 +7966,17 @@ function oa(e) {
 			description: a.description,
 			synonyms: a.synonyms,
 			drillMembers: o
-		};
+		});
 	}
 	return n;
 }
-function sa(e) {
-	let t = Object.keys(e.dimensions), n = Array(t.length);
+function ca(e) {
+	let t = Object.keys(e.dimensions), n = [];
 	for (let r = 0; r < t.length; r++) {
-		let i = t[r], a = e.dimensions[i], o = a.type === "time" ? a.granularities || ia : void 0;
-		n[r] = {
+		let i = t[r], a = e.dimensions[i];
+		if (a.shown === !1) continue;
+		let o = a.type === "time" ? a.granularities || ia : void 0;
+		n.push({
 			name: `${e.name}.${i}`,
 			title: a.title || i,
 			shortTitle: a.title || i,
@@ -7933,11 +7985,11 @@ function sa(e) {
 			description: a.description,
 			synonyms: a.synonyms,
 			granularities: o
-		};
+		});
 	}
 	return n;
 }
-function ca(e, t, n) {
+function la(e, t, n) {
 	let r = [];
 	if (!e.joins) return r;
 	for (let [, i] of Object.entries(e.joins)) {
@@ -7953,22 +8005,38 @@ function ca(e, t, n) {
 	}
 	return r;
 }
-function la(e) {
+function ua(e) {
 	let t = [];
 	if (!e.hierarchies) return t;
-	for (let [, n] of Object.entries(e.hierarchies)) t.push({
-		name: n.name,
-		title: n.title || n.name,
-		cubeName: e.name,
-		levels: n.levels.map((t) => aa(e.name, t))
-	});
+	for (let [, n] of Object.entries(e.hierarchies)) {
+		let r = n.levels.filter((t) => {
+			let n = oa(e.name, t);
+			return n === null || e.dimensions[n]?.shown !== !1;
+		}).map((t) => aa(e.name, t));
+		r.length !== 0 && t.push({
+			name: n.name,
+			title: n.title || n.name,
+			cubeName: e.name,
+			levels: r
+		});
+	}
 	return t;
 }
-//#endregion
-//#region src/server/compiler.ts
-var ua = class {
-	cubes = /* @__PURE__ */ new Map();
-	metadataCache;
+Object.freeze({});
+function da(e) {
+	if (typeof process > "u") return;
+	let t = process.env?.DC_DEBUG;
+	(t === "true" || t === "cubesets") && console.log(`[DC_DEBUG] ${e}`);
+}
+var fa = class {
+	baseCubes = /* @__PURE__ */ new Map();
+	cubeSets = /* @__PURE__ */ new Map();
+	metadataCache = /* @__PURE__ */ new Map();
+	baseGeneration = 0;
+	registrationCounter = 0;
+	contextToCubeSetId;
+	missingCubeSet = "base";
+	onCubeSetRegistered;
 	cacheConfig;
 	rlsSetup;
 	planOptimiser;
@@ -7976,7 +8044,7 @@ var ua = class {
 	schema;
 	engineType;
 	constructor(e) {
-		e?.databaseExecutor ? (this.db = e.databaseExecutor.db, this.schema = e.databaseExecutor.schema, this.engineType = e.databaseExecutor.getEngineType()) : e?.drizzle && (this.db = e.drizzle, this.schema = e.schema, this.engineType = e.engineType), this.cacheConfig = e?.cache, this.rlsSetup = e?.rlsSetup, this.planOptimiser = e?.planOptimiser;
+		e?.databaseExecutor ? (this.db = e.databaseExecutor.db, this.schema = e.databaseExecutor.schema, this.engineType = e.databaseExecutor.getEngineType()) : e?.drizzle && (this.db = e.drizzle, this.schema = e.schema, this.engineType = e.engineType), this.cacheConfig = e?.cache, this.rlsSetup = e?.rlsSetup, this.planOptimiser = e?.planOptimiser, this.contextToCubeSetId = e?.contextToCubeSetId, this.missingCubeSet = e?.missingCubeSet ?? "base", this.onCubeSetRegistered = e?.onCubeSetRegistered;
 	}
 	setDatabaseExecutor(e) {
 		this.db = e.db, this.schema = e.schema, this.engineType = e.getEngineType();
@@ -8005,79 +8073,175 @@ var ua = class {
 		};
 	}
 	registerCube(e) {
-		this.validateCalculatedMeasures(e), new Y(this.cubes).populateDependencies(e), this.cubes.set(e.name, e), this.invalidateMetadataCache();
+		this.prepareCube(e, this.baseCubes), this.baseCubes.set(e.name, e), this.baseGeneration++, this.rebuildAllMergedSets(), this.metadataCache.clear();
+	}
+	registerCubeSet(e, t) {
+		if (e === "") throw Error(r("server.errors.cubeSetIdEmpty"));
+		let n = Date.now(), i = /* @__PURE__ */ new Map();
+		for (let e of t) {
+			let t = new Map(this.baseCubes);
+			for (let [e, n] of i) t.set(e, n);
+			this.prepareCube(e, t), i.set(e.name, e);
+		}
+		let a = ++this.registrationCounter, o = this.mergeWithBase(i), s = Date.now() - n;
+		this.cubeSets.set(e, {
+			overlay: i,
+			merged: o,
+			generation: a,
+			durationMs: s
+		}), this.metadataCache.delete(e);
+		let c = 0;
+		for (let e of i.values()) c += Object.keys(e.dimensions ?? {}).length;
+		let l = {
+			setId: e,
+			cubeCount: o.size,
+			dimensionCount: c,
+			generation: a,
+			durationMs: s
+		};
+		da(`registered cube set '${e}': ${i.size} cube(s), ${c} dimension(s), generation ${a}, ${s}ms`), this.onCubeSetRegistered?.(l);
+	}
+	unregisterCubeSet(e) {
+		let t = this.cubeSets.delete(e);
+		return t && this.metadataCache.delete(e), t;
+	}
+	hasCubeSet(e) {
+		return this.cubeSets.has(e);
+	}
+	getCubeSetIds() {
+		return Array.from(this.cubeSets.keys());
+	}
+	getCubeSetStats() {
+		let e = 0, t = 0, n;
+		for (let [r, i] of this.cubeSets) e += i.merged.size, t += i.durationMs, (!n || i.durationMs > n.durationMs) && (n = {
+			setId: r,
+			durationMs: i.durationMs
+		});
+		return {
+			setCount: this.cubeSets.size,
+			cubeCount: e,
+			totalRegistrationMs: t,
+			slowestSet: n
+		};
+	}
+	prepareCube(e, t) {
+		this.validateCalculatedMeasures(e, t), new Y(t).populateDependencies(e);
+	}
+	mergeWithBase(e) {
+		let t = new Map(this.baseCubes);
+		for (let [n, r] of e) t.set(n, r);
+		return t;
+	}
+	rebuildAllMergedSets() {
+		for (let e of this.cubeSets.values()) e.merged = this.mergeWithBase(e.overlay);
+	}
+	resolveSetId(e) {
+		if (!this.contextToCubeSetId) return "";
+		let t = this.contextToCubeSetId(e);
+		if (t == null || t === "") return "";
+		let n = String(t);
+		if (!this.cubeSets.has(n)) {
+			if (this.missingCubeSet === "throw") throw Error(r("server.errors.cubeSetNotFound", { setId: n }));
+			return "";
+		}
+		return n;
+	}
+	resolveCubes(e) {
+		let t = this.resolveSetId(e);
+		return t === "" ? this.baseCubes : this.cubeSets.get(t)?.merged ?? this.baseCubes;
+	}
+	cubeSetCacheKey(e) {
+		let t = this.cubeSets.get(e)?.generation ?? 0;
+		return `${e}:${this.baseGeneration}.${t}`;
 	}
 	validateCubeReferences() {
-		let e = [];
-		for (let [t, n] of this.cubes) if (n.joins) for (let [i, a] of Object.entries(n.joins)) typeof a.targetCube == "string" && !this.cubes.has(a.targetCube) && e.push(r("server.errors.cubeRefUnresolved", {
-			cubeName: t,
-			joinName: i,
-			targetCube: a.targetCube
-		}));
-		if (e.length > 0) throw Error(r("server.errors.unresolvedCubeRefs", { details: e.map((e) => `  - ${e}`).join("\n") }));
+		let e = /* @__PURE__ */ new Set();
+		for (let t of this.unresolvedJoinRefs(this.baseCubes)) e.add(t);
+		for (let t of this.cubeSets.values()) for (let n of this.unresolvedJoinRefs(t.merged)) e.add(n);
+		if (e.size > 0) {
+			let t = Array.from(e, (e) => `  - ${e}`).join("\n");
+			throw Error(r("server.errors.unresolvedCubeRefs", { details: t }));
+		}
+	}
+	*unresolvedJoinRefs(e) {
+		for (let [t, n] of e) if (n.joins) for (let [i, a] of Object.entries(n.joins)) {
+			let { targetCube: n } = a;
+			typeof n == "string" && !e.has(n) && (yield r("server.errors.cubeRefUnresolved", {
+				cubeName: t,
+				joinName: i,
+				targetCube: n
+			}));
+		}
 	}
-	validateCalculatedMeasures(e) {
-		let t = [];
-		for (let [n, i] of Object.entries(e.measures)) if (i.type === "calculated") {
-			if (!i.calculatedSql) {
-				t.push(r("server.validation.calculatedMeasure.mustHaveCalculatedSql", {
+	validateCalculatedMeasures(e, t) {
+		let n = [];
+		for (let [i, a] of Object.entries(e.measures)) if (a.type === "calculated") {
+			if (!a.calculatedSql) {
+				n.push(r("server.validation.calculatedMeasure.mustHaveCalculatedSql", {
 					cubeName: e.name,
-					fieldName: n
+					fieldName: i
 				}));
 				continue;
 			}
-			let a = Mn(i.calculatedSql);
-			if (!a.isValid) {
-				t.push(r("server.validation.calculatedMeasure.invalidSyntax", {
+			let o = Mn(a.calculatedSql);
+			if (!o.isValid) {
+				n.push(r("server.validation.calculatedMeasure.invalidSyntax", {
 					cubeName: e.name,
-					fieldName: n,
-					errors: a.errors.join(", ")
+					fieldName: i,
+					errors: o.errors.join(", ")
 				}));
 				continue;
 			}
-			let o = new Map(this.cubes);
-			o.set(e.name, e);
-			let s = new Y(o);
+			let s = new Map(t);
+			s.set(e.name, e);
+			let c = new Y(s);
 			try {
-				s.validateDependencies(e);
+				c.validateDependencies(e);
 			} catch (e) {
-				t.push(e instanceof Error ? e.message : String(e));
+				n.push(e instanceof Error ? e.message : String(e));
 			}
 		}
-		if (t.length === 0) {
-			let n = new Map(this.cubes);
-			n.set(e.name, e);
-			let i = new Y(n);
-			i.buildGraph(e);
-			let a = i.detectCycle();
-			a && t.push(r("server.validation.calculatedMeasure.circularDependency", { cycle: a.join(" -> ") }));
-		}
-		if (t.length > 0) throw Error(r("server.errors.calculatedMeasureValidation", {
+		if (n.length === 0) {
+			let i = new Map(t);
+			i.set(e.name, e);
+			let a = new Y(i);
+			a.buildGraph(e);
+			let o = a.detectCycle();
+			o && n.push(r("server.validation.calculatedMeasure.circularDependency", { cycle: o.join(" -> ") }));
+		}
+		if (n.length > 0) throw Error(r("server.errors.calculatedMeasureValidation", {
 			cubeName: e.name,
-			details: t.join("\n")
+			details: n.join("\n")
 		}));
 	}
-	getCube(e) {
-		return this.cubes.get(e);
+	getCube(e, t) {
+		return this.resolveCubes(t).get(e);
 	}
-	getAllCubes() {
-		return Array.from(this.cubes.values());
+	getAllCubes(e) {
+		return Array.from(this.resolveCubes(e).values());
 	}
-	getAllCubesMap() {
-		return this.cubes;
+	getAllCubesMap(e) {
+		return this.resolveCubes(e);
 	}
 	async execute(e, t, n) {
-		return this.createQueryExecutor(!0).execute(this.cubes, e, t, n);
+		let r = this.createQueryExecutor(!0), i = this.resolveSetId(t);
+		return r.execute(this.cubeSetId2Cubes(i), e, t, {
+			...n,
+			cubeSetKey: this.cubeSetCacheKey(i)
+		});
 	}
 	async executeMultiCubeQuery(e, t, n) {
 		return this.execute(e, t, n);
 	}
 	async executeQuery(e, t, n) {
-		if (!this.cubes.get(e)) throw Error(r("server.errors.cubeNotFound", { cubeName: e }));
+		if (!this.resolveCubes(n).get(e)) throw Error(r("server.errors.cubeNotFound", { cubeName: e }));
 		return this.execute(t, n);
 	}
-	getMetadata() {
-		return this.metadataCache ||= Array.from(this.cubes.values()).map((e) => this.generateCubeMetadata(e)), this.metadataCache;
+	getMetadata(e) {
+		let t = this.resolveSetId(e), n = this.metadataCache.get(t);
+		if (n) return n;
+		let r = this.cubeSetId2Cubes(t), i = Array.from(r.values()).map((e) => this.generateCubeMetadata(e, r));
+		return this.metadataCache.set(t, i), i;
 	}
 	getColumnName(e) {
 		if (e && e.name || e && e.columnType && e.name) return e.name;
@@ -8089,33 +8253,33 @@ var ua = class {
 		}
 		return "unknown_column";
 	}
-	generateCubeMetadata(e) {
-		let t = oa(e), n = sa(e), r = ca(e, this.cubes, (e) => this.getColumnName(e)), i = la(e);
+	generateCubeMetadata(e, t) {
+		let n = sa(e), r = ca(e), i = la(e, t, (e) => this.getColumnName(e)), a = ua(e);
 		return {
 			name: e.name,
 			title: e.title || e.name,
 			description: e.description,
 			exampleQuestions: e.exampleQuestions,
-			measures: t,
-			dimensions: n,
+			measures: n,
+			dimensions: r,
 			segments: [],
-			relationships: r.length > 0 ? r : void 0,
-			hierarchies: i.length > 0 ? i : void 0,
+			relationships: i.length > 0 ? i : void 0,
+			hierarchies: a.length > 0 ? a : void 0,
 			meta: e.meta
 		};
 	}
 	async generateSQL(e, t, n) {
-		let i = this.getCube(e);
+		let i = this.getCube(e, n);
 		if (!i) throw Error(r("server.errors.cubeNotFound", { cubeName: e }));
 		let a = await this.createQueryExecutor().generateSQL(i, t, n);
 		return this.formatSqlResult(a);
 	}
 	async generateMultiCubeSQL(e, t) {
-		let n = await this.createQueryExecutor().generateMultiCubeSQL(this.cubes, e, t);
+		let n = await this.createQueryExecutor().generateMultiCubeSQL(this.resolveCubes(t), e, t);
 		return this.formatSqlResult(n);
 	}
 	async dryRun(e, t) {
-		let n = await this.createQueryExecutor().dryRunSQL(this.cubes, e, t);
+		let n = await this.createQueryExecutor().dryRunSQL(this.resolveCubes(t), e, t);
 		return this.formatSqlResult(n);
 	}
 	async dryRunFunnel(e, t) {
@@ -8128,33 +8292,36 @@ var ua = class {
 		return this.dryRun(e, t);
 	}
 	async explainQuery(e, t, n) {
-		return this.createQueryExecutor().explainQuery(this.cubes, e, t, n);
+		return this.createQueryExecutor().explainQuery(this.resolveCubes(t), e, t, n);
 	}
-	hasCube(e) {
-		return this.cubes.has(e);
+	hasCube(e, t) {
+		return this.resolveCubes(t).has(e);
 	}
 	unregisterCube(e) {
 		return this.removeCube(e);
 	}
 	removeCube(e) {
-		let t = this.cubes.delete(e);
-		return t && this.invalidateMetadataCache(), t;
+		let t = this.baseCubes.delete(e);
+		return t && (this.baseGeneration++, this.rebuildAllMergedSets(), this.invalidateMetadataCache()), t;
 	}
 	clearCubes() {
-		this.cubes.clear(), this.invalidateMetadataCache();
+		this.baseCubes.clear(), this.baseGeneration++, this.rebuildAllMergedSets(), this.invalidateMetadataCache();
 	}
 	invalidateMetadataCache() {
-		this.metadataCache = void 0;
+		this.metadataCache.clear();
+	}
+	cubeSetId2Cubes(e) {
+		return e === "" ? this.baseCubes : this.cubeSets.get(e)?.merged ?? this.baseCubes;
 	}
-	getCubeNames() {
-		return Array.from(this.cubes.keys());
+	getCubeNames(e) {
+		return Array.from(this.resolveCubes(e).keys());
 	}
-	validateQuery(e) {
-		return Sr(this.cubes, e);
+	validateQuery(e, t) {
+		return Sr(this.resolveCubes(t), e);
 	}
 	analyzeQuery(e, t) {
-		return this.createQueryExecutor(!0).analyzeQuery(this.cubes, e, t);
+		return this.createQueryExecutor(!0).analyzeQuery(this.resolveCubes(t), e, t);
 	}
 };
 //#endregion
-export { ua as t };
+export { fa as t };