appflare 0.2.30 → 0.2.31

package/cli/templates/core/server.ts

@@ -1,38 +1,38 @@
-import { generateAuthRoute } from "../auth/route";
-import { generateAppCreation } from "./app-creation";
-import { generateExport } from "./export";
-import { generateHandlersRoute } from "./handlers.route";
-import { generateImports } from "./imports";
-import { generateTypes } from "./types";
-
-export function generateServerSource(
-	authBasePath: string,
-	databaseBinding: string,
-	kvBinding?: string,
-	schedulerBinding?: string,
-	r2Binding?: string,
-	realtimeBinding?: string,
-	realtimeObjectName?: string,
-	realtimeSubscribePath?: string,
-	realtimeWebsocketPath?: string,
-	realtimeProtocol?: string,
-): string {
-	return (
-		generateImports() +
-		generateTypes() +
-		generateAppCreation() +
-		generateHandlersRoute(
-			databaseBinding,
-			kvBinding,
-			schedulerBinding,
-			r2Binding,
-			realtimeBinding,
-			realtimeObjectName,
-			realtimeSubscribePath,
-			realtimeWebsocketPath,
-			realtimeProtocol,
-		) +
-		generateAuthRoute(authBasePath, databaseBinding, kvBinding) +
-		generateExport()
-	);
-}
+import { generateAuthRoute } from "../auth/route";
+import { generateAppCreation } from "./app-creation";
+import { generateExport } from "./export";
+import { generateHandlersRoute } from "./handlers.route";
+import { generateImports } from "./imports";
+import { generateTypes } from "./types";
+
+export function generateServerSource(
+	authBasePath: string,
+	databaseBinding: string,
+	kvBinding?: string,
+	schedulerBinding?: string,
+	r2Binding?: string,
+	realtimeBinding?: string,
+	realtimeObjectName?: string,
+	realtimeSubscribePath?: string,
+	realtimeWebsocketPath?: string,
+	realtimeProtocol?: string,
+): string {
+	return (
+		generateImports() +
+		generateTypes() +
+		generateAppCreation() +
+		generateHandlersRoute(
+			databaseBinding,
+			kvBinding,
+			schedulerBinding,
+			r2Binding,
+			realtimeBinding,
+			realtimeObjectName,
+			realtimeSubscribePath,
+			realtimeWebsocketPath,
+			realtimeProtocol,
+		) +
+		generateAuthRoute(authBasePath, databaseBinding, kvBinding) +
+		generateExport()
+	);
+}

package/cli/templates/core/types.ts

@@ -1,6 +1,6 @@
-export function generateTypes(): string {
-	return `type WorkerEnv = {
-\tBindings: Record<string, unknown>;
-};
-`;
-}
+export function generateTypes(): string {
+	return `type WorkerEnv = {
+\tBindings: Record<string, unknown>;
+};
+`;
+}

package/cli/templates/core/wrangler.ts

@@ -1,109 +1,109 @@
-import type { JsonObject, LoadedAppflareConfig } from "../../types";
-import type { DiscoveredHandlerOperation } from "../../utils/handler-discovery";
-import { deepMergeJson } from "../../utils/json-utils";
-
-function unique(values: string[]): string[] {
-	return Array.from(new Set(values.filter((value) => value.length > 0)));
-}
-
-export function generateWranglerJson(
-	config: LoadedAppflareConfig,
-	operations: DiscoveredHandlerOperation[],
-): JsonObject {
-	const schedulerOperations = operations.filter(
-		(operation) => operation.kind === "scheduler" || operation.kind === "cron",
-	);
-	const cronTriggers = unique(
-		operations
-			.filter((operation) => operation.kind === "cron")
-			.flatMap((operation) => operation.cronTriggers ?? []),
-	);
-	const schedulerEnabled =
-		config.config.scheduler.enabled && schedulerOperations.length > 0;
-	const realtimeEnabled = config.config.realtime.enabled;
-	const workerNameOverride =
-		typeof config.config.wranglerOverrides?.name === "string"
-			? config.config.wranglerOverrides.name
-			: undefined;
-	const workerName = workerNameOverride ?? "appflare-worker";
-	const schedulerQueueName =
-		config.config.scheduler.queue ?? `${workerName}-scheduler`;
-
-	const wranglerBase: JsonObject = {
-		name: workerName,
-		main: "./src/index.ts",
-		d1_databases: config.config.database.map((database) => ({
-			binding: database.binding,
-			database_name: database.databaseName,
-			database_id: database.databaseId,
-			preview_database_id: database.previewDatabaseId ?? database.databaseId,
-			...(database.migrationsDir
-				? { migrations_dir: database.migrationsDir }
-				: {}),
-		})),
-		kv_namespaces: config.config.kv.map((namespace) => ({
-			binding: namespace.binding,
-			id: namespace.id,
-			...(namespace.previewId ? { preview_id: namespace.previewId } : {}),
-		})),
-		r2_buckets: config.config.r2.map((bucket) => ({
-			binding: bucket.binding,
-			bucket_name: bucket.bucketName,
-			...(bucket.previewBucketName
-				? { preview_bucket_name: bucket.previewBucketName }
-				: {}),
-			...(bucket.jurisdiction ? { jurisdiction: bucket.jurisdiction } : {}),
-		})),
-		...(schedulerEnabled
-			? {
-					queues: {
-						producers: [
-							{
-								binding: config.config.scheduler.binding,
-								queue: schedulerQueueName,
-							},
-						],
-						consumers: [
-							{
-								queue: schedulerQueueName,
-							},
-						],
-					},
-				}
-			: {}),
-		...(cronTriggers.length > 0
-			? {
-					triggers: {
-						crons: cronTriggers,
-					},
-				}
-			: {}),
-		...(realtimeEnabled
-			? {
-					durable_objects: {
-						bindings: [
-							{
-								name: config.config.realtime.binding,
-								class_name: config.config.realtime.className,
-							},
-						],
-					},
-					migrations: [
-						{
-							tag: "appflare-realtime-v1",
-							new_sqlite_classes: [config.config.realtime.className],
-						},
-					],
-				}
-			: {}),
-	};
-
-	if (!config.config.wranglerOverrides) {
-		return wranglerBase;
-	}
-
-	const { scheduler: _ignoredSchedulerOverride, ...wranglerOverrides } =
-		config.config.wranglerOverrides;
-
-	return deepMergeJson(wranglerBase, wranglerOverrides);
-}
+import type { JsonObject, LoadedAppflareConfig } from "../../types";
+import type { DiscoveredHandlerOperation } from "../../utils/handler-discovery";
+import { deepMergeJson } from "../../utils/json-utils";
+
+function unique(values: string[]): string[] {
+	return Array.from(new Set(values.filter((value) => value.length > 0)));
+}
+
+export function generateWranglerJson(
+	config: LoadedAppflareConfig,
+	operations: DiscoveredHandlerOperation[],
+): JsonObject {
+	const schedulerOperations = operations.filter(
+		(operation) => operation.kind === "scheduler" || operation.kind === "cron",
+	);
+	const cronTriggers = unique(
+		operations
+			.filter((operation) => operation.kind === "cron")
+			.flatMap((operation) => operation.cronTriggers ?? []),
+	);
+	const schedulerEnabled =
+		config.config.scheduler.enabled && schedulerOperations.length > 0;
+	const realtimeEnabled = config.config.realtime.enabled;
+	const workerNameOverride =
+		typeof config.config.wranglerOverrides?.name === "string"
+			? config.config.wranglerOverrides.name
+			: undefined;
+	const workerName = workerNameOverride ?? "appflare-worker";
+	const schedulerQueueName =
+		config.config.scheduler.queue ?? `${workerName}-scheduler`;
+
+	const wranglerBase: JsonObject = {
+		name: workerName,
+		main: "./src/index.ts",
+		d1_databases: config.config.database.map((database) => ({
+			binding: database.binding,
+			database_name: database.databaseName,
+			database_id: database.databaseId,
+			preview_database_id: database.previewDatabaseId ?? database.databaseId,
+			...(database.migrationsDir
+				? { migrations_dir: database.migrationsDir }
+				: {}),
+		})),
+		kv_namespaces: config.config.kv.map((namespace) => ({
+			binding: namespace.binding,
+			id: namespace.id,
+			...(namespace.previewId ? { preview_id: namespace.previewId } : {}),
+		})),
+		r2_buckets: config.config.r2.map((bucket) => ({
+			binding: bucket.binding,
+			bucket_name: bucket.bucketName,
+			...(bucket.previewBucketName
+				? { preview_bucket_name: bucket.previewBucketName }
+				: {}),
+			...(bucket.jurisdiction ? { jurisdiction: bucket.jurisdiction } : {}),
+		})),
+		...(schedulerEnabled
+			? {
+					queues: {
+						producers: [
+							{
+								binding: config.config.scheduler.binding,
+								queue: schedulerQueueName,
+							},
+						],
+						consumers: [
+							{
+								queue: schedulerQueueName,
+							},
+						],
+					},
+				}
+			: {}),
+		...(cronTriggers.length > 0
+			? {
+					triggers: {
+						crons: cronTriggers,
+					},
+				}
+			: {}),
+		...(realtimeEnabled
+			? {
+					durable_objects: {
+						bindings: [
+							{
+								name: config.config.realtime.binding,
+								class_name: config.config.realtime.className,
+							},
+						],
+					},
+					migrations: [
+						{
+							tag: "appflare-realtime-v1",
+							new_sqlite_classes: [config.config.realtime.className],
+						},
+					],
+				}
+			: {}),
+	};
+
+	if (!config.config.wranglerOverrides) {
+		return wranglerBase;
+	}
+
+	const { scheduler: _ignoredSchedulerOverride, ...wranglerOverrides } =
+		config.config.wranglerOverrides;
+
+	return deepMergeJson(wranglerBase, wranglerOverrides);
+}

package/cli/templates/dashboard/builders/functions/index.ts

@@ -1,17 +1,17 @@
-import { DiscoveredHandlerOperation } from "../../../../utils/handler-discovery";
-import { buildFunctionPage } from "./render-page";
-
-export function buildFunctionRoutes(
-	handlers: DiscoveredHandlerOperation[],
-): string {
-	const routes = handlers.map((h) => {
-		if (h.kind !== "query" && h.kind !== "mutation") return "";
-
-		return `
-	adminApp.get('/functions${h.routePath}', (c) => {
-        ${buildFunctionPage(h)}
-	});`;
-	});
-
-	return routes.join("\n");
-}
+import { DiscoveredHandlerOperation } from "../../../../utils/handler-discovery";
+import { buildFunctionPage } from "./render-page";
+
+export function buildFunctionRoutes(
+	handlers: DiscoveredHandlerOperation[],
+): string {
+	const routes = handlers.map((h) => {
+		if (h.kind !== "query" && h.kind !== "mutation") return "";
+
+		return `
+	adminApp.get('/functions${h.routePath}', (c) => {
+        ${buildFunctionPage(h)}
+	});`;
+	});
+
+	return routes.join("\n");
+}

package/cli/templates/dashboard/builders/functions/render-page/header.ts

@@ -1,20 +1,20 @@
-import { DiscoveredHandlerOperation } from "../../../../../utils/handler-discovery";
-
-export function renderHeader(h: DiscoveredHandlerOperation): string {
-	return `
-		<div class="flex items-center justify-between">
-			<div class="flex items-center gap-3">
-				<div class="w-10 h-10 rounded-xl bg-primary/10 flex items-center justify-center">
-					<iconify-icon icon="${h.kind === "query" ? "solar:reorder-bold-duotone" : "solar:bolt-bold-duotone"}" width="24" height="24" class="text-primary"></iconify-icon>
-				</div>
-				<div>
-					<h1 class="text-xl font-bold tracking-tight">${h.exportName}</h1>
-					<p class="text-xs opacity-50 font-medium uppercase tracking-wider">${h.kind}</p>
-				</div>
-			</div>
-			<div class="flex items-center gap-2">
-				<span class="badge badge-sm badge-ghost font-mono opacity-50 px-2 py-3">/api${h.routePath}</span>
-			</div>
-		</div>
-	`;
-}
+import { DiscoveredHandlerOperation } from "../../../../../utils/handler-discovery";
+
+export function renderHeader(h: DiscoveredHandlerOperation): string {
+	return `
+		<div class="flex items-center justify-between">
+			<div class="flex items-center gap-3">
+				<div class="w-10 h-10 rounded-xl bg-primary/10 flex items-center justify-center">
+					<iconify-icon icon="${h.kind === "query" ? "solar:reorder-bold-duotone" : "solar:bolt-bold-duotone"}" width="24" height="24" class="text-primary"></iconify-icon>
+				</div>
+				<div>
+					<h1 class="text-xl font-bold tracking-tight">${h.exportName}</h1>
+					<p class="text-xs opacity-50 font-medium uppercase tracking-wider">${h.kind}</p>
+				</div>
+			</div>
+			<div class="flex items-center gap-2">
+				<span class="badge badge-sm badge-ghost font-mono opacity-50 px-2 py-3">/api${h.routePath}</span>
+			</div>
+		</div>
+	`;
+}

package/cli/templates/dashboard/builders/functions/render-page/index.ts

@@ -1,33 +1,33 @@
-import { DiscoveredHandlerOperation } from "../../../../../utils/handler-discovery";
-import { renderHeader } from "./header";
-import { renderRequestPanel } from "./request-panel";
-import { renderResultPanel } from "./result-panel";
-import { renderScripts } from "./scripts";
-
-export function buildFunctionPage(h: DiscoveredHandlerOperation): string {
-	return `
-				const content = html\`
-				<div class="flex flex-col gap-6 max-w-5xl mx-auto"  id="main-content">
-					${renderHeader(h)}
-
-					<div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
-						<!-- Request Panel -->
-						${renderRequestPanel(h)}
-
-						<!-- Result Panel -->
-						${renderResultPanel()}
-					</div>
-				</div>
-
-				${renderScripts(h)}
-			\`;
-
-		if (c.req.header('hx-request')) {
-			return c.html(content);
-		}
-
-		return c.html(Layout({
-			title: "${h.exportName} - Functions",
-			children: content
-		}));`;
-}
+import { DiscoveredHandlerOperation } from "../../../../../utils/handler-discovery";
+import { renderHeader } from "./header";
+import { renderRequestPanel } from "./request-panel";
+import { renderResultPanel } from "./result-panel";
+import { renderScripts } from "./scripts";
+
+export function buildFunctionPage(h: DiscoveredHandlerOperation): string {
+	return `
+				const content = html\`
+				<div class="flex flex-col gap-6 max-w-5xl mx-auto"  id="main-content">
+					${renderHeader(h)}
+
+					<div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
+						<!-- Request Panel -->
+						${renderRequestPanel(h)}
+
+						<!-- Result Panel -->
+						${renderResultPanel()}
+					</div>
+				</div>
+
+				${renderScripts(h)}
+			\`;
+
+		if (c.req.header('hx-request')) {
+			return c.html(content);
+		}
+
+		return c.html(Layout({
+			title: "${h.exportName} - Functions",
+			children: content
+		}));`;
+}