From af70905f198384a006f3787efa718452ac5494ec Mon Sep 17 00:00:00 2001
From: Aman Varshney <amanvarshney.work@gmail.com>
Date: Fri, 21 Mar 2025 23:36:16 +0530
Subject: [PATCH] Improve Turso setup with group selection

---
 .changeset/crazy-bananas-know.md     |  5 ++
 apps/cli/src/constants.ts            |  4 --
 apps/cli/src/helpers/addons-setup.ts |  1 -
 apps/cli/src/helpers/turso-setup.ts  | 96 +++++++++++++++++++++++++---
 4 files changed, 91 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/crazy-bananas-know.md

diff --git a/.changeset/crazy-bananas-know.md b/.changeset/crazy-bananas-know.md
new file mode 100644
index 0000000..705cf3b
--- /dev/null
+++ b/.changeset/crazy-bananas-know.md
@@ -0,0 +1,5 @@
+---
+"create-better-t-stack": minor
+---
+
+Fix auth template setup, todo example, turso setup with setup selection
diff --git a/apps/cli/src/constants.ts b/apps/cli/src/constants.ts
index 43c292c..27fdbac 100644
--- a/apps/cli/src/constants.ts
+++ b/apps/cli/src/constants.ts
@@ -18,18 +18,14 @@ export const DEFAULT_CONFIG: ProjectConfig = {
 };
 
 export const dependencyVersionMap = {
-	// Authentication
 	"better-auth": "^1.2.4",
 
-	// Database - Drizzle
 	"drizzle-orm": "^0.38.4",
 	"drizzle-kit": "^0.30.5",
 
-	// Database - SQLite/PostgreSQL
 	"@libsql/client": "^0.14.0",
 	postgres: "^3.4.5",
 
-	// Database - Prisma
 	"@prisma/client": "^5.7.1",
 	prisma: "^5.7.1",
 } as const;
diff --git a/apps/cli/src/helpers/addons-setup.ts b/apps/cli/src/helpers/addons-setup.ts
index 5d1414a..7d4a0da 100644
--- a/apps/cli/src/helpers/addons-setup.ts
+++ b/apps/cli/src/helpers/addons-setup.ts
@@ -56,7 +56,6 @@ EXPOSE 3000
 CMD ["node", "packages/server/dist/index.js"]
 `;
 
-	// Create docker-compose.yml
 	const dockerComposeContent = `version: '3'
 
 services:
diff --git a/apps/cli/src/helpers/turso-setup.ts b/apps/cli/src/helpers/turso-setup.ts
index 4901233..6acc570 100644
--- a/apps/cli/src/helpers/turso-setup.ts
+++ b/apps/cli/src/helpers/turso-setup.ts
@@ -1,20 +1,35 @@
 import os from "node:os";
 import path from "node:path";
-import { cancel, confirm, isCancel, log, spinner, text } from "@clack/prompts";
+import {
+	cancel,
+	confirm,
+	isCancel,
+	log,
+	select,
+	spinner,
+	text,
+} from "@clack/prompts";
 import { $ } from "execa";
 import fs from "fs-extra";
 import pc from "picocolors";
 
-interface TursoConfig {
+type TursoConfig = {
 	dbUrl: string;
 	authToken: string;
-}
+};
+
+type TursoGroup = {
+	name: string;
+	locations: string;
+	version: string;
+	status: string;
+};
 
 async function isTursoInstalled() {
 	try {
-		await $`turso --version`;
-		return true;
-	} catch {
+		const result = await $`turso --version`;
+		return result.exitCode === 0;
+	} catch (error) {
 		return false;
 	}
 }
@@ -67,9 +82,66 @@ async function installTursoCLI(isMac: boolean) {
 	}
 }
 
-async function createTursoDatabase(dbName: string): Promise<TursoConfig> {
+async function getTursoGroups(): Promise<TursoGroup[]> {
 	try {
-		await $`turso db create ${dbName}`;
+		const { stdout } = await $`turso group list`;
+		const lines = stdout.trim().split("\n");
+
+		if (lines.length <= 1) {
+			return [];
+		}
+
+		const groups = lines.slice(1).map((line) => {
+			const [name, locations, version, status] = line.trim().split(/\s{2,}/);
+			return { name, locations, version, status };
+		});
+
+		return groups;
+	} catch (error) {
+		console.error("Error fetching Turso groups:", error);
+		return [];
+	}
+}
+
+async function selectTursoGroup(): Promise<string | null> {
+	const groups = await getTursoGroups();
+
+	if (groups.length === 0) {
+		return null;
+	}
+
+	if (groups.length === 1) {
+		return groups[0].name;
+	}
+
+	const groupOptions = groups.map((group) => ({
+		value: group.name,
+		label: `${group.name} (${group.locations})`,
+	}));
+
+	const selectedGroup = await select({
+		message: "Select a Turso database group:",
+		options: groupOptions,
+	});
+
+	if (isCancel(selectedGroup)) {
+		cancel(pc.red("Operation cancelled"));
+		process.exit(0);
+	}
+
+	return selectedGroup as string;
+}
+
+async function createTursoDatabase(
+	dbName: string,
+	groupName: string | null,
+): Promise<TursoConfig> {
+	try {
+		if (groupName) {
+			await $`turso db create ${dbName} --group ${groupName}`;
+		} else {
+			await $`turso db create ${dbName}`;
+		}
 	} catch (error) {
 		if (error instanceof Error && error.message.includes("already exists")) {
 			throw new Error("DATABASE_EXISTS");
@@ -159,6 +231,8 @@ export async function setupTurso(
 			await loginToTurso();
 		}
 
+		const selectedGroup = await selectTursoGroup();
+
 		let success = false;
 		let dbName = "";
 		let suggestedName = path.basename(projectDir);
@@ -180,8 +254,10 @@ export async function setupTurso(
 			const s = spinner();
 
 			try {
-				s.start(`Creating Turso database "${dbName}"...`);
-				const config = await createTursoDatabase(dbName);
+				s.start(
+					`Creating Turso database "${dbName}"${selectedGroup ? ` in group "${selectedGroup}"` : ""}...`,
+				);
+				const config = await createTursoDatabase(dbName, selectedGroup);
 				await writeEnvFile(projectDir, config);
 				s.stop("Turso database configured successfully!");
 				success = true;