@supalytics/cli 0.4.3 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supalytics/cli",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "CLI for Supalytics web analytics",
   "type": "module",
   "bin": {

package/src/commands/funnels.ts

@@ -37,10 +37,10 @@ Examples:
   supalytics funnels
 
   # View a funnel with conversion analysis
-  supalytics funnels view <id>
+  supalytics funnels <id>
 
   # View with custom date range
-  supalytics funnels view <id> -p 90d
+  supalytics funnels <id> -p 90d
 
   # Create a funnel
   supalytics funnels create "Signup Flow" --step "page:/pricing" --step "event:signup_clicked" --step "purchase"
@@ -215,9 +215,13 @@ function renderAnalysis(rows: FunnelAnalysisRow[], funnel: { name: string; descr
 export const funnelsCommand = new Command("funnels")
 	.description("Manage and analyze conversion funnels")
 	.addHelpText("after", funnelsExamples)
+	.argument("[id]", "Funnel ID to view details and conversion analysis")
 	.option("-s, --site <site>", "Site to query")
+	.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("--json", "Output as JSON")
-	.action(async (options) => {
+	.action(async (id, options) => {
 		const site = options.site || (await getDefaultSite())
 
 		if (!site) {
@@ -229,6 +233,47 @@ export const funnelsCommand = new Command("funnels")
 			process.exit(1)
 		}
 
+		// If an ID is provided, show funnel details + analysis
+		if (id) {
+			try {
+				const dateRange =
+					options.start && options.end
+						? ([options.start, options.end] as [string, string])
+						: parsePeriod(options.period as string)
+
+				// Fetch funnel definition and run analysis in parallel
+				const [funnelResponse, analysisResponse] = await Promise.all([
+					getFunnel(site, id),
+					analyzeFunnel(site, id, dateRange),
+				])
+
+				if (options.json) {
+					console.log(
+						JSON.stringify(
+							{
+								funnel: funnelResponse.data,
+								analysis: analysisResponse.data,
+								meta: analysisResponse.meta,
+							},
+							null,
+							2
+						)
+					)
+					return
+				}
+
+				const [startDate, endDate] = analysisResponse.meta.date_range
+				console.log(chalk.dim(`  ${startDate} → ${endDate}  (${analysisResponse.meta.query_ms}ms)`))
+
+				renderAnalysis(analysisResponse.data, funnelResponse.data)
+			} catch (error) {
+				console.error(chalk.red(`Error: ${(error as Error).message}`))
+				process.exit(1)
+			}
+			return
+		}
+
+		// No ID — list all funnels
 		try {
 			const response = await listFunnels(site)
 
@@ -271,65 +316,6 @@ export const funnelsCommand = new Command("funnels")
 		}
 	})
 
-// Subcommand: view
-funnelsCommand
-	.command("view <id>")
-	.description("View funnel details and conversion analysis")
-	.option("-s, --site <site>", "Site to query")
-	.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("--json", "Output as JSON")
-	.action(async (id, _options, cmd) => {
-		const options = mergedOpts(cmd)
-		const site = await resolveSiteOption(cmd)
-
-		if (!site) {
-			console.error(
-				chalk.red(
-					"Error: No site specified. Use --site or set a default with `supalytics login --site`"
-				)
-			)
-			process.exit(1)
-		}
-
-		try {
-			const dateRange =
-				options.start && options.end
-					? ([options.start, options.end] as [string, string])
-					: parsePeriod(options.period as string)
-
-			// Fetch funnel definition and run analysis in parallel
-			const [funnelResponse, analysisResponse] = await Promise.all([
-				getFunnel(site, id),
-				analyzeFunnel(site, id, dateRange),
-			])
-
-			if (options.json) {
-				console.log(
-					JSON.stringify(
-						{
-							funnel: funnelResponse.data,
-							analysis: analysisResponse.data,
-							meta: analysisResponse.meta,
-						},
-						null,
-						2
-					)
-				)
-				return
-			}
-
-			const [startDate, endDate] = analysisResponse.meta.date_range
-			console.log(chalk.dim(`  ${startDate} → ${endDate}  (${analysisResponse.meta.query_ms}ms)`))
-
-			renderAnalysis(analysisResponse.data, funnelResponse.data)
-		} catch (error) {
-			console.error(chalk.red(`Error: ${(error as Error).message}`))
-			process.exit(1)
-		}
-	})
-
 // Subcommand: create
 funnelsCommand
 	.command("create <name>")