appflare 0.2.32 → 0.2.34

package/cli/commands/index.ts

@@ -84,6 +84,15 @@ export async function runDev(
 
 	const watcher = chokidar.watch(loadedConfig.scanDirAbs, {
 		ignoreInitial: true,
+		ignored: (path: string) => {
+			return (
+				path.includes("/_generated/") ||
+				path.includes("/dist/") ||
+				path.includes("/out/") ||
+				path.includes("/node_modules/") ||
+				path.endsWith(".d.ts")
+			);
+		},
 	});
 
 	watcher.on("all", async (_eventName, changedPath) => {

package/cli/generate.ts

@@ -1,6 +1,7 @@
 import { mkdir, readdir, rm } from "node:fs/promises";
 import { existsSync } from "node:fs";
-import { join, relative, resolve } from "node:path";
+import { dirname, join, relative, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 import { generateAuthConfigSource } from "./templates/auth/config";
 import { generateClientArtifacts } from "./templates/core/client.artifacts";
 import { generateDrizzleConfigSource } from "./templates/core/drizzle";
@@ -31,11 +32,26 @@ export async function generateArtifacts(
 		configPath,
 	);
 
+	const t0 = performance.now();
+
 	await Promise.all([
 		mkdir(outDirAbs, { recursive: true }),
 		mkdir(clientOutDirAbs, { recursive: true }),
 		mkdir(wranglerOutDirAbs, { recursive: true }),
 	]);
+	process.stdout.write(`📁 Directories (${(performance.now() - t0).toFixed(0)}ms)\n`);
+
+	const moduleDir = dirname(fileURLToPath(import.meta.url));
+	const tscBin = join(
+		dirname(Bun.resolveSync("typescript/package.json", moduleDir)),
+		"bin",
+		"tsc",
+	);
+	const betterAuthBin = join(
+		dirname(Bun.resolveSync("@better-auth/cli/package.json", moduleDir)),
+		"dist",
+		"index.mjs",
+	);
 
 	const serverPath = resolve(outDirAbs, "server.ts");
 	const clientPath = resolve(outDirAbs, "client.ts");
@@ -54,6 +70,9 @@ export async function generateArtifacts(
 		discoveredSchema.schemaPath,
 	);
 	const discoveredHandlers = await discoverHandlerOperations(loadedConfig);
+	process.stdout.write(
+		`🔍 ${discoveredHandlers.length} handler(s) (${(performance.now() - t0).toFixed(0)}ms)\n`,
+	);
 
 	const serverSource = generateServerSource(
 		config.auth.basePath,
@@ -117,6 +136,7 @@ export async function generateArtifacts(
 		Bun.write(wranglerPath, `${JSON.stringify(wranglerJson, null, 2)}\n`),
 		Bun.write(dashboardPath, dashboardSource),
 	]);
+	process.stdout.write(`📝 Source artifacts (${(performance.now() - t0).toFixed(0)}ms)\n`);
 
 	const authConfigPathFromConfigDir = relative(
 		configDir,
@@ -135,8 +155,8 @@ export async function generateArtifacts(
 
 	const betterAuthGenerate = Bun.spawn(
 		[
-			"npx",
-			"@better-auth/cli",
+			process.execPath,
+			betterAuthBin,
 			"generate",
 			"--config",
 			authConfigCliPath,
@@ -155,49 +175,70 @@ export async function generateArtifacts(
 	if (exitCode !== 0) {
 		throw new Error(`better-auth generation failed with exit code ${exitCode}`);
 	}
+	process.stdout.write(`🔐 Auth schema (${(performance.now() - t0).toFixed(0)}ms)\n`);
 
-	const generatedTsconfig = {
-		compilerOptions: {
-			lib: ["es2024"],
-			types: ["@types/node", "bun", "@cloudflare/workers-types/2023-07-01"],
-			module: "es2022",
-			target: "es2024",
-			moduleResolution: "bundler",
-			strictNullChecks: true,
-			skipLibCheck: true,
-			declaration: true,
-			emitDeclarationOnly: true,
-			jsx: "react-jsx",
-			paths: {
-				"_generated/*": ["./*"],
+	function generatedTsconfig(overrides: Record<string, unknown> = {}) {
+		return {
+			compilerOptions: {
+				lib: ["es2024"],
+				types: ["@types/node", "bun", "@cloudflare/workers-types/2023-07-01"],
+				module: "es2022",
+				target: "es2024",
+				moduleResolution: "bundler",
+				strictNullChecks: true,
+				skipLibCheck: true,
+				declaration: true,
+				emitDeclarationOnly: true,
+				noCheck: true,
+				jsx: "react-jsx",
+				paths: {
+					"_generated/*": ["./*"],
+				},
+				...overrides,
 			},
-		},
-		include: ["*.ts", "client/*.ts"],
-	};
+			include: ["./*.ts", "./client/*.ts"],
+		};
+	}
 
-	const generatedTsconfigPath = resolve(outDirAbs, "tsconfig.json");
-	await Bun.write(
-		generatedTsconfigPath,
-		`${JSON.stringify(generatedTsconfig, null, 2)}\n`,
-	);
+	const jsTsconfigPath = resolve(outDirAbs, "tsconfig.js.json");
 
-	const npxCmd = process.platform === "win32" ? "npx.cmd" : "npx";
-	const generatedBuild = Bun.spawn(
-		[npxCmd, "--yes", "-p", "typescript", "tsc", "-p", generatedTsconfigPath],
-		{
+	await Promise.all([
+		Bun.write(
+			jsTsconfigPath,
+			`${JSON.stringify(generatedTsconfig({ declaration:true,emitDeclarationOnly: false }), null, 2)}\n`,
+		),
+	]);
+	process.stdout.write(`📄 TS configs (${(performance.now() - t0).toFixed(0)}ms)\n`);
+
+	async function runTsc(configPath: string, label: string): Promise<void> {
+		process.stdout.write(`⚙️  ${label}... (${(performance.now() - t0).toFixed(0)}ms)\n`);
+		const p = Bun.spawn([process.execPath, tscBin, "-p", configPath], {
 			cwd: outDirAbs,
 			stdout: "inherit",
 			stderr: "inherit",
-		},
-	);
-
-	const generatedBuildExitCode = await generatedBuild.exited;
-	if (generatedBuildExitCode !== 0) {
-		throw new Error(
-			`Generated code build failed with exit code ${generatedBuildExitCode}`,
-		);
+		});
+		console.log(process.execPath, tscBin, "-p", configPath, { cwd: outDirAbs });
+		const code = await p.exited;
+		if (code !== 0) throw new Error(`tsc ${label} failed with exit code ${code}`);
 	}
 
+	await runTsc(jsTsconfigPath, "JS files");
+	process.stdout.write(`✅ JS + declarations (${(performance.now() - t0).toFixed(0)}ms)\n`);
+	async function removeTsFiles(dir: string): Promise<void> {
+		const entries = await readdir(dir, { withFileTypes: true });
+		for (const entry of entries) {
+			const fullPath = join(dir, entry.name);
+			if (entry.isDirectory()) {
+				if (entry.name === "node_modules" || entry.name.startsWith(".")) continue;
+				await removeTsFiles(fullPath);
+			} else if (entry.name.endsWith(".ts") && !entry.name.endsWith(".d.ts")) {
+				await rm(fullPath);
+			}
+		}
+	}
+	await removeTsFiles(outDirAbs);
+	process.stdout.write(`📦 Cleaned .ts files (${(performance.now() - t0).toFixed(0)}ms)\n`);
+	
 	const generatedDirPrefix = outDirAbs + "/";
 	async function cleanDtsOutside(dir: string): Promise<void> {
 		const entries = await readdir(dir, { withFileTypes: true });
@@ -213,19 +254,24 @@ export async function generateArtifacts(
 				}
 				await cleanDtsOutside(fullPath);
 			} else if (
-				entry.name.endsWith(".d.ts") &&
-				!fullPath.startsWith(generatedDirPrefix)
+				!fullPath.startsWith(generatedDirPrefix) && (
+				entry.name.endsWith(".d.ts") || (
+				entry.name.endsWith(".js"))
+				)
 			) {
 				await rm(fullPath);
 			}
 		}
 	}
 	await cleanDtsOutside(configDir);
+	process.stdout.write(`🧹 Cleanup (${(performance.now() - t0).toFixed(0)}ms)\n`);
+
 
 	const tsconfigPath = resolve(configDir, "tsconfig.json");
 	if (loadedConfig.config.build && existsSync(tsconfigPath)) {
+		process.stdout.write(`⚙️  Building project... (${(performance.now() - t0).toFixed(0)}ms)\n`);
 		const tsBuild = Bun.spawn(
-			[npxCmd, "--yes", "-p", "typescript", "tsc", "--build"],
+			[process.execPath, tscBin, "--build"],
 			{
 				cwd: configDir,
 				stdout: "inherit",
@@ -239,5 +285,6 @@ export async function generateArtifacts(
 				`TypeScript build failed with exit code ${tsBuildExitCode}`,
 			);
 		}
+		process.stdout.write(`✅ Build complete (${(performance.now() - t0).toFixed(0)}ms)\n`);
 	}
 }