@legendapp/state 3.0.0-beta.33 → 3.0.0-beta.35

package/index.d.mts

@@ -3,7 +3,7 @@ type ArrayOverrideFnNames = 'find' | 'findIndex' | 'every' | 'some' | 'filter' |
 type RemoveIndex<T> = {
     [K in keyof T as string extends K ? never : number extends K ? never : K]: T[K];
 };
-type BuiltIns = String | Boolean | Number | Date | Error | RegExp | Array<any> | Function | Promise<any> | OpaqueObject<any>;
+type BuiltIns = String | Boolean | Number | Date | Error | RegExp | Array<any> | Function | Promise<any>;
 type IsUserDefinedObject<T> = T extends Function | BuiltIns | any[] ? false : T extends object ? true : false;
 type RemoveObservables<T> = T extends ImmutableObservableBase<infer t> ? t : T extends ImmutableObservableBase<infer t>[] ? t[] : IsUserDefinedObject<T> extends true ? {
     [K in keyof T]: RemoveObservables<T[K]>;

package/index.d.ts

@@ -3,7 +3,7 @@ type ArrayOverrideFnNames = 'find' | 'findIndex' | 'every' | 'some' | 'filter' |
 type RemoveIndex<T> = {
     [K in keyof T as string extends K ? never : number extends K ? never : K]: T[K];
 };
-type BuiltIns = String | Boolean | Number | Date | Error | RegExp | Array<any> | Function | Promise<any> | OpaqueObject<any>;
+type BuiltIns = String | Boolean | Number | Date | Error | RegExp | Array<any> | Function | Promise<any>;
 type IsUserDefinedObject<T> = T extends Function | BuiltIns | any[] ? false : T extends object ? true : false;
 type RemoveObservables<T> = T extends ImmutableObservableBase<infer t> ? t : T extends ImmutableObservableBase<infer t>[] ? t[] : IsUserDefinedObject<T> extends true ? {
     [K in keyof T]: RemoveObservables<T[K]>;

package/index.js

@@ -1637,7 +1637,11 @@ var proxyHandler = {
       return { configurable: false, enumerable: false };
     }
     const value = getNodeValue(node);
-    return isPrimitive(value) ? void 0 : Reflect.getOwnPropertyDescriptor(value, prop);
+    if (isPrimitive(value)) {
+      return void 0;
+    }
+    const descriptor = Reflect.getOwnPropertyDescriptor(value, prop);
+    return descriptor ? { ...descriptor, configurable: true } : void 0;
   },
   set(node, prop, value) {
     if (node.isSetting) {
@@ -2435,13 +2439,10 @@ function syncState(obs) {
         syncCount: 0,
         resetPersistence: void 0,
         reset: () => Promise.resolve(),
-        sync: (options) => {
-          var _a, _b;
-          if (options == null ? void 0 : options.resetLastSync) {
-            (_a = node.state) == null ? void 0 : _a.lastSync.set(void 0);
-          }
+        sync: () => {
+          var _a;
           obs.peek();
-          if ((_b = node.state) == null ? void 0 : _b.isGetting.peek()) {
+          if ((_a = node.state) == null ? void 0 : _a.isGetting.peek()) {
             return when(node.state.isLoaded);
           }
           return Promise.resolve();

package/index.mjs

@@ -1635,7 +1635,11 @@ var proxyHandler = {
       return { configurable: false, enumerable: false };
     }
     const value = getNodeValue(node);
-    return isPrimitive(value) ? void 0 : Reflect.getOwnPropertyDescriptor(value, prop);
+    if (isPrimitive(value)) {
+      return void 0;
+    }
+    const descriptor = Reflect.getOwnPropertyDescriptor(value, prop);
+    return descriptor ? { ...descriptor, configurable: true } : void 0;
   },
   set(node, prop, value) {
     if (node.isSetting) {
@@ -2433,13 +2437,10 @@ function syncState(obs) {
         syncCount: 0,
         resetPersistence: void 0,
         reset: () => Promise.resolve(),
-        sync: (options) => {
-          var _a, _b;
-          if (options == null ? void 0 : options.resetLastSync) {
-            (_a = node.state) == null ? void 0 : _a.lastSync.set(void 0);
-          }
+        sync: () => {
+          var _a;
           obs.peek();
-          if ((_b = node.state) == null ? void 0 : _b.isGetting.peek()) {
+          if ((_a = node.state) == null ? void 0 : _a.isGetting.peek()) {
             return when(node.state.isLoaded);
           }
           return Promise.resolve();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-beta.33",
+  "version": "3.0.0-beta.35",
   "description": "legend-state",
   "sideEffects": false,
   "private": false,

package/react.d.mts

@@ -187,4 +187,4 @@ declare function configureReactive({ components, binders, }: {
     binders?: Record<string, BindKeys>;
 }): void;
 
-export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useWhen, useWhenReady };
+export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useObservable as useLocalObservable, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useSelector as useValue, useWhen, useWhenReady };

package/react.d.ts

@@ -187,4 +187,4 @@ declare function configureReactive({ components, binders, }: {
     binders?: Record<string, BindKeys>;
 }): void;
 
-export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useWhen, useWhenReady };
+export { type BindKey, type BindKeys, Computed, type ExtractFCPropsType, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, type ShapeWithPick$, Show, Switch, type UseObserveOptions, type UseSelectorOptions, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useObservable as useLocalObservable, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useSelector as useValue, useWhen, useWhenReady };

package/react.js

@@ -510,9 +510,15 @@ function useIsMounted() {
   return obs;
 }
 function useObservableReducer(reducer, initializerArg, initializer) {
-  const obs = useObservable(
-    () => initializerArg !== void 0 && state.isFunction(initializerArg) ? initializer(initializerArg) : initializerArg
-  );
+  const obs = useObservable(() => {
+    if (initializer) {
+      return initializer(initializerArg);
+    }
+    if (state.isFunction(initializerArg)) {
+      return initializerArg();
+    }
+    return initializerArg;
+  });
   const dispatch = (action) => {
     obs.set(reducer(obs.get(), action));
   };
@@ -622,6 +628,7 @@ exports.use$ = useSelector;
 exports.useComputed = useComputed;
 exports.useEffectOnce = useEffectOnce;
 exports.useIsMounted = useIsMounted;
+exports.useLocalObservable = useObservable;
 exports.useMount = useMount;
 exports.useMountOnce = useMountOnce;
 exports.useObservable = useObservable;
@@ -632,5 +639,6 @@ exports.usePauseProvider = usePauseProvider;
 exports.useSelector = useSelector;
 exports.useUnmount = useUnmount;
 exports.useUnmountOnce = useUnmountOnce;
+exports.useValue = useSelector;
 exports.useWhen = useWhen;
 exports.useWhenReady = useWhenReady;

package/react.mjs

@@ -504,9 +504,15 @@ function useIsMounted() {
   return obs;
 }
 function useObservableReducer(reducer, initializerArg, initializer) {
-  const obs = useObservable(
-    () => initializerArg !== void 0 && isFunction(initializerArg) ? initializer(initializerArg) : initializerArg
-  );
+  const obs = useObservable(() => {
+    if (initializer) {
+      return initializer(initializerArg);
+    }
+    if (isFunction(initializerArg)) {
+      return initializerArg();
+    }
+    return initializerArg;
+  });
   const dispatch = (action) => {
     obs.set(reducer(obs.get(), action));
   };
@@ -600,4 +606,4 @@ function useWhenReady(predicate, effect) {
   return useMemo(() => whenReady(predicate, effect), []);
 }
 
-export { Computed, For, Memo, Reactive, Show, Switch, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useWhen, useWhenReady };
+export { Computed, For, Memo, Reactive, Show, Switch, configureReactive, hasSymbol, observer, reactive, reactiveComponents, reactiveObserver, useSelector as use$, useComputed, useEffectOnce, useIsMounted, useObservable as useLocalObservable, useMount, useMountOnce, useObservable, useObservableReducer, useObserve, useObserveEffect, usePauseProvider, useSelector, useUnmount, useUnmountOnce, useSelector as useValue, useWhen, useWhenReady };

package/sync-plugins/tanstack-query.js

@@ -52,7 +52,7 @@ function syncedQuery(params) {
       }
       return result.data;
     } else {
-      observer.refetch();
+      return Promise.resolve(observer.refetch()).then((res) => res.data);
     }
   };
   const subscribe = ({ update }) => {

package/sync-plugins/tanstack-query.mjs

@@ -50,7 +50,7 @@ function syncedQuery(params) {
       }
       return result.data;
     } else {
-      observer.refetch();
+      return Promise.resolve(observer.refetch()).then((res) => res.data);
     }
   };
   const subscribe = ({ update }) => {

package/sync.d.mts

@@ -211,6 +211,7 @@ declare const mapSyncPlugins: WeakMap<ClassConstructor<ObservablePersistPlugin>
 declare function onChangeRemote(cb: () => void): void;
 declare function syncObservable<T>(obs$: ObservableParam<T>, syncOptions: SyncedOptions<T>): Observable<ObservableSyncState>;
 declare function syncObservable<T>(obs$: ObservableParam<T>, syncOptions: Synced<T>): Observable<ObservableSyncState>;
+declare function getAllSyncStates(): readonly [Observable<ObservableSyncState>, NodeInfo][];
 
 declare function synced<TRemote, TLocal = TRemote>(params: SyncedOptions<TRemote, TLocal> | (() => TRemote)): Synced<TLocal>;
 
@@ -230,4 +231,4 @@ declare const internal: {
     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, createRevertChanges, 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, getAllSyncStates, internal, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };

package/sync.d.ts

@@ -211,6 +211,7 @@ declare const mapSyncPlugins: WeakMap<ClassConstructor<ObservablePersistPlugin>
 declare function onChangeRemote(cb: () => void): void;
 declare function syncObservable<T>(obs$: ObservableParam<T>, syncOptions: SyncedOptions<T>): Observable<ObservableSyncState>;
 declare function syncObservable<T>(obs$: ObservableParam<T>, syncOptions: Synced<T>): Observable<ObservableSyncState>;
+declare function getAllSyncStates(): readonly [Observable<ObservableSyncState>, NodeInfo][];
 
 declare function synced<TRemote, TLocal = TRemote>(params: SyncedOptions<TRemote, TLocal> | (() => TRemote)): Synced<TLocal>;
 
@@ -230,4 +231,4 @@ declare const internal: {
     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, createRevertChanges, 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, getAllSyncStates, internal, mapSyncPlugins, onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };

package/sync.js

@@ -179,28 +179,43 @@ function runWithRetry(state, retryOptions, retryId, fn) {
       let timeoutRetry;
       if (mapRetryTimeouts.has(retryId)) {
         clearTimeout(mapRetryTimeouts.get(retryId));
+        mapRetryTimeouts.delete(retryId);
       }
+      const clearRetryState = () => {
+        if (timeoutRetry !== void 0) {
+          clearTimeout(timeoutRetry);
+          timeoutRetry = void 0;
+        }
+        mapRetryTimeouts.delete(retryId);
+      };
       return new Promise((resolve, reject) => {
         const run = () => {
           value.then((val) => {
+            state.retryNum = 0;
+            clearRetryState();
             resolve(val);
           }).catch((error) => {
-            state.retryNum++;
-            if (timeoutRetry) {
+            if (timeoutRetry !== void 0) {
               clearTimeout(timeoutRetry);
+              timeoutRetry = void 0;
             }
-            if (!state.cancelRetry) {
-              const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
-                value = fn(state);
-                run();
-              });
-              if (timeout === false) {
-                state.cancelRetry = true;
-                reject(error);
-              } else {
-                mapRetryTimeouts.set(retryId, timeout);
-                timeoutRetry = timeout;
-              }
+            state.retryNum++;
+            if (state.cancelRetry) {
+              clearRetryState();
+              reject(error);
+              return;
+            }
+            const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
+              value = fn(state);
+              run();
+            });
+            if (timeout === false) {
+              state.cancelRetry = true;
+              clearRetryState();
+              reject(error);
+            } else {
+              timeoutRetry = timeout;
+              mapRetryTimeouts.set(retryId, timeout);
             }
           });
         };
@@ -209,6 +224,7 @@ function runWithRetry(state, retryOptions, retryId, fn) {
     }
     return value;
   } catch (error) {
+    mapRetryTimeouts.delete(retryId);
     return Promise.reject(error);
   }
 }
@@ -243,7 +259,8 @@ var {
   getValueAtPath,
   globalState,
   registerMiddleware,
-  symbolLinked
+  symbolLinked,
+  setNodeValue
 } = state.internal;
 var mapSyncPlugins = /* @__PURE__ */ new WeakMap();
 var allSyncStates = /* @__PURE__ */ new Map();
@@ -324,9 +341,14 @@ function mergeChanges(changes) {
     const existing = changesByPath.get(pathStr);
     if (existing) {
       if (change.valueAtPath === existing.prevAtPath) {
-        changesOut.splice(changesOut.indexOf(change), 1);
+        const idx = changesOut.indexOf(existing);
+        if (idx >= 0) {
+          changesOut.splice(idx, 1);
+        }
+        changesByPath.delete(pathStr);
       } else {
         existing.valueAtPath = change.valueAtPath;
+        existing.pathTypes = change.pathTypes;
       }
     } else {
       let found = false;
@@ -955,6 +977,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
       const runGet = () => {
         var _a;
         const onChange = async ({ value, mode, lastSync: lastSync2 }) => {
+          var _a2;
           mode = mode || syncOptions.mode || "set";
           if (value !== void 0) {
             value = transformLoadData(value, syncOptions, true, "get");
@@ -1011,6 +1034,9 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                 });
               }
             }
+            if (options == null ? void 0 : options.resetLastSync) {
+              setNodeValue(node, (_a2 = syncOptions.initial) != null ? _a2 : void 0);
+            }
             onChangeRemote2(() => {
               if (state.isPlainObject(value)) {
                 value = state.ObservableHint.plain(value);
@@ -1232,6 +1258,14 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     node.dirtyFn = sync;
     await promise;
   };
+  syncState$.lastSync.onChange(({ value }) => {
+    const metadata = metadatas.get(obs$);
+    if (metadata && metadata.lastSync !== value) {
+      updateMetadataImmediate(obs$, localState, syncState$, syncOptions, {
+        lastSync: value
+      });
+    }
+  });
   const onAllPersistLoaded = () => {
     var _a, _b;
     let parentNode = node;
@@ -1255,7 +1289,10 @@ function syncObservable(obs$, syncOptionsOrSynced) {
   });
   return syncState$;
 }
-var { getProxy, globalState: globalState2, setNodeValue, getNodeValue: getNodeValue2 } = state.internal;
+function getAllSyncStates() {
+  return Array.from(allSyncStates.entries());
+}
+var { getProxy, globalState: globalState2, setNodeValue: setNodeValue2, getNodeValue: getNodeValue2 } = state.internal;
 function enableActivateSyncedNode() {
   globalState2.activateSyncedNode = function activateSyncedNode(node, newValue) {
     const obs$ = getProxy(node);
@@ -1278,7 +1315,7 @@ function enableActivateSyncedNode() {
       } else {
         newValue = initial;
       }
-      setNodeValue(node, promiseReturn ? void 0 : newValue);
+      setNodeValue2(node, promiseReturn ? void 0 : newValue);
       syncObservable(obs$, { ...node.activationState, get, set });
       return { update: onChange, value: newValue };
     } else {
@@ -1339,6 +1376,7 @@ exports.configureSynced = configureSynced;
 exports.createRevertChanges = createRevertChanges;
 exports.deepEqual = deepEqual;
 exports.diffObjects = diffObjects;
+exports.getAllSyncStates = getAllSyncStates;
 exports.internal = internal5;
 exports.mapSyncPlugins = mapSyncPlugins;
 exports.onChangeRemote = onChangeRemote2;

package/sync.mjs

@@ -177,28 +177,43 @@ function runWithRetry(state, retryOptions, retryId, fn) {
       let timeoutRetry;
       if (mapRetryTimeouts.has(retryId)) {
         clearTimeout(mapRetryTimeouts.get(retryId));
+        mapRetryTimeouts.delete(retryId);
       }
+      const clearRetryState = () => {
+        if (timeoutRetry !== void 0) {
+          clearTimeout(timeoutRetry);
+          timeoutRetry = void 0;
+        }
+        mapRetryTimeouts.delete(retryId);
+      };
       return new Promise((resolve, reject) => {
         const run = () => {
           value.then((val) => {
+            state.retryNum = 0;
+            clearRetryState();
             resolve(val);
           }).catch((error) => {
-            state.retryNum++;
-            if (timeoutRetry) {
+            if (timeoutRetry !== void 0) {
               clearTimeout(timeoutRetry);
+              timeoutRetry = void 0;
             }
-            if (!state.cancelRetry) {
-              const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
-                value = fn(state);
-                run();
-              });
-              if (timeout === false) {
-                state.cancelRetry = true;
-                reject(error);
-              } else {
-                mapRetryTimeouts.set(retryId, timeout);
-                timeoutRetry = timeout;
-              }
+            state.retryNum++;
+            if (state.cancelRetry) {
+              clearRetryState();
+              reject(error);
+              return;
+            }
+            const timeout = createRetryTimeout(retryOptions, state.retryNum, () => {
+              value = fn(state);
+              run();
+            });
+            if (timeout === false) {
+              state.cancelRetry = true;
+              clearRetryState();
+              reject(error);
+            } else {
+              timeoutRetry = timeout;
+              mapRetryTimeouts.set(retryId, timeout);
             }
           });
         };
@@ -207,6 +222,7 @@ function runWithRetry(state, retryOptions, retryId, fn) {
     }
     return value;
   } catch (error) {
+    mapRetryTimeouts.delete(retryId);
     return Promise.reject(error);
   }
 }
@@ -241,7 +257,8 @@ var {
   getValueAtPath,
   globalState,
   registerMiddleware,
-  symbolLinked
+  symbolLinked,
+  setNodeValue
 } = internal;
 var mapSyncPlugins = /* @__PURE__ */ new WeakMap();
 var allSyncStates = /* @__PURE__ */ new Map();
@@ -322,9 +339,14 @@ function mergeChanges(changes) {
     const existing = changesByPath.get(pathStr);
     if (existing) {
       if (change.valueAtPath === existing.prevAtPath) {
-        changesOut.splice(changesOut.indexOf(change), 1);
+        const idx = changesOut.indexOf(existing);
+        if (idx >= 0) {
+          changesOut.splice(idx, 1);
+        }
+        changesByPath.delete(pathStr);
       } else {
         existing.valueAtPath = change.valueAtPath;
+        existing.pathTypes = change.pathTypes;
       }
     } else {
       let found = false;
@@ -953,6 +975,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
       const runGet = () => {
         var _a;
         const onChange = async ({ value, mode, lastSync: lastSync2 }) => {
+          var _a2;
           mode = mode || syncOptions.mode || "set";
           if (value !== void 0) {
             value = transformLoadData(value, syncOptions, true, "get");
@@ -1009,6 +1032,9 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                 });
               }
             }
+            if (options == null ? void 0 : options.resetLastSync) {
+              setNodeValue(node, (_a2 = syncOptions.initial) != null ? _a2 : void 0);
+            }
             onChangeRemote2(() => {
               if (isPlainObject(value)) {
                 value = ObservableHint.plain(value);
@@ -1230,6 +1256,14 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     node.dirtyFn = sync;
     await promise;
   };
+  syncState$.lastSync.onChange(({ value }) => {
+    const metadata = metadatas.get(obs$);
+    if (metadata && metadata.lastSync !== value) {
+      updateMetadataImmediate(obs$, localState, syncState$, syncOptions, {
+        lastSync: value
+      });
+    }
+  });
   const onAllPersistLoaded = () => {
     var _a, _b;
     let parentNode = node;
@@ -1253,7 +1287,10 @@ function syncObservable(obs$, syncOptionsOrSynced) {
   });
   return syncState$;
 }
-var { getProxy, globalState: globalState2, setNodeValue, getNodeValue: getNodeValue2 } = internal;
+function getAllSyncStates() {
+  return Array.from(allSyncStates.entries());
+}
+var { getProxy, globalState: globalState2, setNodeValue: setNodeValue2, getNodeValue: getNodeValue2 } = internal;
 function enableActivateSyncedNode() {
   globalState2.activateSyncedNode = function activateSyncedNode(node, newValue) {
     const obs$ = getProxy(node);
@@ -1276,7 +1313,7 @@ function enableActivateSyncedNode() {
       } else {
         newValue = initial;
       }
-      setNodeValue(node, promiseReturn ? void 0 : newValue);
+      setNodeValue2(node, promiseReturn ? void 0 : newValue);
       syncObservable(obs$, { ...node.activationState, get, set });
       return { update: onChange, value: newValue };
     } else {
@@ -1331,4 +1368,4 @@ var internal5 = {
   runWithRetry
 };
 
-export { combineTransforms, configureObservableSync, configureSynced, createRevertChanges, deepEqual, diffObjects, internal5 as internal, mapSyncPlugins, onChangeRemote2 as onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };
+export { combineTransforms, configureObservableSync, configureSynced, createRevertChanges, deepEqual, diffObjects, getAllSyncStates, internal5 as internal, mapSyncPlugins, onChangeRemote2 as onChangeRemote, removeNullUndefined, syncObservable, synced, transformStringifyDates, transformStringifyKeys };