gscdump 0.3.0 → 0.4.0

package/dist/query/index.d.mts

@@ -101,6 +101,18 @@ interface BuilderState {
   rowLimit?: number;
   startRow?: number;
 }
+interface JsonInternalFilter {
+  dimension: string;
+  operator: string;
+  expression: string;
+  expression2?: string;
+}
+interface JsonFilter {
+  _filters: JsonInternalFilter[];
+  _nestedGroups?: JsonFilter[];
+  _groupType?: 'and' | 'or';
+}
+type FilterInput = Filter<any> | JsonFilter;
 //#endregion
 //#region src/query/builder.d.ts
 type SelectableColumn = Column<Dimension> | MetricColumn<Metric>;
@@ -159,12 +171,14 @@ declare function between<D extends Dimension>(column: Column<D>, start: Dimensio
 declare function topLevel(column: Column<'page'>): Filter<object>;
 //#endregion
 //#region src/query/resolver.d.ts
-declare function extractDateRange(filter?: Filter<any>): {
+declare function isJsonFilter(value: unknown): value is JsonFilter;
+declare function parseJsonFilter(json: JsonFilter): Filter<any>;
+declare function extractDateRange(input?: FilterInput): {
   startDate?: string;
   endDate?: string;
 };
-declare function extractMetricFilters(filter?: Filter<any>): InternalFilter[];
-declare function extractSpecialOperatorFilters(filter?: Filter<any>): InternalFilter[];
+declare function extractMetricFilters(input?: FilterInput): InternalFilter[];
+declare function extractSpecialOperatorFilters(input?: FilterInput): InternalFilter[];
 //#endregion
 //#region src/query/utils/dayjs.d.ts
 declare function dayjs(date?: _dayjs.ConfigType): Dayjs;
@@ -175,4 +189,4 @@ declare function dayjsPst(): Dayjs;
 declare function today(): string;
 declare function daysAgo(n: number): string;
 //#endregion
-export { type BuilderState, type Column, Countries, type Country, type Device, Devices, type Dimension, type DimensionValueMap, type Filter, type GSCQueryBuilder, type GSCResult, type GSCRow, type InternalFilter, type Metric, type MetricColumn, type QueryParam, type QueryParamName, type QueryParamValueMap, type SearchType, SearchTypes, and, between, clicks, contains, country, ctr, currentPstDate, date, dayjs, dayjsPst, daysAgo, device, eq, extractDateRange, extractMetricFilters, extractSpecialOperatorFilters, gsc, gt, gte, impressions, inArray, like, lt, lte, ne, not, notRegex, or, page, position, query, queryCanonical, regex, searchAppearance, searchType, today, topLevel };
+export { type BuilderState, type Column, Countries, type Country, type Device, Devices, type Dimension, type DimensionValueMap, type Filter, type FilterInput, type GSCQueryBuilder, type GSCResult, type GSCRow, type InternalFilter, type JsonFilter, type JsonInternalFilter, type Metric, type MetricColumn, type QueryParam, type QueryParamName, type QueryParamValueMap, type SearchType, SearchTypes, and, between, clicks, contains, country, ctr, currentPstDate, date, dayjs, dayjsPst, daysAgo, device, eq, extractDateRange, extractMetricFilters, extractSpecialOperatorFilters, gsc, gt, gte, impressions, inArray, isJsonFilter, like, lt, lte, ne, not, notRegex, or, page, parseJsonFilter, position, query, queryCanonical, regex, searchAppearance, searchType, today, topLevel };

package/dist/query/index.mjs

@@ -33,6 +33,26 @@ const METRIC_OPERATORS = [
 ];
 const SPECIAL_OPERATORS = ["topLevel"];
 const QUERY_PARAMS = ["searchType"];
+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 normalizeFilter(input) {
+	if (!input) return void 0;
+	return input;
+}
 function isMetricOperator(op) {
 	return METRIC_OPERATORS.includes(op);
 }
@@ -98,20 +118,22 @@ function extractSpecialFilters(filter) {
 		dimensionFilter
 	};
 }
-function extractDateRange(filter) {
-	const { startDate, endDate } = extractSpecialFilters(filter);
+function extractDateRange(input) {
+	const { startDate, endDate } = extractSpecialFilters(normalizeFilter(input));
 	return {
 		startDate,
 		endDate
 	};
 }
-function extractMetricFilters(filter) {
+function extractMetricFilters(input) {
+	const filter = normalizeFilter(input);
 	if (!filter) return [];
 	const metricFilters = filter._filters.filter((f) => isMetricOperator(f.operator));
 	const nested = filter._nestedGroups?.flatMap((g) => extractMetricFilters(g)) ?? [];
 	return [...metricFilters, ...nested];
 }
-function extractSpecialOperatorFilters(filter) {
+function extractSpecialOperatorFilters(input) {
+	const filter = normalizeFilter(input);
 	if (!filter) return [];
 	const special = filter._filters.filter((f) => isSpecialOperator(f.operator));
 	const nested = filter._nestedGroups?.flatMap((g) => extractSpecialOperatorFilters(g)) ?? [];
@@ -1993,4 +2015,4 @@ function daysAgo(n) {
 }
 
 //#endregion
-export { Countries, Devices, SearchTypes, and, between, clicks, contains, country, ctr, currentPstDate, date, dayjs, dayjsPst, daysAgo, device, eq, extractDateRange, extractMetricFilters, extractSpecialOperatorFilters, gsc, gt, gte, impressions, inArray, like, lt, lte, ne, not, notRegex, or, page, position, query, queryCanonical, regex, searchAppearance, searchType, today, topLevel };
+export { Countries, Devices, SearchTypes, and, between, clicks, contains, country, ctr, currentPstDate, date, dayjs, dayjsPst, daysAgo, device, eq, extractDateRange, extractMetricFilters, extractSpecialOperatorFilters, gsc, gt, gte, impressions, inArray, isJsonFilter, like, lt, lte, ne, not, notRegex, or, page, parseJsonFilter, position, query, queryCanonical, regex, searchAppearance, searchType, today, topLevel };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gscdump",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Google Search Console API wrapper with typed query builder, streaming pagination, and SEO analysis functions",
   "author": {
     "name": "Harlan Wilton",