appflare 0.2.37 → 0.2.39

package/cli/generate.ts

@@ -36,6 +36,46 @@ function extractRolesFromConfig(config: LoadedAppflareConfig["config"]): string[
 	return [];
 }
 
+type AdditionalField = { name: string; tsType: string };
+
+function extractAdditionalFields(config: LoadedAppflareConfig["config"]): AdditionalField[] {
+	const options = config.auth.options as Record<string, unknown> | undefined;
+	const userSection = options?.user as Record<string, unknown> | undefined;
+	const raw = userSection?.additionalFields as Record<string, { type: string }> | undefined;
+	if (!raw || typeof raw !== "object") return [];
+
+	const typeMap: Record<string, string> = {
+		string: "string",
+		number: "number",
+		boolean: "boolean",
+		date: "Date",
+	};
+
+	return Object.entries(raw)
+		.filter(([, v]) => v && typeof v === "object" && "type" in v)
+		.map(([name, v]) => ({
+			name,
+			tsType: typeMap[(v as { type: string }).type] || "unknown",
+		}));
+}
+
+async function patchAuthSchemaRole(schemaPath: string, roles: string[]): Promise<void> {
+	const content = await Bun.file(schemaPath).text();
+	const roleType = roles.map((r) => `"${r}"`).join(" | ");
+
+	const updated = content
+		.replace(
+			/(import.*?from\s+["']drizzle-orm\/sqlite-core["'])/,
+			"$1\nimport { customType } from \"drizzle-orm/sqlite-core\"",
+		)
+		.replace(
+			/role:\s*text\(["']role["']\)/,
+			`role: customType<{ data: ${roleType}; dataNotNull: ${roleType} }>({ dataType: () => "text" })("role")`,
+		);
+
+	await Bun.write(schemaPath, updated);
+}
+
 function toConfigRelativePath(configDir: string, absolutePath: string): string {
 	const relativePath = relative(configDir, absolutePath).replace(/\\/g, "/");
 	return relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
@@ -96,6 +136,7 @@ export async function generateArtifacts(
 	);
 
 	const roles = extractRolesFromConfig(config);
+	const additionalFields = extractAdditionalFields(config);
 
 	const serverSource = generateServerSource(
 		config.auth.basePath,
@@ -118,6 +159,7 @@ export async function generateArtifacts(
 		discoveredHandlers,
 		config.r2[0]?.binding,
 		roles,
+		additionalFields,
 	);
 	const authConfigSource = generateAuthConfigSource(configImport);
 	const drizzleSchemaPaths = compiledSchema
@@ -201,6 +243,11 @@ export async function generateArtifacts(
 	}
 	process.stdout.write(`🔐 Auth schema (${(performance.now() - t0).toFixed(0)}ms)\n`);
 
+	if (roles.length > 0) {
+		await patchAuthSchemaRole(authSchemaPath, roles);
+		process.stdout.write(`🔧 Patched role type (${(performance.now() - t0).toFixed(0)}ms)\n`);
+	}
+
 	function generatedTsconfig(overrides: Record<string, unknown> = {}) {
 		return {
 			compilerOptions: {

package/cli/templates/auth/config.ts

@@ -41,11 +41,11 @@ export const createAuth = (
 				: undefined,
 			kv: env?.KV,
 		},
-		config.auth.options as any,
+		config.auth.options,
 	);
 
 	return betterAuth({
-		...(cloudflareOptions as any),
+		...cloudflareOptions,
 		...(env
 			? {}
 			: {

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

@@ -1,6 +1,7 @@
 import { generateTypes } from "../types";
+import type { AdditionalField } from "../types";
 
-export function generateHandlersSource(schemaImportPath: string, roles: string[] = []): string {
+export function generateHandlersSource(schemaImportPath: string, roles: string[] = [], additionalFields: AdditionalField[] = []): string {
 	return `import type { Context } from "hono";
 import type { D1Database } from "@cloudflare/workers-types";
 import { drizzle } from "drizzle-orm/d1";
@@ -8,6 +9,6 @@ import { z, type ZodRawShape } from "zod";
 import * as authSchema from "./auth.schema";
 import * as schema from "${schemaImportPath}";
 
-${generateTypes(roles)}
+	${generateTypes(roles, additionalFields)}
 `;
 }

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

@@ -1,13 +1,36 @@
-export function generateTypesContextSection(roles: string[] = []): string {
-	const userTypeExtension =
-		roles.length > 0
-			? `type UserRole = ${roles.map((r) => `"${r}"`).join(" | ")};
-type User = Omit<AuthSession['user'], 'role'> & { role: UserRole };`
-			: `type User = AuthSession['user']`;
+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
+		? `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"];
-${userTypeExtension}
+${userType}
 type Session = AuthSession['session']
 
 export type StoragePutArgs = {

package/cli/templates/handlers/generators/types/query-definitions/query-helper-functions.ts

@@ -55,6 +55,86 @@ function buildJsonFieldFilter(
 	return undefined;
 }
 
+function buildJsonArrayElementMatchCondition(
+	field: unknown,
+	matchValue: unknown,
+): SQL {
+	if (!isRecord(matchValue) || matchValue instanceof Date || Array.isArray(matchValue)) {
+		return sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE j.value = \${matchValue})\`;
+	}
+
+	const propConditions: SQL[] = [];
+	for (const [key, propValue] of Object.entries(matchValue)) {
+		const jsonPath = '$.' + key;
+		if (!isRecord(propValue) || propValue instanceof Date || Array.isArray(propValue)) {
+			propConditions.push(
+				sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE json_extract(j.value, \${jsonPath}) = \${propValue})\`,
+			);
+		} else {
+			const nestedConditions: SQL[] = [];
+			const eqVal = readOperatorValue(propValue, "eq");
+			if (eqVal !== undefined) {
+				nestedConditions.push(
+					sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE json_extract(j.value, \${jsonPath}) = \${eqVal})\`,
+				);
+			}
+			const neVal = readOperatorValue(propValue, "ne");
+			if (neVal !== undefined) {
+				nestedConditions.push(
+					sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE json_extract(j.value, \${jsonPath}) != \${neVal})\`,
+				);
+			}
+			const gtVal = readOperatorValue(propValue, "gt");
+			if (gtVal !== undefined) {
+				nestedConditions.push(
+					sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE json_extract(j.value, \${jsonPath}) > \${gtVal})\`,
+				);
+			}
+			const gteVal = readOperatorValue(propValue, "gte");
+			if (gteVal !== undefined) {
+				nestedConditions.push(
+					sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE json_extract(j.value, \${jsonPath}) >= \${gteVal})\`,
+				);
+			}
+			const ltVal = readOperatorValue(propValue, "lt");
+			if (ltVal !== undefined) {
+				nestedConditions.push(
+					sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE json_extract(j.value, \${jsonPath}) < \${ltVal})\`,
+				);
+			}
+			const lteVal = readOperatorValue(propValue, "lte");
+			if (lteVal !== undefined) {
+				nestedConditions.push(
+					sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE json_extract(j.value, \${jsonPath}) <= \${lteVal})\`,
+				);
+			}
+			const inVal = readOperatorValue(propValue, "in");
+			if (Array.isArray(inVal) && inVal.length > 0) {
+				nestedConditions.push(
+					sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE json_extract(j.value, \${jsonPath}) IN (\${sql.join(inVal.map((v) => sql\`\${v}\`), sql\`, \`)})\`,
+				);
+			}
+			if (nestedConditions.length > 0) {
+				propConditions.push(
+					nestedConditions.length === 1
+						? nestedConditions[0]
+						: and(...nestedConditions),
+				);
+			}
+		}
+	}
+
+	if (propConditions.length === 0) {
+		return sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE json_type(j.value) = 'object')\`;
+	}
+
+	if (propConditions.length === 1) {
+		return propConditions[0];
+	}
+
+	return and(...propConditions);
+}
+
 function buildJsonArrayFilter(
 	fieldName: string,
 	field: unknown,
@@ -69,7 +149,7 @@ function buildJsonArrayFilter(
 	const includesValue = readOperatorValue(value, "includes");
 	if (Array.isArray(includesValue) && includesValue.length > 0) {
 		const conditions = includesValue.map((v) =>
-			sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE j.value = \${v})\`,
+			buildJsonArrayElementMatchCondition(field, v),
 		);
 		filters.push(and(...conditions));
 	}
@@ -77,7 +157,7 @@ function buildJsonArrayFilter(
 	const includesAnyValue = readOperatorValue(value, "includesAny");
 	if (Array.isArray(includesAnyValue) && includesAnyValue.length > 0) {
 		const conditions = includesAnyValue.map((v) =>
-			sql\`EXISTS (SELECT 1 FROM json_each(\${field as never}) j WHERE j.value = \${v})\`,
+			buildJsonArrayElementMatchCondition(field, v),
 		);
 		filters.push(sql\`(\${sql.join(conditions, sql\` OR \`)})\`);
 	}

package/cli/templates/handlers/index.ts

@@ -4,6 +4,8 @@ import { generateExecutionSource } from "./generators/execution";
 import { generateHandlersSource } from "./generators/handlers";
 import { generateRegistration } from "./registration";
 
+export type AdditionalField = { name: string; tsType: string };
+
 export type GeneratedHandlerArtifact = {
 	relativePath: string;
 	source: string;
@@ -14,8 +16,9 @@ export function generateHandlersArtifacts(
 	operations: DiscoveredHandlerOperation[],
 	defaultR2Binding?: string,
 	roles: string[] = [],
+	additionalFields: AdditionalField[] = [],
 ): GeneratedHandlerArtifact[] {
-	const handlersSource = generateHandlersSource(schemaImportPath, roles);
+	const handlersSource = generateHandlersSource(schemaImportPath, roles, additionalFields);
 
 	const contextSource = generateContextSource(defaultR2Binding);
 

package/cli/templates/handlers/types.ts

@@ -4,12 +4,14 @@ import { generateTypesQueryRuntimeSection } from "./generators/types/query-runti
 import { generateTypesContextSection } from "./generators/types/context";
 import { generateTypesOperationsSection } from "./generators/types/operations";
 
-export function generateTypes(roles: string[] = []): string {
+export type AdditionalField = { name: string; tsType: string };
+
+export function generateTypes(roles: string[] = [], additionalFields: AdditionalField[] = []): string {
 	return [
 		generateTypesCoreSection(),
 		generateTypesQueryDefinitionsSection(),
 		generateTypesQueryRuntimeSection(),
-		generateTypesContextSection(roles),
+		generateTypesContextSection(roles, additionalFields),
 		generateTypesOperationsSection(),
 	].join("\n\n");
 }