appflare 0.2.48 → 0.2.49

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.js, drizzle.config.js, 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.js, drizzle.config.js, 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);
+});

package/cli/load-config.ts

@@ -1,184 +1,184 @@
-import { dirname, isAbsolute, resolve } from "node:path";
-import { pathToFileURL } from "node:url";
-import { z } from "zod";
-import type {
-	AppflareConfig,
-	LoadedAppflareConfig,
-	NormalizedAppflareConfig,
-} from "./types";
-
-const databaseSchema = z
-	.object({
-		binding: z.string().min(1),
-		databaseName: z.string().min(1),
-		databaseId: z.string().min(1),
-		previewDatabaseId: z.string().min(1).optional(),
-		migrationsDir: z.string().min(1).optional(),
-	})
-	.strict();
-
-const kvSchema = z
-	.object({
-		binding: z.string().min(1),
-		id: z.string().min(1),
-		previewId: z.string().min(1).optional(),
-	})
-	.strict();
-
-const r2Schema = z
-	.object({
-		binding: z.string().min(1),
-		bucketName: z.string().min(1),
-		previewBucketName: z.string().min(1).optional(),
-		jurisdiction: z.string().min(1).optional(),
-	})
-	.strict();
-
-const schedulerConfigSchema = z
-	.object({
-		enabled: z.boolean().optional(),
-		binding: z.string().min(1).optional(),
-		queue: z.string().min(1).optional(),
-	})
-	.strict();
-
-const realtimeConfigSchema = z
-	.object({
-		enabled: z.boolean().optional(),
-		binding: z.string().min(1).optional(),
-		className: z.string().min(1).optional(),
-		objectName: z.string().min(1).optional(),
-		subscribePath: z.string().min(1).optional(),
-		websocketPath: z.string().min(1).optional(),
-		protocol: z.string().min(1).optional(),
-	})
-	.strict();
-
-const appflareConfigSchema = z
-	.object({
-		scanDir: z.string().min(1),
-		outDir: z.string().min(1),
-		wranglerOutDir: z.string().min(1).optional(),
-		wranglerOutPath: z.string().min(1).optional(),
-		schema: z.array(z.string()).min(1),
-		schemaDsl: z
-			.object({
-				entry: z.string().min(1),
-				exportName: z.string().min(1).optional(),
-				outFile: z.string().min(1).optional(),
-				typesOutFile: z.string().min(1).optional(),
-				zodOutFile: z.string().min(1).optional(),
-				namingStrategy: z.literal("camelToSnake").optional(),
-			})
-			.strict()
-			.optional(),
-		database: z.union([databaseSchema, z.array(databaseSchema).min(1)]),
-		kv: z.union([kvSchema, z.array(kvSchema)]).optional(),
-		r2: z.union([r2Schema, z.array(r2Schema)]).optional(),
-		auth: z
-			.object({
-				enabled: z.boolean(),
-				basePath: z.string().min(1),
-				options: z.custom<AppflareConfig["auth"]["options"]>((value) => {
-					return typeof value === "object" && value !== null;
-				}),
-				clientOptions: z.custom<AppflareConfig["auth"]["clientOptions"]>(
-					(value) => {
-						return typeof value === "object" && value !== null;
-					},
-				),
-			})
-			.strict(),
-		scheduler: schedulerConfigSchema.optional(),
-		realtime: realtimeConfigSchema.optional(),
-		wranglerOverrides: z.record(z.string(), z.unknown()).optional(),
-		build: z.boolean().optional(),
-	})
-	.strict();
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-	return typeof value === "object" && value !== null;
-}
-
-function readLegacySchedulerConfig(
-	input: AppflareConfig,
-): Partial<NonNullable<AppflareConfig["scheduler"]>> {
-	const raw = isRecord(input.wranglerOverrides)
-		? input.wranglerOverrides.scheduler
-		: undefined;
-	const parsed = schedulerConfigSchema.safeParse(raw);
-	if (!parsed.success) {
-		return {};
-	}
-
-	return parsed.data;
-}
-
-function removeLegacySchedulerOverride(
-	overrides: AppflareConfig["wranglerOverrides"],
-): AppflareConfig["wranglerOverrides"] {
-	if (!isRecord(overrides) || !("scheduler" in overrides)) {
-		return overrides;
-	}
-
-	const { scheduler: _scheduler, ...rest } = overrides;
-	return rest;
-}
-
-function normalizeConfig(input: AppflareConfig): NormalizedAppflareConfig {
-	const legacyScheduler = readLegacySchedulerConfig(input);
-	const scheduler = {
-		...(legacyScheduler ?? {}),
-		...(input.scheduler ?? {}),
-	};
-	const realtime = input.realtime ?? {};
-
-	return {
-		...input,
-		database: Array.isArray(input.database) ? input.database : [input.database],
-		kv: input.kv ? (Array.isArray(input.kv) ? input.kv : [input.kv]) : [],
-		r2: input.r2 ? (Array.isArray(input.r2) ? input.r2 : [input.r2]) : [],
-		scheduler: {
-			enabled: scheduler.enabled ?? true,
-			binding: scheduler.binding ?? "APPFLARE_SCHEDULER_QUEUE",
-			queue: scheduler.queue,
-		},
-		realtime: {
-			enabled: realtime.enabled ?? true,
-			binding: realtime.binding ?? "APPFLARE_REALTIME",
-			className: realtime.className ?? "AppflareRealtimeDurableObject",
-			objectName: realtime.objectName ?? "global",
-			subscribePath: realtime.subscribePath ?? "/realtime/subscribe",
-			websocketPath: realtime.websocketPath ?? "/realtime/ws",
-			protocol: realtime.protocol ?? "appflare.realtime.v1",
-		},
-		wranglerOverrides: removeLegacySchedulerOverride(input.wranglerOverrides),
-		wranglerOutDir:
-			input.wranglerOutDir ?? input.wranglerOutPath ?? input.outDir,
-		build: input.build ?? true,
-	};
-}
-
-export async function loadConfig(
-	configPathArg?: string,
-): Promise<LoadedAppflareConfig> {
-	const configPath = isAbsolute(configPathArg ?? "")
-		? (configPathArg as string)
-		: resolve(process.cwd(), configPathArg ?? "appflare.config.ts");
-
-	const configDir = dirname(configPath);
-	const moduleUrl = pathToFileURL(configPath).href;
-	const configModule = await import(moduleUrl);
-	const raw = configModule.default;
-	const parsed = appflareConfigSchema.parse(raw) as AppflareConfig;
-	const config = normalizeConfig(parsed);
-
-	return {
-		configPath,
-		configDir,
-		scanDirAbs: resolve(configDir, config.scanDir),
-		outDirAbs: resolve(configDir, config.outDir),
-		wranglerOutDirAbs: resolve(configDir, config.wranglerOutDir),
-		config,
-	};
-}
+import { dirname, isAbsolute, resolve } from "node:path";
+import { pathToFileURL } from "node:url";
+import { z } from "zod";
+import type {
+	AppflareConfig,
+	LoadedAppflareConfig,
+	NormalizedAppflareConfig,
+} from "./types";
+
+const databaseSchema = z
+	.object({
+		binding: z.string().min(1),
+		databaseName: z.string().min(1),
+		databaseId: z.string().min(1),
+		previewDatabaseId: z.string().min(1).optional(),
+		migrationsDir: z.string().min(1).optional(),
+	})
+	.strict();
+
+const kvSchema = z
+	.object({
+		binding: z.string().min(1),
+		id: z.string().min(1),
+		previewId: z.string().min(1).optional(),
+	})
+	.strict();
+
+const r2Schema = z
+	.object({
+		binding: z.string().min(1),
+		bucketName: z.string().min(1),
+		previewBucketName: z.string().min(1).optional(),
+		jurisdiction: z.string().min(1).optional(),
+	})
+	.strict();
+
+const schedulerConfigSchema = z
+	.object({
+		enabled: z.boolean().optional(),
+		binding: z.string().min(1).optional(),
+		queue: z.string().min(1).optional(),
+	})
+	.strict();
+
+const realtimeConfigSchema = z
+	.object({
+		enabled: z.boolean().optional(),
+		binding: z.string().min(1).optional(),
+		className: z.string().min(1).optional(),
+		objectName: z.string().min(1).optional(),
+		subscribePath: z.string().min(1).optional(),
+		websocketPath: z.string().min(1).optional(),
+		protocol: z.string().min(1).optional(),
+	})
+	.strict();
+
+const appflareConfigSchema = z
+	.object({
+		scanDir: z.string().min(1),
+		outDir: z.string().min(1),
+		wranglerOutDir: z.string().min(1).optional(),
+		wranglerOutPath: z.string().min(1).optional(),
+		schema: z.array(z.string()).min(1),
+		schemaDsl: z
+			.object({
+				entry: z.string().min(1),
+				exportName: z.string().min(1).optional(),
+				outFile: z.string().min(1).optional(),
+				typesOutFile: z.string().min(1).optional(),
+				zodOutFile: z.string().min(1).optional(),
+				namingStrategy: z.literal("camelToSnake").optional(),
+			})
+			.strict()
+			.optional(),
+		database: z.union([databaseSchema, z.array(databaseSchema).min(1)]),
+		kv: z.union([kvSchema, z.array(kvSchema)]).optional(),
+		r2: z.union([r2Schema, z.array(r2Schema)]).optional(),
+		auth: z
+			.object({
+				enabled: z.boolean(),
+				basePath: z.string().min(1),
+				options: z.custom<AppflareConfig["auth"]["options"]>((value) => {
+					return typeof value === "object" && value !== null;
+				}),
+				clientOptions: z.custom<AppflareConfig["auth"]["clientOptions"]>(
+					(value) => {
+						return typeof value === "object" && value !== null;
+					},
+				),
+			})
+			.strict(),
+		scheduler: schedulerConfigSchema.optional(),
+		realtime: realtimeConfigSchema.optional(),
+		wranglerOverrides: z.record(z.string(), z.unknown()).optional(),
+		build: z.boolean().optional(),
+	})
+	.strict();
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return typeof value === "object" && value !== null;
+}
+
+function readLegacySchedulerConfig(
+	input: AppflareConfig,
+): Partial<NonNullable<AppflareConfig["scheduler"]>> {
+	const raw = isRecord(input.wranglerOverrides)
+		? input.wranglerOverrides.scheduler
+		: undefined;
+	const parsed = schedulerConfigSchema.safeParse(raw);
+	if (!parsed.success) {
+		return {};
+	}
+
+	return parsed.data;
+}
+
+function removeLegacySchedulerOverride(
+	overrides: AppflareConfig["wranglerOverrides"],
+): AppflareConfig["wranglerOverrides"] {
+	if (!isRecord(overrides) || !("scheduler" in overrides)) {
+		return overrides;
+	}
+
+	const { scheduler: _scheduler, ...rest } = overrides;
+	return rest;
+}
+
+function normalizeConfig(input: AppflareConfig): NormalizedAppflareConfig {
+	const legacyScheduler = readLegacySchedulerConfig(input);
+	const scheduler = {
+		...(legacyScheduler ?? {}),
+		...(input.scheduler ?? {}),
+	};
+	const realtime = input.realtime ?? {};
+
+	return {
+		...input,
+		database: Array.isArray(input.database) ? input.database : [input.database],
+		kv: input.kv ? (Array.isArray(input.kv) ? input.kv : [input.kv]) : [],
+		r2: input.r2 ? (Array.isArray(input.r2) ? input.r2 : [input.r2]) : [],
+		scheduler: {
+			enabled: scheduler.enabled ?? true,
+			binding: scheduler.binding ?? "APPFLARE_SCHEDULER_QUEUE",
+			queue: scheduler.queue,
+		},
+		realtime: {
+			enabled: realtime.enabled ?? true,
+			binding: realtime.binding ?? "APPFLARE_REALTIME",
+			className: realtime.className ?? "AppflareRealtimeDurableObject",
+			objectName: realtime.objectName ?? "global",
+			subscribePath: realtime.subscribePath ?? "/realtime/subscribe",
+			websocketPath: realtime.websocketPath ?? "/realtime/ws",
+			protocol: realtime.protocol ?? "appflare.realtime.v1",
+		},
+		wranglerOverrides: removeLegacySchedulerOverride(input.wranglerOverrides),
+		wranglerOutDir:
+			input.wranglerOutDir ?? input.wranglerOutPath ?? input.outDir,
+		build: input.build ?? true,
+	};
+}
+
+export async function loadConfig(
+	configPathArg?: string,
+): Promise<LoadedAppflareConfig> {
+	const configPath = isAbsolute(configPathArg ?? "")
+		? (configPathArg as string)
+		: resolve(process.cwd(), configPathArg ?? "appflare.config.ts");
+
+	const configDir = dirname(configPath);
+	const moduleUrl = pathToFileURL(configPath).href;
+	const configModule = await import(moduleUrl);
+	const raw = configModule.default;
+	const parsed = appflareConfigSchema.parse(raw) as AppflareConfig;
+	const config = normalizeConfig(parsed);
+
+	return {
+		configPath,
+		configDir,
+		scanDirAbs: resolve(configDir, config.scanDir),
+		outDirAbs: resolve(configDir, config.outDir),
+		wranglerOutDirAbs: resolve(configDir, config.wranglerOutDir),
+		config,
+	};
+}