appflare 0.2.18 → 0.2.20

package/cli/generate.ts

@@ -1,4 +1,5 @@
 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";
@@ -154,4 +155,21 @@ export async function generateArtifacts(
 	if (exitCode !== 0) {
 		throw new Error(`better-auth generation failed with exit code ${exitCode}`);
 	}
+
+	const tsconfigPath = resolve(configDir, "tsconfig.json");
+	if (existsSync(tsconfigPath)) {
+		const npxCmd = process.platform === "win32" ? "npx.cmd" : "npx";
+		const tsBuild = Bun.spawn([npxCmd, "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/templates/dashboard/builders/storage/runtime/storage-page.ts

@@ -2,7 +2,7 @@ export function buildStoragePageRuntime(): string {
 	return `
 	const buildStorageListingContent = (listed: any, prefix: string) => {
 		const parts = prefix.split('/').filter(Boolean);
-		const breadcrumbs = [];
+		const breadcrumbs: any[] = [];
 		let currentPath = '';
 		const visibleObjects = listed.objects.filter((obj: any) => !obj.key.endsWith('/.keep'));
 

package/cli/templates/dashboard/builders/table-routes/table/get-route.ts

@@ -170,7 +170,7 @@ export function buildTableGetRoute(
 \t\tlet countQuery = db.select({ count: sql\`count(*)\` }).from(tableSchema);
 
 \t\tif (search) {
-\t\t\tconst searchConditions = [];
+			const searchConditions: any[] = [];
 \t\t\t${searchConditions}
 \t\t\tif (searchConditions.length > 0) {
 \t\t\t\tquery = query.where(or(...searchConditions)) as any;

package/cli/templates/dashboard/builders/table-routes/table/post-routes.ts

@@ -103,7 +103,7 @@ export function buildTablePostRoutes(
 \t\tif (mode === 'all-matching') {
 \t\t\tlet deleteQuery = db.delete(tableSchema);
 \t\t\tif (search) {
-\t\t\t\tconst searchConditions = [];
+				const searchConditions: any[] = [];
 \t\t\t\t${searchConditions}
 \t\t\t\tif (searchConditions.length > 0) {
 \t\t\t\t\tdeleteQuery = deleteQuery.where(or(...searchConditions)) as any;

package/cli/templates/handlers/execution.ts

@@ -25,7 +25,7 @@ export function handleOperationError(
 	validationMessage: string,
 ): Response {
 	if (error instanceof AppflareHandledError) {
-		return c.json(error.payload, error.status);
+		return c.json(error.payload, error.status as any);
 	}
 
 	if (error instanceof ZodError) {

package/cli/templates/handlers/generators/context/context-creation.ts

@@ -1,9 +1,9 @@
 export function generateContextCreation(defaultR2Binding?: string): string {
 	return `
-export function createSchedulerExecutionContext(
+export async function createSchedulerExecutionContext(
 	env: Record<string, unknown>,
 	options: RegisterHandlersOptions,
-): AppflareContext {
+): Promise<AppflareContext> {
 	const database = env[options.databaseBinding] as D1Database;
 	const r2Binding = options.r2Binding ?? ${JSON.stringify(defaultR2Binding ?? "")};
 	const storageBucket = r2Binding
@@ -11,9 +11,17 @@ export function createSchedulerExecutionContext(
 		: undefined;
 	const db = createDb(database);
 	const mutationEvents = [] as AppflareContext["mutationEvents"];
+	const kvNamespace = options.kvBinding
+		? (env[options.kvBinding] as KVNamespace)
+		: undefined;
 	const schedulerBinding = options.schedulerBinding ?? "APPFLARE_SCHEDULER_QUEUE";
 	const schedulerQueue = env[schedulerBinding] as SchedulerQueueBinding | undefined;
 	const helpers = createContextErrorHelpers();
+	const auth = createAuth({
+		DATABASE: database,
+		KV: kvNamespace,
+	});
+	const authAdapter = (await auth.$context).internalAdapter;
 	const schedulerContext = {
 		env: env as WorkerEnv["Bindings"],
 	} as unknown as Context<WorkerEnv>;
@@ -27,6 +35,7 @@ export function createSchedulerExecutionContext(
 		mutationEvents,
 		user: null as never,
 		session: null as never,
+		auth: authAdapter,
 		context: schedulerContext,
 		scheduler: createScheduler(schedulerQueue),
 		storage: null as never,
@@ -60,6 +69,14 @@ export async function createExecutionContext(
 	const schedulerBinding = options.schedulerBinding ?? "APPFLARE_SCHEDULER_QUEUE";
 	const schedulerQueue = c.env[schedulerBinding] as SchedulerQueueBinding | undefined;
 	const helpers = createContextErrorHelpers();
+	const auth = createAuth(
+		{
+			DATABASE: database,
+			KV: kvNamespace,
+		},
+		c.req.raw.cf as IncomingRequestCfProperties | undefined,
+	);
+	const authAdapter = (await auth.$context).internalAdapter;
 	const ctx = {
 		$db: db,
 		db: createQueryDb(db, {
@@ -70,6 +87,7 @@ export async function createExecutionContext(
 		mutationEvents,
 		user,
 		session,
+		auth: authAdapter,
 		context: c,
 		scheduler: createScheduler(schedulerQueue),
 		storage: null as never,

package/cli/templates/handlers/generators/registration/modules/cron.ts

@@ -9,14 +9,10 @@ export async function executeCronTriggers(
 		return;
 	}
 
-	if (cronHandlers.length === 0) {
-		return;
-	}
-
-	const ctx = createSchedulerExecutionContext(env, options);
+	const ctx = await createSchedulerExecutionContext(env, options);
 
 	for (const cronEntry of cronHandlers) {
-		if (!cronEntry.cronTriggers.includes(cronValue)) {
+		if (!(cronEntry.cronTriggers as readonly string[]).includes(cronValue)) {
 			continue;
 		}
 

package/cli/templates/handlers/generators/registration/modules/realtime/routes.ts

@@ -131,7 +131,7 @@ function registerRealtimeRoutes(
 			} | null;
 			return c.json(
 				{ message: payload?.message ?? "Unable to remove subscription" },
-				response.status,
+				response.status as any,
 			);
 		}
 

package/cli/templates/handlers/generators/registration/modules/scheduler.ts

@@ -17,7 +17,7 @@ export async function executeScheduledBatch(
 		return;
 	}
 
-	const ctx = createSchedulerExecutionContext(env, options);
+	const ctx = await createSchedulerExecutionContext(env, options);
 
 	for (const message of batch.messages) {
 		const body = (message?.body ?? {}) as QueueMessageBody;
@@ -29,7 +29,7 @@ export async function executeScheduledBatch(
 
 		const operation = (schedulerHandlers as Record<string, {
 			definition: {
-				handler: (ctx: typeof ctx, args: unknown) => Promise<void> | void;
+				handler: (ctx: AppflareContext, args: unknown) => Promise<void> | void;
 			};
 			schema: z.ZodTypeAny;
 		}>)[task];

package/cli/templates/handlers/generators/registration/modules/storage.ts

@@ -57,7 +57,7 @@ export function registerGeneratedStorageRoutes(
 			}, 200);
 		} catch (error) {
 			if (error instanceof AppflareHandledError) {
-				return c.json(error.payload, error.status);
+				return c.json(error.payload, error.status as any);
 			}
 
 			return c.json(
@@ -89,7 +89,7 @@ export function registerGeneratedStorageRoutes(
 			}, 200);
 		} catch (error) {
 			if (error instanceof AppflareHandledError) {
-				return c.json(error.payload, error.status);
+				return c.json(error.payload, error.status as any);
 			}
 
 			return c.json(
@@ -119,7 +119,7 @@ export function registerGeneratedStorageRoutes(
 			}, 200);
 		} catch (error) {
 			if (error instanceof AppflareHandledError) {
-				return c.json(error.payload, error.status);
+				return c.json(error.payload, error.status as any);
 			}
 
 			return c.json(
@@ -137,7 +137,7 @@ export function registerGeneratedStorageRoutes(
 			return c.json({ ok: true, path }, 200);
 		} catch (error) {
 			if (error instanceof AppflareHandledError) {
-				return c.json(error.payload, error.status);
+				return c.json(error.payload, error.status as any);
 			}
 
 			return c.json(
@@ -181,7 +181,7 @@ export function registerGeneratedStorageRoutes(
 			return c.json(result, 200);
 		} catch (error) {
 			if (error instanceof AppflareHandledError) {
-				return c.json(error.payload, error.status);
+				return c.json(error.payload, error.status as any);
 			}
 
 			return c.json(

package/cli/templates/handlers/generators/types/context.ts

@@ -1,5 +1,6 @@
 export function generateTypesContextSection(): string {
 	return `type AuthSession = typeof auth.$Infer.Session;
+type AuthAdapter = Awaited<typeof auth.$context>["internalAdapter"];
 type User = AuthSession['user']
 type Session = AuthSession['session']
 
@@ -55,6 +56,7 @@ export type AppflareContext = {
 	mutationEvents: DbMutationEvent[];
 	user: User;
 	session: Session;
+	auth: AuthAdapter;
 	context: Context<WorkerEnv>;
 	scheduler: Scheduler;
 	storage: AppflareStorage;

package/cli/templates/handlers/generators/types/query-definitions/query-helper-functions.ts

@@ -481,11 +481,7 @@ function hasManyToManyRelationsInWith(
 		}
 
 		const nestedWith = relationValue.with;
-		if (
-			hasManyToManyRelationsInWith(relationName, nestedWith) ||
-			(manyToMany &&
-				hasManyToManyRelationsInWith(manyToMany.targetTable, nestedWith))
-		) {
+		if (hasManyToManyRelationsInWith(relationName, nestedWith)) {
 			return true;
 		}
 	}
@@ -577,7 +573,7 @@ type RelationWithAggregatePlan = Record<string, RelationWithAggregatePlanEntry>;
 
 function hasRelationAggregatePlanEntries(
 	plan: RelationWithAggregatePlan | undefined,
-): boolean {
+): plan is RelationWithAggregatePlan {
 	return !!plan && Object.keys(plan).length > 0;
 }