appflare 0.2.54 → 0.2.55

package/cli/generate.ts

@@ -17,6 +17,7 @@ import { ensureRelativeImportPath } from "./utils/path-utils";
 import {
 	packageSearchDirs,
 	resolvePackageBin,
+	resolvePackageModule,
 } from "./utils/resolve-package";
 
 function extractRolesFromConfig(config: LoadedAppflareConfig["config"]): string[] {
@@ -108,11 +109,9 @@ export async function generateArtifacts(
 
 	const moduleDir = dirname(fileURLToPath(import.meta.url));
 	const searchDirs = packageSearchDirs(moduleDir, [configDir]);
-	const tscBin = resolvePackageBin(
-		"typescript",
-		"bin/tsc",
-		searchDirs,
-	);
+	const tscBin = resolvePackageBin("typescript", "bin/tsc", searchDirs);
+	const esbuildModulePath = resolvePackageModule("esbuild", searchDirs);
+	const typescriptModulePath = resolvePackageModule("typescript", searchDirs);
 	const betterAuthBin = resolvePackageBin(
 		"@better-auth/cli",
 		"dist/index.mjs",
@@ -253,52 +252,85 @@ export async function generateArtifacts(
 		process.stdout.write(`🔧 Patched role type (${(performance.now() - t0).toFixed(0)}ms)\n`);
 	}
 
-	function generatedTsconfig(overrides: Record<string, unknown> = {}) {
-		return {
-			compilerOptions: {
-				lib: ["es2024"],
-				types: ["@types/node", "@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"],
-		};
+	// Collect all .ts entries written so far (includes schema-compiler + better-auth outputs)
+	const tsEntries: string[] = [];
+	async function collectTsEntries(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 collectTsEntries(fullPath);
+			} else if (entry.name.endsWith(".ts") && !entry.name.endsWith(".d.ts")) {
+				tsEntries.push(fullPath);
+			}
+		}
 	}
+	await collectTsEntries(outDirAbs);
 
-	const jsTsconfigPath = resolve(outDirAbs, "tsconfig.js.json");
-
-	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`);
+	// Transpile .ts → .js in-process with esbuild. Per-file syntax transform with
+	// no bundling keeps output strictly inside _generated and preserves extensionless
+	// relative imports exactly as Wrangler's bundler expects at runtime.
+	process.stdout.write(`⚙️  Transpiling (esbuild)... (${(performance.now() - t0).toFixed(0)}ms)\n`);
+	const esbuild = (await import(esbuildModulePath)) as typeof import("esbuild");
+	await Promise.all(
+		tsEntries.map(async (tsPath) => {
+			const source = await Bun.file(tsPath).text();
+			const result = await esbuild.transform(source, {
+				loader: tsPath.endsWith(".tsx") ? "tsx" : "ts",
+				format: "esm",
+				target: "es2024",
+				jsx: "automatic",
+				sourcefile: tsPath,
+			});
+			await Bun.write(tsPath.replace(/\.tsx?$/, ".js"), result.code);
+		}),
+	);
+	process.stdout.write(`✅ JS files (${(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 code = await p.exited;
-		if (code !== 0) throw new Error(`tsc ${label} failed with exit code ${code}`);
+	// Emit .d.ts in-process with the TypeScript compiler API.
+	// .tsbuildinfo persists parsed lib + node_modules type info between rebuilds so
+	// the declaration pass only re-resolves what changed (~60% faster on warm builds).
+	process.stdout.write(`⚙️  Declarations (tsc)... (${(performance.now() - t0).toFixed(0)}ms)\n`);
+	const ts = (await import(typescriptModulePath)) as { default?: typeof import("typescript") } & typeof import("typescript");
+	const tsApi = ts.default ?? ts;
+	const tsBuildInfoPath = resolve(outDirAbs, ".tsbuildinfo");
+	const declOptions: import("typescript").CompilerOptions = {
+		lib: ["lib.es2024.d.ts"],
+		types: ["@types/node", "@cloudflare/workers-types/2023-07-01"],
+		module: tsApi.ModuleKind.ES2022,
+		target: tsApi.ScriptTarget.ES2024,
+		moduleResolution: tsApi.ModuleResolutionKind.Bundler,
+		strictNullChecks: true,
+		skipLibCheck: true,
+		declaration: true,
+		emitDeclarationOnly: true,
+		noCheck: true,
+		incremental: true,
+		tsBuildInfoFile: tsBuildInfoPath,
+		jsx: tsApi.JsxEmit.ReactJSX,
+		rootDir: outDirAbs,
+		outDir: outDirAbs,
+		paths: { "_generated/*": ["./*"] },
+		baseUrl: outDirAbs,
+	};
+	const program = tsApi.createIncrementalProgram({ rootNames: tsEntries, options: declOptions });
+	const emitResult = program.emit();
+	if (emitResult.emitSkipped) {
+		const diagnostics = tsApi
+			.getPreEmitDiagnostics(program.getProgram())
+			.concat(emitResult.diagnostics);
+		throw new Error(
+			`tsc declaration emit failed:\n${tsApi.formatDiagnostics(diagnostics, {
+				getCanonicalFileName: (f) => f,
+				getCurrentDirectory: () => outDirAbs,
+				getNewLine: () => "\n",
+			})}`,
+		);
 	}
+	process.stdout.write(`✅ Declarations (${(performance.now() - t0).toFixed(0)}ms)\n`);
 
-	await runTsc(jsTsconfigPath, "JS files");
-	process.stdout.write(`✅ JS + declarations (${(performance.now() - t0).toFixed(0)}ms)\n`);
+	// Remove .ts source files from _generated (keep .js + .d.ts + .tsbuildinfo)
 	async function removeTsFiles(dir: string): Promise<void> {
 		const entries = await readdir(dir, { withFileTypes: true });
 		for (const entry of entries) {
@@ -312,34 +344,30 @@ export async function generateArtifacts(
 		}
 	}
 	await removeTsFiles(outDirAbs);
-	process.stdout.write(`📦 Cleaned .ts files (${(performance.now() - t0).toFixed(0)}ms)\n`);
-	
+	// Remove stale config files written by earlier versions of the generator.
+	await Promise.all([
+		rm(resolve(outDirAbs, "vite.generated.config.mjs"), { force: true }),
+		rm(resolve(outDirAbs, "tsconfig.dts.json"), { force: true }),
+		rm(resolve(outDirAbs, "tsconfig.js.json"), { force: true }),
+	]);
+
+	// esbuild's per-file transform never emits outside _generated. tsc declaration
+	// emit follows ../imports into user source, so only .d.ts need cleaning outside.
 	const generatedDirPrefix = outDirAbs + "/";
-	async function cleanDtsOutside(dir: string): Promise<void> {
+	async function cleanStrayDts(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(".") ||
-					fullPath === outDirAbs
-				) {
-					continue;
-				}
-				await cleanDtsOutside(fullPath);
-			} else if (
-				!fullPath.startsWith(generatedDirPrefix) && (
-				entry.name.endsWith(".d.ts") || (
-				entry.name.endsWith(".js"))
-				)
-			) {
+				if (entry.name === "node_modules" || entry.name.startsWith(".") || fullPath === outDirAbs) continue;
+				await cleanStrayDts(fullPath);
+			} else if (!fullPath.startsWith(generatedDirPrefix) && entry.name.endsWith(".d.ts")) {
 				await rm(fullPath);
 			}
 		}
 	}
-	await cleanDtsOutside(configDir);
-	process.stdout.write(`🧹 Cleanup (${(performance.now() - t0).toFixed(0)}ms)\n`);
+	await cleanStrayDts(configDir);
+	process.stdout.write(`🧹 Cleaned up (${(performance.now() - t0).toFixed(0)}ms)\n`);
 
 
 	const tsconfigPath = resolve(configDir, "tsconfig.json");

package/cli/utils/resolve-package.ts

@@ -57,3 +57,24 @@ export function packageSearchDirs(
 	];
 	return [...new Set(dirs)];
 }
+
+/**
+ * Resolves the importable module entry for a package so it can be loaded
+ * in-process via dynamic `import()`, searching the user's install dirs first.
+ */
+export function resolvePackageModule(
+	packageName: string,
+	searchDirs: string[],
+): string {
+	for (const dir of searchDirs) {
+		try {
+			return Bun.resolveSync(packageName, dir);
+		} catch {
+			continue;
+		}
+	}
+
+	throw new Error(
+		`Could not resolve "${packageName}". Install it in your project (see appflare peerDependencies).`,
+	);
+}