wip

Author: avallete

src/PostgrestClient.ts

@@ -210,8 +210,8 @@ export default class PostgrestClient<
     Fn['Returns'] extends any[]
       ? Fn['Returns'][number] extends Record<string, unknown>
         ? Fn['Returns'][number]
-        : never
-      : never,
+        : {}
+      : {},
     Fn['Returns'],
     FnName,
     null,

src/select-query-parser/utils.ts

@@ -484,19 +484,6 @@ export type ResolveForwardRelationship<
     : SelectQueryError<`could not find the relation between ${CurrentTableOrView} and ${Field['name']}`>
   : SelectQueryError<`could not find the relation between ${CurrentTableOrView} and ${Field['name']}`>
 
-type ResolveEmbededFunctionJoinTableRelationship<
-  Schema extends GenericSchema,
-  CurrentTableOrView extends keyof TablesAndViews<Schema> & string,
-  FieldName extends string
-> = FindMatchingFunctionBySetofFrom<
-  Schema['Functions'][FieldName],
-  CurrentTableOrView
-> extends infer Fn
-  ? Fn extends GenericFunction
-    ? Fn['SetofOptions']
-    : false
-  : false
-
 /**
  * Given a CurrentTableOrView, finds all join tables to this relation.
  * For example, if products and categories are linked via product_categories table:
@@ -535,6 +522,19 @@ type ResolveJoinTableRelationship<
     : never
 }[keyof TablesAndViews<Schema>]
 
+type ResolveEmbededFunctionJoinTableRelationship<
+  Schema extends GenericSchema,
+  CurrentTableOrView extends keyof TablesAndViews<Schema> & string,
+  FieldName extends string
+> = FindMatchingFunctionBySetofFrom<
+  Schema['Functions'][FieldName],
+  CurrentTableOrView
+> extends infer Fn
+  ? Fn extends GenericFunction
+    ? Fn['SetofOptions']
+    : false
+  : false
+
 export type FindJoinTableRelationship<
   Schema extends GenericSchema,
   CurrentTableOrView extends keyof TablesAndViews<Schema> & string,

test/advanced_rpc.ts

@@ -522,6 +522,7 @@ describe('rpc', () => {
         user_row: { username: 'supabot' },
       })
       .select('id, username, users(username, catchphrase)')
+      //@ts-expect-error will complain about missing the rest of the params
       .eq('username', 'nope')
 
     expect(res).toMatchInlineSnapshot(`
@@ -551,6 +552,32 @@ describe('rpc', () => {
           "statusText": "OK",
         }
       `)
+    const res3 = await postgrest
+      .rpc('get_user_profile', {
+        //@ts-expect-error will complain about missing the rest of the params
+        user_row: { username: 'supabot' },
+      })
+      // should also be able to fitler before the select
+      .eq('username', 'supabot')
+      .select('username, users(username, catchphrase)')
+
+    expect(res3).toMatchInlineSnapshot(`
+      Object {
+        "count": null,
+        "data": Array [
+          Object {
+            "username": "supabot",
+            "users": Object {
+              "catchphrase": "'cat' 'fat'",
+              "username": "supabot",
+            },
+          },
+        ],
+        "error": null,
+        "status": 200,
+        "statusText": "OK",
+      }
+    `)
   })
 
   test('unresolvable function with text param', async () => {