Prisma Integration + Scaffolding Fixes

eslint.config.mjs

@@ -26,7 +26,10 @@ export default defineConfig([
 			'scripts/**',
 			'**/*/htmx.*.min.js',
 			'src/templates/types/**',
-			'src/templates/svelte/**'
+			'src/templates/svelte/**',
+			'test-scaffold/**/*.json',
+			'test-scaffold/**/*.config.*',
+			'test-scaffold/.prettierrc.*'
 		]
 	},
 

src/commands/formatProject.ts

@@ -1,6 +1,5 @@
-import { exit } from 'process';
+import { exit } from 'node:process';
 import { spinner } from '@clack/prompts';
-import { $ } from 'bun';
 import { green, red } from 'picocolors';
 import { PackageManager } from '../types';
 import { formatCommands, formatNoInstallCommands } from '../utils/commandMaps';
@@ -17,15 +16,26 @@ export const formatProject = async ({
 	installDependenciesNow
 }: FormatProjectProps) => {
 	const spin = spinner();
+	const fmt = installDependenciesNow
+		? formatCommands[packageManager]
+		: formatNoInstallCommands[packageManager];
+	const parts = fmt.split(/\s+/);
+	const bin = parts[0];
+	if (bin === undefined) throw new Error('Empty format command');
+	const args = parts.slice(1);
 
 	try {
-		const fmt = installDependenciesNow
-			? formatCommands[packageManager]
-			: formatNoInstallCommands[packageManager];
-
 		spin.start('Formatting files…');
-		const [bin, ...args] = fmt.split(' ');
-		await $`${bin} ${args}`.cwd(projectName).quiet();
+		const proc = Bun.spawnSync([bin, ...args], {
+			cwd: projectName,
+			stderr: 'pipe',
+			stdout: 'ignore'
+		});
+		if (!proc.success) {
+			const errMsg =
+				proc.stderr?.toString().trim() ?? `Exit code ${proc.exitCode}`;
+			throw new Error(errMsg);
+		}
 		spin.stop(green('Files formatted'));
 	} catch (err) {
 		spin.cancel(red('Failed to format files'));

src/commands/initializeGit.ts

@@ -1,18 +1,38 @@
 import { spinner } from '@clack/prompts';
 import { $ } from 'bun';
 import { green, red } from 'picocolors';
+import { abort } from '../utils/abort';
+import { checkGitInstalled } from '../utils/checkGitInstalled';
+
+const initializeRepository = async (
+	projectName: string,
+	spin: ReturnType<typeof spinner>
+) => {
+	spin.stop();
+	spin.start('Initializing git repository…');
+
+	await $`git init -b main`.cwd(projectName).quiet();
+	await $`git add -A`.cwd(projectName).quiet();
+	await $`git commit -m "Initial commit"`.cwd(projectName).quiet();
+
+	spin.stop(green('Git repo initialized'));
+};
 
 export const initializeGit = async (projectName: string) => {
 	const spin = spinner();
 
-	try {
-		spin.start('Initializing git repository…');
+	spin.start('Checking git availability...');
+	const isGitInstalled = await checkGitInstalled();
 
-		await $`git init -b main`.cwd(projectName).quiet();
-		await $`git add -A`.cwd(projectName).quiet();
-		await $`git commit -m "Initial commit"`.cwd(projectName).quiet();
+	if (!isGitInstalled) {
+		spin.stop(
+			red('Git is not installed. Please install git before proceeding.')
+		);
+		abort();
+	}
 
-		spin.stop(green('Git repo initialized'));
+	try {
+		await initializeRepository(projectName, spin);
 	} catch (err) {
 		spin.cancel(red('Failed to initialize git'));
 		throw err;

src/commands/installDependencies.ts

@@ -1,6 +1,5 @@
 import { exit } from 'process';
 import { spinner } from '@clack/prompts';
-import { $ } from 'bun';
 import { green, red } from 'picocolors';
 import { PackageManager } from '../types';
 import { installCommands } from '../utils/commandMaps';
@@ -11,11 +10,23 @@ export const installDependencies = async (
 ) => {
 	const spin = spinner();
 	const cmd = installCommands[packageManager];
+	const parts = cmd.split(/\s+/);
+	const bin = parts[0];
+	if (bin === undefined) throw new Error('Empty install command');
+	const args = parts.slice(1);
 
 	try {
 		spin.start('Installing dependencies');
-		const [bin, ...args] = cmd.split(' ');
-		await $`${bin} ${args}`.cwd(projectName).quiet();
+		const proc = Bun.spawnSync([bin, ...args], {
+			cwd: projectName,
+			stderr: 'pipe',
+			stdout: 'ignore'
+		});
+		if (!proc.success) {
+			const errMsg =
+				proc.stderr?.toString().trim() ?? `Exit code ${proc.exitCode}`;
+			throw new Error(errMsg);
+		}
 		spin.stop(green('Dependencies installed'));
 	} catch (err) {
 		spin.cancel(red('Installation failed'));

src/data.ts

@@ -187,6 +187,24 @@ export const eslintReactDependencies: AvailableDependency[] = [
 		value: 'zod-validation-error'
 	}
 ];
+
+export const prismaRuntimeDependencies: AvailableDependency[] = [
+	{
+		latestVersion: '6.2.0',
+		value: '@prisma/client'
+	}
+];
+
+export const prismaDevDependencies: AvailableDependency[] = [
+	{
+		latestVersion: '6.2.0',
+		value: 'prisma'
+	},
+	{
+		latestVersion: '1.2.1',
+		value: '@prisma/extension-accelerate'
+	}
+];
 export const frontendLabels: FrontendLabels = {
 	html: 'HTML',
 	htmx: 'HTMX',

src/generators/configurations/generateEnv.ts

@@ -4,33 +4,41 @@ import { CreateConfiguration } from '../../types';
 
 type GenerateEnvProps = Pick<
 	CreateConfiguration,
-	'databaseEngine' | 'databaseHost' | 'projectName'
+	'databaseEngine' | 'databaseHost' | 'projectName' | 'databaseDirectory'
 > & {
 	envVariables?: string[];
 };
 
 const databaseURLS = {
 	cockroachdb: 'postgresql://root@localhost:26257/database',
 	gel: 'gel://admin@localhost:5656/main?tls_security=insecure',
-	mariadb: 'mariadb://user:userpassword@localhost:3306/database',
-	mongodb: 'mongodb://user:password@localhost:27017/database',
-	mssql: 'Server=localhost,1433;Database=master;User Id=sa;Password=SApassword1;Encrypt=true;TrustServerCertificate=true',
-	mysql: 'mysql://user:userpassword@localhost:3306/database',
-	postgresql: 'postgresql://user:password@localhost:5432/database',
-	singlestore: 'mysql://root:password@localhost:3306/database'
+	mariadb: 'mysql://root:rootpassword@localhost:3306/database',
+	mongodb:
+		'mongodb://root:rootpassword@127.0.0.1:27017/database?authSource=admin&directConnection=true',
+	mssql:
+		'Server=localhost,1433;Database=master;User Id=sa;Password=SApassword1;Encrypt=true;TrustServerCertificate=true',
+	mysql: 'mysql://root:rootpassword@localhost:3306/database',
+	postgresql: 'postgresql://postgres:rootpassword@localhost:5432/database',
+	singlestore: 'mysql://root:rootpassword@localhost:3306/database'
 } as const;
 
 export const generateEnv = ({
 	databaseEngine,
 	databaseHost,
+	databaseDirectory = 'db',
 	envVariables = [],
 	projectName
 }: GenerateEnvProps) => {
 	const vars = [...envVariables];
 
 	if (
-		databaseEngine !== 'sqlite' &&
+		databaseEngine === 'sqlite' &&
+		(databaseHost === 'none' || databaseHost === undefined)
+	) {
+		vars.push(`DATABASE_URL=file:./${databaseDirectory}/database.sqlite`);
+	} else if (
 		databaseEngine !== 'none' &&
+		databaseEngine !== 'sqlite' &&
 		databaseEngine !== undefined &&
 		(databaseHost === 'none' || databaseHost === undefined)
 	) {

src/generators/configurations/generatePackageJson.ts

@@ -8,10 +8,13 @@ import {
 	defaultDependencies,
 	defaultPlugins,
 	eslintAndPrettierDependencies,
-	eslintReactDependencies
+	eslintReactDependencies,
+	prismaDevDependencies,
+	prismaRuntimeDependencies
 } from '../../data';
 import type { CreateConfiguration, PackageJson } from '../../types';
 import { getPackageVersions } from '../../utils/getPackageVersion';
+import { toDockerProjectName } from '../../utils/toDockerProjectName';
 import { versions } from '../../versions';
 import { computeFlags } from '../project/computeFlags';
 
@@ -25,6 +28,7 @@ type CreatePackageJsonProps = Pick<
 	| 'orm'
 	| 'frontendDirectories'
 	| 'codeQualityTool'
+	| 'databaseDirectory'
 > & {
 	projectName: string;
 	latest: boolean;
@@ -33,13 +37,13 @@ type CreatePackageJsonProps = Pick<
 const dbClientCommands = {
 	cockroachdb: 'cockroach sql --insecure --database=database',
 	gel: 'gel -H localhost -P 5656 -u admin --tls-security insecure -b main',
-	mariadb: 'MYSQL_PWD=userpassword mariadb -h127.0.0.1 -u user database',
+	mariadb: 'MYSQL_PWD=rootpassword mariadb -h127.0.0.1 -u root database',
 	mongodb:
-		'mongosh -u user -p password --authenticationDatabase admin database',
+		'mongosh -u root -p rootpassword --authenticationDatabase admin database',
 	mssql: '/opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P SApassword1',
-	mysql: 'MYSQL_PWD=userpassword mysql -h127.0.0.1 -u user database',
-	postgresql: 'psql -h localhost -U user -d database',
-	singlestore: 'singlestore -u root -ppassword -D database'
+	mysql: 'MYSQL_PWD=rootpassword mysql -h127.0.0.1 -u root database',
+	postgresql: 'psql -h localhost -U postgres -d database',
+	singlestore: 'singlestore -u root -prootpassword -D database'
 } as const;
 
 export const createPackageJson = async ({
@@ -52,7 +56,8 @@ export const createPackageJson = async ({
 	useTailwind,
 	latest,
 	frontendDirectories,
-	codeQualityTool
+	codeQualityTool,
+	databaseDirectory
 }: CreatePackageJsonProps) => {
 	const flags = computeFlags(frontendDirectories);
 	const isLocal = !databaseHost || databaseHost === 'none';
@@ -248,33 +253,58 @@ export const createPackageJson = async ({
 			versions['elysia-scoped-state']
 		);
 	}
-
 	if (orm === 'drizzle') {
 		dependencies['drizzle-orm'] = resolveVersion(
 			'drizzle-orm',
 			versions['drizzle-orm']
 		);
+		devDependencies['drizzle-kit'] = resolveVersion(
+			'drizzle-kit',
+			versions['drizzle-kit']
+		);
 	}
+	const usesAccelerate =
+		orm === 'prisma' &&
+		(databaseHost === 'neon' || databaseHost === 'planetscale');
 
-	switch (databaseHost) {
-		case 'neon':
-			dependencies['@neondatabase/serverless'] = resolveVersion(
-				'@neondatabase/serverless',
-				versions['@neondatabase/serverless']
-			);
-			break;
-		case 'planetscale':
-			dependencies['@planetscale/database'] = resolveVersion(
-				'@planetscale/database',
-				versions['@planetscale/database']
+	if (orm === 'prisma') {
+		prismaRuntimeDependencies.forEach((dep) => {
+			dependencies[dep.value] = resolveVersion(
+				dep.value,
+				dep.latestVersion
 			);
-			break;
-		case 'turso':
-			dependencies['@libsql/client'] = resolveVersion(
-				'@libsql/client',
-				versions['@libsql/client']
+		});
+
+		prismaDevDependencies.forEach((dep) => {
+			if (dep.value === '@prisma/extension-accelerate' && !usesAccelerate)
+				return;
+			devDependencies[dep.value] = resolveVersion(
+				dep.value,
+				dep.latestVersion
 			);
-			break;
+		});
+	}
+	if (orm === 'drizzle') {
+		switch (databaseHost) {
+			case 'neon':
+				dependencies['@neondatabase/serverless'] = resolveVersion(
+					'@neondatabase/serverless',
+					versions['@neondatabase/serverless']
+				);
+				break;
+			case 'planetscale':
+				dependencies['@planetscale/database'] = resolveVersion(
+					'@planetscale/database',
+					versions['@planetscale/database']
+				);
+				break;
+			case 'turso':
+				dependencies['@libsql/client'] = resolveVersion(
+					'@libsql/client',
+					versions['@libsql/client']
+				);
+				break;
+		}
 	}
 
 	if (latest) s.stop(green('Package versions resolved'));
@@ -296,7 +326,8 @@ export const createPackageJson = async ({
 		databaseEngine !== 'sqlite'
 	) {
 		const clientCmd = dbClientCommands[databaseEngine];
-		const dockerPrefix = `docker compose -p ${databaseEngine} -f db/docker-compose.db.yml`;
+		const composeFile = `${databaseDirectory ?? 'db'}/docker-compose.db.yml`;
+		const dockerPrefix = `docker compose -p ${toDockerProjectName(projectName)} -f ${composeFile}`;
 
 		scripts['db:up'] = `${dockerPrefix} up -d --wait db`;
 		scripts['db:down'] = `${dockerPrefix} down`;
@@ -347,16 +378,33 @@ export const createPackageJson = async ({
 		);
 	}
 
-	if (isLocalDb && databaseEngine === 'sqlite') {
-		scripts['db:sqlite'] = 'sqlite3 db/database.sqlite';
-		scripts['db:init'] = 'sqlite3 db/database.sqlite < db/init.sql';
+	if (isLocal && databaseEngine === 'sqlite') {
+		const dbDir = databaseDirectory ?? 'db';
+		scripts['db:sqlite'] = `sqlite3 ${dbDir}/database.sqlite`;
+		scripts['db:init'] =
+			`sqlite3 ${dbDir}/database.sqlite < ${dbDir}/init.sql`;
 	}
 
 	if (orm === 'drizzle') {
 		scripts['db:studio'] = 'drizzle-kit studio';
 		scripts['db:push'] = 'drizzle-kit push';
 	}
 
+	if (orm === 'prisma') {
+		const schemaPath = databaseDirectory
+			? `${databaseDirectory}/schema.prisma`
+			: 'db/schema.prisma';
+		scripts['postinstall'] = `prisma generate --schema ${schemaPath}`;
+		scripts['db:generate'] = `prisma generate --schema ${schemaPath}`;
+		scripts['db:push'] = `prisma db push --schema ${schemaPath}`;
+		scripts['db:studio'] = `prisma studio --schema ${schemaPath}`;
+		scripts['db:migrate'] = `prisma migrate dev --schema ${schemaPath}`;
+		scripts['db:migrate:deploy'] =
+			`prisma migrate deploy --schema ${schemaPath}`;
+		scripts['db:migrate:reset'] =
+			`prisma migrate reset --schema ${schemaPath}`;
+	}
+
 	const packageJson: PackageJson = {
 		dependencies,
 		devDependencies,