aoye 0.0.56 → 0.0.57

package/dist/aoye.cjs.js

@@ -985,7 +985,17 @@ const deepSignal = (target, scope, deep = true) => {
         if (targetIsArray) {
           return arrayMethodReWrites[prop] || value;
         } else {
-          return value;
+          if (!Object.prototype.hasOwnProperty.call(obj, prop)) {
+            return value;
+          }
+          let s = cells.get(prop);
+          if (s) {
+            return s.get();
+          }
+          s = new Signal(value);
+          s.scope = scope;
+          cells.set(prop, s);
+          return s.get();
         }
       }
       let s = cells.get(prop);
@@ -999,7 +1009,7 @@ const deepSignal = (target, scope, deep = true) => {
       return s.get();
     },
     set(obj, prop, value, receiver) {
-      if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop) || typeof value === 'function') {
+      if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
         return Reflect.set(obj, prop, value, receiver);
       }
       const isNewKey = !Reflect.has(obj, prop);
@@ -1007,7 +1017,7 @@ const deepSignal = (target, scope, deep = true) => {
       const success = Reflect.set(obj, prop, value, receiver);
       const cell = cells.get(prop);
       if (cell) {
-        cell.set(deep ? deepSignal(value, scope) : value);
+        cell.set(typeof value === 'function' || !deep ? value : deepSignal(value, scope));
       }
       if (targetIsArray) {
         handleArraySet(obj, prop, value, receiver);
@@ -1018,7 +1028,10 @@ const deepSignal = (target, scope, deep = true) => {
       return success;
     },
     deleteProperty(obj, prop) {
-      if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop) || typeof obj[prop] === 'function') {
+      if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
+        return Reflect.deleteProperty(obj, prop);
+      }
+      if (typeof obj[prop] === 'function' && !Object.prototype.hasOwnProperty.call(obj, prop)) {
         return Reflect.deleteProperty(obj, prop);
       }
       cells.delete(prop);
@@ -1463,6 +1476,7 @@ class Store {
     this.parent = null;
   }
 }
+const isStore = s => typeof s === 'function' && s[IsStore];
 
 function $(data) {
   if (typeof data === 'object' && data !== null) {
@@ -1605,6 +1619,7 @@ exports.execIdInc = execIdInc;
 exports.flushMicroEffectManual = flushMicroEffectManual;
 exports.getPulling = getPulling;
 exports.ide = ide;
+exports.isStore = isStore;
 exports.macro = macro;
 exports.micro = micro;
 exports.noopEffect = noopEffect;