fix: validate deeply nested filters

supabase · Jan 6, 2025 · 697cc60 · 697cc60
1 parent 6143dd1
commit 697cc60
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/PostgrestFilterBuilder.ts b/src/PostgrestFilterBuilder.ts
@@ -31,8 +31,10 @@ type ResolveFilterValue<
   Tables extends Record<string, GenericTable>,
   Row extends Record<string, unknown>,
   ColumnName extends string
-> = ColumnName extends `${infer RelationshipTable}.${infer RelationshipColumn}`
-  ? ResolveFilterRelationshipValue<Tables, RelationshipTable, RelationshipColumn>
+> = ColumnName extends `${infer RelationshipTable}.${infer Remainder}`
+  ? Remainder extends `${infer _}.${infer _}`
+    ? ResolveFilterValue<Tables, Row, Remainder>
+    : ResolveFilterRelationshipValue<Tables, RelationshipTable, Remainder>
   : ColumnName extends keyof Row
   ? Row[ColumnName]
   : never

diff --git a/test/index.test-d.ts b/test/index.test-d.ts
@@ -40,6 +40,16 @@ const postgrest = new PostgrestClient<Database>(REST_URL)
       .select('users!first_user(status)')
       .in('users.status', ['invalid'])
   )
+  // Validate deeply nested embedded tables
+  expectError(
+    postgrest.from('users').select('messages(channels(*))').eq('messages.channels.id', 'invalid')
+  )
+  expectError(
+    postgrest.from('users').select('messages(channels(*))').neq('messages.channels.id', 'invalid')
+  )
+  expectError(
+    postgrest.from('users').select('messages(channels(*))').in('messages.channels.id', ['invalid'])
+  )
 
   {
     const { data, error } = await postgrest.from('users').select('status').eq('status', 'ONLINE')