gscdump 0.40.2 → 1.0.1

package/dist/query/index.mjs

@@ -1626,6 +1626,12 @@ const queryErrors = {
 			message: "Invalid state"
 		};
 	},
+	malformedFilterLeaf() {
+		return {
+			kind: "invalid-filter",
+			message: "Malformed filter: each filter leaf requires a string `dimension` and `operator`"
+		};
+	},
 	unsupportedCapability(capability, context) {
 		return {
 			kind: "unsupported-capability",
@@ -1652,15 +1658,13 @@ const QUERY_ERROR_KINDS = /* @__PURE__ */ new Set([
 	"invalid-data-state",
 	"invalid-aggregation-type",
 	"invalid-builder-state",
+	"invalid-filter",
 	"unsupported-capability",
 	"unresolvable-dataset"
 ]);
 function isQueryError(value) {
 	return typeof value === "object" && value !== null && QUERY_ERROR_KINDS.has(value.kind) && typeof value.message === "string";
 }
-function formatQueryError(error) {
-	return error.message;
-}
 var UnsupportedLogicalCapabilityError = class extends Error {
 	queryError;
 	constructor(capability, context) {
@@ -1732,22 +1736,6 @@ function isRegexOperator(op) {
 	return op === "includingRegex" || op === "excludingRegex";
 }
 const KNOWN_SEARCH_TYPES = new Set(Object.values(SearchTypes));
-function isJsonFilter(value) {
-	return typeof value === "object" && value !== null && "_filters" in value && Array.isArray(value._filters);
-}
-function parseJsonFilter(json) {
-	return {
-		_constraints: {},
-		_filters: json._filters.map((f) => ({
-			dimension: f.dimension,
-			operator: f.operator,
-			expression: f.expression,
-			expression2: f.expression2
-		})),
-		_nestedGroups: json._nestedGroups?.map(parseJsonFilter),
-		_groupType: json._groupType
-	};
-}
 function isWireGroupType(type) {
 	return type === "and" || type === "or";
 }
@@ -1793,14 +1781,37 @@ function normalizeFilter(input) {
 	if (isWireFilter(input)) return convertWireGroup(input) ?? void 0;
 	if (typeof input === "object" && Array.isArray(input._filters)) return input;
 }
+function normalizeOrderBy(orderBy) {
+	const spec = Array.isArray(orderBy) ? orderBy[0] : orderBy;
+	if (!spec || typeof spec !== "object") return void 0;
+	const o = spec;
+	if (typeof o.column !== "string" || o.column.length === 0) return void 0;
+	const dir = typeof o.dir === "string" ? o.dir.toLowerCase() === "asc" ? "asc" : "desc" : o.desc === false ? "asc" : "desc";
+	return {
+		column: o.column,
+		dir
+	};
+}
+function hasMalformedFilterLeaf(filter) {
+	if (!filter || typeof filter !== "object") return false;
+	if (Array.isArray(filter._filters)) {
+		for (const leaf of filter._filters) if (!leaf || typeof leaf !== "object" || typeof leaf.operator !== "string" || typeof leaf.dimension !== "string") return true;
+	}
+	if (Array.isArray(filter._nestedGroups)) {
+		for (const group of filter._nestedGroups) if (hasMalformedFilterLeaf(group)) return true;
+	}
+	return false;
+}
 function normalizeBuilderStateResult(state) {
 	if (!state || typeof state !== "object") return err(queryErrors.invalidBuilderState(state));
 	const s = state;
+	const filter = normalizeFilter(s.filter);
+	if (hasMalformedFilterLeaf(filter)) return err(queryErrors.malformedFilterLeaf());
 	const normalized = {
 		dimensions: Array.isArray(s.dimensions) ? s.dimensions : [],
 		metrics: s.metrics,
-		filter: normalizeFilter(s.filter),
-		orderBy: s.orderBy,
+		filter,
+		orderBy: normalizeOrderBy(s.orderBy),
 		rowLimit: s.rowLimit,
 		startRow: s.startRow,
 		dataState: s.dataState,
@@ -2359,4 +2370,4 @@ function today() {
 function daysAgo(n) {
 	return daysAgoPst(n);
 }
-export { Countries, Devices, SearchTypes, UnresolvableDatasetError, UnsupportedLogicalCapabilityError, and, between, buildLogicalComparisonPlan, buildLogicalComparisonPlanResult, buildLogicalPlan, buildLogicalPlanResult, clicks, contains, country, ctr, currentPstDate, date, daysAgo, device, eq, extractDateRange, extractMetricFilters, extractSearchType, extractSpecialOperatorFilters, formatQueryError, gsc, gt, gte, hour, impressions, inArray, isJsonFilter, isQueryError, like, lt, lte, ne, normalizeBuilderState, normalizeBuilderStateResult, normalizeFilter, not, notRegex, or, page, parseJsonFilter, position, query, queryCanonical, queryErrorToException, queryErrors, regex, resolveToBody, resolveToBodyResult, searchAppearance, searchType, today, topLevel };
+export { Countries, Devices, SearchTypes, UnresolvableDatasetError, UnsupportedLogicalCapabilityError, and, between, buildLogicalComparisonPlan, buildLogicalComparisonPlanResult, buildLogicalPlan, buildLogicalPlanResult, clicks, contains, country, ctr, currentPstDate, date, daysAgo, device, eq, extractDateRange, extractMetricFilters, extractSearchType, extractSpecialOperatorFilters, gsc, gt, gte, hour, impressions, inArray, isQueryError, like, lt, lte, ne, normalizeBuilderState, normalizeBuilderStateResult, normalizeFilter, not, notRegex, or, page, position, query, queryCanonical, queryErrorToException, queryErrors, regex, resolveToBody, resolveToBodyResult, searchAppearance, searchType, today, topLevel };

package/dist/query/plan.d.mts

@@ -85,7 +85,7 @@ interface BuilderState {
   /** GSC search corpus. Wins over any `searchType` filter when both are set. */
   searchType?: SearchType;
 }
-type QueryErrorKind = 'missing-date-range' | 'invalid-row-limit' | 'invalid-start-row' | 'invalid-data-state' | 'invalid-aggregation-type' | 'invalid-builder-state' | 'unsupported-capability' | 'unresolvable-dataset';
+type QueryErrorKind = 'missing-date-range' | 'invalid-row-limit' | 'invalid-start-row' | 'invalid-data-state' | 'invalid-aggregation-type' | 'invalid-builder-state' | 'invalid-filter' | 'unsupported-capability' | 'unresolvable-dataset';
 type QueryError = {
   kind: 'missing-date-range';
   message: string;
@@ -107,6 +107,9 @@ type QueryError = {
   kind: 'invalid-builder-state';
   message: string;
   cause?: unknown;
+} | {
+  kind: 'invalid-filter';
+  message: string;
 } | {
   kind: 'unsupported-capability';
   capability: string;

package/dist/query/plan.mjs

@@ -85,6 +85,12 @@ const queryErrors = {
 			message: "Invalid state"
 		};
 	},
+	malformedFilterLeaf() {
+		return {
+			kind: "invalid-filter",
+			message: "Malformed filter: each filter leaf requires a string `dimension` and `operator`"
+		};
+	},
 	unsupportedCapability(capability, context) {
 		return {
 			kind: "unsupported-capability",

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "gscdump",
   "type": "module",
-  "version": "0.40.2",
-  "description": "Google Search Console API wrapper with typed query builder, streaming pagination, and SEO analysis functions",
+  "version": "1.0.1",
+  "description": "Direct Google Search Console client with typed queries, streaming pagination, URL inspection, and indexing helpers",
   "author": {
     "name": "Harlan Wilton",
     "email": "harlan@harlanzw.com",
@@ -37,11 +37,6 @@
       "import": "./dist/index.mjs",
       "default": "./dist/index.mjs"
     },
-    "./api": {
-      "types": "./dist/api/index.d.mts",
-      "import": "./dist/api/index.mjs",
-      "default": "./dist/api/index.mjs"
-    },
     "./query": {
       "types": "./dist/query/index.d.mts",
       "import": "./dist/query/index.mjs",
@@ -84,28 +79,12 @@
     "dist"
   ],
   "engines": {
-    "node": ">=18"
-  },
-  "peerDependencies": {
-    "@googleapis/indexing": "^6.0.1",
-    "@googleapis/searchconsole": "^6.0.1"
-  },
-  "peerDependenciesMeta": {
-    "@googleapis/indexing": {
-      "optional": true
-    },
-    "@googleapis/searchconsole": {
-      "optional": true
-    }
+    "node": ">=22"
   },
   "dependencies": {
     "date-fns": "^4.4.0",
     "ofetch": "^1.5.1",
-    "@gscdump/contracts": "0.40.2"
-  },
-  "devDependencies": {
-    "@googleapis/indexing": "^6.0.1",
-    "@googleapis/searchconsole": "^6.0.1"
+    "@gscdump/contracts": "^1.0.1"
   },
   "scripts": {
     "dev": "obuild --stub",