@gscdump/cli 0.28.3 → 0.30.0

package/dist/index.mjs

@@ -20,11 +20,12 @@ import { createConsola } from "consola";
 import { SearchTypes, and, between, contains, country, date, device, eq, gsc, hour, isQueryError, 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";
+import { allTables, dateColumnsFor, inferTable } from "@gscdump/engine/schema";
 import { isAnalysisError } from "@gscdump/analysis/errors";
 import { isEngineError } from "@gscdump/engine/errors";
 import { DuckDBInstance } from "@duckdb/node-api";
 import { sqlEscape } from "@gscdump/engine/sql";
+import { dateReplaceClause } from "@gscdump/engine/sql-fragments";
 import { createEmptyTypesStore, createIndexingMetadataStore, createInspectionStore, createSitemapStore } from "@gscdump/engine/entities";
 import { daysAgo, getDateRange, progressBar } from "gscdump";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
@@ -33,7 +34,7 @@ import { z } from "zod";
 import { defaultReportRegistry, dryRunReport, formatReport, runReport } from "@gscdump/analysis/report";
 import { resolveWindow } from "@gscdump/engine/period";
 import { collectSpans, inferLegacyTier } from "@gscdump/engine";
-import { DEFAULT_ROLLUPS, rebuildRollups } from "@gscdump/engine/rollups";
+import { CANONICAL_ROLLUPS, DEFAULT_ROLLUPS, rebuildRollups } from "@gscdump/engine/rollups";
 import { filesystemStats } from "@gscdump/engine/filesystem";
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -135,7 +136,7 @@ function loadEnvFromCwd() {
 	}
 	return applied;
 }
-var version = "0.28.3";
+var version = "0.30.0";
 const ALL_SEARCH_TYPES$1 = Object.values(SearchTypes);
 const VERSION = version;
 function noSubcommandSelected(parent, subNames) {
@@ -2061,7 +2062,7 @@ const VALID_KEYS = [
 	"defaultDataState",
 	"serviceAccountPath"
 ];
-const NUMERIC_KEYS = new Set(["defaultLimit"]);
+const NUMERIC_KEYS = /* @__PURE__ */ new Set(["defaultLimit"]);
 const configCommand = defineCommand({
 	meta: {
 		name: "config",
@@ -2785,7 +2786,7 @@ async function dumpRowFormat(store, entries, outDir, siteUrl, format) {
 	let files = 0;
 	let totalRows = 0;
 	for (const [table, tableEntries] of byTable) {
-		const rows = await readTableRows(tableEntries.map((e) => path.join(store.dataDir, e.objectKey)));
+		const rows = await readTableRows(tableEntries.map((e) => path.join(store.dataDir, e.objectKey)), table);
 		const ext = format === "csv" ? "csv" : format === "ndjson" ? "ndjson" : "json";
 		const target = path.join(siteDir, `${table}.${ext}`);
 		let body;
@@ -2801,12 +2802,13 @@ async function dumpRowFormat(store, entries, outDir, siteUrl, format) {
 		rows: totalRows
 	};
 }
-async function readTableRows(filePaths) {
+async function readTableRows(filePaths, table) {
 	const instance = await DuckDBInstance.create(":memory:");
 	const conn = await instance.connect();
 	try {
 		const fileList = filePaths.map((p) => `'${sqlEscape(p)}'`).join(", ");
-		return (await conn.runAndReadAll(`SELECT * FROM read_parquet([${fileList}], union_by_name=true)`)).getRowObjects();
+		const replace = dateReplaceClause(dateColumnsFor(table), "string");
+		return (await conn.runAndReadAll(`SELECT * ${replace} FROM read_parquet([${fileList}], union_by_name=true)`)).getRowObjects();
 	} finally {
 		conn.closeSync();
 		instance.closeSync();
@@ -6204,7 +6206,8 @@ async function exportToDuckDB(opts) {
 			});
 			if (entries.length === 0) continue;
 			const fileList = entries.map((e) => path.join(opts.dataDir, e.objectKey)).map((p) => `'${sqlEscape(p)}'`).join(", ");
-			await conn.run(`CREATE OR REPLACE TABLE ${table} AS SELECT * FROM read_parquet([${fileList}], union_by_name=true)`);
+			const replace = dateReplaceClause(dateColumnsFor(table), "date");
+			await conn.run(`CREATE OR REPLACE TABLE ${table} AS SELECT * ${replace} FROM read_parquet([${fileList}], union_by_name=true)`);
 			const rows = (await conn.runAndReadAll(`SELECT count(*)::BIGINT AS n FROM ${table}`)).getRowObjects();
 			const rowCount = Number(rows[0]?.n ?? 0);
 			tables.push({
@@ -6356,14 +6359,20 @@ const rollupsCommand = defineCommand({
 		},
 		args: {
 			...OUTPUT_ARGS,
-			site: {
+			"site": {
 				type: "string",
 				alias: "s",
 				description: "Restrict to a single site (default: all sites with local data)"
+			},
+			"with-canonical": {
+				type: "boolean",
+				description: "Also build the opt-in canonical-primary rollups (query_canonical_variants, query_canonical_daily)",
+				default: false
 			}
 		},
 		async run({ args }) {
 			const { json } = applyOutputMode(args);
+			const defs = args["with-canonical"] ? [...DEFAULT_ROLLUPS, ...CANONICAL_ROLLUPS] : DEFAULT_ROLLUPS;
 			const store = (await createCommandContext({ needsStore: true })).store;
 			const explicitSiteId = args.site ? store.siteIdFor(String(args.site)) : void 0;
 			const allSiteIds = /* @__PURE__ */ new Set();
@@ -6386,7 +6395,7 @@ const rollupsCommand = defineCommand({
 			const summary = [];
 			let totalBytes = 0;
 			for (const siteId of allSiteIds) {
-				logger.info(`Rebuilding rollups for [${siteId}] (${DEFAULT_ROLLUPS.length} rollups)`);
+				logger.info(`Rebuilding rollups for [${siteId}] (${defs.length} rollups)`);
 				const results = await rebuildRollups({
 					engine: {
 						runSQL: (opts) => store.engine.runSQL(opts),
@@ -6407,7 +6416,7 @@ const rollupsCommand = defineCommand({
 						userId: store.userId,
 						siteId
 					},
-					defs: DEFAULT_ROLLUPS
+					defs
 				});
 				const site = {
 					siteId,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cli",
   "type": "module",
-  "version": "0.28.3",
+  "version": "0.30.0",
   "description": "CLI for Google Search Console - dump, query, and run MCP server",
   "author": {
     "name": "Harlan Wilton",
@@ -35,7 +35,7 @@
     "dist"
   ],
   "dependencies": {
-    "@clack/prompts": "^1.5.1",
+    "@clack/prompts": "^1.6.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "citty": "^0.2.2",
     "consola": "^3.4.2",
@@ -43,10 +43,10 @@
     "ofetch": "^1.5.1",
     "open": "^11.0.0",
     "zod": "^4.4.3",
-    "@gscdump/analysis": "0.28.3",
-    "@gscdump/engine": "0.28.3",
-    "@gscdump/engine-gsc-api": "0.28.3",
-    "gscdump": "0.28.3"
+    "@gscdump/engine": "0.30.0",
+    "gscdump": "0.30.0",
+    "@gscdump/engine-gsc-api": "0.30.0",
+    "@gscdump/analysis": "0.30.0"
   },
   "devDependencies": {
     "@duckdb/node-api": "1.5.1-r.2",