@gscdump/engine-gsc-api 4.8.0 → 5.0.0

package/dist/post-process.mjs

@@ -49,14 +49,25 @@ function compileMetricFilter(filter) {
 		default: return () => true;
 	}
 }
-function compileDimensionFilterTree(filter) {
-	if (!filter || !("_filters" in filter)) return () => true;
-	const localFilters = filter._filters;
+function compileDimensionFilterTree(filter, grouped) {
+	if (!filter || !("_filters" in filter)) return null;
+	const isOr = filter._groupType === "or";
 	const matchers = [];
-	for (const localFilter of localFilters) if (isLocalDimensionFilter(localFilter)) matchers.push(compileDimensionFilter(localFilter));
-	for (const group of filter._nestedGroups ?? []) matchers.push(compileDimensionFilterTree(group));
-	if (matchers.length === 0) return () => true;
-	if (filter._groupType === "or") return (row) => {
+	for (const localFilter of filter._filters) {
+		if (!isLocalDimensionFilter(localFilter)) continue;
+		if (!grouped.has(localFilter.dimension)) {
+			if (isOr) return null;
+			continue;
+		}
+		matchers.push(compileDimensionFilter(localFilter));
+	}
+	for (const group of filter._nestedGroups ?? []) {
+		const matcher = compileDimensionFilterTree(group, grouped);
+		if (matcher) matchers.push(matcher);
+		else if (isOr) return null;
+	}
+	if (matchers.length === 0) return null;
+	if (isOr) return (row) => {
 		for (const matches of matchers) if (matches(row)) return true;
 		return false;
 	};
@@ -110,7 +121,7 @@ function selectTopK(rows, k, compareRows) {
 	return heap.map((entry) => entry.row);
 }
 function applyBuilderStatePostProcessing(rows, state) {
-	const matchesDimensions = compileDimensionFilterTree(state.filter);
+	const matchesDimensions = compileDimensionFilterTree(state.filter, new Set(state.dimensions)) ?? (() => true);
 	const metricMatchers = extractMetricFilters(state.filter).map(compileMetricFilter);
 	const hasTopLevelFilter = extractSpecialOperatorFilters(state.filter).some((filter) => filter.operator === "topLevel");
 	const column = state.orderBy?.column ?? "clicks";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-gsc-api",
   "type": "module",
-  "version": "4.8.0",
+  "version": "5.0.0",
   "description": "GSC live-API engine adapter — wraps the Search Analytics REST API as an AnalysisQuerySource for typed analyzer dispatch.",
   "author": {
     "name": "Harlan Wilton",
@@ -36,8 +36,8 @@
     "node": ">=22.13.0"
   },
   "dependencies": {
-    "@gscdump/engine": "^4.8.0",
-    "gscdump": "^4.8.0"
+    "@gscdump/engine": "^5.0.0",
+    "gscdump": "^5.0.0"
   },
   "devDependencies": {
     "vitest": "^5.0.1"