@legendapp/state 3.0.0-beta.13 → 3.0.0-beta.15

package/sync-plugins/keel.mjs

@@ -1,4 +1,5 @@
 import { observable, isFunction, when, batch, isEmpty } from '@legendapp/state';
+import { createRevertChanges } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import ksuid from 'ksuid';
 
@@ -46,12 +47,17 @@ async function ensureAuthToken(props, force) {
   }
   return isAuthed;
 }
-async function handleApiError(props, error, retry) {
+async function handleApiError(props, error) {
+  var _a;
   if (error.type === "unauthorized" || error.type === "forbidden") {
     console.warn("Keel token expired, refreshing...");
     isAuthed$.set(false);
     await ensureAuthToken(props);
+    return true;
+  } else if (((_a = error.error) == null ? void 0 : _a.message) === "Failed to fetch") {
+    throw error.error;
   }
+  return false;
 }
 function convertObjectToCreate(item) {
   const cloned = {};
@@ -91,7 +97,7 @@ function setupRealtime(props) {
   }
 }
 var NumPerPage = 200;
-async function getAllPages(props, listFn, params) {
+async function getAllPages(props, listFn, params, listParams, onError) {
   const allData = [];
   let pageInfo = void 0;
   const { first: firstParam } = params;
@@ -107,8 +113,17 @@ async function getAllPages(props, listFn, params) {
     if (ret) {
       const { data, error } = ret;
       if (error) {
-        await handleApiError(props, error);
-        throw new Error(error.message);
+        const handled = await handleApiError(props, error);
+        if (!handled) {
+          const err = new Error(error.message, { cause: { error } });
+          onError(err, {
+            getParams: listParams,
+            type: "get",
+            source: "list",
+            action: listFn.name || listFn.toString(),
+            retry: listParams
+          });
+        }
       } else if (data) {
         pageInfo = data.pageInfo;
         allData.push(...data.results);
@@ -132,7 +147,6 @@ function syncedKeel(props) {
     fieldDeleted,
     realtime,
     mode,
-    onError,
     requireAuth = true,
     ...rest
   } = props;
@@ -152,7 +166,7 @@ function syncedKeel(props) {
     }
   } : void 0;
   const list = listParam ? async (listParams) => {
-    const { lastSync } = listParams;
+    const { lastSync, onError } = listParams;
     const queryBySync = !!lastSync && changesSince === "last-sync";
     const where = Object.assign(
       queryBySync ? { updatedAt: { after: new Date(lastSync + 1) } } : {},
@@ -160,14 +174,14 @@ function syncedKeel(props) {
     );
     const params = { where, first };
     realtimeState.current = {};
-    const promise = getAllPages(props, listParam, params);
+    const promise = getAllPages(props, listParam, params, listParams, onError);
     if (realtime) {
       setupSubscribe(listParams);
     }
     return promise;
   } : void 0;
   const get = getParam ? async (getParams) => {
-    const { refresh } = getParams;
+    const { refresh, onError } = getParams;
     realtimeState.current = {};
     const promise = getParam({ refresh });
     if (realtime) {
@@ -175,7 +189,17 @@ function syncedKeel(props) {
     }
     const { data, error } = await promise;
     if (error) {
-      throw new Error(error.message);
+      const handled = await handleApiError(props, error);
+      if (!handled) {
+        const err = new Error(error.message, { cause: { error } });
+        onError(err, {
+          getParams,
+          type: "get",
+          source: "get",
+          action: getParam.name || getParam.toString(),
+          retry: getParams
+        });
+      }
     } else {
       return data;
     }
@@ -192,7 +216,7 @@ function syncedKeel(props) {
   };
   const handleSetError = async (error, params, input, fn, from) => {
     var _a, _b;
-    const { retryNum, update: update2 } = params;
+    const { update: update2, onError } = 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.");
@@ -202,28 +226,25 @@ function syncedKeel(props) {
         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") {
-      onError == null ? void 0 : onError(new Error(error.message), params, {
-        error,
-        params,
-        input,
-        type: from,
-        action: fn.name || fn.toString()
-      });
-      if (retryNum > 4) {
-        params.cancelRetry = true;
+    } else if (from === "delete" && error.message === "record not found") {
+      if (__DEV__) {
+        console.log("Deleting non-existing data, just ignore.");
       }
-      throw new Error(error.message, { cause: { input } });
+      params.cancelRetry = true;
     } else {
-      await handleApiError(props, error);
-      throw new Error(error.message, { cause: { input } });
+      const handled = await handleApiError(props, error);
+      if (!handled) {
+        const err = new Error(error.message, { cause: { error } });
+        onError(err, {
+          setParams: params,
+          input,
+          type: "set",
+          source: from,
+          action: fn.name || fn.toString(),
+          retry: params,
+          revert: createRevertChanges(params.value$, params.changes)
+        });
+      }
     }
   };
   const create = createParam ? async (input, params) => {

package/sync-plugins/supabase.d.mts

@@ -1,9 +1,9 @@
 import { Observable } from '@legendapp/state';
 import { SyncedOptions, SyncedOptionsGlobal, SyncedGetParams } from '@legendapp/state/sync';
 import { SyncedCrudPropsBase, CrudAsOption, SyncedCrudReturnType, SyncedCrudPropsMany } from '@legendapp/state/sync-plugins/crud';
-import { PostgrestQueryBuilder, PostgrestFilterBuilder } from '@supabase/postgrest-js';
-import { SupabaseClient, PostgrestSingleResponse } from '@supabase/supabase-js';
 import { FunctionsResponse } from '@supabase/functions-js';
+import { PostgrestFilterBuilder, PostgrestQueryBuilder } from '@supabase/postgrest-js';
+import { SupabaseClient, PostgrestSingleResponse } from '@supabase/supabase-js';
 
 type DatabaseOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer TDB> ? TDB : never;
 type SchemaNameOf<Client extends SupabaseClient> = keyof DatabaseOf<Client>;
@@ -29,7 +29,7 @@ interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collectio
     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>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
     actions?: ('create' | 'read' | 'update' | 'delete')[];
     realtime?: boolean | {
@@ -42,8 +42,12 @@ interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collectio
     update?: (...params: Parameters<Required<SyncedCrudPropsBase<TRemote>>['update']>) => PromiseLike<PostgrestSingleResponse<TRemote>> | Promise<FunctionsResponse<NoInfer<TRemote>>>;
     delete?: (...params: Parameters<Required<SyncedCrudPropsBase<TRemote>>['delete']>) => 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, []>;
+}
 declare function getSyncedSupabaseConfiguration(): SyncedSupabaseConfiguration;
 declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): void;
+declare 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>;
 declare 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>): 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

@@ -1,9 +1,9 @@
 import { Observable } from '@legendapp/state';
 import { SyncedOptions, SyncedOptionsGlobal, SyncedGetParams } from '@legendapp/state/sync';
 import { SyncedCrudPropsBase, CrudAsOption, SyncedCrudReturnType, SyncedCrudPropsMany } from '@legendapp/state/sync-plugins/crud';
-import { PostgrestQueryBuilder, PostgrestFilterBuilder } from '@supabase/postgrest-js';
-import { SupabaseClient, PostgrestSingleResponse } from '@supabase/supabase-js';
 import { FunctionsResponse } from '@supabase/functions-js';
+import { PostgrestFilterBuilder, PostgrestQueryBuilder } from '@supabase/postgrest-js';
+import { SupabaseClient, PostgrestSingleResponse } from '@supabase/supabase-js';
 
 type DatabaseOf<Client extends SupabaseClient> = Client extends SupabaseClient<infer TDB> ? TDB : never;
 type SchemaNameOf<Client extends SupabaseClient> = keyof DatabaseOf<Client>;
@@ -29,7 +29,7 @@ interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collectio
     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>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
     actions?: ('create' | 'read' | 'update' | 'delete')[];
     realtime?: boolean | {
@@ -42,8 +42,12 @@ interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collectio
     update?: (...params: Parameters<Required<SyncedCrudPropsBase<TRemote>>['update']>) => PromiseLike<PostgrestSingleResponse<TRemote>> | Promise<FunctionsResponse<NoInfer<TRemote>>>;
     delete?: (...params: Parameters<Required<SyncedCrudPropsBase<TRemote>>['delete']>) => 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, []>;
+}
 declare function getSyncedSupabaseConfiguration(): SyncedSupabaseConfiguration;
 declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): void;
+declare 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>;
 declare 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>): SyncedCrudReturnType<TLocal, AsOption>;
 
 export { type SupabaseCollectionOf, type SupabaseRowOf, type SupabaseSchemaOf, type SupabaseTableOf, type SyncedSupabaseConfig, type SyncedSupabaseConfiguration, configureSyncedSupabase, getSyncedSupabaseConfiguration, syncedSupabase };

package/sync-plugins/supabase.js

@@ -18,15 +18,29 @@ function configureSyncedSupabase(config) {
   }
   Object.assign(supabaseConfig, sync.removeNullUndefined(rest));
 }
-function wrapSupabaseFn(fn) {
-  return async (...args) => {
-    const { data, error } = await fn(...args);
+function wrapSupabaseFn(fn, source) {
+  return async (params, ...args) => {
+    const { onError } = params;
+    const { data, error } = await fn(params, ...args);
     if (error) {
-      throw new Error(error.message);
+      onError(new Error(error.message), {
+        getParams: params,
+        source,
+        type: "get",
+        retry: params
+      });
     }
     return data;
   };
 }
+function handleSupabaseError(error, onError, params) {
+  var _a;
+  if ((_a = error.message) == null ? void 0 : _a.includes("Failed to fetch")) {
+    throw error;
+  } else {
+    onError(new Error(error.message), params);
+  }
+}
 function syncedSupabase(props) {
   props = { ...supabaseConfig, ...props };
   const {
@@ -65,8 +79,8 @@ function syncedSupabase(props) {
       console.warn("[legend-state] fieldDeleted is required when using last-sync mode");
     }
   }
-  const list = !actions || actions.includes("read") ? listParam ? wrapSupabaseFn(listParam) : async (params) => {
-    const { lastSync } = params;
+  const list = !actions || actions.includes("read") ? listParam ? wrapSupabaseFn(listParam, "list") : async (params) => {
+    const { lastSync, onError } = params;
     const clientSchema = schema ? client.schema(schema) : client;
     const from = clientSchema.from(collection);
     let select = selectFn ? selectFn(from) : from.select();
@@ -78,40 +92,71 @@ function syncedSupabase(props) {
       select = filter(select, params);
     }
     const { data, error } = await select;
-    if (error) {
-      throw new Error(error == null ? void 0 : error.message);
+    if (data) {
+      return data || [];
+    } else if (error) {
+      handleSupabaseError(error, onError, {
+        getParams: params,
+        source: "list",
+        type: "get",
+        retry: params
+      });
     }
-    return data || [];
+    return null;
   } : void 0;
-  const create = createParam ? wrapSupabaseFn(createParam) : !actions || actions.includes("create") ? async (input) => {
+  const create = createParam ? wrapSupabaseFn(createParam, "create") : !actions || actions.includes("create") ? async (input, params) => {
+    const { onError } = params;
     const res = await client.from(collection).insert(input).select();
     const { data, error } = res;
     if (data) {
       const created = data[0];
       return created;
-    } else {
-      throw new Error(error == null ? void 0 : error.message);
+    } else if (error) {
+      handleSupabaseError(error, onError, {
+        setParams: params,
+        source: "create",
+        type: "set",
+        retry: params,
+        input,
+        revert: sync.createRevertChanges(params.value$, params.changes)
+      });
     }
   } : void 0;
-  const update = !actions || actions.includes("update") ? updateParam ? wrapSupabaseFn(updateParam) : async (input) => {
+  const update = !actions || actions.includes("update") ? updateParam ? wrapSupabaseFn(updateParam, "update") : async (input, params) => {
+    const { onError } = params;
     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);
+    } else if (error) {
+      handleSupabaseError(error, onError, {
+        setParams: params,
+        source: "update",
+        type: "set",
+        retry: params,
+        input,
+        revert: sync.createRevertChanges(params.value$, params.changes)
+      });
     }
   } : void 0;
-  const deleteFn = !fieldDeleted && (!actions || actions.includes("delete")) ? deleteParam ? wrapSupabaseFn(deleteParam) : async (input) => {
+  const deleteFn = !fieldDeleted && (!actions || actions.includes("delete")) ? deleteParam ? wrapSupabaseFn(deleteParam, "delete") : async (input, params) => {
+    const { onError } = params;
     const id = input.id;
     const res = await client.from(collection).delete().eq("id", id).select();
     const { data, error } = res;
     if (data) {
       const created = data[0];
       return created;
-    } else {
-      throw new Error(error == null ? void 0 : error.message);
+    } else if (error) {
+      handleSupabaseError(error, onError, {
+        setParams: params,
+        source: "delete",
+        type: "set",
+        retry: params,
+        input,
+        revert: sync.createRevertChanges(params.value$, params.changes)
+      });
     }
   } : void 0;
   const subscribe = realtime ? ({ node, value$, update: update2 }) => {

package/sync-plugins/supabase.mjs

@@ -1,5 +1,5 @@
 import { observable, computeSelector, isFunction, isObject, symbolDelete } from '@legendapp/state';
-import { removeNullUndefined, transformStringifyDates, combineTransforms } from '@legendapp/state/sync';
+import { removeNullUndefined, createRevertChanges, transformStringifyDates, combineTransforms } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 
 // src/sync-plugins/supabase.ts
@@ -16,15 +16,29 @@ function configureSyncedSupabase(config) {
   }
   Object.assign(supabaseConfig, removeNullUndefined(rest));
 }
-function wrapSupabaseFn(fn) {
-  return async (...args) => {
-    const { data, error } = await fn(...args);
+function wrapSupabaseFn(fn, source) {
+  return async (params, ...args) => {
+    const { onError } = params;
+    const { data, error } = await fn(params, ...args);
     if (error) {
-      throw new Error(error.message);
+      onError(new Error(error.message), {
+        getParams: params,
+        source,
+        type: "get",
+        retry: params
+      });
     }
     return data;
   };
 }
+function handleSupabaseError(error, onError, params) {
+  var _a;
+  if ((_a = error.message) == null ? void 0 : _a.includes("Failed to fetch")) {
+    throw error;
+  } else {
+    onError(new Error(error.message), params);
+  }
+}
 function syncedSupabase(props) {
   props = { ...supabaseConfig, ...props };
   const {
@@ -63,8 +77,8 @@ function syncedSupabase(props) {
       console.warn("[legend-state] fieldDeleted is required when using last-sync mode");
     }
   }
-  const list = !actions || actions.includes("read") ? listParam ? wrapSupabaseFn(listParam) : async (params) => {
-    const { lastSync } = params;
+  const list = !actions || actions.includes("read") ? listParam ? wrapSupabaseFn(listParam, "list") : async (params) => {
+    const { lastSync, onError } = params;
     const clientSchema = schema ? client.schema(schema) : client;
     const from = clientSchema.from(collection);
     let select = selectFn ? selectFn(from) : from.select();
@@ -76,40 +90,71 @@ function syncedSupabase(props) {
       select = filter(select, params);
     }
     const { data, error } = await select;
-    if (error) {
-      throw new Error(error == null ? void 0 : error.message);
+    if (data) {
+      return data || [];
+    } else if (error) {
+      handleSupabaseError(error, onError, {
+        getParams: params,
+        source: "list",
+        type: "get",
+        retry: params
+      });
     }
-    return data || [];
+    return null;
   } : void 0;
-  const create = createParam ? wrapSupabaseFn(createParam) : !actions || actions.includes("create") ? async (input) => {
+  const create = createParam ? wrapSupabaseFn(createParam, "create") : !actions || actions.includes("create") ? async (input, params) => {
+    const { onError } = params;
     const res = await client.from(collection).insert(input).select();
     const { data, error } = res;
     if (data) {
       const created = data[0];
       return created;
-    } else {
-      throw new Error(error == null ? void 0 : error.message);
+    } else if (error) {
+      handleSupabaseError(error, onError, {
+        setParams: params,
+        source: "create",
+        type: "set",
+        retry: params,
+        input,
+        revert: createRevertChanges(params.value$, params.changes)
+      });
     }
   } : void 0;
-  const update = !actions || actions.includes("update") ? updateParam ? wrapSupabaseFn(updateParam) : async (input) => {
+  const update = !actions || actions.includes("update") ? updateParam ? wrapSupabaseFn(updateParam, "update") : async (input, params) => {
+    const { onError } = params;
     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);
+    } else if (error) {
+      handleSupabaseError(error, onError, {
+        setParams: params,
+        source: "update",
+        type: "set",
+        retry: params,
+        input,
+        revert: createRevertChanges(params.value$, params.changes)
+      });
     }
   } : void 0;
-  const deleteFn = !fieldDeleted && (!actions || actions.includes("delete")) ? deleteParam ? wrapSupabaseFn(deleteParam) : async (input) => {
+  const deleteFn = !fieldDeleted && (!actions || actions.includes("delete")) ? deleteParam ? wrapSupabaseFn(deleteParam, "delete") : async (input, params) => {
+    const { onError } = params;
     const id = input.id;
     const res = await client.from(collection).delete().eq("id", id).select();
     const { data, error } = res;
     if (data) {
       const created = data[0];
       return created;
-    } else {
-      throw new Error(error == null ? void 0 : error.message);
+    } else if (error) {
+      handleSupabaseError(error, onError, {
+        setParams: params,
+        source: "delete",
+        type: "set",
+        retry: params,
+        input,
+        revert: createRevertChanges(params.value$, params.changes)
+      });
     }
   } : void 0;
   const subscribe = realtime ? ({ node, value$, update: update2 }) => {

package/sync.d.mts

@@ -1,6 +1,6 @@
 import { MMKVConfiguration } from 'react-native-mmkv';
 import { AsyncStorageStatic } from '@react-native-async-storage/async-storage';
-import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, UpdateFn, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, TypeAtPath, RecordValue, ArrayValue, WaitForSet } from '@legendapp/state';
+import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, UpdateSetFn, UpdateFn, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, TypeAtPath, RecordValue, ArrayValue, WaitForSet } from '@legendapp/state';
 import { SyncedOptionsGlobal as SyncedOptionsGlobal$1 } from '@legendapp/state/sync';
 
 interface PersistOptions<T = any> {
@@ -32,12 +32,12 @@ interface SyncedGetParams<T> extends SyncedGetSetBaseParams<T> {
     lastSync: number | undefined;
     updateLastSync: (lastSync: number) => void;
     mode: GetMode;
-    onError: (error: Error) => void;
+    onError: (error: Error, params: SyncedErrorParams) => void;
     options: SyncedOptions;
 }
 interface SyncedSetParams<T> extends Pick<SetParams<T>, 'changes' | 'value'>, SyncedGetSetBaseParams<T> {
-    update: UpdateFn<T>;
-    onError: (error: Error, retryParams: OnErrorRetryParams) => void;
+    update: UpdateSetFn<T>;
+    onError: (error: Error, params: SyncedErrorParams) => void;
 }
 interface SyncedSubscribeParams<T = any> extends SyncedGetSetSubscribeBaseParams<T> {
     lastSync: number | undefined;
@@ -45,12 +45,14 @@ interface SyncedSubscribeParams<T = any> extends SyncedGetSetSubscribeBaseParams
     onError: (error: Error) => void;
 }
 interface SyncedErrorParams {
+    source: 'get' | 'set' | 'subscribe';
+    type: 'get' | 'set';
+    retry: OnErrorRetryParams;
     getParams?: SyncedGetParams<any>;
     setParams?: SyncedSetParams<any>;
     subscribeParams?: SyncedSubscribeParams<any>;
-    source: 'get' | 'set' | 'subscribe';
-    value$: ObservableParam<any>;
-    retryParams?: OnErrorRetryParams;
+    input?: any;
+    revert?: () => void;
 }
 interface SyncedOptions<TRemote = any, TLocal = TRemote> extends Omit<LinkedOptions<TRemote>, 'get' | 'set'> {
     get?: (params: SyncedGetParams<TRemote>) => Promise<TRemote> | TRemote;
@@ -215,11 +217,17 @@ declare function synced<TRemote, TLocal = TRemote>(params: SyncedOptions<TRemote
 declare function configureSynced<T extends (...args: any[]) => any>(fn: T, origOptions: Partial<Parameters<T>[0]>): T;
 declare function configureSynced(origOptions: SyncedOptions): typeof synced;
 
+declare function createRevertChanges(obs$: ObservableParam<any>, changes: Change[]): () => void;
+
 declare function waitForSet(waitForSet: WaitForSet<any>, changes: Change[], value: any, params?: Record<string, any>): Promise<void>;
 
+declare function runWithRetry<T>(state: SyncedGetSetBaseParams<any>, retryOptions: RetryOptions | undefined, retryId: any, fn: (params: OnErrorRetryParams) => Promise<T>): Promise<T>;
+declare function runWithRetry<T>(state: SyncedGetSetBaseParams<any>, retryOptions: RetryOptions | undefined, retryId: any, fn: (params: OnErrorRetryParams) => T): T;
+
 declare const internal: {
     observableSyncConfiguration: SyncedOptionsGlobal;
     waitForSet: typeof waitForSet;
+    runWithRetry: typeof runWithRetry;
 };
 
-export { type FieldTransforms, type FieldTransformsInner, type ObservablePersistAsyncStoragePluginOptions, type ObservablePersistIndexedDBPluginOptions, type ObservablePersistPlugin, type ObservablePersistPluginOptions, type ObservableSyncFunctions, type ObservableSyncSetParams, type OnErrorRetryParams, type PendingChanges, type PersistMetadata, type PersistOptions, type QueryByModified, type StringToDate, type SubscribeOptions, type SyncTransform, type SyncTransformMethod, type Synced, type SyncedErrorParams, type SyncedGetParams, type SyncedGetSetBaseParams, type SyncedGetSetSubscribeBaseParams, type SyncedOptions, type SyncedOptionsGlobal, type SyncedSetParams, type SyncedSubscribeParams, type TransformStringifyKeys, type TransformStringifyOptions, type TransformStringsToDates, combineTransforms, configureObservableSync, configureSynced, deepEqual, diffObjects, internal, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };
+export { type FieldTransforms, type FieldTransformsInner, type ObservablePersistAsyncStoragePluginOptions, type ObservablePersistIndexedDBPluginOptions, type ObservablePersistPlugin, type ObservablePersistPluginOptions, type ObservableSyncFunctions, type ObservableSyncSetParams, type OnErrorRetryParams, type PendingChanges, type PersistMetadata, type PersistOptions, type QueryByModified, type StringToDate, type SubscribeOptions, type SyncTransform, type SyncTransformMethod, type Synced, type SyncedErrorParams, type SyncedGetParams, type SyncedGetSetBaseParams, type SyncedGetSetSubscribeBaseParams, type SyncedOptions, type SyncedOptionsGlobal, type SyncedSetParams, type SyncedSubscribeParams, type TransformStringifyKeys, type TransformStringifyOptions, type TransformStringsToDates, combineTransforms, configureObservableSync, configureSynced, createRevertChanges, deepEqual, diffObjects, internal, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };

package/sync.d.ts

@@ -1,6 +1,6 @@
 import { MMKVConfiguration } from 'react-native-mmkv';
 import { AsyncStorageStatic } from '@react-native-async-storage/async-storage';
-import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, UpdateFn, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, TypeAtPath, RecordValue, ArrayValue, WaitForSet } from '@legendapp/state';
+import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, UpdateSetFn, UpdateFn, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, TypeAtPath, RecordValue, ArrayValue, WaitForSet } from '@legendapp/state';
 import { SyncedOptionsGlobal as SyncedOptionsGlobal$1 } from '@legendapp/state/sync';
 
 interface PersistOptions<T = any> {
@@ -32,12 +32,12 @@ interface SyncedGetParams<T> extends SyncedGetSetBaseParams<T> {
     lastSync: number | undefined;
     updateLastSync: (lastSync: number) => void;
     mode: GetMode;
-    onError: (error: Error) => void;
+    onError: (error: Error, params: SyncedErrorParams) => void;
     options: SyncedOptions;
 }
 interface SyncedSetParams<T> extends Pick<SetParams<T>, 'changes' | 'value'>, SyncedGetSetBaseParams<T> {
-    update: UpdateFn<T>;
-    onError: (error: Error, retryParams: OnErrorRetryParams) => void;
+    update: UpdateSetFn<T>;
+    onError: (error: Error, params: SyncedErrorParams) => void;
 }
 interface SyncedSubscribeParams<T = any> extends SyncedGetSetSubscribeBaseParams<T> {
     lastSync: number | undefined;
@@ -45,12 +45,14 @@ interface SyncedSubscribeParams<T = any> extends SyncedGetSetSubscribeBaseParams
     onError: (error: Error) => void;
 }
 interface SyncedErrorParams {
+    source: 'get' | 'set' | 'subscribe';
+    type: 'get' | 'set';
+    retry: OnErrorRetryParams;
     getParams?: SyncedGetParams<any>;
     setParams?: SyncedSetParams<any>;
     subscribeParams?: SyncedSubscribeParams<any>;
-    source: 'get' | 'set' | 'subscribe';
-    value$: ObservableParam<any>;
-    retryParams?: OnErrorRetryParams;
+    input?: any;
+    revert?: () => void;
 }
 interface SyncedOptions<TRemote = any, TLocal = TRemote> extends Omit<LinkedOptions<TRemote>, 'get' | 'set'> {
     get?: (params: SyncedGetParams<TRemote>) => Promise<TRemote> | TRemote;
@@ -215,11 +217,17 @@ declare function synced<TRemote, TLocal = TRemote>(params: SyncedOptions<TRemote
 declare function configureSynced<T extends (...args: any[]) => any>(fn: T, origOptions: Partial<Parameters<T>[0]>): T;
 declare function configureSynced(origOptions: SyncedOptions): typeof synced;
 
+declare function createRevertChanges(obs$: ObservableParam<any>, changes: Change[]): () => void;
+
 declare function waitForSet(waitForSet: WaitForSet<any>, changes: Change[], value: any, params?: Record<string, any>): Promise<void>;
 
+declare function runWithRetry<T>(state: SyncedGetSetBaseParams<any>, retryOptions: RetryOptions | undefined, retryId: any, fn: (params: OnErrorRetryParams) => Promise<T>): Promise<T>;
+declare function runWithRetry<T>(state: SyncedGetSetBaseParams<any>, retryOptions: RetryOptions | undefined, retryId: any, fn: (params: OnErrorRetryParams) => T): T;
+
 declare const internal: {
     observableSyncConfiguration: SyncedOptionsGlobal;
     waitForSet: typeof waitForSet;
+    runWithRetry: typeof runWithRetry;
 };
 
-export { type FieldTransforms, type FieldTransformsInner, type ObservablePersistAsyncStoragePluginOptions, type ObservablePersistIndexedDBPluginOptions, type ObservablePersistPlugin, type ObservablePersistPluginOptions, type ObservableSyncFunctions, type ObservableSyncSetParams, type OnErrorRetryParams, type PendingChanges, type PersistMetadata, type PersistOptions, type QueryByModified, type StringToDate, type SubscribeOptions, type SyncTransform, type SyncTransformMethod, type Synced, type SyncedErrorParams, type SyncedGetParams, type SyncedGetSetBaseParams, type SyncedGetSetSubscribeBaseParams, type SyncedOptions, type SyncedOptionsGlobal, type SyncedSetParams, type SyncedSubscribeParams, type TransformStringifyKeys, type TransformStringifyOptions, type TransformStringsToDates, combineTransforms, configureObservableSync, configureSynced, deepEqual, diffObjects, internal, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };
+export { type FieldTransforms, type FieldTransformsInner, type ObservablePersistAsyncStoragePluginOptions, type ObservablePersistIndexedDBPluginOptions, type ObservablePersistPlugin, type ObservablePersistPluginOptions, type ObservableSyncFunctions, type ObservableSyncSetParams, type OnErrorRetryParams, type PendingChanges, type PersistMetadata, type PersistOptions, type QueryByModified, type StringToDate, type SubscribeOptions, type SyncTransform, type SyncTransformMethod, type Synced, type SyncedErrorParams, type SyncedGetParams, type SyncedGetSetBaseParams, type SyncedGetSetSubscribeBaseParams, type SyncedOptions, type SyncedOptionsGlobal, type SyncedSetParams, type SyncedSubscribeParams, type TransformStringifyKeys, type TransformStringifyOptions, type TransformStringsToDates, combineTransforms, configureObservableSync, configureSynced, createRevertChanges, deepEqual, diffObjects, internal, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };