@gscdump/analysis 0.38.1 → 0.39.0

package/dist/analyzer/index.mjs

@@ -6,7 +6,7 @@ import { num } from "@gscdump/engine/analysis-types";
 import { err, ok, unwrapResult } from "gscdump/result";
 import { between, date, extractDateRange, gsc, page, query } from "gscdump/query";
 import { MS_PER_DAY, daysAgoUtc, toIsoDate } from "gscdump/dates";
-import { buildExtrasQueries, buildTotalsSql, mergeExtras, resolveComparisonSQL, resolveToSQL, resolveToSQLOptimized } from "@gscdump/engine/resolver";
+import { buildExtrasQueries, buildTotalsSql, mergeExtras, resolveComparisonSQL, resolveToSQLOptimized } from "@gscdump/engine/resolver";
 function rowNumber(value) {
 	if (typeof value === "number") return Number.isFinite(value) ? value : 0;
 	if (typeof value === "bigint") return Number(value);
@@ -665,7 +665,7 @@ function createMetricSorter(defaultMetric, orderByMetric) {
 		return [...items].sort((a, b) => (a[sortBy] - b[sortBy]) * mult);
 	};
 }
-const sortRowResults$1 = createSorter((item, metric) => {
+const sortRowResults = createSorter((item, metric) => {
 	switch (metric) {
 		case "clicks": return item.totalClicks;
 		case "impressions": return item.totalImpressions;
@@ -712,7 +712,7 @@ function analyzeCannibalization(rows, options = {}) {
 			positionSpread
 		});
 	}
-	return sortRowResults$1(results, sortBy, sortOrder);
+	return sortRowResults(results, sortBy, sortOrder);
 }
 const cannibalizationAnalyzer = defineAnalyzer({
 	id: "cannibalization",
@@ -2250,14 +2250,9 @@ function shapeDataQueryRows(rows, params, extras) {
 function buildDataDetailPlan(params, options) {
 	const state = requireBuilderState(params.q, "data-detail");
 	if (!state.dimensions.includes("date")) throw new Error("data-detail: `date` dimension is required");
-	const main = resolveToSQL(state, options);
-	const totals = buildTotalsSql(state, options);
+	const main = resolveToSQLOptimized(state, options);
 	const prev = optionalBuilderState(params.qc, "data-detail", "qc");
-	const extraQueries = [{
-		name: "totals",
-		sql: totals.sql,
-		params: totals.params
-	}];
+	const extraQueries = [];
 	if (prev) {
 		const previousTotals = buildTotalsSql(prev, options);
 		extraQueries.push({
@@ -2275,18 +2270,22 @@ function buildDataDetailPlan(params, options) {
 }
 function shapeDataDetailRows(rows, params, extras) {
 	const { startDate: rangeStart, endDate: rangeEnd } = extractDateRange(requireBuilderState(params.q, "data-detail").filter);
-	const coerced = rows.map(coerceNumericCols);
+	const first = rows[0];
+	const totals = {
+		clicks: Number(first?.totalClicks ?? 0),
+		impressions: Number(first?.totalImpressions ?? 0),
+		ctr: Number(first?.totalCtr ?? 0),
+		position: Number(first?.totalPosition ?? 0)
+	};
+	const coerced = rows.map((raw) => {
+		const { totalCount: _tc, totalClicks: _tclk, totalImpressions: _timp, totalCtr: _tctr, totalPosition: _tpos, sum_position: _sp, ...rest } = raw;
+		return coerceNumericCols(rest);
+	});
 	const daily = rangeStart && rangeEnd ? padTimeseries(coerced, {
 		startDate: rangeStart,
 		endDate: rangeEnd
 	}) : coerced;
-	const totalsRow = extras?.totals?.[0] ?? {};
-	const meta = { totals: {
-		clicks: Number(totalsRow.clicks ?? 0),
-		impressions: Number(totalsRow.impressions ?? 0),
-		ctr: Number(totalsRow.ctr ?? 0),
-		position: Number(totalsRow.position ?? 0)
-	} };
+	const meta = { totals };
 	if (extras?.prevTotals) {
 		const previousTotalsRow = extras.prevTotals[0] ?? {};
 		meta.previousTotals = {
@@ -2403,13 +2402,75 @@ function paginateInMemory(rows, input) {
 	const o = clampOffset(input.offset);
 	return rows.slice(o, o + l);
 }
+function paginateSortedInMemory(rows, input, compare) {
+	const limit = clampLimit(input.limit, rows.length);
+	const offset = clampOffset(input.offset);
+	const selectedCount = Math.min(rows.length, offset + limit);
+	if (limit === 0 || offset >= rows.length || selectedCount === 0) return [];
+	const fullSort = () => [...rows].sort(compare).slice(offset, offset + limit);
+	if (selectedCount >= rows.length / 2) return fullSort();
+	let invalidComparison = false;
+	const compareStable = (left, right) => {
+		const order = compare(left.value, right.value);
+		if (Number.isNaN(order)) {
+			invalidComparison = true;
+			return left.index - right.index;
+		}
+		return order || left.index - right.index;
+	};
+	const isWorse = (left, right) => compareStable(left, right) > 0;
+	const heap = [];
+	const siftUp = (start) => {
+		let index = start;
+		while (index > 0) {
+			const parent = index - 1 >>> 1;
+			if (!isWorse(heap[index], heap[parent])) break;
+			const swap = heap[parent];
+			heap[parent] = heap[index];
+			heap[index] = swap;
+			index = parent;
+		}
+	};
+	const siftDown = () => {
+		let index = 0;
+		for (;;) {
+			const left = index * 2 + 1;
+			if (left >= heap.length) return;
+			const right = left + 1;
+			let worse = left;
+			if (right < heap.length && isWorse(heap[right], heap[left])) worse = right;
+			if (!isWorse(heap[worse], heap[index])) return;
+			const swap = heap[index];
+			heap[index] = heap[worse];
+			heap[worse] = swap;
+			index = worse;
+		}
+	};
+	for (let index = 0; index < rows.length; index++) {
+		const candidate = {
+			value: rows[index],
+			index
+		};
+		if (heap.length < selectedCount) {
+			heap.push(candidate);
+			siftUp(heap.length - 1);
+		} else if (compareStable(candidate, heap[0]) < 0) {
+			heap[0] = candidate;
+			siftDown();
+		}
+	}
+	if (invalidComparison) return fullSort();
+	heap.sort(compareStable);
+	if (invalidComparison) return fullSort();
+	return heap.slice(offset, offset + limit).map((entry) => entry.value);
+}
 function resolveSort(input, allowed, defaults) {
 	return {
 		sortBy: input.sortBy && allowed.includes(input.sortBy) ? input.sortBy : defaults.sortBy,
 		sortDir: input.sortDir === "asc" || input.sortDir === "desc" ? input.sortDir : defaults.sortDir
 	};
 }
-const sortResults$1 = createMetricSorter("lostClicks", {
+const sortResults = createMetricSorter("lostClicks", {
 	lostClicks: "desc",
 	declinePercent: "desc",
 	currentClicks: "asc"
@@ -2442,7 +2503,7 @@ function analyzeDecay(input, options = {}) {
 			positionDrop: currentPosition != null ? currentPosition - prev.position : null
 		});
 	}
-	return sortResults$1(results, sortBy);
+	return sortResults(results, sortBy);
 }
 const decayAnalyzer = defineAnalyzer({
 	id: "decay",
@@ -3441,12 +3502,6 @@ function calculateCtrGapScore(actualCtr, position) {
 	const gap = expectedCtr - actualCtr;
 	return Math.min(gap / expectedCtr, 1);
 }
-const sortResults = createMetricSorter("opportunityScore", {
-	opportunityScore: "desc",
-	potentialClicks: "desc",
-	impressions: "desc",
-	position: "asc"
-});
 const opportunityAnalyzer = defineAnalyzer({
 	id: "opportunity",
 	buildSql(params) {
@@ -3596,15 +3651,14 @@ const opportunityAnalyzer = defineAnalyzer({
 				}
 			});
 		}
-		const sorted = sortResults(results, sortBy);
-		const paged = paginateInMemory(sorted, {
+		const paged = paginateSortedInMemory(results, {
 			limit: params.limit,
 			offset: params.offset
-		});
+		}, (left, right) => right[sortBy] - left[sortBy]);
 		return {
 			results: paged,
 			meta: {
-				total: sorted.length,
+				total: results.length,
 				returned: paged.length
 			}
 		};
@@ -4306,11 +4360,10 @@ const strikingDistanceAnalyzer = defineAnalyzer({
 	id: "striking-distance",
 	reduce(rows, params) {
 		const results = filterStrikingDistance(Array.isArray(rows) ? rows : [], params);
-		results.sort((a, b) => b.potentialClicks - a.potentialClicks);
-		const paged = paginateInMemory(results, {
+		const paged = paginateSortedInMemory(results, {
 			limit: params.limit ?? 1e3,
 			offset: params.offset
-		});
+		}, (left, right) => right.potentialClicks - left.potentialClicks);
 		return {
 			results: paged,
 			meta: {
@@ -4686,7 +4739,6 @@ const trendsAnalyzer = defineAnalyzer({
 	}
 });
 const DEFAULT_ROW_LIMIT = 25e3;
-const sortRowResults = createSorter((item) => item.impressions, "impressions");
 const zeroClickAnalyzer = defineAnalyzer({
 	id: "zero-click",
 	buildSql(params) {
@@ -4789,11 +4841,11 @@ const zeroClickAnalyzer = defineAnalyzer({
 				position: row.position
 			});
 		}
-		const results = sortRowResults(Array.from(queryMap.values()), "impressions", "desc");
-		const paged = paginateInMemory(results, {
+		const results = Array.from(queryMap.values());
+		const paged = paginateSortedInMemory(results, {
 			limit: params.limit,
 			offset: params.offset
-		});
+		}, (left, right) => right.impressions - left.impressions);
 		return {
 			results: paged,
 			meta: {

package/dist/default-registry.mjs

@@ -6,7 +6,7 @@ import { num } from "@gscdump/engine/analysis-types";
 import { err, ok, unwrapResult } from "gscdump/result";
 import { between, date, extractDateRange, gsc, page, query } from "gscdump/query";
 import { MS_PER_DAY, daysAgoUtc, toIsoDate } from "gscdump/dates";
-import { buildExtrasQueries, buildTotalsSql, mergeExtras, resolveComparisonSQL, resolveToSQL, resolveToSQLOptimized } from "@gscdump/engine/resolver";
+import { buildExtrasQueries, buildTotalsSql, mergeExtras, resolveComparisonSQL, resolveToSQLOptimized } from "@gscdump/engine/resolver";
 function rowNumber(value) {
 	if (typeof value === "number") return Number.isFinite(value) ? value : 0;
 	if (typeof value === "bigint") return Number(value);
@@ -665,7 +665,7 @@ function createMetricSorter(defaultMetric, orderByMetric) {
 		return [...items].sort((a, b) => (a[sortBy] - b[sortBy]) * mult);
 	};
 }
-const sortRowResults$1 = createSorter((item, metric) => {
+const sortRowResults = createSorter((item, metric) => {
 	switch (metric) {
 		case "clicks": return item.totalClicks;
 		case "impressions": return item.totalImpressions;
@@ -712,7 +712,7 @@ function analyzeCannibalization(rows, options = {}) {
 			positionSpread
 		});
 	}
-	return sortRowResults$1(results, sortBy, sortOrder);
+	return sortRowResults(results, sortBy, sortOrder);
 }
 const cannibalizationAnalyzer = defineAnalyzer({
 	id: "cannibalization",
@@ -2250,14 +2250,9 @@ function shapeDataQueryRows(rows, params, extras) {
 function buildDataDetailPlan(params, options) {
 	const state = requireBuilderState(params.q, "data-detail");
 	if (!state.dimensions.includes("date")) throw new Error("data-detail: `date` dimension is required");
-	const main = resolveToSQL(state, options);
-	const totals = buildTotalsSql(state, options);
+	const main = resolveToSQLOptimized(state, options);
 	const prev = optionalBuilderState(params.qc, "data-detail", "qc");
-	const extraQueries = [{
-		name: "totals",
-		sql: totals.sql,
-		params: totals.params
-	}];
+	const extraQueries = [];
 	if (prev) {
 		const previousTotals = buildTotalsSql(prev, options);
 		extraQueries.push({
@@ -2275,18 +2270,22 @@ function buildDataDetailPlan(params, options) {
 }
 function shapeDataDetailRows(rows, params, extras) {
 	const { startDate: rangeStart, endDate: rangeEnd } = extractDateRange(requireBuilderState(params.q, "data-detail").filter);
-	const coerced = rows.map(coerceNumericCols);
+	const first = rows[0];
+	const totals = {
+		clicks: Number(first?.totalClicks ?? 0),
+		impressions: Number(first?.totalImpressions ?? 0),
+		ctr: Number(first?.totalCtr ?? 0),
+		position: Number(first?.totalPosition ?? 0)
+	};
+	const coerced = rows.map((raw) => {
+		const { totalCount: _tc, totalClicks: _tclk, totalImpressions: _timp, totalCtr: _tctr, totalPosition: _tpos, sum_position: _sp, ...rest } = raw;
+		return coerceNumericCols(rest);
+	});
 	const daily = rangeStart && rangeEnd ? padTimeseries(coerced, {
 		startDate: rangeStart,
 		endDate: rangeEnd
 	}) : coerced;
-	const totalsRow = extras?.totals?.[0] ?? {};
-	const meta = { totals: {
-		clicks: Number(totalsRow.clicks ?? 0),
-		impressions: Number(totalsRow.impressions ?? 0),
-		ctr: Number(totalsRow.ctr ?? 0),
-		position: Number(totalsRow.position ?? 0)
-	} };
+	const meta = { totals };
 	if (extras?.prevTotals) {
 		const previousTotalsRow = extras.prevTotals[0] ?? {};
 		meta.previousTotals = {
@@ -2403,7 +2402,69 @@ function paginateInMemory(rows, input) {
 	const o = clampOffset(input.offset);
 	return rows.slice(o, o + l);
 }
-const sortResults$1 = createMetricSorter("lostClicks", {
+function paginateSortedInMemory(rows, input, compare) {
+	const limit = clampLimit(input.limit, rows.length);
+	const offset = clampOffset(input.offset);
+	const selectedCount = Math.min(rows.length, offset + limit);
+	if (limit === 0 || offset >= rows.length || selectedCount === 0) return [];
+	const fullSort = () => [...rows].sort(compare).slice(offset, offset + limit);
+	if (selectedCount >= rows.length / 2) return fullSort();
+	let invalidComparison = false;
+	const compareStable = (left, right) => {
+		const order = compare(left.value, right.value);
+		if (Number.isNaN(order)) {
+			invalidComparison = true;
+			return left.index - right.index;
+		}
+		return order || left.index - right.index;
+	};
+	const isWorse = (left, right) => compareStable(left, right) > 0;
+	const heap = [];
+	const siftUp = (start) => {
+		let index = start;
+		while (index > 0) {
+			const parent = index - 1 >>> 1;
+			if (!isWorse(heap[index], heap[parent])) break;
+			const swap = heap[parent];
+			heap[parent] = heap[index];
+			heap[index] = swap;
+			index = parent;
+		}
+	};
+	const siftDown = () => {
+		let index = 0;
+		for (;;) {
+			const left = index * 2 + 1;
+			if (left >= heap.length) return;
+			const right = left + 1;
+			let worse = left;
+			if (right < heap.length && isWorse(heap[right], heap[left])) worse = right;
+			if (!isWorse(heap[worse], heap[index])) return;
+			const swap = heap[index];
+			heap[index] = heap[worse];
+			heap[worse] = swap;
+			index = worse;
+		}
+	};
+	for (let index = 0; index < rows.length; index++) {
+		const candidate = {
+			value: rows[index],
+			index
+		};
+		if (heap.length < selectedCount) {
+			heap.push(candidate);
+			siftUp(heap.length - 1);
+		} else if (compareStable(candidate, heap[0]) < 0) {
+			heap[0] = candidate;
+			siftDown();
+		}
+	}
+	if (invalidComparison) return fullSort();
+	heap.sort(compareStable);
+	if (invalidComparison) return fullSort();
+	return heap.slice(offset, offset + limit).map((entry) => entry.value);
+}
+const sortResults = createMetricSorter("lostClicks", {
 	lostClicks: "desc",
 	declinePercent: "desc",
 	currentClicks: "asc"
@@ -2436,7 +2497,7 @@ function analyzeDecay(input, options = {}) {
 			positionDrop: currentPosition != null ? currentPosition - prev.position : null
 		});
 	}
-	return sortResults$1(results, sortBy);
+	return sortResults(results, sortBy);
 }
 const decayAnalyzer = defineAnalyzer({
 	id: "decay",
@@ -3435,12 +3496,6 @@ function calculateCtrGapScore(actualCtr, position) {
 	const gap = expectedCtr - actualCtr;
 	return Math.min(gap / expectedCtr, 1);
 }
-const sortResults = createMetricSorter("opportunityScore", {
-	opportunityScore: "desc",
-	potentialClicks: "desc",
-	impressions: "desc",
-	position: "asc"
-});
 const opportunityAnalyzer = defineAnalyzer({
 	id: "opportunity",
 	buildSql(params) {
@@ -3590,15 +3645,14 @@ const opportunityAnalyzer = defineAnalyzer({
 				}
 			});
 		}
-		const sorted = sortResults(results, sortBy);
-		const paged = paginateInMemory(sorted, {
+		const paged = paginateSortedInMemory(results, {
 			limit: params.limit,
 			offset: params.offset
-		});
+		}, (left, right) => right[sortBy] - left[sortBy]);
 		return {
 			results: paged,
 			meta: {
-				total: sorted.length,
+				total: results.length,
 				returned: paged.length
 			}
 		};
@@ -4300,11 +4354,10 @@ const strikingDistanceAnalyzer = defineAnalyzer({
 	id: "striking-distance",
 	reduce(rows, params) {
 		const results = filterStrikingDistance(Array.isArray(rows) ? rows : [], params);
-		results.sort((a, b) => b.potentialClicks - a.potentialClicks);
-		const paged = paginateInMemory(results, {
+		const paged = paginateSortedInMemory(results, {
 			limit: params.limit ?? 1e3,
 			offset: params.offset
-		});
+		}, (left, right) => right.potentialClicks - left.potentialClicks);
 		return {
 			results: paged,
 			meta: {
@@ -4680,7 +4733,6 @@ const trendsAnalyzer = defineAnalyzer({
 	}
 });
 const DEFAULT_ROW_LIMIT = 25e3;
-const sortRowResults = createSorter((item) => item.impressions, "impressions");
 const defaultAnalyzerRegistry = createAnalyzerRegistry({ defined: [
 	bayesianCtrAnalyzer,
 	bipartitePagerankAnalyzer,
@@ -4812,11 +4864,11 @@ const defaultAnalyzerRegistry = createAnalyzerRegistry({ defined: [
 					position: row.position
 				});
 			}
-			const results = sortRowResults(Array.from(queryMap.values()), "impressions", "desc");
-			const paged = paginateInMemory(results, {
+			const results = Array.from(queryMap.values());
+			const paged = paginateSortedInMemory(results, {
 				limit: params.limit,
 				offset: params.offset
-			});
+			}, (left, right) => right.impressions - left.impressions);
 			return {
 				results: paged,
 				meta: {

package/dist/index.mjs

@@ -6,7 +6,7 @@ import { num, num as num$1 } from "@gscdump/engine/analysis-types";
 import { err, ok, unwrapResult } from "gscdump/result";
 import { between, date, extractDateRange, gsc, page, query } from "gscdump/query";
 import { MS_PER_DAY, daysAgoUtc, toIsoDate } from "gscdump/dates";
-import { buildExtrasQueries, buildTotalsSql, mergeExtras, pgResolverAdapter, resolveComparisonSQL, resolveToSQL, resolveToSQLOptimized } from "@gscdump/engine/resolver";
+import { buildExtrasQueries, buildTotalsSql, mergeExtras, pgResolverAdapter, resolveComparisonSQL, resolveToSQLOptimized } from "@gscdump/engine/resolver";
 import pluralize from "pluralize";
 import { ENGINE_QUERY_CAPABILITIES, createAttachedTableSource, createEngineQuerySource, queryComparisonRows, queryRows, rewriteForTableSource, runAnalyzerWithEngine, typedQuery } from "@gscdump/engine/source";
 import { computeInputHash, createReportRegistry, defineReport } from "@gscdump/engine/report";
@@ -897,7 +897,7 @@ function createMetricSorter(defaultMetric, orderByMetric) {
 		return [...items].sort((a, b) => (a[sortBy] - b[sortBy]) * mult);
 	};
 }
-const sortRowResults$1 = createSorter((item, metric) => {
+const sortRowResults = createSorter((item, metric) => {
 	switch (metric) {
 		case "clicks": return item.totalClicks;
 		case "impressions": return item.totalImpressions;
@@ -944,7 +944,7 @@ function analyzeCannibalization(rows, options = {}) {
 			positionSpread
 		});
 	}
-	return sortRowResults$1(results, sortBy, sortOrder);
+	return sortRowResults(results, sortBy, sortOrder);
 }
 const cannibalizationAnalyzer = defineAnalyzer$1({
 	id: "cannibalization",
@@ -2482,14 +2482,9 @@ function shapeDataQueryRows(rows, params, extras) {
 function buildDataDetailPlan(params, options) {
 	const state = requireBuilderState(params.q, "data-detail");
 	if (!state.dimensions.includes("date")) throw new Error("data-detail: `date` dimension is required");
-	const main = resolveToSQL(state, options);
-	const totals = buildTotalsSql(state, options);
+	const main = resolveToSQLOptimized(state, options);
 	const prev = optionalBuilderState(params.qc, "data-detail", "qc");
-	const extraQueries = [{
-		name: "totals",
-		sql: totals.sql,
-		params: totals.params
-	}];
+	const extraQueries = [];
 	if (prev) {
 		const previousTotals = buildTotalsSql(prev, options);
 		extraQueries.push({
@@ -2507,18 +2502,22 @@ function buildDataDetailPlan(params, options) {
 }
 function shapeDataDetailRows(rows, params, extras) {
 	const { startDate: rangeStart, endDate: rangeEnd } = extractDateRange(requireBuilderState(params.q, "data-detail").filter);
-	const coerced = rows.map(coerceNumericCols);
+	const first = rows[0];
+	const totals = {
+		clicks: Number(first?.totalClicks ?? 0),
+		impressions: Number(first?.totalImpressions ?? 0),
+		ctr: Number(first?.totalCtr ?? 0),
+		position: Number(first?.totalPosition ?? 0)
+	};
+	const coerced = rows.map((raw) => {
+		const { totalCount: _tc, totalClicks: _tclk, totalImpressions: _timp, totalCtr: _tctr, totalPosition: _tpos, sum_position: _sp, ...rest } = raw;
+		return coerceNumericCols(rest);
+	});
 	const daily = rangeStart && rangeEnd ? padTimeseries$1(coerced, {
 		startDate: rangeStart,
 		endDate: rangeEnd
 	}) : coerced;
-	const totalsRow = extras?.totals?.[0] ?? {};
-	const meta = { totals: {
-		clicks: Number(totalsRow.clicks ?? 0),
-		impressions: Number(totalsRow.impressions ?? 0),
-		ctr: Number(totalsRow.ctr ?? 0),
-		position: Number(totalsRow.position ?? 0)
-	} };
+	const meta = { totals };
 	if (extras?.prevTotals) {
 		const previousTotalsRow = extras.prevTotals[0] ?? {};
 		meta.previousTotals = {
@@ -2647,10 +2646,12 @@ const SEPARATOR_RE$1 = /[-_/.@#:+]+/g;
 const WHITESPACE_RE$1 = /\s+/g;
 const DIACRITICS_RE$1 = /\p{Diacritic}/gu;
 function tokenize(query) {
-	const text = query.normalize("NFKD").replace(DIACRITICS_RE$1, "").toLowerCase().replace(SEPARATOR_RE$1, " ").replace(WHITESPACE_RE$1, " ").trim();
+	let index = 0;
+	while (index < query.length && query.charCodeAt(index) <= 127) index++;
+	const text = (index === query.length ? query : query.normalize("NFKD").replace(DIACRITICS_RE$1, "")).toLowerCase().replace(SEPARATOR_RE$1, " ").replace(WHITESPACE_RE$1, " ").trim();
 	return {
 		text,
-		tokens: text.split(" ").filter(Boolean)
+		tokens: text.length === 0 ? [] : text.split(" ")
 	};
 }
 function classifyQueryIntent(query) {
@@ -2816,15 +2817,27 @@ const NO_STRIP_S = /* @__PURE__ */ new Set([
 	"nervous",
 	"conscious"
 ]);
+const DEPLURALIZED_CACHE_MAX = 4096;
+const depluralizedCache = /* @__PURE__ */ new Map();
 function depluralize(token) {
 	if (token.length <= 3 || NO_STRIP_S.has(token) || token.endsWith("sis")) return token;
-	return pluralize.singular(token);
+	const last = token.charCodeAt(token.length - 1);
+	if (last < 97 || last > 122) return token;
+	const cached = depluralizedCache.get(token);
+	if (cached !== void 0) return cached;
+	const singular = pluralize.singular(token);
+	if (depluralizedCache.size >= DEPLURALIZED_CACHE_MAX) depluralizedCache.clear();
+	depluralizedCache.set(token, singular);
+	return singular;
 }
 const SEPARATOR_RE = /[-_/.@#:+]+/g;
 const WHITESPACE_RE = /\s+/g;
 const DIACRITICS_RE = /\p{Diacritic}/gu;
 const NORMALIZER_VERSION = 2;
 function foldUnicode(s) {
+	let index = 0;
+	while (index < s.length && s.charCodeAt(index) <= 127) index++;
+	if (index === s.length) return s;
 	return s.normalize("NFKD").replace(DIACRITICS_RE, "");
 }
 const DIRECTIONAL_CONNECTORS = /* @__PURE__ */ new Set([
@@ -2860,9 +2873,15 @@ function isOrderSensitive(tokens) {
 	return false;
 }
 function normalizeQuery(query) {
-	const cleaned = foldUnicode(query).toLowerCase().replace(SEPARATOR_RE, " ").replace(WHITESPACE_RE, " ").trim().split(" ").filter(Boolean);
-	const mapped = cleaned.map((token) => SYNONYMS[token] ?? token).filter(Boolean);
-	const tokens = (mapped.length > 0 ? mapped : cleaned).map(depluralize);
+	const normalized = foldUnicode(query).toLowerCase().replace(SEPARATOR_RE, " ").replace(WHITESPACE_RE, " ").trim();
+	if (normalized.length === 0) return "";
+	const cleaned = normalized.split(" ");
+	const mapped = [];
+	for (const token of cleaned) {
+		const synonym = SYNONYMS[token] ?? token;
+		if (synonym) mapped.push(depluralize(synonym));
+	}
+	const tokens = mapped.length > 0 ? mapped : cleaned.map(depluralize);
 	return (isOrderSensitive(tokens) ? tokens : tokens.sort()).join(" ");
 }
 const dataDetailAnalyzer = defineAnalyzer$1({
@@ -2967,7 +2986,69 @@ function paginateInMemory(rows, input) {
 	const o = clampOffset(input.offset);
 	return rows.slice(o, o + l);
 }
-const sortResults$1 = createMetricSorter("lostClicks", {
+function paginateSortedInMemory(rows, input, compare) {
+	const limit = clampLimit(input.limit, rows.length);
+	const offset = clampOffset(input.offset);
+	const selectedCount = Math.min(rows.length, offset + limit);
+	if (limit === 0 || offset >= rows.length || selectedCount === 0) return [];
+	const fullSort = () => [...rows].sort(compare).slice(offset, offset + limit);
+	if (selectedCount >= rows.length / 2) return fullSort();
+	let invalidComparison = false;
+	const compareStable = (left, right) => {
+		const order = compare(left.value, right.value);
+		if (Number.isNaN(order)) {
+			invalidComparison = true;
+			return left.index - right.index;
+		}
+		return order || left.index - right.index;
+	};
+	const isWorse = (left, right) => compareStable(left, right) > 0;
+	const heap = [];
+	const siftUp = (start) => {
+		let index = start;
+		while (index > 0) {
+			const parent = index - 1 >>> 1;
+			if (!isWorse(heap[index], heap[parent])) break;
+			const swap = heap[parent];
+			heap[parent] = heap[index];
+			heap[index] = swap;
+			index = parent;
+		}
+	};
+	const siftDown = () => {
+		let index = 0;
+		for (;;) {
+			const left = index * 2 + 1;
+			if (left >= heap.length) return;
+			const right = left + 1;
+			let worse = left;
+			if (right < heap.length && isWorse(heap[right], heap[left])) worse = right;
+			if (!isWorse(heap[worse], heap[index])) return;
+			const swap = heap[index];
+			heap[index] = heap[worse];
+			heap[worse] = swap;
+			index = worse;
+		}
+	};
+	for (let index = 0; index < rows.length; index++) {
+		const candidate = {
+			value: rows[index],
+			index
+		};
+		if (heap.length < selectedCount) {
+			heap.push(candidate);
+			siftUp(heap.length - 1);
+		} else if (compareStable(candidate, heap[0]) < 0) {
+			heap[0] = candidate;
+			siftDown();
+		}
+	}
+	if (invalidComparison) return fullSort();
+	heap.sort(compareStable);
+	if (invalidComparison) return fullSort();
+	return heap.slice(offset, offset + limit).map((entry) => entry.value);
+}
+const sortResults = createMetricSorter("lostClicks", {
 	lostClicks: "desc",
 	declinePercent: "desc",
 	currentClicks: "asc"
@@ -3000,7 +3081,7 @@ function analyzeDecay(input, options = {}) {
 			positionDrop: currentPosition != null ? currentPosition - prev.position : null
 		});
 	}
-	return sortResults$1(results, sortBy);
+	return sortResults(results, sortBy);
 }
 const decayAnalyzer = defineAnalyzer$1({
 	id: "decay",
@@ -3995,12 +4076,6 @@ function calculateCtrGapScore(actualCtr, position) {
 	const gap = expectedCtr - actualCtr;
 	return Math.min(gap / expectedCtr, 1);
 }
-const sortResults = createMetricSorter("opportunityScore", {
-	opportunityScore: "desc",
-	potentialClicks: "desc",
-	impressions: "desc",
-	position: "asc"
-});
 const opportunityAnalyzer = defineAnalyzer$1({
 	id: "opportunity",
 	buildSql(params) {
@@ -4150,15 +4225,14 @@ const opportunityAnalyzer = defineAnalyzer$1({
 				}
 			});
 		}
-		const sorted = sortResults(results, sortBy);
-		const paged = paginateInMemory(sorted, {
+		const paged = paginateSortedInMemory(results, {
 			limit: params.limit,
 			offset: params.offset
-		});
+		}, (left, right) => right[sortBy] - left[sortBy]);
 		return {
 			results: paged,
 			meta: {
-				total: sorted.length,
+				total: results.length,
 				returned: paged.length
 			}
 		};
@@ -4860,11 +4934,10 @@ const strikingDistanceAnalyzer = defineAnalyzer$1({
 	id: "striking-distance",
 	reduce(rows, params) {
 		const results = filterStrikingDistance(Array.isArray(rows) ? rows : [], params);
-		results.sort((a, b) => b.potentialClicks - a.potentialClicks);
-		const paged = paginateInMemory(results, {
+		const paged = paginateSortedInMemory(results, {
 			limit: params.limit ?? 1e3,
 			offset: params.offset
-		});
+		}, (left, right) => right.potentialClicks - left.potentialClicks);
 		return {
 			results: paged,
 			meta: {
@@ -5240,7 +5313,6 @@ const trendsAnalyzer = defineAnalyzer$1({
 	}
 });
 const DEFAULT_ROW_LIMIT = 25e3;
-const sortRowResults = createSorter((item) => item.impressions, "impressions");
 const ALL_ANALYZERS = [
 	bayesianCtrAnalyzer,
 	bipartitePagerankAnalyzer,
@@ -5372,11 +5444,11 @@ const ALL_ANALYZERS = [
 					position: row.position
 				});
 			}
-			const results = sortRowResults(Array.from(queryMap.values()), "impressions", "desc");
-			const paged = paginateInMemory(results, {
+			const results = Array.from(queryMap.values());
+			const paged = paginateSortedInMemory(results, {
 				limit: params.limit,
 				offset: params.offset
-			});
+			}, (left, right) => right.impressions - left.impressions);
 			return {
 				results: paged,
 				meta: {

package/package.json

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