@gscdump/analysis 0.24.1 → 0.25.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/analysis",
   "type": "module",
-  "version": "0.24.1",
+  "version": "0.25.0",
   "description": "GSC analyzers — striking-distance, opportunity, movers, decay, brand, clustering, concentration, seasonality. Pure row-based + DuckDB-native.",
   "author": {
     "name": "Harlan Wilton",
@@ -36,11 +36,6 @@
       "import": "./dist/default-registry.mjs",
       "default": "./dist/default-registry.mjs"
     },
-    "./query": {
-      "types": "./dist/query/index.d.mts",
-      "import": "./dist/query/index.mjs",
-      "default": "./dist/query/index.mjs"
-    },
     "./source": {
       "types": "./dist/source/index.d.mts",
       "import": "./dist/source/index.mjs",
@@ -75,9 +70,9 @@
   },
   "dependencies": {
     "drizzle-orm": "1.0.0-rc.3",
-    "@gscdump/engine": "0.24.1",
-    "@gscdump/engine-gsc-api": "0.24.1",
-    "gscdump": "0.24.1"
+    "gscdump": "0.25.0",
+    "@gscdump/engine-gsc-api": "0.25.0",
+    "@gscdump/engine": "0.25.0"
   },
   "devDependencies": {
     "vitest": "^4.1.7"

package/dist/query/index.d.mts

@@ -1,53 +0,0 @@
-import { ResolverOptions } from "@gscdump/engine/resolver";
-import { BuilderState } from "gscdump/query";
-import { AnalysisParams } from "@gscdump/engine/analysis-types";
-import { Row } from "@gscdump/engine/contracts";
-interface QueryAnalyzerExtraQuery {
-  name: string;
-  sql: string;
-  params: unknown[];
-}
-interface QueryAnalyzerPlan<TK extends string = string> {
-  tableKey: TK;
-  sql: string;
-  params: unknown[];
-  extraQueries?: QueryAnalyzerExtraQuery[];
-}
-declare function buildDataQueryPlan<TK extends string>(params: AnalysisParams, options: ResolverOptions<TK>): QueryAnalyzerPlan<TK>;
-/** Row-query plan for `data-query`. Comparison (`qc`) joins two periods. */
-declare function buildDataQueryRows(params: AnalysisParams): Record<string, BuilderState>;
-/** Post-processing for `data-query` row results. Mirrors `shapeDataQuery`. */
-declare function shapeDataQueryRowResults(rowMap: Record<string, Row[]>, params: AnalysisParams): {
-  results: Row[];
-  meta: Record<string, unknown>;
-};
-/** Row-query plan for `data-detail`. `qc` adds a previous-period totals query. */
-declare function buildDataDetailRows(params: AnalysisParams): Record<string, BuilderState>;
-/** Post-processing for `data-detail` row results. Mirrors `shapeDataDetailRows`. */
-declare function shapeDataDetailRowResults(rowMap: Record<string, Row[]>, params: AnalysisParams): {
-  results: Row[];
-  meta: Record<string, unknown>;
-};
-/**
- * Pure post-processing for `data-query` rows. Adapter-free so reducers can
- * call it without re-running the SQL plan.
- */
-declare function shapeDataQueryRows(rows: Row[], params: AnalysisParams, extras?: Record<string, Row[]>): {
-  results: Row[];
-  meta: Record<string, unknown>;
-};
-declare function buildDataDetailPlan<TK extends string>(params: AnalysisParams, options: ResolverOptions<TK>): QueryAnalyzerPlan<TK>;
-/**
- * Pure post-processing for `data-detail` rows. Reads the date range off
- * `params.q` so it stays adapter-free; reducers call it directly.
- */
-declare function shapeDataDetailRows(rows: Row[], params: AnalysisParams, extras?: Record<string, Row[]>): {
-  results: Row[];
-  meta: Record<string, unknown>;
-};
-/**
- * Produce a canonical form of a search query for grouping near-duplicates.
- * Idempotent: `normalizeQuery(normalizeQuery(q)) === normalizeQuery(q)`.
- */
-declare function normalizeQuery(query: string): string;
-export { type QueryAnalyzerExtraQuery, type QueryAnalyzerPlan, buildDataDetailPlan, buildDataDetailRows, buildDataQueryPlan, buildDataQueryRows, normalizeQuery, shapeDataDetailRowResults, shapeDataDetailRows, shapeDataQueryRowResults, shapeDataQueryRows };

package/dist/query/index.mjs

@@ -1,444 +0,0 @@
-import { padTimeseries } from "@gscdump/engine/period";
-import { buildExtrasQueries, buildTotalsSql, mergeExtras, resolveComparisonSQL, resolveToSQL, resolveToSQLOptimized } from "@gscdump/engine/resolver";
-import { extractDateRange } from "gscdump/query";
-function requireBuilderState(input, tool) {
-	if (!input || typeof input !== "object" || !("dimensions" in input) || !Array.isArray(input.dimensions)) throw new Error(`${tool}: params.q is required (BuilderState)`);
-	return input;
-}
-function optionalBuilderState(input, tool, key) {
-	if (input == null) return null;
-	if (typeof input !== "object" || !("dimensions" in input) || !Array.isArray(input.dimensions)) throw new Error(`${tool}: params.${key} must be a BuilderState`);
-	return input;
-}
-const NUMERIC_METRIC_COLS = [
-	"clicks",
-	"impressions",
-	"ctr",
-	"position",
-	"prevClicks",
-	"prevImpressions",
-	"prevCtr",
-	"prevPosition",
-	"variantCount",
-	"totalCount"
-];
-function coerceNumericCols(row) {
-	const out = { ...row };
-	for (const col of NUMERIC_METRIC_COLS) if (col in out && out[col] != null) out[col] = Number(out[col]);
-	return out;
-}
-function shapeDataQuery(rows, extras, opts) {
-	let totalCount;
-	let cleaned;
-	if (opts.hasPrev) {
-		cleaned = rows.map(coerceNumericCols);
-		totalCount = Number((extras?.count?.[0])?.total ?? cleaned.length);
-	} else {
-		const first = rows[0];
-		totalCount = Number(first?.totalCount ?? 0);
-		cleaned = rows.map((raw) => {
-			const { totalCount: _tc, totalClicks: _tclk, totalImpressions: _timp, totalCtr: _tctr, totalPosition: _tpos, sum_position: _sp, ...rest } = raw;
-			return coerceNumericCols(rest);
-		});
-	}
-	const totalsRow = extras?.totals?.[0] ?? {};
-	const totals = {
-		clicks: Number(totalsRow.clicks ?? 0),
-		impressions: Number(totalsRow.impressions ?? 0),
-		ctr: Number(totalsRow.ctr ?? 0),
-		position: Number(totalsRow.position ?? 0)
-	};
-	const extrasResults = [];
-	if (extras?.canonicalExtras) extrasResults.push({
-		key: "canonicalExtras",
-		results: extras.canonicalExtras
-	});
-	return {
-		results: mergeExtras(cleaned, extrasResults),
-		meta: {
-			totalCount,
-			totals
-		}
-	};
-}
-function buildDataQueryPlan(params, options) {
-	const state = requireBuilderState(params.q, "data-query");
-	if (state.dimensions.includes("date")) throw new Error("data-query: date dimension not supported; use data-detail");
-	const prev = optionalBuilderState(params.qc, "data-query", "qc");
-	const totals = buildTotalsSql(state, options);
-	const extras = buildExtrasQueries(state, options);
-	const extraQueries = [{
-		name: "totals",
-		sql: totals.sql,
-		params: totals.params
-	}, ...extras.map((extra) => ({
-		name: extra.key,
-		sql: extra.sql,
-		params: extra.params
-	}))];
-	const tableKey = options.adapter.inferTable(state.dimensions);
-	if (prev) {
-		const comparison = resolveComparisonSQL(state, prev, options, params.comparisonFilter);
-		extraQueries.push({
-			name: "count",
-			sql: comparison.countSql,
-			params: comparison.countParams
-		});
-		return {
-			tableKey,
-			sql: comparison.sql,
-			params: comparison.params,
-			extraQueries
-		};
-	}
-	const optimized = resolveToSQLOptimized(state, options);
-	return {
-		tableKey,
-		sql: optimized.sql,
-		params: optimized.params,
-		extraQueries
-	};
-}
-function totalsState(state) {
-	return {
-		...state,
-		dimensions: [],
-		orderBy: void 0,
-		rowLimit: 1
-	};
-}
-function readTotals(row) {
-	return {
-		clicks: Number(row?.clicks ?? 0),
-		impressions: Number(row?.impressions ?? 0),
-		ctr: Number(row?.ctr ?? 0),
-		position: Number(row?.position ?? 0)
-	};
-}
-function buildDataQueryRows(params) {
-	const state = requireBuilderState(params.q, "data-query");
-	if (state.dimensions.includes("date")) throw new Error("data-query: date dimension not supported; use data-detail");
-	const queries = {
-		main: state,
-		totals: totalsState(state)
-	};
-	const prev = optionalBuilderState(params.qc, "data-query", "qc");
-	if (prev) {
-		queries.prevMain = prev;
-		queries.prevTotals = totalsState(prev);
-	}
-	return queries;
-}
-function shapeDataQueryRowResults(rowMap, params) {
-	const main = (rowMap.main ?? []).map((r) => coerceNumericCols(r));
-	const totals = readTotals(rowMap.totals?.[0]);
-	if (params.qc == null) return {
-		results: main,
-		meta: {
-			totalCount: main.length,
-			totals
-		}
-	};
-	const state = requireBuilderState(params.q, "data-query");
-	const dims = state.dimensions;
-	const keyOf = (row) => dims.map((d) => String(row[d] ?? "")).join("\0");
-	const prevByKey = /* @__PURE__ */ new Map();
-	for (const r of rowMap.prevMain ?? []) prevByKey.set(keyOf(r), r);
-	const filter = params.comparisonFilter;
-	const merged = [];
-	const seen = /* @__PURE__ */ new Set();
-	for (const cur of main) {
-		const key = keyOf(cur);
-		seen.add(key);
-		const prev = prevByKey.get(key);
-		const row = {
-			...cur,
-			prevClicks: Number(prev?.clicks ?? 0),
-			prevImpressions: Number(prev?.impressions ?? 0),
-			prevCtr: Number(prev?.ctr ?? 0),
-			prevPosition: Number(prev?.position ?? 0)
-		};
-		if (passesComparisonFilter(filter, {
-			isNew: !prev,
-			isLost: false,
-			clicksChange: Number(cur.clicks ?? 0) - Number(prev?.clicks ?? 0)
-		})) merged.push(row);
-	}
-	for (const prev of rowMap.prevMain ?? []) {
-		const p = prev;
-		const key = keyOf(p);
-		if (seen.has(key)) continue;
-		const row = {
-			...p,
-			clicks: 0,
-			impressions: 0,
-			ctr: 0,
-			position: 0,
-			prevClicks: Number(p.clicks ?? 0),
-			prevImpressions: Number(p.impressions ?? 0),
-			prevCtr: Number(p.ctr ?? 0),
-			prevPosition: Number(p.position ?? 0)
-		};
-		if (passesComparisonFilter(filter, {
-			isNew: false,
-			isLost: true,
-			clicksChange: -Number(p.clicks ?? 0)
-		})) merged.push(row);
-	}
-	if (state.orderBy) {
-		const { column, dir } = state.orderBy;
-		merged.sort((a, b) => {
-			const av = Number(a[column]) || 0;
-			const bv = Number(b[column]) || 0;
-			return dir === "asc" ? av - bv : bv - av;
-		});
-	}
-	return {
-		results: merged.map((r) => coerceNumericCols(r)),
-		meta: {
-			totalCount: merged.length,
-			totals
-		}
-	};
-}
-function passesComparisonFilter(filter, ctx) {
-	switch (filter) {
-		case "new": return ctx.isNew;
-		case "lost": return ctx.isLost;
-		case "improving": return ctx.clicksChange > 0;
-		case "declining": return ctx.clicksChange < 0;
-		default: return true;
-	}
-}
-function buildDataDetailRows(params) {
-	const state = requireBuilderState(params.q, "data-detail");
-	if (!state.dimensions.includes("date")) throw new Error("data-detail: `date` dimension is required");
-	const queries = {
-		main: state,
-		totals: totalsState(state)
-	};
-	const prev = optionalBuilderState(params.qc, "data-detail", "qc");
-	if (prev) queries.prevTotals = totalsState(prev);
-	return queries;
-}
-function shapeDataDetailRowResults(rowMap, params) {
-	const { startDate, endDate } = extractDateRange(requireBuilderState(params.q, "data-detail").filter);
-	const coerced = (rowMap.main ?? []).map((r) => coerceNumericCols(r));
-	const daily = startDate && endDate ? padTimeseries(coerced, {
-		startDate,
-		endDate
-	}) : coerced;
-	const meta = { totals: readTotals(rowMap.totals?.[0]) };
-	if (rowMap.prevTotals) meta.previousTotals = readTotals(rowMap.prevTotals[0]);
-	return {
-		results: daily,
-		meta
-	};
-}
-function shapeDataQueryRows(rows, params, extras) {
-	return shapeDataQuery(rows, extras, { hasPrev: params.qc != null });
-}
-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 prev = optionalBuilderState(params.qc, "data-detail", "qc");
-	const extraQueries = [{
-		name: "totals",
-		sql: totals.sql,
-		params: totals.params
-	}];
-	if (prev) {
-		const previousTotals = buildTotalsSql(prev, options);
-		extraQueries.push({
-			name: "prevTotals",
-			sql: previousTotals.sql,
-			params: previousTotals.params
-		});
-	}
-	return {
-		tableKey: options.adapter.inferTable(state.dimensions),
-		sql: main.sql,
-		params: main.params,
-		extraQueries
-	};
-}
-function shapeDataDetailRows(rows, params, extras) {
-	const { startDate: rangeStart, endDate: rangeEnd } = extractDateRange(requireBuilderState(params.q, "data-detail").filter);
-	const coerced = rows.map(coerceNumericCols);
-	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)
-	} };
-	if (extras?.prevTotals) {
-		const previousTotalsRow = extras.prevTotals[0] ?? {};
-		meta.previousTotals = {
-			clicks: Number(previousTotalsRow.clicks ?? 0),
-			impressions: Number(previousTotalsRow.impressions ?? 0),
-			ctr: Number(previousTotalsRow.ctr ?? 0),
-			position: Number(previousTotalsRow.position ?? 0)
-		};
-	}
-	return {
-		results: daily,
-		meta
-	};
-}
-const SYNONYMS = {
-	checker: "validator",
-	tester: "validator",
-	verifier: "validator",
-	verify: "validate",
-	check: "validate",
-	test: "validate",
-	checking: "validate",
-	testing: "validate",
-	creator: "generator",
-	builder: "generator",
-	maker: "generator",
-	create: "generate",
-	build: "generate",
-	make: "generate",
-	lookup: "search",
-	finder: "search",
-	find: "search",
-	online: "",
-	free: ""
-};
-const NO_STRIP_S = new Set([
-	"css",
-	"js",
-	"ts",
-	"os",
-	"as",
-	"is",
-	"us",
-	"has",
-	"was",
-	"its",
-	"this",
-	"yes",
-	"no",
-	"bus",
-	"gas",
-	"dns",
-	"rss",
-	"sms",
-	"gps",
-	"aws",
-	"sas",
-	"cms",
-	"ios",
-	"less",
-	"loss",
-	"miss",
-	"pass",
-	"class",
-	"access",
-	"process",
-	"express",
-	"address",
-	"cross",
-	"press",
-	"stress",
-	"progress",
-	"success",
-	"business",
-	"wordpress",
-	"status",
-	"radius",
-	"nexus",
-	"focus",
-	"bonus",
-	"campus",
-	"census",
-	"corpus",
-	"nucleus",
-	"stimulus",
-	"terminus",
-	"versus",
-	"virus",
-	"surplus",
-	"cactus",
-	"analysis",
-	"basis",
-	"thesis",
-	"crisis",
-	"axis",
-	"genesis",
-	"synopsis",
-	"diagnosis",
-	"emphasis",
-	"hypothesis",
-	"synthesis",
-	"parenthesis",
-	"redis",
-	"apis",
-	"chaos",
-	"demos",
-	"logos",
-	"photos",
-	"videos",
-	"nuxtjs",
-	"nextjs",
-	"nodejs",
-	"reactjs",
-	"vuejs",
-	"angularjs",
-	"expressjs",
-	"nestjs",
-	"threejs",
-	"alpinejs",
-	"solidjs",
-	"sveltejs",
-	"dejs",
-	"bunjs",
-	"denojs",
-	"canvas",
-	"atlas",
-	"alias",
-	"bias",
-	"perhaps",
-	"whereas",
-	"kubernetes",
-	"sass",
-	"postgres",
-	"always",
-	"across",
-	"previous",
-	"various",
-	"serious",
-	"famous",
-	"anonymous",
-	"continuous",
-	"dangerous",
-	"generous",
-	"obvious",
-	"numerous",
-	"curious",
-	"nervous",
-	"conscious"
-]);
-function depluralize(token) {
-	if (token.length <= 3) return token;
-	if (NO_STRIP_S.has(token)) return token;
-	if (token.endsWith("ies") && token.length > 4) return `${token.slice(0, -3)}y`;
-	if (token.endsWith("ses") && token.length > 4) return token.slice(0, -1);
-	if (token.endsWith("shes") || token.endsWith("ches") || token.endsWith("xes") || token.endsWith("zes")) return token.slice(0, -2);
-	if (token.endsWith("s") && !token.endsWith("ss")) return token.slice(0, -1);
-	return token;
-}
-const SEPARATOR_RE = /[-_/.@#:+]+/g;
-const WHITESPACE_RE = /\s+/g;
-function normalizeQuery(query) {
-	return query.toLowerCase().replace(SEPARATOR_RE, " ").replace(WHITESPACE_RE, " ").trim().split(" ").filter(Boolean).map((token) => SYNONYMS[token] ?? token).filter(Boolean).map(depluralize).sort().join(" ");
-}
-export { buildDataDetailPlan, buildDataDetailRows, buildDataQueryPlan, buildDataQueryRows, normalizeQuery, shapeDataDetailRowResults, shapeDataDetailRows, shapeDataQueryRowResults, shapeDataQueryRows };