@gscdump/cloudflare 0.35.11 → 0.36.0

package/dist/server-tail/index.mjs

@@ -78,22 +78,19 @@ function moverClause(movers) {
 	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`
-		};
+		case "improving": return { where: `${curClicks} > ${prevClicks}` };
+		case "declining": return { where: `${curClicks} < ${prevClicks}` };
+		case "new": return { where: `${prevImpr} = 0 AND ${curImpr} > 0` };
+		case "lost": return { where: `${curImpr} = 0 AND ${prevImpr} > 0` };
+		default: throw new Error(`[archetype-sql] unknown movers mode: ${movers}`);
+	}
+}
+function moverOrderByAlias(movers) {
+	switch (movers) {
+		case "improving": return "(clicks - prevClicks) DESC";
+		case "declining": return "(clicks - prevClicks) ASC";
+		case "new": return "clicks DESC, impressions DESC";
+		case "lost": return "prevImpressions DESC";
 		default: throw new Error(`[archetype-sql] unknown movers mode: ${movers}`);
 	}
 }
@@ -183,10 +180,14 @@ function buildTopNBreakdown(q, pruned, mode) {
 	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()}`;
-	const compareOrder = `COALESCE(c.${metricAlias(q.orderBy.metric)}, 0) ${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 metricList0 = q.metrics.includes(q.orderBy.metric) ? q.metrics : [...q.metrics, q.orderBy.metric];
+	const metricList = q.compareRange && q.movers ? [.../* @__PURE__ */ new Set([
+		...metricList0,
+		"clicks",
+		"impressions"
+	])] : metricList0;
 	const variantSel = q.dimension === "queryCanonical" ? ", COUNT(DISTINCT query) AS variantCount" : "";
 	if (q.dimension === "device") {
 		if (q.compareRange) {
@@ -199,9 +200,8 @@ function buildTopNBreakdown(q, pruned, mode) {
 				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 ${compareOrder} ${limit}${offset}`;
+			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}`;
 			return {
 				table,
 				params: [...DEVICE_SUFFIXES.flatMap(() => w.params), ...DEVICE_SUFFIXES.flatMap(() => wPrev.params)],
@@ -232,10 +232,10 @@ function buildTopNBreakdown(q, pruned, mode) {
 		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 ${compareOrder}`;
-		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}`;
+		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}`;
 		return {
 			table,
 			params: [
@@ -380,13 +380,15 @@ function createServerTailDispatcher(config) {
 	async function runOn(engine, query) {
 		if (engine === "r2-sql") {
 			const res = await config.r2Sql.runArchetype(query);
+			const { rows, totalRows } = extractTotal(res.rows);
 			return {
 				archetype: query.archetype,
-				rows: res.rows,
+				rows,
 				source: sourceFor("r2-sql"),
 				meta: {
-					rowCount: res.rows.length,
-					queryMs: res.queryMs
+					rowCount: rows.length,
+					queryMs: res.queryMs,
+					...totalRows !== void 0 ? { totalRows } : {}
 				}
 			};
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cloudflare",
   "type": "module",
-  "version": "0.35.11",
+  "version": "0.36.0",
   "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/engine": "0.35.11",
-    "@gscdump/engine-sqlite": "0.35.11",
-    "@gscdump/contracts": "0.35.11",
-    "gscdump": "0.35.11"
+    "@gscdump/contracts": "0.36.0",
+    "@gscdump/engine-sqlite": "0.36.0",
+    "gscdump": "0.36.0",
+    "@gscdump/engine": "0.36.0"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.18.0",