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

package/sync.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var state = require('@legendapp/state');
+var sync = require('@legendapp/state/sync');
 
 // src/sync/configureObservableSync.ts
 var observableSyncConfiguration = {};
@@ -161,13 +162,13 @@ function createRetryTimeout(retryOptions, retryNum, fn) {
   }
 }
 var mapRetryTimeouts = /* @__PURE__ */ new Map();
-function runWithRetry(state, retryOptions, fn, onError) {
+function runWithRetry(state, retryOptions, retryId, fn) {
   try {
     let value = fn(state);
     if (isPromise(value) && retryOptions) {
       let timeoutRetry;
-      if (mapRetryTimeouts.has(state.node)) {
-        clearTimeout(mapRetryTimeouts.get(state.node));
+      if (mapRetryTimeouts.has(retryId)) {
+        clearTimeout(mapRetryTimeouts.get(retryId));
       }
       return new Promise((resolve, reject) => {
         const run = () => {
@@ -178,9 +179,6 @@ function runWithRetry(state, retryOptions, fn, onError) {
             if (timeoutRetry) {
               clearTimeout(timeoutRetry);
             }
-            if (onError) {
-              onError(error, state);
-            }
             if (!state.cancelRetry) {
               const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
                 value = fn(state);
@@ -190,7 +188,7 @@ function runWithRetry(state, retryOptions, fn, onError) {
                 state.cancelRetry = true;
                 reject(error);
               } else {
-                mapRetryTimeouts.set(state.node, timeout);
+                mapRetryTimeouts.set(retryId, timeout);
                 timeoutRetry = timeout;
               }
             }
@@ -210,9 +208,23 @@ async function waitForSet(waitForSet2, changes, value, params = {}) {
     await state.when(waitFn);
   }
 }
+var { clone } = state.internal;
+function createRevertChanges(obs$, changes) {
+  return () => {
+    const previous = state.applyChanges(
+      clone(obs$.peek()),
+      changes,
+      /*applyPrevious*/
+      true
+    );
+    sync.onChangeRemote(() => {
+      obs$.set(previous);
+    });
+  };
+}
 
 // src/sync/syncObservable.ts
-var { clone, deepMerge, getNode, getNodeValue, getValueAtPath, globalState, symbolLinked, createPreviousHandler } = state.internal;
+var { clone: clone2, deepMerge, getNode, getNodeValue, getValueAtPath, globalState, symbolLinked, createPreviousHandler } = state.internal;
 var mapSyncPlugins = /* @__PURE__ */ new WeakMap();
 var allSyncStates = /* @__PURE__ */ new Map();
 var metadatas = /* @__PURE__ */ new WeakMap();
@@ -223,7 +235,7 @@ function parseLocalConfig(config) {
 function doInOrder(arg1, arg2) {
   return state.isPromise(arg1) ? arg1.then(arg2) : arg2(arg1);
 }
-function onChangeRemote(cb) {
+function onChangeRemote2(cb) {
   state.endBatch(true);
   globalState.isLoadingRemote = true;
   state.beginBatch();
@@ -580,7 +592,7 @@ async function doChangeRemote(changeInfo) {
     if (waitForSetParam) {
       await waitForSet(waitForSetParam, changesRemote, obs$.peek());
     }
-    let value = clone(obs$.peek());
+    let value = clone2(obs$.peek());
     const transformSave = (_a = syncOptions == null ? void 0 : syncOptions.transform) == null ? void 0 : _a.save;
     if (transformSave) {
       value = transformSave(value);
@@ -593,31 +605,38 @@ async function doChangeRemote(changeInfo) {
     onBeforeSet == null ? void 0 : onBeforeSet(beforeSetParams);
     if (!beforeSetParams.cancel) {
       let updateResult = void 0;
-      let errorHandled = false;
-      const onError = (error, retryParams) => {
+      let lastErrorHandled;
+      const onSetError = (error, params, noThrow) => {
         var _a2;
-        state$.error.set(error);
-        if (!errorHandled) {
-          (_a2 = syncOptions.onError) == null ? void 0 : _a2.call(syncOptions, error, {
-            setParams,
-            source: "set",
-            value$: obs$,
-            retryParams
-          });
+        if (lastErrorHandled !== error) {
+          if (!params) {
+            params = {
+              setParams,
+              source: "set",
+              type: "set",
+              input: value,
+              retry: setParams,
+              revert: createRevertChanges(setParams.value$, setParams.changes)
+            };
+          }
+          state$.error.set(error);
+          (_a2 = syncOptions.onError) == null ? void 0 : _a2.call(syncOptions, error, params);
+          lastErrorHandled = error;
+          if (!noThrow) {
+            throw error;
+          }
         }
-        errorHandled = true;
       };
       const setParams = {
         node,
         value$: obs$,
         changes: changesRemote,
         value,
-        onError,
+        onError: onSetError,
         update: (params) => {
           if (updateResult) {
-            const { value: value2, lastSync, mode } = params;
+            const { value: value2, mode } = params;
             updateResult = {
-              lastSync: Math.max(updateResult.lastSync || 0, lastSync || 0),
               value: deepMerge(updateResult.value, value2),
               mode
             };
@@ -629,26 +648,21 @@ async function doChangeRemote(changeInfo) {
         retryNum: 0,
         cancelRetry: false
       };
-      const savedPromise = runWithRetry(
-        setParams,
-        syncOptions.retry,
-        async () => {
-          return syncOptions.set(setParams);
-        },
-        onError
-      );
+      const savedPromise = runWithRetry(setParams, syncOptions.retry, node, async () => {
+        return syncOptions.set(setParams);
+      });
       let didError = false;
       if (state.isPromise(savedPromise)) {
         await savedPromise.catch((error) => {
           didError = true;
           if (!syncOptions.retry) {
-            onError(error);
+            onSetError(error, void 0, true);
           }
         });
       }
       if (!didError) {
         const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
-        const { value: changes, lastSync } = updateResult || {};
+        const { value: changes } = updateResult || {};
         if (pathStrs.length > 0) {
           let transformedChanges = void 0;
           const metadata = {};
@@ -665,9 +679,6 @@ async function doChangeRemote(changeInfo) {
                 delete pending[pathStr];
               }
             }
-            if (lastSync) {
-              metadata.lastSync = lastSync;
-            }
           }
           if (changes && !state.isEmpty(changes)) {
             transformedChanges = transformLoadData(changes, syncOptions, false, "set");
@@ -676,7 +687,7 @@ async function doChangeRemote(changeInfo) {
             if (state.isPromise(transformedChanges)) {
               transformedChanges = await transformedChanges;
             }
-            onChangeRemote(() => state.mergeIntoObservable(obs$, transformedChanges));
+            onChangeRemote2(() => state.mergeIntoObservable(obs$, transformedChanges));
           }
           if (saveLocal) {
             if (shouldSaveMetadata && !state.isEmpty(metadata)) {
@@ -819,14 +830,24 @@ function syncObservable(obs$, syncOptionsOrSynced) {
   const syncStateValue = getNodeValue(getNode(syncState$));
   allSyncStates.set(syncState$, node);
   syncStateValue.getPendingChanges = () => localState.pendingChanges;
-  let errorHandled = false;
-  const onGetError = (error, params) => {
+  let lastErrorHandled;
+  const onGetError = (error, params, noThrow) => {
     var _a;
-    syncState$.error.set(error);
-    if (!errorHandled) {
-      (_a = syncOptions.onError) == null ? void 0 : _a.call(syncOptions, error, { ...params, value$: obs$ });
+    if (lastErrorHandled !== error) {
+      if (!params) {
+        params = {
+          source: "get",
+          type: "get",
+          retry: params
+        };
+      }
+      syncState$.error.set(error);
+      (_a = syncOptions.onError) == null ? void 0 : _a.call(syncOptions, error, params);
+      lastErrorHandled = error;
+      if (!noThrow) {
+        throw error;
+      }
     }
-    errorHandled = true;
   };
   loadLocal(obs$, syncOptions, syncState$, localState);
   let isWaitingForLoad = !!syncOptions.get;
@@ -892,7 +913,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                   const p = key.split("/").filter((k) => k !== "");
                   const { v, t } = pending2[key];
                   if (t.length === 0 || !value) {
-                    const oldValue = clone(value);
+                    const oldValue = clone2(value);
                     pending2[key].p = oldValue;
                     if (state.isObject(value) && state.isObject(v)) {
                       Object.assign(value, v);
@@ -906,7 +927,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                       delete pending2[key];
                       didChangeMetadata = true;
                     } else {
-                      const oldValue = clone(value);
+                      const oldValue = clone2(value);
                       pending2[key].p = getValueAtPath(oldValue, p);
                       value = state.setAtPath(
                         value,
@@ -933,7 +954,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                   });
                 }
               }
-              onChangeRemote(() => {
+              onChangeRemote2(() => {
                 if (state.isPlainObject(value)) {
                   value = state.ObservableHint.plain(value);
                 }
@@ -992,7 +1013,12 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                   );
                 },
                 refresh: () => state.when(syncState$.isLoaded, sync),
-                onError: (error) => onGetError(error, { source: "subscribe", subscribeParams })
+                onError: (error) => onGetError(error, {
+                  source: "subscribe",
+                  subscribeParams,
+                  type: "get",
+                  retry: {}
+                })
               };
               unsubscribe = subscribe2(subscribeParams);
             };
@@ -1004,7 +1030,6 @@ function syncObservable(obs$, syncOptionsOrSynced) {
           }
           const existingValue = getNodeValue(node);
           if (get) {
-            const onError = (error) => onGetError(error, { getParams, source: "get" });
             const getParams = {
               node,
               value$: obs$,
@@ -1014,7 +1039,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
               options: syncOptions,
               lastSync,
               updateLastSync: (lastSync2) => getParams.lastSync = lastSync2,
-              onError,
+              onError: onGetError,
               retryNum: 0,
               cancelRetry: false
             };
@@ -1043,17 +1068,12 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                 numPendingGets: (syncStateValue.numPendingGets || 0) + 1,
                 isGetting: true
               });
-              const got = runWithRetry(
-                getParams,
-                syncOptions.retry,
-                (retryEvent) => {
-                  const params = getParams;
-                  params.cancelRetry = retryEvent.cancelRetry;
-                  params.retryNum = retryEvent.retryNum;
-                  return get(params);
-                },
-                onError
-              );
+              const got = runWithRetry(getParams, syncOptions.retry, node, (retryEvent) => {
+                const params = getParams;
+                params.cancelRetry = retryEvent.cancelRetry;
+                params.retryNum = retryEvent.retryNum;
+                return get(params);
+              });
               const numGets = node.numGets = (node.numGets || 0) + 1;
               const handle = (value) => {
                 syncState$.numPendingGets.set((v) => v - 1);
@@ -1080,7 +1100,13 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                 });
               };
               if (state.isPromise(got)) {
-                got.then(handle).catch(onError);
+                got.then(handle).catch((error) => {
+                  onGetError(
+                    error,
+                    { getParams, source: "get", type: "get", retry: getParams },
+                    true
+                  );
+                });
               } else {
                 handle(got);
               }
@@ -1133,7 +1159,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     unsubscribe == null ? void 0 : unsubscribe();
     unsubscribe = void 0;
     const promise = syncStateValue.resetPersistence();
-    onChangeRemote(() => {
+    onChangeRemote2(() => {
       var _a;
       obs$.set((_a = syncOptions.initial) != null ? _a : void 0);
     });
@@ -1238,19 +1264,21 @@ function configureSynced(fnOrOrigOptions, origOptions) {
 }
 
 // sync.ts
-var internal4 = {
+var internal5 = {
   observableSyncConfiguration,
-  waitForSet
+  waitForSet,
+  runWithRetry
 };
 
 exports.combineTransforms = combineTransforms;
 exports.configureObservableSync = configureObservableSync;
 exports.configureSynced = configureSynced;
+exports.createRevertChanges = createRevertChanges;
 exports.deepEqual = deepEqual;
 exports.diffObjects = diffObjects;
-exports.internal = internal4;
+exports.internal = internal5;
 exports.mapSyncPlugins = mapSyncPlugins;
-exports.onChangeRemote = onChangeRemote;
+exports.onChangeRemote = onChangeRemote2;
 exports.removeNullUndefined = removeNullUndefined;
 exports.syncObservable = syncObservable;
 exports.synced = synced;

package/sync.mjs

@@ -1,4 +1,5 @@
-import { isObject, isDate, isNullOrUndefined, isString, endBatch, beginBatch, isFunction, syncState, when, linked, internal, observable, isPromise as isPromise$1, mergeIntoObservable, isEmpty, shouldIgnoreUnobserved, whenReady, trackSelector, constructObjectWithPath, setAtPath, isPlainObject, ObservableHint, isArray } from '@legendapp/state';
+import { isObject, isDate, isNullOrUndefined, isString, applyChanges, endBatch, beginBatch, isFunction, syncState, when, linked, internal, observable, isPromise as isPromise$1, mergeIntoObservable, isEmpty, shouldIgnoreUnobserved, whenReady, trackSelector, constructObjectWithPath, setAtPath, isPlainObject, ObservableHint, isArray } from '@legendapp/state';
+import { onChangeRemote } from '@legendapp/state/sync';
 
 // src/sync/configureObservableSync.ts
 var observableSyncConfiguration = {};
@@ -159,13 +160,13 @@ function createRetryTimeout(retryOptions, retryNum, fn) {
   }
 }
 var mapRetryTimeouts = /* @__PURE__ */ new Map();
-function runWithRetry(state, retryOptions, fn, onError) {
+function runWithRetry(state, retryOptions, retryId, fn) {
   try {
     let value = fn(state);
     if (isPromise(value) && retryOptions) {
       let timeoutRetry;
-      if (mapRetryTimeouts.has(state.node)) {
-        clearTimeout(mapRetryTimeouts.get(state.node));
+      if (mapRetryTimeouts.has(retryId)) {
+        clearTimeout(mapRetryTimeouts.get(retryId));
       }
       return new Promise((resolve, reject) => {
         const run = () => {
@@ -176,9 +177,6 @@ function runWithRetry(state, retryOptions, fn, onError) {
             if (timeoutRetry) {
               clearTimeout(timeoutRetry);
             }
-            if (onError) {
-              onError(error, state);
-            }
             if (!state.cancelRetry) {
               const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
                 value = fn(state);
@@ -188,7 +186,7 @@ function runWithRetry(state, retryOptions, fn, onError) {
                 state.cancelRetry = true;
                 reject(error);
               } else {
-                mapRetryTimeouts.set(state.node, timeout);
+                mapRetryTimeouts.set(retryId, timeout);
                 timeoutRetry = timeout;
               }
             }
@@ -208,9 +206,23 @@ async function waitForSet(waitForSet2, changes, value, params = {}) {
     await when(waitFn);
   }
 }
+var { clone } = internal;
+function createRevertChanges(obs$, changes) {
+  return () => {
+    const previous = applyChanges(
+      clone(obs$.peek()),
+      changes,
+      /*applyPrevious*/
+      true
+    );
+    onChangeRemote(() => {
+      obs$.set(previous);
+    });
+  };
+}
 
 // src/sync/syncObservable.ts
-var { clone, deepMerge, getNode, getNodeValue, getValueAtPath, globalState, symbolLinked, createPreviousHandler } = internal;
+var { clone: clone2, deepMerge, getNode, getNodeValue, getValueAtPath, globalState, symbolLinked, createPreviousHandler } = internal;
 var mapSyncPlugins = /* @__PURE__ */ new WeakMap();
 var allSyncStates = /* @__PURE__ */ new Map();
 var metadatas = /* @__PURE__ */ new WeakMap();
@@ -221,7 +233,7 @@ function parseLocalConfig(config) {
 function doInOrder(arg1, arg2) {
   return isPromise$1(arg1) ? arg1.then(arg2) : arg2(arg1);
 }
-function onChangeRemote(cb) {
+function onChangeRemote2(cb) {
   endBatch(true);
   globalState.isLoadingRemote = true;
   beginBatch();
@@ -578,7 +590,7 @@ async function doChangeRemote(changeInfo) {
     if (waitForSetParam) {
       await waitForSet(waitForSetParam, changesRemote, obs$.peek());
     }
-    let value = clone(obs$.peek());
+    let value = clone2(obs$.peek());
     const transformSave = (_a = syncOptions == null ? void 0 : syncOptions.transform) == null ? void 0 : _a.save;
     if (transformSave) {
       value = transformSave(value);
@@ -591,31 +603,38 @@ async function doChangeRemote(changeInfo) {
     onBeforeSet == null ? void 0 : onBeforeSet(beforeSetParams);
     if (!beforeSetParams.cancel) {
       let updateResult = void 0;
-      let errorHandled = false;
-      const onError = (error, retryParams) => {
+      let lastErrorHandled;
+      const onSetError = (error, params, noThrow) => {
         var _a2;
-        state$.error.set(error);
-        if (!errorHandled) {
-          (_a2 = syncOptions.onError) == null ? void 0 : _a2.call(syncOptions, error, {
-            setParams,
-            source: "set",
-            value$: obs$,
-            retryParams
-          });
+        if (lastErrorHandled !== error) {
+          if (!params) {
+            params = {
+              setParams,
+              source: "set",
+              type: "set",
+              input: value,
+              retry: setParams,
+              revert: createRevertChanges(setParams.value$, setParams.changes)
+            };
+          }
+          state$.error.set(error);
+          (_a2 = syncOptions.onError) == null ? void 0 : _a2.call(syncOptions, error, params);
+          lastErrorHandled = error;
+          if (!noThrow) {
+            throw error;
+          }
         }
-        errorHandled = true;
       };
       const setParams = {
         node,
         value$: obs$,
         changes: changesRemote,
         value,
-        onError,
+        onError: onSetError,
         update: (params) => {
           if (updateResult) {
-            const { value: value2, lastSync, mode } = params;
+            const { value: value2, mode } = params;
             updateResult = {
-              lastSync: Math.max(updateResult.lastSync || 0, lastSync || 0),
               value: deepMerge(updateResult.value, value2),
               mode
             };
@@ -627,26 +646,21 @@ async function doChangeRemote(changeInfo) {
         retryNum: 0,
         cancelRetry: false
       };
-      const savedPromise = runWithRetry(
-        setParams,
-        syncOptions.retry,
-        async () => {
-          return syncOptions.set(setParams);
-        },
-        onError
-      );
+      const savedPromise = runWithRetry(setParams, syncOptions.retry, node, async () => {
+        return syncOptions.set(setParams);
+      });
       let didError = false;
       if (isPromise$1(savedPromise)) {
         await savedPromise.catch((error) => {
           didError = true;
           if (!syncOptions.retry) {
-            onError(error);
+            onSetError(error, void 0, true);
           }
         });
       }
       if (!didError) {
         const pathStrs = Array.from(new Set(changesRemote.map((change) => change.pathStr)));
-        const { value: changes, lastSync } = updateResult || {};
+        const { value: changes } = updateResult || {};
         if (pathStrs.length > 0) {
           let transformedChanges = void 0;
           const metadata = {};
@@ -663,9 +677,6 @@ async function doChangeRemote(changeInfo) {
                 delete pending[pathStr];
               }
             }
-            if (lastSync) {
-              metadata.lastSync = lastSync;
-            }
           }
           if (changes && !isEmpty(changes)) {
             transformedChanges = transformLoadData(changes, syncOptions, false, "set");
@@ -674,7 +685,7 @@ async function doChangeRemote(changeInfo) {
             if (isPromise$1(transformedChanges)) {
               transformedChanges = await transformedChanges;
             }
-            onChangeRemote(() => mergeIntoObservable(obs$, transformedChanges));
+            onChangeRemote2(() => mergeIntoObservable(obs$, transformedChanges));
           }
           if (saveLocal) {
             if (shouldSaveMetadata && !isEmpty(metadata)) {
@@ -817,14 +828,24 @@ function syncObservable(obs$, syncOptionsOrSynced) {
   const syncStateValue = getNodeValue(getNode(syncState$));
   allSyncStates.set(syncState$, node);
   syncStateValue.getPendingChanges = () => localState.pendingChanges;
-  let errorHandled = false;
-  const onGetError = (error, params) => {
+  let lastErrorHandled;
+  const onGetError = (error, params, noThrow) => {
     var _a;
-    syncState$.error.set(error);
-    if (!errorHandled) {
-      (_a = syncOptions.onError) == null ? void 0 : _a.call(syncOptions, error, { ...params, value$: obs$ });
+    if (lastErrorHandled !== error) {
+      if (!params) {
+        params = {
+          source: "get",
+          type: "get",
+          retry: params
+        };
+      }
+      syncState$.error.set(error);
+      (_a = syncOptions.onError) == null ? void 0 : _a.call(syncOptions, error, params);
+      lastErrorHandled = error;
+      if (!noThrow) {
+        throw error;
+      }
     }
-    errorHandled = true;
   };
   loadLocal(obs$, syncOptions, syncState$, localState);
   let isWaitingForLoad = !!syncOptions.get;
@@ -890,7 +911,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                   const p = key.split("/").filter((k) => k !== "");
                   const { v, t } = pending2[key];
                   if (t.length === 0 || !value) {
-                    const oldValue = clone(value);
+                    const oldValue = clone2(value);
                     pending2[key].p = oldValue;
                     if (isObject(value) && isObject(v)) {
                       Object.assign(value, v);
@@ -904,7 +925,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                       delete pending2[key];
                       didChangeMetadata = true;
                     } else {
-                      const oldValue = clone(value);
+                      const oldValue = clone2(value);
                       pending2[key].p = getValueAtPath(oldValue, p);
                       value = setAtPath(
                         value,
@@ -931,7 +952,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                   });
                 }
               }
-              onChangeRemote(() => {
+              onChangeRemote2(() => {
                 if (isPlainObject(value)) {
                   value = ObservableHint.plain(value);
                 }
@@ -990,7 +1011,12 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                   );
                 },
                 refresh: () => when(syncState$.isLoaded, sync),
-                onError: (error) => onGetError(error, { source: "subscribe", subscribeParams })
+                onError: (error) => onGetError(error, {
+                  source: "subscribe",
+                  subscribeParams,
+                  type: "get",
+                  retry: {}
+                })
               };
               unsubscribe = subscribe2(subscribeParams);
             };
@@ -1002,7 +1028,6 @@ function syncObservable(obs$, syncOptionsOrSynced) {
           }
           const existingValue = getNodeValue(node);
           if (get) {
-            const onError = (error) => onGetError(error, { getParams, source: "get" });
             const getParams = {
               node,
               value$: obs$,
@@ -1012,7 +1037,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
               options: syncOptions,
               lastSync,
               updateLastSync: (lastSync2) => getParams.lastSync = lastSync2,
-              onError,
+              onError: onGetError,
               retryNum: 0,
               cancelRetry: false
             };
@@ -1041,17 +1066,12 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                 numPendingGets: (syncStateValue.numPendingGets || 0) + 1,
                 isGetting: true
               });
-              const got = runWithRetry(
-                getParams,
-                syncOptions.retry,
-                (retryEvent) => {
-                  const params = getParams;
-                  params.cancelRetry = retryEvent.cancelRetry;
-                  params.retryNum = retryEvent.retryNum;
-                  return get(params);
-                },
-                onError
-              );
+              const got = runWithRetry(getParams, syncOptions.retry, node, (retryEvent) => {
+                const params = getParams;
+                params.cancelRetry = retryEvent.cancelRetry;
+                params.retryNum = retryEvent.retryNum;
+                return get(params);
+              });
               const numGets = node.numGets = (node.numGets || 0) + 1;
               const handle = (value) => {
                 syncState$.numPendingGets.set((v) => v - 1);
@@ -1078,7 +1098,13 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                 });
               };
               if (isPromise$1(got)) {
-                got.then(handle).catch(onError);
+                got.then(handle).catch((error) => {
+                  onGetError(
+                    error,
+                    { getParams, source: "get", type: "get", retry: getParams },
+                    true
+                  );
+                });
               } else {
                 handle(got);
               }
@@ -1131,7 +1157,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     unsubscribe == null ? void 0 : unsubscribe();
     unsubscribe = void 0;
     const promise = syncStateValue.resetPersistence();
-    onChangeRemote(() => {
+    onChangeRemote2(() => {
       var _a;
       obs$.set((_a = syncOptions.initial) != null ? _a : void 0);
     });
@@ -1236,9 +1262,10 @@ function configureSynced(fnOrOrigOptions, origOptions) {
 }
 
 // sync.ts
-var internal4 = {
+var internal5 = {
   observableSyncConfiguration,
-  waitForSet
+  waitForSet,
+  runWithRetry
 };
 
-export { combineTransforms, configureObservableSync, configureSynced, deepEqual, diffObjects, internal4 as internal, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };
+export { combineTransforms, configureObservableSync, configureSynced, createRevertChanges, deepEqual, diffObjects, internal5 as internal, mapSyncPlugins, onChangeRemote2 as onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };