feat(auth): Improve auth extras (#28)

Restructuring the auth output, and improving file structures.

Author: OllieJT

.changeset/eleven-humans-smell.md

@@ -0,0 +1,5 @@
+---
+"create-sva": patch
+---
+
+Improves oauth example with github email validation

.changeset/nervous-boats-act.md

@@ -0,0 +1,5 @@
+---
+"create-sva": patch
+---
+
+Add multi-file schema for drizzle

.changeset/rare-carrots-jam.md

@@ -0,0 +1,5 @@
+---
+"create-sva": patch
+---
+
+Add missing verifier token required by some oauth providers

cli/README.md

@@ -40,7 +40,7 @@ The _"SVA Stack"_ is a web development stack focused on **simplicity**, **consis
 | [Tailwind CSS](https://tailwindcss.com)       | Styling          | 💠 Recommended |
 | [Lucia](https://lucia-auth.com/)              | Auth             | 💠 Recommended |
 | [Drizzle](https://orm.drizzle.team/)          | Database Adapter | 💠 Recommended |
-| [Husky](https://typicode.github.io/husky/)    | Auth             | 💠 Optional    |
+| [Husky](https://typicode.github.io/husky/)    | Git Hooks        | 💠 Optional    |
 
 > [!NOTE]
 > create-sva is heavily inspired by the [t3stack](https://github.com/t3-oss/create-t3-app/), both in the methodology, and the CLI. The first version of this project used or learnt from many aspects of the t3 codebase, and we owe a lot to it's [contributors](https://github.com/t3-oss/create-t3-app/graphs/contributors).
@@ -83,7 +83,7 @@ The stated goal of `create-sva` is to provide the quickest way to start a new fu
 
 <h2 id="getting-started">Getting Started</h2>
 
-To scaffold an app using `create-t3-app`, run any of the following four commands and answer the command prompt questions:
+To scaffold an app using `create-sva`, run any of the following four commands and answer the command prompt questions:
 
 ### npm
 

cli/package.json

@@ -33,7 +33,7 @@
 	],
 	"scripts": {
 		"typecheck": "tsc --noEmit",
-		"build:css": "npx tailwind -i ./template/extras/src/tailwind.pcss -o ./template/base/src/app.pcss",
+		"build:css": "npx tailwind -i ./template/extras/tailwind/app.pcss -o ./template/base/src/app.pcss",
 		"build:readme": "cp -f ../README.md ./",
 		"build": "tsup",
 		"dev": "tsup --watch",
@@ -68,7 +68,7 @@
 	"devDependencies": {
 		"@types/fs-extra": "^11.0.4",
 		"@types/gradient-string": "^1.1.6",
-		"@types/node": "^20.14.9",
+		"@types/node": "^20.14.10",
 		"prettier": "^3.3.2",
 		"prettier-plugin-svelte": "^3.2.5",
 		"prettier-plugin-tailwindcss": "^0.6.5",

cli/src/installers/installer.adapter-auto.ts

@@ -1,26 +1,32 @@
 import { PKG_ROOT } from "$src/data/constants.js";
+import { AvailableDependencies } from "$src/installers/dependency-version-map.js";
 import { type Installer } from "$src/installers/installer.js";
 import { add_pkg_dependency } from "$src/utility/add-pkg-dependency.js";
 import fs from "fs-extra";
 import path from "path";
 
-export const adapter_auto_installer: Installer = ({ project_dir }) => {
-	// Add dependencies to package json
+type AdapterType = "auto" | "cloudflare" | "netlify" | "node" | "vercel";
 
-	add_pkg_dependency({
-		project_dir,
-		dependencies: ["@sveltejs/adapter-auto"],
-		is_dev_dependency: true,
-	});
+export const get_adapter_installer = (adapter: AdapterType): Installer => {
+	const dependencies: AvailableDependencies[] = [`@sveltejs/adapter-${adapter}`];
 
-	// Moving Files
+	const extras_dir = path.join(PKG_ROOT, "template/extras");
+	const config_src = path.join(extras_dir, `config/svelte-${adapter}.js`);
 
-	// Move template svelte.config.js file
+	const adapter_auto_installer: Installer = ({ project_dir }) => {
+		// Add dependencies to package json
 
-	const extras_dir = path.join(PKG_ROOT, "template/extras");
+		add_pkg_dependency({
+			project_dir,
+			dependencies,
+			is_dev_dependency: true,
+		});
+
+		// Moving Files
 
-	const config_src = path.join(extras_dir, `config/svelte-auto.js`);
-	const config_dest = path.join(project_dir, "svelte.config.js");
+		const config_dest = path.join(project_dir, "svelte.config.js");
+		fs.copySync(config_src, config_dest);
+	};
 
-	fs.copySync(config_src, config_dest);
+	return adapter_auto_installer;
 };

cli/src/installers/installer.adapter-cloudflare.ts

@@ -57,29 +57,41 @@ export const drizzle_installer: Installer = ({ packages, project_dir, database_s
 
 	// Moving Files
 
-	const source = path.join(PKG_ROOT, "template/extras");
-	const dest_server = path.join(project_dir, "src/lib/server");
+	const template_dir = path.join(PKG_ROOT, "template/extras/drizzle");
+	const db_dir = path.join(project_dir, "src/lib/server/db");
+	fs.mkdirSync(db_dir, { recursive: true });
 
 	// Setup config files
 
-	const config_src = path.join(source, `config/drizzle-config-${database_solution}.ts`);
+	const config_src = path.join(template_dir, `drizzle.config-${database_solution}.ts`);
 	const config_dest = path.join(project_dir, "drizzle.config.ts");
-	const config_content = fs.readFileSync(config_src, "utf-8");
+	fs.copySync(config_src, config_dest, { overwrite: true });
 
 	// Setup schema files
 
-	const schema_suffix = packages?.["lucia"].is_used ? "-lucia" : "";
-	const schema_src = path.join(
-		source,
-		`src/lib/server/schema-${database_solution}${schema_suffix}.ts`,
-	);
-	const schema_dest = path.join(dest_server, "schema.ts");
-	const schema_content = fs.readFileSync(schema_src, "utf-8");
+	if (packages?.["lucia"].is_used) {
+		const schema_lucia_src = path.join(template_dir, `lib/schema-${database_solution}-lucia.ts`);
+		const schema_lucia_dest = path.join(db_dir, "schema.lucia.ts");
+		fs.copySync(schema_lucia_src, schema_lucia_dest, { overwrite: true });
+
+		const schema_src = path.join(template_dir, `lib/schema-lucia.ts`);
+		const schema_dest = path.join(db_dir, "schema.ts");
+		fs.copySync(schema_src, schema_dest, { overwrite: true });
+	} else {
+		const schema_demo_src = path.join(template_dir, `lib/schema-${database_solution}-demo.ts`);
+		const schema_demo_dest = path.join(db_dir, "schema.demo.ts");
+		fs.copySync(schema_demo_src, schema_demo_dest, { overwrite: true });
+
+		const schema_src = path.join(template_dir, `lib/schema-demo.ts`);
+		const schema_dest = path.join(db_dir, "schema.ts");
+		fs.copySync(schema_src, schema_dest, { overwrite: true });
+	}
 
 	// Setup client files
 
-	const client_src = path.join(source, `src/lib/server/db-${database_solution}.ts`);
-	const client_dest = path.join(dest_server, "db.ts");
+	const client_src = path.join(template_dir, `lib/db-${database_solution}.ts`);
+	const client_dest = path.join(db_dir, "index.ts");
+	fs.copySync(client_src, client_dest, { overwrite: true });
 
 	// Add db:* scripts to package.json
 	update_pkg_json({
@@ -95,12 +107,4 @@ export const drizzle_installer: Installer = ({ packages, project_dir, database_s
 			return pkg;
 		},
 	});
-
-	// Write files to project directory
-
-	fs.copySync(config_src, config_dest, { overwrite: true });
-	fs.mkdirSync(path.dirname(schema_dest), { recursive: true });
-	fs.writeFileSync(schema_dest, schema_content);
-	fs.writeFileSync(config_dest, config_content);
-	fs.copySync(client_src, client_dest, { overwrite: true });
 };

cli/src/installers/installer.adapter-netlify.ts

@@ -24,62 +24,62 @@ export const lucia_installer: Installer = ({ project_dir, database_solution }) =
 
 	// Moving Files
 
-	const source = path.join(PKG_ROOT, "template/extras");
-	const dest = path.join(project_dir, "src/");
+	const template_dir = path.join(PKG_ROOT, "template/extras/lucia");
+	const routes_dir = path.join(project_dir, "src/routes");
+	const auth_dir = path.join(project_dir, "src/lib/server/auth");
+	fs.mkdirSync(auth_dir, { recursive: true });
 
-	// Lib
-
-	const global_types_src = path.join(source, `src/app-lucia.ts`);
-	const global_types_dest = path.join(dest, "app.d.ts");
-
-	const hook_server_src = path.join(source, `src/hooks-server-lucia.ts`);
-	const hook_server_dest = path.join(dest, "hooks.server.ts");
-
-	const auth_src = path.join(source, `src/lib/server/lucia-${database_solution}.ts`);
-	const auth_dest = path.join(dest, "lib/server/auth.ts");
-
-	const auth_create_session_src = path.join(source, `src/lib/server/lucia-auth.create-session.ts`);
-	const auth_create_session_dest = path.join(dest, "lib/server/auth.create-session.ts");
-
-	const auth_oauth_provider_src = path.join(source, `src/lib/server/lucia-auth.oauth-provider.ts`);
-	const auth_oauth_provider_dest = path.join(dest, "lib/server/auth.oauth-provider.ts");
-
-	const auth_use_oauth_src = path.join(source, `src/lib/server/lucia-auth.use-oauth.ts`);
-	const auth_use_oauth_dest = path.join(dest, "lib/server/auth.use-oauth.ts");
+	// Framework
 
-	/* Routes */
-
-	const account_server_src = path.join(source, `src/routes/lucia/page-account.ts`);
-	const account_server_dest = path.join(dest, "routes/account/+page.server.ts");
-
-	const account_svelte_src = path.join(source, `src/routes/lucia/page-account.svelte`);
-	const account_svelte_dest = path.join(dest, "routes/account/+page.svelte");
-
-	const login_server_src = path.join(source, `src/routes/lucia/page-login.ts`);
-	const login_server_dest = path.join(dest, "routes/login/+page.server.ts");
-
-	const login_svelte_src = path.join(source, `src/routes/lucia/page-login.svelte`);
-	const login_svelte_dest = path.join(dest, "routes/login/+page.svelte");
+	const global_types_src = path.join(template_dir, `app.d.ts`);
+	const global_types_dest = path.join(project_dir, "src/app.d.ts");
+	fs.copySync(global_types_src, global_types_dest, { overwrite: true });
 
-	const login_gh_server_src = path.join(source, `src/routes/lucia/github-login.ts`);
-	const login_gh_server_dest = path.join(dest, "routes/login/github/+server.ts");
+	const hook_server_src = path.join(template_dir, `hooks.server.ts`);
+	const hook_server_dest = path.join(project_dir, "src/hooks.server.ts");
+	fs.copySync(hook_server_src, hook_server_dest, { overwrite: true });
 
-	const login_ghcb_server_src = path.join(source, `src/routes/lucia/github-callback.ts`);
-	const login_ghcb_server_dest = path.join(dest, "routes/login/github/callback/+server.ts");
+	// Lib
 
-	// Copy Lib
-	fs.copySync(global_types_src, global_types_dest, { overwrite: true });
-	fs.copySync(hook_server_src, hook_server_dest, { overwrite: true });
+	const auth_src = path.join(template_dir, `lib/with-${database_solution}.ts`);
+	const auth_dest = path.join(auth_dir, "index.ts");
 	fs.copySync(auth_src, auth_dest, { overwrite: true });
+
+	const auth_create_session_src = path.join(template_dir, `lib/create-session.ts`);
+	const auth_create_session_dest = path.join(auth_dir, "create-session.ts");
 	fs.copySync(auth_create_session_src, auth_create_session_dest, { overwrite: true });
+
+	const auth_oauth_provider_src = path.join(template_dir, `lib/oauth.ts`);
+	const auth_oauth_provider_dest = path.join(auth_dir, "oauth.ts");
 	fs.copySync(auth_oauth_provider_src, auth_oauth_provider_dest, { overwrite: true });
+
+	const auth_use_oauth_src = path.join(template_dir, `lib/use-oauth.ts`);
+	const auth_use_oauth_dest = path.join(auth_dir, "use-oauth.ts");
 	fs.copySync(auth_use_oauth_src, auth_use_oauth_dest, { overwrite: true });
 
-	// Copy Routes
+	// Routes
+
+	const account_server_src = path.join(template_dir, `routes/account/+page.server.ts`);
+	const account_server_dest = path.join(routes_dir, "account/+page.server.ts");
 	fs.copySync(account_server_src, account_server_dest, { overwrite: true });
+
+	const account_svelte_src = path.join(template_dir, `routes/account/+page.svelte`);
+	const account_svelte_dest = path.join(routes_dir, "account/+page.svelte");
 	fs.copySync(account_svelte_src, account_svelte_dest, { overwrite: true });
+
+	const login_server_src = path.join(template_dir, `routes/login/+page.server.ts`);
+	const login_server_dest = path.join(routes_dir, "login/+page.server.ts");
 	fs.copySync(login_server_src, login_server_dest, { overwrite: true });
+
+	const login_svelte_src = path.join(template_dir, `routes/login/+page.svelte`);
+	const login_svelte_dest = path.join(routes_dir, "login/+page.svelte");
 	fs.copySync(login_svelte_src, login_svelte_dest, { overwrite: true });
+
+	const login_gh_server_src = path.join(template_dir, `routes/login/github/+server.ts`);
+	const login_gh_server_dest = path.join(routes_dir, "login/github/+server.ts");
 	fs.copySync(login_gh_server_src, login_gh_server_dest, { overwrite: true });
+
+	const login_ghcb_server_src = path.join(template_dir, `routes/login/github/callback/+server.ts`);
+	const login_ghcb_server_dest = path.join(routes_dir, "login/github/callback/+server.ts");
 	fs.copySync(login_ghcb_server_src, login_ghcb_server_dest, { overwrite: true });
 };