@gscdump/cli 0.9.1 → 0.10.0

package/dist/index.mjs

@@ -7,7 +7,7 @@ import { defineCommand, runMain } from "citty";
 import { defaultAnalyzerRegistry } from "@gscdump/analysis/registry";
 import fs, { readFile, readdir, rm } from "node:fs/promises";
 import path, { join } from "node:path";
-import { AnalyzerCapabilityError, analyzeFromSource, createEngineQuerySource } from "@gscdump/analysis";
+import { AnalyzerCapabilityError, createEngineQuerySource, runAnalyzerFromSource } from "@gscdump/analysis";
 import { createGscApiQuerySource } from "@gscdump/engine-gsc-api";
 import { decodeSiteId, normalizeSiteUrl } from "gscdump/tenant";
 import os from "node:os";
@@ -18,7 +18,7 @@ import { JWT, OAuth2Client } from "google-auth-library";
 import { Buffer } from "node:buffer";
 import fs$1 from "node:fs";
 import { createConsola } from "consola";
-import { createNodeHarness } from "@gscdump/engine-duckdb-node";
+import { createNodeHarness } from "@gscdump/engine/node";
 import { TABLE_DIMS, transformGscRow } from "@gscdump/engine/ingest";
 import { allTables, inferTable } from "@gscdump/engine/schema";
 import { DuckDBInstance } from "@duckdb/node-api";
@@ -30,7 +30,7 @@ import { SearchTypes, and, between, contains, country, date, device, eq, gsc, no
 import { defaultReportRegistry, dryRunReport, formatReport, runReport } from "@gscdump/analysis/report";
 import { resolveWindow } from "@gscdump/engine/period";
 import { inferLegacyTier } from "@gscdump/engine";
-import { DEFAULT_ROLLUPS, rebuildRollups } from "@gscdump/analysis/rollups";
+import { DEFAULT_ROLLUPS, rebuildRollups } from "@gscdump/engine/rollups";
 import { filesystemStats } from "@gscdump/engine/filesystem";
 const ENV_LINE_RE$1 = /^([^=]+)=(.*)$/;
 function parseEnvFile(envPath) {
@@ -74,7 +74,7 @@ function loadEnvFromCwd() {
 	}
 	return applied;
 }
-const VERSION = "0.9.1";
+const VERSION = "0.10.0";
 const baseLogger = createConsola({
 	stdout: process.stderr,
 	stderr: process.stderr
@@ -689,8 +689,24 @@ async function createCommandContext(opts = {}) {
 		resolveSite
 	};
 }
+var LocalStoreUnsupportedError = class extends Error {
+	tool;
+	mode;
+	constructor(tool, mode) {
+		super(`analysis "${tool}" has no implementation for the ${mode} source`);
+		this.name = "LocalStoreUnsupportedError";
+		this.tool = tool;
+		this.mode = mode;
+	}
+};
 async function gscErrorHandler(error) {
 	console.error();
+	if (error instanceof LocalStoreUnsupportedError) {
+		console.error(formatErrorForCli(error));
+		if (error.mode === "local") console.error("Pass --live to run against the GSC API.");
+		console.error();
+		process.exit(1);
+	}
 	console.error(formatErrorForCli(error));
 	if (isAuthError(error)) {
 		console.error();
@@ -699,12 +715,6 @@ async function gscErrorHandler(error) {
 	console.error();
 	process.exit(1);
 }
-var LocalStoreUnsupportedError = class extends Error {
-	constructor(tool) {
-		super(`analysis "${tool}" is not yet implemented against the local Parquet store`);
-		this.name = "LocalStoreUnsupportedError";
-	}
-};
 async function hasLocalData(store, siteUrl) {
 	return (await store.engine.listLive({
 		userId: store.userId,
@@ -722,6 +732,12 @@ function pickLocalSite(siteUrls, hint) {
 	if (exact) return exact;
 	return siteUrls.find((s) => s.includes(hint) || hint.includes(s)) ?? null;
 }
+function makeRunAnalysis(source, mode) {
+	return (params) => runAnalyzerFromSource(source, params, defaultAnalyzerRegistry).catch((e) => {
+		if (e instanceof AnalyzerCapabilityError) throw new LocalStoreUnsupportedError(params.type, mode);
+		throw e;
+	});
+}
 async function resolveAnalysisSource(args) {
 	const isLive = !!args.live;
 	const format = args.json ? "json" : args.format ? String(args.format) : "table";
@@ -748,20 +764,12 @@ async function resolveAnalysisSource(args) {
 				siteId: store.siteIdFor(siteUrl)
 			}
 		});
-		const runAnalysis = (params) => analyzeFromSource(source, params, defaultAnalyzerRegistry).catch((e) => {
-			if (e instanceof AnalyzerCapabilityError) {
-				logger.error(`${new LocalStoreUnsupportedError(params.type).message}. Pass --live to run against the GSC API.`);
-				process.exit(1);
-			}
-			logger.error(`Local analysis failed: ${e.message}`);
-			process.exit(1);
-		});
 		return {
 			source,
 			siteUrl,
 			format,
 			isLive,
-			runAnalysis
+			runAnalysis: makeRunAnalysis(source, "local")
 		};
 	}
 	const ctx = await createCommandContext({
@@ -773,16 +781,12 @@ async function resolveAnalysisSource(args) {
 		client: ctx.client,
 		siteUrl
 	});
-	const runAnalysis = (params) => analyzeFromSource(source, params, defaultAnalyzerRegistry).catch((e) => {
-		if (e instanceof AnalyzerCapabilityError) throw new LocalStoreUnsupportedError(params.type);
-		return gscErrorHandler(e);
-	});
 	return {
 		source,
 		siteUrl,
 		format,
 		isLive,
-		runAnalysis
+		runAnalysis: makeRunAnalysis(source, "live")
 	};
 }
 const ANALYSIS_TOOLS = defaultAnalyzerRegistry.listAnalyzerIds();
@@ -908,7 +912,7 @@ function makeToolCommand(tool) {
 				format: args.format
 			});
 			logger.info(`Running ${tool} analysis...`);
-			const result = await runAnalysis(buildParams(tool, args));
+			const result = await runAnalysis(buildParams(tool, args)).catch(gscErrorHandler);
 			if (format === "json") {
 				console.log(JSON.stringify(result, null, 2));
 				return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cli",
   "type": "module",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "description": "CLI for Google Search Console - dump, query, and run MCP server",
   "author": {
     "name": "Harlan Wilton",
@@ -41,12 +41,11 @@
     "consola": "^3.4.2",
     "google-auth-library": "^10.6.2",
     "open": "^11.0.0",
-    "@gscdump/engine": "0.9.1",
-    "@gscdump/engine-duckdb-node": "0.9.1",
-    "@gscdump/engine-gsc-api": "0.9.1",
-    "@gscdump/mcp": "0.9.1",
-    "gscdump": "0.9.1",
-    "@gscdump/analysis": "0.9.1"
+    "@gscdump/analysis": "0.10.0",
+    "@gscdump/engine": "0.10.0",
+    "@gscdump/mcp": "0.10.0",
+    "gscdump": "0.10.0",
+    "@gscdump/engine-gsc-api": "0.10.0"
   },
   "devDependencies": {
     "@duckdb/node-api": "1.5.1-r.2",