appflare 0.2.24 → 0.2.26

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

@@ -1,112 +1,134 @@
-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,
+			});
+
+			if (args.returnSignedUrlOnly) {
+				const currentBucket = requireBucket();
+				if (typeof currentBucket.createPresignedUrl !== "function") {
+					throw new Error("R2 createPresignedUrl is unavailable for this runtime binding");
+				}
+
+				const signedRequest = buildSignedRequest(
+					{
+						path,
+						method: "PUT",
+						contentType: args.contentType,
+						expiresIn: args.expiresIn,
+					},
+					path,
+				);
+				const signedUrl = await currentBucket.createPresignedUrl(signedRequest, {
+					expiresIn: args.expiresIn ?? 60 * 5,
+				});
+
+				return signedUrl.toString();
+			}
+
+			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();
+		},
+	};
+}
+`;
+}

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

@@ -1,59 +1,59 @@
-export function generateStorageHelpers(): string {
-	return `
-function normalizeStoragePath(path: string): string {
-	const trimmed = path.trim();
-	if (trimmed.length === 0) {
-		throw new Error("Storage path is required");
-	}
-
-	const withoutLeadingSlash = trimmed.replace(/^\\/+/, "");
-	if (withoutLeadingSlash.length === 0) {
-		throw new Error("Storage path is required");
-	}
-
-	return withoutLeadingSlash;
-}
-
-function normalizeStorageMethod(method: StorageMethod | undefined): StorageMethod {
-	return method ?? "get";
-}
-
-function sanitizeSignedFileName(fileName: string | undefined): string | null {
-	if (!fileName) {
-		return null;
-	}
-
-	const normalized = fileName.replace(/[\\r\\n\\"]/g, "").trim();
-	return normalized.length > 0 ? normalized : null;
-}
-
-function buildSignedRequest(
-	args: StorageSignedUrlArgs,
-	path: string,
-): Request {
-	const method = args.method ?? "GET";
-	const endpoint = new URL("https://r2.appflare.local/" + encodeURI(path));
-	const headers = new Headers();
-
-	if (args.contentType) {
-		headers.set("content-type", args.contentType);
-	}
-
-	if (method === "GET") {
-		const disposition = args.downloadAsAttachment === false ? "inline" : "attachment";
-		const fileName = sanitizeSignedFileName(args.fileName);
-		headers.set(
-			"response-content-disposition",
-			fileName
-				? disposition + '; filename="' + fileName + '"'
-				: disposition,
-		);
-	}
-
-	return new Request(endpoint.toString(), {
-		method,
-		headers,
-	});
-}
-`;
-}
+export function generateStorageHelpers(): string {
+	return `
+function normalizeStoragePath(path: string): string {
+	const trimmed = path.trim();
+	if (trimmed.length === 0) {
+		throw new Error("Storage path is required");
+	}
+
+	const withoutLeadingSlash = trimmed.replace(/^\\/+/, "");
+	if (withoutLeadingSlash.length === 0) {
+		throw new Error("Storage path is required");
+	}
+
+	return withoutLeadingSlash;
+}
+
+function normalizeStorageMethod(method: StorageMethod | undefined): StorageMethod {
+	return method ?? "get";
+}
+
+function sanitizeSignedFileName(fileName: string | undefined): string | null {
+	if (!fileName) {
+		return null;
+	}
+
+	const normalized = fileName.replace(/[\\r\\n\\"]/g, "").trim();
+	return normalized.length > 0 ? normalized : null;
+}
+
+function buildSignedRequest(
+	args: StorageSignedUrlArgs,
+	path: string,
+): Request {
+	const method = args.method ?? "GET";
+	const endpoint = new URL("https://r2.appflare.local/" + encodeURI(path));
+	const headers = new Headers();
+
+	if (args.contentType) {
+		headers.set("content-type", args.contentType);
+	}
+
+	if (method === "GET") {
+		const disposition = args.downloadAsAttachment === false ? "inline" : "attachment";
+		const fileName = sanitizeSignedFileName(args.fileName);
+		headers.set(
+			"response-content-disposition",
+			fileName
+				? disposition + '; filename="' + fileName + '"'
+				: disposition,
+		);
+	}
+
+	return new Request(endpoint.toString(), {
+		method,
+		headers,
+	});
+}
+`;
+}

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

@@ -1,18 +1,18 @@
-export function generateContextTypes(): string {
-	return `
-type SchedulerQueueBinding = {
-	send: (body: unknown, options?: SchedulerEnqueueOptions) => Promise<void>;
-};
-
-type R2BucketBinding = {
-	put: (key: string, value: unknown, options?: Record<string, unknown>) => Promise<unknown>;
-	get: (key: string, options?: Record<string, unknown>) => Promise<unknown | null>;
-	delete: (key: string | string[]) => Promise<void>;
-	list: (options?: Record<string, unknown>) => Promise<unknown>;
-	createPresignedUrl?: (
-		request: Request,
-		options?: { expiresIn?: number },
-	) => Promise<URL>;
-};
-`;
-}
+export function generateContextTypes(): string {
+	return `
+type SchedulerQueueBinding = {
+	send: (body: unknown, options?: SchedulerEnqueueOptions) => Promise<void>;
+};
+
+type R2BucketBinding = {
+	put: (key: string, value: unknown, options?: Record<string, unknown>) => Promise<unknown>;
+	get: (key: string, options?: Record<string, unknown>) => Promise<unknown | null>;
+	delete: (key: string | string[]) => Promise<void>;
+	list: (options?: Record<string, unknown>) => Promise<unknown>;
+	createPresignedUrl?: (
+		request: Request,
+		options?: { expiresIn?: number },
+	) => Promise<URL>;
+};
+`;
+}

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

@@ -1,43 +1,43 @@
-import { generateAuth } from "../auth";
-import { generateContextTypes } from "./context/types";
-import { generateSchedulerFunctions } from "./context/scheduler";
-import { generateErrorHelpers } from "./context/error-helpers";
-import { generateStorageHelpers } from "./context/storage-helpers";
-import { generateStorageApi } from "./context/storage-api";
-import { generateContextCreation } from "./context/context-creation";
-
-export function generateContextSource(defaultR2Binding?: string): string {
-	return `import type { Context } from "hono";
-import type { D1Database, IncomingRequestCfProperties, KVNamespace } from "@cloudflare/workers-types";
-import { createAuth } from "./auth.config";
-import {
-	type AppflareContext,
-	type AppflareStorage,
-	AppflareHandledError,
-	type Scheduler,
-	type SchedulerEnqueueOptions,
-	type RegisterHandlersOptions,
-	type StorageAuthorizationArgs,
-	type StorageMethod,
-	type StorageSignedUrlArgs,
-	type WorkerEnv,
-	isStorageAllowed,
-	createDb,
-	createQueryDb,
-} from "./handlers";
-
-${generateContextTypes()}
-
-${generateAuth()}
-
-${generateSchedulerFunctions()}
-
-${generateErrorHelpers()}
-
-${generateStorageHelpers()}
-
-${generateStorageApi()}
-
-${generateContextCreation(defaultR2Binding)}
-`;
-}
+import { generateAuth } from "../auth";
+import { generateContextTypes } from "./context/types";
+import { generateSchedulerFunctions } from "./context/scheduler";
+import { generateErrorHelpers } from "./context/error-helpers";
+import { generateStorageHelpers } from "./context/storage-helpers";
+import { generateStorageApi } from "./context/storage-api";
+import { generateContextCreation } from "./context/context-creation";
+
+export function generateContextSource(defaultR2Binding?: string): string {
+	return `import type { Context } from "hono";
+import type { D1Database, IncomingRequestCfProperties, KVNamespace } from "@cloudflare/workers-types";
+import { createAuth } from "./auth.config";
+import {
+	type AppflareContext,
+	type AppflareStorage,
+	AppflareHandledError,
+	type Scheduler,
+	type SchedulerEnqueueOptions,
+	type RegisterHandlersOptions,
+	type StorageAuthorizationArgs,
+	type StorageMethod,
+	type StorageSignedUrlArgs,
+	type WorkerEnv,
+	isStorageAllowed,
+	createDb,
+	createQueryDb,
+} from "./handlers";
+
+${generateContextTypes()}
+
+${generateAuth()}
+
+${generateSchedulerFunctions()}
+
+${generateErrorHelpers()}
+
+${generateStorageHelpers()}
+
+${generateStorageApi()}
+
+${generateContextCreation(defaultR2Binding)}
+`;
+}

package/cli/templates/handlers/generators/execution.ts

@@ -1,15 +1,15 @@
-import { generateExecution } from "../execution";
-
-export function generateExecutionSource(): string {
-	return `import type { Context } from "hono";
-import { ZodError, type ZodRawShape } from "zod";
-import {
-	type AppflareContext,
-	AppflareHandledError,
-	type RegisteredOperation,
-	type WorkerEnv,
-} from "./handlers";
-
-${generateExecution()}
-`;
-}
+import { generateExecution } from "../execution";
+
+export function generateExecutionSource(): string {
+	return `import type { Context } from "hono";
+import { ZodError, type ZodRawShape } from "zod";
+import {
+	type AppflareContext,
+	AppflareHandledError,
+	type RegisteredOperation,
+	type WorkerEnv,
+} from "./handlers";
+
+${generateExecution()}
+`;
+}

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

@@ -1,13 +1,13 @@
-import { generateTypes } from "../types";
-
-export function generateHandlersSource(schemaImportPath: string): string {
-	return `import type { Context } from "hono";
-import type { D1Database } from "@cloudflare/workers-types";
-import { drizzle } from "drizzle-orm/d1";
-import { z, type ZodRawShape } from "zod";
-import * as authSchema from "./auth.schema";
-import * as schema from "${schemaImportPath}";
-
-${generateTypes()}
-`;
-}
+import { generateTypes } from "../types";
+
+export function generateHandlersSource(schemaImportPath: string): string {
+	return `import type { Context } from "hono";
+import type { D1Database } from "@cloudflare/workers-types";
+import { drizzle } from "drizzle-orm/d1";
+import { z, type ZodRawShape } from "zod";
+import * as authSchema from "./auth.schema";
+import * as schema from "${schemaImportPath}";
+
+${generateTypes()}
+`;
+}

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

@@ -1,26 +1,26 @@
-export const cronModule = `
-export async function executeCronTriggers(
-	controller: { cron: string },
-	env: Record<string, unknown>,
-	options: RegisterHandlersOptions,
-): Promise<void> {
-	const cronValue = controller?.cron;
-	if (!cronValue) {
-		return;
-	}
-
-	const ctx = await createSchedulerExecutionContext(env, options);
-
-	for (const cronEntry of cronHandlers) {
-		if (!(cronEntry.cronTriggers as readonly string[]).includes(cronValue)) {
-			continue;
-		}
-
-		try {
-			await cronEntry.definition.handler(ctx);
-		} catch (error) {
-			console.error("Cron task failed", cronEntry.taskName, error);
-		}
-	}
-}
-`;
+export const cronModule = `
+export async function executeCronTriggers(
+	controller: { cron: string },
+	env: Record<string, unknown>,
+	options: RegisterHandlersOptions,
+): Promise<void> {
+	const cronValue = controller?.cron;
+	if (!cronValue) {
+		return;
+	}
+
+	const ctx = await createSchedulerExecutionContext(env, options);
+
+	for (const cronEntry of cronHandlers) {
+		if (!cronEntry.cronTriggers.includes(cronValue)) {
+			continue;
+		}
+
+		try {
+			await cronEntry.definition.handler(ctx);
+		} catch (error) {
+			console.error("Cron task failed", cronEntry.taskName, error);
+		}
+	}
+}
+`;