aoye 0.0.60 → 0.0.62

package/dist/index.d.ts

@@ -230,6 +230,10 @@ declare const micro: (cb: () => any) => void;
 declare const toRaw: <T>(a: T) => any;
 
 declare const deepSignal: <T>(target: T, scope: Scope, deep?: boolean) => any;
+declare const backupSignal: (child: any, parent: any) => void;
+declare const findValidBackup: (child: any, key: any) => any;
+declare const getProxyHasKey: (proxy: any, key: any) => any;
+declare const proxyHasKey: (proxy: any, key: any) => any;
 /**
  * 将 from 响应式对象中 fromKey 对应的 Signal
  * 共享给 to 响应式对象的 toKey
@@ -246,5 +250,5 @@ declare function effectUt(callback: (...args: ValueDiff[]) => void, depOrOpt?: a
 declare function effect(callback: (...args: ValueDiff[]) => void, depOrOpt?: any[] | CustomEffectOpt, opt?: CustomEffectOpt): Effect;
 declare function scope(...args: any[]): any;
 
-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 };
 export type { CreateScope, CreateTaskProps, CustomEffectOpt, DeepOmitPath, DeepPath, DeepValue, Dispose, Key, Link, MatchValue, Mix, OnClean, OutLink, PRecord, ScheduleTypeStr, SideEffect, SignalNode, SignalType, Task, TaskControlReturn, ValueDiff };

package/dist/index.umd.js

@@ -941,7 +941,8 @@
       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);
@@ -973,7 +974,8 @@
     const meta = {
       deep,
       scope,
-      cells
+      cells,
+      backup: null
     };
     const proxy = new Proxy(target, {
       get(obj, prop, receiver) {
@@ -983,11 +985,18 @@
           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 = bobeShared.getPropertyDescriptorInChain(obj, prop);
         const isGetter = desc && typeof desc.get === 'function';
         if (isGetter) {
           return handleGetterAsComputed(obj, prop, receiver, cells, scope);
@@ -998,7 +1007,7 @@
           if (targetIsArray) {
             return arrayMethodReWrites[prop] || value;
           } else {
-            if (!Object.prototype.hasOwnProperty.call(obj, prop)) {
+            if (!bobeShared.hasOwn(obj, prop)) {
               return value;
             }
             let s = cells.get(prop);
@@ -1022,6 +1031,14 @@
         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);
         }
@@ -1044,7 +1061,7 @@
         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' && !bobeShared.hasOwn(obj, prop)) {
           return Reflect.deleteProperty(obj, prop);
         }
         cells.delete(prop);
@@ -1066,6 +1083,21 @@
     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('.');
@@ -1356,8 +1388,8 @@
     ...GetMethodConf
   }, {
     key: 'find',
-    wrapReturn: true,
-    ...GetMethodConf
+    ...GetMethodConf,
+    wrapReturn: true
   }, {
     key: 'findLast',
     ...GetMethodConf,
@@ -1621,6 +1653,7 @@
   exports.Signal = Signal;
   exports.Store = Store;
   exports.StoreIgnoreKeys = StoreIgnoreKeys;
+  exports.backupSignal = backupSignal;
   exports.batchDeep = batchDeep;
   exports.batchEnd = batchEnd;
   exports.batchStart = batchStart;
@@ -1630,7 +1663,9 @@
   exports.effectUt = effectUt;
   exports.execId = execId;
   exports.execIdInc = execIdInc;
+  exports.findValidBackup = findValidBackup;
   exports.flushMicroEffectManual = flushMicroEffectManual;
+  exports.getProxyHasKey = getProxyHasKey;
   exports.getPulling = getPulling;
   exports.ide = ide;
   exports.isStore = isStore;
@@ -1638,6 +1673,7 @@
   exports.micro = micro;
   exports.noopEffect = noopEffect;
   exports.now = now;
+  exports.proxyHasKey = proxyHasKey;
   exports.runWithPulling = runWithPulling;
   exports.scope = scope;
   exports.setExecId = setExecId;