appflare 0.2.25 → 0.2.27

package/cli/templates/handlers/auth.ts

@@ -1,37 +1,37 @@
-export function generateAuth(): string {
-	return `
-
-import { getHeaders } from "./server";
-export async function resolveSession(
-\trequest: Request,
-\tdatabase: D1Database,
-\tkvNamespace?: KVNamespace,
-\tcf?: IncomingRequestCfProperties,
-): Promise<{ user: unknown; session: unknown }> {
-\tconst auth = createAuth(
-\t\t{
-\t\t\tDATABASE: database,
-\t\t\tKV: kvNamespace,
-\t\t},
-\t\tcf,
-\t);
-
-\ttry {
-\t\tconst session = await auth.api.getSession({
-\t\t\theaders: getHeaders(request.headers),
-\t\t});
-
-\t\treturn {
-\t\t\tuser: (session as any)?.user ?? null,
-\t\t\tsession: (session as any)?.session ?? null,
-\t\t};
-\t} catch {
-\t\treturn {
-\t\t\tuser: null,
-\t\t\tsession: null,
-\t\t};
-\t}
-}
-
-`;
-}
+export function generateAuth(): string {
+	return `
+
+import { getHeaders } from "./server";
+export async function resolveSession(
+\trequest: Request,
+\tdatabase: D1Database,
+\tkvNamespace?: KVNamespace,
+\tcf?: IncomingRequestCfProperties,
+): Promise<{ user: unknown; session: unknown }> {
+\tconst auth = createAuth(
+\t\t{
+\t\t\tDATABASE: database,
+\t\t\tKV: kvNamespace,
+\t\t},
+\t\tcf,
+\t);
+
+\ttry {
+\t\tconst session = await auth.api.getSession({
+\t\t\theaders: getHeaders(request.headers),
+\t\t});
+
+\t\treturn {
+\t\t\tuser: (session as any)?.user ?? null,
+\t\t\tsession: (session as any)?.session ?? null,
+\t\t};
+\t} catch {
+\t\treturn {
+\t\t\tuser: null,
+\t\t\tsession: null,
+\t\t};
+\t}
+}
+
+`;
+}

package/cli/templates/handlers/execution.ts

@@ -1,42 +1,42 @@
-export function generateExecution(): string {
-	return `
-export async function executeOperation<
-	TShape extends ZodRawShape,
-	TResult,
->(
-	c: Context<WorkerEnv>,
-	operation: RegisteredOperation<TShape, TResult>,
-	args: unknown,
-\tctx: AppflareContext,
-): Promise<Response> {
-	if (operation.definition.authRequired && !ctx.user) {
-		ctx.error(401, "Unauthorized");
-	}
-
-	if (operation.definition.middleware) {
-		await operation.definition.middleware(ctx, args as never, c.req.raw);
-	}
-
-	const result = await operation.definition.handler(ctx, args as never);
-
-\treturn c.json(result, 200);
-}
-
-export function handleOperationError(
-	c: Context<WorkerEnv>,
-	error: unknown,
-	validationMessage: string,
-): Response {
-	if (error instanceof AppflareHandledError) {
-		return c.json(error.payload, error.status as any);
-	}
-
-	if (error instanceof ZodError) {
-		return c.json({ message: validationMessage, issues: error.issues }, 400);
-	}
-
-	return c.json({ message: (error as Error).message ?? "Unknown error" }, 500);
-}
-
-`;
-}
+export function generateExecution(): string {
+	return `
+export async function executeOperation<
+	TShape extends ZodRawShape,
+	TResult,
+>(
+	c: Context<WorkerEnv>,
+	operation: RegisteredOperation<TShape, TResult>,
+	args: unknown,
+\tctx: AppflareContext,
+): Promise<Response> {
+	if (operation.definition.authRequired && !ctx.user) {
+		ctx.error(401, "Unauthorized");
+	}
+
+	if (operation.definition.middleware) {
+		await operation.definition.middleware(ctx, args as never, c.req.raw);
+	}
+
+	const result = await operation.definition.handler(ctx, args as never);
+
+\treturn c.json(result, 200);
+}
+
+export function handleOperationError(
+	c: Context<WorkerEnv>,
+	error: unknown,
+	validationMessage: string,
+): Response {
+	if (error instanceof AppflareHandledError) {
+		return c.json(error.payload, error.status as any);
+	}
+
+	if (error instanceof ZodError) {
+		return c.json({ message: validationMessage, issues: error.issues }, 400);
+	}
+
+	return c.json({ message: (error as Error).message ?? "Unknown error" }, 500);
+}
+
+`;
+}

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

@@ -1,101 +1,101 @@
-export function generateContextCreation(defaultR2Binding?: string): string {
-	return `
-export async function createSchedulerExecutionContext(
-	env: Record<string, unknown>,
-	options: RegisterHandlersOptions,
-): Promise<AppflareContext> {
-	const database = env[options.databaseBinding] as D1Database;
-	const r2Binding = options.r2Binding ?? ${JSON.stringify(defaultR2Binding ?? "")};
-	const storageBucket = r2Binding
-		? (env[r2Binding] as R2BucketBinding | undefined)
-		: 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>;
-	const ctx = {
-		$db: db,
-		db: createQueryDb(db, {
-			onMutation: (event) => {
-				mutationEvents.push(event);
-			},
-		}),
-		mutationEvents,
-		user: null as never,
-		session: null as never,
-		auth: authAdapter,
-		context: schedulerContext,
-		scheduler: createScheduler(schedulerQueue),
-		storage: null as never,
-		...helpers,
-	} as AppflareContext;
-
-	ctx.storage = createStorageApi(ctx, storageBucket);
-	return ctx;
-}
-
-export async function createExecutionContext(
-	c: Context<WorkerEnv>,
-	options: RegisterHandlersOptions,
-): Promise<AppflareContext> {
-	const database = c.env[options.databaseBinding] as D1Database;
-	const r2Binding = options.r2Binding ?? ${JSON.stringify(defaultR2Binding ?? "")};
-	const storageBucket = r2Binding
-		? (c.env[r2Binding] as R2BucketBinding | undefined)
-		: undefined;
-	const kvNamespace = options.kvBinding
-		? (c.env[options.kvBinding] as KVNamespace)
-		: undefined;
-	const db = createDb(database);
-	const mutationEvents = [] as AppflareContext["mutationEvents"];
-	const { user, session } = await resolveSession(
-		c.req.raw,
-		database,
-		kvNamespace,
-		c.req.raw.cf as IncomingRequestCfProperties | undefined,
-	);
-	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, {
-			onMutation: (event) => {
-				mutationEvents.push(event);
-			},
-		}),
-		mutationEvents,
-		user,
-		session,
-		auth: authAdapter,
-		context: c,
-		scheduler: createScheduler(schedulerQueue),
-		storage: null as never,
-		...helpers,
-	} as AppflareContext;
-
-	ctx.storage = createStorageApi(ctx, storageBucket);
-	return ctx;
-}
-`;
-}
+export function generateContextCreation(defaultR2Binding?: string): string {
+	return `
+export async function createSchedulerExecutionContext(
+	env: Record<string, unknown>,
+	options: RegisterHandlersOptions,
+): Promise<AppflareContext> {
+	const database = env[options.databaseBinding] as D1Database;
+	const r2Binding = options.r2Binding ?? ${JSON.stringify(defaultR2Binding ?? "")};
+	const storageBucket = r2Binding
+		? (env[r2Binding] as R2BucketBinding | undefined)
+		: 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>;
+	const ctx = {
+		$db: db,
+		db: createQueryDb(db, {
+			onMutation: (event) => {
+				mutationEvents.push(event);
+			},
+		}),
+		mutationEvents,
+		user: null as never,
+		session: null as never,
+		auth: authAdapter,
+		context: schedulerContext,
+		scheduler: createScheduler(schedulerQueue),
+		storage: null as never,
+		...helpers,
+	} as AppflareContext;
+
+	ctx.storage = createStorageApi(ctx, storageBucket);
+	return ctx;
+}
+
+export async function createExecutionContext(
+	c: Context<WorkerEnv>,
+	options: RegisterHandlersOptions,
+): Promise<AppflareContext> {
+	const database = c.env[options.databaseBinding] as D1Database;
+	const r2Binding = options.r2Binding ?? ${JSON.stringify(defaultR2Binding ?? "")};
+	const storageBucket = r2Binding
+		? (c.env[r2Binding] as R2BucketBinding | undefined)
+		: undefined;
+	const kvNamespace = options.kvBinding
+		? (c.env[options.kvBinding] as KVNamespace)
+		: undefined;
+	const db = createDb(database);
+	const mutationEvents = [] as AppflareContext["mutationEvents"];
+	const { user, session } = await resolveSession(
+		c.req.raw,
+		database,
+		kvNamespace,
+		c.req.raw.cf as IncomingRequestCfProperties | undefined,
+	);
+	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, {
+			onMutation: (event) => {
+				mutationEvents.push(event);
+			},
+		}),
+		mutationEvents,
+		user,
+		session,
+		auth: authAdapter,
+		context: c,
+		scheduler: createScheduler(schedulerQueue),
+		storage: null as never,
+		...helpers,
+	} as AppflareContext;
+
+	ctx.storage = createStorageApi(ctx, storageBucket);
+	return ctx;
+}
+`;
+}

package/cli/templates/handlers/generators/context/error-helpers.ts

@@ -1,11 +1,11 @@
-export function generateErrorHelpers(): string {
-	return `
-function createContextErrorHelpers() {
-	return {
-		error: (status: number, message: string, details?: unknown) => {
-			throw new AppflareHandledError(status, { message, details });
-		},
-	};
-}
-`;
-}
+export function generateErrorHelpers(): string {
+	return `
+function createContextErrorHelpers() {
+	return {
+		error: (status: number, message: string, details?: unknown) => {
+			throw new AppflareHandledError(status, { message, details });
+		},
+	};
+}
+`;
+}

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

@@ -1,24 +1,24 @@
-export function generateSchedulerFunctions(): string {
-	return `
-export function createScheduler(
-	queue?: SchedulerQueueBinding,
-): Scheduler {
-	return {
-		enqueue: async (task, ...args) => {
-			const [payload, options] = args as [unknown, SchedulerEnqueueOptions | undefined];
-			if (!queue) {
-				throw new Error("Scheduler queue binding is not configured");
-			}
-
-			await queue.send(
-				{
-					task,
-					payload,
-				},
-				options,
-			);
-		},
-	};
-}
-`;
-}
+export function generateSchedulerFunctions(): string {
+	return `
+export function createScheduler(
+	queue?: SchedulerQueueBinding,
+): Scheduler {
+	return {
+		enqueue: async (task, ...args) => {
+			const [payload, options] = args as [unknown, SchedulerEnqueueOptions | undefined];
+			if (!queue) {
+				throw new Error("Scheduler queue binding is not configured");
+			}
+
+			await queue.send(
+				{
+					task,
+					payload,
+				},
+				options,
+			);
+		},
+	};
+}
+`;
+}

package/cli/templates/handlers/generators/context/storage-api.ts

@@ -1,112 +1,82 @@
-export function generateStorageApi(): string {
-	return `
-function createStorageApi(
-	ctx: AppflareContext,
-	bucket: R2BucketBinding | undefined,
-): AppflareStorage {
-	const assertAuthorized = async (args: StorageAuthorizationArgs): Promise<void> => {
-		const allowed = await isStorageAllowed(ctx, args);
-		if (!allowed) {
-			ctx.error(403, "Storage access denied", {
-				path: args.path,
-				method: args.method,
-			});
-		}
-	};
-
-	const requireBucket = (): R2BucketBinding => {
-		if (!bucket) {
-			throw new Error(
-				"R2 binding is not configured. Set r2 in appflare.config.ts and regenerate artifacts.",
-			);
-		}
-		return bucket;
-	};
-
-	return {
-		put: async (args) => {
-			const path = normalizeStoragePath(args.path);
-			await assertAuthorized({
-				path: "/" + path,
-				method: "put",
-				contentType: args.contentType,
-			});
-
-			return requireBucket().put(path, args.body, {
-				httpMetadata: {
-					...(args.httpMetadata ?? {}),
-					...(args.contentType ? { contentType: args.contentType } : {}),
-				},
-				customMetadata: args.customMetadata,
-			});
-		},
-		get: async (args) => {
-			const path = normalizeStoragePath(args.path);
-			const method = normalizeStorageMethod(args.method);
-			await assertAuthorized({
-				path: "/" + path,
-				method,
-			});
-
-			return requireBucket().get(path, {
-				onlyIf: args.onlyIf,
-				range: args.range,
-			});
-		},
-		delete: async (args) => {
-			const path = normalizeStoragePath(args.path);
-			await assertAuthorized({
-				path: "/" + path,
-				method: "delete",
-			});
-
-			await requireBucket().delete(path);
-		},
-		list: async (args = {}) => {
-			await assertAuthorized({
-				path: "/" + (args.prefix ?? ""),
-				method: args.method ?? "list",
-			});
-
-			return requireBucket().list({
-				prefix: args.prefix,
-				cursor: args.cursor,
-				limit: args.limit,
-				delimiter: args.delimiter,
-				include: args.include,
-			});
-		},
-		signedUrl: async (args) => {
-			const path = normalizeStoragePath(args.path);
-			const requestMethod = args.method ?? "GET";
-			const method: StorageMethod =
-				requestMethod === "PUT"
-					? "put"
-					: requestMethod === "DELETE"
-						? "delete"
-						: args.downloadAsAttachment === false
-							? "preview"
-							: "download";
-
-			await assertAuthorized({
-				path: "/" + path,
-				method,
-				contentType: args.contentType,
-			});
-
-			const currentBucket = requireBucket();
-			if (typeof currentBucket.createPresignedUrl !== "function") {
-				throw new Error("R2 createPresignedUrl is unavailable for this runtime binding");
-			}
-
-			const signedRequest = buildSignedRequest(args, path);
-			const signedUrl = await currentBucket.createPresignedUrl(signedRequest, {
-				expiresIn: args.expiresIn ?? 60 * 5,
-			});
-
-			return signedUrl.toString();
-		},
-	};
-}
-`;
-}
+export function generateStorageApi(): string {
+	return `
+function createStorageApi(
+	ctx: AppflareContext,
+	bucket: R2BucketBinding | undefined,
+): AppflareStorage {
+	const assertAuthorized = async (args: StorageAuthorizationArgs): Promise<void> => {
+		const allowed = await isStorageAllowed(ctx, args);
+		if (!allowed) {
+			ctx.error(403, "Storage access denied", {
+				path: args.path,
+				method: args.method,
+			});
+		}
+	};
+
+	const requireBucket = (): R2BucketBinding => {
+		if (!bucket) {
+			throw new Error(
+				"R2 binding is not configured. Set r2 in appflare.config.ts and regenerate artifacts.",
+			);
+		}
+		return bucket;
+	};
+
+	return {
+		put: async (args) => {
+			const path = normalizeStoragePath(args.path);
+			await assertAuthorized({
+				path: "/" + path,
+				method: "put",
+				contentType: args.contentType,
+			});
+
+			return requireBucket().put(path, args.body, {
+				httpMetadata: {
+					...(args.httpMetadata ?? {}),
+					...(args.contentType ? { contentType: args.contentType } : {}),
+				},
+				customMetadata: args.customMetadata,
+			});
+		},
+		get: async (args) => {
+			const path = normalizeStoragePath(args.path);
+			const method = normalizeStorageMethod(args.method);
+			await assertAuthorized({
+				path: "/" + path,
+				method,
+			});
+
+			return requireBucket().get(path, {
+				onlyIf: args.onlyIf,
+				range: args.range,
+			});
+		},
+		delete: async (args) => {
+			const path = normalizeStoragePath(args.path);
+			await assertAuthorized({
+				path: "/" + path,
+				method: "delete",
+			});
+
+			await requireBucket().delete(path);
+		},
+		list: async (args = {}) => {
+			await assertAuthorized({
+				path: "/" + (args.prefix ?? ""),
+				method: args.method ?? "list",
+			});
+
+			return requireBucket().list({
+				prefix: args.prefix,
+				cursor: args.cursor,
+				limit: args.limit,
+				delimiter: args.delimiter,
+				include: args.include,
+			});
+		},
+	};
+}
+`;
+}