From d1f59c99a455e831e1659682df96547cb1ea102a Mon Sep 17 00:00:00 2001
From: Ben Merckx <ben@codeurs.be>
Date: Tue, 12 Nov 2024 11:07:30 +0530
Subject: [PATCH] Add entry fields to inferred types

---
 src/core/Graph.ts |  4 +---
 src/core/Infer.ts | 11 +++--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/core/Graph.ts b/src/core/Graph.ts
index db2d5316..c50877bf 100644
--- a/src/core/Graph.ts
+++ b/src/core/Graph.ts
@@ -77,9 +77,7 @@ type InferResult<Selection, Types, Include> = Selection extends Expr<
   : Selection extends undefined
   ? Types extends undefined
     ? EntryFields & (Include extends undefined ? {} : InferSelection<Include>)
-    : Infer<Types> &
-        EntryFields &
-        (Include extends undefined ? {} : InferSelection<Include>)
+    : Infer<Types> & (Include extends undefined ? {} : InferSelection<Include>)
   : InferSelection<Selection>
 
 type QueryResult<Selection, Types, Include> = Expand<
diff --git a/src/core/Infer.ts b/src/core/Infer.ts
index 9f218ad0..07b8325f 100644
--- a/src/core/Infer.ts
+++ b/src/core/Infer.ts
@@ -1,24 +1,19 @@
 import {Expand, UnionOfValues} from 'alinea/core/util/Types'
+import {EntryFields} from './EntryFields.js'
 import {Expr} from './Expr.js'
 import {Field} from './Field.js'
 import {Type} from './Type.js'
 
 type QueryList<T> = Expand<
   UnionOfValues<{
-    [K in keyof T]: {_type: K} & QueryRow<T[K]>
+    [K in keyof T]: {_type: K} & Type.Infer<T[K]>
   }>
 >
 
-export type QueryRow<Definition> = {
-  [K in keyof Definition as Definition[K] extends Expr<any>
-    ? K
-    : never]: Definition[K] extends Expr<infer T> ? T : never
-}
-
 export type InferQueryValue<T> = T extends Array<Type<infer X>>
   ? InferQueryValue<X>
   : T extends Type<infer Fields>
-  ? QueryRow<Fields>
+  ? Type.Infer<Fields> & EntryFields
   : T extends Expr<infer QueryValue>
   ? QueryValue
   : T extends Record<string, Type>