drizzle-cube 0.4.35 → 0.4.37

package/dist/server/index.d.ts

@@ -3844,6 +3844,11 @@ export declare interface QueryContext {
      * Created at query start and used throughout query building
      */
     filterCache?: FilterCacheManager;
+    /**
+     * When true, measures should be rendered as raw column expressions
+     * without aggregation wrappers. Set from SemanticQuery.ungrouped.
+     */
+    ungrouped?: boolean;
 }
 
 export declare class QueryExecutor {
@@ -4687,6 +4692,19 @@ export declare interface SemanticQuery {
      * Default: 0
      */
     fillMissingDatesValue?: number | null;
+    /**
+     * When true, returns raw row-level data without GROUP BY or aggregation.
+     * Measures are rendered as raw column expressions (no aggregation wrappers).
+     * Security context and joins still apply normally.
+     *
+     * Constraints:
+     * - Requires at least one dimension
+     * - Only compatible with sum, avg, min, max, and number measure types
+     * - Incompatible with count, countDistinct, calculated, and window function measures
+     * - Incompatible with measure filters, hasMany joins, funnel/flow/retention modes
+     * - Incompatible with compareDateRange and fillMissingDates
+     */
+    ungrouped?: boolean;
     /**
      * Funnel analysis configuration for query-time funnel definition.
      * When specified, the query executes as a funnel analysis instead of

package/dist/server/index.js

@@ -2711,6 +2711,7 @@ var F = class e {
 		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 a = M(t.sql, r);
+		if (r.ungrouped) return a;
 		if (t.filters && t.filters.length > 0) {
 			let e = t.filters.map((e) => {
 				let t = e(r);
@@ -2920,6 +2921,7 @@ var F = class e {
 		].includes(e);
 	}
 	buildGroupByFields(e, t, n, r) {
+		if (t.ungrouped) return [];
 		let i = [], a = e instanceof Map ? e : new Map([[e.name, e]]), o = t.dimensions && t.dimensions.length > 0 || t.timeDimensions && t.timeDimensions.length > 0, s = t.measures && t.measures.length > 0, c = o && !s, l = !1;
 		for (let e of t.measures || []) {
 			let [t, n] = e.split("."), r = a.get(t);
@@ -6187,14 +6189,15 @@ function qt(e, t, r, i, a, o, s, c) {
 		d = d.where(e);
 	}
 	let f = c.queryBuilder.buildGroupByFields(e.joinCubes.length > 0 ? i : e.primaryCube, t, r, e);
-	f.length > 0 && (d = d.groupBy(...f));
-	let p = c.queryBuilder.buildHavingConditions(e.joinCubes.length > 0 ? i : e.primaryCube, t, r, e);
-	if (p.length > 0) {
-		let e = p.length === 1 ? p[0] : n(...p);
-		d = d.having(e);
+	if (f.length > 0 && (d = d.groupBy(...f)), !t.ungrouped) {
+		let a = c.queryBuilder.buildHavingConditions(e.joinCubes.length > 0 ? i : e.primaryCube, t, r, e);
+		if (a.length > 0) {
+			let e = a.length === 1 ? a[0] : n(...a);
+			d = d.having(e);
+		}
 	}
-	let m = c.queryBuilder.buildOrderBy(t);
-	return m.length > 0 && (d = d.orderBy(...m)), d = c.queryBuilder.applyLimitAndOffset(d, t), d;
+	let p = c.queryBuilder.buildOrderBy(t);
+	return p.length > 0 && (d = d.orderBy(...p)), d = c.queryBuilder.applyLimitAndOffset(d, t), d;
 }
 //#endregion
 //#region src/server/physical-plan/processors/shared.ts
@@ -6565,7 +6568,7 @@ var Yt = class {
 //#endregion
 //#region src/server/executor.ts
 function Xt(e, t) {
-	if (process.env.DC_DEBUG) try {
+	if (!(typeof process > "u" || !process.env?.DC_DEBUG)) try {
 		let { sql: n, params: r } = t.toSQL();
 		console.log(`\n[DC_DEBUG] ${e}`), console.log(n), r.length > 0 && console.log("params:", r), console.log();
 	} catch {}
@@ -6649,11 +6652,11 @@ var Zt = class {
 		}
 	}
 	buildLogicalPlan(e, t, n) {
-		let r = new $e(), i = this.createQueryContext(n, r);
+		let r = new $e(), 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 $e(), i = this.createQueryContext(n, r);
+		let r = new $e(), i = this.createQueryContext(n, r, t);
 		return this.preloadFilterCache(t, r, e, i), this.buildRegularQueryArtifacts(e, t, i).analysis;
 	}
 	async executeQuery(e, t, n) {
@@ -6784,7 +6787,7 @@ var Zt = class {
 		};
 	}
 	async executeStandardQuery(e, t, n) {
-		let r = new $e(), i = this.createQueryContext(n, r);
+		let r = new $e(), 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);
 		Xt("query", s);
@@ -6807,12 +6810,13 @@ var Zt = class {
 			annotation: this.generateAnnotations(o, t)
 		};
 	}
-	createQueryContext(e, t) {
+	createQueryContext(e, t, n) {
 		return {
 			db: this.dbExecutor.db,
 			schema: this.dbExecutor.schema,
 			securityContext: e,
-			filterCache: t
+			filterCache: t,
+			ungrouped: n?.ungrouped
 		};
 	}
 	getOptimiserEngineType() {
@@ -6900,7 +6904,7 @@ var Zt = class {
 		return this.validateQueryForMode(r, e, t), this.generateSqlForMode(r, e, t, n);
 	}
 	async generateUnifiedSQL(e, t, n) {
-		let r = new $e(), i = this.createQueryContext(n, r);
+		let r = new $e(), 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 {
@@ -6946,7 +6950,7 @@ var Zt = class {
 		}[qe(e)]();
 	}
 	async executeRegularQueryWithCache(e, t, n, r) {
-		let i = new $e(), a = this.createQueryContext(n, i);
+		let i = new $e(), 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);
@@ -11522,7 +11526,56 @@ function vc(e, t) {
 		o.dimensions[i] || n.push(`TimeDimension '${i}' not found on cube '${t}' (must be a dimension with time type)`);
 	}
 	if (t.filters) for (let r of t.filters) yc(r, e, n, a);
-	return a.size === 0 && n.push("Query must reference at least one cube through measures, dimensions, or filters"), {
+	if (a.size === 0 && n.push("Query must reference at least one cube through measures, dimensions, or filters"), t.ungrouped) {
+		t.dimensions && t.dimensions.length > 0 || t.timeDimensions && t.timeDimensions.length > 0 || n.push("Ungrouped queries require at least one dimension or time dimension"), t.funnel && n.push("Ungrouped queries are incompatible with funnel analysis"), t.flow && n.push("Ungrouped queries are incompatible with flow analysis"), t.retention && n.push("Ungrouped queries are incompatible with retention analysis"), t.timeDimensions?.some((e) => e.compareDateRange && e.compareDateRange.length > 0) && n.push("Ungrouped queries are incompatible with compareDateRange"), t.timeDimensions?.some((e) => e.fillMissingDates === !0) && n.push("Ungrouped queries are incompatible with fillMissingDates");
+		let r = new Set([
+			"sum",
+			"avg",
+			"min",
+			"max",
+			"number"
+		]), i = new Set([
+			"count",
+			"countDistinct",
+			"countDistinctApprox",
+			"calculated",
+			"stddev",
+			"stddevSamp",
+			"variance",
+			"varianceSamp",
+			"median",
+			"p95",
+			"p99",
+			"percentile",
+			"lag",
+			"lead",
+			"rank",
+			"denseRank",
+			"rowNumber",
+			"ntile",
+			"firstValue",
+			"lastValue",
+			"movingAvg",
+			"movingSum"
+		]);
+		if (t.measures) for (let a of t.measures) {
+			let [t, o] = a.split("."), s = e.get(t);
+			if (s && s.measures[o]) {
+				let e = s.measures[o];
+				i.has(e.type) && n.push(`Measure '${a}' has type '${e.type}' which is incompatible with ungrouped queries. Only ${[...r].join(", ")} types are allowed.`), e.filters && e.filters.length > 0 && n.push(`Measure '${a}' has filters which are incompatible with ungrouped queries (measure filters require aggregation)`);
+			}
+		}
+		for (let t of a) {
+			let r = e.get(t);
+			if (r && r.joins) {
+				for (let [i, o] of Object.entries(r.joins)) if (o.relationship === "hasMany") {
+					let r = j(o.targetCube, e);
+					r && a.has(r.name) && n.push(`Ungrouped queries are incompatible with hasMany relationships (${t} → ${i} is hasMany)`);
+				}
+			}
+		}
+	}
+	return {
 		isValid: n.length === 0,
 		errors: n
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-cube",
-  "version": "0.4.35",
+  "version": "0.4.37",
   "description": "Drizzle ORM-first semantic layer with Cube.js compatibility. Type-safe analytics and dashboards with SQL injection protection.",
   "main": "./dist/server/index.js",
   "types": "./dist/server/index.d.ts",