appflare 0.2.48 → 0.2.49

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

@@ -1,210 +1,210 @@
-import type { DiscoveredHandlerOperation } from "../../../../utils/handler-discovery";
-
-type IndexedOperation = {
-	operation: DiscoveredHandlerOperation;
-	index: number;
-	alias: string;
-};
-
-export type RegistrationTemplateSections = {
-	imports: string;
-	operationSchemas: string;
-	schedulerSchemas: string;
-	queryRoutes: string;
-	mutationRoutes: string;
-	queryRegistryEntries: string;
-	schedulerEntries: string;
-	schedulerPayloadMapEntries: string;
-	cronEntries: string;
-	storageHandlersEntries: string;
-};
-
-function toSafeIdentifier(value: string): string {
-	const sanitized = value.replace(/[^A-Za-z0-9_]/g, "_");
-	if (/^[0-9]/.test(sanitized)) {
-		return `_${sanitized}`;
-	}
-	return sanitized;
-}
-
-function buildImportAlias(
-	operation: DiscoveredHandlerOperation,
-	index: number,
-): string {
-	const routeName = operation.routePath.replace(/^\//, "").replace(/\//g, "_");
-	return toSafeIdentifier(`op_${index}_${routeName}`);
-}
-
-function indexOperations(
-	operations: DiscoveredHandlerOperation[],
-): IndexedOperation[] {
-	return operations.map((operation, index) => ({
-		operation,
-		index,
-		alias: buildImportAlias(operation, index),
-	}));
-}
-
-function buildImports(operations: IndexedOperation[]): string {
-	return operations
-		.map(({ operation, alias }) => {
-			return `import { ${operation.exportName} as ${alias} } from "${operation.importPath}";`;
-		})
-		.join("\n");
-}
-
-function buildOperationSchemas(operations: IndexedOperation[]): string {
-	return operations
-		.filter(
-			({ operation }) =>
-				operation.kind === "query" || operation.kind === "mutation",
-		)
-		.map(({ alias }) => {
-			const schemaName = `${alias}Schema`;
-			return `const ${schemaName} = z.object(${alias}.definition.args);`;
-		})
-		.join("\n");
-}
-
-function buildSchedulerSchemas(operations: IndexedOperation[]): string {
-	return operations
-		.filter(({ operation }) => operation.kind === "scheduler")
-		.map(({ alias }) => {
-			const schemaName = `${alias}SchedulerSchema`;
-			return `const ${schemaName} = ${alias}.definition.args ? z.object(${alias}.definition.args) : z.undefined();`;
-		})
-		.join("\n");
-}
-
-function buildQueryRoutes(operations: IndexedOperation[]): string {
-	return operations
-		.filter(({ operation }) => operation.kind === "query")
-		.map(({ operation, alias }) => {
-			const schemaName = `${alias}Schema`;
-			return `
-	app.get(
-		"${operation.routePath}",
-		sValidator("query", ${schemaName}),
-		async (c) => {
-			const ctx = await createExecutionContext(c, options);
-			try {
-				return await executeOperation(c, ${alias}, c.req.valid("query"), ctx);
-			} catch (error) {
-				return handleOperationError(c, error, "Invalid query arguments");
-			}
-		},
-	);`;
-		})
-		.join("\n");
-}
-
-function buildMutationRoutes(operations: IndexedOperation[]): string {
-	return operations
-		.filter(({ operation }) => operation.kind === "mutation")
-		.map(({ operation, alias }) => {
-			const schemaName = `${alias}Schema`;
-			return `
-	app.post(
-		"${operation.routePath}",
-		sValidator("json", ${schemaName}),
-		async (c) => {
-			const ctx = await createExecutionContext(c, options);
-			try {
-				const response = await executeOperation(c, ${alias}, c.req.valid("json"), ctx);
-				await publishMutationEvents(c, options, ctx.mutationEvents);
-				return response;
-			} catch (error) {
-				return handleOperationError(c, error, "Invalid mutation arguments");
-			}
-		},
-	);`;
-		})
-		.join("\n");
-}
-
-function buildQueryRegistryEntries(operations: IndexedOperation[]): string {
-	return operations
-		.filter(({ operation }) => operation.kind === "query")
-		.map(({ operation, alias }) => {
-			const schemaName = `${alias}Schema`;
-			const queryName = operation.handlerName ?? operation.routePath;
-			return `
-	${JSON.stringify(queryName)}: {
-		definition: ${alias}.definition,
-		schema: ${schemaName},
-	},`;
-		})
-		.join("\n");
-}
-
-function buildSchedulerEntries(operations: IndexedOperation[]): string {
-	return operations
-		.filter(({ operation }) => operation.kind === "scheduler")
-		.map(({ operation, alias }) => {
-			const schemaName = `${alias}SchedulerSchema`;
-			const taskName = operation.taskName ?? `${operation.routePath}`;
-			return `
-	${JSON.stringify(taskName)}: {
-		definition: ${alias}.definition,
-		schema: ${schemaName},
-	},`;
-		})
-		.join("\n");
-}
-
-function buildSchedulerPayloadMapEntries(
-	operations: IndexedOperation[],
-): string {
-	return operations
-		.filter(({ operation }) => operation.kind === "scheduler")
-		.map(({ operation, alias }) => {
-			const taskName = operation.taskName ?? `${operation.routePath}`;
-			return `\t${JSON.stringify(taskName)}: Parameters<typeof ${alias}.definition.handler>[1];`;
-		})
-		.join("\n");
-}
-
-function buildCronEntries(operations: IndexedOperation[]): string {
-	return operations
-		.filter(({ operation }) => operation.kind === "cron")
-		.map(({ operation, alias }) => {
-			const taskName = operation.taskName ?? `${operation.routePath}`;
-			const cronTriggers = operation.cronTriggers ?? [];
-			return `
-	{
-		taskName: ${JSON.stringify(taskName)},
-		cronTriggers: ${JSON.stringify(cronTriggers)},
-		definition: ${alias}.definition,
-	},`;
-		})
-		.join("\n");
-}
-
-function buildStorageHandlersEntries(operations: IndexedOperation[]): string {
-	return operations
-		.filter(({ operation }) => operation.kind === "storage")
-		.map(({ alias }) => {
-			return `\n\t${alias}.definition.handler,`;
-		})
-		.join("\n");
-}
-
-export function buildRegistrationTemplateSections(
-	operations: DiscoveredHandlerOperation[],
-): RegistrationTemplateSections {
-	const indexedOperations = indexOperations(operations);
-
-	return {
-		imports: buildImports(indexedOperations),
-		operationSchemas: buildOperationSchemas(indexedOperations),
-		schedulerSchemas: buildSchedulerSchemas(indexedOperations),
-		queryRoutes: buildQueryRoutes(indexedOperations),
-		mutationRoutes: buildMutationRoutes(indexedOperations),
-		queryRegistryEntries: buildQueryRegistryEntries(indexedOperations),
-		schedulerEntries: buildSchedulerEntries(indexedOperations),
-		schedulerPayloadMapEntries:
-			buildSchedulerPayloadMapEntries(indexedOperations),
-		cronEntries: buildCronEntries(indexedOperations),
-		storageHandlersEntries: buildStorageHandlersEntries(indexedOperations),
-	};
-}
+import type { DiscoveredHandlerOperation } from "../../../../utils/handler-discovery";
+
+type IndexedOperation = {
+	operation: DiscoveredHandlerOperation;
+	index: number;
+	alias: string;
+};
+
+export type RegistrationTemplateSections = {
+	imports: string;
+	operationSchemas: string;
+	schedulerSchemas: string;
+	queryRoutes: string;
+	mutationRoutes: string;
+	queryRegistryEntries: string;
+	schedulerEntries: string;
+	schedulerPayloadMapEntries: string;
+	cronEntries: string;
+	storageHandlersEntries: string;
+};
+
+function toSafeIdentifier(value: string): string {
+	const sanitized = value.replace(/[^A-Za-z0-9_]/g, "_");
+	if (/^[0-9]/.test(sanitized)) {
+		return `_${sanitized}`;
+	}
+	return sanitized;
+}
+
+function buildImportAlias(
+	operation: DiscoveredHandlerOperation,
+	index: number,
+): string {
+	const routeName = operation.routePath.replace(/^\//, "").replace(/\//g, "_");
+	return toSafeIdentifier(`op_${index}_${routeName}`);
+}
+
+function indexOperations(
+	operations: DiscoveredHandlerOperation[],
+): IndexedOperation[] {
+	return operations.map((operation, index) => ({
+		operation,
+		index,
+		alias: buildImportAlias(operation, index),
+	}));
+}
+
+function buildImports(operations: IndexedOperation[]): string {
+	return operations
+		.map(({ operation, alias }) => {
+			return `import { ${operation.exportName} as ${alias} } from "${operation.importPath}";`;
+		})
+		.join("\n");
+}
+
+function buildOperationSchemas(operations: IndexedOperation[]): string {
+	return operations
+		.filter(
+			({ operation }) =>
+				operation.kind === "query" || operation.kind === "mutation",
+		)
+		.map(({ alias }) => {
+			const schemaName = `${alias}Schema`;
+			return `const ${schemaName} = z.object(${alias}.definition.args);`;
+		})
+		.join("\n");
+}
+
+function buildSchedulerSchemas(operations: IndexedOperation[]): string {
+	return operations
+		.filter(({ operation }) => operation.kind === "scheduler")
+		.map(({ alias }) => {
+			const schemaName = `${alias}SchedulerSchema`;
+			return `const ${schemaName} = ${alias}.definition.args ? z.object(${alias}.definition.args) : z.undefined();`;
+		})
+		.join("\n");
+}
+
+function buildQueryRoutes(operations: IndexedOperation[]): string {
+	return operations
+		.filter(({ operation }) => operation.kind === "query")
+		.map(({ operation, alias }) => {
+			const schemaName = `${alias}Schema`;
+			return `
+	app.get(
+		"${operation.routePath}",
+		sValidator("query", ${schemaName}),
+		async (c) => {
+			const ctx = await createExecutionContext(c, options);
+			try {
+				return await executeOperation(c, ${alias}, c.req.valid("query"), ctx);
+			} catch (error) {
+				return handleOperationError(c, error, "Invalid query arguments");
+			}
+		},
+	);`;
+		})
+		.join("\n");
+}
+
+function buildMutationRoutes(operations: IndexedOperation[]): string {
+	return operations
+		.filter(({ operation }) => operation.kind === "mutation")
+		.map(({ operation, alias }) => {
+			const schemaName = `${alias}Schema`;
+			return `
+	app.post(
+		"${operation.routePath}",
+		sValidator("json", ${schemaName}),
+		async (c) => {
+			const ctx = await createExecutionContext(c, options);
+			try {
+				const response = await executeOperation(c, ${alias}, c.req.valid("json"), ctx);
+				await publishMutationEvents(c, options, ctx.mutationEvents);
+				return response;
+			} catch (error) {
+				return handleOperationError(c, error, "Invalid mutation arguments");
+			}
+		},
+	);`;
+		})
+		.join("\n");
+}
+
+function buildQueryRegistryEntries(operations: IndexedOperation[]): string {
+	return operations
+		.filter(({ operation }) => operation.kind === "query")
+		.map(({ operation, alias }) => {
+			const schemaName = `${alias}Schema`;
+			const queryName = operation.handlerName ?? operation.routePath;
+			return `
+	${JSON.stringify(queryName)}: {
+		definition: ${alias}.definition,
+		schema: ${schemaName},
+	},`;
+		})
+		.join("\n");
+}
+
+function buildSchedulerEntries(operations: IndexedOperation[]): string {
+	return operations
+		.filter(({ operation }) => operation.kind === "scheduler")
+		.map(({ operation, alias }) => {
+			const schemaName = `${alias}SchedulerSchema`;
+			const taskName = operation.taskName ?? `${operation.routePath}`;
+			return `
+	${JSON.stringify(taskName)}: {
+		definition: ${alias}.definition,
+		schema: ${schemaName},
+	},`;
+		})
+		.join("\n");
+}
+
+function buildSchedulerPayloadMapEntries(
+	operations: IndexedOperation[],
+): string {
+	return operations
+		.filter(({ operation }) => operation.kind === "scheduler")
+		.map(({ operation, alias }) => {
+			const taskName = operation.taskName ?? `${operation.routePath}`;
+			return `\t${JSON.stringify(taskName)}: Parameters<typeof ${alias}.definition.handler>[1];`;
+		})
+		.join("\n");
+}
+
+function buildCronEntries(operations: IndexedOperation[]): string {
+	return operations
+		.filter(({ operation }) => operation.kind === "cron")
+		.map(({ operation, alias }) => {
+			const taskName = operation.taskName ?? `${operation.routePath}`;
+			const cronTriggers = operation.cronTriggers ?? [];
+			return `
+	{
+		taskName: ${JSON.stringify(taskName)},
+		cronTriggers: ${JSON.stringify(cronTriggers)},
+		definition: ${alias}.definition,
+	},`;
+		})
+		.join("\n");
+}
+
+function buildStorageHandlersEntries(operations: IndexedOperation[]): string {
+	return operations
+		.filter(({ operation }) => operation.kind === "storage")
+		.map(({ alias }) => {
+			return `\n\t${alias}.definition.handler,`;
+		})
+		.join("\n");
+}
+
+export function buildRegistrationTemplateSections(
+	operations: DiscoveredHandlerOperation[],
+): RegistrationTemplateSections {
+	const indexedOperations = indexOperations(operations);
+
+	return {
+		imports: buildImports(indexedOperations),
+		operationSchemas: buildOperationSchemas(indexedOperations),
+		schedulerSchemas: buildSchedulerSchemas(indexedOperations),
+		queryRoutes: buildQueryRoutes(indexedOperations),
+		mutationRoutes: buildMutationRoutes(indexedOperations),
+		queryRegistryEntries: buildQueryRegistryEntries(indexedOperations),
+		schedulerEntries: buildSchedulerEntries(indexedOperations),
+		schedulerPayloadMapEntries:
+			buildSchedulerPayloadMapEntries(indexedOperations),
+		cronEntries: buildCronEntries(indexedOperations),
+		storageHandlersEntries: buildStorageHandlersEntries(indexedOperations),
+	};
+}

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

@@ -1,121 +1,121 @@
-export function generateTypesContextSection(
-	roles: string[] = [],
-	additionalFields: Array<{ name: string; tsType: string }> = [],
-): string {
-	const additionalFieldLines = additionalFields.map(
-		(f) => `\t${f.name}?: ${f.tsType} | null;`,
-	).join("\n");
-
-	const adminFieldLines = roles.length > 0
-		? [
-			"\trole: UserRole;",
-			"\tbanned: boolean | null;",
-			"\tbanReason?: string | null | undefined;",
-			"\tbanExpires?: Date | null | undefined;",
-		].join("\n")
-		: "";
-
-	const userFields = [adminFieldLines, additionalFieldLines].filter(Boolean).join("\n");
-
-	const userType = roles.length > 0
-		? `export type UserRole = ${roles.map((r) => `"${r}"`).join(" | ")};
-type User = import("better-auth").User & {
-${userFields}
-};`
-		: additionalFields.length > 0
-			? `type User = import("better-auth").User & {
-${userFields}
-};`
-			: "type User = import(\"better-auth\").User;";
-
-	return `type AuthSession = typeof auth.$Infer.Session;
-type AuthAdapter = Awaited<typeof auth.$context>["internalAdapter"];
-${userType}
-type Session = AuthSession['session']
-
-export type StoragePutArgs = {
-	path: string;
-	body: ReadableStream | ArrayBuffer | ArrayBufferView | string | Blob;
-	contentType?: string;
-	httpMetadata?: Record<string, unknown>;
-	customMetadata?: Record<string, string>;
-	returnSignedUrlOnly?: boolean;
-	expiresIn?: number;
-};
-
-export type StorageGetArgs = {
-	path: string;
-	method?: StorageMethod;
-	onlyIf?: unknown;
-	range?: unknown;
-	includeBody?: boolean;
-};
-
-export type StorageGetResult = {
-	body: ReadableStream;
-	bodyUsed: boolean;
-	writeHttpResponse: (response: Response) => void;
-	httpMetadata?: Record<string, string | undefined>;
-	customMetadata?: Record<string, string>;
-	range?: {
-		offset: number;
-		length: number;
-	};
-	size: number;
-	etag: string;
-	httpEtag: string;
-	checksums: {
-		md5?: ArrayBuffer;
-		sha1?: ArrayBuffer;
-		sha256?: ArrayBuffer;
-		sha384?: ArrayBuffer;
-		sha512?: ArrayBuffer;
-	};
-	uploaded: Date;
-	key: string;
-	contentType?: string;
-};
-
-export type StorageDeleteArgs = {
-	path: string;
-};
-
-export type StorageListArgs = {
-	prefix?: string;
-	cursor?: string;
-	limit?: number;
-	delimiter?: string;
-	include?: Array<"httpMetadata" | "customMetadata">;
-	method?: StorageMethod;
-};
-
-export type StorageSignedUrlArgs = {
-	path: string;
-	method?: "GET" | "PUT" | "DELETE";
-	expiresIn?: number;
-	contentType?: string;
-	downloadAsAttachment?: boolean;
-	fileName?: string;
-};
-
-export type AppflareStorage = {
-	put: (args: StoragePutArgs) => Promise<unknown>;
-	get: (args: StorageGetArgs) => Promise<StorageGetResult | null>;
-	delete: (args: StorageDeleteArgs) => Promise<void>;
-	list: (args?: StorageListArgs) => Promise<unknown>;
-};
-
-export type AppflareContext = {
-	$db: AppflareDb;
-	db: AppflareQueryDb;
-	mutationEvents: DbMutationEvent[];
-	user: User;
-	session: Session;
-	auth: AuthAdapter;
-	context: Context<WorkerEnv>;
-	scheduler: Scheduler;
-	storage: AppflareStorage;
-	error: (status: number, message: string, details?: unknown) => never;
-};
-`;
-}
+export function generateTypesContextSection(
+	roles: string[] = [],
+	additionalFields: Array<{ name: string; tsType: string }> = [],
+): string {
+	const additionalFieldLines = additionalFields.map(
+		(f) => `\t${f.name}?: ${f.tsType} | null;`,
+	).join("\n");
+
+	const adminFieldLines = roles.length > 0
+		? [
+			"\trole: UserRole;",
+			"\tbanned: boolean | null;",
+			"\tbanReason?: string | null | undefined;",
+			"\tbanExpires?: Date | null | undefined;",
+		].join("\n")
+		: "";
+
+	const userFields = [adminFieldLines, additionalFieldLines].filter(Boolean).join("\n");
+
+	const userType = roles.length > 0
+		? `export type UserRole = ${roles.map((r) => `"${r}"`).join(" | ")};
+type User = import("better-auth").User & {
+${userFields}
+};`
+		: additionalFields.length > 0
+			? `type User = import("better-auth").User & {
+${userFields}
+};`
+			: "type User = import(\"better-auth\").User;";
+
+	return `type AuthSession = typeof auth.$Infer.Session;
+type AuthAdapter = Awaited<typeof auth.$context>["internalAdapter"];
+${userType}
+type Session = AuthSession['session']
+
+export type StoragePutArgs = {
+	path: string;
+	body: ReadableStream | ArrayBuffer | ArrayBufferView | string | Blob;
+	contentType?: string;
+	httpMetadata?: Record<string, unknown>;
+	customMetadata?: Record<string, string>;
+	returnSignedUrlOnly?: boolean;
+	expiresIn?: number;
+};
+
+export type StorageGetArgs = {
+	path: string;
+	method?: StorageMethod;
+	onlyIf?: unknown;
+	range?: unknown;
+	includeBody?: boolean;
+};
+
+export type StorageGetResult = {
+	body: ReadableStream;
+	bodyUsed: boolean;
+	writeHttpResponse: (response: Response) => void;
+	httpMetadata?: Record<string, string | undefined>;
+	customMetadata?: Record<string, string>;
+	range?: {
+		offset: number;
+		length: number;
+	};
+	size: number;
+	etag: string;
+	httpEtag: string;
+	checksums: {
+		md5?: ArrayBuffer;
+		sha1?: ArrayBuffer;
+		sha256?: ArrayBuffer;
+		sha384?: ArrayBuffer;
+		sha512?: ArrayBuffer;
+	};
+	uploaded: Date;
+	key: string;
+	contentType?: string;
+};
+
+export type StorageDeleteArgs = {
+	path: string;
+};
+
+export type StorageListArgs = {
+	prefix?: string;
+	cursor?: string;
+	limit?: number;
+	delimiter?: string;
+	include?: Array<"httpMetadata" | "customMetadata">;
+	method?: StorageMethod;
+};
+
+export type StorageSignedUrlArgs = {
+	path: string;
+	method?: "GET" | "PUT" | "DELETE";
+	expiresIn?: number;
+	contentType?: string;
+	downloadAsAttachment?: boolean;
+	fileName?: string;
+};
+
+export type AppflareStorage = {
+	put: (args: StoragePutArgs) => Promise<unknown>;
+	get: (args: StorageGetArgs) => Promise<StorageGetResult | null>;
+	delete: (args: StorageDeleteArgs) => Promise<void>;
+	list: (args?: StorageListArgs) => Promise<unknown>;
+};
+
+export type AppflareContext = {
+	$db: AppflareDb;
+	db: AppflareQueryDb;
+	mutationEvents: DbMutationEvent[];
+	user: User;
+	session: Session;
+	auth: AuthAdapter;
+	context: Context<WorkerEnv>;
+	scheduler: Scheduler;
+	storage: AppflareStorage;
+	error: (status: number, message: string, details?: unknown) => never;
+};
+`;
+}