appflare 0.2.15 → 0.2.17

package/cli/templates/handlers/generators/types/query-definitions/schema-and-table-types.ts

@@ -27,7 +27,13 @@ type ResolveNativeFindManyWith<
 	TName extends TableName,
 	TArgs extends QueryFindManyArgs<TName> | undefined,
 > = TArgs extends { with?: infer TWith }
-	? Extract<TWith, NativeFindManyWith<TName>>
+	? Extract<TWith, NativeFindManyWith<TName>> extends infer TResolved
+		? [TResolved] extends [never]
+			? TWith extends Record<string, unknown>
+				? NativeFindManyWith<TName>
+				: never
+			: TResolved
+		: never
 	: never;
 type ResolveTableFindManySelection<
 	TName extends TableName,
@@ -41,35 +47,170 @@ type ResolveTableFindManySelection<
 type TableModel<TName extends TableName> = InferSelectModel<
 	(typeof mergedSchema)[TName]
 >;
+type ManyToManySchemaMap = typeof schema extends {
+	__appflareManyToMany: infer TMap extends Record<string, unknown>;
+}
+	? TMap
+	: {};
+type ManyToManySourceTableMap<TSourceTable extends TableName> =
+	TSourceTable extends keyof ManyToManySchemaMap
+		? ManyToManySchemaMap[TSourceTable] extends Record<string, unknown>
+			? ManyToManySchemaMap[TSourceTable]
+			: {}
+		: {};
+type ManyToManyTargetTableName<
+	TSourceTable extends TableName,
+	TRelationName extends string,
+> = TRelationName extends keyof ManyToManySourceTableMap<TSourceTable>
+	? ManyToManySourceTableMap<TSourceTable>[TRelationName] extends {
+				targetTable: infer TTarget extends string;
+		  }
+			? Extract<TTarget, TableName>
+			: never
+	: never;
+type RuntimeRelationsSchemaMap = typeof schema extends {
+	__appflareRelations: infer TMap extends Record<string, unknown>;
+}
+	? TMap
+	: {};
+type RuntimeRelationsSourceTableMap<TSourceTable extends TableName> =
+	TSourceTable extends keyof RuntimeRelationsSchemaMap
+		? RuntimeRelationsSchemaMap[TSourceTable] extends Record<string, unknown>
+			? RuntimeRelationsSchemaMap[TSourceTable]
+			: {}
+		: {};
+type RuntimeRelationName<TSourceTable extends TableName> =
+	Extract<keyof RuntimeRelationsSourceTableMap<TSourceTable>, string>;
+type RuntimeRelationConfig<
+	TSourceTable extends TableName,
+	TRelationName extends string,
+> = TRelationName extends keyof RuntimeRelationsSourceTableMap<TSourceTable>
+	? RuntimeRelationsSourceTableMap<TSourceTable>[TRelationName]
+	: never;
+type RuntimeRelationKind<
+	TSourceTable extends TableName,
+	TRelationName extends string,
+> = RuntimeRelationConfig<TSourceTable, TRelationName> extends {
+	kind: infer TKind extends string;
+}
+	? TKind
+	: never;
+type RuntimeRelationTargetTable<
+	TSourceTable extends TableName,
+	TRelationName extends string,
+> = RuntimeRelationConfig<TSourceTable, TRelationName> extends {
+	targetTable: infer TTarget extends string;
+}
+	? Extract<TTarget, TableName>
+	: never;
+type TableInsertScalarModel<TName extends TableName> = TableInsertModel<TName>;
+type FindManyWithFromArgs<TArgs> = TArgs extends { with?: infer TWith }
+	? TWith
+	: undefined;
+type ManyToManyRelationRows<
+	TTargetTable extends TableName,
+	TRelationArgs,
+> = TRelationArgs extends true
+	? Array<TableModel<TTargetTable>>
+	: TRelationArgs extends Record<string, unknown>
+		? Awaited<
+				TableFindManyResult<
+					TTargetTable,
+					Extract<
+						Omit<TRelationArgs, "_count" | "_avg">,
+						QueryFindManyArgs<TTargetTable>
+					>
+				>
+		  >
+		: Array<TableModel<TTargetTable>>;
+type ReplaceManyToManyRelationsInRow<
+	TSourceTable extends TableName,
+	TRow,
+	TWith,
+> = TRow extends Record<string, unknown>
+	? {
+			[K in keyof TRow]: K extends string
+				? TWith extends Record<string, unknown>
+					? K extends keyof TWith
+						? [ManyToManyTargetTableName<TSourceTable, K>] extends [never]
+							? TRow[K]
+							: ManyToManyRelationRows<
+									Extract<ManyToManyTargetTableName<TSourceTable, K>, TableName>,
+									TWith[K]
+							  >
+						: TRow[K]
+					: TRow[K]
+				: TRow[K];
+	  }
+	: TRow;
+type ApplyManyToManyFindManyResult<
+	TSourceTable extends TableName,
+	TArgs extends QueryFindManyArgs<TSourceTable> | undefined,
+	TResult,
+> = TResult extends Promise<infer TRows>
+	? TRows extends Array<infer TRow>
+		? Promise<
+				Array<
+					ReplaceManyToManyRelationsInRow<
+						TSourceTable,
+						TRow,
+						FindManyWithFromArgs<TArgs>
+					>
+				>
+		  >
+		: TResult
+	: TResult;
+type ApplyManyToManyFindFirstResult<
+	TSourceTable extends TableName,
+	TArgs extends QueryFindFirstArgs<TSourceTable> | undefined,
+	TResult,
+> = TResult extends Promise<infer TRow>
+	? Promise<
+			TRow extends null
+				? null
+				: ReplaceManyToManyRelationsInRow<
+						TSourceTable,
+						TRow,
+						FindManyWithFromArgs<TArgs>
+				  >
+	  >
+	: TResult;
 type TableFindManyResult<
 	TName extends TableName,
 	TArgs extends QueryFindManyArgs<TName> | undefined =
 		| QueryFindManyArgs<TName>
 		| undefined,
-> = TArgs extends undefined
-	? Promise<Array<TableModel<TName>>>
-	: Promise<
-			Array<
-				BuildQueryResult<
-					SchemaRelations,
-					TableRelationConfig<TName>,
-					ResolveTableFindManySelection<TName, TArgs>
+> = ApplyManyToManyFindManyResult<
+	TName,
+	TArgs,
+	TArgs extends undefined
+		? Promise<Array<TableModel<TName>>>
+		: Promise<
+				Array<
+					BuildQueryResult<
+						SchemaRelations,
+						TableRelationConfig<TName>,
+						ResolveTableFindManySelection<TName, TArgs>
+					>
 				>
-			>
-	  >;
+		  >
+>;
 type TableFindFirstArgs<TName extends TableName> = Omit<
 	TableFindManyArgs<TName>,
 	"limit"
 >;
-type NativeFindFirstWith<TName extends TableName> =
-	NonNullable<TableFindFirstArgs<TName>> extends { with?: infer TWith }
-		? TWith
-		: never;
+type NativeFindFirstWith<TName extends TableName> = NativeFindManyWith<TName>;
 type ResolveNativeFindFirstWith<
 	TName extends TableName,
 	TArgs extends QueryFindFirstArgs<TName> | undefined,
 > = TArgs extends { with?: infer TWith }
-	? Extract<TWith, NativeFindFirstWith<TName>>
+	? Extract<TWith, NativeFindFirstWith<TName>> extends infer TResolved
+		? [TResolved] extends [never]
+			? TWith extends Record<string, unknown>
+				? NativeFindFirstWith<TName>
+				: never
+			: TResolved
+		: never
 	: never;
 type ResolveTableFindFirstSelection<
 	TName extends TableName,
@@ -85,15 +226,19 @@ type TableFindFirstResult<
 	TArgs extends QueryFindFirstArgs<TName> | undefined =
 		| QueryFindFirstArgs<TName>
 		| undefined,
-> = TArgs extends undefined
-	? Promise<TableModel<TName> | null>
-	: Promise<
-			BuildQueryResult<
-				SchemaRelations,
-				TableRelationConfig<TName>,
-				ResolveTableFindFirstSelection<TName, TArgs>
-			> | null
-	  >;
+> = ApplyManyToManyFindFirstResult<
+	TName,
+	TArgs,
+	TArgs extends undefined
+		? Promise<TableModel<TName> | null>
+		: Promise<
+				BuildQueryResult<
+					SchemaRelations,
+					TableRelationConfig<TName>,
+					ResolveTableFindFirstSelection<TName, TArgs>
+				> | null
+		  >
+>;
 type TableInsertModel<TName extends TableName> = InferInsertModel<
 	(typeof mergedSchema)[TName]
 >;

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

@@ -19,12 +19,17 @@ export function generateQueryRuntimeAggregateAndFooterSection(): string {
 						const transformedWith =
 							withValue === undefined
 								? undefined
-								: transformWithRelations(withValue);
+								: transformWithRelations(withValue, tableName);
 						const rawRows = await queryTable.findMany({
 							...(whereFilter ? { where: () => whereFilter } : {}),
 							...(transformedWith !== undefined ? { with: transformedWith } : {}),
 						});
-						const rows = Array.isArray(rawRows) ? rawRows : [];
+						const flattenedRows = flattenManyToManyResult(
+							tableName,
+							rawRows,
+							withValue,
+						);
+						const rows = Array.isArray(flattenedRows) ? flattenedRows : [];
 						const constrainedRows = hasAggregateWithConstraints(withValue)
 							? rows.filter((row) =>
 									rowMatchesAggregateWithConstraints(row, withValue),
@@ -97,12 +102,17 @@ export function generateQueryRuntimeAggregateAndFooterSection(): string {
 						const transformedWith =
 							withValue === undefined
 								? undefined
-								: transformWithRelations(withValue);
+								: transformWithRelations(withValue, tableName);
 						const rawRows = await queryTable.findMany({
 							...(whereFilter ? { where: () => whereFilter } : {}),
 							...(transformedWith !== undefined ? { with: transformedWith } : {}),
 						});
-						const rows = Array.isArray(rawRows) ? rawRows : [];
+						const flattenedRows = flattenManyToManyResult(
+							tableName,
+							rawRows,
+							withValue,
+						);
+						const rows = Array.isArray(flattenedRows) ? flattenedRows : [];
 						const constrainedRows = hasAggregateWithConstraints(withValue)
 							? rows.filter((row) =>
 									rowMatchesAggregateWithConstraints(row, withValue),

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

@@ -19,10 +19,19 @@ export function generateQueryRuntimeReadSection(): string {
 								with: undefined,
 								aggregatePlan: undefined,
 							}
-							: transformWithRelationsAndExtractAggregates(withValue);
+							: transformWithRelationsAndExtractAggregates(withValue, tableName);
 					const transformedWith = transformedWithResult.with;
 					const aggregatePlan = transformedWithResult.aggregatePlan;
-					if (!whereFilter && transformedWith === withValue && !aggregatePlan) {
+					const requiresManyToManyFlatten = hasManyToManyRelationsInWith(
+						tableName,
+						withValue,
+					);
+					if (
+						!whereFilter &&
+						transformedWith === withValue &&
+						!aggregatePlan &&
+						!requiresManyToManyFlatten
+					) {
 						return queryTable.findMany(passthroughArgs);
 					}
 
@@ -32,13 +41,22 @@ export function generateQueryRuntimeReadSection(): string {
 						...(transformedWith !== undefined ? { with: transformedWith } : {}),
 					});
 
-					if (!aggregatePlan) {
-						return queryPromise;
-					}
+					return queryPromise.then((result) => {
+						const flattenedResult = flattenManyToManyResult(
+							tableName,
+							result,
+							withValue,
+						);
 
-					return queryPromise.then((result) =>
-						applyRelationAggregatePlanToResult(result, aggregatePlan),
-					);
+						if (!aggregatePlan) {
+							return flattenedResult;
+						}
+
+						return applyRelationAggregatePlanToResult(
+							flattenedResult,
+							aggregatePlan,
+						);
+					});
 				},
 				findFirst: (args?: Record<string, unknown>) => {
 					const where = isRecord(args?.where)
@@ -60,10 +78,19 @@ export function generateQueryRuntimeReadSection(): string {
 								with: undefined,
 								aggregatePlan: undefined,
 							}
-							: transformWithRelationsAndExtractAggregates(withValue);
+							: transformWithRelationsAndExtractAggregates(withValue, tableName);
 					const transformedWith = transformedWithResult.with;
 					const aggregatePlan = transformedWithResult.aggregatePlan;
-					if (!whereFilter && transformedWith === withValue && !aggregatePlan) {
+					const requiresManyToManyFlatten = hasManyToManyRelationsInWith(
+						tableName,
+						withValue,
+					);
+					if (
+						!whereFilter &&
+						transformedWith === withValue &&
+						!aggregatePlan &&
+						!requiresManyToManyFlatten
+					) {
 						return queryTable.findFirst(passthroughArgs);
 					}
 
@@ -73,13 +100,22 @@ export function generateQueryRuntimeReadSection(): string {
 						...(transformedWith !== undefined ? { with: transformedWith } : {}),
 					});
 
-					if (!aggregatePlan) {
-						return queryPromise;
-					}
+					return queryPromise.then((result) => {
+						const flattenedResult = flattenManyToManyResult(
+							tableName,
+							result,
+							withValue,
+						);
 
-					return queryPromise.then((result) =>
-						applyRelationAggregatePlanToResult(result, aggregatePlan),
-					);
+						if (!aggregatePlan) {
+							return flattenedResult;
+						}
+
+						return applyRelationAggregatePlanToResult(
+							flattenedResult,
+							aggregatePlan,
+						);
+					});
 				},
 `;
 }