@gscdump/analysis 0.25.4 → 0.25.6

package/dist/analyzer/index.d.mts

@@ -461,6 +461,13 @@ interface MoversSeriesPoint {
 }
 interface MoversResultRow extends MoverData {
   direction: 'rising' | 'declining' | 'stable';
+  clicks: number;
+  impressions: number;
+  ctr: number;
+  position: number;
+  prevClicks: number;
+  prevImpressions: number;
+  prevPosition: number;
   series?: MoversSeriesPoint[];
 }
 declare const moversAnalyzer: import("@gscdump/engine/analyzer").DefinedAnalyzer;

package/dist/analyzer/index.mjs

@@ -3151,6 +3151,45 @@ function parseJsonList$4(v) {
 	}
 	return [];
 }
+function withCanonicalFields(r) {
+	return {
+		...r,
+		clicks: r.recentClicks,
+		impressions: r.recentImpressions,
+		ctr: r.recentImpressions > 0 ? r.recentClicks / r.recentImpressions : 0,
+		position: r.recentPosition,
+		prevClicks: r.baselineClicks,
+		prevImpressions: r.baselineImpressions,
+		prevPosition: r.baselinePosition
+	};
+}
+function selectMoversDirection(rising, declining, stable, params) {
+	if (params.direction) {
+		const selected = params.direction === "rising" ? rising : declining;
+		const total = selected.length;
+		const offset = params.offset ?? 0;
+		const limit = params.limit ?? total;
+		return {
+			results: selected.slice(offset, offset + limit),
+			meta: {
+				total,
+				rising: rising.length,
+				declining: declining.length,
+				stable: stable.length
+			}
+		};
+	}
+	const combined = [...rising, ...declining];
+	return {
+		results: combined,
+		meta: {
+			total: combined.length,
+			rising: rising.length,
+			declining: declining.length,
+			stable: stable.length
+		}
+	};
+}
 function analyzeMovers(input, options = {}) {
 	const { changeThreshold = .2, minImpressions = 50, sortBy = "clicksChange" } = options;
 	const normFactor = input.normalizationFactor ?? 1;
@@ -3223,7 +3262,7 @@ const moversAnalyzer = defineAnalyzer({
 		const { current: cur, previous: prev } = comparisonOf(params);
 		const minImpressions = params.minImpressions ?? 50;
 		const changeThreshold = params.changeThreshold ?? .2;
-		const limit = params.limit ?? 2e3;
+		const limit = params.direction ? 5e3 : params.limit ?? 2e3;
 		return {
 			sql: `
       WITH cur AS (
@@ -3328,40 +3367,36 @@ const moversAnalyzer = defineAnalyzer({
 			}
 		};
 	},
-	reduceSql(rows) {
-		const normalized = (Array.isArray(rows) ? rows : []).map((r) => ({
-			keyword: str$7(r.keyword),
-			page: r.page == null ? null : str$7(r.page),
-			recentClicks: num(r.recentClicks),
-			recentImpressions: num(r.recentImpressions),
-			recentPosition: num(r.recentPosition),
-			baselineClicks: Math.round(num(r.baselineClicks)),
-			baselineImpressions: Math.round(num(r.baselineImpressions)),
-			baselinePosition: num(r.baselinePosition),
-			clicksChange: num(r.clicksChange),
-			clicksChangePercent: num(r.clicksChangePercent),
-			impressionsChangePercent: num(r.impressionsChangePercent),
-			positionChange: num(r.positionChange),
-			direction: str$7(r.direction),
-			series: parseJsonList$4(r.seriesJson).map((s) => ({
-				week: str$7(s.week),
-				clicks: num(s.clicks),
-				impressions: num(s.impressions)
-			}))
-		}));
-		const rising = normalized.filter((r) => r.direction === "rising");
-		const declining = normalized.filter((r) => r.direction === "declining");
-		const stable = normalized.filter((r) => r.direction === "stable");
-		const combined = [...rising, ...declining];
-		return {
-			results: combined,
-			meta: {
-				total: combined.length,
-				rising: rising.length,
-				declining: declining.length,
-				stable: stable.length
-			}
-		};
+	reduceSql(rows, params) {
+		const normalized = (Array.isArray(rows) ? rows : []).map((r) => {
+			const recentClicks = num(r.recentClicks);
+			const recentImpressions = num(r.recentImpressions);
+			const recentPosition = num(r.recentPosition);
+			const baselineClicks = Math.round(num(r.baselineClicks));
+			const baselineImpressions = Math.round(num(r.baselineImpressions));
+			const baselinePosition = num(r.baselinePosition);
+			return {
+				keyword: str$7(r.keyword),
+				page: r.page == null ? null : str$7(r.page),
+				recentClicks,
+				recentImpressions,
+				recentPosition,
+				baselineClicks,
+				baselineImpressions,
+				baselinePosition,
+				clicksChange: num(r.clicksChange),
+				clicksChangePercent: num(r.clicksChangePercent),
+				impressionsChangePercent: num(r.impressionsChangePercent),
+				positionChange: num(r.positionChange),
+				direction: str$7(r.direction),
+				series: parseJsonList$4(r.seriesJson).map((s) => ({
+					week: str$7(s.week),
+					clicks: num(s.clicks),
+					impressions: num(s.impressions)
+				}))
+			};
+		}).map(withCanonicalFields);
+		return selectMoversDirection(normalized.filter((r) => r.direction === "rising"), normalized.filter((r) => r.direction === "declining"), normalized.filter((r) => r.direction === "stable"), params);
 	},
 	buildRows(params) {
 		const { current, previous } = comparisonOf(params);
@@ -3382,19 +3417,13 @@ const moversAnalyzer = defineAnalyzer({
 			changeThreshold: params.changeThreshold,
 			minImpressions: params.minImpressions
 		});
-		return {
-			results: [...result.rising.map((r) => ({
-				...r,
-				direction: "rising"
-			})), ...result.declining.map((r) => ({
-				...r,
-				direction: "declining"
-			}))],
-			meta: {
-				rising: result.rising.length,
-				declining: result.declining.length
-			}
-		};
+		return selectMoversDirection(result.rising.map((r) => withCanonicalFields({
+			...r,
+			direction: "rising"
+		})), result.declining.map((r) => withCanonicalFields({
+			...r,
+			direction: "declining"
+		})), [], params);
 	}
 });
 const DEFAULT_LIMIT = 1e3;

package/dist/default-registry.mjs

@@ -3151,6 +3151,45 @@ function parseJsonList$4(v) {
 	}
 	return [];
 }
+function withCanonicalFields(r) {
+	return {
+		...r,
+		clicks: r.recentClicks,
+		impressions: r.recentImpressions,
+		ctr: r.recentImpressions > 0 ? r.recentClicks / r.recentImpressions : 0,
+		position: r.recentPosition,
+		prevClicks: r.baselineClicks,
+		prevImpressions: r.baselineImpressions,
+		prevPosition: r.baselinePosition
+	};
+}
+function selectMoversDirection(rising, declining, stable, params) {
+	if (params.direction) {
+		const selected = params.direction === "rising" ? rising : declining;
+		const total = selected.length;
+		const offset = params.offset ?? 0;
+		const limit = params.limit ?? total;
+		return {
+			results: selected.slice(offset, offset + limit),
+			meta: {
+				total,
+				rising: rising.length,
+				declining: declining.length,
+				stable: stable.length
+			}
+		};
+	}
+	const combined = [...rising, ...declining];
+	return {
+		results: combined,
+		meta: {
+			total: combined.length,
+			rising: rising.length,
+			declining: declining.length,
+			stable: stable.length
+		}
+	};
+}
 function analyzeMovers(input, options = {}) {
 	const { changeThreshold = .2, minImpressions = 50, sortBy = "clicksChange" } = options;
 	const normFactor = input.normalizationFactor ?? 1;
@@ -3223,7 +3262,7 @@ const moversAnalyzer = defineAnalyzer({
 		const { current: cur, previous: prev } = comparisonOf(params);
 		const minImpressions = params.minImpressions ?? 50;
 		const changeThreshold = params.changeThreshold ?? .2;
-		const limit = params.limit ?? 2e3;
+		const limit = params.direction ? 5e3 : params.limit ?? 2e3;
 		return {
 			sql: `
       WITH cur AS (
@@ -3328,40 +3367,36 @@ const moversAnalyzer = defineAnalyzer({
 			}
 		};
 	},
-	reduceSql(rows) {
-		const normalized = (Array.isArray(rows) ? rows : []).map((r) => ({
-			keyword: str$7(r.keyword),
-			page: r.page == null ? null : str$7(r.page),
-			recentClicks: num(r.recentClicks),
-			recentImpressions: num(r.recentImpressions),
-			recentPosition: num(r.recentPosition),
-			baselineClicks: Math.round(num(r.baselineClicks)),
-			baselineImpressions: Math.round(num(r.baselineImpressions)),
-			baselinePosition: num(r.baselinePosition),
-			clicksChange: num(r.clicksChange),
-			clicksChangePercent: num(r.clicksChangePercent),
-			impressionsChangePercent: num(r.impressionsChangePercent),
-			positionChange: num(r.positionChange),
-			direction: str$7(r.direction),
-			series: parseJsonList$4(r.seriesJson).map((s) => ({
-				week: str$7(s.week),
-				clicks: num(s.clicks),
-				impressions: num(s.impressions)
-			}))
-		}));
-		const rising = normalized.filter((r) => r.direction === "rising");
-		const declining = normalized.filter((r) => r.direction === "declining");
-		const stable = normalized.filter((r) => r.direction === "stable");
-		const combined = [...rising, ...declining];
-		return {
-			results: combined,
-			meta: {
-				total: combined.length,
-				rising: rising.length,
-				declining: declining.length,
-				stable: stable.length
-			}
-		};
+	reduceSql(rows, params) {
+		const normalized = (Array.isArray(rows) ? rows : []).map((r) => {
+			const recentClicks = num(r.recentClicks);
+			const recentImpressions = num(r.recentImpressions);
+			const recentPosition = num(r.recentPosition);
+			const baselineClicks = Math.round(num(r.baselineClicks));
+			const baselineImpressions = Math.round(num(r.baselineImpressions));
+			const baselinePosition = num(r.baselinePosition);
+			return {
+				keyword: str$7(r.keyword),
+				page: r.page == null ? null : str$7(r.page),
+				recentClicks,
+				recentImpressions,
+				recentPosition,
+				baselineClicks,
+				baselineImpressions,
+				baselinePosition,
+				clicksChange: num(r.clicksChange),
+				clicksChangePercent: num(r.clicksChangePercent),
+				impressionsChangePercent: num(r.impressionsChangePercent),
+				positionChange: num(r.positionChange),
+				direction: str$7(r.direction),
+				series: parseJsonList$4(r.seriesJson).map((s) => ({
+					week: str$7(s.week),
+					clicks: num(s.clicks),
+					impressions: num(s.impressions)
+				}))
+			};
+		}).map(withCanonicalFields);
+		return selectMoversDirection(normalized.filter((r) => r.direction === "rising"), normalized.filter((r) => r.direction === "declining"), normalized.filter((r) => r.direction === "stable"), params);
 	},
 	buildRows(params) {
 		const { current, previous } = comparisonOf(params);
@@ -3382,19 +3417,13 @@ const moversAnalyzer = defineAnalyzer({
 			changeThreshold: params.changeThreshold,
 			minImpressions: params.minImpressions
 		});
-		return {
-			results: [...result.rising.map((r) => ({
-				...r,
-				direction: "rising"
-			})), ...result.declining.map((r) => ({
-				...r,
-				direction: "declining"
-			}))],
-			meta: {
-				rising: result.rising.length,
-				declining: result.declining.length
-			}
-		};
+		return selectMoversDirection(result.rising.map((r) => withCanonicalFields({
+			...r,
+			direction: "rising"
+		})), result.declining.map((r) => withCanonicalFields({
+			...r,
+			direction: "declining"
+		})), [], params);
 	}
 });
 const DEFAULT_LIMIT = 1e3;

package/dist/index.mjs

@@ -3513,6 +3513,45 @@ function parseJsonList$4(v) {
 	}
 	return [];
 }
+function withCanonicalFields(r) {
+	return {
+		...r,
+		clicks: r.recentClicks,
+		impressions: r.recentImpressions,
+		ctr: r.recentImpressions > 0 ? r.recentClicks / r.recentImpressions : 0,
+		position: r.recentPosition,
+		prevClicks: r.baselineClicks,
+		prevImpressions: r.baselineImpressions,
+		prevPosition: r.baselinePosition
+	};
+}
+function selectMoversDirection(rising, declining, stable, params) {
+	if (params.direction) {
+		const selected = params.direction === "rising" ? rising : declining;
+		const total = selected.length;
+		const offset = params.offset ?? 0;
+		const limit = params.limit ?? total;
+		return {
+			results: selected.slice(offset, offset + limit),
+			meta: {
+				total,
+				rising: rising.length,
+				declining: declining.length,
+				stable: stable.length
+			}
+		};
+	}
+	const combined = [...rising, ...declining];
+	return {
+		results: combined,
+		meta: {
+			total: combined.length,
+			rising: rising.length,
+			declining: declining.length,
+			stable: stable.length
+		}
+	};
+}
 function analyzeMovers(input, options = {}) {
 	const { changeThreshold = .2, minImpressions = 50, sortBy = "clicksChange" } = options;
 	const normFactor = input.normalizationFactor ?? 1;
@@ -3585,7 +3624,7 @@ const moversAnalyzer = defineAnalyzer$1({
 		const { current: cur, previous: prev } = comparisonOf$1(params);
 		const minImpressions = params.minImpressions ?? 50;
 		const changeThreshold = params.changeThreshold ?? .2;
-		const limit = params.limit ?? 2e3;
+		const limit = params.direction ? 5e3 : params.limit ?? 2e3;
 		return {
 			sql: `
       WITH cur AS (
@@ -3690,40 +3729,36 @@ const moversAnalyzer = defineAnalyzer$1({
 			}
 		};
 	},
-	reduceSql(rows) {
-		const normalized = (Array.isArray(rows) ? rows : []).map((r) => ({
-			keyword: str$7(r.keyword),
-			page: r.page == null ? null : str$7(r.page),
-			recentClicks: num$1(r.recentClicks),
-			recentImpressions: num$1(r.recentImpressions),
-			recentPosition: num$1(r.recentPosition),
-			baselineClicks: Math.round(num$1(r.baselineClicks)),
-			baselineImpressions: Math.round(num$1(r.baselineImpressions)),
-			baselinePosition: num$1(r.baselinePosition),
-			clicksChange: num$1(r.clicksChange),
-			clicksChangePercent: num$1(r.clicksChangePercent),
-			impressionsChangePercent: num$1(r.impressionsChangePercent),
-			positionChange: num$1(r.positionChange),
-			direction: str$7(r.direction),
-			series: parseJsonList$4(r.seriesJson).map((s) => ({
-				week: str$7(s.week),
-				clicks: num$1(s.clicks),
-				impressions: num$1(s.impressions)
-			}))
-		}));
-		const rising = normalized.filter((r) => r.direction === "rising");
-		const declining = normalized.filter((r) => r.direction === "declining");
-		const stable = normalized.filter((r) => r.direction === "stable");
-		const combined = [...rising, ...declining];
-		return {
-			results: combined,
-			meta: {
-				total: combined.length,
-				rising: rising.length,
-				declining: declining.length,
-				stable: stable.length
-			}
-		};
+	reduceSql(rows, params) {
+		const normalized = (Array.isArray(rows) ? rows : []).map((r) => {
+			const recentClicks = num$1(r.recentClicks);
+			const recentImpressions = num$1(r.recentImpressions);
+			const recentPosition = num$1(r.recentPosition);
+			const baselineClicks = Math.round(num$1(r.baselineClicks));
+			const baselineImpressions = Math.round(num$1(r.baselineImpressions));
+			const baselinePosition = num$1(r.baselinePosition);
+			return {
+				keyword: str$7(r.keyword),
+				page: r.page == null ? null : str$7(r.page),
+				recentClicks,
+				recentImpressions,
+				recentPosition,
+				baselineClicks,
+				baselineImpressions,
+				baselinePosition,
+				clicksChange: num$1(r.clicksChange),
+				clicksChangePercent: num$1(r.clicksChangePercent),
+				impressionsChangePercent: num$1(r.impressionsChangePercent),
+				positionChange: num$1(r.positionChange),
+				direction: str$7(r.direction),
+				series: parseJsonList$4(r.seriesJson).map((s) => ({
+					week: str$7(s.week),
+					clicks: num$1(s.clicks),
+					impressions: num$1(s.impressions)
+				}))
+			};
+		}).map(withCanonicalFields);
+		return selectMoversDirection(normalized.filter((r) => r.direction === "rising"), normalized.filter((r) => r.direction === "declining"), normalized.filter((r) => r.direction === "stable"), params);
 	},
 	buildRows(params) {
 		const { current, previous } = comparisonOf$1(params);
@@ -3744,19 +3779,13 @@ const moversAnalyzer = defineAnalyzer$1({
 			changeThreshold: params.changeThreshold,
 			minImpressions: params.minImpressions
 		});
-		return {
-			results: [...result.rising.map((r) => ({
-				...r,
-				direction: "rising"
-			})), ...result.declining.map((r) => ({
-				...r,
-				direction: "declining"
-			}))],
-			meta: {
-				rising: result.rising.length,
-				declining: result.declining.length
-			}
-		};
+		return selectMoversDirection(result.rising.map((r) => withCanonicalFields({
+			...r,
+			direction: "rising"
+		})), result.declining.map((r) => withCanonicalFields({
+			...r,
+			direction: "declining"
+		})), [], params);
 	}
 });
 const DEFAULT_LIMIT$1 = 1e3;

package/package.json

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