fix(types): computed field over rpc call

Fixes: supabase/supabase-js#1364

Author: avallete

src/types.ts

@@ -1,5 +1,5 @@
 import PostgrestError from './PostgrestError'
-import { ContainsNull } from './select-query-parser/types'
+import { ContainsNull, TablesAndViews } from './select-query-parser/types'
 import { FindMatchingFunctionByArgs, IsAny, SelectQueryError } from './select-query-parser/utils'
 import { LastOf } from './select-query-parser/types'
 
@@ -43,7 +43,11 @@ export type GetRpcFunctionFilterBuilderByArgs<
     : // Otherwise, we use the arguments based function definition narrowing to get the rigt value
     Fn extends GenericFunction
     ? {
-        Row: Fn['Returns'] extends any[]
+        Row: Fn['SetofOptions'] extends GenericSetofOption
+          ? Fn['SetofOptions']['isSetofReturn'] extends true
+            ? TablesAndViews<Schema>[Fn['SetofOptions']['to']]['Row']
+            : TablesAndViews<Schema>[Fn['SetofOptions']['to']]['Row']
+          : Fn['Returns'] extends any[]
           ? Fn['Returns'][number] extends Record<string, unknown>
             ? Fn['Returns'][number]
             : never

test/advanced_rpc.test.ts

@@ -529,7 +529,6 @@ describe('advanced rpc', () => {
         user_row: { username: 'supabot' },
       })
       .select('id, username, users(username, catchphrase)')
-      //@ts-expect-error Property 'eq' does not exist on type
       .eq('username', 'nope')
 
     expect(res).toMatchInlineSnapshot(`
@@ -1310,3 +1309,47 @@ describe('advanced rpc', () => {
     UserProfileSchema.parse(res.data)
   })
 })
+
+test('RPC call with subselect and computed field', async () => {
+  const res = await postgrest
+    .rpc('get_messages_by_username', { search_username: 'supabot' })
+    // should be able to select computed field
+    .select('message, blurb_message')
+  // .limit(1)
+  expect(res).toMatchInlineSnapshot(`
+    Object {
+      "count": null,
+      "data": Array [
+        Object {
+          "blurb_message": "Hel",
+          "message": "Hello World 👋",
+        },
+        Object {
+          "blurb_message": "Per",
+          "message": "Perfection is attained, not when there is nothing more to add, but when there is nothing left to take away.",
+        },
+        Object {
+          "blurb_message": "Som",
+          "message": "Some message on channel wihtout details",
+        },
+        Object {
+          "blurb_message": "Som",
+          "message": "Some message on channel wihtout details",
+        },
+      ],
+      "error": null,
+      "status": 200,
+      "statusText": "OK",
+    }
+  `)
+  let result: Exclude<typeof res.data, null>
+  const ExpectedSchema = z.array(
+    z.object({
+      message: z.string().nullable(),
+      blurb_message: z.string().nullable(),
+    })
+  )
+  let expected: z.infer<typeof ExpectedSchema>
+  expectType<TypeEqual<typeof result, typeof expected>>(true)
+  ExpectedSchema.parse(res.data)
+})