@legendapp/state 3.0.0-beta.2 → 3.0.0-beta.20

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 {
@@ -36,9 +50,9 @@ function syncedSupabase(props) {
     schema,
     filter,
     actions,
-    fieldCreatedAt: fieldCreatedAtParam,
-    fieldUpdatedAt: fieldUpdatedAtParam,
-    fieldDeleted: fieldDeletedParam,
+    fieldCreatedAt,
+    fieldUpdatedAt,
+    fieldDeleted,
     realtime,
     changesSince,
     transform: transformParam,
@@ -54,11 +68,19 @@ function syncedSupabase(props) {
     ...rest
   } = props;
   const client = supabase;
-  const fieldCreatedAt = fieldCreatedAtParam || (changesSince === "last-sync" ? "created_at" : void 0);
-  const fieldUpdatedAt = fieldUpdatedAtParam || (changesSince === "last-sync" ? "updated_at" : void 0);
-  const fieldDeleted = fieldDeletedParam || (changesSince === "last-sync" ? "deleted" : void 0);
-  const list = !actions || actions.includes("read") ? listParam ? wrapSupabaseFn(listParam) : async (params) => {
-    const { lastSync } = params;
+  if (process.env.NODE_ENV === "development" && changesSince === "last-sync") {
+    if (!fieldCreatedAt) {
+      console.warn("[legend-state] fieldCreatedAt is required when using last-sync mode");
+    }
+    if (!fieldUpdatedAt) {
+      console.warn("[legend-state] fieldUpdatedAt is required when using last-sync mode");
+    }
+    if (!fieldDeleted) {
+      console.warn("[legend-state] fieldDeleted is required when using last-sync mode");
+    }
+  }
+  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();
@@ -70,42 +92,76 @@ 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 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);
+  const deleteFn = !fieldDeleted && (!actions || actions.includes("delete")) ? (
+    // prettier-ignore
+    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 if (error) {
+        handleSupabaseError(error, onError, {
+          setParams: params,
+          source: "delete",
+          type: "set",
+          retry: params,
+          input,
+          revert: sync.createRevertChanges(params.value$, params.changes)
+        });
+      }
     }
-  } : void 0;
+  ) : void 0;
   const subscribe = realtime ? ({ node, value$, update: update2 }) => {
     const { filter: filter2, schema: schema2 } = state.isObject(realtime) ? realtime : {};
     const channel = client.channel(`LS_${node.key || ""}${channelNum++}`).on(

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 {
@@ -34,9 +48,9 @@ function syncedSupabase(props) {
     schema,
     filter,
     actions,
-    fieldCreatedAt: fieldCreatedAtParam,
-    fieldUpdatedAt: fieldUpdatedAtParam,
-    fieldDeleted: fieldDeletedParam,
+    fieldCreatedAt,
+    fieldUpdatedAt,
+    fieldDeleted,
     realtime,
     changesSince,
     transform: transformParam,
@@ -52,11 +66,19 @@ function syncedSupabase(props) {
     ...rest
   } = props;
   const client = supabase;
-  const fieldCreatedAt = fieldCreatedAtParam || (changesSince === "last-sync" ? "created_at" : void 0);
-  const fieldUpdatedAt = fieldUpdatedAtParam || (changesSince === "last-sync" ? "updated_at" : void 0);
-  const fieldDeleted = fieldDeletedParam || (changesSince === "last-sync" ? "deleted" : void 0);
-  const list = !actions || actions.includes("read") ? listParam ? wrapSupabaseFn(listParam) : async (params) => {
-    const { lastSync } = params;
+  if (process.env.NODE_ENV === "development" && changesSince === "last-sync") {
+    if (!fieldCreatedAt) {
+      console.warn("[legend-state] fieldCreatedAt is required when using last-sync mode");
+    }
+    if (!fieldUpdatedAt) {
+      console.warn("[legend-state] fieldUpdatedAt is required when using last-sync mode");
+    }
+    if (!fieldDeleted) {
+      console.warn("[legend-state] fieldDeleted is required when using last-sync mode");
+    }
+  }
+  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();
@@ -68,42 +90,76 @@ 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 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);
+  const deleteFn = !fieldDeleted && (!actions || actions.includes("delete")) ? (
+    // prettier-ignore
+    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 if (error) {
+        handleSupabaseError(error, onError, {
+          setParams: params,
+          source: "delete",
+          type: "set",
+          retry: params,
+          input,
+          revert: createRevertChanges(params.value$, params.changes)
+        });
+      }
     }
-  } : void 0;
+  ) : void 0;
   const subscribe = realtime ? ({ node, value$, update: update2 }) => {
     const { filter: filter2, schema: schema2 } = isObject(realtime) ? realtime : {};
     const channel = client.channel(`LS_${node.key || ""}${channelNum++}`).on(

package/sync-plugins/tanstack-query.d.mts

@@ -1,14 +1,14 @@
-import { SyncedOptions } from '@legendapp/state/sync';
+import { SyncedOptions, Synced } from '@legendapp/state/sync';
 import { QueryKey, QueryObserverOptions, QueryClient, MutationObserverOptions, DefaultError } from '@tanstack/query-core';
 
-interface ObservableQueryOptions<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<QueryObserverOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey'> {
+interface ObservableQueryOptions<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<QueryObserverOptions<TQueryFnData, TError, TData, TData, TQueryKey>, 'queryKey'> {
     queryKey?: TQueryKey | (() => TQueryKey);
 }
-interface SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<SyncedOptions<TData>, 'get' | 'set'> {
+interface SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<SyncedOptions<TData>, 'get' | 'set' | 'retry'> {
     queryClient: QueryClient;
     query: ObservableQueryOptions<TQueryFnData, TError, TData, TQueryKey>;
-    mutation?: MutationObserverOptions<TData, TError, void>;
+    mutation?: MutationObserverOptions<TQueryFnData, TError, TData>;
 }
-declare function syncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): TData;
+declare function syncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): Synced<TData>;
 
 export { type ObservableQueryOptions, type SyncedQueryParams, syncedQuery };

package/sync-plugins/tanstack-query.d.ts

@@ -1,14 +1,14 @@
-import { SyncedOptions } from '@legendapp/state/sync';
+import { SyncedOptions, Synced } from '@legendapp/state/sync';
 import { QueryKey, QueryObserverOptions, QueryClient, MutationObserverOptions, DefaultError } from '@tanstack/query-core';
 
-interface ObservableQueryOptions<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<QueryObserverOptions<TQueryFnData, TError, TData, TQueryKey>, 'queryKey'> {
+interface ObservableQueryOptions<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<QueryObserverOptions<TQueryFnData, TError, TData, TData, TQueryKey>, 'queryKey'> {
     queryKey?: TQueryKey | (() => TQueryKey);
 }
-interface SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<SyncedOptions<TData>, 'get' | 'set'> {
+interface SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey extends QueryKey> extends Omit<SyncedOptions<TData>, 'get' | 'set' | 'retry'> {
     queryClient: QueryClient;
     query: ObservableQueryOptions<TQueryFnData, TError, TData, TQueryKey>;
-    mutation?: MutationObserverOptions<TData, TError, void>;
+    mutation?: MutationObserverOptions<TQueryFnData, TError, TData>;
 }
-declare function syncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): TData;
+declare function syncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): Synced<TData>;
 
 export { type ObservableQueryOptions, type SyncedQueryParams, syncedQuery };

package/sync-plugins/tanstack-query.js

@@ -5,6 +5,7 @@ var sync = require('@legendapp/state/sync');
 var queryCore = require('@tanstack/query-core');
 
 // src/sync-plugins/tanstack-query.ts
+var nextMutationKey = 0;
 function syncedQuery(params) {
   const { query: options, mutation: mutationOptions, queryClient, initial: initialParam, ...rest } = params;
   if (initialParam !== void 0) {
@@ -71,8 +72,16 @@ function syncedQuery(params) {
   };
   let set = void 0;
   if (mutationOptions) {
-    const mutator = new queryCore.MutationObserver(queryClient, mutationOptions);
+    const options2 = {
+      mutationKey: ["LS-mutation", nextMutationKey++],
+      ...mutationOptions
+    };
+    const mutator = new queryCore.MutationObserver(queryClient, options2);
     set = ({ value }) => {
+      const mutationCache = queryClient.getMutationCache();
+      mutationCache.findAll({ mutationKey: options2.mutationKey }).forEach((mutation) => {
+        mutationCache.remove(mutation);
+      });
       return mutator.mutate(value);
     };
   }

package/sync-plugins/tanstack-query.mjs

@@ -3,6 +3,7 @@ import { synced } from '@legendapp/state/sync';
 import { MutationObserver, QueryObserver, notifyManager } from '@tanstack/query-core';
 
 // src/sync-plugins/tanstack-query.ts
+var nextMutationKey = 0;
 function syncedQuery(params) {
   const { query: options, mutation: mutationOptions, queryClient, initial: initialParam, ...rest } = params;
   if (initialParam !== void 0) {
@@ -69,8 +70,16 @@ function syncedQuery(params) {
   };
   let set = void 0;
   if (mutationOptions) {
-    const mutator = new MutationObserver(queryClient, mutationOptions);
+    const options2 = {
+      mutationKey: ["LS-mutation", nextMutationKey++],
+      ...mutationOptions
+    };
+    const mutator = new MutationObserver(queryClient, options2);
     set = ({ value }) => {
+      const mutationCache = queryClient.getMutationCache();
+      mutationCache.findAll({ mutationKey: options2.mutationKey }).forEach((mutation) => {
+        mutationCache.remove(mutation);
+      });
       return mutator.mutate(value);
     };
   }

package/sync-plugins/tanstack-react-query.d.mts

@@ -1,8 +1,10 @@
 import { SyncedQueryParams } from '@legendapp/state/sync-plugins/tanstack-query';
-import { DefaultError, QueryKey } from '@tanstack/query-core';
+import { DefaultError, QueryKey, QueryClient } from '@tanstack/query-core';
 import { Observable } from '@legendapp/state';
 import { Synced } from '@legendapp/state/sync';
 
-declare function useObservableSyncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): Observable<Synced<TData>>;
+declare function useObservableSyncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: Omit<SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>, 'queryClient'> & {
+    queryClient?: QueryClient;
+}): Observable<Synced<TData>>;
 
 export { useObservableSyncedQuery };

package/sync-plugins/tanstack-react-query.d.ts

@@ -1,8 +1,10 @@
 import { SyncedQueryParams } from '@legendapp/state/sync-plugins/tanstack-query';
-import { DefaultError, QueryKey } from '@tanstack/query-core';
+import { DefaultError, QueryKey, QueryClient } from '@tanstack/query-core';
 import { Observable } from '@legendapp/state';
 import { Synced } from '@legendapp/state/sync';
 
-declare function useObservableSyncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>): Observable<Synced<TData>>;
+declare function useObservableSyncedQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(params: Omit<SyncedQueryParams<TQueryFnData, TError, TData, TQueryKey>, 'queryClient'> & {
+    queryClient?: QueryClient;
+}): Observable<Synced<TData>>;
 
 export { useObservableSyncedQuery };

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 };