@gscdump/cloudflare 0.35.9 → 0.35.11

package/dist/server-tail/index.mjs

@@ -183,6 +183,7 @@ 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];
@@ -200,7 +201,7 @@ function buildTopNBreakdown(q, pruned, mode) {
 			}).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}`;
+			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}`;
 			return {
 				table,
 				params: [...DEVICE_SUFFIXES.flatMap(() => w.params), ...DEVICE_SUFFIXES.flatMap(() => wPrev.params)],
@@ -233,7 +234,7 @@ function buildTopNBreakdown(q, pruned, mode) {
 		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 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}`;
 		return {
 			table,

package/package.json

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