@gscdump/cli 0.26.10 → 0.27.0

package/dist/index.mjs

@@ -10,7 +10,7 @@ import { err, ok, unwrapResult } from "gscdump/result";
 import { decodeSiteId, normalizeSiteUrl } from "gscdump/tenant";
 import os from "node:os";
 import { cancel, confirm, isCancel, multiselect, select, text } from "@clack/prompts";
-import { addSite, batchInspectUrls, batchRequestIndexing, createAuth, daysAgo, deleteSite, discoverSitemap, fetchSitemap, fetchSitemapUrls, fetchSitesWithSitemaps, formatErrorForCli, getDateRange, getIndexingMetadata, getVerificationToken, getVerifiedSite, googleSearchConsole, listVerifiedSites, progressBar, requestIndexing, runSequentialBatch, siteUrlToVerificationSite, unverifySite, verificationMethodsFor, verifySite } from "gscdump";
+import { addSite, batchInspectUrls, batchRequestIndexing, createAuth, deleteSite, discoverSitemap, fetchSitemap, fetchSitemapUrls, fetchSitesWithSitemaps, formatErrorForCli, getIndexingMetadata, getVerificationToken, getVerifiedSite, googleSearchConsole, listVerifiedSites, requestIndexing, runSequentialBatch, siteUrlToVerificationSite, unverifySite, verificationMethodsFor, verifySite } from "gscdump/api";
 import { createServer } from "node:http";
 import { JWT, OAuth2Client } from "google-auth-library";
 import { ofetch } from "ofetch";
@@ -26,6 +26,7 @@ import { isEngineError } from "@gscdump/engine/errors";
 import { DuckDBInstance } from "@duckdb/node-api";
 import { sqlEscape } from "@gscdump/engine/sql";
 import { createEmptyTypesStore, createIndexingMetadataStore, createInspectionStore, createSitemapStore } from "@gscdump/engine/entities";
+import { daysAgo, getDateRange, progressBar } from "gscdump";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
@@ -49,6 +50,7 @@ var config_exports = /* @__PURE__ */ __exportAll({
 	getConfigDir: () => getConfigDir,
 	getConfigPath: () => getConfigPath,
 	loadConfig: () => loadConfig,
+	loadResolvedConfig: () => loadResolvedConfig,
 	resolveDataDir: () => resolveDataDir,
 	saveConfig: () => saveConfig,
 	setConfigDir: () => setConfigDir
@@ -74,6 +76,13 @@ function expandTilde(p) {
 async function loadConfig() {
 	return fs.readFile(path.join(configDir, "config.json"), "utf-8").then((data) => JSON.parse(data)).catch(() => ({}));
 }
+async function loadResolvedConfig() {
+	const config = await loadConfig();
+	return {
+		config,
+		dataDir: resolveDataDir(config)
+	};
+}
 async function saveConfig(config) {
 	await fs.mkdir(configDir, {
 		recursive: true,
@@ -126,7 +135,7 @@ function loadEnvFromCwd() {
 	}
 	return applied;
 }
-var version = "0.26.10";
+var version = "0.27.0";
 const ALL_SEARCH_TYPES$1 = Object.values(SearchTypes);
 const VERSION = version;
 function noSubcommandSelected(parent, subNames) {
@@ -768,14 +777,14 @@ function createLocalStore(opts) {
 var context_exports = /* @__PURE__ */ __exportAll({ createCommandContext: () => createCommandContext });
 async function createCommandContext(opts = {}) {
 	const { needsAuth = false, needsStore = false, interactive = false, byok, fetchOptions } = opts;
-	const config = await loadConfig();
+	const { config, dataDir } = await loadResolvedConfig();
 	const auth = needsAuth ? await resolveAuth({
 		interactive,
 		config,
 		byok
 	}) : null;
 	const client = auth ? googleSearchConsole(auth, { fetchOptions }) : null;
-	const store = needsStore ? createLocalStore({ dataDir: resolveDataDir(config) }) : null;
+	const store = needsStore ? createLocalStore({ dataDir }) : null;
 	const loadSites = async () => {
 		if (!client) throw new Error("loadSites requires needsAuth: true");
 		return (await client.sites().catch((e) => {
@@ -929,8 +938,7 @@ async function resolveAnalysisSource(args) {
 	const isLive = !!args.live;
 	const format = args.json ? "json" : args.format ? String(args.format) : "table";
 	if (!isLive) {
-		const config = await loadConfig();
-		const dataDir = resolveDataDir(config);
+		const { config, dataDir } = await loadResolvedConfig();
 		const store = createLocalStore({ dataDir });
 		const siteHint = args.site ? String(args.site) : config.defaultSite;
 		const localSites = await listLocalSites(dataDir, store.userId);
@@ -2434,7 +2442,7 @@ async function checkTimeSkew() {
 	}];
 }
 async function checkDataDir() {
-	const dataDir = resolveDataDir(await loadConfig());
+	const { dataDir } = await loadResolvedConfig();
 	const display = displayPath(dataDir);
 	const stat = await fs.stat(dataDir).catch(() => null);
 	if (!stat) return [{
@@ -2459,7 +2467,7 @@ async function checkDataDir() {
 	}];
 }
 async function checkStoreWatermarks() {
-	const dataDir = resolveDataDir(await loadConfig());
+	const { dataDir } = await loadResolvedConfig();
 	if (!(await fs.stat(dataDir).catch(() => null))?.isDirectory()) return [{
 		name: "store.watermarks",
 		status: "pass",
@@ -6857,7 +6865,7 @@ const syncCommand = defineCommand({
 	async run({ args }) {
 		const { json, quiet } = applyOutputMode(args);
 		if (args.status) {
-			await printSyncStatus(await loadConfig(), args.site ? String(args.site) : void 0, json);
+			await printSyncStatus(await loadResolvedConfig(), args.site ? String(args.site) : void 0, json);
 			return;
 		}
 		const ctx = await createCommandContext({
@@ -7069,8 +7077,8 @@ function isKnownTable(name) {
 function isKnownSearchType(name) {
 	return ALL_SEARCH_TYPES.includes(name);
 }
-async function printSyncStatus(config, siteFilter, asJson) {
-	const store = createLocalStore({ dataDir: resolveDataDir(config) });
+async function printSyncStatus(resolved, siteFilter, asJson) {
+	const store = createLocalStore({ dataDir: resolved.dataDir });
 	const siteId = siteFilter ? store.siteIdFor(siteFilter) : void 0;
 	const watermarks = await store.engine.getWatermarks({
 		userId: store.userId,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cli",
   "type": "module",
-  "version": "0.26.10",
+  "version": "0.27.0",
   "description": "CLI for Google Search Console - dump, query, and run MCP server",
   "author": {
     "name": "Harlan Wilton",
@@ -43,10 +43,10 @@
     "ofetch": "^1.5.1",
     "open": "^11.0.0",
     "zod": "^4.4.3",
-    "@gscdump/analysis": "0.26.10",
-    "@gscdump/engine-gsc-api": "0.26.10",
-    "@gscdump/engine": "0.26.10",
-    "gscdump": "0.26.10"
+    "@gscdump/engine": "0.27.0",
+    "@gscdump/engine-gsc-api": "0.27.0",
+    "gscdump": "0.27.0",
+    "@gscdump/analysis": "0.27.0"
   },
   "devDependencies": {
     "@duckdb/node-api": "1.5.1-r.2",