@gscdump/cloudflare 0.26.0 → 0.26.2

package/dist/server-tail/index.mjs

@@ -35,6 +35,44 @@ function deviceSource(suffix) {
 		sumPosition: `sum_position_${suffix}`
 	};
 }
+const STD_METRICS = [
+	"clicks",
+	"impressions",
+	"ctr",
+	"position"
+];
+function coalesceMetric(metric, src, alias) {
+	const ref = `${src}.${metric}`;
+	return metric === "clicks" || metric === "impressions" ? `CAST(COALESCE(${ref}, 0) AS DOUBLE) AS ${alias}` : `COALESCE(${ref}, 0) AS ${alias}`;
+}
+function prevAlias(metric) {
+	return `prev${metric.charAt(0).toUpperCase()}${metric.slice(1)}`;
+}
+function moverClause(movers) {
+	const curClicks = "COALESCE(c.clicks, 0)";
+	const prevClicks = "COALESCE(p.clicks, 0)";
+	const curImpr = "COALESCE(c.impressions, 0)";
+	const prevImpr = "COALESCE(p.impressions, 0)";
+	switch (movers) {
+		case "improving": return {
+			where: `${curClicks} > ${prevClicks}`,
+			order: `(${curClicks} - ${prevClicks}) DESC`
+		};
+		case "declining": return {
+			where: `${curClicks} < ${prevClicks}`,
+			order: `(${curClicks} - ${prevClicks}) ASC`
+		};
+		case "new": return {
+			where: `${prevImpr} = 0 AND ${curImpr} > 0`,
+			order: `${curClicks} DESC, ${curImpr} DESC`
+		};
+		case "lost": return {
+			where: `${curImpr} = 0 AND ${prevImpr} > 0`,
+			order: `${prevImpr} DESC`
+		};
+		default: throw new Error(`[archetype-sql] unknown movers mode: ${movers}`);
+	}
+}
 function sqlStringLiteral(value) {
 	return `'${value.replace(/'/g, "''")}'`;
 }
@@ -115,15 +153,36 @@ function buildEntityDailySparkline(q) {
 function buildTopNBreakdown(q) {
 	const table = inferTable([q.dimension]);
 	const w = partitionWhere(q);
+	const order = `${q.orderBy.metric} ${q.orderBy.dir.toUpperCase()}`;
+	const limit = `LIMIT ${Math.max(0, Math.floor(q.limit))}`;
+	const offset = q.offset && q.offset > 0 ? ` OFFSET ${Math.floor(q.offset)}` : "";
+	const metricList = q.metrics.includes(q.orderBy.metric) ? q.metrics : [...q.metrics, q.orderBy.metric];
+	const variantSel = q.dimension === "queryCanonical" ? ", COUNT(DISTINCT query) AS variantCount" : "";
 	if (q.dimension === "device") {
-		const metricList = q.metrics.includes(q.orderBy.metric) ? q.metrics : [...q.metrics, q.orderBy.metric];
-		const order = `${q.orderBy.metric} ${q.orderBy.dir.toUpperCase()}`;
-		let sql = `${DEVICE_SUFFIXES.map((suffix) => {
+		if (q.compareRange) {
+			const wPrev = partitionWhere({
+				...q,
+				range: q.compareRange
+			});
+			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}`;
+			}).join(" UNION ALL ");
+			const curCols = metricList.map((m) => coalesceMetric(m, "c", m)).join(", ");
+			const prevCols = STD_METRICS.map((m) => coalesceMetric(m, "p", prevAlias(m))).join(", ");
+			const sql = `WITH cur AS (${deviceSelects(w.clause, metricList)}), prev AS (${deviceSelects(wPrev.clause, STD_METRICS)}) SELECT COALESCE(c.device, p.device) AS device, ${curCols}, ${prevCols} FROM cur c FULL OUTER JOIN prev p ON c.device = p.device ORDER BY ${order} ${limit}${offset}`;
+			return {
+				table,
+				params: [...DEVICE_SUFFIXES.flatMap(() => w.params), ...DEVICE_SUFFIXES.flatMap(() => wPrev.params)],
+				sql
+			};
+		}
+		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}`;
-		}).join(" UNION ALL ")} ORDER BY ${order} LIMIT ${Math.max(0, Math.floor(q.limit))}`;
-		if (q.offset && q.offset > 0) sql += ` OFFSET ${Math.floor(q.offset)}`;
+		}).join(" UNION ALL ")} ORDER BY ${order} ${limit}${offset}`;
 		return {
 			table,
 			params: DEVICE_SUFFIXES.flatMap(() => w.params),
@@ -131,11 +190,34 @@ function buildTopNBreakdown(q) {
 		};
 	}
 	const col = dimColumn(q.dimension);
-	const metrics = (q.metrics.includes(q.orderBy.metric) ? q.metrics : [...q.metrics, q.orderBy.metric]).map(metricExpr).join(", ");
-	const order = `${q.orderBy.metric} ${q.orderBy.dir.toUpperCase()}`;
 	const facet = facetPredicate(q);
-	let sql = `SELECT ${col}, ${metrics}${q.includeTotal ? ", COUNT(*) OVER() AS __total" : ""} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause}${facet.sql} GROUP BY ${col} ORDER BY ${order} LIMIT ${Math.max(0, Math.floor(q.limit))}`;
-	if (q.offset && q.offset > 0) sql += ` OFFSET ${Math.floor(q.offset)}`;
+	const totalCol = q.includeTotal ? ", COUNT(*) OVER() AS __total" : "";
+	if (q.compareRange) {
+		const wPrev = partitionWhere({
+			...q,
+			range: q.compareRange
+		});
+		const curMetrics = metricList.map(metricExpr).join(", ");
+		const prevMetrics = STD_METRICS.map((m) => metricExpr(m)).join(", ");
+		const curCols = metricList.map((m) => coalesceMetric(m, "c", m)).join(", ");
+		const prevCols = STD_METRICS.map((m) => coalesceMetric(m, "p", prevAlias(m))).join(", ");
+		const variantOut = q.dimension === "queryCanonical" ? ", c.variantCount AS variantCount" : "";
+		const mover = q.movers ? moverClause(q.movers) : null;
+		const moverWhere = mover ? `WHERE ${mover.where} ` : "";
+		const orderSql = mover ? `ORDER BY ${mover.order}` : `ORDER BY ${order}`;
+		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 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}${orderSql} ${limit}${offset}`;
+		return {
+			table,
+			params: [
+				...w.params,
+				...facet.params,
+				...wPrev.params,
+				...facet.params
+			],
+			sql
+		};
+	}
+	const sql = `SELECT ${col}, ${metricList.map(metricExpr).join(", ")}${variantSel}${totalCol} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause}${facet.sql} GROUP BY ${col} ORDER BY ${order} ${limit}${offset}`;
 	return {
 		table,
 		params: [...w.params, ...facet.params],
@@ -230,6 +312,8 @@ function resolveServerTailEngineResult(query) {
 	if (cls === "duckdb") return ok("duckdb");
 	if (query.archetype === "top-n-breakdown" && query.offset && query.offset > 0) return ok("duckdb");
 	if (query.archetype === "top-n-breakdown" && query.includeTotal) return ok("duckdb");
+	if (query.archetype === "top-n-breakdown" && query.compareRange) return ok("duckdb");
+	if (query.archetype === "top-n-breakdown" && query.dimension === "queryCanonical") return ok("duckdb");
 	const facets = query.facets;
 	if (facets && facets.length > 0) return ok("duckdb");
 	return ok("r2-sql");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cloudflare",
   "type": "module",
-  "version": "0.26.0",
+  "version": "0.26.2",
   "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,18 +46,18 @@
   "dependencies": {
     "@uwdata/flechette": "^2.5.0",
     "aws4fetch": "^1.0.20",
-    "@gscdump/contracts": "0.26.0",
-    "@gscdump/engine-sqlite": "0.26.0",
-    "@gscdump/sdk": "0.26.0",
-    "@gscdump/engine": "0.26.0",
-    "gscdump": "0.26.0"
+    "@gscdump/engine": "0.26.2",
+    "@gscdump/contracts": "0.26.2",
+    "@gscdump/engine-sqlite": "0.26.2",
+    "gscdump": "0.26.2",
+    "@gscdump/sdk": "0.26.2"
   },
   "devDependencies": {
-    "@cloudflare/vitest-pool-workers": "^0.16.12",
-    "@cloudflare/workers-types": "^4.20260603.1",
+    "@cloudflare/vitest-pool-workers": "^0.16.13",
+    "@cloudflare/workers-types": "^4.20260608.1",
     "h3": "^1.15.11",
     "typescript": "^6.0.3",
-    "wrangler": "^4.97.0"
+    "wrangler": "^4.98.0"
   },
   "scripts": {
     "build": "obuild",