@gscdump/sdk 0.19.7 → 0.20.0

package/dist/index.mjs

@@ -46,6 +46,7 @@ function toPartnerError(error) {
 }
 const TRAILING_SLASH_RE$2 = /\/+$/;
 const LEADING_SLASH_RE$1 = /^\/+/;
+const DEFAULT_SEARCH_TYPE$1 = "web";
 function trimApiBase$1(apiBase) {
 	return (apiBase ?? "").replace(TRAILING_SLASH_RE$2, "");
 }
@@ -67,9 +68,42 @@ function shouldValidate$1(options, phase) {
 function parseWith$1(schema, value) {
 	return schema ? schema.parse(value) : value;
 }
-function tablesQuery$1(tables) {
-	if (!tables) return void 0;
-	return { tables: Array.isArray(tables) ? tables.join(",") : tables };
+function isAnalysisSourcesOptions$1(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function searchTypeQuery(searchType) {
+	return { searchType: searchType ?? DEFAULT_SEARCH_TYPE$1 };
+}
+function dateRangeOptionsQuery(options) {
+	const query = {};
+	const start = options?.start ?? options?.startDate;
+	const end = options?.end ?? options?.endDate;
+	if (start) query.start = start;
+	if (end) query.end = end;
+	return query;
+}
+function sourceInfoQuery(options) {
+	return {
+		...searchTypeQuery(options?.searchType),
+		...dateRangeOptionsQuery(options)
+	};
+}
+function tablesQuery$1(tablesOrOptions, options) {
+	const tables = isAnalysisSourcesOptions$1(tablesOrOptions) ? tablesOrOptions.tables : tablesOrOptions;
+	const source = isAnalysisSourcesOptions$1(tablesOrOptions) ? tablesOrOptions : options;
+	const query = {
+		...searchTypeQuery(source?.searchType),
+		...dateRangeOptionsQuery(source)
+	};
+	if (tables) query.tables = Array.isArray(tables) ? tables.join(",") : tables;
+	return query;
+}
+function withDefaultSearchType$1(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return value;
+	return {
+		...value,
+		searchType: value.searchType ?? DEFAULT_SEARCH_TYPE$1
+	};
 }
 function indexingUrlsQuery$1(params = {}) {
 	const query = {};
@@ -102,22 +136,22 @@ function createAnalyticsClient(options = {}) {
 		listSites() {
 			return request(analyticsRoutes.sites, {}, partnerEndpointSchemas.analyticsSites.response);
 		},
-		getSourceInfo(siteId) {
-			return request(analyticsRoutes.site.sourceInfo(siteId), {}, partnerEndpointSchemas.analyticsSourceInfo.response);
+		getSourceInfo(siteId, options) {
+			return request(analyticsRoutes.site.sourceInfo(siteId), { query: sourceInfoQuery(options) }, partnerEndpointSchemas.analyticsSourceInfo.response);
 		},
-		getAnalysisSources(siteId, tables) {
-			return request(analyticsRoutes.site.analysisSources(siteId), { query: tablesQuery$1(tables) }, partnerEndpointSchemas.analyticsAnalysisSources.response);
+		getAnalysisSources(siteId, tables, options) {
+			return request(analyticsRoutes.site.analysisSources(siteId), { query: tablesQuery$1(tables, options) }, partnerEndpointSchemas.analyticsAnalysisSources.response);
 		},
 		analyze(siteId, params) {
 			return request(analyticsRoutes.site.analyze(siteId), {
 				method: "POST",
-				body: params
+				body: withDefaultSearchType$1(params)
 			});
 		},
 		queryRows(siteId, state) {
 			return request(analyticsRoutes.site.rows(siteId), {
 				method: "POST",
-				body: state
+				body: withDefaultSearchType$1(state)
 			}, partnerEndpointSchemas.analyticsRows.response);
 		},
 		getRollup(siteId, rollupId, params) {
@@ -251,6 +285,7 @@ function findLifecycleSite(lifecycle, siteIdOrPropertyUrl) {
 }
 const TRAILING_SLASH_RE$1 = /\/+$/;
 const LEADING_SLASH_RE = /^\/+/;
+const DEFAULT_SEARCH_TYPE = "web";
 function trimApiBase(apiBase) {
 	return (apiBase ?? "/api").replace(TRAILING_SLASH_RE$1, "");
 }
@@ -268,15 +303,32 @@ async function resolveHeaders(options) {
 	if (!options.apiKey) return resolved;
 	return mergeHeaders(resolved, { "x-api-key": options.apiKey });
 }
+function withDefaultSearchType(state, searchType) {
+	const scoped = state;
+	return {
+		...state,
+		searchType: searchType ?? scoped.searchType ?? DEFAULT_SEARCH_TYPE
+	};
+}
 function dataQuery(state, options) {
-	const query = { q: JSON.stringify(state) };
-	if (options?.comparison) query.qc = JSON.stringify(options.comparison);
-	if (options?.filter) query.filter = options.filter;
+	const opts = options;
+	const scoped = withDefaultSearchType(state, opts?.searchType);
+	const query = {
+		q: JSON.stringify(scoped),
+		searchType: scoped.searchType ?? DEFAULT_SEARCH_TYPE
+	};
+	if (opts?.comparison) query.qc = JSON.stringify(withDefaultSearchType(opts.comparison, scoped.searchType));
+	if (opts?.filter) query.filter = opts.filter;
 	return query;
 }
 function dataDetailQuery(state, options) {
-	const query = { q: JSON.stringify(state) };
-	if (options?.comparison) query.qc = JSON.stringify(options.comparison);
+	const opts = options;
+	const scoped = withDefaultSearchType(state, opts?.searchType);
+	const query = {
+		q: JSON.stringify(scoped),
+		searchType: scoped.searchType ?? DEFAULT_SEARCH_TYPE
+	};
+	if (opts?.comparison) query.qc = JSON.stringify(withDefaultSearchType(opts.comparison, scoped.searchType));
 	return query;
 }
 function assertAnalysisParams(params) {
@@ -298,6 +350,7 @@ function analysisQuery(params) {
 	if (params.minPosition != null) query.minPosition = params.minPosition;
 	if (params.maxPosition != null) query.maxPosition = params.maxPosition;
 	if (params.maxCtr != null) query.maxCtr = params.maxCtr;
+	query.searchType = params.searchType ?? DEFAULT_SEARCH_TYPE;
 	return query;
 }
 function indexingUrlsQuery(params = {}) {
@@ -309,9 +362,19 @@ function indexingUrlsQuery(params = {}) {
 	if (params.search) query.search = params.search;
 	return query;
 }
-function tablesQuery(tables) {
-	if (!tables) return void 0;
-	return { tables: Array.isArray(tables) ? tables.join(",") : tables };
+function isAnalysisSourcesOptions(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function tablesQuery(tablesOrOptions, options) {
+	const tables = isAnalysisSourcesOptions(tablesOrOptions) ? tablesOrOptions.tables : tablesOrOptions;
+	const source = isAnalysisSourcesOptions(tablesOrOptions) ? tablesOrOptions : options;
+	const query = { searchType: source?.searchType ?? DEFAULT_SEARCH_TYPE };
+	const start = source?.start ?? source?.startDate;
+	const end = source?.end ?? source?.endDate;
+	if (start) query.start = start;
+	if (end) query.end = end;
+	if (tables) query.tables = Array.isArray(tables) ? tables.join(",") : tables;
+	return query;
 }
 function dateRangeQuery(params) {
 	return {
@@ -441,8 +504,8 @@ function createPartnerClient(options = {}) {
 		deleteSite(siteId) {
 			return request(partnerRoutes.sites.byId(siteId), { method: "DELETE" });
 		},
-		getAnalysisSources(siteId, tables) {
-			return request(partnerRoutes.sites.analysisSources(siteId), { query: tablesQuery(tables) }, partnerEndpointSchemas.getAnalysisSources.response);
+		getAnalysisSources(siteId, tables, options) {
+			return request(partnerRoutes.sites.analysisSources(siteId), { query: tablesQuery(tables, options) }, partnerEndpointSchemas.getAnalysisSources.response);
 		},
 		async getSiteSyncStatus(siteId, userId) {
 			if (!userId) return request(partnerRoutes.sites.syncStatus(siteId));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/sdk",
   "type": "module",
-  "version": "0.19.7",
+  "version": "0.20.0",
   "description": "Consumer SDK for hosted gscdump.com integrations.",
   "author": {
     "name": "Harlan Wilton",
@@ -41,7 +41,7 @@
     "node": ">=18"
   },
   "peerDependencies": {
-    "gscdump": "0.19.7"
+    "gscdump": "0.20.0"
   },
   "peerDependenciesMeta": {
     "gscdump": {
@@ -51,7 +51,7 @@
   "dependencies": {
     "ofetch": "^1.5.1",
     "zod": "^4.4.3",
-    "@gscdump/contracts": "0.19.7"
+    "@gscdump/contracts": "0.20.0"
   },
   "devDependencies": {
     "typescript": "^6.0.3",