@gscdump/engine-duckdb-wasm 0.26.0 → 0.26.1

package/dist/index.mjs

@@ -78,6 +78,55 @@ function rangePredicate(q) {
 		]
 	};
 }
+function compareRangePredicate(q) {
+	if (!q.compareRange) return null;
+	return {
+		sql: "date BETWEEN ? AND ? AND search_type = ?",
+		params: [
+			q.compareRange.start,
+			q.compareRange.end,
+			q.searchType
+		]
+	};
+}
+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 facetPredicate(query) {
 	const facets = query.facets;
 	if (!facets?.length) return {
@@ -145,9 +194,34 @@ function compileArchetypeSql(query) {
 		case "top-n-breakdown": {
 			const table = tableForDimensions([query.dimension]);
 			const where = rangePredicate(query);
+			const cmp = compareRangePredicate(query);
 			const dir = query.orderBy.dir === "asc" ? "ASC" : "DESC";
+			const metricList = query.metrics.includes(query.orderBy.metric) ? query.metrics : [...query.metrics, query.orderBy.metric];
+			const variantSel = query.dimension === "queryCanonical" ? ", COUNT(DISTINCT query) AS variantCount" : "";
 			if (query.dimension === "device") {
-				const metricList = query.metrics.includes(query.orderBy.metric) ? query.metrics : [...query.metrics, query.orderBy.metric];
+				if (cmp) {
+					const curCols = metricList.map((m) => coalesceMetric(m, "c", m)).join(", ");
+					const prevCols = STD_METRICS.map((m) => coalesceMetric(m, "p", prevAlias(m))).join(", ");
+					let sql = `WITH cur AS (${deviceUnpivotSql(metricList, where.sql, false)}), prev AS (${deviceUnpivotSql(STD_METRICS, cmp.sql, false)}) 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 ${query.orderBy.metric} ${dir} LIMIT ?`;
+					const params = [
+						...where.params,
+						...where.params,
+						...where.params,
+						...cmp.params,
+						...cmp.params,
+						...cmp.params,
+						query.limit
+					];
+					if (query.offset && query.offset > 0) {
+						sql += " OFFSET ?";
+						params.push(query.offset);
+					}
+					return {
+						table,
+						sql,
+						params
+					};
+				}
 				let sql = `SELECT device, ${metricList.join(", ")} FROM (${deviceUnpivotSql(metricList, where.sql, false)}) ORDER BY ${query.orderBy.metric} ${dir} LIMIT ?`;
 				const params = [
 					...where.params,
@@ -168,7 +242,32 @@ function compileArchetypeSql(query) {
 			const col = DIM_COLUMN[query.dimension];
 			const facet = facetPredicate(query);
 			const totalCol = query.includeTotal ? ", COUNT(*) OVER() AS __total" : "";
-			let sql = `SELECT ${col} AS ${query.dimension}, ${metricSelectList(query.metrics)}${totalCol} FROM ${table} WHERE ${where.sql}${facet.sql} GROUP BY ${col} ORDER BY ${query.orderBy.metric} ${dir} LIMIT ?`;
+			if (cmp) {
+				const curCols = metricList.map((m) => coalesceMetric(m, "c", m)).join(", ");
+				const prevCols = STD_METRICS.map((m) => coalesceMetric(m, "p", prevAlias(m))).join(", ");
+				const variantOut = query.dimension === "queryCanonical" ? ", c.variantCount AS variantCount" : "";
+				const mover = query.movers ? moverClause(query.movers) : null;
+				const moverWhere = mover ? `WHERE ${mover.where} ` : "";
+				const orderSql = mover ? mover.order : `${query.orderBy.metric} ${dir}`;
+				let sql = `WITH cur AS (SELECT ${col} AS k, ${metricSelectList(metricList)}${variantSel} FROM ${table} WHERE ${where.sql}${facet.sql} GROUP BY ${col}), prev AS (SELECT ${col} AS k, ${metricSelectList(STD_METRICS)} FROM ${table} WHERE ${cmp.sql}${facet.sql} GROUP BY ${col}) SELECT COALESCE(c.k, p.k) AS ${query.dimension}, ${curCols}, ${prevCols}${variantOut}${totalCol} FROM cur c FULL OUTER JOIN prev p ON c.k = p.k ${moverWhere}ORDER BY ${orderSql} LIMIT ?`;
+				const params = [
+					...where.params,
+					...facet.params,
+					...cmp.params,
+					...facet.params,
+					query.limit
+				];
+				if (query.offset && query.offset > 0) {
+					sql += " OFFSET ?";
+					params.push(query.offset);
+				}
+				return {
+					table,
+					sql,
+					params
+				};
+			}
+			let sql = `SELECT ${col} AS ${query.dimension}, ${metricSelectList(query.metrics)}${variantSel}${totalCol} FROM ${table} WHERE ${where.sql}${facet.sql} GROUP BY ${col} ORDER BY ${query.orderBy.metric} ${dir} LIMIT ?`;
 			const params = [
 				...where.params,
 				...facet.params,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-duckdb-wasm",
   "type": "module",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "description": "DuckDB-WASM engine adapter for @gscdump/analysis — typed browser analytics against parquet via R2.",
   "author": {
     "name": "Harlan Wilton",
@@ -45,9 +45,9 @@
   },
   "dependencies": {
     "drizzle-orm": "1.0.0-rc.3",
-    "@gscdump/engine": "0.26.0",
-    "@gscdump/sdk": "0.26.0",
-    "gscdump": "0.26.0"
+    "@gscdump/engine": "0.26.1",
+    "@gscdump/sdk": "0.26.1",
+    "gscdump": "0.26.1"
   },
   "devDependencies": {
     "@duckdb/duckdb-wasm": "^1.32.0",