@legendapp/state 3.0.0-beta.2 → 3.0.0-beta.21

package/config/enableReactComponents.js

@@ -4,7 +4,9 @@ var react = require('@legendapp/state/react');
 
 // src/config/enableReactComponents.ts
 function enableReactComponents() {
-  const bindInfo = { value: { handler: "onChange", getValue: (e) => e.target.value, defaultValue: "" } };
+  const bindInfo = {
+    value: { handler: "onChange", getValue: (e) => e.target.value, defaultValue: "" }
+  };
   const bindInfoInput = Object.assign(
     { checked: { handler: "onChange", getValue: (e) => e.target.checked } },
     bindInfo

package/config/enableReactComponents.mjs

@@ -2,7 +2,9 @@ import { configureReactive } from '@legendapp/state/react';
 
 // src/config/enableReactComponents.ts
 function enableReactComponents() {
-  const bindInfo = { value: { handler: "onChange", getValue: (e) => e.target.value, defaultValue: "" } };
+  const bindInfo = {
+    value: { handler: "onChange", getValue: (e) => e.target.value, defaultValue: "" }
+  };
   const bindInfoInput = Object.assign(
     { checked: { handler: "onChange", getValue: (e) => e.target.checked } },
     bindInfo

package/config/enableReactTracking.d.mts

@@ -1,7 +1,8 @@
 interface ReactTrackingOptions {
     auto?: boolean;
     warnUnobserved?: boolean;
+    warnMissingUse?: boolean;
 }
-declare function enableReactTracking({ auto, warnUnobserved }: ReactTrackingOptions): void;
+declare function enableReactTracking({ auto, warnUnobserved, warnMissingUse }: ReactTrackingOptions): void;
 
 export { enableReactTracking };

package/config/enableReactTracking.d.ts

@@ -1,7 +1,8 @@
 interface ReactTrackingOptions {
     auto?: boolean;
     warnUnobserved?: boolean;
+    warnMissingUse?: boolean;
 }
-declare function enableReactTracking({ auto, warnUnobserved }: ReactTrackingOptions): void;
+declare function enableReactTracking({ auto, warnUnobserved, warnMissingUse }: ReactTrackingOptions): void;
 
 export { enableReactTracking };

package/config/enableReactTracking.js

@@ -6,32 +6,51 @@ var react$1 = require('@legendapp/state/react');
 var react = require('react');
 
 // src/config/enableReactTracking.ts
-function enableReactTracking({ auto, warnUnobserved }) {
+function enableReactTracking({ auto, warnUnobserved, warnMissingUse }) {
   const { get } = state.internal;
-  if (auto || process.env.NODE_ENV === "development" && warnUnobserved) {
+  if (auto || process.env.NODE_ENV === "development" && (warnUnobserved || warnMissingUse)) {
     const ReactRenderContext = react.createContext(0);
-    const needsSelector = () => {
-      if (!state.tracking.current) {
-        try {
-          const dispatcher = react.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher.current;
-          if (dispatcher) {
-            react.useContext(ReactRenderContext);
-            return true;
-          }
-        } catch (e) {
+    const isInRender = () => {
+      try {
+        const dispatcher = react.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher.current;
+        if (dispatcher) {
+          react.useContext(ReactRenderContext);
+          return true;
         }
+      } catch (e) {
+      }
+      return false;
+    };
+    const isObserved = () => {
+      return !!state.tracking.current;
+    };
+    const needsSelector = () => {
+      if (!isObserved()) {
+        return isInRender();
       }
       return false;
     };
     configureLegendState.configureLegendState({
       observableFunctions: {
         get: (node, options) => {
-          if (needsSelector()) {
+          if (process.env.NODE_ENV === "development" && warnMissingUse) {
+            if (isInRender()) {
+              if (isObserved()) {
+                console.warn(
+                  "[legend-state] Detected a `get()` call in an observer component. It is recommended to use the `use$` hook instead to be compatible with React Compiler: https://legendapp.com/open-source/state/v3/react/react-api/#use$"
+                );
+              } else {
+                console.warn(
+                  "[legend-state] Detected a `get()` call in a component. You likely want to use the `use$` hook to be reactive to it changing, or change `get()` to `peek()` to get the value without tracking: https://legendapp.com/open-source/state/v3/react/react-api/#use$"
+                );
+              }
+            }
+          } else if (needsSelector()) {
             if (auto) {
               return react$1.useSelector(() => get(node, options), state.isObject(options) ? options : void 0);
             } else if (process.env.NODE_ENV === "development" && warnUnobserved) {
               console.warn(
-                "[legend-state] Detected a `get()` call in an unobserved component. You may want to wrap it in observer: https://legendapp.com/open-source/state/react-api/#observer-hoc"
+                "[legend-state] Detected a `get()` call in an unobserved component. You may want to wrap it in observer: https://legendapp.com/open-source/state/v3/react/react-api/#observer"
               );
             }
           }

package/config/enableReactTracking.mjs

@@ -4,32 +4,51 @@ import { useSelector } from '@legendapp/state/react';
 import { createContext, __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, useContext } from 'react';
 
 // src/config/enableReactTracking.ts
-function enableReactTracking({ auto, warnUnobserved }) {
+function enableReactTracking({ auto, warnUnobserved, warnMissingUse }) {
   const { get } = internal;
-  if (auto || process.env.NODE_ENV === "development" && warnUnobserved) {
+  if (auto || process.env.NODE_ENV === "development" && (warnUnobserved || warnMissingUse)) {
     const ReactRenderContext = createContext(0);
-    const needsSelector = () => {
-      if (!tracking.current) {
-        try {
-          const dispatcher = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher.current;
-          if (dispatcher) {
-            useContext(ReactRenderContext);
-            return true;
-          }
-        } catch (e) {
+    const isInRender = () => {
+      try {
+        const dispatcher = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentDispatcher.current;
+        if (dispatcher) {
+          useContext(ReactRenderContext);
+          return true;
         }
+      } catch (e) {
+      }
+      return false;
+    };
+    const isObserved = () => {
+      return !!tracking.current;
+    };
+    const needsSelector = () => {
+      if (!isObserved()) {
+        return isInRender();
       }
       return false;
     };
     configureLegendState({
       observableFunctions: {
         get: (node, options) => {
-          if (needsSelector()) {
+          if (process.env.NODE_ENV === "development" && warnMissingUse) {
+            if (isInRender()) {
+              if (isObserved()) {
+                console.warn(
+                  "[legend-state] Detected a `get()` call in an observer component. It is recommended to use the `use$` hook instead to be compatible with React Compiler: https://legendapp.com/open-source/state/v3/react/react-api/#use$"
+                );
+              } else {
+                console.warn(
+                  "[legend-state] Detected a `get()` call in a component. You likely want to use the `use$` hook to be reactive to it changing, or change `get()` to `peek()` to get the value without tracking: https://legendapp.com/open-source/state/v3/react/react-api/#use$"
+                );
+              }
+            }
+          } else if (needsSelector()) {
             if (auto) {
               return useSelector(() => get(node, options), isObject(options) ? options : void 0);
             } else if (process.env.NODE_ENV === "development" && warnUnobserved) {
               console.warn(
-                "[legend-state] Detected a `get()` call in an unobserved component. You may want to wrap it in observer: https://legendapp.com/open-source/state/react-api/#observer-hoc"
+                "[legend-state] Detected a `get()` call in an unobserved component. You may want to wrap it in observer: https://legendapp.com/open-source/state/v3/react/react-api/#observer"
               );
             }
           }

package/index.d.mts

@@ -108,6 +108,7 @@ declare function getNode(value$: ObservableParam): NodeInfo;
 declare function setNodeValue(node: NodeInfo, newValue: any): {
     prevValue: any;
     newValue: any;
+    parentValue: any;
 };
 declare function getNodeValue(node: NodeInfo): any;
 declare function ensureNodeValue(node: NodeInfo): any;
@@ -115,7 +116,7 @@ declare function findIDKey(obj: unknown | undefined, node: NodeInfo): string | (
 
 type TrackingType = undefined | true | symbol;
 interface GetOptions {
-    shallow: boolean;
+    shallow?: boolean;
 }
 type OpaqueObject<T> = T & {
     [symbolOpaque]: true;
@@ -152,6 +153,7 @@ type ObservableListenerDispose = () => void;
 interface ObservableRoot {
     _: any;
     set?: (value: any) => void;
+    isLoadingLocal?: boolean;
 }
 type Primitive = boolean | string | number | Date;
 type NotPrimitive<T> = T extends Primitive ? never : T;
@@ -187,6 +189,7 @@ interface BaseNodeInfo {
     numListenersRecursive: number;
     state?: Observable<ObservableSyncState>;
     activated?: boolean;
+    isPlain?: boolean;
     recursivelyAutoActivated?: boolean;
     activationState?: LinkedOptions & {
         onError?: () => void;
@@ -246,8 +249,13 @@ interface UpdateFnParams<T = any> {
     value: T;
     mode?: GetMode;
     lastSync?: number | undefined;
+    changes?: Change[];
+}
+interface UpdateSetFnParams<T = any> extends UpdateFnParams<T> {
+    lastSync?: never;
 }
 type UpdateFn<T = any> = (params: UpdateFnParams<T>) => void;
+type UpdateSetFn<T = any> = (params: UpdateSetFnParams<T>) => void;
 type Linked<T> = T;
 interface ObserveOptions {
     immediate?: boolean;
@@ -288,6 +296,7 @@ interface RetryOptions {
 declare const ObservableHint: {
     opaque: <T extends object>(value: T) => OpaqueObject<T>;
     plain: <T extends object>(value: T) => PlainObject<T>;
+    function: <T extends object>(value: T) => PlainObject<T>;
 };
 
 declare function getProxy(node: NodeInfo, p?: string, asFunction?: Function): Observable;
@@ -307,7 +316,7 @@ declare function computed<T, T2 = T>(get: (() => RecursiveValueOrFunction<T>) |
 
 declare function event(): ObservableEvent;
 
-declare function computeSelector<T>(selector: Selector<T>, e?: ObserveEvent<T>, retainObservable?: boolean): T;
+declare function computeSelector<T>(selector: Selector<T>, getOptions?: GetOptions, e?: ObserveEvent<T>, retainObservable?: boolean): T;
 declare function getObservableIndex(value$: ObservableParam): number;
 declare function opaqueObject<T extends object>(value: T): OpaqueObject<T>;
 declare function getValueAtPath(obj: Record<string, any>, path: string[]): any;
@@ -357,7 +366,7 @@ declare function proxy<T>(get: (key: string) => T): Observable<Record<string, T>
 
 declare function syncState(obs: ObservableParam): Observable<ObservableSyncState>;
 
-declare function trackSelector<T>(selector: Selector<T>, update: (params: ListenerParams) => void, observeEvent?: ObserveEvent<T>, observeOptions?: ObserveOptions, createResubscribe?: boolean): {
+declare function trackSelector<T>(selector: Selector<T>, update: (params: ListenerParams) => void, getOptions?: GetOptions, observeEvent?: ObserveEvent<T>, observeOptions?: ObserveOptions, createResubscribe?: boolean): {
     nodes: Map<NodeInfo, TrackingNode> | undefined;
     value: T;
     dispose: (() => void) | undefined;
@@ -426,4 +435,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 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 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 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 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

@@ -108,6 +108,7 @@ declare function getNode(value$: ObservableParam): NodeInfo;
 declare function setNodeValue(node: NodeInfo, newValue: any): {
     prevValue: any;
     newValue: any;
+    parentValue: any;
 };
 declare function getNodeValue(node: NodeInfo): any;
 declare function ensureNodeValue(node: NodeInfo): any;
@@ -115,7 +116,7 @@ declare function findIDKey(obj: unknown | undefined, node: NodeInfo): string | (
 
 type TrackingType = undefined | true | symbol;
 interface GetOptions {
-    shallow: boolean;
+    shallow?: boolean;
 }
 type OpaqueObject<T> = T & {
     [symbolOpaque]: true;
@@ -152,6 +153,7 @@ type ObservableListenerDispose = () => void;
 interface ObservableRoot {
     _: any;
     set?: (value: any) => void;
+    isLoadingLocal?: boolean;
 }
 type Primitive = boolean | string | number | Date;
 type NotPrimitive<T> = T extends Primitive ? never : T;
@@ -187,6 +189,7 @@ interface BaseNodeInfo {
     numListenersRecursive: number;
     state?: Observable<ObservableSyncState>;
     activated?: boolean;
+    isPlain?: boolean;
     recursivelyAutoActivated?: boolean;
     activationState?: LinkedOptions & {
         onError?: () => void;
@@ -246,8 +249,13 @@ interface UpdateFnParams<T = any> {
     value: T;
     mode?: GetMode;
     lastSync?: number | undefined;
+    changes?: Change[];
+}
+interface UpdateSetFnParams<T = any> extends UpdateFnParams<T> {
+    lastSync?: never;
 }
 type UpdateFn<T = any> = (params: UpdateFnParams<T>) => void;
+type UpdateSetFn<T = any> = (params: UpdateSetFnParams<T>) => void;
 type Linked<T> = T;
 interface ObserveOptions {
     immediate?: boolean;
@@ -288,6 +296,7 @@ interface RetryOptions {
 declare const ObservableHint: {
     opaque: <T extends object>(value: T) => OpaqueObject<T>;
     plain: <T extends object>(value: T) => PlainObject<T>;
+    function: <T extends object>(value: T) => PlainObject<T>;
 };
 
 declare function getProxy(node: NodeInfo, p?: string, asFunction?: Function): Observable;
@@ -307,7 +316,7 @@ declare function computed<T, T2 = T>(get: (() => RecursiveValueOrFunction<T>) |
 
 declare function event(): ObservableEvent;
 
-declare function computeSelector<T>(selector: Selector<T>, e?: ObserveEvent<T>, retainObservable?: boolean): T;
+declare function computeSelector<T>(selector: Selector<T>, getOptions?: GetOptions, e?: ObserveEvent<T>, retainObservable?: boolean): T;
 declare function getObservableIndex(value$: ObservableParam): number;
 declare function opaqueObject<T extends object>(value: T): OpaqueObject<T>;
 declare function getValueAtPath(obj: Record<string, any>, path: string[]): any;
@@ -357,7 +366,7 @@ declare function proxy<T>(get: (key: string) => T): Observable<Record<string, T>
 
 declare function syncState(obs: ObservableParam): Observable<ObservableSyncState>;
 
-declare function trackSelector<T>(selector: Selector<T>, update: (params: ListenerParams) => void, observeEvent?: ObserveEvent<T>, observeOptions?: ObserveOptions, createResubscribe?: boolean): {
+declare function trackSelector<T>(selector: Selector<T>, update: (params: ListenerParams) => void, getOptions?: GetOptions, observeEvent?: ObserveEvent<T>, observeOptions?: ObserveOptions, createResubscribe?: boolean): {
     nodes: Map<NodeInfo, TrackingNode> | undefined;
     value: T;
     dispose: (() => void) | undefined;
@@ -426,4 +435,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 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 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 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 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

@@ -181,7 +181,7 @@ function setNodeValue(node, newValue) {
       parentNode.isSetting--;
     }
   }
-  return { prevValue, newValue };
+  return { prevValue, newValue, parentValue };
 }
 var arrNodeKeys = [];
 function getNodeValue(node) {
@@ -276,16 +276,19 @@ var ObservableHint = {
   },
   plain: function plainObject(value) {
     return addSymbol(value, symbolPlain);
+  },
+  function: function plainObject2(value) {
+    return addSymbol(value, symbolPlain);
   }
 };
 
 // src/helpers.ts
-function computeSelector(selector, e, retainObservable) {
+function computeSelector(selector, getOptions, e, retainObservable) {
   let c = selector;
   if (!isObservable(c) && isFunction(c)) {
     c = e ? c(e) : c();
   }
-  return isObservable(c) && !retainObservable ? c.get() : c;
+  return isObservable(c) && !retainObservable ? c.get(getOptions) : c;
 }
 function getObservableIndex(value$) {
   const node = getNode(value$);
@@ -384,7 +387,7 @@ function _mergeIntoObservable(target, source, levelsDeep) {
   const isSourceSet = isSet(source);
   if (isSourceSet && isSet(targetValue)) {
     target.set(/* @__PURE__ */ new Set([...source, ...targetValue]));
-  } else if (isTargetObj && isObject(source) && !isEmpty(targetValue) || isTargetArr && targetValue.length > 0) {
+  } else if (isTargetObj && isObject(source) || isTargetArr && targetValue.length > 0) {
     const keys = isSourceMap || isSourceSet ? Array.from(source.keys()) : Object.keys(source);
     for (let i = 0; i < keys.length; i++) {
       const key = keys[i];
@@ -969,13 +972,13 @@ function updateTracking(node, track) {
 }
 
 // src/trackSelector.ts
-function trackSelector(selector, update, observeEvent, observeOptions, createResubscribe) {
+function trackSelector(selector, update, getOptions, observeEvent, observeOptions, createResubscribe) {
   var _a;
   let dispose;
   let resubscribe;
   let updateFn = update;
   beginTracking();
-  const value = selector ? computeSelector(selector, observeEvent, observeOptions == null ? void 0 : observeOptions.fromComputed) : selector;
+  const value = selector ? computeSelector(selector, getOptions, observeEvent, observeOptions == null ? void 0 : observeOptions.fromComputed) : selector;
   const tracker = tracking.current;
   const nodes = tracker.nodes;
   endTracking();
@@ -1023,7 +1026,11 @@ function observe(selectorOrRun, reactionOrOptions, options) {
     beginBatch();
     delete e.value;
     dispose == null ? void 0 : dispose();
-    const { dispose: _dispose, value, nodes } = trackSelector(selectorOrRun, update, e, options);
+    const {
+      dispose: _dispose,
+      value,
+      nodes
+    } = trackSelector(selectorOrRun, update, void 0, e, options);
     dispose = _dispose;
     e.value = value;
     e.nodes = nodes;
@@ -1068,10 +1075,13 @@ function _when(predicate, effect, checkReady) {
       let isOk = true;
       if (isArray(ret)) {
         for (let i = 0; i < ret.length; i++) {
-          if (isObservable(ret[i])) {
-            ret[i] = computeSelector(ret[i]);
+          let item = ret[i];
+          if (isObservable(item)) {
+            item = computeSelector(item);
+          } else if (isFunction(item)) {
+            item = item();
           }
-          isOk = isOk && !!(checkReady ? isObservableValueReady(ret[i]) : ret[i]);
+          isOk = isOk && !!(checkReady ? isObservableValueReady(item) : item);
         }
       } else {
         isOk = checkReady ? isObservableValueReady(ret) : ret;
@@ -1170,8 +1180,8 @@ function collectionSetter(node, target, prop, ...args) {
     return ret;
   }
 }
-function getKeys(obj, isArr, isMap2) {
-  return isArr ? void 0 : obj ? isMap2 ? Array.from(obj.keys()) : Object.keys(obj) : [];
+function getKeys(obj, isArr, isMap2, isSet2) {
+  return isArr ? void 0 : obj ? isSet2 ? Array.from(obj) : isMap2 ? Array.from(obj.keys()) : Object.keys(obj) : [];
 }
 function updateNodes(parent, obj, prevValue) {
   var _a, _b, _c;
@@ -1201,9 +1211,11 @@ function updateNodes(parent, obj, prevValue) {
   let prevChildrenById;
   let moved;
   const isCurMap = isMap(obj);
+  const isCurSet = isSet(obj);
   const isPrevMap = isMap(prevValue);
-  const keys = getKeys(obj, isArr, isCurMap);
-  const keysPrev = getKeys(prevValue, isArr, isPrevMap);
+  const isPrevSet = isSet(prevValue);
+  const keys = getKeys(obj, isArr, isCurMap, isCurSet);
+  const keysPrev = getKeys(prevValue, isArr, isPrevMap, isPrevSet);
   const length = ((_a = keys || obj) == null ? void 0 : _a.length) || 0;
   const lengthPrev = ((_b = keysPrev || prevValue) == null ? void 0 : _b.length) || 0;
   let idField;
@@ -1553,7 +1565,9 @@ var proxyHandler = {
     if (isObservable(thisArg)) {
       thisArg = thisArg.peek();
     }
-    return Reflect.apply(target.lazyFn || target, thisArg, argArray);
+    const fnRaw = getNodeValue(target);
+    const fn = isFunction(fnRaw) ? fnRaw : target.lazyFn || target;
+    return Reflect.apply(fn, thisArg, argArray);
   }
 };
 function set(node, newValue) {
@@ -1585,7 +1599,7 @@ function setKey(node, key, newValue, level) {
   if (isObservable(newValue)) {
     setToObservable(childNode, newValue);
   } else {
-    const { newValue: savedValue, prevValue } = setNodeValue(childNode, newValue);
+    const { newValue: savedValue, prevValue, parentValue } = setNodeValue(childNode, newValue);
     const isPrim = isPrimitive(savedValue) || savedValue instanceof Date;
     if (!isPrim) {
       let parent = childNode;
@@ -1597,7 +1611,17 @@ function setKey(node, key, newValue, level) {
     const notify2 = !equals(savedValue, prevValue);
     const forceNotify = !notify2 && childNode.isComputing && !isPrim;
     if (notify2 || forceNotify) {
-      updateNodesAndNotify(node, savedValue, prevValue, childNode, isPrim, isRoot, level, forceNotify);
+      updateNodesAndNotify(
+        node,
+        savedValue,
+        prevValue,
+        childNode,
+        parentValue,
+        isPrim,
+        isRoot,
+        level,
+        forceNotify
+      );
     }
     extractFunctionOrComputed(node, key, savedValue);
   }
@@ -1704,7 +1728,7 @@ function handlerMapSet(node, p, value) {
     };
   }
 }
-function updateNodesAndNotify(node, newValue, prevValue, childNode, isPrim, isRoot, level, forceNotify) {
+function updateNodesAndNotify(node, newValue, prevValue, childNode, parentValue, isPrim, isRoot, level, forceNotify) {
   if (!childNode)
     childNode = node;
   beginBatch();
@@ -1713,15 +1737,29 @@ function updateNodesAndNotify(node, newValue, prevValue, childNode, isPrim, isRo
   }
   let hasADiff = forceNotify || isPrim;
   let whenOptimizedOnlyIf = false;
+  let valueAsArr;
+  let valueAsMap;
   if (!isPrim || prevValue && !isPrimitive(prevValue)) {
     if ((process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") && typeof __devUpdateNodes !== "undefined") {
       __devUpdateNodes.clear();
     }
     hasADiff = hasADiff || updateNodes(childNode, newValue, prevValue);
     if (isArray(newValue)) {
-      whenOptimizedOnlyIf = (newValue == null ? void 0 : newValue.length) !== (prevValue == null ? void 0 : prevValue.length);
+      valueAsArr = newValue;
+    } else if (isMap(newValue) || isSet(newValue)) {
+      valueAsMap = newValue;
     }
   }
+  if (isArray(parentValue)) {
+    valueAsArr = parentValue;
+  } else if (isMap(parentValue) || isSet(parentValue)) {
+    valueAsMap = parentValue;
+  }
+  if (valueAsArr) {
+    whenOptimizedOnlyIf = (valueAsArr == null ? void 0 : valueAsArr.length) !== (prevValue == null ? void 0 : prevValue.length);
+  } else if (valueAsMap) {
+    whenOptimizedOnlyIf = (valueAsMap == null ? void 0 : valueAsMap.size) !== (prevValue == null ? void 0 : prevValue.size);
+  }
   if (isPrim || !newValue || isEmpty(newValue) && !isEmpty(prevValue) ? newValue !== prevValue : hasADiff) {
     notify(
       isPrim && isRoot ? node : childNode,
@@ -1788,7 +1826,7 @@ function peek(node) {
 }
 var isFlushing = false;
 function peekInternal(node, activateRecursive) {
-  var _a;
+  var _a, _b;
   isFlushing = true;
   if (activateRecursive && ((_a = node.dirtyChildren) == null ? void 0 : _a.size)) {
     const dirty = Array.from(node.dirtyChildren);
@@ -1803,7 +1841,10 @@ function peekInternal(node, activateRecursive) {
   }
   isFlushing = false;
   let value = getNodeValue(node);
-  if (!globalState.isLoadingLocal) {
+  if (((_b = node.parent) == null ? void 0 : _b.isPlain) || isHintPlain(value)) {
+    node.isPlain = true;
+  }
+  if (!node.root.isLoadingLocal && !node.isPlain) {
     value = checkLazy(node, value, !!activateRecursive);
   }
   return value;
@@ -2274,7 +2315,14 @@ function syncState(obs) {
         syncCount: 0,
         resetPersistence: void 0,
         reset: () => Promise.resolve(),
-        sync: () => Promise.resolve(),
+        sync: () => {
+          var _a;
+          obs.peek();
+          if ((_a = node.state) == null ? void 0 : _a.isGetting.peek()) {
+            return when(node.state.isLoaded);
+          }
+          return Promise.resolve();
+        },
         getPendingChanges: () => ({}),
         // TODOV3 remove
         clearPersist: void 0