@gscdump/cloudflare 0.36.1 → 0.36.3

package/dist/server-tail/index.mjs

@@ -3,9 +3,13 @@ import { ARCHETYPE_EXECUTION_CLASS } from "@gscdump/contracts/archetypes";
 import { err, ok, unwrapResult } from "gscdump/result";
 import { SEARCH_TYPE_INT } from "@gscdump/engine/iceberg";
 const TABLE_PLACEHOLDER = "{{TABLE}}";
+const FACT_ALIAS = "fact";
+function factTableRef() {
+	return `${TABLE_PLACEHOLDER} AS ${FACT_ALIAS}`;
+}
 function dimColumn(dim) {
 	if (dim === "page") return "url";
-	if (dim === "queryCanonical") return "COALESCE((SELECT qd.query_canonical FROM query_dim qd WHERE qd.query = query LIMIT 1), query)";
+	if (dim === "queryCanonical") return `COALESCE((SELECT qd.query_canonical FROM query_dim qd WHERE qd.query = ${FACT_ALIAS}.query LIMIT 1), ${FACT_ALIAS}.query)`;
 	return dim;
 }
 function dimSelect(dim) {
@@ -20,6 +24,15 @@ function tableForDimensions(dims) {
 	if (set.has("device")) return "dates";
 	return "pages";
 }
+function tableForTopNBreakdown(q) {
+	const dims = [q.dimension];
+	for (const facet of q.facets ?? []) {
+		const hasPage = q.dimension === "page" || facet.column === "page";
+		const hasQuery = q.dimension === "query" || q.dimension === "queryCanonical" || facet.column === "query" || facet.column === "queryCanonical";
+		if (hasPage && hasQuery) dims.push(facet.column);
+	}
+	return tableForDimensions(dims);
+}
 function metricExpr(metric) {
 	switch (metric) {
 		case "clicks": return "SUM(clicks) AS clicks";
@@ -149,7 +162,7 @@ function buildSiteDailyTimeseries(q, pruned, mode) {
 	return {
 		table: "dates",
 		params: w.params,
-		sql: `SELECT date, ${metrics} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause} GROUP BY date ORDER BY date ASC`
+		sql: `SELECT date, ${metrics} FROM ${factTableRef()} WHERE ${w.clause} GROUP BY date ORDER BY date ASC`
 	};
 }
 function buildEntityDailyTimeseries(q, pruned, mode) {
@@ -160,7 +173,7 @@ function buildEntityDailyTimeseries(q, pruned, mode) {
 	return {
 		table,
 		params: [...w.params, q.entity.value],
-		sql: `SELECT date, ${metrics} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause} AND ${col} = ? GROUP BY date ORDER BY date ASC`
+		sql: `SELECT date, ${metrics} FROM ${factTableRef()} WHERE ${w.clause} AND ${col} = ? GROUP BY date ORDER BY date ASC`
 	};
 }
 function buildEntityDailySparkline(q, pruned, mode) {
@@ -172,11 +185,11 @@ function buildEntityDailySparkline(q, pruned, mode) {
 	return {
 		table,
 		params: w.params,
-		sql: `SELECT date, ${dimSelect(q.dimension)}, ${metricExpr(q.metric)} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause} AND ${col} IN (${inList}) GROUP BY date, ${col} ORDER BY date ASC`
+		sql: `SELECT date, ${dimSelect(q.dimension)}, ${metricExpr(q.metric)} FROM ${factTableRef()} WHERE ${w.clause} AND ${col} IN (${inList}) GROUP BY date, ${col} ORDER BY date ASC`
 	};
 }
 function buildTopNBreakdown(q, pruned, mode) {
-	const table = tableForDimensions([q.dimension]);
+	const table = tableForTopNBreakdown(q);
 	const w = partitionWhere(q, pruned, mode);
 	if (!q.orderBy || !q.orderBy.metric || !q.orderBy.dir) throw new Error(`[archetype-sql] top-n-breakdown requires orderBy.{metric,dir}, got: ${JSON.stringify(q.orderBy)}`);
 	const order = `${metricAlias(q.orderBy.metric)} ${q.orderBy.dir.toUpperCase()}`;
@@ -198,7 +211,7 @@ function buildTopNBreakdown(q, pruned, mode) {
 			const deviceSelects = (clause, ml) => DEVICE_SUFFIXES.map((suffix) => {
 				const source = deviceSource(suffix);
 				const metrics = ml.map((m) => metricExprForSource(m, source)).join(", ");
-				return `SELECT '${suffix.toUpperCase()}' AS device, ${metrics} FROM ${TABLE_PLACEHOLDER} WHERE ${clause}`;
+				return `SELECT '${suffix.toUpperCase()}' AS device, ${metrics} FROM ${factTableRef()} WHERE ${clause}`;
 			}).join(" UNION ALL ");
 			const inner = `SELECT COALESCE(c.device, p.device) AS device, ${metricList.map((m) => coalesceMetric(m, "c", m)).join(", ")}, ${STD_METRICS.map((m) => coalesceMetric(m, "p", prevAlias(m))).join(", ")} FROM cur c FULL OUTER JOIN prev p ON c.device = p.device`;
 			const sql = `WITH cur AS (${deviceSelects(w.clause, metricList)}), prev AS (${deviceSelects(wPrev.clause, STD_METRICS)}) SELECT * FROM (${inner}) t ORDER BY ${order} ${limit}${offset}`;
@@ -211,7 +224,7 @@ function buildTopNBreakdown(q, pruned, mode) {
 		const sql = `${DEVICE_SUFFIXES.map((suffix) => {
 			const source = deviceSource(suffix);
 			const metrics = metricList.map((m) => metricExprForSource(m, source)).join(", ");
-			return `SELECT '${suffix.toUpperCase()}' AS device, ${metrics} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause}`;
+			return `SELECT '${suffix.toUpperCase()}' AS device, ${metrics} FROM ${factTableRef()} WHERE ${w.clause}`;
 		}).join(" UNION ALL ")} ORDER BY ${order} ${limit}${offset}`;
 		return {
 			table,
@@ -235,7 +248,7 @@ function buildTopNBreakdown(q, pruned, mode) {
 		const moverWhere = q.movers ? `WHERE ${moverClause(q.movers).where} ` : "";
 		const outerOrder = q.movers ? moverOrderByAlias(q.movers) : order;
 		const inner = `SELECT COALESCE(c.k, p.k) AS ${q.dimension}, ${curCols}, ${prevCols}${variantOut}${totalCol} FROM cur c FULL OUTER JOIN prev p ON c.k = p.k ${moverWhere}`;
-		const sql = `WITH cur AS (SELECT ${col} AS k, ${curMetrics}${variantSel} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause}${facet.sql} GROUP BY ${col}), prev AS (SELECT ${col} AS k, ${prevMetrics} FROM ${TABLE_PLACEHOLDER} WHERE ${wPrev.clause}${facet.sql} GROUP BY ${col}) SELECT * FROM (${inner}) t ORDER BY ${outerOrder} ${limit}${offset}`;
+		const sql = `WITH cur AS (SELECT ${col} AS k, ${curMetrics}${variantSel} FROM ${factTableRef()} WHERE ${w.clause}${facet.sql} GROUP BY ${col}), prev AS (SELECT ${col} AS k, ${prevMetrics} FROM ${factTableRef()} WHERE ${wPrev.clause}${facet.sql} GROUP BY ${col}) SELECT * FROM (${inner}) t ORDER BY ${outerOrder} ${limit}${offset}`;
 		return {
 			table,
 			params: [
@@ -248,7 +261,7 @@ function buildTopNBreakdown(q, pruned, mode) {
 		};
 	}
 	const metrics = metricList.map(metricExpr).join(", ");
-	const sql = `SELECT ${dimSelect(q.dimension)}, ${metrics}${variantSel}${totalCol} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause}${facet.sql} GROUP BY ${col} ORDER BY ${order} ${limit}${offset}`;
+	const sql = `SELECT ${dimSelect(q.dimension)}, ${metrics}${variantSel}${totalCol} FROM ${factTableRef()} WHERE ${w.clause}${facet.sql} GROUP BY ${col} ORDER BY ${order} ${limit}${offset}`;
 	return {
 		table,
 		params: [...w.params, ...facet.params],
@@ -270,7 +283,7 @@ function buildSingleRowLookup(q, pruned, mode) {
 	return {
 		table,
 		params,
-		sql: `SELECT ${dims.length > 0 ? `${dims.map(dimSelect).join(", ")}, ${metrics}` : metrics} FROM ${TABLE_PLACEHOLDER} WHERE ${clause}${groupBy}`
+		sql: `SELECT ${dims.length > 0 ? `${dims.map(dimSelect).join(", ")}, ${metrics}` : metrics} FROM ${factTableRef()} WHERE ${clause}${groupBy}`
 	};
 }
 function buildMultiSeriesStackedDaily(q, pruned, mode) {
@@ -279,7 +292,7 @@ function buildMultiSeriesStackedDaily(q, pruned, mode) {
 	if (q.seriesDimension === "device") {
 		const selects = DEVICE_SUFFIXES.map((suffix) => {
 			const source = deviceSource(suffix);
-			return `SELECT date, '${suffix.toUpperCase()}' AS device, ${metricExprForSource(q.metric, source)} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause} GROUP BY date`;
+			return `SELECT date, '${suffix.toUpperCase()}' AS device, ${metricExprForSource(q.metric, source)} FROM ${factTableRef()} WHERE ${w.clause} GROUP BY date`;
 		});
 		return {
 			table,
@@ -291,7 +304,7 @@ function buildMultiSeriesStackedDaily(q, pruned, mode) {
 	return {
 		table,
 		params: w.params,
-		sql: `SELECT date, ${dimSelect(q.seriesDimension)}, ${metricExpr(q.metric)} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause} GROUP BY date, ${col} ORDER BY date ASC`
+		sql: `SELECT date, ${dimSelect(q.seriesDimension)}, ${metricExpr(q.metric)} FROM ${factTableRef()} WHERE ${w.clause} GROUP BY date, ${col} ORDER BY date ASC`
 	};
 }
 function buildTwoDimensionDetail(q, pruned, mode) {
@@ -309,7 +322,7 @@ function buildTwoDimensionDetail(q, pruned, mode) {
 	const facet = facetPredicate(q);
 	clause += facet.sql;
 	params.push(...facet.params);
-	let sql = `SELECT url, query, ${(q.orderBy && !q.metrics.includes(q.orderBy.metric) ? [...q.metrics, q.orderBy.metric] : q.metrics).map(metricExpr).join(", ")} FROM ${TABLE_PLACEHOLDER} WHERE ${clause} GROUP BY url, query`;
+	let sql = `SELECT url, query, ${(q.orderBy && !q.metrics.includes(q.orderBy.metric) ? [...q.metrics, q.orderBy.metric] : q.metrics).map(metricExpr).join(", ")} FROM ${factTableRef()} WHERE ${clause} GROUP BY url, query`;
 	if (q.orderBy) sql += ` ORDER BY ${metricAlias(q.orderBy.metric)} ${q.orderBy.dir.toUpperCase()}`;
 	if (q.limit && q.limit > 0) sql += ` LIMIT ${Math.floor(q.limit)}`;
 	return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cloudflare",
   "type": "module",
-  "version": "0.36.1",
+  "version": "0.36.3",
   "description": "Cloudflare-Workers-flavored helpers for the gscdump analytics stack: AnalyticsEnv binding contract, R2 SigV4 presigner, size-hint HMAC, DuckDB Workers shims, engine factory.",
   "author": {
     "name": "Harlan Wilton",
@@ -46,10 +46,10 @@
   "dependencies": {
     "@uwdata/flechette": "^2.5.0",
     "aws4fetch": "^1.0.20",
-    "@gscdump/contracts": "0.36.1",
-    "@gscdump/engine": "0.36.1",
-    "@gscdump/engine-sqlite": "0.36.1",
-    "gscdump": "0.36.1"
+    "@gscdump/contracts": "0.36.3",
+    "@gscdump/engine": "0.36.3",
+    "@gscdump/engine-sqlite": "0.36.3",
+    "gscdump": "0.36.3"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.18.0",