@gscdump/engine-duckdb-wasm 5.3.0 → 5.7.0

package/dist/archetype-sql.mjs

@@ -159,37 +159,63 @@ function facetPredicate(query, table) {
 		params
 	};
 }
+const DAILY_FACET_COLUMNS = /* @__PURE__ */ new Set([
+	"page",
+	"query",
+	"queryCanonical",
+	"country"
+]);
+function dailyTable(query, seriesDimension, unfaceted) {
+	const facets = query.facets ?? [];
+	if (!facets.length) return unfaceted;
+	const dims = [...seriesDimension ? [seriesDimension] : [], ...facets.map((facet) => facet.column)];
+	const unsupported = dims.find((dim) => !DAILY_FACET_COLUMNS.has(dim));
+	if (unsupported) throw new Error(`[archetype-sql] ${query.archetype}: a daily read cannot combine a facet with the ${unsupported} dimension`);
+	if (dims.includes("country") && dims.some((dim) => dim !== "country")) throw new Error(`[archetype-sql] ${query.archetype}: no fact table stores country with page or query, so a daily read cannot apply this facet`);
+	return tableForDimensions(dims);
+}
 function compileArchetypeSql(query) {
 	switch (query.archetype) {
 		case "site-daily-timeseries": {
-			const table = "dates";
+			const table = dailyTable(query, void 0, "dates");
 			const where = rangePredicate(query);
+			const facet = facetPredicate(query, table);
 			return {
 				table,
-				sql: `SELECT date, ${query.metrics.map((m) => `${metricExpr(m)} AS ${m}`).join(", ")} FROM ${table} WHERE ${where.sql} GROUP BY date ORDER BY date`,
-				params: where.params
+				sql: `SELECT date, ${query.metrics.map((m) => `${metricExpr(m)} AS ${m}`).join(", ")} FROM ${table} WHERE ${where.sql}${facet.sql} GROUP BY date ORDER BY date`,
+				params: [...where.params, ...facet.params]
 			};
 		}
 		case "entity-daily-timeseries": {
-			const table = tableForDimensions([query.entity.dimension]);
+			const table = dailyTable(query, query.entity.dimension, tableForDimensions([query.entity.dimension]));
 			const col = dimExpr(query.entity.dimension, table);
 			const where = rangePredicate(query);
+			const facet = facetPredicate(query, table);
 			return {
 				table,
-				sql: `SELECT date, ${metricSelectList(query.metrics)} FROM ${table} WHERE ${where.sql} AND ${col} = ? GROUP BY date ORDER BY date`,
-				params: [...where.params, query.entity.value]
+				sql: `SELECT date, ${metricSelectList(query.metrics)} FROM ${table} WHERE ${where.sql}${facet.sql} AND ${col} = ? GROUP BY date ORDER BY date`,
+				params: [
+					...where.params,
+					...facet.params,
+					query.entity.value
+				]
 			};
 		}
 		case "entity-daily-sparkline": {
-			const table = tableForDimensions([query.dimension]);
+			const table = dailyTable(query, query.dimension, tableForDimensions([query.dimension]));
 			const col = dimExpr(query.dimension, table);
 			const where = rangePredicate(query);
+			const facet = facetPredicate(query, table);
 			if (query.entities.length === 0) throw new Error("[archetype-sql] entity-daily-sparkline requires resolved entities");
 			const placeholders = query.entities.map(() => "?").join(", ");
 			return {
 				table,
-				sql: `SELECT ${col} AS entity, date, ${metricExpr(query.metric)} AS ${query.metric} FROM ${table} WHERE ${where.sql} AND ${col} IN (${placeholders}) GROUP BY ${col}, date ORDER BY ${col}, date`,
-				params: [...where.params, ...query.entities]
+				sql: `SELECT ${col} AS entity, date, ${metricExpr(query.metric)} AS ${query.metric} FROM ${table} WHERE ${where.sql}${facet.sql} AND ${col} IN (${placeholders}) GROUP BY ${col}, date ORDER BY ${col}, date`,
+				params: [
+					...where.params,
+					...facet.params,
+					...query.entities
+				]
 			};
 		}
 		case "top-n-breakdown": {
@@ -304,7 +330,7 @@ function compileArchetypeSql(query) {
 			};
 		}
 		case "multi-series-stacked-daily": {
-			const table = tableForDimensions([query.seriesDimension]);
+			const table = dailyTable(query, query.seriesDimension, tableForDimensions([query.seriesDimension]));
 			const where = rangePredicate(query);
 			if (query.seriesDimension === "device") return {
 				table,
@@ -316,10 +342,11 @@ function compileArchetypeSql(query) {
 				]
 			};
 			const col = dimExpr(query.seriesDimension, table);
+			const facet = facetPredicate(query, table);
 			return {
 				table,
-				sql: `SELECT date, ${col} AS ${query.seriesDimension}, ${metricExpr(query.metric)} AS ${query.metric} FROM ${table} WHERE ${where.sql} GROUP BY date, ${col} ORDER BY date, ${col}`,
-				params: where.params
+				sql: `SELECT date, ${col} AS ${query.seriesDimension}, ${metricExpr(query.metric)} AS ${query.metric} FROM ${table} WHERE ${where.sql}${facet.sql} GROUP BY date, ${col} ORDER BY date, ${col}`,
+				params: [...where.params, ...facet.params]
 			};
 		}
 		case "two-dimension-detail": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-duckdb-wasm",
   "type": "module",
-  "version": "5.3.0",
+  "version": "5.7.0",
   "description": "DuckDB-WASM engine adapter for @gscdump/analysis — typed browser analytics against parquet via R2.",
   "author": {
     "name": "Harlan Wilton",
@@ -44,10 +44,10 @@
     }
   },
   "dependencies": {
-    "@gscdump/contracts": "^5.3.0",
-    "@gscdump/engine": "^5.3.0",
+    "@gscdump/contracts": "^5.7.0",
+    "@gscdump/engine": "^5.7.0",
     "drizzle-orm": "1.0.0-rc.4",
-    "gscdump": "^5.3.0"
+    "gscdump": "^5.7.0"
   },
   "devDependencies": {
     "@duckdb/duckdb-wasm": "1.33.1-dev57.0",