@gscdump/cloudflare 0.21.0 → 0.21.2

package/dist/index.mjs

@@ -466,6 +466,26 @@ function orderMetricExpr(metric) {
 		case "position": return "SUM(sum_position) / NULLIF(SUM(impressions), 0)";
 	}
 }
+const DEVICE_SUFFIXES = [
+	"desktop",
+	"mobile",
+	"tablet"
+];
+function metricExprForSource(metric, source) {
+	switch (metric) {
+		case "clicks": return `SUM(${source.clicks}) AS clicks`;
+		case "impressions": return `SUM(${source.impressions}) AS impressions`;
+		case "ctr": return `SUM(${source.clicks}) / NULLIF(SUM(${source.impressions}), 0) AS ctr`;
+		case "position": return `SUM(${source.sumPosition}) / NULLIF(SUM(${source.impressions}), 0) AS position`;
+	}
+}
+function deviceSource(suffix) {
+	return {
+		clicks: `clicks_${suffix}`,
+		impressions: `impressions_${suffix}`,
+		sumPosition: `sum_position_${suffix}`
+	};
+}
 function sqlStringLiteral(value) {
 	return `'${value.replace(/'/g, "''")}'`;
 }
@@ -515,6 +535,21 @@ function buildEntityDailySparkline(q) {
 function buildTopNBreakdown(q) {
 	const table = inferTable([q.dimension]);
 	const w = partitionWhere(q);
+	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) => {
+			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)}`;
+		return {
+			table,
+			params: DEVICE_SUFFIXES.flatMap(() => w.params),
+			sql
+		};
+	}
 	const col = dimColumn(q.dimension);
 	const metrics = q.metrics.map(metricExpr).join(", ");
 	const order = `${orderMetricExpr(q.orderBy.metric)} ${q.orderBy.dir.toUpperCase()}`;
@@ -547,6 +582,17 @@ function buildSingleRowLookup(q) {
 function buildMultiSeriesStackedDaily(q) {
 	const table = inferTable([q.seriesDimension]);
 	const w = partitionWhere(q);
+	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 {
+			table,
+			params: DEVICE_SUFFIXES.flatMap(() => w.params),
+			sql: `${selects.join(" UNION ALL ")} ORDER BY date ASC, device ASC`
+		};
+	}
 	const col = dimColumn(q.seriesDimension);
 	return {
 		table,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cloudflare",
   "type": "module",
-  "version": "0.21.0",
+  "version": "0.21.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",
@@ -41,11 +41,11 @@
   "dependencies": {
     "@uwdata/flechette": "^2.5.0",
     "aws4fetch": "^1.0.20",
-    "@gscdump/contracts": "0.21.0",
-    "@gscdump/engine-sqlite": "0.21.0",
-    "gscdump": "0.21.0",
-    "@gscdump/sdk": "0.21.0",
-    "@gscdump/engine": "0.21.0"
+    "@gscdump/contracts": "0.21.2",
+    "@gscdump/engine": "0.21.2",
+    "@gscdump/engine-sqlite": "0.21.2",
+    "@gscdump/sdk": "0.21.2",
+    "gscdump": "0.21.2"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20260520.1",