aoye 0.0.12 → 0.0.14

package/dist/aoye.cjs.js

@@ -769,21 +769,19 @@ const _Signal = class _Signal {
   pullRecurse(shouldLink = true) {
     var _a, _b;
     G.PullingRecurseDeep++;
-    let downstream = G.PullingSignal;
+    const downstream = G.PullingSignal;
     const isScope = this.state & State.IsScope;
-    if (
-      // 1. 外部支持 link
-      shouldLink && // 2. 有下游
-      downstream && // 3. 下游是 watcher，不链接非 scope
-      !(downstream.state & State.LinkScopeOnly && !isScope)
-    ) {
+    if (this !== downstream && // 1. 外部支持 link
+    shouldLink && // 2. 有下游
+    downstream && // 3. 下游是 watcher，不链接非 scope
+    (!(downstream.state & State.LinkScopeOnly) || isScope)) {
       Line.link(this, downstream);
     }
     try {
       if (this.version === G.version) {
         return this.value;
       }
-      this.recEnd = null;
+      if (this.pull !== this.DEFAULT_PULL) this.recEnd = null;
       this.state |= State.Pulling;
       G.PullingSignal = this;
       (_a = this.clean) == null ? void 0 : _a.call(this);
@@ -794,7 +792,6 @@ const _Signal = class _Signal {
         this.clean = () => runWithPulling(fn, null);
         v = this.value;
       }
-      this.pull = this.customPull || this.DEFAULT_PULL;
       this.value = v;
       this.version = G.version;
       return this.value;
@@ -802,6 +799,7 @@ const _Signal = class _Signal {
       console.error("\u8BA1\u7B97\u5C5E\u6027\u62A5\u9519\u8FD9\u6B21\u4E0D\u89E6\u53D1\uFF0C\u540E\u7EED\u72B6\u6001\u53EF\u80FD\u51FA\u9519", error);
       return this.value;
     } finally {
+      this.pull = this.customPull || this.DEFAULT_PULL;
       pullingPostprocess(this);
       const toDel = (_b = this.recEnd) == null ? void 0 : _b.nextRecLine;
       unlinkRecWithScope(toDel);
@@ -811,54 +809,64 @@ const _Signal = class _Signal {
   }
   pullDeep() {
     const signal = this;
-    if (!(signal.state & DirtyState)) {
-      return this.value;
-    }
-    dfs(signal, {
-      isUp: true,
-      begin: ({ node }) => {
-        if (node.state & State.Pulling || !(node.state & DirtyState) || node.isDisabled()) {
-          return true;
-        }
-        node.state |= State.Pulling;
-      },
-      complete: ({ node, notGoDeep: currentClean, walkedLine }) => {
-        let noGoSibling = false;
-        const last = walkedLine[walkedLine.length - 1];
-        const downstream = last == null ? void 0 : last.downstream;
-        if (currentClean) ; else if (node.state & State.Dirty) {
-          if (!node.recStart && node.value !== node.nextValue) {
-            node.markDownStreamsDirty();
-            node.state &= ~State.Dirty;
-            node.state &= ~State.Pulling;
-            return;
-          } else {
-            const prevPulling = G.PullingSignal;
-            G.PullingSignal = downstream;
-            const prevValue = node.value;
-            node.pullRecurse(false);
-            if (prevValue !== node.value) {
+    if (signal.state & DirtyState) {
+      dfs(signal, {
+        isUp: true,
+        begin: ({ node }) => {
+          if (node.state & (State.Pulling | State.Dirty) || !(node.state & DirtyState) || node.isDisabled()) {
+            return true;
+          }
+          node.state |= State.Pulling;
+        },
+        complete: ({ node, notGoDeep: cleanOrDirty, walkedLine }) => {
+          const isDirty = node.state & State.Dirty;
+          let currentClean = cleanOrDirty && !isDirty;
+          if (cleanOrDirty && node.state & State.Pulling) {
+            currentClean = true;
+          }
+          let noGoSibling = false;
+          const last = walkedLine[walkedLine.length - 1];
+          const downstream2 = last == null ? void 0 : last.downstream;
+          if (currentClean) ; else if (isDirty) {
+            if (node.pull === node.DEFAULT_PULL && node.value !== node.nextValue) {
               node.markDownStreamsDirty();
+              node.state &= ~State.Dirty;
+              node.state &= ~State.Pulling;
+              return;
+            } else {
+              const prevPulling = G.PullingSignal;
+              G.PullingSignal = downstream2;
+              const prevValue = node.value;
+              node.pullRecurse(false);
+              if (prevValue !== node.value) {
+                node.markDownStreamsDirty();
+              }
+              node.state &= ~State.Dirty;
+              G.PullingSignal = prevPulling;
+              noGoSibling = true;
             }
-            node.state &= ~State.Dirty;
-            G.PullingSignal = prevPulling;
-            noGoSibling = true;
+          } else if (node.state & State.Unknown) {
+            node.state &= ~State.Unknown;
           }
-        } else if (node.state & State.Unknown) {
-          node.state &= ~State.Unknown;
+          node.version = G.version;
+          pullingPostprocess(node);
+          return noGoSibling;
         }
-        node.version = G.version;
-        pullingPostprocess(node);
-        return noGoSibling;
-      }
-    });
+      });
+    }
+    const downstream = G.PullingSignal;
+    if (this !== downstream && // 2. 有下游
+    downstream && // 3. 下游是 watcher 不是 watch，或 是watcher 但 当前是 scope
+    (!(downstream.state & State.LinkScopeOnly) || this.state & State.IsScope)) {
+      Line.link(this, downstream);
+    }
     return this.value;
   }
   get v() {
     if (this.isDisabled()) {
       return this.value;
     }
-    if (!this.recStart) {
+    if (!this.recStart || this.pull === this.DEFAULT_PULL) {
       return this.pullRecurse(true);
     }
     return this.pullDeep();
@@ -942,6 +950,7 @@ const deepSignal = (target, scope, deep = true) => {
         case Keys.Meta:
           return meta;
       }
+      if (prop === Symbol.unscopables) return Reflect.get(obj, prop, receiver);
       if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
         return Reflect.get(obj, prop, receiver);
       }
@@ -972,7 +981,7 @@ const deepSignal = (target, scope, deep = true) => {
       return s.v;
     },
     set(obj, prop, value, receiver) {
-      if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
+      if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop) || typeof value === "function") {
         return Reflect.set(obj, prop, value, receiver);
       }
       batch.start();
@@ -991,7 +1000,7 @@ const deepSignal = (target, scope, deep = true) => {
     },
     // 【核心修改】拦截 delete 操作
     deleteProperty(obj, prop) {
-      if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
+      if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop) || typeof obj[prop] === "function") {
         return Reflect.deleteProperty(obj, prop);
       }
       if (cells.has(prop)) {