appflare 0.2.29 → 0.2.31

package/cli/generate.ts

@@ -1,178 +1,178 @@
-import { mkdir } from "node:fs/promises";
-import { existsSync } from "node:fs";
-import { relative, resolve } from "node:path";
-import { generateAuthConfigSource } from "./templates/auth/config";
-import { generateClientArtifacts } from "./templates/core/client.artifacts";
-import { generateDrizzleConfigSource } from "./templates/core/drizzle";
-import { generateHandlersArtifacts } from "./templates/core/handlers";
-import { generateServerSource } from "./templates/core/server";
-import { generateWranglerJson } from "./templates/core/wrangler";
-import { generateDashboardSource } from "./templates/dashboard/index";
-import { compileSchemaDsl } from "./schema-compiler";
-import type { LoadedAppflareConfig } from "./types";
-import { discoverHandlerOperations } from "./utils/handler-discovery";
-import { discoverSchema } from "./utils/schema-discovery";
-import { ensureRelativeImportPath } from "./utils/path-utils";
-
-function toConfigRelativePath(configDir: string, absolutePath: string): string {
-	const relativePath = relative(configDir, absolutePath).replace(/\\/g, "/");
-	return relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
-}
-
-export async function generateArtifacts(
-	loadedConfig: LoadedAppflareConfig,
-): Promise<void> {
-	const { outDirAbs, wranglerOutDirAbs, config, configPath, configDir } =
-		loadedConfig;
-	const configImport = ensureRelativeImportPath(outDirAbs, configPath);
-	const clientOutDirAbs = resolve(outDirAbs, "client");
-	const clientConfigImport = ensureRelativeImportPath(
-		clientOutDirAbs,
-		configPath,
-	);
-
-	await Promise.all([
-		mkdir(outDirAbs, { recursive: true }),
-		mkdir(clientOutDirAbs, { recursive: true }),
-		mkdir(wranglerOutDirAbs, { recursive: true }),
-	]);
-
-	const serverPath = resolve(outDirAbs, "server.ts");
-	const clientPath = resolve(outDirAbs, "client.ts");
-	const authConfigPath = resolve(outDirAbs, "auth.config.ts");
-	const authSchemaPath = resolve(outDirAbs, "auth.schema.ts");
-	const drizzleConfigPath = resolve(outDirAbs, "drizzle.config.ts");
-	const wranglerPath = resolve(wranglerOutDirAbs, "wrangler.json");
-	const compiledSchema = await compileSchemaDsl(loadedConfig);
-
-	const discoveredSchema = await discoverSchema(
-		loadedConfig,
-		compiledSchema ? [compiledSchema.schemaPath] : [],
-	);
-	const schemaImport = ensureRelativeImportPath(
-		outDirAbs,
-		discoveredSchema.schemaPath,
-	);
-	const discoveredHandlers = await discoverHandlerOperations(loadedConfig);
-
-	const serverSource = generateServerSource(
-		config.auth.basePath,
-		config.database[0].binding,
-		config.kv[0]?.binding,
-		config.scheduler.binding,
-		config.r2[0]?.binding,
-		config.realtime.binding,
-		config.realtime.objectName,
-		config.realtime.subscribePath,
-		config.realtime.websocketPath,
-		config.realtime.protocol,
-	);
-	const clientArtifacts = generateClientArtifacts(
-		clientConfigImport,
-		discoveredHandlers,
-	);
-	const handlerArtifacts = generateHandlersArtifacts(
-		schemaImport,
-		discoveredHandlers,
-		config.r2[0]?.binding,
-	);
-	const authConfigSource = generateAuthConfigSource(configImport);
-	const drizzleSchemaPaths = compiledSchema
-		? [
-				toConfigRelativePath(configDir, compiledSchema.schemaPath),
-				...config.schema.filter((schemaPath) => {
-					return !/(^|\/)schema\.ts$/.test(schemaPath);
-				}),
-			]
-		: config.schema;
-	const drizzleConfigSource = generateDrizzleConfigSource(drizzleSchemaPaths);
-	const wranglerJson = generateWranglerJson(loadedConfig, discoveredHandlers);
-	const dashboardSource = generateDashboardSource(
-		schemaImport,
-		discoveredSchema,
-		discoveredHandlers,
-	);
-	const dashboardPath = resolve(outDirAbs, "admin.routes.ts");
-	const handlerWriteOperations = handlerArtifacts.map((artifact) => {
-		return Bun.write(
-			resolve(outDirAbs, artifact.relativePath),
-			artifact.source,
-		);
-	});
-	const clientWriteOperations = clientArtifacts.map((artifact) => {
-		return Bun.write(
-			resolve(outDirAbs, artifact.relativePath),
-			artifact.source,
-		);
-	});
-
-	await Promise.all([
-		Bun.write(serverPath, serverSource),
-		Bun.write(clientPath, 'export * from "./client/index";\n'),
-		...clientWriteOperations,
-		...handlerWriteOperations,
-		Bun.write(authConfigPath, authConfigSource),
-		Bun.write(authSchemaPath, ""),
-		Bun.write(drizzleConfigPath, drizzleConfigSource),
-		Bun.write(wranglerPath, `${JSON.stringify(wranglerJson, null, 2)}\n`),
-		Bun.write(dashboardPath, dashboardSource),
-	]);
-
-	const authConfigPathFromConfigDir = relative(
-		configDir,
-		authConfigPath,
-	).replace(/\\/g, "/");
-	const authConfigCliPath = authConfigPathFromConfigDir.startsWith(".")
-		? authConfigPathFromConfigDir
-		: `./${authConfigPathFromConfigDir}`;
-	const authSchemaPathFromConfigDir = relative(
-		configDir,
-		authSchemaPath,
-	).replace(/\\/g, "/");
-	const authSchemaCliPath = authSchemaPathFromConfigDir.startsWith(".")
-		? authSchemaPathFromConfigDir
-		: `./${authSchemaPathFromConfigDir}`;
-
-	const betterAuthGenerate = Bun.spawn(
-		[
-			"npx",
-			"@better-auth/cli",
-			"generate",
-			"--config",
-			authConfigCliPath,
-			"--output",
-			authSchemaCliPath,
-			"--yes",
-		],
-		{
-			cwd: configDir,
-			stdout: "inherit",
-			stderr: "inherit",
-		},
-	);
-
-	const exitCode = await betterAuthGenerate.exited;
-	if (exitCode !== 0) {
-		throw new Error(`better-auth generation failed with exit code ${exitCode}`);
-	}
-
-	const tsconfigPath = resolve(configDir, "tsconfig.json");
-	if (loadedConfig.config.build && existsSync(tsconfigPath)) {
-		const npxCmd = process.platform === "win32" ? "npx.cmd" : "npx";
-		const tsBuild = Bun.spawn(
-			[npxCmd, "--yes", "-p", "typescript", "tsc", "--build"],
-			{
-				cwd: configDir,
-				stdout: "inherit",
-				stderr: "inherit",
-			},
-		);
-
-		const tsBuildExitCode = await tsBuild.exited;
-		if (tsBuildExitCode !== 0) {
-			throw new Error(
-				`TypeScript build failed with exit code ${tsBuildExitCode}`,
-			);
-		}
-	}
-}
+import { mkdir } from "node:fs/promises";
+import { existsSync } from "node:fs";
+import { relative, resolve } from "node:path";
+import { generateAuthConfigSource } from "./templates/auth/config";
+import { generateClientArtifacts } from "./templates/core/client.artifacts";
+import { generateDrizzleConfigSource } from "./templates/core/drizzle";
+import { generateHandlersArtifacts } from "./templates/core/handlers";
+import { generateServerSource } from "./templates/core/server";
+import { generateWranglerJson } from "./templates/core/wrangler";
+import { generateDashboardSource } from "./templates/dashboard/index";
+import { compileSchemaDsl } from "./schema-compiler";
+import type { LoadedAppflareConfig } from "./types";
+import { discoverHandlerOperations } from "./utils/handler-discovery";
+import { discoverSchema } from "./utils/schema-discovery";
+import { ensureRelativeImportPath } from "./utils/path-utils";
+
+function toConfigRelativePath(configDir: string, absolutePath: string): string {
+	const relativePath = relative(configDir, absolutePath).replace(/\\/g, "/");
+	return relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
+}
+
+export async function generateArtifacts(
+	loadedConfig: LoadedAppflareConfig,
+): Promise<void> {
+	const { outDirAbs, wranglerOutDirAbs, config, configPath, configDir } =
+		loadedConfig;
+	const configImport = ensureRelativeImportPath(outDirAbs, configPath);
+	const clientOutDirAbs = resolve(outDirAbs, "client");
+	const clientConfigImport = ensureRelativeImportPath(
+		clientOutDirAbs,
+		configPath,
+	);
+
+	await Promise.all([
+		mkdir(outDirAbs, { recursive: true }),
+		mkdir(clientOutDirAbs, { recursive: true }),
+		mkdir(wranglerOutDirAbs, { recursive: true }),
+	]);
+
+	const serverPath = resolve(outDirAbs, "server.ts");
+	const clientPath = resolve(outDirAbs, "client.ts");
+	const authConfigPath = resolve(outDirAbs, "auth.config.ts");
+	const authSchemaPath = resolve(outDirAbs, "auth.schema.ts");
+	const drizzleConfigPath = resolve(outDirAbs, "drizzle.config.ts");
+	const wranglerPath = resolve(wranglerOutDirAbs, "wrangler.json");
+	const compiledSchema = await compileSchemaDsl(loadedConfig);
+
+	const discoveredSchema = await discoverSchema(
+		loadedConfig,
+		compiledSchema ? [compiledSchema.schemaPath] : [],
+	);
+	const schemaImport = ensureRelativeImportPath(
+		outDirAbs,
+		discoveredSchema.schemaPath,
+	);
+	const discoveredHandlers = await discoverHandlerOperations(loadedConfig);
+
+	const serverSource = generateServerSource(
+		config.auth.basePath,
+		config.database[0].binding,
+		config.kv[0]?.binding,
+		config.scheduler.binding,
+		config.r2[0]?.binding,
+		config.realtime.binding,
+		config.realtime.objectName,
+		config.realtime.subscribePath,
+		config.realtime.websocketPath,
+		config.realtime.protocol,
+	);
+	const clientArtifacts = generateClientArtifacts(
+		clientConfigImport,
+		discoveredHandlers,
+	);
+	const handlerArtifacts = generateHandlersArtifacts(
+		schemaImport,
+		discoveredHandlers,
+		config.r2[0]?.binding,
+	);
+	const authConfigSource = generateAuthConfigSource(configImport);
+	const drizzleSchemaPaths = compiledSchema
+		? [
+				toConfigRelativePath(configDir, compiledSchema.schemaPath),
+				...config.schema.filter((schemaPath) => {
+					return !/(^|\/)schema\.ts$/.test(schemaPath);
+				}),
+			]
+		: config.schema;
+	const drizzleConfigSource = generateDrizzleConfigSource(drizzleSchemaPaths);
+	const wranglerJson = generateWranglerJson(loadedConfig, discoveredHandlers);
+	const dashboardSource = generateDashboardSource(
+		schemaImport,
+		discoveredSchema,
+		discoveredHandlers,
+	);
+	const dashboardPath = resolve(outDirAbs, "admin.routes.ts");
+	const handlerWriteOperations = handlerArtifacts.map((artifact) => {
+		return Bun.write(
+			resolve(outDirAbs, artifact.relativePath),
+			artifact.source,
+		);
+	});
+	const clientWriteOperations = clientArtifacts.map((artifact) => {
+		return Bun.write(
+			resolve(outDirAbs, artifact.relativePath),
+			artifact.source,
+		);
+	});
+
+	await Promise.all([
+		Bun.write(serverPath, serverSource),
+		Bun.write(clientPath, 'export * from "./client/index";\n'),
+		...clientWriteOperations,
+		...handlerWriteOperations,
+		Bun.write(authConfigPath, authConfigSource),
+		Bun.write(authSchemaPath, ""),
+		Bun.write(drizzleConfigPath, drizzleConfigSource),
+		Bun.write(wranglerPath, `${JSON.stringify(wranglerJson, null, 2)}\n`),
+		Bun.write(dashboardPath, dashboardSource),
+	]);
+
+	const authConfigPathFromConfigDir = relative(
+		configDir,
+		authConfigPath,
+	).replace(/\\/g, "/");
+	const authConfigCliPath = authConfigPathFromConfigDir.startsWith(".")
+		? authConfigPathFromConfigDir
+		: `./${authConfigPathFromConfigDir}`;
+	const authSchemaPathFromConfigDir = relative(
+		configDir,
+		authSchemaPath,
+	).replace(/\\/g, "/");
+	const authSchemaCliPath = authSchemaPathFromConfigDir.startsWith(".")
+		? authSchemaPathFromConfigDir
+		: `./${authSchemaPathFromConfigDir}`;
+
+	const betterAuthGenerate = Bun.spawn(
+		[
+			"npx",
+			"@better-auth/cli",
+			"generate",
+			"--config",
+			authConfigCliPath,
+			"--output",
+			authSchemaCliPath,
+			"--yes",
+		],
+		{
+			cwd: configDir,
+			stdout: "inherit",
+			stderr: "inherit",
+		},
+	);
+
+	const exitCode = await betterAuthGenerate.exited;
+	if (exitCode !== 0) {
+		throw new Error(`better-auth generation failed with exit code ${exitCode}`);
+	}
+
+	const tsconfigPath = resolve(configDir, "tsconfig.json");
+	if (loadedConfig.config.build && existsSync(tsconfigPath)) {
+		const npxCmd = process.platform === "win32" ? "npx.cmd" : "npx";
+		const tsBuild = Bun.spawn(
+			[npxCmd, "--yes", "-p", "typescript", "tsc", "--build"],
+			{
+				cwd: configDir,
+				stdout: "inherit",
+				stderr: "inherit",
+			},
+		);
+
+		const tsBuildExitCode = await tsBuild.exited;
+		if (tsBuildExitCode !== 0) {
+			throw new Error(
+				`TypeScript build failed with exit code ${tsBuildExitCode}`,
+			);
+		}
+	}
+}

package/cli/index.ts

@@ -1,120 +1,120 @@
-import { Command } from "commander";
-import { runBuild, runDev, runMigrate, runAddAdmin } from "./commands/index";
-
-const program = new Command();
-
-program
-	.name("appflare")
-	.description(
-		"Appflare compiler/bundler for Cloudflare-native backends and SDK generation",
-	)
-	.version("0.0.28");
-
-program
-	.command("build")
-	.description(
-		"Generate server.ts, client.ts, auth.config.ts, drizzle.config.ts, and wrangler.json artifacts",
-	)
-	.option(
-		"-c, --config <path>",
-		"Path to appflare.config.ts",
-		"appflare.config.ts",
-	)
-	.option("--no-build", "Skip TypeScript build step")
-	.action(async (options: { config: string; build: boolean }) => {
-		await runBuild(options.config, { build: options.build });
-	});
-
-program
-	.command("dev")
-	.description("Run generator in development mode")
-	.option(
-		"-c, --config <path>",
-		"Path to appflare.config.ts",
-		"appflare.config.ts",
-	)
-	.option("-w, --watch", "Watch scanDir and regenerate on changes", false)
-	.option("--no-build", "Skip TypeScript build step")
-	.action(
-		async (options: { config: string; watch: boolean; build: boolean }) => {
-			await runDev(options.config, { watch: options.watch, build: options.build });
-		},
-	);
-
-program
-	.command("migrate")
-	.description(
-		"Generate drizzle migration files from outDir/auth.schema.ts and apply them to the configured D1 database",
-	)
-	.option(
-		"-c, --config <path>",
-		"Path to appflare.config.ts",
-		"appflare.config.ts",
-	)
-	.option(
-		"--local",
-		"Execute commands/files against a local DB for use with wrangler dev",
-		false,
-	)
-	.option(
-		"--remote",
-		"Execute commands/files against a remote DB for use with wrangler dev --remote",
-		false,
-	)
-	.option("--preview", "Execute commands/files against a preview D1 DB", false)
-	.action(
-		async (options: {
-			config: string;
-			local: boolean;
-			remote: boolean;
-			preview: boolean;
-		}) => {
-			await runMigrate(options.config, {
-				local: options.local,
-				remote: options.remote,
-				preview: options.preview,
-			});
-		},
-	);
-
-program
-	.command("add-admin")
-	.description("Add an admin user to the database")
-	.requiredOption("-n, --name <name>", "Admin's display name")
-	.requiredOption("-e, --email <email>", "Admin's email address")
-	.requiredOption("-p, --password <password>", "Admin's password")
-	.option(
-		"-c, --config <path>",
-		"Path to appflare.config.ts",
-		"appflare.config.ts",
-	)
-	.option(
-		"--local",
-		"Execute command against a local DB for use with wrangler dev",
-		false,
-	)
-	.option(
-		"--remote",
-		"Execute command against a remote DB for use with wrangler dev --remote",
-		false,
-	)
-	.action(async (options: any) => {
-		await runAddAdmin(options.config, {
-			name: options.name,
-			email: options.email,
-			password: options.password,
-			local: options.local,
-			remote: options.remote,
-		});
-	});
-
-(async () => {
-	if (!process.versions.bun) {
-		console.error("Appflare CLI must be run with Bun.");
-		process.exit(1);
-	}
-	await program.parseAsync(process.argv);
-})().catch((error) => {
-	console.error(error);
-	process.exit(1);
-});
+import { Command } from "commander";
+import { runBuild, runDev, runMigrate, runAddAdmin } from "./commands/index";
+
+const program = new Command();
+
+program
+	.name("appflare")
+	.description(
+		"Appflare compiler/bundler for Cloudflare-native backends and SDK generation",
+	)
+	.version("0.0.28");
+
+program
+	.command("build")
+	.description(
+		"Generate server.ts, client.ts, auth.config.ts, drizzle.config.ts, and wrangler.json artifacts",
+	)
+	.option(
+		"-c, --config <path>",
+		"Path to appflare.config.ts",
+		"appflare.config.ts",
+	)
+	.option("--no-build", "Skip TypeScript build step")
+	.action(async (options: { config: string; build: boolean }) => {
+		await runBuild(options.config, { build: options.build });
+	});
+
+program
+	.command("dev")
+	.description("Run generator in development mode")
+	.option(
+		"-c, --config <path>",
+		"Path to appflare.config.ts",
+		"appflare.config.ts",
+	)
+	.option("-w, --watch", "Watch scanDir and regenerate on changes", false)
+	.option("--no-build", "Skip TypeScript build step")
+	.action(
+		async (options: { config: string; watch: boolean; build: boolean }) => {
+			await runDev(options.config, { watch: options.watch, build: options.build });
+		},
+	);
+
+program
+	.command("migrate")
+	.description(
+		"Generate drizzle migration files from outDir/auth.schema.ts and apply them to the configured D1 database",
+	)
+	.option(
+		"-c, --config <path>",
+		"Path to appflare.config.ts",
+		"appflare.config.ts",
+	)
+	.option(
+		"--local",
+		"Execute commands/files against a local DB for use with wrangler dev",
+		false,
+	)
+	.option(
+		"--remote",
+		"Execute commands/files against a remote DB for use with wrangler dev --remote",
+		false,
+	)
+	.option("--preview", "Execute commands/files against a preview D1 DB", false)
+	.action(
+		async (options: {
+			config: string;
+			local: boolean;
+			remote: boolean;
+			preview: boolean;
+		}) => {
+			await runMigrate(options.config, {
+				local: options.local,
+				remote: options.remote,
+				preview: options.preview,
+			});
+		},
+	);
+
+program
+	.command("add-admin")
+	.description("Add an admin user to the database")
+	.requiredOption("-n, --name <name>", "Admin's display name")
+	.requiredOption("-e, --email <email>", "Admin's email address")
+	.requiredOption("-p, --password <password>", "Admin's password")
+	.option(
+		"-c, --config <path>",
+		"Path to appflare.config.ts",
+		"appflare.config.ts",
+	)
+	.option(
+		"--local",
+		"Execute command against a local DB for use with wrangler dev",
+		false,
+	)
+	.option(
+		"--remote",
+		"Execute command against a remote DB for use with wrangler dev --remote",
+		false,
+	)
+	.action(async (options: any) => {
+		await runAddAdmin(options.config, {
+			name: options.name,
+			email: options.email,
+			password: options.password,
+			local: options.local,
+			remote: options.remote,
+		});
+	});
+
+(async () => {
+	if (!process.versions.bun) {
+		console.error("Appflare CLI must be run with Bun.");
+		process.exit(1);
+	}
+	await program.parseAsync(process.argv);
+})().catch((error) => {
+	console.error(error);
+	process.exit(1);
+});