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

package/config/enableReactComponents.d.mts

@@ -1,4 +1,5 @@
 import { FCReactiveObject } from '@legendapp/state/react';
+import { JSX } from 'react';
 
 declare function enableReactComponents(): void;
 declare module '@legendapp/state/react' {

package/config/enableReactComponents.d.ts

@@ -1,4 +1,5 @@
 import { FCReactiveObject } from '@legendapp/state/react';
+import { JSX } from 'react';
 
 declare function enableReactComponents(): void;
 declare module '@legendapp/state/react' {

package/config/enableReactNativeComponents.d.mts

@@ -1,3 +1,4 @@
+import { JSX } from 'react';
 import { FCReactiveObject, FCReactive } from '@legendapp/state/react';
 import { ActivityIndicator, ActivityIndicatorProps, Button, ButtonProps, FlatList, FlatListProps, Image, ImageProps, Pressable, PressableProps, ScrollView, ScrollViewProps, SectionList, SectionListProps, Switch, SwitchProps, Text, TextProps, TextInput, TextInputProps, TouchableWithoutFeedback, TouchableWithoutFeedbackProps, View, ViewProps } from 'react-native';
 

package/config/enableReactNativeComponents.d.ts

@@ -1,3 +1,4 @@
+import { JSX } from 'react';
 import { FCReactiveObject, FCReactive } from '@legendapp/state/react';
 import { ActivityIndicator, ActivityIndicatorProps, Button, ButtonProps, FlatList, FlatListProps, Image, ImageProps, Pressable, PressableProps, ScrollView, ScrollViewProps, SectionList, SectionListProps, Switch, SwitchProps, Text, TextProps, TextInput, TextInputProps, TouchableWithoutFeedback, TouchableWithoutFeedbackProps, View, ViewProps } from 'react-native';
 

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.44",
   "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-hooks/createObservableHook.js

@@ -29,7 +29,7 @@ function createObservableHook(fn) {
   const _useState = React__default.default.useState;
   const _useReducer = React__default.default.useReducer;
   return function(...args) {
-    const refObs = React__default.default.useRef();
+    const refObs = React__default.default.useRef(void 0);
     overrideHooks(refObs);
     fn(...args);
     React__default.default.useState = _useState;

package/react-hooks/createObservableHook.mjs

@@ -23,7 +23,7 @@ function createObservableHook(fn) {
   const _useState = React.useState;
   const _useReducer = React.useReducer;
   return function(...args) {
-    const refObs = React.useRef();
+    const refObs = React.useRef(void 0);
     overrideHooks(refObs);
     fn(...args);
     React.useState = _useState;

package/react-reactive/enableReactComponents.d.mts

@@ -1,4 +1,5 @@
 import { FCReactiveObject, configureReactive } from '@legendapp/state/react';
+import { JSX } from 'react';
 
 declare function enableReactComponents_(config: typeof configureReactive): void;
 

package/react-reactive/enableReactComponents.d.ts

@@ -1,4 +1,5 @@
 import { FCReactiveObject, configureReactive } from '@legendapp/state/react';
+import { JSX } from 'react';
 
 declare function enableReactComponents_(config: typeof configureReactive): void;
 

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<{
@@ -71,18 +71,20 @@ declare function Switch<T>({ value, children, }: {
     children: Partial<Record<'undefined' | 'default', () => ReactNode>>;
 }): ReactElement | null;
 
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+type ValueOfUnionKey$1<P, K extends PropertyKey> = P extends any ? (K extends keyof P ? P[K] : never) : never;
 type ShapeWithNew$<T> = Partial<Omit<T, 'children'>> & {
     [K in keyof T as K extends `$${string & K}` ? K : `$${string & K}`]?: Selector<T[K]>;
 } & {
     children?: Selector<ReactNode>;
 };
-interface BindKey<P, K extends keyof P = keyof P> {
+interface BindKey<P, K extends KeysOfUnion<P> = KeysOfUnion<P>> {
     handler?: K;
-    getValue?: P[K] extends infer T ? T extends (...args: any) => any ? (params: Parameters<T>[0]) => any : (e: any) => any : (e: any) => any;
+    getValue?: ValueOfUnionKey$1<P, K> extends infer T ? T extends (...args: any) => any ? (params: Parameters<T>[0]) => any : (e: any) => any : (e: any) => any;
     defaultValue?: any;
     selector?: (propsOut: Record<string, any>, p: Observable<any>) => any;
 }
-type BindKeys<P = any, K extends keyof P = keyof P> = Partial<Record<K, BindKey<P>>>;
+type BindKeys<P = any, K extends KeysOfUnion<P> = KeysOfUnion<P>> = Partial<Record<K, BindKey<P, K>>>;
 type FCReactiveObject<T> = {
     [K in keyof T]: FC<ShapeWithNew$<T[K]>>;
 };
@@ -109,23 +111,24 @@ type ShapeWith$<T> = WithSelectorChildren<Partial<T>> & {
 type ObjectShapeWith$<T> = {
     [K in keyof T]: T[K] extends FC<infer P> ? FC<ShapeWith$<P>> : T[K];
 };
-type ReactifyProps<T, K extends keyof T> = T & {
-    [P in K as `$${string & P}`]?: Selector<T[P]>;
+type ValueOfUnionKey<T, K extends PropertyKey> = T extends any ? (K extends keyof T ? T[K] : never) : never;
+type ReactifyProps<T, K extends KeysOfUnion<T>> = T & {
+    [P in K as `$${string & P}`]?: Selector<ValueOfUnionKey<T, P>>;
 };
 declare const hasSymbol: false | ((key: string) => symbol);
 declare function observer<P extends FC<any>>(component: P): P;
 declare function reactive<T extends object>(component: React.ComponentClass<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.FC<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.ForwardRefExoticComponent<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
-declare function reactive<T extends object, K extends keyof T>(component: React.FC<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
-declare function reactive<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
+declare function reactive<T extends object, K extends KeysOfUnion<T>>(component: React.FC<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
+declare function reactive<T extends object, K extends KeysOfUnion<T>>(component: React.ForwardRefExoticComponent<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
 declare function reactive<T extends object>(component: React.ComponentClass<T>): React.ComponentClass<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
 declare function reactive<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
 declare function reactiveObserver<T extends object>(component: React.FC<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.FC<ShapeWith$<T>>;
 declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>, keys: undefined | null, bindKeys?: BindKeys<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
-declare function reactiveObserver<T extends object, K extends keyof T>(component: React.FC<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
-declare function reactiveObserver<T extends object, K extends keyof T>(component: React.ForwardRefExoticComponent<T>, keys: K[] | (keyof T)[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
+declare function reactiveObserver<T extends object, K extends KeysOfUnion<T>>(component: React.FC<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.FC<ReactifyProps<T, K>>;
+declare function reactiveObserver<T extends object, K extends KeysOfUnion<T>>(component: React.ForwardRefExoticComponent<T>, keys: K[] | KeysOfUnion<T>[], bindKeys?: BindKeys<T, K>): React.ForwardRefExoticComponent<ReactifyProps<T, K>>;
 declare function reactiveObserver<T extends object>(component: React.FC<T>): React.FC<ShapeWith$<T>>;
 declare function reactiveObserver<T extends object>(component: React.ForwardRefExoticComponent<T>): React.ForwardRefExoticComponent<ShapeWith$<T>>;
 declare function reactiveComponents<P extends Record<string, any>>(components: P): ObjectShapeWith$<P>;
@@ -192,4 +195,4 @@ declare function configureReactive({ components, binders, }: {
     binders?: Record<string, BindKeys>;
 }): void;
 
-export { type BindKey, type BindKeys, Computed, type FCReactive, type FCReactiveObject, For, type IReactive, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, 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 };
+export { type BindKey, type BindKeys, Computed, type FCReactive, type FCReactiveObject, For, type IReactive, type KeysOfUnion, Memo, type ObjectShapeWith$, type ReactifyProps, Reactive, type ShapeWith$, type ShapeWithNew$, 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 };