appflare 0.2.24 → 0.2.26

package/cli/templates/handlers/generators/types/query-runtime.ts

@@ -1,15 +1,15 @@
-import { generateQueryRuntimeAggregateAndFooterSection } from "./query-runtime/runtime-aggregate-and-footer";
-import { generateQueryRuntimeHandledErrorSection } from "./query-runtime/handled-error";
-import { generateQueryRuntimeReadSection } from "./query-runtime/runtime-read";
-import { generateQueryRuntimeSetupSection } from "./query-runtime/runtime-setup";
-import { generateQueryRuntimeWriteSection } from "./query-runtime/runtime-write";
-
-export function generateTypesQueryRuntimeSection(): string {
-	return [
-		generateQueryRuntimeSetupSection(),
-		generateQueryRuntimeReadSection(),
-		generateQueryRuntimeWriteSection(),
-		generateQueryRuntimeAggregateAndFooterSection(),
-		generateQueryRuntimeHandledErrorSection(),
-	].join("\n\n");
-}
+import { generateQueryRuntimeAggregateAndFooterSection } from "./query-runtime/runtime-aggregate-and-footer";
+import { generateQueryRuntimeHandledErrorSection } from "./query-runtime/handled-error";
+import { generateQueryRuntimeReadSection } from "./query-runtime/runtime-read";
+import { generateQueryRuntimeSetupSection } from "./query-runtime/runtime-setup";
+import { generateQueryRuntimeWriteSection } from "./query-runtime/runtime-write";
+
+export function generateTypesQueryRuntimeSection(): string {
+	return [
+		generateQueryRuntimeSetupSection(),
+		generateQueryRuntimeReadSection(),
+		generateQueryRuntimeWriteSection(),
+		generateQueryRuntimeAggregateAndFooterSection(),
+		generateQueryRuntimeHandledErrorSection(),
+	].join("\n\n");
+}

package/cli/templates/handlers/index.ts

@@ -1,43 +1,43 @@
-import { DiscoveredHandlerOperation } from "../../utils/handler-discovery";
-import { generateContextSource } from "./generators/context";
-import { generateExecutionSource } from "./generators/execution";
-import { generateHandlersSource } from "./generators/handlers";
-import { generateRegistration } from "./registration";
-
-export type GeneratedHandlerArtifact = {
-	relativePath: string;
-	source: string;
-};
-
-export function generateHandlersArtifacts(
-	schemaImportPath: string,
-	operations: DiscoveredHandlerOperation[],
-	defaultR2Binding?: string,
-): GeneratedHandlerArtifact[] {
-	const handlersSource = generateHandlersSource(schemaImportPath);
-
-	const contextSource = generateContextSource(defaultR2Binding);
-
-	const executionSource = generateExecutionSource();
-
-	const routesSource = generateRegistration(operations);
-
-	return [
-		{
-			relativePath: "handlers.ts",
-			source: handlersSource,
-		},
-		{
-			relativePath: "handlers.context.ts",
-			source: contextSource,
-		},
-		{
-			relativePath: "handlers.execution.ts",
-			source: executionSource,
-		},
-		{
-			relativePath: "handlers.routes.ts",
-			source: routesSource,
-		},
-	];
-}
+import { DiscoveredHandlerOperation } from "../../utils/handler-discovery";
+import { generateContextSource } from "./generators/context";
+import { generateExecutionSource } from "./generators/execution";
+import { generateHandlersSource } from "./generators/handlers";
+import { generateRegistration } from "./registration";
+
+export type GeneratedHandlerArtifact = {
+	relativePath: string;
+	source: string;
+};
+
+export function generateHandlersArtifacts(
+	schemaImportPath: string,
+	operations: DiscoveredHandlerOperation[],
+	defaultR2Binding?: string,
+): GeneratedHandlerArtifact[] {
+	const handlersSource = generateHandlersSource(schemaImportPath);
+
+	const contextSource = generateContextSource(defaultR2Binding);
+
+	const executionSource = generateExecutionSource();
+
+	const routesSource = generateRegistration(operations);
+
+	return [
+		{
+			relativePath: "handlers.ts",
+			source: handlersSource,
+		},
+		{
+			relativePath: "handlers.context.ts",
+			source: contextSource,
+		},
+		{
+			relativePath: "handlers.execution.ts",
+			source: executionSource,
+		},
+		{
+			relativePath: "handlers.routes.ts",
+			source: routesSource,
+		},
+	];
+}

package/cli/templates/handlers/operations.ts

@@ -1,116 +1,116 @@
-import {
-	toPascalCase,
-	singularize,
-	zodForColumn,
-	zodForQueryColumn,
-} from "./utils";
-import type {
-	DiscoveredColumn,
-	DiscoveredTable,
-} from "../../utils/schema-discovery";
-
-function createArgsShape(columns: DiscoveredColumn[]): string {
-	const creatableColumns = columns.filter(
-		(column) => !(column.primaryKey && column.autoIncrement),
-	);
-	if (creatableColumns.length === 0) {
-		return "{}";
-	}
-
-	return `{
-${creatableColumns.map((column) => `\t\t${column.name}: ${zodForColumn(column)},`).join("\n")}
-\t}`;
-}
-
-function createInsertValues(columns: DiscoveredColumn[]): string {
-	const creatableColumns = columns.filter(
-		(column) => !(column.primaryKey && column.autoIncrement),
-	);
-
-	if (creatableColumns.length === 0) {
-		return "{}";
-	}
-
-	return `{
-${creatableColumns.map((column) => `\t\t\t${column.name}: args.${column.name},`).join("\n")}
-\t\t}`;
-}
-
-function createQueryBlock(table: DiscoveredTable): string {
-	const idColumn = table.columns.find((column) => column.name === "id");
-	const queryName = `get${toPascalCase(table.exportName)}`;
-	const args = idColumn
-		? `{
-		id: ${zodForQueryColumn(idColumn)},
-\t}`
-		: "{}";
-	const queryBody = idColumn
-		? `if (args.id !== undefined) {
-			return ctx.$db.select().from(schema.${table.exportName}).where(eq(schema.${table.exportName}.id, args.id));
-\t\t}
-\n\t\treturn ctx.$db.select().from(schema.${table.exportName});`
-		: `return ctx.$db.select().from(schema.${table.exportName});`;
-
-	return `export const ${queryName} = query({
-\targs: ${args},
-\thandler: async (ctx, args) => {
-\t\t${queryBody}
-\t},
-});`;
-}
-
-function createMutationBlock(table: DiscoveredTable): string {
-	const mutationName = `create${toPascalCase(singularize(table.exportName))}`;
-	const argsShape = createArgsShape(table.columns);
-	const values = createInsertValues(table.columns);
-
-	return `export const ${mutationName} = mutation({
-\targs: ${argsShape},
-\thandler: async (ctx, args) => {
-		const [created] = await ctx.$db
-\t\t\t.insert(schema.${table.exportName})
-\t\t\t.values(${values})
-\t\t\t.returning();
-
-\n\t\treturn created ?? null;
-\t},
-});`;
-}
-
-function createRegistry(tableNames: string[]): string {
-	const queryEntries = tableNames.map((name) => {
-		return `\t${`get${toPascalCase(name)}`},`;
-	});
-	const mutationEntries = tableNames.map((name) => {
-		return `\t${`create${toPascalCase(singularize(name))}`},`;
-	});
-
-	return `const generatedQueries = {
-${queryEntries.join("\n")}
-} as const;
-
-const generatedMutations = {
-${mutationEntries.join("\n")}
-} as const;`;
-}
-
-export function generateOperations(tables: DiscoveredTable[]): string {
-	if (tables.length === 0) {
-		return `const generatedQueries = {} as const;
-const generatedMutations = {} as const;`;
-	}
-
-	const queryBlocks = tables
-		.map((table) => createQueryBlock(table))
-		.join("\n\n");
-	const mutationBlocks = tables
-		.map((table) => createMutationBlock(table))
-		.join("\n\n");
-	const registry = createRegistry(tables.map((table) => table.exportName));
-
-	return `${queryBlocks}
-
-${mutationBlocks}
-
-${registry}`;
-}
+import {
+	toPascalCase,
+	singularize,
+	zodForColumn,
+	zodForQueryColumn,
+} from "./utils";
+import type {
+	DiscoveredColumn,
+	DiscoveredTable,
+} from "../../utils/schema-discovery";
+
+function createArgsShape(columns: DiscoveredColumn[]): string {
+	const creatableColumns = columns.filter(
+		(column) => !(column.primaryKey && column.autoIncrement),
+	);
+	if (creatableColumns.length === 0) {
+		return "{}";
+	}
+
+	return `{
+${creatableColumns.map((column) => `\t\t${column.name}: ${zodForColumn(column)},`).join("\n")}
+\t}`;
+}
+
+function createInsertValues(columns: DiscoveredColumn[]): string {
+	const creatableColumns = columns.filter(
+		(column) => !(column.primaryKey && column.autoIncrement),
+	);
+
+	if (creatableColumns.length === 0) {
+		return "{}";
+	}
+
+	return `{
+${creatableColumns.map((column) => `\t\t\t${column.name}: args.${column.name},`).join("\n")}
+\t\t}`;
+}
+
+function createQueryBlock(table: DiscoveredTable): string {
+	const idColumn = table.columns.find((column) => column.name === "id");
+	const queryName = `get${toPascalCase(table.exportName)}`;
+	const args = idColumn
+		? `{
+		id: ${zodForQueryColumn(idColumn)},
+\t}`
+		: "{}";
+	const queryBody = idColumn
+		? `if (args.id !== undefined) {
+			return ctx.$db.select().from(schema.${table.exportName}).where(eq(schema.${table.exportName}.id, args.id));
+\t\t}
+\n\t\treturn ctx.$db.select().from(schema.${table.exportName});`
+		: `return ctx.$db.select().from(schema.${table.exportName});`;
+
+	return `export const ${queryName} = query({
+\targs: ${args},
+\thandler: async (ctx, args) => {
+\t\t${queryBody}
+\t},
+});`;
+}
+
+function createMutationBlock(table: DiscoveredTable): string {
+	const mutationName = `create${toPascalCase(singularize(table.exportName))}`;
+	const argsShape = createArgsShape(table.columns);
+	const values = createInsertValues(table.columns);
+
+	return `export const ${mutationName} = mutation({
+\targs: ${argsShape},
+\thandler: async (ctx, args) => {
+		const [created] = await ctx.$db
+\t\t\t.insert(schema.${table.exportName})
+\t\t\t.values(${values})
+\t\t\t.returning();
+
+\n\t\treturn created ?? null;
+\t},
+});`;
+}
+
+function createRegistry(tableNames: string[]): string {
+	const queryEntries = tableNames.map((name) => {
+		return `\t${`get${toPascalCase(name)}`},`;
+	});
+	const mutationEntries = tableNames.map((name) => {
+		return `\t${`create${toPascalCase(singularize(name))}`},`;
+	});
+
+	return `const generatedQueries = {
+${queryEntries.join("\n")}
+} as const;
+
+const generatedMutations = {
+${mutationEntries.join("\n")}
+} as const;`;
+}
+
+export function generateOperations(tables: DiscoveredTable[]): string {
+	if (tables.length === 0) {
+		return `const generatedQueries = {} as const;
+const generatedMutations = {} as const;`;
+	}
+
+	const queryBlocks = tables
+		.map((table) => createQueryBlock(table))
+		.join("\n\n");
+	const mutationBlocks = tables
+		.map((table) => createMutationBlock(table))
+		.join("\n\n");
+	const registry = createRegistry(tables.map((table) => table.exportName));
+
+	return `${queryBlocks}
+
+${mutationBlocks}
+
+${registry}`;
+}

package/cli/templates/handlers/registration.ts

@@ -1,83 +1,91 @@
-import type { DiscoveredHandlerOperation } from "../../utils/handler-discovery";
-import { buildRegistrationTemplateSections } from "./generators/registration/sections";
-import { realtimeModule } from "./generators/registration/modules/realtime";
-import { storageModule } from "./generators/registration/modules/storage";
-import { schedulerModule } from "./generators/registration/modules/scheduler";
-import { cronModule } from "./generators/registration/modules/cron";
-
-export function generateRegistration(
-	operations: DiscoveredHandlerOperation[],
-): string {
-	const {
-		imports,
-		operationSchemas,
-		schedulerSchemas,
-		queryRoutes,
-		mutationRoutes,
-		queryRegistryEntries,
-		schedulerEntries,
-		schedulerPayloadMapEntries,
-		cronEntries,
-		storageHandlersEntries,
-	} = buildRegistrationTemplateSections(operations);
-
-	return `import { sValidator } from "@hono/standard-validator";
-import type { Hono } from "hono";
-import type { D1Database, IncomingRequestCfProperties, KVNamespace } from "@cloudflare/workers-types";
-import { ZodError, z } from "zod";
-import {
-	AppflareHandledError,
-	type AppflareContext,
-	type DbMutationEvent,
-	createDb,
-	createQueryDb,
-	setStorageHandlers,
-	type RegisterHandlersOptions,
-	type StorageMethod,
-	type WorkerEnv,
-} from "./handlers";
-import { createExecutionContext, createSchedulerExecutionContext, resolveSession } from "./handlers.context";
-import { executeOperation, handleOperationError } from "./handlers.execution";
-${imports ? `\n${imports}` : ""}
-
-${operationSchemas}
-${schedulerSchemas}
-
-const realtimeQueryHandlers = {${queryRegistryEntries || "\n"}
-} as const;
-
-const schedulerHandlers = {${schedulerEntries || "\n"}
-} as const;
-
-type GeneratedSchedulerPayloadMap = {${
-		schedulerPayloadMapEntries ? `\n${schedulerPayloadMapEntries}\n` : ""
-	}};
-
-declare global {
-	interface AppflareSchedulerHandlerMap extends GeneratedSchedulerPayloadMap {}
-}
-
-const cronHandlers = [${cronEntries || "\n"}
-] as const;
-
-const storageHandlers = [${storageHandlersEntries || "\n"}
-] as const;
-
-setStorageHandlers([...storageHandlers]);
-
-${schedulerModule}
-
-${realtimeModule}
-
-export function registerGeneratedHandlers(
-	app: Hono<WorkerEnv>,
-	options: RegisterHandlersOptions,
-): void {
-	registerRealtimeRoutes(app, options);${queryRoutes || "\n\t// No query handlers discovered under scanDir/queries.\n"}${mutationRoutes || "\n\t// No mutation handlers discovered under scanDir/mutations.\n"}
-}
-
-${storageModule}
-
-${cronModule}
-`;
-}
+import type { DiscoveredHandlerOperation } from "../../utils/handler-discovery";
+import { buildRegistrationTemplateSections } from "./generators/registration/sections";
+import { realtimeModule } from "./generators/registration/modules/realtime";
+import { storageModule } from "./generators/registration/modules/storage";
+import { schedulerModule } from "./generators/registration/modules/scheduler";
+import { cronModule } from "./generators/registration/modules/cron";
+
+export function generateRegistration(
+	operations: DiscoveredHandlerOperation[],
+): string {
+	const {
+		imports,
+		operationSchemas,
+		schedulerSchemas,
+		queryRoutes,
+		mutationRoutes,
+		queryRegistryEntries,
+		schedulerEntries,
+		schedulerPayloadMapEntries,
+		cronEntries,
+		storageHandlersEntries,
+	} = buildRegistrationTemplateSections(operations);
+
+	return `import { sValidator } from "@hono/standard-validator";
+import type { Hono } from "hono";
+import type { D1Database, IncomingRequestCfProperties, KVNamespace } from "@cloudflare/workers-types";
+import { ZodError, z } from "zod";
+import {
+	AppflareHandledError,
+	type AppflareContext,
+	type DbMutationEvent,
+	createDb,
+	createQueryDb,
+	setStorageHandlers,
+	type RegisterHandlersOptions,
+	type StorageMethod,
+	type WorkerEnv,
+} from "./handlers";
+import { createExecutionContext, createSchedulerExecutionContext, resolveSession } from "./handlers.context";
+import { executeOperation, handleOperationError } from "./handlers.execution";
+${imports ? `\n${imports}` : ""}
+
+${operationSchemas}
+${schedulerSchemas}
+
+const realtimeQueryHandlers = {${queryRegistryEntries || "\n"}
+} as const;
+
+const schedulerHandlers = {${schedulerEntries || "\n"}
+} as const;
+
+type GeneratedSchedulerPayloadMap = {${
+		schedulerPayloadMapEntries ? `\n${schedulerPayloadMapEntries}\n` : ""
+	}};
+
+declare global {
+	interface AppflareSchedulerHandlerMap extends GeneratedSchedulerPayloadMap {}
+}
+
+type CronHandlerEntry = {
+	taskName: string;
+	cronTriggers: readonly string[];
+	definition: {
+		handler: (ctx: AppflareContext) => void | Promise<void>;
+	};
+};
+
+const cronHandlers: readonly CronHandlerEntry[] = [${cronEntries || "\n"}
+];
+
+const storageHandlers = [${storageHandlersEntries || "\n"}
+] as const;
+
+setStorageHandlers([...storageHandlers]);
+
+${schedulerModule}
+
+${realtimeModule}
+
+export function registerGeneratedHandlers(
+	app: Hono<WorkerEnv>,
+	options: RegisterHandlersOptions,
+): void {
+	registerRealtimeRoutes(app, options);${queryRoutes || "\n\t// No query handlers discovered under scanDir/queries.\n"}${mutationRoutes || "\n\t// No mutation handlers discovered under scanDir/mutations.\n"}
+}
+
+${storageModule}
+
+${cronModule}
+`;
+}

package/cli/templates/handlers/types.ts

@@ -1,15 +1,15 @@
-import { generateTypesCoreSection } from "./generators/types/core";
-import { generateTypesQueryDefinitionsSection } from "./generators/types/query-definitions";
-import { generateTypesQueryRuntimeSection } from "./generators/types/query-runtime";
-import { generateTypesContextSection } from "./generators/types/context";
-import { generateTypesOperationsSection } from "./generators/types/operations";
-
-export function generateTypes(): string {
-	return [
-		generateTypesCoreSection(),
-		generateTypesQueryDefinitionsSection(),
-		generateTypesQueryRuntimeSection(),
-		generateTypesContextSection(),
-		generateTypesOperationsSection(),
-	].join("\n\n");
-}
+import { generateTypesCoreSection } from "./generators/types/core";
+import { generateTypesQueryDefinitionsSection } from "./generators/types/query-definitions";
+import { generateTypesQueryRuntimeSection } from "./generators/types/query-runtime";
+import { generateTypesContextSection } from "./generators/types/context";
+import { generateTypesOperationsSection } from "./generators/types/operations";
+
+export function generateTypes(): string {
+	return [
+		generateTypesCoreSection(),
+		generateTypesQueryDefinitionsSection(),
+		generateTypesQueryRuntimeSection(),
+		generateTypesContextSection(),
+		generateTypesOperationsSection(),
+	].join("\n\n");
+}

package/cli/templates/handlers/utils.ts

@@ -1,48 +1,48 @@
-import type { DiscoveredColumn } from "../../utils/schema-discovery";
-
-export function toPascalCase(value: string): string {
-	return value
-		.replace(/[_-]+/g, " ")
-		.replace(/\s+(.)/g, (_match, char: string) => char.toUpperCase())
-		.replace(/\s/g, "")
-		.replace(/^(.)/, (_match, char: string) => char.toUpperCase());
-}
-
-export function singularize(value: string): string {
-	if (value.endsWith("ies")) {
-		return `${value.slice(0, -3)}y`;
-	}
-	if (value.endsWith("ses")) {
-		return value.slice(0, -2);
-	}
-	if (value.endsWith("s") && value.length > 1) {
-		return value.slice(0, -1);
-	}
-	return value;
-}
-
-export function zodForColumn(column: DiscoveredColumn): string {
-	if (column.type === "number") {
-		return `z.number()${column.optional ? ".optional()" : ""}`;
-	}
-	if (column.type === "boolean") {
-		return `z.boolean()${column.optional ? ".optional()" : ""}`;
-	}
-	if (column.type === "string") {
-		return `z.string()${column.optional ? ".optional()" : ""}`;
-	}
-	return `z.unknown()${column.optional ? ".optional()" : ""}`;
-}
-
-export function zodForQueryColumn(column: DiscoveredColumn): string {
-	if (column.type === "number") {
-		return "z.coerce.number().optional()";
-	}
-	if (column.type === "boolean") {
-		return "z.coerce.boolean().optional()";
-	}
-	if (column.type === "string") {
-		return "z.string().optional()";
-	}
-	return "z.unknown().optional()";
-}
+import type { DiscoveredColumn } from "../../utils/schema-discovery";
+
+export function toPascalCase(value: string): string {
+	return value
+		.replace(/[_-]+/g, " ")
+		.replace(/\s+(.)/g, (_match, char: string) => char.toUpperCase())
+		.replace(/\s/g, "")
+		.replace(/^(.)/, (_match, char: string) => char.toUpperCase());
+}
+
+export function singularize(value: string): string {
+	if (value.endsWith("ies")) {
+		return `${value.slice(0, -3)}y`;
+	}
+	if (value.endsWith("ses")) {
+		return value.slice(0, -2);
+	}
+	if (value.endsWith("s") && value.length > 1) {
+		return value.slice(0, -1);
+	}
+	return value;
+}
+
+export function zodForColumn(column: DiscoveredColumn): string {
+	if (column.type === "number") {
+		return `z.number()${column.optional ? ".optional()" : ""}`;
+	}
+	if (column.type === "boolean") {
+		return `z.boolean()${column.optional ? ".optional()" : ""}`;
+	}
+	if (column.type === "string") {
+		return `z.string()${column.optional ? ".optional()" : ""}`;
+	}
+	return `z.unknown()${column.optional ? ".optional()" : ""}`;
+}
+
+export function zodForQueryColumn(column: DiscoveredColumn): string {
+	if (column.type === "number") {
+		return "z.coerce.number().optional()";
+	}
+	if (column.type === "boolean") {
+		return "z.coerce.boolean().optional()";
+	}
+	if (column.type === "string") {
+		return "z.string().optional()";
+	}
+	return "z.unknown().optional()";
+}