@gscdump/cli 2.1.0 → 2.2.0

package/dist/commands/report.mjs

@@ -165,12 +165,13 @@ function makeReportCommand(report) {
 			};
 			const params = buildReportParams(report, args);
 			if (args.explain || args["dry-run"]) {
-				const dry = await dryRunReport(report, {
+				const ctx = {
 					site: args.site ? String(args.site) : "(unresolved)",
 					window,
 					params,
 					registryVersion: defaultReportRegistry.version
-				});
+				};
+				const dry = await dryRunReport(report, ctx);
 				console.log(JSON.stringify({
 					id: report.id,
 					window,
@@ -184,15 +185,16 @@ function makeReportCommand(report) {
 				live: !!args.live,
 				json: !!args.json
 			});
+			const ctx = {
+				site: siteUrl,
+				window,
+				params,
+				registryVersion: defaultReportRegistry.version
+			};
 			const result = await runReport(report, {
 				source,
 				analyzers: defaultAnalyzerRegistry,
-				ctx: {
-					site: siteUrl,
-					window,
-					params,
-					registryVersion: defaultReportRegistry.version
-				}
+				ctx
 			});
 			if (args.json) {
 				console.log(JSON.stringify(result, null, 2));
@@ -207,36 +209,37 @@ function presetToFlag(preset) {
 	if (preset === "mtd" || preset === "ytd" || preset === "custom") return preset;
 	return preset.replace(/^last-/, "");
 }
+const listCommand = defineCommand({
+	meta: {
+		name: "list",
+		description: "List available report ids"
+	},
+	args: { json: {
+		type: "boolean",
+		default: false,
+		description: "Output as JSON"
+	} },
+	async run({ args }) {
+		const reports = defaultReportRegistry.listReports().map((r) => ({
+			id: r.id,
+			description: r.description,
+			defaultPeriod: r.defaultPeriod,
+			defaultComparison: r.defaultComparison
+		}));
+		if (args.json) {
+			console.log(JSON.stringify(reports, null, 2));
+			return;
+		}
+		for (const r of reports) console.log(`${r.id.padEnd(16)} ${r.description}`);
+	}
+});
 const reportCommand = defineCommand({
 	meta: {
 		name: "report",
 		description: "Run an intent-keyed report (composes analyzers into bounded sections)"
 	},
 	subCommands: {
-		list: defineCommand({
-			meta: {
-				name: "list",
-				description: "List available report ids"
-			},
-			args: { json: {
-				type: "boolean",
-				default: false,
-				description: "Output as JSON"
-			} },
-			async run({ args }) {
-				const reports = defaultReportRegistry.listReports().map((r) => ({
-					id: r.id,
-					description: r.description,
-					defaultPeriod: r.defaultPeriod,
-					defaultComparison: r.defaultComparison
-				}));
-				if (args.json) {
-					console.log(JSON.stringify(reports, null, 2));
-					return;
-				}
-				for (const r of reports) console.log(`${r.id.padEnd(16)} ${r.description}`);
-			}
-		}),
+		list: listCommand,
 		...Object.fromEntries(REPORT_IDS.map((id) => [id, makeReportCommand(defaultReportRegistry.getReport(id))]))
 	}
 });

package/dist/commands/rollups.mjs

@@ -33,102 +33,103 @@ async function buildSiteQueryDim(store, siteId) {
 	await createQueryDimStore({ dataSource: store.dataSource }).write(ctx, records, Date.now());
 	return records.length;
 }
-const rollupsCommand = defineCommand({
+const rebuildSubCommand = defineCommand({
 	meta: {
-		name: "rollups",
-		description: "Manage post-sync rollups"
+		name: "rebuild",
+		description: "Rebuild post-sync rollups (daily totals, weekly totals, top-N tables) for a site"
 	},
-	subCommands: { rebuild: defineCommand({
-		meta: {
-			name: "rebuild",
-			description: "Rebuild post-sync rollups (daily totals, weekly totals, top-N tables) for a site"
-		},
-		args: {
-			...OUTPUT_ARGS,
-			"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
-			}
+	args: {
+		...OUTPUT_ARGS,
+		"site": {
+			type: "string",
+			alias: "s",
+			description: "Restrict to a single site (default: all sites with local data)"
 		},
-		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();
-			if (explicitSiteId) allSiteIds.add(explicitSiteId);
-			else {
-				const entries = await store.engine.listLive({ userId: store.userId });
-				for (const e of entries) if (e.siteId) allSiteIds.add(e.siteId);
-			}
-			if (allSiteIds.size === 0) {
-				if (json) console.log(JSON.stringify({
-					sites: [],
-					totalBytes: 0
-				}, null, 2));
-				else logger.warn("No sites with local data. Run `gscdump sync` first.");
-				return;
+		"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();
+		if (explicitSiteId) allSiteIds.add(explicitSiteId);
+		else {
+			const entries = await store.engine.listLive({ userId: store.userId });
+			for (const e of entries) if (e.siteId) allSiteIds.add(e.siteId);
+		}
+		if (allSiteIds.size === 0) {
+			if (json) console.log(JSON.stringify({
+				sites: [],
+				totalBytes: 0
+			}, null, 2));
+			else logger.warn("No sites with local data. Run `gscdump sync` first.");
+			return;
+		}
+		const summary = [];
+		let totalBytes = 0;
+		for (const siteId of allSiteIds) {
+			if (args["with-canonical"]) {
+				const dimRows = await buildSiteQueryDim(store, siteId);
+				if (!json) logger.info(`Built query dimension for [${siteId}] (${dimRows} distinct queries, normalizer v${NORMALIZER_VERSION})`);
 			}
-			const summary = [];
-			let totalBytes = 0;
-			for (const siteId of allSiteIds) {
-				if (args["with-canonical"]) {
-					const dimRows = await buildSiteQueryDim(store, siteId);
-					if (!json) logger.info(`Built query dimension for [${siteId}] (${dimRows} distinct queries, normalizer v${NORMALIZER_VERSION})`);
-				}
-				logger.info(`Rebuilding rollups for [${siteId}] (${defs.length} rollups)`);
-				const results = await rebuildRollups({
-					engine: {
-						runSQL: (opts) => store.engine.runSQL(opts),
-						listPartitions: async ({ ctx, table, searchType }) => {
-							return (await store.engine.listLive({
-								userId: ctx.userId,
-								...ctx.siteId !== void 0 ? { siteId: ctx.siteId } : {},
-								table,
-								...searchType !== void 0 ? { searchType } : {}
-							})).map((e) => ({
-								partition: e.partition,
-								bytes: e.bytes
-							}));
-						}
-					},
-					dataSource: store.dataSource,
-					ctx: {
-						userId: store.userId,
-						siteId
-					},
-					defs
+			logger.info(`Rebuilding rollups for [${siteId}] (${defs.length} rollups)`);
+			const results = await rebuildRollups({
+				engine: {
+					runSQL: (opts) => store.engine.runSQL(opts),
+					listPartitions: async ({ ctx, table, searchType }) => {
+						return (await store.engine.listLive({
+							userId: ctx.userId,
+							...ctx.siteId !== void 0 ? { siteId: ctx.siteId } : {},
+							table,
+							...searchType !== void 0 ? { searchType } : {}
+						})).map((e) => ({
+							partition: e.partition,
+							bytes: e.bytes
+						}));
+					}
+				},
+				dataSource: store.dataSource,
+				ctx: {
+					userId: store.userId,
+					siteId
+				},
+				defs
+			});
+			const site = {
+				siteId,
+				rollups: []
+			};
+			for (const r of results) {
+				totalBytes += r.bytes;
+				site.rollups.push({
+					id: r.id,
+					bytes: r.bytes,
+					objectKey: r.objectKey
 				});
-				const site = {
-					siteId,
-					rollups: []
-				};
-				for (const r of results) {
-					totalBytes += r.bytes;
-					site.rollups.push({
-						id: r.id,
-						bytes: r.bytes,
-						objectKey: r.objectKey
-					});
-					if (!json) console.log(`  ${r.id.padEnd(20)} ${(r.bytes / 1024).toFixed(1).padStart(8)} KB  ${r.objectKey}`);
-				}
-				summary.push(site);
-			}
-			if (json) {
-				console.log(JSON.stringify({
-					sites: summary,
-					totalBytes
-				}, null, 2));
-				return;
+				if (!json) console.log(`  ${r.id.padEnd(20)} ${(r.bytes / 1024).toFixed(1).padStart(8)} KB  ${r.objectKey}`);
 			}
-			logger.success(`Rebuilt rollups across ${allSiteIds.size} site(s) — total ${(totalBytes / 1024).toFixed(1)} KB`);
+			summary.push(site);
+		}
+		if (json) {
+			console.log(JSON.stringify({
+				sites: summary,
+				totalBytes
+			}, null, 2));
+			return;
 		}
-	}) }
+		logger.success(`Rebuilt rollups across ${allSiteIds.size} site(s) — total ${(totalBytes / 1024).toFixed(1)} KB`);
+	}
+});
+const rollupsCommand = defineCommand({
+	meta: {
+		name: "rollups",
+		description: "Manage post-sync rollups"
+	},
+	subCommands: { rebuild: rebuildSubCommand }
 });
 export { rollupsCommand };