@gscdump/cli 0.16.0 → 0.17.0

package/dist/index.mjs

@@ -17,6 +17,7 @@ import { ofetch } from "ofetch";
 import fs$1 from "node:fs";
 import { Buffer } from "node:buffer";
 import { createConsola } from "consola";
+import { SearchTypes, and, between, contains, country, date, device, eq, gsc, notRegex, page, query, regex, searchAppearance } from "gscdump/query";
 import { createNodeHarness } from "@gscdump/engine/node";
 import { TABLE_DIMS, transformGscRow } from "@gscdump/engine/ingest";
 import { allTables, inferTable } from "@gscdump/engine/schema";
@@ -25,7 +26,6 @@ import { sqlEscape } from "@gscdump/engine/sql";
 import { createEmptyTypesStore, createIndexingMetadataStore, createInspectionStore, createSitemapStore } from "@gscdump/engine/entities";
 import { createGscMcpServer } from "@gscdump/mcp/server";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { SearchTypes, and, between, contains, country, date, device, eq, gsc, notRegex, page, query, regex, searchAppearance } from "gscdump/query";
 import { defaultReportRegistry, dryRunReport, formatReport, runReport } from "@gscdump/analysis/report";
 import { resolveWindow } from "@gscdump/engine/period";
 import { inferLegacyTier } from "@gscdump/engine";
@@ -73,7 +73,9 @@ function loadEnvFromCwd() {
 	}
 	return applied;
 }
-const VERSION = "0.16.0";
+var version = "0.17.0";
+const ALL_SEARCH_TYPES$1 = Object.values(SearchTypes);
+const VERSION = version;
 const baseLogger = createConsola({
 	stdout: process.stderr,
 	stderr: process.stderr
@@ -104,6 +106,15 @@ function applyOutputMode(args) {
 		quiet
 	};
 }
+function parseSearchType(value, flag = "--search-type") {
+	if (!value) return void 0;
+	const v = String(value);
+	if (!ALL_SEARCH_TYPES$1.includes(v)) {
+		logger.error(`Invalid ${flag}: ${v}. Allowed: ${ALL_SEARCH_TYPES$1.join(", ")}`);
+		process.exit(1);
+	}
+	return v;
+}
 let colorEnabled = (() => {
 	if (process.env.NO_COLOR) return false;
 	if (process.argv.includes("--no-color")) return false;
@@ -2247,6 +2258,10 @@ const dumpCommand = defineCommand({
 			default: false,
 			description: "Compact every closed month into a single file before exporting"
 		},
+		"search-type": {
+			type: "string",
+			description: `Restrict dump to a single GSC search-type slice (${ALL_SEARCH_TYPES$1.join(", ")}). Default: all slices.`
+		},
 		...OUTPUT_ARGS
 	},
 	async run({ args }) {
@@ -2257,6 +2272,7 @@ const dumpCommand = defineCommand({
 			process.exit(1);
 		}
 		const tablesFilter = args.tables ? new Set(String(args.tables).split(",").map((t) => t.trim()).filter(Boolean)) : null;
+		const searchType = parseSearchType(args["search-type"]);
 		const ctx = await createCommandContext({
 			needsAuth: !args["all-sites"],
 			needsStore: true
@@ -2271,7 +2287,7 @@ const dumpCommand = defineCommand({
 		if (args.compact) for (const siteUrl of targets) await compactClosedMonths(store, siteUrl, quiet);
 		const summary = [];
 		for (const siteUrl of targets) {
-			const entries = (await listLiveEntries(store, siteUrl)).filter((e) => !tablesFilter || tablesFilter.has(e.table));
+			const entries = (await listLiveEntries(store, siteUrl, searchType)).filter((e) => !tablesFilter || tablesFilter.has(e.table));
 			if (entries.length === 0) {
 				if (!quiet) logger.warn(`No data for ${siteUrl}; skipping`);
 				continue;
@@ -2320,12 +2336,13 @@ async function listSitesWithData(store) {
 	}
 	return Array.from(siteIds);
 }
-async function listLiveEntries(store, siteUrl) {
+async function listLiveEntries(store, siteUrl, searchType) {
 	const siteId = store.siteIdFor(siteUrl);
 	return (await Promise.all(allTables().map((table) => store.engine.listLive({
 		userId: store.userId,
 		siteId,
-		table
+		table,
+		...searchType !== void 0 ? { searchType } : {}
 	})))).flat();
 }
 async function dumpParquet(store, entries, outDir) {
@@ -3514,7 +3531,6 @@ const FILTER_COL = {
 	device,
 	searchAppearance
 };
-const ALL_SEARCH_TYPES$1 = Object.values(SearchTypes);
 const DATA_STATES = [
 	"all",
 	"final",
@@ -3702,7 +3718,8 @@ const queryCommand = defineCommand({
 				site: args.site ? String(args.site) : void 0,
 				table: args.table ? String(args.table) : "pages",
 				output: args.output ? String(args.output) : void 0,
-				quiet: Boolean(args.quiet)
+				quiet: Boolean(args.quiet),
+				searchType: parseSearchType(args.type, "--type")
 			});
 			return;
 		}
@@ -3714,7 +3731,7 @@ const queryCommand = defineCommand({
 		const rowLimit = limitArg != null && limitArg !== "1000" ? Number.parseInt(limitArg, 10) : ctxConfig.defaultLimit ?? 1e3;
 		const format = String(args.format);
 		const dimensionFilter = buildDimensionFilter(args);
-		const searchType = parseSearchType(args.type ?? ctxConfig.defaultSearchType);
+		const searchType = parseSearchType(args.type ?? ctxConfig.defaultSearchType, "--type");
 		const dataState = args["data-state"] ? String(args["data-state"]) : ctxConfig.defaultDataState;
 		const aggregationType = args["aggregation-type"] ? String(args["aggregation-type"]) : void 0;
 		if (dataState && !DATA_STATES.includes(dataState)) {
@@ -3777,10 +3794,6 @@ const queryCommand = defineCommand({
 			});
 			return;
 		}
-		if (searchType && searchType !== "web") {
-			logger.error(`--type=${searchType} requires --live (local store query path is web-only).`);
-			process.exit(1);
-		}
 		if (dataState || aggregationType) logger.warn("--data-state / --aggregation-type are ignored without --live");
 		if (!args.quiet) logger.info(`Querying ${siteUrl} from local Parquet store...`);
 		const state = buildLocalState(dimNames, startDate, endDate, rowLimit, dimensionFilter);
@@ -3798,7 +3811,8 @@ const queryCommand = defineCommand({
 		const result = await store.engine.query({
 			userId: store.userId,
 			siteId: store.siteIdFor(siteUrl),
-			table
+			table,
+			...searchType !== void 0 ? { searchType } : {}
 		}, state).catch((e) => {
 			logger.error(`Query failed: ${e.message}`);
 			process.exit(1);
@@ -3925,15 +3939,6 @@ function buildDimensionFilter(args) {
 	if (leaves.length === 1) return leaves[0];
 	return and(...leaves);
 }
-function parseSearchType(value) {
-	if (!value) return void 0;
-	const v = String(value);
-	if (!ALL_SEARCH_TYPES$1.includes(v)) {
-		logger.error(`Invalid --type: ${v}. Allowed: ${ALL_SEARCH_TYPES$1.join(", ")}`);
-		process.exit(1);
-	}
-	return v;
-}
 async function assertRangeCovered(store, siteUrl, table, startDate, endDate) {
 	const wm = (await store.engine.getWatermarks({
 		userId: store.userId,
@@ -3968,7 +3973,8 @@ async function runRawSqlMode(opts) {
 	const { rows, sql } = await store.runRawSql({
 		sql: opts.sql,
 		siteUrl,
-		table: opts.table
+		table: opts.table,
+		...opts.searchType !== void 0 ? { searchType: opts.searchType } : {}
 	}).catch((e) => {
 		logger.error(`SQL failed: ${e.message}`);
 		process.exit(1);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cli",
   "type": "module",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "CLI for Google Search Console - dump, query, and run MCP server",
   "author": {
     "name": "Harlan Wilton",
@@ -35,22 +35,22 @@
     "dist"
   ],
   "dependencies": {
-    "@clack/prompts": "^1.3.0",
+    "@clack/prompts": "^1.4.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "citty": "^0.2.2",
     "consola": "^3.4.2",
     "google-auth-library": "^10.6.2",
     "ofetch": "^1.5.1",
     "open": "^11.0.0",
-    "@gscdump/analysis": "0.16.0",
-    "@gscdump/engine": "0.16.0",
-    "@gscdump/engine-gsc-api": "0.16.0",
-    "@gscdump/mcp": "0.16.0",
-    "gscdump": "0.16.0"
+    "@gscdump/analysis": "0.17.0",
+    "@gscdump/engine-gsc-api": "0.17.0",
+    "@gscdump/engine": "0.17.0",
+    "gscdump": "0.17.0",
+    "@gscdump/mcp": "0.17.0"
   },
   "devDependencies": {
     "@duckdb/node-api": "1.5.1-r.2",
-    "vitest": "^4.1.5"
+    "vitest": "^4.1.6"
   },
   "scripts": {
     "build": "obuild",