aoye 0.0.61 → 0.0.62

package/dist/aoye.esm.js

@@ -1,4 +1,4 @@
-import { isNatureNumStr } from 'bobe-shared';
+import { hasOwn, getPropertyDescriptorInChain, isNatureNumStr } from 'bobe-shared';
 
 let _execId = 0;
 let currentExecId = 0;
@@ -937,7 +937,8 @@ const deepSignal = (target, scope, deep = true) => {
     const meta = {
       deep,
       scope,
-      cells
+      cells,
+      backup: null
     };
     const shared = createSharedHandler(cells, scope, deep, targetIsMap);
     const specific = targetIsMap ? createMapHandler(cells, scope, deep) : createSetHandler(cells, scope);
@@ -969,7 +970,8 @@ const deepSignal = (target, scope, deep = true) => {
   const meta = {
     deep,
     scope,
-    cells
+    cells,
+    backup: null
   };
   const proxy = new Proxy(target, {
     get(obj, prop, receiver) {
@@ -979,11 +981,18 @@ const deepSignal = (target, scope, deep = true) => {
         case Keys.Meta:
           return meta;
       }
+      const hasP = Reflect.has(obj, prop) || cells.has(prop);
+      if (!hasP) {
+        const backup = findValidBackup(receiver, prop);
+        if (backup) {
+          return backup[prop];
+        }
+      }
       if (prop === Symbol.unscopables) return Reflect.get(obj, prop, receiver);
       if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
         return Reflect.get(obj, prop, receiver);
       }
-      const desc = Reflect.getOwnPropertyDescriptor(obj, prop);
+      const desc = getPropertyDescriptorInChain(obj, prop);
       const isGetter = desc && typeof desc.get === 'function';
       if (isGetter) {
         return handleGetterAsComputed(obj, prop, receiver, cells, scope);
@@ -994,7 +1003,7 @@ const deepSignal = (target, scope, deep = true) => {
         if (targetIsArray) {
           return arrayMethodReWrites[prop] || value;
         } else {
-          if (!Object.prototype.hasOwnProperty.call(obj, prop)) {
+          if (!hasOwn(obj, prop)) {
             return value;
           }
           let s = cells.get(prop);
@@ -1018,6 +1027,14 @@ const deepSignal = (target, scope, deep = true) => {
       return s.get();
     },
     set(obj, prop, value, receiver) {
+      const hasP = Reflect.has(obj, prop) || cells.has(prop);
+      if (!hasP) {
+        const backup = findValidBackup(receiver, prop);
+        if (backup) {
+          backup[prop] = value;
+          return true;
+        }
+      }
       if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
         return Reflect.set(obj, prop, value, receiver);
       }
@@ -1040,7 +1057,7 @@ const deepSignal = (target, scope, deep = true) => {
       if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
         return Reflect.deleteProperty(obj, prop);
       }
-      if (typeof obj[prop] === 'function' && !Object.prototype.hasOwnProperty.call(obj, prop)) {
+      if (typeof obj[prop] === 'function' && !hasOwn(obj, prop)) {
         return Reflect.deleteProperty(obj, prop);
       }
       cells.delete(prop);
@@ -1062,6 +1079,21 @@ const deepSignal = (target, scope, deep = true) => {
   rawToProxy.set(target, proxy);
   return proxy;
 };
+const backupSignal = (child, parent) => {
+  child[Keys.Meta].backup = parent;
+};
+const findValidBackup = (child, key) => {
+  let backup = child[Keys.Meta].backup;
+  while (backup) {
+    if (proxyHasKey(backup, key)) {
+      return backup;
+    }
+    backup = backup[Keys.Meta].backup;
+  }
+  return null;
+};
+const getProxyHasKey = (proxy, key) => proxyHasKey(proxy, key) ? proxy : findValidBackup(proxy, key);
+const proxyHasKey = (proxy, key) => Reflect.has(proxy[Keys.Raw], key) || proxy[Keys.Meta].cells.has(key);
 const shareSignal = (from, fromPath, to, toPath) => {
   try {
     const toPaths = toPath.split('.');
@@ -1352,8 +1384,8 @@ const GetMethodConf = {
   ...GetMethodConf
 }, {
   key: 'find',
-  wrapReturn: true,
-  ...GetMethodConf
+  ...GetMethodConf,
+  wrapReturn: true
 }, {
   key: 'findLast',
   ...GetMethodConf,
@@ -1604,5 +1636,5 @@ function scope(...args) {
   return run;
 }
 
-export { $, Computed, Effect, EffectStrType2Enum, IsStore, Keys, NoopEffect, ScheduleStatus, ScheduleType, Scope, Signal, Store, StoreIgnoreKeys, batchDeep, batchEnd, batchStart, clean, deepSignal, effect, effectUt, execId, execIdInc, flushMicroEffectManual, getPulling, ide, isStore, macro, micro, noopEffect, now, runWithPulling, scope, setExecId, setPulling, shareSignal, toRaw };
+export { $, Computed, Effect, EffectStrType2Enum, IsStore, Keys, NoopEffect, ScheduleStatus, ScheduleType, Scope, Signal, Store, StoreIgnoreKeys, backupSignal, batchDeep, batchEnd, batchStart, clean, deepSignal, effect, effectUt, execId, execIdInc, findValidBackup, flushMicroEffectManual, getProxyHasKey, getPulling, ide, isStore, macro, micro, noopEffect, now, proxyHasKey, runWithPulling, scope, setExecId, setPulling, shareSignal, toRaw };
 //# sourceMappingURL=aoye.esm.js.map