@gscdump/analysis 0.35.12 → 0.36.1

package/dist/analyzer/index.mjs

@@ -2011,24 +2011,31 @@ function coerceNumericCols(row) {
 function shapeDataQuery(rows, extras, opts) {
 	let totalCount;
 	let cleaned;
+	let totals;
 	if (opts.hasPrev) {
 		cleaned = rows.map(coerceNumericCols);
 		totalCount = Number((extras?.count?.[0])?.total ?? cleaned.length);
+		const totalsRow = extras?.totals?.[0] ?? {};
+		totals = {
+			clicks: Number(totalsRow.clicks ?? 0),
+			impressions: Number(totalsRow.impressions ?? 0),
+			ctr: Number(totalsRow.ctr ?? 0),
+			position: Number(totalsRow.position ?? 0)
+		};
 	} else {
 		const first = rows[0];
 		totalCount = Number(first?.totalCount ?? 0);
+		totals = {
+			clicks: Number(first?.totalClicks ?? 0),
+			impressions: Number(first?.totalImpressions ?? 0),
+			ctr: Number(first?.totalCtr ?? 0),
+			position: Number(first?.totalPosition ?? 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",
@@ -2046,20 +2053,20 @@ 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) => ({
+	const extraQueries = [...buildExtrasQueries(state, options).map((extra) => ({
 		name: extra.key,
 		sql: extra.sql,
 		params: extra.params
 	}))];
 	const tableKey = options.adapter.inferTable(state.dimensions);
 	if (prev) {
+		const totals = buildTotalsSql(state, options);
 		const comparison = resolveComparisonSQL(state, prev, options, params.comparisonFilter);
+		extraQueries.unshift({
+			name: "totals",
+			sql: totals.sql,
+			params: totals.params
+		});
 		extraQueries.push({
 			name: "count",
 			sql: comparison.countSql,
@@ -2122,7 +2129,7 @@ function shapeDataQueryRowResults(rowMap, params) {
 	};
 	const state = requireBuilderState(params.q, "data-query");
 	const dims = state.dimensions;
-	const keyOf = (row) => dims.map((d) => String(row[d] ?? "")).join("\0");
+	const keyOf = (row) => dims.map((d) => String(row[d] ?? "")).join("");
 	const prevByKey = /* @__PURE__ */ new Map();
 	for (const r of rowMap.prevMain ?? []) prevByKey.set(keyOf(r), r);
 	const filter = params.comparisonFilter;

package/dist/default-registry.mjs

@@ -2011,24 +2011,31 @@ function coerceNumericCols(row) {
 function shapeDataQuery(rows, extras, opts) {
 	let totalCount;
 	let cleaned;
+	let totals;
 	if (opts.hasPrev) {
 		cleaned = rows.map(coerceNumericCols);
 		totalCount = Number((extras?.count?.[0])?.total ?? cleaned.length);
+		const totalsRow = extras?.totals?.[0] ?? {};
+		totals = {
+			clicks: Number(totalsRow.clicks ?? 0),
+			impressions: Number(totalsRow.impressions ?? 0),
+			ctr: Number(totalsRow.ctr ?? 0),
+			position: Number(totalsRow.position ?? 0)
+		};
 	} else {
 		const first = rows[0];
 		totalCount = Number(first?.totalCount ?? 0);
+		totals = {
+			clicks: Number(first?.totalClicks ?? 0),
+			impressions: Number(first?.totalImpressions ?? 0),
+			ctr: Number(first?.totalCtr ?? 0),
+			position: Number(first?.totalPosition ?? 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",
@@ -2046,20 +2053,20 @@ 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) => ({
+	const extraQueries = [...buildExtrasQueries(state, options).map((extra) => ({
 		name: extra.key,
 		sql: extra.sql,
 		params: extra.params
 	}))];
 	const tableKey = options.adapter.inferTable(state.dimensions);
 	if (prev) {
+		const totals = buildTotalsSql(state, options);
 		const comparison = resolveComparisonSQL(state, prev, options, params.comparisonFilter);
+		extraQueries.unshift({
+			name: "totals",
+			sql: totals.sql,
+			params: totals.params
+		});
 		extraQueries.push({
 			name: "count",
 			sql: comparison.countSql,
@@ -2122,7 +2129,7 @@ function shapeDataQueryRowResults(rowMap, params) {
 	};
 	const state = requireBuilderState(params.q, "data-query");
 	const dims = state.dimensions;
-	const keyOf = (row) => dims.map((d) => String(row[d] ?? "")).join("\0");
+	const keyOf = (row) => dims.map((d) => String(row[d] ?? "")).join("");
 	const prevByKey = /* @__PURE__ */ new Map();
 	for (const r of rowMap.prevMain ?? []) prevByKey.set(keyOf(r), r);
 	const filter = params.comparisonFilter;

package/dist/index.mjs

@@ -2243,24 +2243,31 @@ function coerceNumericCols(row) {
 function shapeDataQuery(rows, extras, opts) {
 	let totalCount;
 	let cleaned;
+	let totals;
 	if (opts.hasPrev) {
 		cleaned = rows.map(coerceNumericCols);
 		totalCount = Number((extras?.count?.[0])?.total ?? cleaned.length);
+		const totalsRow = extras?.totals?.[0] ?? {};
+		totals = {
+			clicks: Number(totalsRow.clicks ?? 0),
+			impressions: Number(totalsRow.impressions ?? 0),
+			ctr: Number(totalsRow.ctr ?? 0),
+			position: Number(totalsRow.position ?? 0)
+		};
 	} else {
 		const first = rows[0];
 		totalCount = Number(first?.totalCount ?? 0);
+		totals = {
+			clicks: Number(first?.totalClicks ?? 0),
+			impressions: Number(first?.totalImpressions ?? 0),
+			ctr: Number(first?.totalCtr ?? 0),
+			position: Number(first?.totalPosition ?? 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",
@@ -2278,20 +2285,20 @@ 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) => ({
+	const extraQueries = [...buildExtrasQueries(state, options).map((extra) => ({
 		name: extra.key,
 		sql: extra.sql,
 		params: extra.params
 	}))];
 	const tableKey = options.adapter.inferTable(state.dimensions);
 	if (prev) {
+		const totals = buildTotalsSql(state, options);
 		const comparison = resolveComparisonSQL(state, prev, options, params.comparisonFilter);
+		extraQueries.unshift({
+			name: "totals",
+			sql: totals.sql,
+			params: totals.params
+		});
 		extraQueries.push({
 			name: "count",
 			sql: comparison.countSql,
@@ -2354,7 +2361,7 @@ function shapeDataQueryRowResults(rowMap, params) {
 	};
 	const state = requireBuilderState(params.q, "data-query");
 	const dims = state.dimensions;
-	const keyOf = (row) => dims.map((d) => String(row[d] ?? "")).join("\0");
+	const keyOf = (row) => dims.map((d) => String(row[d] ?? "")).join("");
 	const prevByKey = /* @__PURE__ */ new Map();
 	for (const r of rowMap.prevMain ?? []) prevByKey.set(keyOf(r), r);
 	const filter = params.comparisonFilter;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/analysis",
   "type": "module",
-  "version": "0.35.12",
+  "version": "0.36.1",
   "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": "0.35.12",
-    "@gscdump/engine-gsc-api": "0.35.12",
-    "gscdump": "0.35.12"
+    "@gscdump/engine": "0.36.1",
+    "@gscdump/engine-gsc-api": "0.36.1",
+    "gscdump": "0.36.1"
   },
   "devDependencies": {
     "vitest": "^4.1.9"