detect !inner in one-to-one relationships

supabase · Apr 3, 2024 · 63271ca · 63271ca
1 parent 7c3dd21
commit 63271ca
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/select-query-parser.ts b/src/select-query-parser.ts
@@ -228,7 +228,9 @@ type ConstructFieldDefinition<
               ? R
               : unknown
           > extends true
-          ? Child | null
+          ? Field extends { inner: true }
+            ? Child
+            : Child | null
           : Relationships extends unknown[]
           ? HasFKey<Field['hint'], Relationships> extends true
             ? Field extends { inner: true }
@@ -259,7 +261,9 @@ type ConstructFieldDefinition<
               ? R
               : unknown
           > extends true
-          ? Child | null
+          ? Field extends { inner: true }
+            ? Child
+            : Child | null
           : Relationships extends unknown[]
           ? HasFKeyToFRel<Field['original'], Relationships> extends true
             ? Field extends { inner: true }

diff --git a/test/index.test-d.ts b/test/index.test-d.ts
@@ -154,12 +154,18 @@ const postgrest = new PostgrestClient<Database>(REST_URL)
 {
   const { data: message, error } = await postgrest
     .from('messages')
-    .select('user:users!inner(*)')
+    .select('channels!inner(*, channel_details!inner(*))')
     .single()
   if (error) {
     throw new Error(error.message)
   }
-  expectType<Database['public']['Tables']['users']['Row']>(message.user)
+  type ExpectedType = Prettify<
+    Database['public']['Tables']['channels']['Row'] & {
+      channel_details: Database['public']['Tables']['channel_details']['Row']
+    }
+  >
+
+  expectType<ExpectedType>(message.channels)
 }
 
 // one-to-many relationship