appflare 0.2.30 → 0.2.32

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

@@ -1,174 +1,174 @@
-export function generateQueryRuntimeAggregateAndFooterSection(): string {
-	return `				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, tableName);
-						const rawRows = await queryTable.findMany({
-							...(whereFilter ? { where: () => whereFilter } : {}),
-							...(transformedWith !== undefined ? { with: transformedWith } : {}),
-						});
-						const flattenedRows = flattenManyToManyResult(
-							tableName,
-							rawRows,
-							withValue,
-						);
-						const rows = Array.isArray(flattenedRows) ? flattenedRows : [];
-						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, tableName);
-						const rawRows = await queryTable.findMany({
-							...(whereFilter ? { where: () => whereFilter } : {}),
-							...(transformedWith !== undefined ? { with: transformedWith } : {}),
-						});
-						const flattenedRows = flattenManyToManyResult(
-							tableName,
-							rawRows,
-							withValue,
-						);
-						const rows = Array.isArray(flattenedRows) ? flattenedRows : [];
-						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 function generateQueryRuntimeAggregateAndFooterSection(): string {
+	return `				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, tableName);
+						const rawRows = await queryTable.findMany({
+							...(whereFilter ? { where: () => whereFilter } : {}),
+							...(transformedWith !== undefined ? { with: transformedWith } : {}),
+						});
+						const flattenedRows = flattenManyToManyResult(
+							tableName,
+							rawRows,
+							withValue,
+						);
+						const rows = Array.isArray(flattenedRows) ? flattenedRows : [];
+						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, tableName);
+						const rawRows = await queryTable.findMany({
+							...(whereFilter ? { where: () => whereFilter } : {}),
+							...(transformedWith !== undefined ? { with: transformedWith } : {}),
+						});
+						const flattenedRows = flattenManyToManyResult(
+							tableName,
+							rawRows,
+							withValue,
+						);
+						const rows = Array.isArray(flattenedRows) ? flattenedRows : [];
+						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;
+}
+`;
+}

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

@@ -1,121 +1,157 @@
-export function generateQueryRuntimeReadSection(): string {
-	return `				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, tableName);
-					const transformedWith = transformedWithResult.with;
-					const aggregatePlan = transformedWithResult.aggregatePlan;
-					const requiresManyToManyFlatten = hasManyToManyRelationsInWith(
-						tableName,
-						withValue,
-					);
-					if (
-						!whereFilter &&
-						transformedWith === withValue &&
-						!aggregatePlan &&
-						!requiresManyToManyFlatten
-					) {
-						return queryTable.findMany(passthroughArgs);
-					}
-
-					const queryPromise = queryTable.findMany({
-						...(passthroughArgs ?? {}),
-						...(whereFilter ? { where: () => whereFilter } : {}),
-						...(transformedWith !== undefined ? { with: transformedWith } : {}),
-					});
-
-					return queryPromise.then((result) => {
-						const flattenedResult = flattenManyToManyResult(
-							tableName,
-							result,
-							withValue,
-						);
-
-						if (!aggregatePlan) {
-							return flattenedResult;
-						}
-
-						return applyRelationAggregatePlanToResult(
-							flattenedResult,
-							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, tableName);
-					const transformedWith = transformedWithResult.with;
-					const aggregatePlan = transformedWithResult.aggregatePlan;
-					const requiresManyToManyFlatten = hasManyToManyRelationsInWith(
-						tableName,
-						withValue,
-					);
-					if (
-						!whereFilter &&
-						transformedWith === withValue &&
-						!aggregatePlan &&
-						!requiresManyToManyFlatten
-					) {
-						return queryTable.findFirst(passthroughArgs);
-					}
-
-					const queryPromise = queryTable.findFirst({
-						...(passthroughArgs ?? {}),
-						...(whereFilter ? { where: () => whereFilter } : {}),
-						...(transformedWith !== undefined ? { with: transformedWith } : {}),
-					});
-
-					return queryPromise.then((result) => {
-						const flattenedResult = flattenManyToManyResult(
-							tableName,
-							result,
-							withValue,
-						);
-
-						if (!aggregatePlan) {
-							return flattenedResult;
-						}
-
-						return applyRelationAggregatePlanToResult(
-							flattenedResult,
-							aggregatePlan,
-						);
-					});
-				},
-`;
-}
+export function generateQueryRuntimeReadSection(): string {
+	return `				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;
+								delete nextArgs.orderBy;
+								return nextArgs;
+							})()
+							: (() => {
+								const nextArgs = { ...(args ?? {}) };
+								delete nextArgs.orderBy;
+								return nextArgs;
+							})();
+					const withValue = args?.with;
+					const transformedWithResult =
+						withValue === undefined
+							? {
+								with: undefined,
+								aggregatePlan: undefined,
+							}
+							: transformWithRelationsAndExtractAggregates(withValue, tableName);
+					const transformedWith = transformedWithResult.with;
+					const aggregatePlan = transformedWithResult.aggregatePlan;
+					const requiresManyToManyFlatten = hasManyToManyRelationsInWith(
+						tableName,
+						withValue,
+					);
+					const orderByValue = args?.orderBy;
+					const transformedOrderBy = orderByValue
+						? (Array.isArray(orderByValue) ? orderByValue : [orderByValue]).map(
+							(item: Record<string, unknown>) => {
+								const column = item.column as string;
+								const direction = (item.direction as string) ?? "asc";
+								const col = (table as Record<string, { asc: () => unknown; desc: () => unknown }>)[column];
+								return direction === "desc" ? col.desc() : col.asc();
+							},
+						)
+						: undefined;
+					if (
+						!whereFilter &&
+						transformedWith === withValue &&
+						!aggregatePlan &&
+						!requiresManyToManyFlatten &&
+						!transformedOrderBy
+					) {
+						return queryTable.findMany(passthroughArgs);
+					}
+
+					const queryPromise = queryTable.findMany({
+						...(passthroughArgs ?? {}),
+						...(whereFilter ? { where: () => whereFilter } : {}),
+						...(transformedWith !== undefined ? { with: transformedWith } : {}),
+						...(transformedOrderBy ? { orderBy: transformedOrderBy } : {}),
+					});
+
+					return queryPromise.then((result) => {
+						const flattenedResult = flattenManyToManyResult(
+							tableName,
+							result,
+							withValue,
+						);
+
+						if (!aggregatePlan) {
+							return flattenedResult;
+						}
+
+						return applyRelationAggregatePlanToResult(
+							flattenedResult,
+							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;
+								delete nextArgs.orderBy;
+								return nextArgs;
+							})()
+							: (() => {
+								const nextArgs = { ...(args ?? {}) };
+								delete nextArgs.orderBy;
+								return nextArgs;
+							})();
+					const withValue = args?.with;
+					const transformedWithResult =
+						withValue === undefined
+							? {
+								with: undefined,
+								aggregatePlan: undefined,
+							}
+							: transformWithRelationsAndExtractAggregates(withValue, tableName);
+					const transformedWith = transformedWithResult.with;
+					const aggregatePlan = transformedWithResult.aggregatePlan;
+					const requiresManyToManyFlatten = hasManyToManyRelationsInWith(
+						tableName,
+						withValue,
+					);
+					const orderByValue = args?.orderBy;
+					const transformedOrderBy = orderByValue
+						? (Array.isArray(orderByValue) ? orderByValue : [orderByValue]).map(
+							(item: Record<string, unknown>) => {
+								const column = item.column as string;
+								const direction = (item.direction as string) ?? "asc";
+								const col = (table as Record<string, { asc: () => unknown; desc: () => unknown }>)[column];
+								return direction === "desc" ? col.desc() : col.asc();
+							},
+						)
+						: undefined;
+					if (
+						!whereFilter &&
+						transformedWith === withValue &&
+						!aggregatePlan &&
+						!requiresManyToManyFlatten &&
+						!transformedOrderBy
+					) {
+						return queryTable.findFirst(passthroughArgs);
+					}
+
+					const queryPromise = queryTable.findFirst({
+						...(passthroughArgs ?? {}),
+						...(whereFilter ? { where: () => whereFilter } : {}),
+						...(transformedWith !== undefined ? { with: transformedWith } : {}),
+						...(transformedOrderBy ? { orderBy: transformedOrderBy } : {}),
+					});
+
+					return queryPromise.then((result) => {
+						const flattenedResult = flattenManyToManyResult(
+							tableName,
+							result,
+							withValue,
+						);
+
+						if (!aggregatePlan) {
+							return flattenedResult;
+						}
+
+						return applyRelationAggregatePlanToResult(
+							flattenedResult,
+							aggregatePlan,
+						);
+					});
+				},
+`;
+}