r-state-tree 0.6.2 → 0.6.3

package/dist/observables/object.d.ts

@@ -7,7 +7,7 @@ export declare class ObjectAdministration<T extends object> extends Administrati
     hasMap: AtomMap<PropertyKey>;
     valuesMap: SignalMap<PropertyKey>;
     computedMap: Map<PropertyKey, ComputedNode<T[keyof T]>>;
-    types: Map<PropertyKey, PropertyType>;
+    types: Map<PropertyKey, PropertyType | null>;
     isWriting: boolean;
     static proxyTraps: ProxyHandler<object>;
     constructor(source?: T);

package/dist/r-state-tree.cjs

@@ -66,13 +66,13 @@ function isPropertyKey(val) {
   return typeof val === "string" || typeof val === "number" || typeof val === "symbol";
 }
 function getPropertyType(key, obj) {
-  const ctor = obj.constructor;
-  const hasMetadata = ctor != null && ctor[Symbol.metadata] !== void 0;
+  const plain = isPlainObject(obj);
   const descriptor = getPropertyDescriptor$1(obj, key);
   if (descriptor?.value && typeof descriptor.value === "function") {
     return "action";
   }
-  if (!hasMetadata) {
+  const isAccessor = descriptor && (typeof descriptor.get === "function" || typeof descriptor.set === "function");
+  if (plain) {
     return "observable";
   }
   const metadata = obj.constructor[Symbol.metadata];
@@ -89,6 +89,9 @@ function getPropertyType(key, obj) {
         return "observable";
     }
   }
+  if (isAccessor) {
+    return null;
+  }
   return "observable";
 }
 function getPropertyDescriptor$1(obj, key) {
@@ -329,7 +332,7 @@ class ObjectAdministration extends Administration {
   }
   getType(key) {
     let type = this.types.get(key);
-    if (type === void 0) {
+    if (type === void 0 && !this.types.has(key)) {
       type = getPropertyType(key, this.source);
       this.types.set(key, type);
     }
@@ -347,6 +350,9 @@ class ObjectAdministration extends Administration {
     if (type === "computed") {
       return resolveNode(this.getComputed(key));
     }
+    if (type === null) {
+      return void 0;
+    }
     return resolveNode(this.valuesMap.getOrCreate(key, this.source[key]));
   }
   read(key, receiver = this.proxy) {
@@ -358,15 +364,16 @@ class ObjectAdministration extends Administration {
       this.atom.reportObserved();
       return Reflect.get(this.source, key, receiver);
     }
-    if (key in this.source) {
-      this.valuesMap.reportObserved(key, this.source[key]);
+    if (type === null) {
+      return Reflect.get(this.source, key, receiver);
     }
     this.atom.reportObserved();
     if (this.atom.observing) {
       this.hasMap.reportObserved(key);
     }
+    const value = Reflect.get(this.source, key, receiver);
+    this.valuesMap.reportObserved(key, value);
     if (type === "observable") {
-      const value = Reflect.get(this.source, key, receiver);
       const shouldWrap = this.explicitObservables.has(key) || isObservable(value);
       if (shouldWrap && value && typeof value === "object" && !Object.isFrozen(value)) {
         const desc = getPropertyDescriptor$1(this.source, key);
@@ -380,13 +387,14 @@ class ObjectAdministration extends Administration {
       }
       return value;
     }
-    return getAction(
-      Reflect.get(this.source, key, receiver)
-    );
+    return getAction(value);
   }
   explicitObservables = /* @__PURE__ */ new Set();
   write(key, newValue) {
     const type = this.getType(key);
+    if (type === null) {
+      return Reflect.set(this.source, key, newValue, this.proxy);
+    }
     if (type === "computed") {
       return signalsCore.batch(() => this.set(key, newValue));
     }

package/dist/r-state-tree.js

@@ -65,13 +65,13 @@ function isPropertyKey(val) {
   return typeof val === "string" || typeof val === "number" || typeof val === "symbol";
 }
 function getPropertyType(key, obj) {
-  const ctor = obj.constructor;
-  const hasMetadata = ctor != null && ctor[Symbol.metadata] !== void 0;
+  const plain = isPlainObject(obj);
   const descriptor = getPropertyDescriptor$1(obj, key);
   if (descriptor?.value && typeof descriptor.value === "function") {
     return "action";
   }
-  if (!hasMetadata) {
+  const isAccessor = descriptor && (typeof descriptor.get === "function" || typeof descriptor.set === "function");
+  if (plain) {
     return "observable";
   }
   const metadata = obj.constructor[Symbol.metadata];
@@ -88,6 +88,9 @@ function getPropertyType(key, obj) {
         return "observable";
     }
   }
+  if (isAccessor) {
+    return null;
+  }
   return "observable";
 }
 function getPropertyDescriptor$1(obj, key) {
@@ -328,7 +331,7 @@ class ObjectAdministration extends Administration {
   }
   getType(key) {
     let type = this.types.get(key);
-    if (type === void 0) {
+    if (type === void 0 && !this.types.has(key)) {
       type = getPropertyType(key, this.source);
       this.types.set(key, type);
     }
@@ -346,6 +349,9 @@ class ObjectAdministration extends Administration {
     if (type === "computed") {
       return resolveNode(this.getComputed(key));
     }
+    if (type === null) {
+      return void 0;
+    }
     return resolveNode(this.valuesMap.getOrCreate(key, this.source[key]));
   }
   read(key, receiver = this.proxy) {
@@ -357,15 +363,16 @@ class ObjectAdministration extends Administration {
       this.atom.reportObserved();
       return Reflect.get(this.source, key, receiver);
     }
-    if (key in this.source) {
-      this.valuesMap.reportObserved(key, this.source[key]);
+    if (type === null) {
+      return Reflect.get(this.source, key, receiver);
     }
     this.atom.reportObserved();
     if (this.atom.observing) {
       this.hasMap.reportObserved(key);
     }
+    const value = Reflect.get(this.source, key, receiver);
+    this.valuesMap.reportObserved(key, value);
     if (type === "observable") {
-      const value = Reflect.get(this.source, key, receiver);
       const shouldWrap = this.explicitObservables.has(key) || isObservable(value);
       if (shouldWrap && value && typeof value === "object" && !Object.isFrozen(value)) {
         const desc = getPropertyDescriptor$1(this.source, key);
@@ -379,13 +386,14 @@ class ObjectAdministration extends Administration {
       }
       return value;
     }
-    return getAction(
-      Reflect.get(this.source, key, receiver)
-    );
+    return getAction(value);
   }
   explicitObservables = /* @__PURE__ */ new Set();
   write(key, newValue) {
     const type = this.getType(key);
+    if (type === null) {
+      return Reflect.set(this.source, key, newValue, this.proxy);
+    }
     if (type === "computed") {
       return batch(() => this.set(key, newValue));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "r-state-tree",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "reactive state management library",
   "main": "dist/r-state-tree.cjs",
   "module": "dist/r-state-tree.js",