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

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) {

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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/state",
-  "version": "3.0.0-beta.34",
+  "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.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);
   }
 }
@@ -325,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;

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);
   }
 }
@@ -323,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;