@supalytics/cli 0.3.8 → 0.4.1

package/src/commands/logout.ts

@@ -1,15 +1,51 @@
-import { Command } from "commander";
-import chalk from "chalk";
-import { CONFIG_FILE } from "../config";
-import { unlink } from "fs/promises";
+import chalk from "chalk"
+import { Command } from "commander"
+import { clearAuth, getAuth } from "../config"
+
+const WEB_BASE = process.env.SUPALYTICS_WEB_URL || "https://www.supalytics.co"
+
+/**
+ * Revoke the PAT on the server
+ * Returns true if successful, false if failed (but we still proceed with local cleanup)
+ */
+async function revokeToken(accessToken: string): Promise<boolean> {
+	try {
+		const response = await fetch(`${WEB_BASE}/api/cli/auth/revoke`, {
+			method: "DELETE",
+			headers: {
+				Authorization: `Bearer ${accessToken}`,
+			},
+		})
+
+		// Treat 200, 401, and 404 as success (token revoked or already invalid)
+		return response.ok || response.status === 401 || response.status === 404
+	} catch {
+		// Network errors shouldn't prevent local logout
+		return false
+	}
+}
 
 export const logoutCommand = new Command("logout")
-  .description("Log out and remove all stored credentials")
-  .action(async () => {
-    try {
-      await unlink(CONFIG_FILE);
-      console.log(chalk.green("✓ Logged out"));
-    } catch {
-      console.log(chalk.dim("Already logged out"));
-    }
-  });
+	.description("Log out and remove all stored credentials")
+	.action(async () => {
+		const auth = await getAuth()
+
+		if (!auth?.accessToken) {
+			console.log(chalk.dim("Already logged out"))
+			return
+		}
+
+		// Try to revoke token on server (don't block on failure)
+		const revoked = await revokeToken(auth.accessToken)
+
+		// Clear local config regardless of server result
+		await clearAuth()
+
+		if (revoked) {
+			console.log(chalk.green("Logged out"))
+		} else {
+			// Local logout succeeded but server revocation failed
+			console.log(chalk.green("Logged out"))
+			console.log(chalk.dim("Note: Could not reach server to revoke token"))
+		}
+	})

package/src/commands/query.ts

@@ -1,11 +1,10 @@
-import { Command } from "commander";
-import chalk from "chalk";
-import { query, formatNumber, formatPercent, formatDuration } from "../api";
-import { getDefaultSite } from "../config";
-import { table, type TableColumn } from "../ui";
-
-const queryDescription = `Flexible query with custom metrics and dimensions.
+import chalk from "chalk"
+import { Command } from "commander"
+import { formatDuration, formatNumber, formatPercent, query } from "../api"
+import { getDefaultSite } from "../config"
+import { type TableColumn, table } from "../ui"
 
+const queryExamples = `
 Examples:
   # Top pages with revenue
   supalytics query -d page -m visitors,revenue
@@ -32,156 +31,180 @@ Examples:
   supalytics query -d country -f "event:is:signup"
 
   # Pages visited by premium users
-  supalytics query -d page -f "event_property:is:plan:premium"`;
+  supalytics query -d page -f "event_property:is:plan:premium"`
 
 export const queryCommand = new Command("query")
-  .description(queryDescription)
-  .option("-s, --site <site>", "Site to query")
-  .option("-m, --metrics <metrics>", "Metrics: visitors, bounce_rate, avg_session_duration, revenue, conversions", "visitors,revenue")
-  .option("-d, --dimensions <dimensions>", "Dimensions: page, referrer, country, region, city, browser, os, device, date, hour, event, utm_* (max 2, event cannot combine)")
-  .option("-f, --filter <filters...>", "Filters: field:operator:value (e.g., 'page:contains:/blog', 'event:is:signup', 'event_property:is:plan:premium')")
-  .option("--sort <sort>", "Sort by field:order (e.g., 'revenue:desc', 'visitors:asc')")
-  .option("--timezone <tz>", "Timezone for date grouping (e.g., 'America/New_York')", "UTC")
-  .option("-p, --period <period>", "Time period: 7d, 14d, 30d, 90d, 12mo, all", "30d")
-  .option("--start <date>", "Start date (YYYY-MM-DD)")
-  .option("--end <date>", "End date (YYYY-MM-DD)")
-  .option("-l, --limit <number>", "Number of results (1-1000)", "10")
-  .option("--offset <number>", "Skip results for pagination", "0")
-  .option("--no-revenue", "Exclude revenue metrics")
-  .option("--json", "Output as JSON")
-  .option("-t, --test", "Test mode: query localhost data instead of production")
-  .action(async (options) => {
-    const site = options.site || (await getDefaultSite());
-
-    if (!site) {
-      console.error(chalk.red("Error: No site specified. Use --site or set a default with `supalytics login --site`"));
-      process.exit(1);
-    }
-
-    const dateRange = options.start && options.end
-      ? [options.start, options.end] as [string, string]
-      : options.period;
-
-    // Parse metrics
-    const metrics = options.metrics.split(",").map((m: string) => m.trim());
-
-    // Parse dimensions
-    const dimensions = options.dimensions
-      ? options.dimensions.split(",").map((d: string) => d.trim())
-      : undefined;
-
-    // Parse filters - NEW FORMAT: field:operator:value
-    const filters = options.filter
-      ? options.filter.map((f: string) => {
-          const parts = f.split(":");
-          if (parts.length < 3) {
-            console.error(chalk.red(`Invalid filter format: ${f}. Use 'field:operator:value'`));
-            process.exit(1);
-          }
-          const [field, operator, ...valueParts] = parts;
-          return [field, operator, valueParts.join(":")] as [string, string, string];
-        })
-      : undefined;
-
-    // Parse sort
-    const sort = options.sort
-      ? (() => {
-          const [field, order] = options.sort.split(":");
-          if (!field || !order || (order !== "asc" && order !== "desc")) {
-            console.error(chalk.red(`Invalid sort format: ${options.sort}. Use 'field:order' where order is 'asc' or 'desc'`));
-            process.exit(1);
-          }
-          return { field, order: order as "asc" | "desc" };
-        })()
-      : undefined;
-
-    try {
-      const response = await query(site, {
-        metrics,
-        dimensions,
-        filters,
-        sort,
-        timezone: options.timezone,
-        date_range: dateRange,
-        limit: parseInt(options.limit),
-        offset: parseInt(options.offset),
-        include_revenue: options.revenue !== false,
-        is_dev: options.test || false,
-      });
-
-      if (options.json) {
-        console.log(JSON.stringify(response, null, 2));
-        return;
-      }
-
-      const [startDate, endDate] = response.meta.date_range;
-
-      console.log();
-      console.log(chalk.bold("Query Results"), chalk.dim(`${startDate} → ${endDate}`));
-      console.log(chalk.dim(`  ${response.data.length} rows in ${response.meta.query_ms}ms`));
-      if (response.pagination.has_more) {
-        console.log(chalk.dim(`  More results available (offset: ${response.pagination.offset + response.pagination.limit})`));
-      }
-      console.log();
-
-      if (response.data.length === 0) {
-        console.log(chalk.dim("  No data"));
-        return;
-      }
-
-      // Build columns from data
-      const columns: TableColumn[] = [];
-
-      // Add dimension columns
-      if (response.data[0]?.dimensions) {
-        for (const key of Object.keys(response.data[0].dimensions)) {
-          columns.push({
-            key: `dim_${key}`,
-            label: key.toUpperCase(),
-            align: "left",
-          });
-        }
-      }
-
-      // Add metric columns
-      for (const key of Object.keys(response.data[0]?.metrics || {})) {
-        columns.push({
-          key: `met_${key}`,
-          label: key.toUpperCase().replaceAll("_", " "),
-          align: "right",
-          format: (val) => {
-            if (val === null || val === undefined) return "-";
-            const v = val as number;
-            if (key === "bounce_rate" || key === "conversion_rate") {
-              return formatPercent(v);
-            } else if (key === "avg_session_duration") {
-              return formatDuration(v);
-            } else if (key === "revenue") {
-              return chalk.green("$" + (v / 100).toFixed(2));
-            }
-            return formatNumber(v);
-          },
-        });
-      }
-
-      // Transform data for table
-      const tableData = response.data.map((r) => {
-        const row: Record<string, unknown> = {};
-        if (r.dimensions) {
-          for (const [k, v] of Object.entries(r.dimensions)) {
-            row[`dim_${k}`] = v || "(none)";
-          }
-        }
-        for (const [k, v] of Object.entries(r.metrics)) {
-          row[`met_${k}`] = v;
-        }
-        return row;
-      });
-
-      console.log(table(tableData, columns));
-      console.log();
-    } catch (error) {
-      console.error(chalk.red(`Error: ${(error as Error).message}`));
-      process.exit(1);
-    }
-  });
+	.description("Flexible analytics query with custom metrics and dimensions")
+	.addHelpText("after", queryExamples)
+	.option("-s, --site <site>", "Site to query")
+	.option(
+		"-m, --metrics <metrics>",
+		"Metrics: visitors, bounce_rate, avg_session_duration, revenue, conversions",
+		"visitors,revenue"
+	)
+	.option(
+		"-d, --dimensions <dimensions>",
+		"Dimensions: page, referrer, country, region, city, browser, os, device, date, hour, event, utm_* (max 2, event cannot combine)"
+	)
+	.option(
+		"-f, --filter <filters...>",
+		"Filters: field:operator:value (e.g., 'page:contains:/blog', 'event:is:signup', 'event_property:is:plan:premium')"
+	)
+	.option("--sort <sort>", "Sort by field:order (e.g., 'revenue:desc', 'visitors:asc')")
+	.option("--timezone <tz>", "Timezone for date grouping (e.g., 'America/New_York')", "UTC")
+	.option("-p, --period <period>", "Time period: 7d, 14d, 30d, 90d, 12mo, all", "30d")
+	.option("--start <date>", "Start date (YYYY-MM-DD)")
+	.option("--end <date>", "End date (YYYY-MM-DD)")
+	.option("-l, --limit <number>", "Number of results (1-1000)", "10")
+	.option("--offset <number>", "Skip results for pagination", "0")
+	.option("--no-revenue", "Exclude revenue metrics")
+	.option("--json", "Output as JSON")
+	.option("-t, --test", "Test mode: query localhost data instead of production")
+	.action(async (options) => {
+		const site = options.site || (await getDefaultSite())
+
+		if (!site) {
+			console.error(
+				chalk.red(
+					"Error: No site specified. Use --site or set a default with `supalytics login --site`"
+				)
+			)
+			process.exit(1)
+		}
+
+		const dateRange =
+			options.start && options.end
+				? ([options.start, options.end] as [string, string])
+				: options.period
+
+		// Parse metrics
+		const metrics = options.metrics.split(",").map((m: string) => m.trim())
+
+		// Parse dimensions
+		const dimensions = options.dimensions
+			? options.dimensions.split(",").map((d: string) => d.trim())
+			: undefined
+
+		// Parse filters - NEW FORMAT: field:operator:value
+		const filters = options.filter
+			? options.filter.map((f: string) => {
+					const parts = f.split(":")
+					if (parts.length < 3) {
+						console.error(chalk.red(`Invalid filter format: ${f}. Use 'field:operator:value'`))
+						process.exit(1)
+					}
+					const [field, operator, ...valueParts] = parts
+					return [field, operator, valueParts.join(":")] as [string, string, string]
+				})
+			: undefined
+
+		// Parse sort
+		const sort = options.sort
+			? (() => {
+					const [field, order] = options.sort.split(":")
+					if (!field || !order || (order !== "asc" && order !== "desc")) {
+						console.error(
+							chalk.red(
+								`Invalid sort format: ${options.sort}. Use 'field:order' where order is 'asc' or 'desc'`
+							)
+						)
+						process.exit(1)
+					}
+					return { field, order: order as "asc" | "desc" }
+				})()
+			: undefined
+
+		try {
+			const response = await query(site, {
+				metrics,
+				dimensions,
+				filters,
+				sort,
+				timezone: options.timezone,
+				date_range: dateRange,
+				limit: parseInt(options.limit),
+				offset: parseInt(options.offset),
+				include_revenue: options.revenue !== false,
+				is_dev: options.test || false,
+			})
+
+			if (options.json) {
+				console.log(JSON.stringify(response, null, 2))
+				return
+			}
+
+			const [startDate, endDate] = response.meta.date_range
+
+			console.log()
+			console.log(chalk.bold("Query Results"), chalk.dim(`${startDate} → ${endDate}`))
+			console.log(chalk.dim(`  ${response.data.length} rows in ${response.meta.query_ms}ms`))
+			if (response.pagination.has_more) {
+				console.log(
+					chalk.dim(
+						`  More results available (offset: ${response.pagination.offset + response.pagination.limit})`
+					)
+				)
+			}
+			console.log()
+
+			if (response.data.length === 0) {
+				console.log(chalk.dim("  No data"))
+				return
+			}
+
+			// Build columns from data
+			const columns: TableColumn[] = []
+
+			// Add dimension columns
+			if (response.data[0]?.dimensions) {
+				for (const key of Object.keys(response.data[0].dimensions)) {
+					columns.push({
+						key: `dim_${key}`,
+						label: key.toUpperCase(),
+						align: "left",
+					})
+				}
+			}
+
+			// Add metric columns
+			for (const key of Object.keys(response.data[0]?.metrics || {})) {
+				columns.push({
+					key: `met_${key}`,
+					label: key.toUpperCase().replaceAll("_", " "),
+					align: "right",
+					format: (val) => {
+						if (val === null || val === undefined) return "-"
+						const v = val as number
+						if (key === "bounce_rate" || key === "conversion_rate") {
+							return formatPercent(v)
+						} else if (key === "avg_session_duration") {
+							return formatDuration(v)
+						} else if (key === "revenue") {
+							return chalk.green("$" + (v / 100).toFixed(2))
+						}
+						return formatNumber(v)
+					},
+				})
+			}
+
+			// Transform data for table
+			const tableData = response.data.map((r) => {
+				const row: Record<string, unknown> = {}
+				if (r.dimensions) {
+					for (const [k, v] of Object.entries(r.dimensions)) {
+						row[`dim_${k}`] = v || "(none)"
+					}
+				}
+				for (const [k, v] of Object.entries(r.metrics)) {
+					row[`met_${k}`] = v
+				}
+				return row
+			})
+
+			console.log(table(tableData, columns))
+			console.log()
+		} catch (error) {
+			console.error(chalk.red(`Error: ${(error as Error).message}`))
+			process.exit(1)
+		}
+	})

package/src/commands/update.ts

@@ -1,54 +1,70 @@
-import { Command } from "commander";
-import chalk from "chalk";
-import { $ } from "bun";
+import { $ } from "bun"
+import chalk from "chalk"
+import { Command } from "commander"
 
 export const updateCommand = new Command("update")
-  .description("Update Supalytics CLI to the latest version")
-  .action(async () => {
-    // Read current version
-    const pkg = await Bun.file(new URL("../../package.json", import.meta.url)).json();
-    console.log(chalk.dim(`Current version: ${pkg.version}`));
-    console.log(chalk.dim("Checking for updates..."));
-    console.log();
-
-    try {
-      // Check latest version from npm
-      const response = await fetch("https://registry.npmjs.org/@supalytics/cli/latest");
-      if (!response.ok) {
-        throw new Error("Failed to check npm registry");
-      }
-      const data = await response.json();
-      const latestVersion = data.version;
-
-      if (latestVersion === pkg.version) {
-        console.log(chalk.green("✓ Already on the latest version"));
-        return;
-      }
-
-      console.log(chalk.cyan(`New version available: ${latestVersion}`));
-      console.log();
-      console.log(chalk.dim("Updating..."));
-
-      // Try bun first, fall back to npm
-      try {
-        await $`bun upgrade @supalytics/cli`.quiet();
-        console.log(chalk.green(`✓ Updated to ${latestVersion}`));
-      } catch {
-        // bun upgrade might not work for global packages, try npm
-        try {
-          await $`npm update -g @supalytics/cli`.quiet();
-          console.log(chalk.green(`✓ Updated to ${latestVersion}`));
-        } catch {
-          console.log(chalk.yellow("Automatic update failed."));
-          console.log();
-          console.log("Please update manually:");
-          console.log(chalk.cyan("  bun install -g @supalytics/cli@latest"));
-          console.log("  or");
-          console.log(chalk.cyan("  npm install -g @supalytics/cli@latest"));
-        }
-      }
-    } catch (error) {
-      console.error(chalk.red(`Error: ${(error as Error).message}`));
-      process.exit(1);
-    }
-  });
+	.description("Update Supalytics CLI to the latest version")
+	.action(async () => {
+		// Read current version
+		const pkg = await Bun.file(new URL("../../package.json", import.meta.url)).json()
+		console.log(chalk.dim(`Current version: ${pkg.version}`))
+		console.log(chalk.dim("Checking for updates..."))
+		console.log()
+
+		try {
+			// Check latest version from npm
+			const response = await fetch("https://registry.npmjs.org/@supalytics/cli/latest")
+			if (!response.ok) {
+				throw new Error("Failed to check npm registry")
+			}
+			const data = await response.json()
+			const latestVersion = data.version
+
+			if (latestVersion === pkg.version) {
+				console.log(chalk.green("✓ Already on the latest version"))
+				return
+			}
+
+			console.log(chalk.cyan(`New version available: ${latestVersion}`))
+			console.log()
+			console.log(chalk.dim("Updating..."))
+
+			// Try to update using the appropriate package manager
+			let updated = false
+
+			// Try bun first (bun add -g for global packages)
+			try {
+				await $`bun add -g @supalytics/cli@latest`.quiet()
+				updated = true
+			} catch {
+				// bun not available or failed, try npm
+			}
+
+			// Fall back to npm if bun didn't work
+			if (!updated) {
+				try {
+					await $`npm install -g @supalytics/cli@latest`.quiet()
+					updated = true
+				} catch {
+					// npm also failed
+				}
+			}
+
+			if (!updated) {
+				console.log(chalk.yellow("Automatic update failed."))
+				console.log()
+				console.log("Please update manually:")
+				console.log(chalk.cyan("  bun add -g @supalytics/cli@latest"))
+				console.log("  or")
+				console.log(chalk.cyan("  npm install -g @supalytics/cli@latest"))
+				return
+			}
+
+			console.log(chalk.green(`✓ Updated to ${latestVersion}`))
+			console.log()
+			console.log(chalk.dim("Run `supalytics --version` to verify"))
+		} catch (error) {
+			console.error(chalk.red(`Error: ${(error as Error).message}`))
+			process.exit(1)
+		}
+	})