@legendapp/state 3.0.0-beta.42 → 3.0.0-beta.43

package/index.d.mts

@@ -5,9 +5,9 @@ type RemoveIndex<T> = {
 };
 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 ? {
+type RemoveObservables<T> = T extends OpaqueObject<infer t> ? t : T extends ImmutableObservableBase<infer t> ? t : T extends ImmutableObservableBase<infer t>[] ? t[] : IsUserDefinedObject<T> extends true ? {
     [K in keyof T]: RemoveObservables<T[K]>;
-} : T extends ImmutableObservableBase<infer TObs> ? TObs : T extends () => infer TRet ? RemoveObservables<TRet> & T : T extends (key: infer TKey extends string | number) => infer TRet ? Record<TKey, RemoveObservables<TRet>> & T : T extends OpaqueObject<infer TObj> ? TObj : T;
+} : T extends ImmutableObservableBase<infer TObs> ? TObs : T extends () => infer TRet ? RemoveObservables<TRet> & T : T extends (key: infer TKey extends string | number) => infer TRet ? Record<TKey, RemoveObservables<TRet>> & T : T;
 interface ObservableArray<T, U> extends ObservablePrimitive<T>, Pick<Array<Observable<U>>, ArrayOverrideFnNames>, Omit<RemoveIndex<Array<U>>, ArrayOverrideFnNames> {
 }
 interface ObservableObjectFns<T> {
@@ -29,7 +29,7 @@ type ObservableSet<T extends Set<any> | WeakSet<any>> = Omit<T, 'size' | 'add'>
     size: number;
     add: (value: SetValue<T>) => Observable<T>;
 };
-interface ObservableBoolean extends ObservablePrimitive<boolean> {
+interface ObservableBoolean<T = any> extends ObservablePrimitive<T> {
     toggle(): void;
 }
 interface ObservablePrimitive<T> extends ImmutableObservableBase<T>, MutableObservableBase<T> {
@@ -87,7 +87,7 @@ type ObservableFunction<T> = T extends () => infer t ? t | (() => t) : T;
 type IsLookupFunction<T> = T extends (...args: infer P) => any ? P extends {
     length: 1;
 } ? P[0] extends string | ObservablePrimitive<string> | number | ObservablePrimitive<number> ? true : false : false : false;
-type ObservableNode<T, NT = NonNullable<T>> = [NT] extends [never] ? ObservablePrimitive<T> : IsStrictAny<T> extends true ? ObservableAny : [T] extends [Promise<infer t>] ? ObservableNode<t> : [T] extends [(key: infer K extends string) => infer t] ? [t] extends [ImmutableObservableBase<any>] ? IsLookupFunction<T> extends true ? Observable<Record<K, t>> : t : IsLookupFunction<T> extends true ? Observable<Record<K, t>> & T : Observable<ObservableFunction<t>> : [NT] extends [ImmutableObservableBase<any>] ? NT : [NT] extends [Primitive$1] ? [NT] extends [boolean] ? ObservableBoolean : ObservablePrimitive<T> : NT extends Map<any, any> | WeakMap<any, any> ? ObservableMap<NT> : NT extends Set<infer U> ? ObservableSet<Set<UndefinedIf<U, IsNullable<T>>>> : NT extends WeakSet<any> ? ObservableSet<NT> : NT extends Array<infer U> ? ObservableArray<T, U> & ObservableChildren<T> : ObservableObject<T> & {};
+type ObservableNode<T, NT = NonNullable<T>> = [NT] extends [never] ? ObservablePrimitive<T> : IsStrictAny<T> extends true ? ObservableAny : [T] extends [Promise<infer t>] ? ObservableNode<t> : [T] extends [(key: infer K extends string) => infer t] ? [t] extends [ImmutableObservableBase<any>] ? IsLookupFunction<T> extends true ? Observable<Record<K, t>> : t : IsLookupFunction<T> extends true ? Observable<Record<K, t>> & T : Observable<ObservableFunction<t>> : [NT] extends [ImmutableObservableBase<any>] ? NT : [NT] extends [Primitive$1] ? [NT] extends [boolean] ? ObservableBoolean<T> : ObservablePrimitive<T> : NT extends Map<any, any> | WeakMap<any, any> ? ObservableMap<NT> : NT extends Set<infer U> ? ObservableSet<Set<UndefinedIf<U, IsNullable<T>>>> : NT extends WeakSet<any> ? ObservableSet<NT> : NT extends Array<infer U> ? ObservableArray<T, U> & ObservableChildren<T> : ObservableObject<T> & {};
 type Observable<T = any> = ObservableNode<T> & {};
 type ObservableParam<T = any> = ImmutableObservableSimple<T> & MutableObservableSimple;
 type FixExpanded<T> = [T] extends [boolean] ? boolean : T;
@@ -146,6 +146,9 @@ interface Change {
     valueAtPath: any;
     prevAtPath: any;
 }
+interface ChangeWithPathStr extends Change {
+    pathStr: string;
+}
 type RecordValue<T> = T extends Record<string, infer t> ? t : never;
 type ArrayValue<T> = T extends Array<infer t> ? t : never;
 type ObservableValue<T> = T extends Observable<infer t> ? t : never;
@@ -253,8 +256,13 @@ interface UpdateFnParams<T = any> {
     lastSync?: number | undefined;
     changes?: Change[];
 }
-interface UpdateSetFnParams<T = any> extends UpdateFnParams<T> {
+type DeepPartial<T> = T extends readonly (infer U)[] ? ReadonlyArray<DeepPartial<U>> : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends object ? {
+    [K in keyof T]?: DeepPartial<T[K]>;
+} : T;
+interface UpdateSetFnParams<T = any> extends Omit<UpdateFnParams<T>, 'value'> {
+    value: DeepPartial<T>;
     lastSync?: never;
+    changes?: ChangeWithPathStr[];
 }
 type UpdateFn<T = any> = (params: UpdateFnParams<T>) => void;
 type UpdateSetFn<T = any> = (params: UpdateSetFnParams<T>) => void;
@@ -464,4 +472,4 @@ declare const internal: {
     };
 };
 
-export { type ArrayValue, type Change, type ChildNodeInfo, type ClassConstructor, type GetMode, type GetOptions, type ImmutableObservableBase, type Linked, type LinkedOptions, type ListenerFn, type ListenerParams, type NodeInfo, type NodeListener, type NotPrimitive, type Observable, type ObservableBoolean, type ObservableEvent, ObservableHint, type ObservableListenerDispose, type ObservableMap, type ObservableObject, type ObservableObjectFns, type ObservableParam, type ObservablePrimitive, type ObservableRoot, type ObservableState, type ObservableSyncState, type ObservableSyncStateBase, type ObservableSyncStateOptions, type ObservableValue, type ObserveEvent, type ObserveEventCallback, type ObserveOptions, type OpaqueObject, type PlainObject, type Primitive, type RecordValue, type RecursiveValueOrFunction, type RemoveObservables, type RetryOptions, type RootNodeInfo, type Selector, type SetParams, type TrackingNode, type TrackingState, type TrackingType, type TypeAtPath, type UpdateFn, type UpdateFnParams, type UpdateSetFn, type UpdateSetFnParams, type WaitForSet, type WaitForSetFnParams, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, isObservable, isObservableValueReady, isObserved, isPlainObject, isPrimitive, isPromise, isSet, isString, isSymbol, linked, mergeIntoObservable, observable, observablePrimitive, observe, opaqueObject, proxy, setAtPath, setSilently, shouldIgnoreUnobserved, syncState, trackSelector, when, whenReady };
+export { type ArrayValue, type Change, type ChangeWithPathStr, type ChildNodeInfo, type ClassConstructor, type GetMode, type GetOptions, type ImmutableObservableBase, type Linked, type LinkedOptions, type ListenerFn, type ListenerParams, type NodeInfo, type NodeListener, type NotPrimitive, type Observable, type ObservableBoolean, type ObservableEvent, ObservableHint, type ObservableListenerDispose, type ObservableMap, type ObservableObject, type ObservableObjectFns, type ObservableParam, type ObservablePrimitive, type ObservableRoot, type ObservableState, type ObservableSyncState, type ObservableSyncStateBase, type ObservableSyncStateOptions, type ObservableValue, type ObserveEvent, type ObserveEventCallback, type ObserveOptions, type OpaqueObject, type PlainObject, type Primitive, type RecordValue, type RecursiveValueOrFunction, type RemoveObservables, type RetryOptions, type RootNodeInfo, type Selector, type SetParams, type TrackingNode, type TrackingState, type TrackingType, type TypeAtPath, type UpdateFn, type UpdateFnParams, type UpdateSetFn, type UpdateSetFnParams, type WaitForSet, type WaitForSetFnParams, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, isObservable, isObservableValueReady, isObserved, isPlainObject, isPrimitive, isPromise, isSet, isString, isSymbol, linked, mergeIntoObservable, observable, observablePrimitive, observe, opaqueObject, proxy, setAtPath, setSilently, shouldIgnoreUnobserved, syncState, trackSelector, when, whenReady };

package/index.d.ts

@@ -5,9 +5,9 @@ type RemoveIndex<T> = {
 };
 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 ? {
+type RemoveObservables<T> = T extends OpaqueObject<infer t> ? t : T extends ImmutableObservableBase<infer t> ? t : T extends ImmutableObservableBase<infer t>[] ? t[] : IsUserDefinedObject<T> extends true ? {
     [K in keyof T]: RemoveObservables<T[K]>;
-} : T extends ImmutableObservableBase<infer TObs> ? TObs : T extends () => infer TRet ? RemoveObservables<TRet> & T : T extends (key: infer TKey extends string | number) => infer TRet ? Record<TKey, RemoveObservables<TRet>> & T : T extends OpaqueObject<infer TObj> ? TObj : T;
+} : T extends ImmutableObservableBase<infer TObs> ? TObs : T extends () => infer TRet ? RemoveObservables<TRet> & T : T extends (key: infer TKey extends string | number) => infer TRet ? Record<TKey, RemoveObservables<TRet>> & T : T;
 interface ObservableArray<T, U> extends ObservablePrimitive<T>, Pick<Array<Observable<U>>, ArrayOverrideFnNames>, Omit<RemoveIndex<Array<U>>, ArrayOverrideFnNames> {
 }
 interface ObservableObjectFns<T> {
@@ -29,7 +29,7 @@ type ObservableSet<T extends Set<any> | WeakSet<any>> = Omit<T, 'size' | 'add'>
     size: number;
     add: (value: SetValue<T>) => Observable<T>;
 };
-interface ObservableBoolean extends ObservablePrimitive<boolean> {
+interface ObservableBoolean<T = any> extends ObservablePrimitive<T> {
     toggle(): void;
 }
 interface ObservablePrimitive<T> extends ImmutableObservableBase<T>, MutableObservableBase<T> {
@@ -87,7 +87,7 @@ type ObservableFunction<T> = T extends () => infer t ? t | (() => t) : T;
 type IsLookupFunction<T> = T extends (...args: infer P) => any ? P extends {
     length: 1;
 } ? P[0] extends string | ObservablePrimitive<string> | number | ObservablePrimitive<number> ? true : false : false : false;
-type ObservableNode<T, NT = NonNullable<T>> = [NT] extends [never] ? ObservablePrimitive<T> : IsStrictAny<T> extends true ? ObservableAny : [T] extends [Promise<infer t>] ? ObservableNode<t> : [T] extends [(key: infer K extends string) => infer t] ? [t] extends [ImmutableObservableBase<any>] ? IsLookupFunction<T> extends true ? Observable<Record<K, t>> : t : IsLookupFunction<T> extends true ? Observable<Record<K, t>> & T : Observable<ObservableFunction<t>> : [NT] extends [ImmutableObservableBase<any>] ? NT : [NT] extends [Primitive$1] ? [NT] extends [boolean] ? ObservableBoolean : ObservablePrimitive<T> : NT extends Map<any, any> | WeakMap<any, any> ? ObservableMap<NT> : NT extends Set<infer U> ? ObservableSet<Set<UndefinedIf<U, IsNullable<T>>>> : NT extends WeakSet<any> ? ObservableSet<NT> : NT extends Array<infer U> ? ObservableArray<T, U> & ObservableChildren<T> : ObservableObject<T> & {};
+type ObservableNode<T, NT = NonNullable<T>> = [NT] extends [never] ? ObservablePrimitive<T> : IsStrictAny<T> extends true ? ObservableAny : [T] extends [Promise<infer t>] ? ObservableNode<t> : [T] extends [(key: infer K extends string) => infer t] ? [t] extends [ImmutableObservableBase<any>] ? IsLookupFunction<T> extends true ? Observable<Record<K, t>> : t : IsLookupFunction<T> extends true ? Observable<Record<K, t>> & T : Observable<ObservableFunction<t>> : [NT] extends [ImmutableObservableBase<any>] ? NT : [NT] extends [Primitive$1] ? [NT] extends [boolean] ? ObservableBoolean<T> : ObservablePrimitive<T> : NT extends Map<any, any> | WeakMap<any, any> ? ObservableMap<NT> : NT extends Set<infer U> ? ObservableSet<Set<UndefinedIf<U, IsNullable<T>>>> : NT extends WeakSet<any> ? ObservableSet<NT> : NT extends Array<infer U> ? ObservableArray<T, U> & ObservableChildren<T> : ObservableObject<T> & {};
 type Observable<T = any> = ObservableNode<T> & {};
 type ObservableParam<T = any> = ImmutableObservableSimple<T> & MutableObservableSimple;
 type FixExpanded<T> = [T] extends [boolean] ? boolean : T;
@@ -146,6 +146,9 @@ interface Change {
     valueAtPath: any;
     prevAtPath: any;
 }
+interface ChangeWithPathStr extends Change {
+    pathStr: string;
+}
 type RecordValue<T> = T extends Record<string, infer t> ? t : never;
 type ArrayValue<T> = T extends Array<infer t> ? t : never;
 type ObservableValue<T> = T extends Observable<infer t> ? t : never;
@@ -253,8 +256,13 @@ interface UpdateFnParams<T = any> {
     lastSync?: number | undefined;
     changes?: Change[];
 }
-interface UpdateSetFnParams<T = any> extends UpdateFnParams<T> {
+type DeepPartial<T> = T extends readonly (infer U)[] ? ReadonlyArray<DeepPartial<U>> : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends object ? {
+    [K in keyof T]?: DeepPartial<T[K]>;
+} : T;
+interface UpdateSetFnParams<T = any> extends Omit<UpdateFnParams<T>, 'value'> {
+    value: DeepPartial<T>;
     lastSync?: never;
+    changes?: ChangeWithPathStr[];
 }
 type UpdateFn<T = any> = (params: UpdateFnParams<T>) => void;
 type UpdateSetFn<T = any> = (params: UpdateSetFnParams<T>) => void;
@@ -464,4 +472,4 @@ declare const internal: {
     };
 };
 
-export { type ArrayValue, type Change, type ChildNodeInfo, type ClassConstructor, type GetMode, type GetOptions, type ImmutableObservableBase, type Linked, type LinkedOptions, type ListenerFn, type ListenerParams, type NodeInfo, type NodeListener, type NotPrimitive, type Observable, type ObservableBoolean, type ObservableEvent, ObservableHint, type ObservableListenerDispose, type ObservableMap, type ObservableObject, type ObservableObjectFns, type ObservableParam, type ObservablePrimitive, type ObservableRoot, type ObservableState, type ObservableSyncState, type ObservableSyncStateBase, type ObservableSyncStateOptions, type ObservableValue, type ObserveEvent, type ObserveEventCallback, type ObserveOptions, type OpaqueObject, type PlainObject, type Primitive, type RecordValue, type RecursiveValueOrFunction, type RemoveObservables, type RetryOptions, type RootNodeInfo, type Selector, type SetParams, type TrackingNode, type TrackingState, type TrackingType, type TypeAtPath, type UpdateFn, type UpdateFnParams, type UpdateSetFn, type UpdateSetFnParams, type WaitForSet, type WaitForSetFnParams, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, isObservable, isObservableValueReady, isObserved, isPlainObject, isPrimitive, isPromise, isSet, isString, isSymbol, linked, mergeIntoObservable, observable, observablePrimitive, observe, opaqueObject, proxy, setAtPath, setSilently, shouldIgnoreUnobserved, syncState, trackSelector, when, whenReady };
+export { type ArrayValue, type Change, type ChangeWithPathStr, type ChildNodeInfo, type ClassConstructor, type GetMode, type GetOptions, type ImmutableObservableBase, type Linked, type LinkedOptions, type ListenerFn, type ListenerParams, type NodeInfo, type NodeListener, type NotPrimitive, type Observable, type ObservableBoolean, type ObservableEvent, ObservableHint, type ObservableListenerDispose, type ObservableMap, type ObservableObject, type ObservableObjectFns, type ObservableParam, type ObservablePrimitive, type ObservableRoot, type ObservableState, type ObservableSyncState, type ObservableSyncStateBase, type ObservableSyncStateOptions, type ObservableValue, type ObserveEvent, type ObserveEventCallback, type ObserveOptions, type OpaqueObject, type PlainObject, type Primitive, type RecordValue, type RecursiveValueOrFunction, type RemoveObservables, type RetryOptions, type RootNodeInfo, type Selector, type SetParams, type TrackingNode, type TrackingState, type TrackingType, type TypeAtPath, type UpdateFn, type UpdateFnParams, type UpdateSetFn, type UpdateSetFnParams, type WaitForSet, type WaitForSetFnParams, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, isObservable, isObservableValueReady, isObserved, isPlainObject, isPrimitive, isPromise, isSet, isString, isSymbol, linked, mergeIntoObservable, observable, observablePrimitive, observe, opaqueObject, proxy, setAtPath, setSilently, shouldIgnoreUnobserved, syncState, trackSelector, when, whenReady };

package/index.js

@@ -416,10 +416,19 @@ function _mergeIntoObservable(target, source, levelsDeep) {
         const isArr = !isObj && isArray(sourceValue);
         const targetChild = target[key];
         if ((isObj || isArr) && targetChild) {
-          if (levelsDeep > 0 && isEmpty(sourceValue)) {
+          if (isArr) {
+            const sourceArr = sourceValue;
+            const isSparseArray = Object.keys(sourceArr).length < sourceArr.length;
+            if (isSparseArray) {
+              _mergeIntoObservable(targetChild, sourceValue, levelsDeep + 1);
+            } else {
+              targetChild.set(sourceValue);
+            }
+          } else if (levelsDeep > 0 && isEmpty(sourceValue)) {
             targetChild.set(sourceValue);
+          } else {
+            _mergeIntoObservable(targetChild, sourceValue, levelsDeep + 1);
           }
-          _mergeIntoObservable(targetChild, sourceValue, levelsDeep + 1);
         } else {
           targetChild.set(sourceValue);
         }
@@ -1501,7 +1510,7 @@ function flushPending() {
 }
 var proxyHandler = {
   get(node, p, receiver) {
-    var _a, _b;
+    var _a, _b, _c;
     if (p === symbolToPrimitive) {
       throw new Error(
         process.env.NODE_ENV === "development" ? "[legend-state] observable should not be used as a primitive. You may have forgotten to use .get() or .peek() to get the value of the observable." : "[legend-state] observable is not a primitive."
@@ -1516,6 +1525,10 @@ var proxyHandler = {
         return nodeValue[p];
       }
     }
+    if (p === "constructor") {
+      const ctor = (_a = peekInternal(node)) == null ? void 0 : _a.constructor;
+      return typeof ctor === "function" ? ctor : Object;
+    }
     let value = peekInternal(
       node,
       /*activateRecursive*/
@@ -1561,7 +1574,7 @@ var proxyHandler = {
     if (isObject(value) && isHintOpaque(value)) {
       return vProp;
     }
-    const fnOrComputed = (_a = node.functions) == null ? void 0 : _a.get(p);
+    const fnOrComputed = (_b = node.functions) == null ? void 0 : _b.get(p);
     if (fnOrComputed) {
       if (isObservable(fnOrComputed)) {
         return fnOrComputed;
@@ -1614,7 +1627,7 @@ var proxyHandler = {
         }
       }
       extractFunctionOrComputed(node, p, vProp);
-      const fnOrComputed2 = (_b = node.functions) == null ? void 0 : _b.get(p);
+      const fnOrComputed2 = (_c = node.functions) == null ? void 0 : _c.get(p);
       if (fnOrComputed2) {
         return getProxy(node, p, fnOrComputed2);
       }
@@ -1689,7 +1702,13 @@ var proxyHandler = {
   },
   has(node, prop) {
     const value = getNodeValue(node);
-    return Reflect.has(value, prop);
+    if (value === void 0 || value === null) {
+      return false;
+    }
+    if (typeof value === "object" || typeof value === "function") {
+      return Reflect.has(value, prop);
+    }
+    return false;
   },
   apply(target, thisArg, argArray) {
     if (isObservable(thisArg)) {

package/index.mjs

@@ -414,10 +414,19 @@ function _mergeIntoObservable(target, source, levelsDeep) {
         const isArr = !isObj && isArray(sourceValue);
         const targetChild = target[key];
         if ((isObj || isArr) && targetChild) {
-          if (levelsDeep > 0 && isEmpty(sourceValue)) {
+          if (isArr) {
+            const sourceArr = sourceValue;
+            const isSparseArray = Object.keys(sourceArr).length < sourceArr.length;
+            if (isSparseArray) {
+              _mergeIntoObservable(targetChild, sourceValue, levelsDeep + 1);
+            } else {
+              targetChild.set(sourceValue);
+            }
+          } else if (levelsDeep > 0 && isEmpty(sourceValue)) {
             targetChild.set(sourceValue);
+          } else {
+            _mergeIntoObservable(targetChild, sourceValue, levelsDeep + 1);
           }
-          _mergeIntoObservable(targetChild, sourceValue, levelsDeep + 1);
         } else {
           targetChild.set(sourceValue);
         }
@@ -1499,7 +1508,7 @@ function flushPending() {
 }
 var proxyHandler = {
   get(node, p, receiver) {
-    var _a, _b;
+    var _a, _b, _c;
     if (p === symbolToPrimitive) {
       throw new Error(
         process.env.NODE_ENV === "development" ? "[legend-state] observable should not be used as a primitive. You may have forgotten to use .get() or .peek() to get the value of the observable." : "[legend-state] observable is not a primitive."
@@ -1514,6 +1523,10 @@ var proxyHandler = {
         return nodeValue[p];
       }
     }
+    if (p === "constructor") {
+      const ctor = (_a = peekInternal(node)) == null ? void 0 : _a.constructor;
+      return typeof ctor === "function" ? ctor : Object;
+    }
     let value = peekInternal(
       node,
       /*activateRecursive*/
@@ -1559,7 +1572,7 @@ var proxyHandler = {
     if (isObject(value) && isHintOpaque(value)) {
       return vProp;
     }
-    const fnOrComputed = (_a = node.functions) == null ? void 0 : _a.get(p);
+    const fnOrComputed = (_b = node.functions) == null ? void 0 : _b.get(p);
     if (fnOrComputed) {
       if (isObservable(fnOrComputed)) {
         return fnOrComputed;
@@ -1612,7 +1625,7 @@ var proxyHandler = {
         }
       }
       extractFunctionOrComputed(node, p, vProp);
-      const fnOrComputed2 = (_b = node.functions) == null ? void 0 : _b.get(p);
+      const fnOrComputed2 = (_c = node.functions) == null ? void 0 : _c.get(p);
       if (fnOrComputed2) {
         return getProxy(node, p, fnOrComputed2);
       }
@@ -1687,7 +1700,13 @@ var proxyHandler = {
   },
   has(node, prop) {
     const value = getNodeValue(node);
-    return Reflect.has(value, prop);
+    if (value === void 0 || value === null) {
+      return false;
+    }
+    if (typeof value === "object" || typeof value === "function") {
+      return Reflect.has(value, prop);
+    }
+    return false;
   },
   apply(target, thisArg, argArray) {
     if (isObservable(thisArg)) {

package/package.json

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

package/persist-plugins/mmkv.d.mts

@@ -1,12 +1,13 @@
 import { Change } from '@legendapp/state';
 import { ObservablePersistPlugin, PersistOptions, PersistMetadata } from '@legendapp/state/sync';
-import { MMKVConfiguration } from 'react-native-mmkv';
+import * as mmkv from 'react-native-mmkv';
 
+type Configuration = mmkv.Configuration;
 declare class ObservablePersistMMKV implements ObservablePersistPlugin {
     private data;
     private storages;
     private configuration;
-    constructor(configuration: MMKVConfiguration);
+    constructor(configuration: Configuration);
     getTable<T = any>(table: string, init: object, config: PersistOptions): T;
     getMetadata(table: string, config: PersistOptions): PersistMetadata;
     set(table: string, changes: Change[], config: PersistOptions): void;
@@ -17,6 +18,6 @@ declare class ObservablePersistMMKV implements ObservablePersistPlugin {
     private setValue;
     private save;
 }
-declare function observablePersistMMKV(configuration: MMKVConfiguration): ObservablePersistMMKV;
+declare function observablePersistMMKV(configuration: Configuration): ObservablePersistMMKV;
 
 export { ObservablePersistMMKV, observablePersistMMKV };

package/persist-plugins/mmkv.d.ts

@@ -1,12 +1,13 @@
 import { Change } from '@legendapp/state';
 import { ObservablePersistPlugin, PersistOptions, PersistMetadata } from '@legendapp/state/sync';
-import { MMKVConfiguration } from 'react-native-mmkv';
+import * as mmkv from 'react-native-mmkv';
 
+type Configuration = mmkv.Configuration;
 declare class ObservablePersistMMKV implements ObservablePersistPlugin {
     private data;
     private storages;
     private configuration;
-    constructor(configuration: MMKVConfiguration);
+    constructor(configuration: Configuration);
     getTable<T = any>(table: string, init: object, config: PersistOptions): T;
     getMetadata(table: string, config: PersistOptions): PersistMetadata;
     set(table: string, changes: Change[], config: PersistOptions): void;
@@ -17,6 +18,6 @@ declare class ObservablePersistMMKV implements ObservablePersistPlugin {
     private setValue;
     private save;
 }
-declare function observablePersistMMKV(configuration: MMKVConfiguration): ObservablePersistMMKV;
+declare function observablePersistMMKV(configuration: Configuration): ObservablePersistMMKV;
 
 export { ObservablePersistMMKV, observablePersistMMKV };

package/persist-plugins/mmkv.js

@@ -1,19 +1,55 @@
 'use strict';
 
 var state = require('@legendapp/state');
-var reactNativeMmkv = require('react-native-mmkv');
+var mmkv = require('react-native-mmkv');
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
+var mmkv__namespace = /*#__PURE__*/_interopNamespace(mmkv);
 
 // src/persist-plugins/mmkv.ts
 var symbolDefault = Symbol();
 var MetadataSuffix = "__m";
 var { safeParse, safeStringify } = state.internal;
+function createMMKVInstance(config) {
+  const hasCreateFunction = "createMMKV" in mmkv__namespace;
+  if (hasCreateFunction) {
+    return mmkv__namespace.createMMKV(config);
+  } else {
+    const { MMKV: MMKVConstructor } = mmkv__namespace;
+    return new MMKVConstructor(config);
+  }
+}
+function deleteFromMMKV(storage, key) {
+  if ("remove" in storage) {
+    storage.remove(key);
+  } else {
+    storage.delete(key);
+  }
+}
 var ObservablePersistMMKV = class {
   constructor(configuration) {
     this.data = {};
     this.storages = /* @__PURE__ */ new Map([
       [
         symbolDefault,
-        new reactNativeMmkv.MMKV({
+        createMMKVInstance({
           id: `obsPersist`
         })
       ]
@@ -53,7 +89,7 @@ var ObservablePersistMMKV = class {
   deleteTable(table, config) {
     const storage = this.getStorage(config);
     delete this.data[table];
-    storage.delete(table);
+    deleteFromMMKV(storage, table);
   }
   deleteMetadata(table, config) {
     this.deleteTable(table + MetadataSuffix, config);
@@ -65,7 +101,7 @@ var ObservablePersistMMKV = class {
       const key = JSON.stringify(configuration);
       let storage = this.storages.get(key);
       if (!storage) {
-        storage = new reactNativeMmkv.MMKV(configuration);
+        storage = createMMKVInstance(configuration);
         this.storages.set(key, storage);
       }
       return storage;
@@ -87,7 +123,7 @@ var ObservablePersistMMKV = class {
         console.error(err);
       }
     } else {
-      storage.delete(table);
+      deleteFromMMKV(storage, table);
     }
   }
 };

package/persist-plugins/mmkv.mjs

@@ -1,17 +1,33 @@
 import { setAtPath, internal } from '@legendapp/state';
-import { MMKV } from 'react-native-mmkv';
+import * as mmkv from 'react-native-mmkv';
 
 // src/persist-plugins/mmkv.ts
 var symbolDefault = Symbol();
 var MetadataSuffix = "__m";
 var { safeParse, safeStringify } = internal;
+function createMMKVInstance(config) {
+  const hasCreateFunction = "createMMKV" in mmkv;
+  if (hasCreateFunction) {
+    return mmkv.createMMKV(config);
+  } else {
+    const { MMKV: MMKVConstructor } = mmkv;
+    return new MMKVConstructor(config);
+  }
+}
+function deleteFromMMKV(storage, key) {
+  if ("remove" in storage) {
+    storage.remove(key);
+  } else {
+    storage.delete(key);
+  }
+}
 var ObservablePersistMMKV = class {
   constructor(configuration) {
     this.data = {};
     this.storages = /* @__PURE__ */ new Map([
       [
         symbolDefault,
-        new MMKV({
+        createMMKVInstance({
           id: `obsPersist`
         })
       ]
@@ -51,7 +67,7 @@ var ObservablePersistMMKV = class {
   deleteTable(table, config) {
     const storage = this.getStorage(config);
     delete this.data[table];
-    storage.delete(table);
+    deleteFromMMKV(storage, table);
   }
   deleteMetadata(table, config) {
     this.deleteTable(table + MetadataSuffix, config);
@@ -63,7 +79,7 @@ var ObservablePersistMMKV = class {
       const key = JSON.stringify(configuration);
       let storage = this.storages.get(key);
       if (!storage) {
-        storage = new MMKV(configuration);
+        storage = createMMKVInstance(configuration);
         this.storages.set(key, storage);
       }
       return storage;
@@ -85,7 +101,7 @@ var ObservablePersistMMKV = class {
         console.error(err);
       }
     } else {
-      storage.delete(table);
+      deleteFromMMKV(storage, table);
     }
   }
 };

package/react.d.mts

@@ -22,8 +22,8 @@ declare function For<T, TProps>({ each, optimized: isOptimized, item, itemProps,
 declare function usePauseProvider(): {
     PauseProvider: ({ children }: {
         children: ReactNode;
-    }) => React.FunctionComponentElement<React.ProviderProps<ObservableBoolean>>;
-    isPaused$: ObservableBoolean;
+    }) => React.FunctionComponentElement<React.ProviderProps<ObservableBoolean<boolean>>>;
+    isPaused$: ObservableBoolean<boolean>;
 };
 
 declare const Memo: NamedExoticComponent<{

package/react.d.ts

@@ -22,8 +22,8 @@ declare function For<T, TProps>({ each, optimized: isOptimized, item, itemProps,
 declare function usePauseProvider(): {
     PauseProvider: ({ children }: {
         children: ReactNode;
-    }) => React.FunctionComponentElement<React.ProviderProps<ObservableBoolean>>;
-    isPaused$: ObservableBoolean;
+    }) => React.FunctionComponentElement<React.ProviderProps<ObservableBoolean<boolean>>>;
+    isPaused$: ObservableBoolean<boolean>;
 };
 
 declare const Memo: NamedExoticComponent<{

package/sync-plugins/crud.d.mts

@@ -1,4 +1,4 @@
-import { WaitForSetFnParams, ObservableParam, ObservableEvent } from '@legendapp/state';
+import { WaitForSetFnParams, ChangeWithPathStr, ObservableParam, ObservableEvent } from '@legendapp/state';
 import { SyncedGetParams, SyncedErrorParams, SyncedOptions, SyncedSetParams, SyncedSubscribeParams } from '@legendapp/state/sync';
 
 type CrudAsOption = 'Map' | 'object' | 'value' | 'array';
@@ -28,7 +28,8 @@ interface SyncedCrudOnSavedParams<TRemote extends object, TLocal> {
     isCreate: boolean;
     props: SyncedCrudPropsBase<TRemote, TLocal>;
 }
-interface WaitForSetCrudFnParams<T> extends WaitForSetFnParams<T> {
+interface WaitForSetCrudFnParams<T> extends Omit<WaitForSetFnParams<T>, 'changes'> {
+    changes: ChangeWithPathStr[];
     type: 'create' | 'update' | 'delete';
 }
 interface CrudErrorParams extends Omit<SyncedErrorParams, 'source'> {

package/sync-plugins/crud.d.ts

@@ -1,4 +1,4 @@
-import { WaitForSetFnParams, ObservableParam, ObservableEvent } from '@legendapp/state';
+import { WaitForSetFnParams, ChangeWithPathStr, ObservableParam, ObservableEvent } from '@legendapp/state';
 import { SyncedGetParams, SyncedErrorParams, SyncedOptions, SyncedSetParams, SyncedSubscribeParams } from '@legendapp/state/sync';
 
 type CrudAsOption = 'Map' | 'object' | 'value' | 'array';
@@ -28,7 +28,8 @@ interface SyncedCrudOnSavedParams<TRemote extends object, TLocal> {
     isCreate: boolean;
     props: SyncedCrudPropsBase<TRemote, TLocal>;
 }
-interface WaitForSetCrudFnParams<T> extends WaitForSetFnParams<T> {
+interface WaitForSetCrudFnParams<T> extends Omit<WaitForSetFnParams<T>, 'changes'> {
+    changes: ChangeWithPathStr[];
     type: 'create' | 'update' | 'delete';
 }
 interface CrudErrorParams extends Omit<SyncedErrorParams, 'source'> {

package/sync-plugins/supabase.d.mts

@@ -13,7 +13,7 @@ type SupabaseSchemaOf<Client extends SupabaseClient> = Client extends SupabaseCl
 type SupabaseTableOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Tables'];
 type SupabaseViewOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Views'];
 type SupabaseCollectionOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = keyof SupabaseTableOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName> | keyof SupabaseViewOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName>;
-type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>> = SupabaseTableOf<Client, SchemaName>[Collection]['Row'];
+type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>> = SupabaseTableOf<Client, SchemaName>[Collection]['Row'] & SupabaseViewOf<Client, SchemaName>[Collection]['Row'];
 type SyncedSupabaseConfig<TRemote extends {
     id: string | number;
 }, TLocal> = Omit<SyncedCrudPropsBase<TRemote, TLocal>, 'create' | 'update' | 'delete'>;
@@ -44,7 +44,7 @@ interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collectio
     delete?: (...params: Parameters<Required<SyncedCrudPropsBase<TRemote>>['delete']>) => PromiseLike<PostgrestSingleResponse<TRemote>> | Promise<FunctionsResponse<NoInfer<TRemote>>>;
 }
 interface SyncedSupabasePropsWithSelect<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client> = 'public', TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote> extends Omit<SyncedSupabaseProps<Client, Collection, SchemaName, TOption, TRemote, TLocal>, 'select'> {
-    select: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client, SchemaName>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+    select: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client, SchemaName>[Collection] & SupabaseViewOf<Client, SchemaName>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
 }
 declare function getSyncedSupabaseConfiguration(): SyncedSupabaseConfiguration;
 declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): void;

package/sync-plugins/supabase.d.ts

@@ -13,7 +13,7 @@ type SupabaseSchemaOf<Client extends SupabaseClient> = Client extends SupabaseCl
 type SupabaseTableOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Tables'];
 type SupabaseViewOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = DatabaseOf<Client>[SchemaName]['Views'];
 type SupabaseCollectionOf<Client extends SupabaseClient, SchemaName extends SchemaNameOf<Client>> = keyof SupabaseTableOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName> | keyof SupabaseViewOf<Client, IsUnionOfStrings<SchemaName> extends true ? 'public' : SchemaName>;
-type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>> = SupabaseTableOf<Client, SchemaName>[Collection]['Row'];
+type SupabaseRowOf<Client extends SupabaseClient, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client>> = SupabaseTableOf<Client, SchemaName>[Collection]['Row'] & SupabaseViewOf<Client, SchemaName>[Collection]['Row'];
 type SyncedSupabaseConfig<TRemote extends {
     id: string | number;
 }, TLocal> = Omit<SyncedCrudPropsBase<TRemote, TLocal>, 'create' | 'update' | 'delete'>;
@@ -44,7 +44,7 @@ interface SyncedSupabaseProps<Client extends SupabaseClient<any, any>, Collectio
     delete?: (...params: Parameters<Required<SyncedCrudPropsBase<TRemote>>['delete']>) => PromiseLike<PostgrestSingleResponse<TRemote>> | Promise<FunctionsResponse<NoInfer<TRemote>>>;
 }
 interface SyncedSupabasePropsWithSelect<Client extends SupabaseClient<any, any>, Collection extends SupabaseCollectionOf<Client, SchemaName>, SchemaName extends SchemaNameOf<Client> = 'public', TOption extends CrudAsOption = 'object', TRemote extends SupabaseRowOf<Client, Collection, SchemaName> = SupabaseRowOf<Client, Collection, SchemaName>, TLocal = TRemote> extends Omit<SyncedSupabaseProps<Client, Collection, SchemaName, TOption, TRemote, TLocal>, 'select'> {
-    select: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client, SchemaName>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
+    select: (query: PostgrestQueryBuilder<SupabaseSchemaOf<Client>, SupabaseTableOf<Client, SchemaName>[Collection] & SupabaseViewOf<Client, SchemaName>[Collection], Collection>) => PostgrestFilterBuilder<SupabaseSchemaOf<Client>, TRemote, TRemote[], Collection, []>;
 }
 declare function getSyncedSupabaseConfiguration(): SyncedSupabaseConfiguration;
 declare function configureSyncedSupabase(config: SyncedSupabaseConfiguration): void;

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, UpdateSetFn, UpdateFn, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, TypeAtPath, RecordValue, ArrayValue, WaitForSet } from '@legendapp/state';
+import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, ChangeWithPathStr, 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> {
@@ -35,7 +35,8 @@ interface SyncedGetParams<T> extends SyncedGetSetBaseParams<T> {
     onError: (error: Error, params: SyncedErrorParams) => void;
     options: SyncedOptions;
 }
-interface SyncedSetParams<T> extends Pick<SetParams<T>, 'changes' | 'value'>, SyncedGetSetBaseParams<T> {
+interface SyncedSetParams<T> extends Omit<Pick<SetParams<T>, 'changes' | 'value'>, 'changes'>, SyncedGetSetBaseParams<T> {
+    changes: ChangeWithPathStr[];
     update: UpdateSetFn<T>;
     onError: (error: Error, params: SyncedErrorParams) => void;
 }

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, UpdateSetFn, UpdateFn, LinkedOptions, RetryOptions, Change, Observable, ObservableSyncState, TypeAtPath, RecordValue, ArrayValue, WaitForSet } from '@legendapp/state';
+import { ClassConstructor, NodeInfo, ObservableParam, GetMode, SetParams, ChangeWithPathStr, 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> {
@@ -35,7 +35,8 @@ interface SyncedGetParams<T> extends SyncedGetSetBaseParams<T> {
     onError: (error: Error, params: SyncedErrorParams) => void;
     options: SyncedOptions;
 }
-interface SyncedSetParams<T> extends Pick<SetParams<T>, 'changes' | 'value'>, SyncedGetSetBaseParams<T> {
+interface SyncedSetParams<T> extends Omit<Pick<SetParams<T>, 'changes' | 'value'>, 'changes'>, SyncedGetSetBaseParams<T> {
+    changes: ChangeWithPathStr[];
     update: UpdateSetFn<T>;
     onError: (error: Error, params: SyncedErrorParams) => void;
 }

package/sync.js

@@ -542,7 +542,7 @@ async function prepChangeRemote(queuedChange) {
           );
           promisesTransform.push(
             doInOrder(promiseTransformRemote, ({ value: valueTransformed, path: pathTransformed }) => {
-              var _a;
+              var _a, _b, _c, _d;
               if (!localState.pendingChanges) {
                 localState.pendingChanges = {};
               }
@@ -559,18 +559,27 @@ async function prepChangeRemote(queuedChange) {
                     pathTypesChild,
                     valueAtPath
                   );
+                  if ((_b = localState.pendingClears) == null ? void 0 : _b[pathParent]) {
+                    delete localState.pendingClears[pathParent];
+                  }
                 }
               }
               if (!found2) {
                 for (const key in localState.pendingChanges) {
                   if (key !== pathStr && key.startsWith(pathStr)) {
                     delete localState.pendingChanges[key];
+                    if ((_c = localState.pendingClears) == null ? void 0 : _c[key]) {
+                      delete localState.pendingClears[key];
+                    }
                   }
                 }
                 if (!localState.pendingChanges[pathStr]) {
                   localState.pendingChanges[pathStr] = { p: prevAtPath != null ? prevAtPath : null, t: pathTypes };
                 }
                 localState.pendingChanges[pathStr].v = valueAtPath;
+                if ((_d = localState.pendingClears) == null ? void 0 : _d[pathStr]) {
+                  delete localState.pendingClears[pathStr];
+                }
               }
               changesRemote.push({
                 path: pathTransformed,
@@ -634,7 +643,7 @@ async function doChangeRemote(changeInfo) {
   const shouldSaveMetadata = persist == null ? void 0 : persist.retrySync;
   const saveLocal = !!(persist == null ? void 0 : persist.name);
   if (changesRemote.length > 0) {
-    if (!syncState2.isLoaded.peek()) {
+    if ((syncOptions.get || syncOptions.subscribe) && !syncState2.isLoaded.peek()) {
       await state.when(syncState2.isLoaded);
       const pending = localState.pendingChanges;
       if (pending) {
@@ -656,6 +665,12 @@ async function doChangeRemote(changeInfo) {
     if (transformSave) {
       value = transformSave(value);
     }
+    const setGeneration = localState.pendingSetGeneration;
+    const pendingSetsSinceClear = localState.pendingSetsSinceClear || 0;
+    const hadPendingSets = setGeneration !== void 0 ? pendingSetsSinceClear > 0 : (state$.numPendingSets.peek() || 0) > 0;
+    if (setGeneration !== void 0) {
+      localState.pendingSetsSinceClear = pendingSetsSinceClear + 1;
+    }
     state$.numPendingSets.set((v) => (v || 0) + 1);
     state$.isSetting.set(true);
     const beforeSetParams = {
@@ -722,26 +737,63 @@ async function doChangeRemote(changeInfo) {
       }
       if (!didError || (updateResult == null ? void 0 : updateResult.changes)) {
         const { value: updateValue, changes: updateChanges = changesRemote } = updateResult || {};
-        const pathStrs = Array.from(
-          new Set(updateChanges.map((change) => change.pathStr))
-        );
+        const changesWithPath = updateChanges;
+        const pathStrs = Array.from(new Set(changesWithPath.map((change) => change.pathStr)));
         if (pathStrs.length > 0) {
           let transformedChanges = void 0;
           const metadata = {};
-          if (saveLocal) {
-            const pendingMetadata = (_b = pluginPersist.getMetadata(table, configLocal)) == null ? void 0 : _b.pending;
-            const pending = localState.pendingChanges;
-            for (let i = 0; i < pathStrs.length; i++) {
-              const pathStr = pathStrs[i];
-              if (pendingMetadata == null ? void 0 : pendingMetadata[pathStr]) {
-                delete pendingMetadata[pathStr];
-                metadata.pending = pendingMetadata;
+          const pending = localState.pendingChanges;
+          const pendingToKeep = /* @__PURE__ */ new Set();
+          if (pending) {
+            const changesByPath = /* @__PURE__ */ new Map();
+            for (let i = 0; i < changesWithPath.length; i++) {
+              const change = changesWithPath[i];
+              changesByPath.set(change.pathStr, change);
+            }
+            for (const key in pending) {
+              const pendingEntry = pending[key];
+              if (!pendingEntry) {
+                continue;
               }
-              if (pending == null ? void 0 : pending[pathStr]) {
-                delete pending[pathStr];
+              const change = changesByPath.get(key);
+              if (!change || !deepEqual(pendingEntry.v, change.valueAtPath)) {
+                pendingToKeep.add(key);
               }
             }
           }
+          const pendingToOverlay = new Set(pendingToKeep);
+          const pendingClears = localState.pendingClears;
+          if (pendingClears) {
+            for (const key in pendingClears) {
+              pendingToOverlay.add(key);
+            }
+          }
+          if (hadPendingSets) {
+            for (let i = 0; i < changesWithPath.length; i++) {
+              pendingToOverlay.add(changesWithPath[i].pathStr);
+            }
+          }
+          const pendingMetadata = saveLocal ? (_b = pluginPersist.getMetadata(table, configLocal)) == null ? void 0 : _b.pending : void 0;
+          const shouldDeferPendingClear = (state$.numPendingSets.peek() || 0) > 1;
+          for (let i = 0; i < pathStrs.length; i++) {
+            const pathStr = pathStrs[i];
+            if (pendingToKeep.has(pathStr)) {
+              continue;
+            }
+            if (shouldDeferPendingClear && (pending == null ? void 0 : pending[pathStr])) {
+              if (!localState.pendingClears) {
+                localState.pendingClears = {};
+              }
+              localState.pendingClears[pathStr] = pending[pathStr];
+            }
+            if (pendingMetadata == null ? void 0 : pendingMetadata[pathStr]) {
+              delete pendingMetadata[pathStr];
+              metadata.pending = pendingMetadata;
+            }
+            if (pending == null ? void 0 : pending[pathStr]) {
+              delete pending[pathStr];
+            }
+          }
           if (updateValue && !state.isEmpty(updateValue)) {
             transformedChanges = transformLoadData(updateValue, syncOptions, false, "set");
           }
@@ -749,7 +801,48 @@ async function doChangeRemote(changeInfo) {
             if (state.isPromise(transformedChanges)) {
               transformedChanges = await transformedChanges;
             }
-            onChangeRemote2(() => state.mergeIntoObservable(obs$, transformedChanges));
+            if (pendingToOverlay.size === 0) {
+              onChangeRemote2(() => state.mergeIntoObservable(obs$, transformedChanges));
+            } else if (!pendingToOverlay.has("")) {
+              let updatePatch = transformedChanges;
+              if (typeof updatePatch === "object" && updatePatch !== null) {
+                updatePatch = clone2(updatePatch);
+                const currentValue = obs$.peek();
+                for (const pathStr of pendingToOverlay) {
+                  if (!pathStr) {
+                    continue;
+                  }
+                  const pendingEntry = (pending == null ? void 0 : pending[pathStr]) || (pendingClears == null ? void 0 : pendingClears[pathStr]);
+                  if (!pendingEntry) {
+                    continue;
+                  }
+                  const path = pathStr.split("/").filter((p) => p);
+                  const currentAtPath = getValueAtPath(currentValue, path);
+                  updatePatch = state.setAtPath(updatePatch, path, pendingEntry.t, currentAtPath);
+                }
+                if (hadPendingSets) {
+                  for (let i = 0; i < changesWithPath.length; i++) {
+                    const change = changesWithPath[i];
+                    if (!change.pathStr || !pendingToOverlay.has(change.pathStr)) {
+                      continue;
+                    }
+                    const currentAtPath = getValueAtPath(
+                      currentValue,
+                      change.path
+                    );
+                    updatePatch = state.setAtPath(
+                      updatePatch,
+                      change.path,
+                      change.pathTypes,
+                      currentAtPath
+                    );
+                  }
+                }
+              }
+              if (updatePatch !== void 0) {
+                onChangeRemote2(() => state.mergeIntoObservable(obs$, updatePatch));
+              }
+            }
           }
           if (saveLocal) {
             if (shouldSaveMetadata && !state.isEmpty(metadata)) {
@@ -758,7 +851,18 @@ async function doChangeRemote(changeInfo) {
           }
         }
         state$.numPendingSets.set((v) => v - 1);
-        state$.isSetting.set(state$.numPendingSets.peek() > 0);
+        const remainingSets = state$.numPendingSets.peek() || 0;
+        if (setGeneration !== void 0 && localState.pendingSetGeneration === setGeneration) {
+          localState.pendingSetsSinceClear = (localState.pendingSetsSinceClear || 1) - 1;
+        }
+        if (!remainingSets) {
+          if (localState.pendingSetGeneration !== void 0 && !localState.pendingSetsSinceClear) {
+            localState.pendingSetGeneration = void 0;
+            localState.pendingSetsSinceClear = void 0;
+          }
+          localState.pendingClears = void 0;
+        }
+        state$.isSetting.set(remainingSets > 0);
         onAfterSet == null ? void 0 : onAfterSet();
       }
     }
@@ -893,10 +997,18 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     observableSyncConfiguration,
     removeNullUndefined(syncOptions || {})
   );
-  const localState = {};
-  let sync;
   const syncState$ = state.syncState(obs$);
   const syncStateValue = getNodeValue(getNode(syncState$));
+  const localState = {};
+  let sync;
+  const resetPendingState = () => {
+    var _a;
+    localState.pendingChanges = {};
+    localState.pendingClears = void 0;
+    const hasPendingSets = (syncStateValue.numPendingSets || 0) > 0;
+    localState.pendingSetGeneration = hasPendingSets ? ((_a = localState.pendingSetGeneration) != null ? _a : 0) + 1 : void 0;
+    localState.pendingSetsSinceClear = hasPendingSets ? 0 : void 0;
+  };
   allSyncStates.set(syncState$, node);
   syncStateValue.getPendingChanges = () => localState.pendingChanges;
   let lastErrorHandled;
@@ -1087,7 +1199,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                       onChange(params);
                       if (!syncState$.isLoaded.peek()) {
                         syncState$.assign({
-                          isLoaded: syncStateValue.numPendingRemoteLoads < 1,
+                          isLoaded: (syncStateValue.numPendingRemoteLoads || 0) < 1,
                           error: void 0,
                           isGetting: syncStateValue.numPendingGets > 0
                         });
@@ -1145,7 +1257,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             lastSync,
             pendingChanges: pending && !state.isEmpty(pending) ? pending : void 0,
             clearPendingChanges: async () => {
-              localState.pendingChanges = {};
+              resetPendingState();
               await updateMetadataImmediate(obs$, localState, syncState$, syncOptions, {
                 pending: localState.pendingChanges
               });
@@ -1232,6 +1344,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     if (metadata) {
       Object.assign(metadata, { lastSync: void 0, pending: void 0 });
     }
+    resetPendingState();
     const newState = {
       isPersistEnabled: false,
       isSyncEnabled: false,
@@ -1253,7 +1366,6 @@ function syncObservable(obs$, syncOptionsOrSynced) {
       var _a;
       obs$.set((_a = syncOptions.initial) != null ? _a : void 0);
     });
-    syncState$.isLoaded.set(false);
     syncStateValue.isPersistEnabled = wasPersistEnabled;
     syncStateValue.isSyncEnabled = wasSyncEnabled;
     node.dirtyFn = sync;

package/sync.mjs

@@ -540,7 +540,7 @@ async function prepChangeRemote(queuedChange) {
           );
           promisesTransform.push(
             doInOrder(promiseTransformRemote, ({ value: valueTransformed, path: pathTransformed }) => {
-              var _a;
+              var _a, _b, _c, _d;
               if (!localState.pendingChanges) {
                 localState.pendingChanges = {};
               }
@@ -557,18 +557,27 @@ async function prepChangeRemote(queuedChange) {
                     pathTypesChild,
                     valueAtPath
                   );
+                  if ((_b = localState.pendingClears) == null ? void 0 : _b[pathParent]) {
+                    delete localState.pendingClears[pathParent];
+                  }
                 }
               }
               if (!found2) {
                 for (const key in localState.pendingChanges) {
                   if (key !== pathStr && key.startsWith(pathStr)) {
                     delete localState.pendingChanges[key];
+                    if ((_c = localState.pendingClears) == null ? void 0 : _c[key]) {
+                      delete localState.pendingClears[key];
+                    }
                   }
                 }
                 if (!localState.pendingChanges[pathStr]) {
                   localState.pendingChanges[pathStr] = { p: prevAtPath != null ? prevAtPath : null, t: pathTypes };
                 }
                 localState.pendingChanges[pathStr].v = valueAtPath;
+                if ((_d = localState.pendingClears) == null ? void 0 : _d[pathStr]) {
+                  delete localState.pendingClears[pathStr];
+                }
               }
               changesRemote.push({
                 path: pathTransformed,
@@ -632,7 +641,7 @@ async function doChangeRemote(changeInfo) {
   const shouldSaveMetadata = persist == null ? void 0 : persist.retrySync;
   const saveLocal = !!(persist == null ? void 0 : persist.name);
   if (changesRemote.length > 0) {
-    if (!syncState2.isLoaded.peek()) {
+    if ((syncOptions.get || syncOptions.subscribe) && !syncState2.isLoaded.peek()) {
       await when(syncState2.isLoaded);
       const pending = localState.pendingChanges;
       if (pending) {
@@ -654,6 +663,12 @@ async function doChangeRemote(changeInfo) {
     if (transformSave) {
       value = transformSave(value);
     }
+    const setGeneration = localState.pendingSetGeneration;
+    const pendingSetsSinceClear = localState.pendingSetsSinceClear || 0;
+    const hadPendingSets = setGeneration !== void 0 ? pendingSetsSinceClear > 0 : (state$.numPendingSets.peek() || 0) > 0;
+    if (setGeneration !== void 0) {
+      localState.pendingSetsSinceClear = pendingSetsSinceClear + 1;
+    }
     state$.numPendingSets.set((v) => (v || 0) + 1);
     state$.isSetting.set(true);
     const beforeSetParams = {
@@ -720,26 +735,63 @@ async function doChangeRemote(changeInfo) {
       }
       if (!didError || (updateResult == null ? void 0 : updateResult.changes)) {
         const { value: updateValue, changes: updateChanges = changesRemote } = updateResult || {};
-        const pathStrs = Array.from(
-          new Set(updateChanges.map((change) => change.pathStr))
-        );
+        const changesWithPath = updateChanges;
+        const pathStrs = Array.from(new Set(changesWithPath.map((change) => change.pathStr)));
         if (pathStrs.length > 0) {
           let transformedChanges = void 0;
           const metadata = {};
-          if (saveLocal) {
-            const pendingMetadata = (_b = pluginPersist.getMetadata(table, configLocal)) == null ? void 0 : _b.pending;
-            const pending = localState.pendingChanges;
-            for (let i = 0; i < pathStrs.length; i++) {
-              const pathStr = pathStrs[i];
-              if (pendingMetadata == null ? void 0 : pendingMetadata[pathStr]) {
-                delete pendingMetadata[pathStr];
-                metadata.pending = pendingMetadata;
+          const pending = localState.pendingChanges;
+          const pendingToKeep = /* @__PURE__ */ new Set();
+          if (pending) {
+            const changesByPath = /* @__PURE__ */ new Map();
+            for (let i = 0; i < changesWithPath.length; i++) {
+              const change = changesWithPath[i];
+              changesByPath.set(change.pathStr, change);
+            }
+            for (const key in pending) {
+              const pendingEntry = pending[key];
+              if (!pendingEntry) {
+                continue;
               }
-              if (pending == null ? void 0 : pending[pathStr]) {
-                delete pending[pathStr];
+              const change = changesByPath.get(key);
+              if (!change || !deepEqual(pendingEntry.v, change.valueAtPath)) {
+                pendingToKeep.add(key);
               }
             }
           }
+          const pendingToOverlay = new Set(pendingToKeep);
+          const pendingClears = localState.pendingClears;
+          if (pendingClears) {
+            for (const key in pendingClears) {
+              pendingToOverlay.add(key);
+            }
+          }
+          if (hadPendingSets) {
+            for (let i = 0; i < changesWithPath.length; i++) {
+              pendingToOverlay.add(changesWithPath[i].pathStr);
+            }
+          }
+          const pendingMetadata = saveLocal ? (_b = pluginPersist.getMetadata(table, configLocal)) == null ? void 0 : _b.pending : void 0;
+          const shouldDeferPendingClear = (state$.numPendingSets.peek() || 0) > 1;
+          for (let i = 0; i < pathStrs.length; i++) {
+            const pathStr = pathStrs[i];
+            if (pendingToKeep.has(pathStr)) {
+              continue;
+            }
+            if (shouldDeferPendingClear && (pending == null ? void 0 : pending[pathStr])) {
+              if (!localState.pendingClears) {
+                localState.pendingClears = {};
+              }
+              localState.pendingClears[pathStr] = pending[pathStr];
+            }
+            if (pendingMetadata == null ? void 0 : pendingMetadata[pathStr]) {
+              delete pendingMetadata[pathStr];
+              metadata.pending = pendingMetadata;
+            }
+            if (pending == null ? void 0 : pending[pathStr]) {
+              delete pending[pathStr];
+            }
+          }
           if (updateValue && !isEmpty(updateValue)) {
             transformedChanges = transformLoadData(updateValue, syncOptions, false, "set");
           }
@@ -747,7 +799,48 @@ async function doChangeRemote(changeInfo) {
             if (isPromise$1(transformedChanges)) {
               transformedChanges = await transformedChanges;
             }
-            onChangeRemote2(() => mergeIntoObservable(obs$, transformedChanges));
+            if (pendingToOverlay.size === 0) {
+              onChangeRemote2(() => mergeIntoObservable(obs$, transformedChanges));
+            } else if (!pendingToOverlay.has("")) {
+              let updatePatch = transformedChanges;
+              if (typeof updatePatch === "object" && updatePatch !== null) {
+                updatePatch = clone2(updatePatch);
+                const currentValue = obs$.peek();
+                for (const pathStr of pendingToOverlay) {
+                  if (!pathStr) {
+                    continue;
+                  }
+                  const pendingEntry = (pending == null ? void 0 : pending[pathStr]) || (pendingClears == null ? void 0 : pendingClears[pathStr]);
+                  if (!pendingEntry) {
+                    continue;
+                  }
+                  const path = pathStr.split("/").filter((p) => p);
+                  const currentAtPath = getValueAtPath(currentValue, path);
+                  updatePatch = setAtPath(updatePatch, path, pendingEntry.t, currentAtPath);
+                }
+                if (hadPendingSets) {
+                  for (let i = 0; i < changesWithPath.length; i++) {
+                    const change = changesWithPath[i];
+                    if (!change.pathStr || !pendingToOverlay.has(change.pathStr)) {
+                      continue;
+                    }
+                    const currentAtPath = getValueAtPath(
+                      currentValue,
+                      change.path
+                    );
+                    updatePatch = setAtPath(
+                      updatePatch,
+                      change.path,
+                      change.pathTypes,
+                      currentAtPath
+                    );
+                  }
+                }
+              }
+              if (updatePatch !== void 0) {
+                onChangeRemote2(() => mergeIntoObservable(obs$, updatePatch));
+              }
+            }
           }
           if (saveLocal) {
             if (shouldSaveMetadata && !isEmpty(metadata)) {
@@ -756,7 +849,18 @@ async function doChangeRemote(changeInfo) {
           }
         }
         state$.numPendingSets.set((v) => v - 1);
-        state$.isSetting.set(state$.numPendingSets.peek() > 0);
+        const remainingSets = state$.numPendingSets.peek() || 0;
+        if (setGeneration !== void 0 && localState.pendingSetGeneration === setGeneration) {
+          localState.pendingSetsSinceClear = (localState.pendingSetsSinceClear || 1) - 1;
+        }
+        if (!remainingSets) {
+          if (localState.pendingSetGeneration !== void 0 && !localState.pendingSetsSinceClear) {
+            localState.pendingSetGeneration = void 0;
+            localState.pendingSetsSinceClear = void 0;
+          }
+          localState.pendingClears = void 0;
+        }
+        state$.isSetting.set(remainingSets > 0);
         onAfterSet == null ? void 0 : onAfterSet();
       }
     }
@@ -891,10 +995,18 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     observableSyncConfiguration,
     removeNullUndefined(syncOptions || {})
   );
-  const localState = {};
-  let sync;
   const syncState$ = syncState(obs$);
   const syncStateValue = getNodeValue(getNode(syncState$));
+  const localState = {};
+  let sync;
+  const resetPendingState = () => {
+    var _a;
+    localState.pendingChanges = {};
+    localState.pendingClears = void 0;
+    const hasPendingSets = (syncStateValue.numPendingSets || 0) > 0;
+    localState.pendingSetGeneration = hasPendingSets ? ((_a = localState.pendingSetGeneration) != null ? _a : 0) + 1 : void 0;
+    localState.pendingSetsSinceClear = hasPendingSets ? 0 : void 0;
+  };
   allSyncStates.set(syncState$, node);
   syncStateValue.getPendingChanges = () => localState.pendingChanges;
   let lastErrorHandled;
@@ -1085,7 +1197,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
                       onChange(params);
                       if (!syncState$.isLoaded.peek()) {
                         syncState$.assign({
-                          isLoaded: syncStateValue.numPendingRemoteLoads < 1,
+                          isLoaded: (syncStateValue.numPendingRemoteLoads || 0) < 1,
                           error: void 0,
                           isGetting: syncStateValue.numPendingGets > 0
                         });
@@ -1143,7 +1255,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
             lastSync,
             pendingChanges: pending && !isEmpty(pending) ? pending : void 0,
             clearPendingChanges: async () => {
-              localState.pendingChanges = {};
+              resetPendingState();
               await updateMetadataImmediate(obs$, localState, syncState$, syncOptions, {
                 pending: localState.pendingChanges
               });
@@ -1230,6 +1342,7 @@ function syncObservable(obs$, syncOptionsOrSynced) {
     if (metadata) {
       Object.assign(metadata, { lastSync: void 0, pending: void 0 });
     }
+    resetPendingState();
     const newState = {
       isPersistEnabled: false,
       isSyncEnabled: false,
@@ -1251,7 +1364,6 @@ function syncObservable(obs$, syncOptionsOrSynced) {
       var _a;
       obs$.set((_a = syncOptions.initial) != null ? _a : void 0);
     });
-    syncState$.isLoaded.set(false);
     syncStateValue.isPersistEnabled = wasPersistEnabled;
     syncStateValue.isSyncEnabled = wasSyncEnabled;
     node.dirtyFn = sync;