@gscdump/cloudflare 5.3.1 → 5.7.0

package/dist/server-tail/archetype-sql.mjs

@@ -153,36 +153,59 @@ function facetPredicate(query) {
 		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 buildSiteDailyTimeseries(q, pruned, mode) {
+	const table = dailyTable(q, void 0, "dates");
 	const w = partitionWhere(q, pruned, mode);
+	const facet = facetPredicate(q);
 	const metrics = q.metrics.map(metricExpr).join(", ");
 	return {
-		table: "dates",
-		params: w.params,
-		sql: `SELECT date, ${metrics} FROM ${factTableRef()} WHERE ${w.clause} GROUP BY date ORDER BY date ASC`
+		table,
+		params: [...w.params, ...facet.params],
+		sql: `SELECT date, ${metrics} FROM ${factTableRef()} WHERE ${w.clause}${facet.sql} GROUP BY date ORDER BY date ASC`
 	};
 }
 function buildEntityDailyTimeseries(q, pruned, mode) {
-	const table = tableForDimensions([q.entity.dimension]);
+	const table = dailyTable(q, q.entity.dimension, tableForDimensions([q.entity.dimension]));
 	const w = partitionWhere(q, pruned, mode);
+	const facet = facetPredicate(q);
 	const col = dimColumn(q.entity.dimension);
 	const metrics = q.metrics.map(metricExpr).join(", ");
 	return {
 		table,
-		params: [...w.params, q.entity.value],
-		sql: `SELECT date, ${metrics} FROM ${factTableRef()} WHERE ${w.clause} AND ${col} = ? GROUP BY date ORDER BY date ASC`
+		params: [
+			...w.params,
+			...facet.params,
+			q.entity.value
+		],
+		sql: `SELECT date, ${metrics} FROM ${factTableRef()} WHERE ${w.clause}${facet.sql} AND ${col} = ? GROUP BY date ORDER BY date ASC`
 	};
 }
 function buildEntityDailySparkline(q, pruned, mode) {
-	const table = tableForDimensions([q.dimension]);
+	const table = dailyTable(q, q.dimension, tableForDimensions([q.dimension]));
 	const w = partitionWhere(q, pruned, mode);
+	const facet = facetPredicate(q);
 	const col = dimColumn(q.dimension);
 	if (q.entities.length === 0) throw new Error("entity-daily-sparkline: empty entities - resolver must pre-resolve the top-N list");
 	const inList = q.entities.map(sqlStringLiteral).join(", ");
 	return {
 		table,
-		params: w.params,
-		sql: `SELECT date, ${col} AS entity, ${metricExpr(q.metric)} FROM ${factTableRef()} WHERE ${w.clause} AND ${col} IN (${inList}) GROUP BY date, ${col} ORDER BY date ASC`
+		params: [...w.params, ...facet.params],
+		sql: `SELECT date, ${col} AS entity, ${metricExpr(q.metric)} FROM ${factTableRef()} WHERE ${w.clause}${facet.sql} AND ${col} IN (${inList}) GROUP BY date, ${col} ORDER BY date ASC`
 	};
 }
 function buildTopNBreakdown(q, pruned, mode, separateComparisonTable = false) {
@@ -285,7 +308,7 @@ function buildSingleRowLookup(q, pruned, mode) {
 	};
 }
 function buildMultiSeriesStackedDaily(q, pruned, mode) {
-	const table = tableForDimensions([q.seriesDimension]);
+	const table = dailyTable(q, q.seriesDimension, tableForDimensions([q.seriesDimension]));
 	const w = partitionWhere(q, pruned, mode);
 	if (q.seriesDimension === "device") {
 		const selects = DEVICE_SUFFIXES.map((suffix) => {
@@ -299,10 +322,11 @@ function buildMultiSeriesStackedDaily(q, pruned, mode) {
 		};
 	}
 	const col = dimColumn(q.seriesDimension);
+	const facet = facetPredicate(q);
 	return {
 		table,
-		params: w.params,
-		sql: `SELECT date, ${dimSelect(q.seriesDimension)}, ${metricExpr(q.metric)} FROM ${factTableRef()} WHERE ${w.clause} GROUP BY date, ${col} ORDER BY date ASC`
+		params: [...w.params, ...facet.params],
+		sql: `SELECT date, ${dimSelect(q.seriesDimension)}, ${metricExpr(q.metric)} FROM ${factTableRef()} WHERE ${w.clause}${facet.sql} GROUP BY date, ${col} ORDER BY date ASC`
 	};
 }
 function buildTwoDimensionDetail(q, pruned, mode) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cloudflare",
   "type": "module",
-  "version": "5.3.1",
+  "version": "5.7.0",
   "description": "Cloudflare Workers helpers for server-tail queries and in-flight request deduplication.",
   "author": {
     "name": "Harlan Wilton",
@@ -39,9 +39,9 @@
     "node": ">=22.13.0"
   },
   "dependencies": {
-    "@gscdump/contracts": "^5.3.0",
-    "@gscdump/engine": "^5.3.0",
-    "gscdump": "^5.3.1"
+    "@gscdump/contracts": "^5.7.0",
+    "@gscdump/engine": "^5.7.0",
+    "gscdump": "^5.7.0"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.22.0",