appflare 0.2.5 → 0.2.8

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

@@ -1,433 +1,15 @@
-export function generateTypesQueryRuntimeSection(): string {
-	return `export function createQueryDb(
-	$db: AppflareDb,
-	options?: QueryDbOptions,
-): AppflareQueryDb {
-	const cache = new Map<string, unknown>();
-	const onMutation = options?.onMutation;
-	const queryDb = $db.query as Record<
-		string,
-		{
-			findMany: (args?: unknown) => Promise<unknown>;
-			findFirst: (args?: unknown) => Promise<unknown>;
-		}
-	>;
-
-	return new Proxy({} as AppflareQueryDb, {
-		get: (_target, property) => {
-			const tableName = String(property);
-			if (cache.has(tableName)) {
-				return cache.get(tableName);
-			}
-
-			const queryTable = queryDb[tableName];
-			if (!queryTable) {
-				return undefined;
-			}
-
-			const table = (mergedSchema as Record<string, unknown>)[tableName];
-
-			const emitMutation = (
-				kind: DbMutationKind,
-				args: Record<string, unknown>,
-				rows: unknown[],
-			): void => {
-				onMutation?.({
-					kind,
-					table: tableName,
-					args,
-					rows,
-				});
-			};
-
-			const tableApi = {
-				findMany: (args?: Record<string, unknown>) => {
-					const where = isRecord(args?.where)
-						? (args?.where as Record<string, unknown>)
-						: undefined;
-					const whereFilter = buildWhereFilter(table, where, tableName);
-					const passthroughArgs =
-						where !== undefined && !whereFilter
-							? (() => {
-								const nextArgs = { ...(args ?? {}) };
-								delete nextArgs.where;
-								return nextArgs;
-							})()
-							: args;
-					const withValue = args?.with;
-					const transformedWithResult =
-						withValue === undefined
-							? {
-								with: undefined,
-								aggregatePlan: undefined,
-							}
-							: transformWithRelationsAndExtractAggregates(withValue);
-					const transformedWith = transformedWithResult.with;
-					const aggregatePlan = transformedWithResult.aggregatePlan;
-					if (!whereFilter && transformedWith === withValue && !aggregatePlan) {
-						return queryTable.findMany(passthroughArgs);
-					}
-
-					const queryPromise = queryTable.findMany({
-						...(passthroughArgs ?? {}),
-						...(whereFilter ? { where: () => whereFilter } : {}),
-						...(transformedWith !== undefined ? { with: transformedWith } : {}),
-					});
-
-					if (!aggregatePlan) {
-						return queryPromise;
-					}
-
-					return queryPromise.then((result) =>
-						applyRelationAggregatePlanToResult(result, aggregatePlan),
-					);
-				},
-				findFirst: (args?: Record<string, unknown>) => {
-					const where = isRecord(args?.where)
-						? (args?.where as Record<string, unknown>)
-						: undefined;
-					const whereFilter = buildWhereFilter(table, where, tableName);
-					const passthroughArgs =
-						where !== undefined && !whereFilter
-							? (() => {
-								const nextArgs = { ...(args ?? {}) };
-								delete nextArgs.where;
-								return nextArgs;
-							})()
-							: args;
-					const withValue = args?.with;
-					const transformedWithResult =
-						withValue === undefined
-							? {
-								with: undefined,
-								aggregatePlan: undefined,
-							}
-							: transformWithRelationsAndExtractAggregates(withValue);
-					const transformedWith = transformedWithResult.with;
-					const aggregatePlan = transformedWithResult.aggregatePlan;
-					if (!whereFilter && transformedWith === withValue && !aggregatePlan) {
-						return queryTable.findFirst(passthroughArgs);
-					}
-
-					const queryPromise = queryTable.findFirst({
-						...(passthroughArgs ?? {}),
-						...(whereFilter ? { where: () => whereFilter } : {}),
-						...(transformedWith !== undefined ? { with: transformedWith } : {}),
-					});
-
-					if (!aggregatePlan) {
-						return queryPromise;
-					}
-
-					return queryPromise.then((result) =>
-						applyRelationAggregatePlanToResult(result, aggregatePlan),
-					);
-				},
-				insert: async (args: QueryInsertArgs<TableName>) => {
-					let insertQuery: any = ($db as any)
-						.insert(table as any)
-						.values(args.values as any);
-
-					if (typeof insertQuery.returning === "function") {
-						insertQuery = insertQuery.returning();
-					}
-
-					const rows = (await insertQuery) as Array<TableModel<TableName>>;
-					emitMutation(
-						"insert",
-						{ values: args.values as unknown as Record<string, unknown> },
-						rows,
-					);
-					return rows;
-				},
-				update: async (args: QueryUpdateArgs<TableName>) => {
-					const whereFilter = buildWhereFilter(
-						table,
-						args.where as Record<string, unknown> | undefined,
-						tableName,
-					);
-					let updateQuery: any = ($db as any)
-						.update(table as any)
-						.set(args.set as any);
-
-					if (whereFilter) {
-						updateQuery = updateQuery.where(whereFilter);
-					}
-					if (typeof args.limit === "number" && typeof updateQuery.limit === "function") {
-						updateQuery = updateQuery.limit(args.limit);
-					}
-					if (typeof updateQuery.returning === "function") {
-						updateQuery = updateQuery.returning();
-					}
-
-					const rows = (await updateQuery) as Array<TableModel<TableName>>;
-					emitMutation(
-						"update",
-						{
-							set: args.set as unknown as Record<string, unknown>,
-							where: (args.where ?? undefined) as unknown as Record<string, unknown>,
-							limit: args.limit,
-						},
-						rows,
-					);
-					return rows;
-				},
-				upsert: async (args: QueryUpsertArgs<TableName>) => {
-					const valuesArray = Array.isArray(args.values)
-						? args.values
-						: [args.values];
-					const values = Array.isArray(args.values)
-						? args.values
-						: args.values;
-
-					const targets = args.target
-						? Array.isArray(args.target)
-							? args.target
-							: [args.target]
-						: inferConflictTarget(table);
-
-					if (targets.length === 0) {
-						throw new Error(
-							"Unable to infer conflict target for table " + tableName + ". Provide target explicitly.",
-						);
-					}
-
-					const tableColumns = getTableColumns(table as never) as Record<string, unknown>;
-					const targetColumns = targets
-						.map((target) => tableColumns[target])
-						.filter(Boolean);
-
-					if (targetColumns.length === 0) {
-						throw new Error(
-							"Invalid conflict target for table " + tableName + ".",
-						);
-					}
-
-					const setPayload = args.set ?? valuesArray[0] ?? {};
-					let upsertQuery: any = ($db as any)
-						.insert(table as any)
-						.values(values as any)
-						.onConflictDoUpdate({
-							target: targetColumns as any,
-							set: setPayload as any,
-						});
-
-					if (typeof upsertQuery.returning === "function") {
-						upsertQuery = upsertQuery.returning();
-					}
-
-					const rows = (await upsertQuery) as Array<TableModel<TableName>>;
-					emitMutation(
-						"upsert",
-						{
-							values: args.values as unknown as Record<string, unknown>,
-							target: targets as unknown as Record<string, unknown>,
-							set: (args.set ?? undefined) as unknown as Record<string, unknown>,
-						},
-						rows,
-					);
-					return rows;
-				},
-				delete: async (args?: QueryDeleteArgs<TableName>) => {
-					const whereFilter = buildWhereFilter(
-						table,
-						args?.where as Record<string, unknown> | undefined,
-						tableName,
-					);
-					let deleteQuery: any = ($db as any).delete(table as any);
-
-					if (whereFilter) {
-						deleteQuery = deleteQuery.where(whereFilter);
-					}
-					if (typeof args?.limit === "number" && typeof deleteQuery.limit === "function") {
-						deleteQuery = deleteQuery.limit(args.limit);
-					}
-					if (typeof deleteQuery.returning === "function") {
-						deleteQuery = deleteQuery.returning();
-					}
+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";
 
-					const rows = (await deleteQuery) as Array<TableModel<TableName>>;
-					emitMutation(
-						"delete",
-						{
-							where: (args?.where ?? undefined) as unknown as Record<string, unknown>,
-							limit: args?.limit,
-						},
-						rows,
-					);
-					return rows;
-				},
-				count: async (args?: QueryCountArgs<TableName>) => {
-					const withValue = args?.with;
-					const pathSegments = args?.field
-						? splitAggregateFieldPath(String(args.field))
-						: [];
-					if (args?.field && pathSegments.length === 0) {
-						throw new Error(
-							"Invalid count field for table " + tableName + ": " + String(args.field),
-						);
-					}
-
-					if (withValue !== undefined || pathSegments.length > 1) {
-						const whereFilter = buildWhereFilter(
-							table,
-							args?.where as Record<string, unknown> | undefined,
-							tableName,
-						);
-						const transformedWith =
-							withValue === undefined
-								? undefined
-								: transformWithRelations(withValue);
-						const rawRows = await queryTable.findMany({
-							...(whereFilter ? { where: () => whereFilter } : {}),
-							...(transformedWith !== undefined ? { with: transformedWith } : {}),
-						});
-						const rows = Array.isArray(rawRows) ? rawRows : [];
-						const constrainedRows = hasAggregateWithConstraints(withValue)
-							? rows.filter((row) =>
-									rowMatchesAggregateWithConstraints(row, withValue),
-								)
-							: rows;
-
-						if (!args?.field) {
-							return constrainedRows.length;
-						}
-
-						const values = constrainedRows.flatMap((row) =>
-							collectValuesFromPath(row, pathSegments),
-						);
-						const useDistinct = args?.distinct ?? withValue !== undefined;
-						return countAggregateValues(values, useDistinct);
-					}
-
-					const whereFilter = buildWhereFilter(
-						table,
-						args?.where as Record<string, unknown> | undefined,
-						tableName,
-					);
-					const tableColumns = getTableColumns(table as never) as Record<string, unknown>;
-					const selectedField = args?.field
-						? tableColumns[String(args.field)]
-						: undefined;
-
-					if (args?.field && !selectedField) {
-						throw new Error(
-							"Invalid count field for table " + tableName + ": " + args.field,
-						);
-					}
-
-					let expression: SQL;
-					if (selectedField) {
-						expression = args?.distinct
-							? sql\`count(distinct \${selectedField as never})\`
-							: sql\`count(\${selectedField as never})\`;
-					} else {
-						expression = sql\`count(*)\`;
-					}
-
-					let query = ($db as any)
-						.select({ value: expression })
-						.from(table as any);
-
-					if (whereFilter) {
-						query = query.where(whereFilter);
-					}
-
-					const rows = (await query) as Array<{ value: unknown }>;
-					const value = Number(rows[0]?.value ?? 0);
-					return Number.isFinite(value) ? value : 0;
-				},
-				avg: async (args: QueryAvgArgs<TableName>) => {
-					const withValue = args.with;
-					const pathSegments = splitAggregateFieldPath(String(args.field));
-					if (pathSegments.length === 0) {
-						throw new Error(
-							"Invalid avg field for table " + tableName + ": " + String(args.field),
-						);
-					}
-
-					if (withValue !== undefined || pathSegments.length > 1) {
-						const whereFilter = buildWhereFilter(
-							table,
-							args.where as Record<string, unknown> | undefined,
-							tableName,
-						);
-						const transformedWith =
-							withValue === undefined
-								? undefined
-								: transformWithRelations(withValue);
-						const rawRows = await queryTable.findMany({
-							...(whereFilter ? { where: () => whereFilter } : {}),
-							...(transformedWith !== undefined ? { with: transformedWith } : {}),
-						});
-						const rows = Array.isArray(rawRows) ? rawRows : [];
-						const constrainedRows = hasAggregateWithConstraints(withValue)
-							? rows.filter((row) =>
-									rowMatchesAggregateWithConstraints(row, withValue),
-								)
-							: rows;
-						const numericValues = constrainedRows
-							.flatMap((row) => collectValuesFromPath(row, pathSegments))
-							.map((value) => toFiniteNumber(value))
-							.filter((value): value is number => value !== null);
-						const values = args.distinct
-							? Array.from(new Set<number>(numericValues))
-							: numericValues;
-						return averageAggregateValues(values);
-					}
-
-					const whereFilter = buildWhereFilter(
-						table,
-						args.where as Record<string, unknown> | undefined,
-						tableName,
-					);
-					const tableColumns = getTableColumns(table as never) as Record<string, unknown>;
-					const selectedField = tableColumns[String(args.field)];
-
-					if (!selectedField) {
-						throw new Error(
-							"Invalid avg field for table " + tableName + ": " + String(args.field),
-						);
-					}
-
-					const expression = args.distinct
-						? sql\`avg(distinct \${selectedField as never})\`
-						: sql\`avg(\${selectedField as never})\`;
-
-					let query = ($db as any)
-						.select({ value: expression })
-						.from(table as any);
-
-					if (whereFilter) {
-						query = query.where(whereFilter);
-					}
-
-					const rows = (await query) as Array<{ value: unknown }>;
-					const rawValue = rows[0]?.value;
-					if (rawValue === null || rawValue === undefined) {
-						return null;
-					}
-
-					const value = Number(rawValue);
-					return Number.isFinite(value) ? value : null;
-				},
-			};
-
-			cache.set(tableName, tableApi);
-			return tableApi;
-		},
-	}) as AppflareQueryDb;
-}
-
-export class AppflareHandledError extends Error {
-	public readonly status: number;
-	public readonly payload: unknown;
-
-	public constructor(status: number, payload: unknown) {
-		super(typeof payload === "object" ? "Handled error" : String(payload));
-		this.status = status;
-		this.payload = payload;
-	}
-}
-`;
+export function generateTypesQueryRuntimeSection(): string {
+	return [
+		generateQueryRuntimeSetupSection(),
+		generateQueryRuntimeReadSection(),
+		generateQueryRuntimeWriteSection(),
+		generateQueryRuntimeAggregateAndFooterSection(),
+		generateQueryRuntimeHandledErrorSection(),
+	].join("\n\n");
 }

package/cli/utils/schema-discovery.ts

@@ -5,7 +5,7 @@ import type { LoadedAppflareConfig } from "../types";
 export type DiscoveredColumn = {
 	name: string;
 	expression: string;
-	type: "string" | "number" | "boolean" | "unknown";
+	type: "string" | "number" | "boolean" | "date" | "unknown";
 	optional: boolean;
 	primaryKey: boolean;
 	autoIncrement: boolean;
@@ -191,6 +191,15 @@ function getTopLevelColonIndex(entry: string): number {
 
 function inferColumnType(expression: string): DiscoveredColumn["type"] {
 	const lowered = expression.toLowerCase();
+	if (/mode\s*:\s*["'`](timestamp|timestamp_ms)["'`]/.test(lowered)) {
+		return "date";
+	}
+	if (/mode\s*:\s*["'`]boolean["'`]/.test(lowered)) {
+		return "boolean";
+	}
+	if (/\.(date|datetime|timestamp)\s*\(/.test(lowered)) {
+		return "date";
+	}
 	if (/\.(int|integer|real|numeric|decimal|float|double)\s*\(/.test(lowered)) {
 		return "number";
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "appflare",
-	"version": "0.2.5",
+	"version": "0.2.8",
 	"bin": {
 		"appflare": "./cli/index.ts"
 	},

package/test-better-auth-hash.ts

@@ -0,0 +1,2 @@
+import { hashPassword } from "better-auth/crypto";
+console.log(await hashPassword("password"));