From 3a86d000f0106b9c9787670d4f06c52c61291e56 Mon Sep 17 00:00:00 2001
From: Jay Meistrich <jmeistrich@gmail.com>
Date: Sat, 2 Nov 2024 10:43:07 +0000
Subject: [PATCH] types: Improve supabase types to infer type from the column
 names in the select query

---
 src/sync-plugins/supabase.ts | 47 ++++++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/sync-plugins/supabase.ts b/src/sync-plugins/supabase.ts
index 235da33b..377b93f0 100644
--- a/src/sync-plugins/supabase.ts
+++ b/src/sync-plugins/supabase.ts
@@ -87,13 +87,7 @@ interface SyncedSupabaseProps<
     supabase?: Client;
     collection: Collection;
     schema?: SchemaName;
-    select?: (
-        query: PostgrestQueryBuilder<
-            SupabaseSchemaOf<Client>,
-            SupabaseTableOf<Client, SchemaName>[Collection],
-            Collection
-        >,
-    ) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+    select?: never;
     filter?: (
         select: PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>,
         params: SyncedGetParams<TRemote>,
@@ -115,6 +109,23 @@ interface SyncedSupabaseProps<
     ) => PromiseLike<PostgrestSingleResponse<TRemote>> | Promise<FunctionsResponse<NoInfer<TRemote>>>;
 }
 
+interface SyncedSupabasePropsWithSelect<
+    Client extends SupabaseClient<any, any>,
+    Collection extends SupabaseCollectionOf<Client, SchemaName>,
+    SchemaName extends SchemaNameOf<Client> = 'public',
+    TOption extends CrudAsOption = 'object',
+    TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>,
+    TLocal = TRemote,
+> extends Omit<SyncedSupabaseProps<Client, Collection, SchemaName, TOption, TRemote, TLocal>, 'select'> {
+    select: (
+        query: PostgrestQueryBuilder<
+            SupabaseSchemaOf<Client>,
+            SupabaseTableOf<Client, SchemaName>[Collection],
+            Collection
+        >,
+    ) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+}
+
 let channelNum = 1;
 const supabaseConfig: SyncedSupabaseConfiguration = {};
 const isEnabled$ = observable(true);
@@ -146,6 +157,16 @@ function wrapSupabaseFn(fn: (...args: any) => PromiseLike<any>, source: CrudErro
     };
 }
 
+export function syncedSupabase<
+    Client extends SupabaseClient<any, any>,
+    Collection extends SupabaseCollectionOf<Client, SchemaName> & string,
+    SchemaName extends SchemaNameOf<Client> = 'public',
+    AsOption extends CrudAsOption = 'object',
+    TRemote = SupabaseRowOf<Client, Collection, SchemaName>,
+    TLocal = TRemote,
+>(
+    props: SyncedSupabasePropsWithSelect<Client, Collection, SchemaName, AsOption, TRemote, TLocal>,
+): SyncedCrudReturnType<TLocal, AsOption>;
 export function syncedSupabase<
     Client extends SupabaseClient<any, any>,
     Collection extends SupabaseCollectionOf<Client, SchemaName> & string,
@@ -155,6 +176,18 @@ export function syncedSupabase<
     TLocal = TRemote,
 >(
     props: SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>,
+): SyncedCrudReturnType<TLocal, AsOption>;
+export function syncedSupabase<
+    Client extends SupabaseClient<any, any>,
+    Collection extends SupabaseCollectionOf<Client, SchemaName> & string,
+    SchemaName extends SchemaNameOf<Client> = 'public',
+    AsOption extends CrudAsOption = 'object',
+    TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>,
+    TLocal = TRemote,
+>(
+    props:
+        | SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>
+        | SyncedSupabasePropsWithSelect<Client, Collection, SchemaName, AsOption, TRemote, TLocal>,
 ): SyncedCrudReturnType<TLocal, AsOption> {
     props = { ...supabaseConfig, ...props } as any;
     const {