Revert "Merge pull request #1300 from supabase/fix/revert-new-parser"

This reverts commit 4c7f571, reversing
changes made to 963d6a5.

package.json

@@ -43,7 +43,7 @@
     "@supabase/auth-js": "2.65.1",
     "@supabase/functions-js": "2.4.3",
     "@supabase/node-fetch": "2.6.15",
-    "@supabase/postgrest-js": "1.16.3",
+    "@supabase/postgrest-js": "1.17.0",
     "@supabase/realtime-js": "2.10.7",
     "@supabase/storage-js": "2.7.1"
   },

src/SupabaseClient.ts

@@ -221,7 +221,9 @@ export default class SupabaseClient<
         ? Fn['Returns'][number]
         : never
       : never,
-    Fn['Returns']
+    Fn['Returns'],
+    FnName,
+    null
   > {
     return this.rest.rpc(fn, args, options)
   }

src/lib/types.ts

@@ -80,16 +80,26 @@ export type SupabaseClientOptions<SchemaName> = {
   accessToken?: () => Promise<string>
 }
 
+export type GenericRelationship = {
+  foreignKeyName: string
+  columns: string[]
+  isOneToOne?: boolean
+  referencedRelation: string
+  referencedColumns: string[]
+}
+
 export type GenericTable = {
   Row: Record<string, unknown>
   Insert: Record<string, unknown>
   Update: Record<string, unknown>
+  Relationships: GenericRelationship[]
 }
 
 export type GenericUpdatableView = GenericTable
 
 export type GenericNonUpdatableView = {
   Row: Record<string, unknown>
+  Relationships: GenericRelationship[]
 }
 
 export type GenericView = GenericUpdatableView | GenericNonUpdatableView

test/index.test-d.ts

@@ -84,7 +84,7 @@ const supabase = createClient<Database>(URL, KEY)
   if (error) {
     throw new Error(error.message)
   }
-  expectType<Database['public']['Tables']['users']['Row'] | null>(message.user)
+  expectType<Database['public']['Tables']['users']['Row']>(message.user)
 }
 
 // one-to-many relationship
@@ -99,8 +99,11 @@ const supabase = createClient<Database>(URL, KEY)
 // referencing missing column
 {
   type SelectQueryError<Message extends string> = { error: true } & Message
+
   const res = await supabase.from('users').select('username, dat')
-  expectType<PostgrestSingleResponse<SelectQueryError<`Referencing missing column \`dat\``>[]>>(res)
+  expectType<
+    PostgrestSingleResponse<SelectQueryError<"column 'dat' does not exist on 'users'.">[]>
+  >(res)
 }
 
 // one-to-one relationship