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

package/config.d.mts

@@ -1,4 +1,4 @@
-import { N as NodeInfo } from './observableInterfaces-CZR3_8mM.mjs';
+import { N as NodeInfo } from './observableInterfaces-CgBddSU6.mjs';
 
 declare function configureLegendState({ observableFunctions, observableProperties, jsonReplacer, jsonReviver, }: {
     observableFunctions?: Record<string, (node: NodeInfo, ...args: any[]) => any>;

package/config.d.ts

@@ -1,4 +1,4 @@
-import { N as NodeInfo } from './observableInterfaces-CZR3_8mM.js';
+import { N as NodeInfo } from './observableInterfaces-CgBddSU6.js';
 
 declare function configureLegendState({ observableFunctions, observableProperties, jsonReplacer, jsonReviver, }: {
     observableFunctions?: Record<string, (node: NodeInfo, ...args: any[]) => any>;

package/config.js

@@ -61,15 +61,19 @@ var symbolIterator = Symbol.iterator;
 var symbolGetNode = Symbol("getNode");
 var symbolDelete = /* @__PURE__ */ Symbol("delete");
 var symbolOpaque = Symbol("opaque");
+var symbolPlain = Symbol("plain");
 var optimized = Symbol("optimized");
 var symbolLinked = Symbol("linked");
 var globalState = {
   pendingNodes: /* @__PURE__ */ new Map(),
   dirtyNodes: /* @__PURE__ */ new Set()
 };
-function isOpaqueObject(value) {
+function isHintOpaque(value) {
   return value && (value[symbolOpaque] || value["$$typeof"]);
 }
+function isHintPlain(value) {
+  return value && value[symbolPlain];
+}
 function getPathType(value) {
   return isArray(value) ? "array" : isMap(value) ? "map" : value instanceof Set ? "set" : "object";
 }
@@ -255,12 +259,14 @@ function setAtPath(obj, path, pathTypes, value, mode, fullObj, restore) {
   if (path.length > 0) {
     for (let i = 0; i < path.length; i++) {
       p = path[i];
-      if (o[p] === symbolDelete) {
+      const map = isMap(o);
+      let child = o ? map ? o.get(p) : o[p] : void 0;
+      if (child === symbolDelete) {
         return obj;
-      } else if (o[p] === void 0 && value === void 0 && i === path.length - 1) {
+      } else if (child === void 0 && value === void 0 && i === path.length - 1) {
         return obj;
-      } else if (i < path.length - 1 && (o[p] === void 0 || o[p] === null)) {
-        const child = initializePathType(pathTypes[i]);
+      } else if (i < path.length - 1 && (child === void 0 || child === null)) {
+        child = initializePathType(pathTypes[i]);
         if (isMap(o)) {
           o.set(p, child);
         } else {
@@ -268,7 +274,7 @@ function setAtPath(obj, path, pathTypes, value, mode, fullObj, restore) {
         }
       }
       if (i < path.length - 1) {
-        o = isMap(o) ? o.get(p) : o[p];
+        o = child;
       }
     }
   }
@@ -997,7 +1003,7 @@ function updateNodes(parent, obj, prevValue) {
     }
     __devUpdateNodes.add(obj);
   }
-  if (isObject(obj) && isOpaqueObject(obj) || isObject(prevValue) && isOpaqueObject(prevValue)) {
+  if (isObject(obj) && isHintOpaque(obj) || isObject(prevValue) && isHintOpaque(prevValue)) {
     const isDiff = obj !== prevValue;
     if (isDiff) {
       if (parent.listeners || parent.listenersImmediate) {
@@ -1233,7 +1239,7 @@ var proxyHandler = {
       return property.get(node);
     }
     let vProp = value == null ? void 0 : value[p];
-    if (isObject(value) && isOpaqueObject(value)) {
+    if (isObject(value) && isHintOpaque(value)) {
       return vProp;
     }
     const fnOrComputed = (_a = node.functions) == null ? void 0 : _a.get(p);
@@ -1934,14 +1940,14 @@ function setToObservable(node, value) {
   return value;
 }
 function recursivelyAutoActivate(obj, node) {
-  if (!node.recursivelyAutoActivated && (isObject(obj) || isArray(obj)) && !isOpaqueObject(obj)) {
+  if (!node.recursivelyAutoActivated && (isObject(obj) || isArray(obj)) && !isHintOpaque(obj)) {
     node.recursivelyAutoActivated = true;
     const pathStack = [];
     const getNodeAtPath2 = () => {
       var _a;
       let childNode = node;
       for (let i = 0; i < pathStack.length; i++) {
-        const { key } = pathStack[i];
+        const key = pathStack[i];
         const value = (_a = getNodeValue(childNode)) == null ? void 0 : _a[key];
         childNode = getChildNode(childNode, key, isFunction(value) ? value : void 0);
         peekInternal(childNode);
@@ -1953,7 +1959,7 @@ function recursivelyAutoActivate(obj, node) {
 }
 function recursivelyAutoActivateInner(obj, pathStack, getNodeAtPath2) {
   var _a;
-  if ((isObject(obj) || isArray(obj)) && !isOpaqueObject(obj)) {
+  if ((isObject(obj) || isArray(obj)) && !isHintOpaque(obj) && !isHintPlain(obj)) {
     for (const key in obj) {
       if (hasOwnProperty.call(obj, key)) {
         const value = obj[key];
@@ -1972,7 +1978,7 @@ function recursivelyAutoActivateInner(obj, pathStack, getNodeAtPath2) {
           }
         }
         if (typeof value === "object") {
-          pathStack.push({ key, value });
+          pathStack.push(key);
           recursivelyAutoActivateInner(value, pathStack, getNodeAtPath2);
           pathStack.pop();
         }

package/config.mjs

@@ -59,15 +59,19 @@ var symbolIterator = Symbol.iterator;
 var symbolGetNode = Symbol("getNode");
 var symbolDelete = /* @__PURE__ */ Symbol("delete");
 var symbolOpaque = Symbol("opaque");
+var symbolPlain = Symbol("plain");
 var optimized = Symbol("optimized");
 var symbolLinked = Symbol("linked");
 var globalState = {
   pendingNodes: /* @__PURE__ */ new Map(),
   dirtyNodes: /* @__PURE__ */ new Set()
 };
-function isOpaqueObject(value) {
+function isHintOpaque(value) {
   return value && (value[symbolOpaque] || value["$$typeof"]);
 }
+function isHintPlain(value) {
+  return value && value[symbolPlain];
+}
 function getPathType(value) {
   return isArray(value) ? "array" : isMap(value) ? "map" : value instanceof Set ? "set" : "object";
 }
@@ -253,12 +257,14 @@ function setAtPath(obj, path, pathTypes, value, mode, fullObj, restore) {
   if (path.length > 0) {
     for (let i = 0; i < path.length; i++) {
       p = path[i];
-      if (o[p] === symbolDelete) {
+      const map = isMap(o);
+      let child = o ? map ? o.get(p) : o[p] : void 0;
+      if (child === symbolDelete) {
         return obj;
-      } else if (o[p] === void 0 && value === void 0 && i === path.length - 1) {
+      } else if (child === void 0 && value === void 0 && i === path.length - 1) {
         return obj;
-      } else if (i < path.length - 1 && (o[p] === void 0 || o[p] === null)) {
-        const child = initializePathType(pathTypes[i]);
+      } else if (i < path.length - 1 && (child === void 0 || child === null)) {
+        child = initializePathType(pathTypes[i]);
         if (isMap(o)) {
           o.set(p, child);
         } else {
@@ -266,7 +272,7 @@ function setAtPath(obj, path, pathTypes, value, mode, fullObj, restore) {
         }
       }
       if (i < path.length - 1) {
-        o = isMap(o) ? o.get(p) : o[p];
+        o = child;
       }
     }
   }
@@ -995,7 +1001,7 @@ function updateNodes(parent, obj, prevValue) {
     }
     __devUpdateNodes.add(obj);
   }
-  if (isObject(obj) && isOpaqueObject(obj) || isObject(prevValue) && isOpaqueObject(prevValue)) {
+  if (isObject(obj) && isHintOpaque(obj) || isObject(prevValue) && isHintOpaque(prevValue)) {
     const isDiff = obj !== prevValue;
     if (isDiff) {
       if (parent.listeners || parent.listenersImmediate) {
@@ -1231,7 +1237,7 @@ var proxyHandler = {
       return property.get(node);
     }
     let vProp = value == null ? void 0 : value[p];
-    if (isObject(value) && isOpaqueObject(value)) {
+    if (isObject(value) && isHintOpaque(value)) {
       return vProp;
     }
     const fnOrComputed = (_a = node.functions) == null ? void 0 : _a.get(p);
@@ -1932,14 +1938,14 @@ function setToObservable(node, value) {
   return value;
 }
 function recursivelyAutoActivate(obj, node) {
-  if (!node.recursivelyAutoActivated && (isObject(obj) || isArray(obj)) && !isOpaqueObject(obj)) {
+  if (!node.recursivelyAutoActivated && (isObject(obj) || isArray(obj)) && !isHintOpaque(obj)) {
     node.recursivelyAutoActivated = true;
     const pathStack = [];
     const getNodeAtPath2 = () => {
       var _a;
       let childNode = node;
       for (let i = 0; i < pathStack.length; i++) {
-        const { key } = pathStack[i];
+        const key = pathStack[i];
         const value = (_a = getNodeValue(childNode)) == null ? void 0 : _a[key];
         childNode = getChildNode(childNode, key, isFunction(value) ? value : void 0);
         peekInternal(childNode);
@@ -1951,7 +1957,7 @@ function recursivelyAutoActivate(obj, node) {
 }
 function recursivelyAutoActivateInner(obj, pathStack, getNodeAtPath2) {
   var _a;
-  if ((isObject(obj) || isArray(obj)) && !isOpaqueObject(obj)) {
+  if ((isObject(obj) || isArray(obj)) && !isHintOpaque(obj) && !isHintPlain(obj)) {
     for (const key in obj) {
       if (hasOwnProperty.call(obj, key)) {
         const value = obj[key];
@@ -1970,7 +1976,7 @@ function recursivelyAutoActivateInner(obj, pathStack, getNodeAtPath2) {
           }
         }
         if (typeof value === "object") {
-          pathStack.push({ key, value });
+          pathStack.push(key);
           recursivelyAutoActivateInner(value, pathStack, getNodeAtPath2);
           pathStack.pop();
         }

package/index.d.mts

@@ -1,5 +1,10 @@
-import { N as NodeInfo, O as Observable, T as TrackingType, G as GetOptions, C as Change, R as RecursiveValueOrFunction, a as ObservableEvent, S as Selector, b as ObserveEvent, c as ObservableParam, d as OpaqueObject, e as TypeAtPath, L as LinkedOptions, f as Linked, g as ObservablePrimitive, h as ObserveOptions, i as ObserveEventCallback, j as ObservableSyncState, k as ListenerParams, l as TrackingNode, m as clone, n as ensureNodeValue, o as findIDKey, p as getNode, q as getNodeValue, r as getPathType, U as UpdateFn, s as safeParse, t as safeStringify, u as setNodeValue, v as TrackingState } from './observableInterfaces-CZR3_8mM.mjs';
-export { A as ArrayValue, J as ChildNodeInfo, B as ClassConstructor, Q as GetMode, a1 as ImmutableObservableBase, x as ListenerFn, H as NodeListener, F as NotPrimitive, a0 as ObservableBoolean, D as ObservableListenerDispose, a2 as ObservableObject, $ as ObservableObjectFns, E as ObservableRoot, Y as ObservableState, X as ObservableSyncStateBase, z as ObservableValue, P as Primitive, y as RecordValue, _ as RemoveObservables, Z as RetryOptions, I as RootNodeInfo, K as SetParams, V as UpdateFnParams, W as WaitForSet, M as WaitForSetFnParams, w as isObservable } from './observableInterfaces-CZR3_8mM.mjs';
+import { O as OpaqueObject, P as PlainObject, N as NodeInfo, a as Observable, T as TrackingType, G as GetOptions, C as Change, R as RecursiveValueOrFunction, b as ObservableEvent, S as Selector, c as ObserveEvent, d as ObservableParam, e as TypeAtPath, L as LinkedOptions, f as Linked, g as ObservablePrimitive, h as ObserveOptions, i as ObserveEventCallback, j as ObservableSyncState, k as ListenerParams, l as TrackingNode, m as clone, n as ensureNodeValue, o as findIDKey, p as getNode, q as getNodeValue, r as getPathType, U as UpdateFn, s as safeParse, t as safeStringify, u as setNodeValue, v as TrackingState } from './observableInterfaces-CgBddSU6.mjs';
+export { A as ArrayValue, K as ChildNodeInfo, B as ClassConstructor, V as GetMode, a2 as ImmutableObservableBase, x as ListenerFn, I as NodeListener, H as NotPrimitive, a1 as ObservableBoolean, D as ObservableListenerDispose, a3 as ObservableObject, a0 as ObservableObjectFns, E as ObservableRoot, Z as ObservableState, Y as ObservableSyncStateBase, z as ObservableValue, F as Primitive, y as RecordValue, $ as RemoveObservables, _ as RetryOptions, J as RootNodeInfo, M as SetParams, X as UpdateFnParams, W as WaitForSet, Q as WaitForSetFnParams, w as isObservable } from './observableInterfaces-CgBddSU6.mjs';
+
+declare const ObservableHint: {
+    opaque: <T extends object>(value: T) => OpaqueObject<T>;
+    plain: <T extends object>(value: T) => PlainObject<T>;
+};
 
 declare function getProxy(node: NodeInfo, p?: string, asFunction?: Function): Observable;
 declare function set(node: NodeInfo, newValue?: any): void;
@@ -37,6 +42,7 @@ declare const hasOwnProperty: (v: PropertyKey) => boolean;
 declare function isArray(obj: unknown): obj is Array<any>;
 declare function isString(obj: unknown): obj is string;
 declare function isObject(obj: unknown): obj is Record<any, any>;
+declare function isPlainObject(obj: unknown): obj is Record<any, any>;
 declare function isFunction(obj: unknown): obj is Function;
 declare function isPrimitive(arg: unknown): arg is string | number | bigint | boolean | symbol;
 declare function isDate(obj: unknown): obj is Date;
@@ -44,6 +50,7 @@ declare function isSymbol(obj: unknown): obj is symbol;
 declare function isBoolean(obj: unknown): obj is boolean;
 declare function isPromise<T>(obj: unknown): obj is Promise<T>;
 declare function isMap(obj: unknown): obj is Map<any, any>;
+declare function isSet(obj: unknown): obj is Set<any>;
 declare function isNumber(obj: unknown): obj is number;
 declare function isEmpty(obj: object): boolean;
 declare function isNullOrUndefined(value: any): value is undefined | null;
@@ -124,4 +131,4 @@ declare const internal: {
     };
 };
 
-export { Change, GetOptions, Linked, LinkedOptions, ListenerParams, NodeInfo, Observable, ObservableEvent, ObservableParam, ObservablePrimitive, ObservableSyncState, ObserveEvent, ObserveEventCallback, ObserveOptions, OpaqueObject, RecursiveValueOrFunction, Selector, TrackingNode, TrackingState, TrackingType, TypeAtPath, UpdateFn, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, isObservableValueReady, isObserved, isPrimitive, isPromise, isString, isSymbol, linked, mergeIntoObservable, observable, observablePrimitive, observe, opaqueObject, proxy, setAtPath, setSilently, shouldIgnoreUnobserved, syncState, trackSelector, when, whenReady };
+export { Change, GetOptions, Linked, LinkedOptions, ListenerParams, NodeInfo, Observable, ObservableEvent, ObservableHint, ObservableParam, ObservablePrimitive, ObservableSyncState, ObserveEvent, ObserveEventCallback, ObserveOptions, OpaqueObject, PlainObject, RecursiveValueOrFunction, Selector, TrackingNode, TrackingState, TrackingType, TypeAtPath, UpdateFn, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, 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

@@ -1,5 +1,10 @@
-import { N as NodeInfo, O as Observable, T as TrackingType, G as GetOptions, C as Change, R as RecursiveValueOrFunction, a as ObservableEvent, S as Selector, b as ObserveEvent, c as ObservableParam, d as OpaqueObject, e as TypeAtPath, L as LinkedOptions, f as Linked, g as ObservablePrimitive, h as ObserveOptions, i as ObserveEventCallback, j as ObservableSyncState, k as ListenerParams, l as TrackingNode, m as clone, n as ensureNodeValue, o as findIDKey, p as getNode, q as getNodeValue, r as getPathType, U as UpdateFn, s as safeParse, t as safeStringify, u as setNodeValue, v as TrackingState } from './observableInterfaces-CZR3_8mM.js';
-export { A as ArrayValue, J as ChildNodeInfo, B as ClassConstructor, Q as GetMode, a1 as ImmutableObservableBase, x as ListenerFn, H as NodeListener, F as NotPrimitive, a0 as ObservableBoolean, D as ObservableListenerDispose, a2 as ObservableObject, $ as ObservableObjectFns, E as ObservableRoot, Y as ObservableState, X as ObservableSyncStateBase, z as ObservableValue, P as Primitive, y as RecordValue, _ as RemoveObservables, Z as RetryOptions, I as RootNodeInfo, K as SetParams, V as UpdateFnParams, W as WaitForSet, M as WaitForSetFnParams, w as isObservable } from './observableInterfaces-CZR3_8mM.js';
+import { O as OpaqueObject, P as PlainObject, N as NodeInfo, a as Observable, T as TrackingType, G as GetOptions, C as Change, R as RecursiveValueOrFunction, b as ObservableEvent, S as Selector, c as ObserveEvent, d as ObservableParam, e as TypeAtPath, L as LinkedOptions, f as Linked, g as ObservablePrimitive, h as ObserveOptions, i as ObserveEventCallback, j as ObservableSyncState, k as ListenerParams, l as TrackingNode, m as clone, n as ensureNodeValue, o as findIDKey, p as getNode, q as getNodeValue, r as getPathType, U as UpdateFn, s as safeParse, t as safeStringify, u as setNodeValue, v as TrackingState } from './observableInterfaces-CgBddSU6.js';
+export { A as ArrayValue, K as ChildNodeInfo, B as ClassConstructor, V as GetMode, a2 as ImmutableObservableBase, x as ListenerFn, I as NodeListener, H as NotPrimitive, a1 as ObservableBoolean, D as ObservableListenerDispose, a3 as ObservableObject, a0 as ObservableObjectFns, E as ObservableRoot, Z as ObservableState, Y as ObservableSyncStateBase, z as ObservableValue, F as Primitive, y as RecordValue, $ as RemoveObservables, _ as RetryOptions, J as RootNodeInfo, M as SetParams, X as UpdateFnParams, W as WaitForSet, Q as WaitForSetFnParams, w as isObservable } from './observableInterfaces-CgBddSU6.js';
+
+declare const ObservableHint: {
+    opaque: <T extends object>(value: T) => OpaqueObject<T>;
+    plain: <T extends object>(value: T) => PlainObject<T>;
+};
 
 declare function getProxy(node: NodeInfo, p?: string, asFunction?: Function): Observable;
 declare function set(node: NodeInfo, newValue?: any): void;
@@ -37,6 +42,7 @@ declare const hasOwnProperty: (v: PropertyKey) => boolean;
 declare function isArray(obj: unknown): obj is Array<any>;
 declare function isString(obj: unknown): obj is string;
 declare function isObject(obj: unknown): obj is Record<any, any>;
+declare function isPlainObject(obj: unknown): obj is Record<any, any>;
 declare function isFunction(obj: unknown): obj is Function;
 declare function isPrimitive(arg: unknown): arg is string | number | bigint | boolean | symbol;
 declare function isDate(obj: unknown): obj is Date;
@@ -44,6 +50,7 @@ declare function isSymbol(obj: unknown): obj is symbol;
 declare function isBoolean(obj: unknown): obj is boolean;
 declare function isPromise<T>(obj: unknown): obj is Promise<T>;
 declare function isMap(obj: unknown): obj is Map<any, any>;
+declare function isSet(obj: unknown): obj is Set<any>;
 declare function isNumber(obj: unknown): obj is number;
 declare function isEmpty(obj: object): boolean;
 declare function isNullOrUndefined(value: any): value is undefined | null;
@@ -124,4 +131,4 @@ declare const internal: {
     };
 };
 
-export { Change, GetOptions, Linked, LinkedOptions, ListenerParams, NodeInfo, Observable, ObservableEvent, ObservableParam, ObservablePrimitive, ObservableSyncState, ObserveEvent, ObserveEventCallback, ObserveOptions, OpaqueObject, RecursiveValueOrFunction, Selector, TrackingNode, TrackingState, TrackingType, TypeAtPath, UpdateFn, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, isObservableValueReady, isObserved, isPrimitive, isPromise, isString, isSymbol, linked, mergeIntoObservable, observable, observablePrimitive, observe, opaqueObject, proxy, setAtPath, setSilently, shouldIgnoreUnobserved, syncState, trackSelector, when, whenReady };
+export { Change, GetOptions, Linked, LinkedOptions, ListenerParams, NodeInfo, Observable, ObservableEvent, ObservableHint, ObservableParam, ObservablePrimitive, ObservableSyncState, ObserveEvent, ObserveEventCallback, ObserveOptions, OpaqueObject, PlainObject, RecursiveValueOrFunction, Selector, TrackingNode, TrackingState, TrackingType, TypeAtPath, UpdateFn, applyChange, applyChanges, batch, beginBatch, computeSelector, computed, constructObjectWithPath, deconstructObjectWithPath, endBatch, event, getObservableIndex, hasOwnProperty, internal, isArray, isBoolean, isDate, isEmpty, isFunction, isMap, isNullOrUndefined, isNumber, isObject, 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

@@ -11,6 +11,9 @@ function isString(obj) {
 function isObject(obj) {
   return !!obj && typeof obj === "object" && !(obj instanceof Date) && !isArray(obj);
 }
+function isPlainObject(obj) {
+  return isObject(obj) && obj.constructor === Object;
+}
 function isFunction(obj) {
   return typeof obj === "function";
 }
@@ -71,15 +74,19 @@ var symbolIterator = Symbol.iterator;
 var symbolGetNode = Symbol("getNode");
 var symbolDelete = /* @__PURE__ */ Symbol("delete");
 var symbolOpaque = Symbol("opaque");
+var symbolPlain = Symbol("plain");
 var optimized = Symbol("optimized");
 var symbolLinked = Symbol("linked");
 var globalState = {
   pendingNodes: /* @__PURE__ */ new Map(),
   dirtyNodes: /* @__PURE__ */ new Set()
 };
-function isOpaqueObject(value) {
+function isHintOpaque(value) {
   return value && (value[symbolOpaque] || value["$$typeof"]);
 }
+function isHintPlain(value) {
+  return value && value[symbolPlain];
+}
 function getPathType(value) {
   return isArray(value) ? "array" : isMap(value) ? "map" : value instanceof Set ? "set" : "object";
 }
@@ -251,6 +258,27 @@ function equals(a, b) {
   return a === b || isDate(a) && isDate(b) && +a === +b;
 }
 
+// src/ObservableHint.ts
+function addSymbol(value, symbol) {
+  if (value) {
+    Object.defineProperty(value, symbol, {
+      value: true,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    });
+  }
+  return value;
+}
+var ObservableHint = {
+  opaque: function opaqueObject(value) {
+    return addSymbol(value, symbolOpaque);
+  },
+  plain: function plainObject(value) {
+    return addSymbol(value, symbolPlain);
+  }
+};
+
 // src/helpers.ts
 function computeSelector(selector, e, retainObservable) {
   let c = selector;
@@ -264,7 +292,10 @@ function getObservableIndex(value$) {
   const n = +node.key;
   return isNumber(n) ? n : -1;
 }
-function opaqueObject(value) {
+function opaqueObject2(value) {
+  if (process.env.NODE_ENV === "development") {
+    console.warn("[legend-state]: In version 3.0 opaqueObject is moved to ObservableHint.opaque");
+  }
   if (value) {
     value[symbolOpaque] = true;
   }
@@ -281,16 +312,23 @@ function setAtPath(obj, path, pathTypes, value, mode, fullObj, restore) {
     let oFull = fullObj;
     for (let i = 0; i < path.length; i++) {
       p = path[i];
-      if (o[p] === symbolDelete) {
+      const map = isMap(o);
+      let child = o ? map ? o.get(p) : o[p] : void 0;
+      const fullChild = oFull ? map ? oFull.get(p) : oFull[p] : void 0;
+      if (child === symbolDelete) {
         if (oFull) {
-          o[p] = oFull[p];
-          restore == null ? void 0 : restore(path.slice(0, i + 1), o[p]);
+          if (map) {
+            o.set(p, fullChild);
+          } else {
+            o[p] = fullChild;
+          }
+          restore == null ? void 0 : restore(path.slice(0, i + 1), fullChild);
         }
         return obj;
-      } else if (o[p] === void 0 && value === void 0 && i === path.length - 1) {
+      } else if (child === void 0 && value === void 0 && i === path.length - 1) {
         return obj;
-      } else if (i < path.length - 1 && (o[p] === void 0 || o[p] === null)) {
-        const child = initializePathType(pathTypes[i]);
+      } else if (i < path.length - 1 && (child === void 0 || child === null)) {
+        child = initializePathType(pathTypes[i]);
         if (isMap(o)) {
           o.set(p, child);
         } else {
@@ -298,9 +336,9 @@ function setAtPath(obj, path, pathTypes, value, mode, fullObj, restore) {
         }
       }
       if (i < path.length - 1) {
-        o = isMap(o) ? o.get(p) : o[p];
+        o = child;
         if (oFull) {
-          oFull = oFull[p];
+          oFull = fullChild;
         }
       }
     }
@@ -330,18 +368,12 @@ function mergeIntoObservable(target, ...sources) {
   }
   beginBatch();
   for (let i = 0; i < sources.length; i++) {
-    _mergeIntoObservable(
-      target,
-      sources[i],
-      /*assign*/
-      i < sources.length - 1,
-      0
-    );
+    _mergeIntoObservable(target, sources[i], 0);
   }
   endBatch();
   return target;
 }
-function _mergeIntoObservable(target, source, assign2, levelsDeep) {
+function _mergeIntoObservable(target, source, levelsDeep) {
   if (isObservable(source)) {
     source = source.peek();
   }
@@ -367,7 +399,7 @@ function _mergeIntoObservable(target, source, assign2, levelsDeep) {
           if (levelsDeep > 0 && isEmpty(sourceValue)) {
             targetChild.set(sourceValue);
           }
-          _mergeIntoObservable(targetChild, sourceValue, false, levelsDeep + 1);
+          _mergeIntoObservable(targetChild, sourceValue, levelsDeep + 1);
         } else {
           targetChild.set(sourceValue);
         }
@@ -437,7 +469,7 @@ function deepMerge(target, ...sources) {
   let result = isArray(target) ? [...target] : { ...target };
   for (let i = 0; i < sources.length; i++) {
     const obj2 = sources[i];
-    if (isObject(obj2) || isArray(obj2)) {
+    if (isPlainObject(obj2) || isArray(obj2)) {
       const objTarget = obj2;
       for (const key in objTarget) {
         if (hasOwnProperty.call(objTarget, key)) {
@@ -1153,7 +1185,7 @@ function updateNodes(parent, obj, prevValue) {
     }
     __devUpdateNodes.add(obj);
   }
-  if (isObject(obj) && isOpaqueObject(obj) || isObject(prevValue) && isOpaqueObject(prevValue)) {
+  if (isObject(obj) && isHintOpaque(obj) || isObject(prevValue) && isHintOpaque(prevValue)) {
     const isDiff = obj !== prevValue;
     if (isDiff) {
       if (parent.listeners || parent.listenersImmediate) {
@@ -1389,7 +1421,7 @@ var proxyHandler = {
       return property.get(node);
     }
     let vProp = value == null ? void 0 : value[p];
-    if (isObject(value) && isOpaqueObject(value)) {
+    if (isObject(value) && isHintOpaque(value)) {
       return vProp;
     }
     const fnOrComputed = (_a = node.functions) == null ? void 0 : _a.get(p);
@@ -2090,14 +2122,14 @@ function setToObservable(node, value) {
   return value;
 }
 function recursivelyAutoActivate(obj, node) {
-  if (!node.recursivelyAutoActivated && (isObject(obj) || isArray(obj)) && !isOpaqueObject(obj)) {
+  if (!node.recursivelyAutoActivated && (isObject(obj) || isArray(obj)) && !isHintOpaque(obj)) {
     node.recursivelyAutoActivated = true;
     const pathStack = [];
     const getNodeAtPath2 = () => {
       var _a;
       let childNode = node;
       for (let i = 0; i < pathStack.length; i++) {
-        const { key } = pathStack[i];
+        const key = pathStack[i];
         const value = (_a = getNodeValue(childNode)) == null ? void 0 : _a[key];
         childNode = getChildNode(childNode, key, isFunction(value) ? value : void 0);
         peekInternal(childNode);
@@ -2109,7 +2141,7 @@ function recursivelyAutoActivate(obj, node) {
 }
 function recursivelyAutoActivateInner(obj, pathStack, getNodeAtPath2) {
   var _a;
-  if ((isObject(obj) || isArray(obj)) && !isOpaqueObject(obj)) {
+  if ((isObject(obj) || isArray(obj)) && !isHintOpaque(obj) && !isHintPlain(obj)) {
     for (const key in obj) {
       if (hasOwnProperty.call(obj, key)) {
         const value = obj[key];
@@ -2128,7 +2160,7 @@ function recursivelyAutoActivateInner(obj, pathStack, getNodeAtPath2) {
           }
         }
         if (typeof value === "object") {
-          pathStack.push({ key, value });
+          pathStack.push(key);
           recursivelyAutoActivateInner(value, pathStack, getNodeAtPath2);
           pathStack.pop();
         }
@@ -2229,21 +2261,23 @@ function proxy(get2, set2) {
 function syncState(obs) {
   const node = getNode(obs);
   if (!node.state) {
-    node.state = observable({
-      isPersistLoaded: false,
-      isLoaded: false,
-      isPersistEnabled: true,
-      isSyncEnabled: true,
-      isGetting: false,
-      isSetting: false,
-      numPendingGets: 0,
-      numPendingSets: 0,
-      syncCount: 0,
-      clearPersist: void 0,
-      reset: () => Promise.resolve(),
-      sync: () => Promise.resolve(),
-      getPendingChanges: () => ({})
-    });
+    node.state = observable(
+      ObservableHint.plain({
+        isPersistLoaded: false,
+        isLoaded: false,
+        isPersistEnabled: true,
+        isSyncEnabled: true,
+        isGetting: false,
+        isSetting: false,
+        numPendingGets: 0,
+        numPendingSets: 0,
+        syncCount: 0,
+        clearPersist: void 0,
+        reset: () => Promise.resolve(),
+        sync: () => Promise.resolve(),
+        getPendingChanges: () => ({})
+      })
+    );
   }
   return node.state;
 }
@@ -2276,6 +2310,7 @@ var internal = {
   tracking
 };
 
+exports.ObservableHint = ObservableHint;
 exports.ObservablePrimitiveClass = ObservablePrimitiveClass;
 exports.applyChange = applyChange;
 exports.applyChanges = applyChanges;
@@ -2307,8 +2342,10 @@ exports.isObject = isObject;
 exports.isObservable = isObservable;
 exports.isObservableValueReady = isObservableValueReady;
 exports.isObserved = isObserved;
+exports.isPlainObject = isPlainObject;
 exports.isPrimitive = isPrimitive;
 exports.isPromise = isPromise;
+exports.isSet = isSet;
 exports.isString = isString;
 exports.isSymbol = isSymbol;
 exports.linked = linked;
@@ -2316,7 +2353,7 @@ exports.mergeIntoObservable = mergeIntoObservable;
 exports.observable = observable;
 exports.observablePrimitive = observablePrimitive;
 exports.observe = observe;
-exports.opaqueObject = opaqueObject;
+exports.opaqueObject = opaqueObject2;
 exports.optimized = optimized;
 exports.proxy = proxy;
 exports.setAtPath = setAtPath;