@legendapp/state 3.0.0-alpha.3 → 3.0.0-alpha.31

package/sync-plugins/keel.js

@@ -1,16 +1,15 @@
 'use strict';
 
-var ksuid = require('ksuid');
 var state = require('@legendapp/state');
 var sync = require('@legendapp/state/sync');
 var crud = require('@legendapp/state/sync-plugins/crud');
+var ksuid = require('ksuid');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var ksuid__default = /*#__PURE__*/_interopDefault(ksuid);
 
 // src/sync-plugins/keel.ts
-var { clone } = state.internal;
 var KeelKeys = ["createdAt", "updatedAt"];
 function generateKeelId() {
   return ksuid__default.default.randomSync().string;
@@ -20,6 +19,9 @@ var modifiedClients = /* @__PURE__ */ new WeakSet();
 var isEnabled$ = state.observable(true);
 async function ensureAuthToken() {
   await state.when(isEnabled$.get());
+  if (keelConfig.refreshAuth) {
+    await keelConfig.refreshAuth();
+  }
   let isAuthed = await keelConfig.client.auth.isAuthenticated();
   if (!isAuthed) {
     isAuthed = await keelConfig.client.auth.refresh();
@@ -33,17 +35,20 @@ async function handleApiError(error, retry) {
   }
 }
 function convertObjectToCreate(item) {
-  const cloned = clone(item);
-  Object.keys(cloned).forEach((key) => {
+  const cloned = {};
+  Object.keys(item).forEach((key) => {
     if (key.endsWith("Id")) {
-      if (cloned[key]) {
-        cloned[key.slice(0, -2)] = { id: cloned[key] };
+      if (item[key]) {
+        cloned[key.slice(0, -2)] = { id: item[key] };
+      }
+    } else if (key !== "createdAt" && key !== "updatedAt") {
+      if (item[key] === void 0) {
+        cloned[key] = null;
+      } else {
+        cloned[key] = item[key];
       }
-      delete cloned[key];
     }
   });
-  delete cloned.createdAt;
-  delete cloned.updatedAt;
   return cloned;
 }
 function getSyncedKeelConfiguration() {
@@ -65,9 +70,9 @@ function configureSyncedKeel(config) {
           const oldFn = queries[key];
           queries[key] = (i) => {
             const realtimeKey = [key, ...Object.values(i.where || {})].filter((value) => value && typeof value !== "object").join("/");
-            const subscribe = ({ refresh }) => {
+            const subscribe = (params) => {
               if (realtimeKey) {
-                return realtimePlugin.subscribe(realtimeKey, refresh);
+                return realtimePlugin.subscribe(realtimeKey, params);
               }
             };
             return oldFn(i).then((ret) => {
@@ -128,7 +133,9 @@ function syncedKeel(props) {
     first,
     where: whereParam,
     waitFor,
+    waitForSet,
     fieldDeleted,
+    mode,
     ...rest
   } = props;
   const { changesSince } = props;
@@ -137,8 +144,15 @@ function syncedKeel(props) {
   const subscribeFnKey$ = state.observable("");
   const fieldCreatedAt = "createdAt";
   const fieldUpdatedAt = "updatedAt";
+  const setupSubscribe = (doSubscribe, subscribeKey, lastSync) => {
+    subscribeFn = doSubscribe;
+    subscribeFnKey$.set(subscribeKey);
+    if (realtimePlugin && lastSync) {
+      realtimePlugin.setLatestChange(subscribeKey, new Date(lastSync));
+    }
+  };
   const list = listParam ? async (listParams) => {
-    const { lastSync, refresh } = listParams;
+    const { lastSync } = listParams;
     const queryBySync = !!lastSync && changesSince === "last-sync";
     const where = Object.assign(
       queryBySync ? { updatedAt: { after: new Date(lastSync + 1) } } : {},
@@ -147,8 +161,7 @@ function syncedKeel(props) {
     const params = { where, first };
     const { results, subscribe: subscribe2, subscribeKey } = await getAllPages(listParam, params);
     if (subscribe2) {
-      subscribeFn = () => subscribe2({ refresh });
-      subscribeFnKey$.set(subscribeKey);
+      setupSubscribe(() => subscribe2(listParams), subscribeKey, lastSync);
     }
     return results;
   } : void 0;
@@ -156,8 +169,7 @@ function syncedKeel(props) {
     const { refresh } = getParams;
     const { data, error, subscribe: subscribe2, subscribeKey } = await getParam({ refresh });
     if (subscribe2) {
-      subscribeFn = () => subscribe2({ refresh });
-      subscribeFnKey$.set(subscribeKey);
+      setupSubscribe(() => subscribe2(getParams), subscribeKey);
     }
     if (error) {
       throw new Error(error.message);
@@ -176,32 +188,40 @@ function syncedKeel(props) {
       }
     }
   };
-  const handleSetError = async (error, params, isCreate) => {
+  const handleSetError = async (error, params, input, fn, from) => {
     var _a, _b, _c;
-    const { retryNum, cancelRetry, update: update2 } = params;
-    if (isCreate && ((_a = error.message) == null ? void 0 : _a.includes("for the unique")) && ((_b = error.message) == null ? void 0 : _b.includes("must be unique"))) {
+    const { retryNum, update: update2 } = params;
+    if (from === "create" && ((_a = error.message) == null ? void 0 : _a.includes("for the unique")) && ((_b = error.message) == null ? void 0 : _b.includes("must be unique"))) {
       if (__DEV__) {
         console.log("Creating duplicate data already saved, just ignore.");
       }
+      params.cancelRetry = true;
       update2({
         value: {},
         mode: "assign"
       });
+    } else if (from === "delete") {
+      if (error.message === "record not found") {
+        if (__DEV__) {
+          console.log("Deleting non-existing data, just ignore.");
+        }
+        params.cancelRetry = true;
+      }
     } else if (error.type === "bad_request") {
-      (_c = keelConfig.onError) == null ? void 0 : _c.call(keelConfig, error);
+      (_c = keelConfig.onError) == null ? void 0 : _c.call(keelConfig, { error, params, input, type: from, action: fn.name || fn.toString() });
       if (retryNum > 4) {
-        cancelRetry();
+        params.cancelRetry = true;
       }
-      throw new Error(error.message);
+      throw new Error(error.message, { cause: { input } });
     } else {
       await handleApiError(error);
-      throw new Error(error.message);
+      throw new Error(error.message, { cause: { input } });
     }
   };
   const create = createParam ? async (input, params) => {
     const { data, error } = await createParam(convertObjectToCreate(input));
     if (error) {
-      handleSetError(error, params, true);
+      await handleSetError(error, params, input, createParam, "create");
     }
     return data;
   } : void 0;
@@ -209,20 +229,18 @@ function syncedKeel(props) {
     const id = input.id;
     const values = convertObjectToCreate(input);
     delete values.id;
-    delete values.createdAt;
-    delete values.updatedAt;
     if (!state.isEmpty(values)) {
       const { data, error } = await updateParam({ where: { id }, values });
       if (error) {
-        handleSetError(error, params, false);
+        await handleSetError(error, params, input, updateParam, "update");
       }
       return data;
     }
   } : void 0;
-  const deleteFn = deleteParam ? async ({ id }, params) => {
-    const { data, error } = await deleteParam({ id });
+  const deleteFn = deleteParam ? async (value, params) => {
+    const { data, error } = await deleteParam({ id: value.id });
     if (error) {
-      handleSetError(error, params, false);
+      await handleSetError(error, params, value, deleteParam, "delete");
     }
     return data;
   } : void 0;
@@ -238,16 +256,17 @@ function syncedKeel(props) {
   return crud.syncedCrud({
     ...rest,
     as: asType,
+    mode: mode || "merge",
     list,
     create,
     update,
     delete: deleteFn,
     waitFor: () => isEnabled$.get() && (waitFor ? state.computeSelector(waitFor) : true),
+    waitForSet: (params) => isEnabled$.get() && (waitForSet ? state.isFunction(waitForSet) ? waitForSet(params) : waitForSet : true),
     onSaved,
-    onSavedUpdate: "createdUpdatedAt",
     fieldCreatedAt,
     fieldUpdatedAt,
-    fieldDeleted: fieldDeleted || "deleted",
+    fieldDeleted,
     changesSince,
     updatePartial: true,
     subscribe,

package/sync-plugins/keel.mjs

@@ -1,10 +1,9 @@
-import ksuid from 'ksuid';
-import { observable, computeSelector, isFunction, isEmpty, when, internal } from '@legendapp/state';
+import { observable, computeSelector, isFunction, isEmpty, when } from '@legendapp/state';
 import { removeNullUndefined } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
+import ksuid from 'ksuid';
 
 // src/sync-plugins/keel.ts
-var { clone } = internal;
 var KeelKeys = ["createdAt", "updatedAt"];
 function generateKeelId() {
   return ksuid.randomSync().string;
@@ -14,6 +13,9 @@ var modifiedClients = /* @__PURE__ */ new WeakSet();
 var isEnabled$ = observable(true);
 async function ensureAuthToken() {
   await when(isEnabled$.get());
+  if (keelConfig.refreshAuth) {
+    await keelConfig.refreshAuth();
+  }
   let isAuthed = await keelConfig.client.auth.isAuthenticated();
   if (!isAuthed) {
     isAuthed = await keelConfig.client.auth.refresh();
@@ -27,17 +29,20 @@ async function handleApiError(error, retry) {
   }
 }
 function convertObjectToCreate(item) {
-  const cloned = clone(item);
-  Object.keys(cloned).forEach((key) => {
+  const cloned = {};
+  Object.keys(item).forEach((key) => {
     if (key.endsWith("Id")) {
-      if (cloned[key]) {
-        cloned[key.slice(0, -2)] = { id: cloned[key] };
+      if (item[key]) {
+        cloned[key.slice(0, -2)] = { id: item[key] };
+      }
+    } else if (key !== "createdAt" && key !== "updatedAt") {
+      if (item[key] === void 0) {
+        cloned[key] = null;
+      } else {
+        cloned[key] = item[key];
       }
-      delete cloned[key];
     }
   });
-  delete cloned.createdAt;
-  delete cloned.updatedAt;
   return cloned;
 }
 function getSyncedKeelConfiguration() {
@@ -59,9 +64,9 @@ function configureSyncedKeel(config) {
           const oldFn = queries[key];
           queries[key] = (i) => {
             const realtimeKey = [key, ...Object.values(i.where || {})].filter((value) => value && typeof value !== "object").join("/");
-            const subscribe = ({ refresh }) => {
+            const subscribe = (params) => {
               if (realtimeKey) {
-                return realtimePlugin.subscribe(realtimeKey, refresh);
+                return realtimePlugin.subscribe(realtimeKey, params);
               }
             };
             return oldFn(i).then((ret) => {
@@ -122,7 +127,9 @@ function syncedKeel(props) {
     first,
     where: whereParam,
     waitFor,
+    waitForSet,
     fieldDeleted,
+    mode,
     ...rest
   } = props;
   const { changesSince } = props;
@@ -131,8 +138,15 @@ function syncedKeel(props) {
   const subscribeFnKey$ = observable("");
   const fieldCreatedAt = "createdAt";
   const fieldUpdatedAt = "updatedAt";
+  const setupSubscribe = (doSubscribe, subscribeKey, lastSync) => {
+    subscribeFn = doSubscribe;
+    subscribeFnKey$.set(subscribeKey);
+    if (realtimePlugin && lastSync) {
+      realtimePlugin.setLatestChange(subscribeKey, new Date(lastSync));
+    }
+  };
   const list = listParam ? async (listParams) => {
-    const { lastSync, refresh } = listParams;
+    const { lastSync } = listParams;
     const queryBySync = !!lastSync && changesSince === "last-sync";
     const where = Object.assign(
       queryBySync ? { updatedAt: { after: new Date(lastSync + 1) } } : {},
@@ -141,8 +155,7 @@ function syncedKeel(props) {
     const params = { where, first };
     const { results, subscribe: subscribe2, subscribeKey } = await getAllPages(listParam, params);
     if (subscribe2) {
-      subscribeFn = () => subscribe2({ refresh });
-      subscribeFnKey$.set(subscribeKey);
+      setupSubscribe(() => subscribe2(listParams), subscribeKey, lastSync);
     }
     return results;
   } : void 0;
@@ -150,8 +163,7 @@ function syncedKeel(props) {
     const { refresh } = getParams;
     const { data, error, subscribe: subscribe2, subscribeKey } = await getParam({ refresh });
     if (subscribe2) {
-      subscribeFn = () => subscribe2({ refresh });
-      subscribeFnKey$.set(subscribeKey);
+      setupSubscribe(() => subscribe2(getParams), subscribeKey);
     }
     if (error) {
       throw new Error(error.message);
@@ -170,32 +182,40 @@ function syncedKeel(props) {
       }
     }
   };
-  const handleSetError = async (error, params, isCreate) => {
+  const handleSetError = async (error, params, input, fn, from) => {
     var _a, _b, _c;
-    const { retryNum, cancelRetry, update: update2 } = params;
-    if (isCreate && ((_a = error.message) == null ? void 0 : _a.includes("for the unique")) && ((_b = error.message) == null ? void 0 : _b.includes("must be unique"))) {
+    const { retryNum, update: update2 } = params;
+    if (from === "create" && ((_a = error.message) == null ? void 0 : _a.includes("for the unique")) && ((_b = error.message) == null ? void 0 : _b.includes("must be unique"))) {
       if (__DEV__) {
         console.log("Creating duplicate data already saved, just ignore.");
       }
+      params.cancelRetry = true;
       update2({
         value: {},
         mode: "assign"
       });
+    } else if (from === "delete") {
+      if (error.message === "record not found") {
+        if (__DEV__) {
+          console.log("Deleting non-existing data, just ignore.");
+        }
+        params.cancelRetry = true;
+      }
     } else if (error.type === "bad_request") {
-      (_c = keelConfig.onError) == null ? void 0 : _c.call(keelConfig, error);
+      (_c = keelConfig.onError) == null ? void 0 : _c.call(keelConfig, { error, params, input, type: from, action: fn.name || fn.toString() });
       if (retryNum > 4) {
-        cancelRetry();
+        params.cancelRetry = true;
       }
-      throw new Error(error.message);
+      throw new Error(error.message, { cause: { input } });
     } else {
       await handleApiError(error);
-      throw new Error(error.message);
+      throw new Error(error.message, { cause: { input } });
     }
   };
   const create = createParam ? async (input, params) => {
     const { data, error } = await createParam(convertObjectToCreate(input));
     if (error) {
-      handleSetError(error, params, true);
+      await handleSetError(error, params, input, createParam, "create");
     }
     return data;
   } : void 0;
@@ -203,20 +223,18 @@ function syncedKeel(props) {
     const id = input.id;
     const values = convertObjectToCreate(input);
     delete values.id;
-    delete values.createdAt;
-    delete values.updatedAt;
     if (!isEmpty(values)) {
       const { data, error } = await updateParam({ where: { id }, values });
       if (error) {
-        handleSetError(error, params, false);
+        await handleSetError(error, params, input, updateParam, "update");
       }
       return data;
     }
   } : void 0;
-  const deleteFn = deleteParam ? async ({ id }, params) => {
-    const { data, error } = await deleteParam({ id });
+  const deleteFn = deleteParam ? async (value, params) => {
+    const { data, error } = await deleteParam({ id: value.id });
     if (error) {
-      handleSetError(error, params, false);
+      await handleSetError(error, params, value, deleteParam, "delete");
     }
     return data;
   } : void 0;
@@ -232,16 +250,17 @@ function syncedKeel(props) {
   return syncedCrud({
     ...rest,
     as: asType,
+    mode: mode || "merge",
     list,
     create,
     update,
     delete: deleteFn,
     waitFor: () => isEnabled$.get() && (waitFor ? computeSelector(waitFor) : true),
+    waitForSet: (params) => isEnabled$.get() && (waitForSet ? isFunction(waitForSet) ? waitForSet(params) : waitForSet : true),
     onSaved,
-    onSavedUpdate: "createdUpdatedAt",
     fieldCreatedAt,
     fieldUpdatedAt,
-    fieldDeleted: fieldDeleted || "deleted",
+    fieldDeleted,
     changesSince,
     updatePartial: true,
     subscribe,

package/sync-plugins/supabase.d.mts

@@ -4,10 +4,14 @@ import { SyncedCrudPropsBase, CrudAsOption, SyncedCrudReturnType, SyncedCrudProp
 import { PostgrestQueryBuilder, PostgrestFilterBuilder } from '@supabase/postgrest-js';
 import { SupabaseClient } from '@supabase/supabase-js';
 
+type DatabaseOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer TDB> ? TDB : never;
+type SchemaNameOf<Client extends SupabaseClient> = keyof DatabaseOf<Client>;
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+type IsUnionOfStrings<T> = [T] extends [string] ? ([T] extends [UnionToIntersection<T>] ? false : true) : false;
 type SupabaseSchemaOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer _, infer __, infer Schema> ? Schema : never;
-type SupabaseTableOf<Client extends SupabaseClient> = SupabaseSchemaOf<Client>['Tables'];
-type SupabaseCollectionOf<Client extends SupabaseClient> = keyof SupabaseTableOf<Client>;
-type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client>> = SupabaseTableOf<Client>[Collection]['Row'];
+type SupabaseTableOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Tables'];
+type SupabaseCollectionOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = keyof SupabaseTableOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName>;
+type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>> = SupabaseTableOf<Client, SchemaName>[Collection]['Row'];
 type SyncedSupabaseConfig<TRemote extends {
     id: string | number;
 }, TLocal> = Omit<SyncedCrudPropsBase<TRemote, TLocal>, 'create' | 'update' | 'delete'>;
@@ -20,11 +24,12 @@ interface SyncedSupabaseConfiguration extends Omit<SyncedSupabaseConfig<{
     enabled?: Observable<boolean>;
     as?: Exclude<CrudAsOption, 'value'>;
 }
-interface SyncedSupabaseProps<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client>, TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection> = SupabaseRowOf<Client, Collection>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, SyncedCrudPropsMany<TRemote, TRemote, TOption> {
+interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>, TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, SyncedCrudPropsMany<TRemote, TRemote, TOption> {
     supabase: Client;
     collection: Collection;
-    select?: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
-    filter?: (select: PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>, params: SyncedGetParams) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+    schema?: SchemaName;
+    select?: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client, SchemaName>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+    filter?: (select: PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>, params: SyncedGetParams<TRemote>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
     actions?: ('create' | 'read' | 'update' | 'delete')[];
     realtime?: boolean | {
         schema?: string;
@@ -34,6 +39,6 @@ interface SyncedSupabaseProps<Client extends SupabaseClient, Collection extends
 }
 declare function getSyncedSupabaseConfiguration(): SyncedSupabaseConfiguration;
 declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): void;
-declare function syncedSupabase<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client> & string, AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection> = SupabaseRowOf<Client, Collection>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
+declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client>, AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
 
 export { type SupabaseCollectionOf, type SupabaseRowOf, type SupabaseSchemaOf, type SupabaseTableOf, type SyncedSupabaseConfig, type SyncedSupabaseConfiguration, configureSyncedSupabase, getSyncedSupabaseConfiguration, syncedSupabase };

package/sync-plugins/supabase.d.ts

@@ -4,10 +4,14 @@ import { SyncedCrudPropsBase, CrudAsOption, SyncedCrudReturnType, SyncedCrudProp
 import { PostgrestQueryBuilder, PostgrestFilterBuilder } from '@supabase/postgrest-js';
 import { SupabaseClient } from '@supabase/supabase-js';
 
+type DatabaseOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer TDB> ? TDB : never;
+type SchemaNameOf<Client extends SupabaseClient> = keyof DatabaseOf<Client>;
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+type IsUnionOfStrings<T> = [T] extends [string] ? ([T] extends [UnionToIntersection<T>] ? false : true) : false;
 type SupabaseSchemaOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer _, infer __, infer Schema> ? Schema : never;
-type SupabaseTableOf<Client extends SupabaseClient> = SupabaseSchemaOf<Client>['Tables'];
-type SupabaseCollectionOf<Client extends SupabaseClient> = keyof SupabaseTableOf<Client>;
-type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client>> = SupabaseTableOf<Client>[Collection]['Row'];
+type SupabaseTableOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Tables'];
+type SupabaseCollectionOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = keyof SupabaseTableOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName>;
+type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>> = SupabaseTableOf<Client, SchemaName>[Collection]['Row'];
 type SyncedSupabaseConfig<TRemote extends {
     id: string | number;
 }, TLocal> = Omit<SyncedCrudPropsBase<TRemote, TLocal>, 'create' | 'update' | 'delete'>;
@@ -20,11 +24,12 @@ interface SyncedSupabaseConfiguration extends Omit<SyncedSupabaseConfig<{
     enabled?: Observable<boolean>;
     as?: Exclude<CrudAsOption, 'value'>;
 }
-interface SyncedSupabaseProps<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client>, TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection> = SupabaseRowOf<Client, Collection>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, SyncedCrudPropsMany<TRemote, TRemote, TOption> {
+interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>, TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote> extends SyncedSupabaseConfig<TRemote, TLocal>, SyncedCrudPropsMany<TRemote, TRemote, TOption> {
     supabase: Client;
     collection: Collection;
-    select?: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
-    filter?: (select: PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>, params: SyncedGetParams) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+    schema?: SchemaName;
+    select?: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client, SchemaName>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+    filter?: (select: PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>, params: SyncedGetParams<TRemote>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
     actions?: ('create' | 'read' | 'update' | 'delete')[];
     realtime?: boolean | {
         schema?: string;
@@ -34,6 +39,6 @@ interface SyncedSupabaseProps<Client extends SupabaseClient, Collection extends
 }
 declare function getSyncedSupabaseConfiguration(): SyncedSupabaseConfiguration;
 declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): void;
-declare function syncedSupabase<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client> & string, AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection> = SupabaseRowOf<Client, Collection>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
+declare function syncedSupabase<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName> & string, SchemaName extends SchemaNameOf<Client>, AsOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote>(props: SyncedSupabaseProps<Client, Collection, SchemaName, AsOption, TRemote, TLocal>): SyncedCrudReturnType<TLocal, AsOption>;
 
 export { type SupabaseCollectionOf, type SupabaseRowOf, type SupabaseSchemaOf, type SupabaseTableOf, type SyncedSupabaseConfig, type SyncedSupabaseConfiguration, configureSyncedSupabase, getSyncedSupabaseConfiguration, syncedSupabase };

package/sync-plugins/supabase.js

@@ -24,6 +24,7 @@ function syncedSupabase(props) {
     supabase: client,
     collection,
     select: selectFn,
+    schema,
     filter,
     actions,
     fieldCreatedAt: fieldCreatedAtParam,
@@ -36,6 +37,7 @@ function syncedSupabase(props) {
     waitFor,
     waitForSet,
     generateId,
+    mode,
     ...rest
   } = props;
   const fieldCreatedAt = fieldCreatedAtParam || (changesSince === "last-sync" ? "created_at" : void 0);
@@ -43,7 +45,8 @@ function syncedSupabase(props) {
   const fieldDeleted = fieldDeletedParam || (changesSince === "last-sync" ? "deleted" : void 0);
   const list = !actions || actions.includes("read") ? async (params) => {
     const { lastSync } = params;
-    const from = client.from(collection);
+    const clientSchema = schema ? client.schema(schema) : client;
+    const from = clientSchema.from(collection);
     let select = selectFn ? selectFn(from) : from.select();
     if (changesSince === "last-sync" && lastSync) {
       const date = new Date(lastSync).toISOString();
@@ -58,8 +61,8 @@ function syncedSupabase(props) {
     }
     return data || [];
   } : void 0;
-  const upsert = async (input) => {
-    const res = await client.from(collection).upsert(input).select();
+  const create = !actions || actions.includes("create") ? async (input) => {
+    const res = await client.from(collection).insert(input).select();
     const { data, error } = res;
     if (data) {
       const created = data[0];
@@ -67,9 +70,17 @@ function syncedSupabase(props) {
     } else {
       throw new Error(error == null ? void 0 : error.message);
     }
-  };
-  const create = !actions || actions.includes("create") ? upsert : void 0;
-  const update = !actions || actions.includes("update") ? upsert : void 0;
+  } : void 0;
+  const update = !actions || actions.includes("update") ? async (input) => {
+    const res = await client.from(collection).update(input).eq("id", input.id).select();
+    const { data, error } = res;
+    if (data) {
+      const created = data[0];
+      return created;
+    } else {
+      throw new Error(error == null ? void 0 : error.message);
+    }
+  } : void 0;
   const deleteFn = !fieldDeleted && (!actions || actions.includes("delete")) ? async (input) => {
     const id = input.id;
     const res = await client.from(collection).delete().eq("id", id).select();
@@ -82,13 +93,13 @@ function syncedSupabase(props) {
     }
   } : void 0;
   const subscribe = realtime ? ({ node, value$, update: update2 }) => {
-    const { filter: filter2, schema } = state.isObject(realtime) ? realtime : {};
+    const { filter: filter2, schema: schema2 } = state.isObject(realtime) ? realtime : {};
     const channel = client.channel(`LS_${node.key || ""}${channelNum++}`).on(
       "postgres_changes",
       {
         event: "*",
         table: collection,
-        schema: schema || "public",
+        schema: schema2 || "public",
         filter: filter2 || void 0
       },
       (payload) => {
@@ -101,15 +112,15 @@ function syncedSupabase(props) {
           const valueDate = +new Date(valueDateStr);
           if (valueDateStr && (!curDateStr || valueDate > +new Date(curDateStr))) {
             update2({
-              value: { [value.id]: value },
+              value: [value],
               lastSync: valueDate,
               mode: "merge"
             });
           }
         } else if (eventType === "DELETE") {
-          const { id } = old;
+          old[state.symbolDelete] = true;
           update2({
-            value: { [id]: state.symbolDelete }
+            value: [old]
           });
         }
       }
@@ -123,6 +134,7 @@ function syncedSupabase(props) {
   }
   return crud.syncedCrud({
     ...rest,
+    mode: mode || "merge",
     list,
     create,
     update,
@@ -132,11 +144,10 @@ function syncedSupabase(props) {
     fieldUpdatedAt,
     fieldDeleted,
     updatePartial: false,
-    onSavedUpdate: "createdUpdatedAt",
     transform,
     generateId,
     waitFor: () => isEnabled$.get() && (waitFor ? state.computeSelector(waitFor) : true),
-    waitForSet
+    waitForSet: (params) => isEnabled$.get() && (waitForSet ? state.isFunction(waitForSet) ? waitForSet(params) : waitForSet : true)
   });
 }