@supalytics/cli 0.4.1 → 0.4.3

package/src/commands/sites.ts

@@ -1,251 +1,255 @@
-import { Command } from "commander";
-import chalk from "chalk";
+import chalk from "chalk"
+import { Command } from "commander"
 import {
-  getConfig,
-  removeSite,
-  setDefaultSite,
-  getAuth,
-  addSiteWithId,
-  saveConfig,
-} from "../config";
+	addSiteWithId,
+	getAuth,
+	getConfig,
+	removeSite,
+	saveConfig,
+	setDefaultSite,
+} from "../config"
 
-const WEB_BASE = process.env.SUPALYTICS_WEB_URL || "https://www.supalytics.co";
+const WEB_BASE = process.env.SUPALYTICS_WEB_URL || "https://www.supalytics.co"
 
 interface CreateSiteResponse {
-  site: {
-    id: string;
-    site_id: string;
-    domain: string;
-  };
+	site: {
+		id: string
+		site_id: string
+		domain: string
+	}
 }
 
 interface UpdateSiteResponse {
-  site: {
-    id: string;
-    site_id: string;
-    domain: string;
-  };
+	site: {
+		id: string
+		site_id: string
+		domain: string
+	}
 }
 
 export async function createSiteViaApi(
-  accessToken: string,
-  identifier: string
+	accessToken: string,
+	identifier: string
 ): Promise<CreateSiteResponse> {
-  let response: Response;
-  try {
-    response = await fetch(`${WEB_BASE}/api/cli/sites`, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({ identifier }),
-    });
-  } catch {
-    throw new Error(`Network error: Could not connect to ${WEB_BASE}`);
-  }
-
-  if (!response.ok) {
-    let errorMessage = "Failed to create site";
-    try {
-      const error = await response.json();
-      errorMessage = error.error || errorMessage;
-    } catch {
-      // Response wasn't JSON
-    }
-    throw new Error(errorMessage);
-  }
-
-  return response.json();
+	let response: Response
+	try {
+		response = await fetch(`${WEB_BASE}/api/cli/sites`, {
+			method: "POST",
+			headers: {
+				Authorization: `Bearer ${accessToken}`,
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify({ identifier }),
+		})
+	} catch {
+		throw new Error(`Network error: Could not connect to ${WEB_BASE}`)
+	}
+
+	if (!response.ok) {
+		let errorMessage = "Failed to create site"
+		try {
+			const error = await response.json()
+			errorMessage = error.error || errorMessage
+		} catch {
+			// Response wasn't JSON
+		}
+		throw new Error(errorMessage)
+	}
+
+	return response.json()
 }
 
 export const sitesCommand = new Command("sites")
-  .description("List all configured sites")
-  .action(async () => {
-    const config = await getConfig();
-    const sites = Object.keys(config.sites);
-
-    if (sites.length === 0) {
-      console.log(chalk.dim("No sites configured."));
-      console.log(chalk.dim("Run `supalytics login` then `supalytics sites add <name>` to add a site."));
-      return;
-    }
-
-    console.log();
-    console.log(chalk.bold("Configured Sites"));
-    console.log();
-
-    for (const site of sites) {
-      const isDefault = config.defaultSite === site;
-      const siteId = config.sites[site].siteId;
-
-      if (isDefault) {
-        console.log(`  ${chalk.green("●")} ${site} ${chalk.dim("(default)")}${siteId ? ` ${chalk.dim(siteId)}` : ""}`);
-      } else {
-        console.log(`  ${chalk.dim("○")} ${site}${siteId ? ` ${chalk.dim(siteId)}` : ""}`);
-      }
-    }
-    console.log();
-  });
+	.description("List all configured sites")
+	.action(async () => {
+		const config = await getConfig()
+		const sites = Object.keys(config.sites)
+
+		if (sites.length === 0) {
+			console.log(chalk.dim("No sites configured."))
+			console.log(
+				chalk.dim("Run `supalytics login` then `supalytics sites add <name>` to add a site.")
+			)
+			return
+		}
+
+		console.log()
+		console.log(chalk.bold("Configured Sites"))
+		console.log()
+
+		for (const site of sites) {
+			const isDefault = config.defaultSite === site
+			const siteId = config.sites[site].siteId
+
+			if (isDefault) {
+				console.log(
+					`  ${chalk.green("●")} ${site} ${chalk.dim("(default)")}${siteId ? ` ${chalk.dim(siteId)}` : ""}`
+				)
+			} else {
+				console.log(`  ${chalk.dim("○")} ${site}${siteId ? ` ${chalk.dim(siteId)}` : ""}`)
+			}
+		}
+		console.log()
+	})
 
 // sites add <identifier>
 const addCommand = new Command("add")
-  .description("Create a new site")
-  .argument("<identifier>", "Domain or project name")
-  .action(async (identifier: string) => {
-    const auth = await getAuth();
-    if (!auth) {
-      console.error(chalk.red("Not logged in. Run `supalytics login` first."));
-      process.exit(1);
-    }
-
-    console.log(chalk.dim("Creating site..."));
-
-    try {
-      const result = await createSiteViaApi(auth.accessToken, identifier);
-
-      // Store locally (including website UUID for updates)
-      await addSiteWithId(result.site.domain, result.site.site_id, result.site.id);
-
-      console.log(chalk.green(`✓ Created ${result.site.domain}`));
-      console.log(chalk.dim(`  Site ID: ${result.site.site_id}`));
-      console.log();
-      console.log(chalk.dim("Add this to your HTML <head>:"));
-      console.log();
-      console.log(
-        chalk.cyan(
-          `  <script src="https://cdn.supalytics.co/script.js" data-site="${result.site.site_id}" defer></script>`
-        )
-      );
-      console.log();
-    } catch (error) {
-      console.error(chalk.red(`Error: ${(error as Error).message}`));
-      process.exit(1);
-    }
-  });
+	.description("Create a new site")
+	.argument("<identifier>", "Domain or project name")
+	.action(async (identifier: string) => {
+		const auth = await getAuth()
+		if (!auth) {
+			console.error(chalk.red("Not logged in. Run `supalytics login` first."))
+			process.exit(1)
+		}
+
+		console.log(chalk.dim("Creating site..."))
+
+		try {
+			const result = await createSiteViaApi(auth.accessToken, identifier)
+
+			// Store locally (including website UUID for updates)
+			await addSiteWithId(result.site.domain, result.site.site_id, result.site.id)
+
+			console.log(chalk.green(`✓ Created ${result.site.domain}`))
+			console.log(chalk.dim(`  Site ID: ${result.site.site_id}`))
+			console.log()
+			console.log(chalk.dim("Add this to your HTML <head>:"))
+			console.log()
+			console.log(
+				chalk.cyan(
+					`  <script src="https://cdn.supalytics.co/script.js" data-site="${result.site.site_id}" defer></script>`
+				)
+			)
+			console.log()
+		} catch (error) {
+			console.error(chalk.red(`Error: ${(error as Error).message}`))
+			process.exit(1)
+		}
+	})
 
 // sites update <identifier> --domain <domain>
 const updateCommand = new Command("update")
-  .description("Update a site's domain")
-  .argument("<identifier>", "Current domain/identifier")
-  .option("-d, --domain <domain>", "New domain name")
-  .action(async (identifier: string, options: { domain?: string }) => {
-    if (!options.domain) {
-      console.error(chalk.red("Error: --domain is required"));
-      console.error(chalk.dim("Usage: supalytics sites update <identifier> --domain <new-domain>"));
-      process.exit(1);
-    }
-
-    const auth = await getAuth();
-    if (!auth) {
-      console.error(chalk.red("Not logged in. Run `supalytics login` first."));
-      process.exit(1);
-    }
-
-    // Get site from local config
-    const config = await getConfig();
-    const siteConfig = config.sites[identifier];
-    if (!siteConfig) {
-      console.error(chalk.red(`Site '${identifier}' not found locally.`));
-      const sites = Object.keys(config.sites);
-      if (sites.length > 0) {
-        console.log(chalk.dim(`Available sites: ${sites.join(", ")}`));
-      }
-      process.exit(1);
-    }
-
-    console.log(chalk.dim("Updating site..."));
-
-    try {
-      // Try to use locally stored website ID first
-      let websiteId = siteConfig.id;
-
-      // If no local ID, fetch from server
-      if (!websiteId) {
-        const listResponse = await fetch(`${WEB_BASE}/api/cli/sites`, {
-          headers: { Authorization: `Bearer ${auth.accessToken}` },
-        });
-
-        if (!listResponse.ok) {
-          throw new Error("Failed to fetch sites");
-        }
-
-        const { sites } = await listResponse.json();
-        const site = sites.find((s: { domain: string }) => s.domain === identifier);
-
-        if (!site) {
-          throw new Error(`Site '${identifier}' not found on server`);
-        }
-        websiteId = site.id;
-      }
-
-      // Update via API
-      const updateResponse = await fetch(`${WEB_BASE}/api/cli/sites/${websiteId}`, {
-        method: "PATCH",
-        headers: {
-          Authorization: `Bearer ${auth.accessToken}`,
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ domain: options.domain }),
-      });
-
-      if (!updateResponse.ok) {
-        const error = await updateResponse.json();
-        throw new Error(error.error || "Failed to update site");
-      }
-
-      const result: UpdateSiteResponse = await updateResponse.json();
-
-      // Update local config (preserve all fields)
-      const { siteId: existingSiteId, id: existingId } = siteConfig;
-      const siteId = existingSiteId || result.site.site_id;
-      const id = existingId || websiteId;
-      delete config.sites[identifier];
-      config.sites[options.domain] = { siteId, id };
-      if (config.defaultSite === identifier) {
-        config.defaultSite = options.domain;
-      }
-      await saveConfig(config);
-
-      console.log(chalk.green(`✓ Updated ${identifier} → ${options.domain}`));
-    } catch (error) {
-      console.error(chalk.red(`Error: ${(error as Error).message}`));
-      process.exit(1);
-    }
-  });
-
-sitesCommand.addCommand(addCommand);
-sitesCommand.addCommand(updateCommand);
+	.description("Update a site's domain")
+	.argument("<identifier>", "Current domain/identifier")
+	.option("-d, --domain <domain>", "New domain name")
+	.action(async (identifier: string, options: { domain?: string }) => {
+		if (!options.domain) {
+			console.error(chalk.red("Error: --domain is required"))
+			console.error(chalk.dim("Usage: supalytics sites update <identifier> --domain <new-domain>"))
+			process.exit(1)
+		}
+
+		const auth = await getAuth()
+		if (!auth) {
+			console.error(chalk.red("Not logged in. Run `supalytics login` first."))
+			process.exit(1)
+		}
+
+		// Get site from local config
+		const config = await getConfig()
+		const siteConfig = config.sites[identifier]
+		if (!siteConfig) {
+			console.error(chalk.red(`Site '${identifier}' not found locally.`))
+			const sites = Object.keys(config.sites)
+			if (sites.length > 0) {
+				console.log(chalk.dim(`Available sites: ${sites.join(", ")}`))
+			}
+			process.exit(1)
+		}
+
+		console.log(chalk.dim("Updating site..."))
+
+		try {
+			// Try to use locally stored website ID first
+			let websiteId = siteConfig.id
+
+			// If no local ID, fetch from server
+			if (!websiteId) {
+				const listResponse = await fetch(`${WEB_BASE}/api/cli/sites`, {
+					headers: { Authorization: `Bearer ${auth.accessToken}` },
+				})
+
+				if (!listResponse.ok) {
+					throw new Error("Failed to fetch sites")
+				}
+
+				const { sites } = await listResponse.json()
+				const site = sites.find((s: { domain: string }) => s.domain === identifier)
+
+				if (!site) {
+					throw new Error(`Site '${identifier}' not found on server`)
+				}
+				websiteId = site.id
+			}
+
+			// Update via API
+			const updateResponse = await fetch(`${WEB_BASE}/api/cli/sites/${websiteId}`, {
+				method: "PATCH",
+				headers: {
+					Authorization: `Bearer ${auth.accessToken}`,
+					"Content-Type": "application/json",
+				},
+				body: JSON.stringify({ domain: options.domain }),
+			})
+
+			if (!updateResponse.ok) {
+				const error = await updateResponse.json()
+				throw new Error(error.error || "Failed to update site")
+			}
+
+			const result: UpdateSiteResponse = await updateResponse.json()
+
+			// Update local config (preserve all fields)
+			const { siteId: existingSiteId, id: existingId } = siteConfig
+			const siteId = existingSiteId || result.site.site_id
+			const id = existingId || websiteId
+			delete config.sites[identifier]
+			config.sites[options.domain] = { siteId, id }
+			if (config.defaultSite === identifier) {
+				config.defaultSite = options.domain
+			}
+			await saveConfig(config)
+
+			console.log(chalk.green(`✓ Updated ${identifier} → ${options.domain}`))
+		} catch (error) {
+			console.error(chalk.red(`Error: ${(error as Error).message}`))
+			process.exit(1)
+		}
+	})
+
+sitesCommand.addCommand(addCommand)
+sitesCommand.addCommand(updateCommand)
 
 export const defaultCommand = new Command("default")
-  .description("Set the default site")
-  .argument("<domain>", "Domain to set as default")
-  .action(async (domain: string) => {
-    const success = await setDefaultSite(domain);
-
-    if (!success) {
-      const config = await getConfig();
-      const sites = Object.keys(config.sites);
-      console.error(chalk.red(`Error: Site '${domain}' not found.`));
-      if (sites.length > 0) {
-        console.log(chalk.dim(`Available sites: ${sites.join(", ")}`));
-      }
-      process.exit(1);
-    }
-
-    console.log(chalk.green(`✓ Default site set to ${domain}`));
-  });
+	.description("Set the default site")
+	.argument("<domain>", "Domain to set as default")
+	.action(async (domain: string) => {
+		const success = await setDefaultSite(domain)
+
+		if (!success) {
+			const config = await getConfig()
+			const sites = Object.keys(config.sites)
+			console.error(chalk.red(`Error: Site '${domain}' not found.`))
+			if (sites.length > 0) {
+				console.log(chalk.dim(`Available sites: ${sites.join(", ")}`))
+			}
+			process.exit(1)
+		}
+
+		console.log(chalk.green(`✓ Default site set to ${domain}`))
+	})
 
 export const removeCommand = new Command("remove")
-  .description("Remove a site")
-  .argument("<domain>", "Domain to remove")
-  .action(async (domain: string) => {
-    const success = await removeSite(domain);
-
-    if (!success) {
-      console.error(chalk.red(`Error: Site '${domain}' not found.`));
-      process.exit(1);
-    }
-
-    console.log(chalk.green(`✓ Removed ${domain}`));
-  });
+	.description("Remove a site from local CLI config (does not delete from server)")
+	.argument("<domain>", "Domain to remove")
+	.action(async (domain: string) => {
+		const success = await removeSite(domain)
+
+		if (!success) {
+			console.error(chalk.red(`Error: Site '${domain}' not found.`))
+			process.exit(1)
+		}
+
+		console.log(chalk.green(`✓ Removed ${domain}`))
+	})

package/src/commands/stats.ts

@@ -6,8 +6,8 @@ import { logo, parsePeriod, truncate } from "../ui";
 
 export const statsCommand = new Command("stats")
   .description("Overview stats: pageviews, visitors, bounce rate, revenue")
-  .argument("[period]", "Time period: today, yesterday, week, month, year, 7d, 30d, 90d, 12mo, all", "30d")
   .option("-s, --site <site>", "Site to query")
+  .option("-p, --period <period>", "Time period: today, yesterday, week, month, year, 7d, 30d, 90d, 12mo, all", "30d")
   .option("--start <date>", "Start date (YYYY-MM-DD)")
   .option("--end <date>", "End date (YYYY-MM-DD)")
   .option("-f, --filter <filters...>", "Filters in format 'field:operator:value'")
@@ -15,7 +15,7 @@ export const statsCommand = new Command("stats")
   .option("--no-revenue", "Exclude revenue metrics")
   .option("--json", "Output as JSON")
   .option("-t, --test", "Test mode: query localhost data instead of production")
-  .action(async (period, options) => {
+  .action(async (options) => {
     const site = options.site || (await getDefaultSite());
 
     if (!site) {
@@ -25,7 +25,7 @@ export const statsCommand = new Command("stats")
 
     const dateRange = options.start && options.end
       ? [options.start, options.end] as [string, string]
-      : parsePeriod(period);
+      : parsePeriod(options.period);
 
     const filters = options.filter
       ? options.filter.map((f: string) => {
@@ -65,7 +65,7 @@ export const statsCommand = new Command("stats")
           query(site, { metrics: ["visitors"], dimensions: ["country"], ...breakdownOpts }),
           query(site, { metrics: ["visitors"], dimensions: ["browser"], ...breakdownOpts }),
           query(site, { metrics: ["visitors"], dimensions: ["utm_source"], ...breakdownOpts }),
-          listEvents(site, typeof dateRange === "string" ? dateRange : "30d", 10, options.test || false)
+          listEvents(site, dateRange, 10, options.test || false)
         );
       }
 

package/src/commands/trend.ts

@@ -2,7 +2,7 @@ import { Command } from "commander";
 import chalk from "chalk";
 import { query, formatNumber } from "../api";
 import { getDefaultSite } from "../config";
-import { coloredSparkline } from "../ui";
+import { coloredSparkline, parsePeriod } from "../ui";
 
 export const trendCommand = new Command("trend")
   .description("Daily visitor trend")
@@ -25,7 +25,7 @@ export const trendCommand = new Command("trend")
 
     const dateRange = options.start && options.end
       ? [options.start, options.end] as [string, string]
-      : options.period;
+      : parsePeriod(options.period);
 
     // Parse filters
     const filters = options.filter