@gscdump/analysis 0.26.7 → 0.26.8

package/dist/analyzer/index.mjs

@@ -2675,15 +2675,36 @@ const deviceGapAnalyzer = defineAnalyzer({
 		const { startDate, endDate } = periodOf(params);
 		return {
 			sql: `
+    WITH raw AS (
+      SELECT
+        date,
+        COALESCE(clicks_desktop, 0) AS c_desktop,
+        COALESCE(clicks_mobile, 0) AS c_mobile,
+        COALESCE(clicks_tablet, 0) AS c_tablet,
+        COALESCE(impressions_desktop, 0) AS i_desktop,
+        COALESCE(impressions_mobile, 0) AS i_mobile,
+        COALESCE(impressions_tablet, 0) AS i_tablet,
+        COALESCE(sum_position_desktop, 0) AS p_desktop,
+        COALESCE(sum_position_mobile, 0) AS p_mobile,
+        COALESCE(sum_position_tablet, 0) AS p_tablet
+      FROM read_parquet({{FILES}}, union_by_name = true)
+      WHERE date >= ? AND date <= ?
+    ),
+    device_long AS (
+      SELECT date, 'DESKTOP' AS device, c_desktop AS clicks, i_desktop AS impressions, p_desktop AS sum_position FROM raw
+      UNION ALL
+      SELECT date, 'MOBILE', c_mobile, i_mobile, p_mobile FROM raw
+      UNION ALL
+      SELECT date, 'TABLET', c_tablet, i_tablet, p_tablet FROM raw
+    )
     SELECT
       date,
       device,
-      ${METRIC_EXPR.clicks} AS clicks,
-      ${METRIC_EXPR.impressions} AS impressions,
-      ${METRIC_EXPR.ctr} AS ctr,
-      ${METRIC_EXPR.position} AS position
-    FROM read_parquet({{FILES}}, union_by_name = true)
-    WHERE date >= ? AND date <= ?
+      CAST(SUM(clicks) AS DOUBLE) AS clicks,
+      CAST(SUM(impressions) AS DOUBLE) AS impressions,
+      CAST(SUM(clicks) AS DOUBLE) / NULLIF(SUM(impressions), 0) AS ctr,
+      SUM(sum_position) / NULLIF(SUM(impressions), 0) + 1 AS position
+    FROM device_long
     GROUP BY date, device
     ORDER BY date ASC
   `,

package/dist/default-registry.mjs

@@ -2669,15 +2669,36 @@ const deviceGapAnalyzer = defineAnalyzer({
 		const { startDate, endDate } = periodOf(params);
 		return {
 			sql: `
+    WITH raw AS (
+      SELECT
+        date,
+        COALESCE(clicks_desktop, 0) AS c_desktop,
+        COALESCE(clicks_mobile, 0) AS c_mobile,
+        COALESCE(clicks_tablet, 0) AS c_tablet,
+        COALESCE(impressions_desktop, 0) AS i_desktop,
+        COALESCE(impressions_mobile, 0) AS i_mobile,
+        COALESCE(impressions_tablet, 0) AS i_tablet,
+        COALESCE(sum_position_desktop, 0) AS p_desktop,
+        COALESCE(sum_position_mobile, 0) AS p_mobile,
+        COALESCE(sum_position_tablet, 0) AS p_tablet
+      FROM read_parquet({{FILES}}, union_by_name = true)
+      WHERE date >= ? AND date <= ?
+    ),
+    device_long AS (
+      SELECT date, 'DESKTOP' AS device, c_desktop AS clicks, i_desktop AS impressions, p_desktop AS sum_position FROM raw
+      UNION ALL
+      SELECT date, 'MOBILE', c_mobile, i_mobile, p_mobile FROM raw
+      UNION ALL
+      SELECT date, 'TABLET', c_tablet, i_tablet, p_tablet FROM raw
+    )
     SELECT
       date,
       device,
-      ${METRIC_EXPR.clicks} AS clicks,
-      ${METRIC_EXPR.impressions} AS impressions,
-      ${METRIC_EXPR.ctr} AS ctr,
-      ${METRIC_EXPR.position} AS position
-    FROM read_parquet({{FILES}}, union_by_name = true)
-    WHERE date >= ? AND date <= ?
+      CAST(SUM(clicks) AS DOUBLE) AS clicks,
+      CAST(SUM(impressions) AS DOUBLE) AS impressions,
+      CAST(SUM(clicks) AS DOUBLE) / NULLIF(SUM(impressions), 0) AS ctr,
+      SUM(sum_position) / NULLIF(SUM(impressions), 0) + 1 AS position
+    FROM device_long
     GROUP BY date, device
     ORDER BY date ASC
   `,

package/dist/index.mjs

@@ -3049,15 +3049,36 @@ const deviceGapAnalyzer = defineAnalyzer$1({
 		const { startDate, endDate } = periodOf$1(params);
 		return {
 			sql: `
+    WITH raw AS (
+      SELECT
+        date,
+        COALESCE(clicks_desktop, 0) AS c_desktop,
+        COALESCE(clicks_mobile, 0) AS c_mobile,
+        COALESCE(clicks_tablet, 0) AS c_tablet,
+        COALESCE(impressions_desktop, 0) AS i_desktop,
+        COALESCE(impressions_mobile, 0) AS i_mobile,
+        COALESCE(impressions_tablet, 0) AS i_tablet,
+        COALESCE(sum_position_desktop, 0) AS p_desktop,
+        COALESCE(sum_position_mobile, 0) AS p_mobile,
+        COALESCE(sum_position_tablet, 0) AS p_tablet
+      FROM read_parquet({{FILES}}, union_by_name = true)
+      WHERE date >= ? AND date <= ?
+    ),
+    device_long AS (
+      SELECT date, 'DESKTOP' AS device, c_desktop AS clicks, i_desktop AS impressions, p_desktop AS sum_position FROM raw
+      UNION ALL
+      SELECT date, 'MOBILE', c_mobile, i_mobile, p_mobile FROM raw
+      UNION ALL
+      SELECT date, 'TABLET', c_tablet, i_tablet, p_tablet FROM raw
+    )
     SELECT
       date,
       device,
-      ${METRIC_EXPR.clicks} AS clicks,
-      ${METRIC_EXPR.impressions} AS impressions,
-      ${METRIC_EXPR.ctr} AS ctr,
-      ${METRIC_EXPR.position} AS position
-    FROM read_parquet({{FILES}}, union_by_name = true)
-    WHERE date >= ? AND date <= ?
+      CAST(SUM(clicks) AS DOUBLE) AS clicks,
+      CAST(SUM(impressions) AS DOUBLE) AS impressions,
+      CAST(SUM(clicks) AS DOUBLE) / NULLIF(SUM(impressions), 0) AS ctr,
+      SUM(sum_position) / NULLIF(SUM(impressions), 0) + 1 AS position
+    FROM device_long
     GROUP BY date, device
     ORDER BY date ASC
   `,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/analysis",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.26.8",
   "description": "GSC analyzers — striking-distance, opportunity, movers, decay, brand, clustering, concentration, seasonality. Pure row-based + DuckDB-native.",
   "author": {
     "name": "Harlan Wilton",
@@ -75,9 +75,9 @@
   },
   "dependencies": {
     "drizzle-orm": "1.0.0-rc.3",
-    "@gscdump/engine": "0.26.7",
-    "@gscdump/engine-gsc-api": "0.26.7",
-    "gscdump": "0.26.7"
+    "@gscdump/engine": "0.26.8",
+    "@gscdump/engine-gsc-api": "0.26.8",
+    "gscdump": "0.26.8"
   },
   "devDependencies": {
     "vitest": "^4.1.8"