aoye 0.0.21 → 0.0.22

package/dist/index.umd.js

@@ -4,7 +4,7 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Aoye = {}, global.BobeShared));
 })(this, (function (exports, bobeShared) { 'use strict';
 
-  const rawToProxy = /* @__PURE__ */ new WeakMap();
+  const rawToProxy = /* @__PURE__ */new WeakMap();
   new bobeShared.BaseEvent();
   const G = {
     /** 原子 signal 更新次数 */
@@ -16,7 +16,7 @@
     /** 表示当前处于 pull 递归中 */
     PullingRecurseDeep: 0
   };
-  var State = /* @__PURE__ */ ((State2) => {
+  var State = /* @__PURE__ */(State2 => {
     State2[State2["Clean"] = 0] = "Clean";
     State2[State2["LinkScopeOnly"] = 256] = "LinkScopeOnly";
     State2[State2["ScopeAbort"] = 128] = "ScopeAbort";
@@ -37,7 +37,12 @@
   const getLeft = (x, max) => leakI(x * 2 + 1, max);
   const getRight = (x, max) => leakI(x * 2 + 2, max);
   const getParent = (x, max) => leakI(x - 1 >>> 1, max);
-  const exchange = (arr, i, j) => [arr[i], arr[j]] = [arr[j], arr[i]];
+  const exchange = (arr, i, j) => {
+    var _ref = [arr[j], arr[i]];
+    arr[i] = _ref[0];
+    arr[j] = _ref[1];
+    return _ref;
+  };
   class PriorityQueue {
     // 构造函数接受一个compare函数
     // compare返回的-1, 0, 1决定元素是否优先被去除
@@ -89,11 +94,11 @@
       this.goUp(this.arr, current, len);
     }
     add(...items) {
-      items.forEach((it) => this._add(it));
+      items.forEach(it => this._add(it));
     }
     // 去除头元素并返回
     poll() {
-      const { arr } = this;
+      const arr = this.arr;
       const len = this.size();
       if (len <= 2) {
         return arr.shift();
@@ -113,7 +118,7 @@
       return this.arr.length;
     }
     logTree() {
-      const { arr } = this;
+      const arr = this.arr;
       let i = 0;
       let j = 1;
       let level = 0;
@@ -127,7 +132,7 @@
       const last = Math.pow(2, matrix.length - 1);
       const arrStr = JSON.stringify(last);
       const halfLen = arrStr.length >>> 1;
-      matrix.forEach((it) => {
+      matrix.forEach(it => {
         const str = JSON.stringify(it);
         const halfIt = str.length >>> 1;
         console.log(str.padStart(halfLen + halfIt, " "));
@@ -136,22 +141,6 @@
     }
   }
 
-  var __defProp$3 = Object.defineProperty;
-  var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$3 = (a, b) => {
-    for (var prop in b || (b = {}))
-      if (__hasOwnProp$4.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
-    if (__getOwnPropSymbols$4)
-      for (var prop of __getOwnPropSymbols$4(b)) {
-        if (__propIsEnum$4.call(b, prop))
-          __defNormalProp$3(a, prop, b[prop]);
-      }
-    return a;
-  };
   const DefaultTaskControlReturn = {
     finished: true,
     startNewCallbackAble: true
@@ -162,13 +151,17 @@
       this.aIsUrgent = aIsUrgent;
       this.isScheduling = false;
     }
-    static create({ callbackAble, aIsUrgent }) {
+    static create({
+      callbackAble,
+      aIsUrgent
+    }) {
       const queue = new TaskQueue(callbackAble, aIsUrgent);
       queue.taskQueue = new PriorityQueue(aIsUrgent);
       return queue;
     }
     pushTask(task) {
-      const { taskQueue, isScheduling } = this;
+      const taskQueue = this.taskQueue,
+        isScheduling = this.isScheduling;
       taskQueue._add(task);
       if (!isScheduling) {
         this.callbackAble(this.scheduleTask.bind(this));
@@ -176,11 +169,14 @@
       }
     }
     scheduleTask() {
-      const { taskQueue } = this;
+      const taskQueue = this.taskQueue;
       const fn = taskQueue.peek();
       if (!fn) return this.isScheduling = false;
       let info = fn() || {};
-      info = __spreadValues$3(__spreadValues$3({}, DefaultTaskControlReturn), info);
+      info = {
+        ...DefaultTaskControlReturn,
+        ...info
+      };
       if (info.finished) {
         taskQueue.poll();
         if (taskQueue.size() === 0) {
@@ -195,20 +191,21 @@
     }
   }
 
-  var Keys = /* @__PURE__ */ ((Keys2) => {
+  var Keys = /* @__PURE__ */(Keys2 => {
     Keys2["Iterator"] = "__AOYE_ITERATOR";
     Keys2["Raw"] = "__AOYE_RAW";
     Keys2["Meta"] = "__AOYE_META";
     return Keys2;
   })(Keys || {});
-  const IsStore = /* @__PURE__ */ Symbol("__AOYE_IS_STORE"), StoreIgnoreKeys = /* @__PURE__ */ Symbol("__AOYE_IGNORE_KEYS");
+  const IsStore = /* @__PURE__ */Symbol("__AOYE_IS_STORE"),
+    StoreIgnoreKeys = /* @__PURE__ */Symbol("__AOYE_IGNORE_KEYS");
 
   let channel = globalThis.MessageChannel ? new MessageChannel() : null;
   if (globalThis.MessageChannel) {
     channel = new MessageChannel();
   }
   let msgId = 0;
-  const macro = (fn) => {
+  const macro = fn => {
     if (!channel) {
       setTimeout(fn);
     }
@@ -223,10 +220,10 @@
     channel.port1.postMessage(msgId++);
   };
   const p = Promise.resolve();
-  const micro = (cb) => {
+  const micro = cb => {
     p.then(cb);
   };
-  const toRaw = (a) => {
+  const toRaw = a => {
     if (typeof a === "object" && a !== null && a[Keys.Raw]) {
       return toRaw(a[Keys.Raw]);
     }
@@ -241,25 +238,31 @@
       /** 记录 Set 或 BatchSet 产生的最后一个 Effect */
       this.lastEffectItem = null;
     }
+    static {
+      this.Sync = "__Sync_";
+    }
+    static {
+      this.Layout = "__Layout_";
+    }
+    static {
+      this.Micro = "__Micro_";
+    }
+    static {
+      this.Macro = "__Macro_";
+    }
     endSet() {
-      var _a;
       if (!this.firstEffectItem) return;
       const subQueue = this.effectQueue.subRef(this.firstEffectItem, this.lastEffectItem);
       this.firstEffectItem = null;
       this.lastEffectItem = null;
-      (_a = this.onOneSetEffectsAdded) == null ? void 0 : _a.call(this, subQueue, this.effectQueue);
+      this.onOneSetEffectsAdded?.(subQueue, this.effectQueue);
     }
     addEffect(effect) {
-      var _a;
       const item = this.effectQueue.push(effect);
-      (_a = this.onEffectAdded) == null ? void 0 : _a.call(this, effect, item, this.effectQueue);
+      this.onEffectAdded?.(effect, item, this.effectQueue);
       return item;
     }
   }
-  Scheduler.Sync = "__Sync_";
-  Scheduler.Layout = "__Layout_";
-  Scheduler.Micro = "__Micro_";
-  Scheduler.Macro = "__Macro_";
   class SyncScheduler extends Scheduler {
     onOneSetEffectsAdded(subQueue, queue) {
       subQueue.forEach((effect, item) => {
@@ -271,7 +274,10 @@
   class MicroScheduler extends Scheduler {
     constructor() {
       super(...arguments);
-      this.taskQueue = TaskQueue.create({ callbackAble: micro, aIsUrgent: (a, b) => a.time < b.time });
+      this.taskQueue = TaskQueue.create({
+        callbackAble: micro,
+        aIsUrgent: (a, b) => a.time < b.time
+      });
     }
     onOneSetEffectsAdded(subQueue, queue) {
       const task = () => {
@@ -291,7 +297,10 @@
   class MacroScheduler extends Scheduler {
     constructor() {
       super(...arguments);
-      this.taskQueue = TaskQueue.create({ callbackAble: macro, aIsUrgent: (a, b) => a.time < b.time });
+      this.taskQueue = TaskQueue.create({
+        callbackAble: macro,
+        aIsUrgent: (a, b) => a.time < b.time
+      });
     }
     onOneSetEffectsAdded(subQueue, queue) {
       const task = () => {
@@ -307,7 +316,10 @@
   class LayoutScheduler extends Scheduler {
     constructor() {
       super(...arguments);
-      this.taskQueue = TaskQueue.create({ callbackAble: macro, aIsUrgent: (a, b) => a.time < b.time });
+      this.taskQueue = TaskQueue.create({
+        callbackAble: macro,
+        aIsUrgent: (a, b) => a.time < b.time
+      });
     }
     onOneSetEffectsAdded(subQueue, queue) {
       const task = () => {
@@ -329,22 +341,6 @@
   globalThis["sche"] = _scheduler[Scheduler.Sync];
   const registerScheduler = (key, Ctor) => _scheduler[key] = new Ctor();
 
-  var __defProp$2 = Object.defineProperty;
-  var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$2 = (a, b) => {
-    for (var prop in b || (b = {}))
-      if (__hasOwnProp$3.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
-    if (__getOwnPropSymbols$3)
-      for (var prop of __getOwnPropSymbols$3(b)) {
-        if (__propIsEnum$3.call(b, prop))
-          __defNormalProp$2(a, prop, b[prop]);
-      }
-    return a;
-  };
   const DefaultDFSOpt = {
     isUp: false,
     begin: null,
@@ -354,15 +350,23 @@
     breakNode: null
   };
   function dfs(root, opt = {}) {
-    const { isUp, begin, complete, breakStack: lineStack, breakLine } = __spreadValues$2(__spreadValues$2({}, DefaultDFSOpt), opt);
+    const _DefaultDFSOpt$opt = {
+        ...DefaultDFSOpt,
+        ...opt
+      },
+      isUp = _DefaultDFSOpt$opt.isUp,
+      begin = _DefaultDFSOpt$opt.begin,
+      complete = _DefaultDFSOpt$opt.complete,
+      lineStack = _DefaultDFSOpt$opt.breakStack,
+      breakLine = _DefaultDFSOpt$opt.breakLine;
     let node = opt.breakNode || root;
     let line = breakLine;
     const listKey = isUp ? "recStart" : "emitStart";
     const nodeKey = isUp ? "upstream" : "downstream";
     const nextLineKey = isUp ? "nextRecLine" : "nextEmitLine";
     const reverseNodeKey = isUp ? "downstream" : "upstream";
-    while (1) {
-      let notGoDeep = begin == null ? void 0 : begin({
+    while (true) {
+      let notGoDeep = begin?.({
         node,
         lineFromUp: line,
         walkedLine: lineStack
@@ -374,8 +378,8 @@
         node = firstChild;
         continue;
       }
-      while (1) {
-        const noGoSibling = complete == null ? void 0 : complete({
+      while (true) {
+        const noGoSibling = complete?.({
           node,
           lineToDeep: line,
           walkedLine: lineStack,
@@ -416,9 +420,17 @@
       this.nextOutLink = null;
     }
     static link(v1, v2) {
-      let { emitEnd } = v1, { recEnd, recStart } = v2, noRecEnd = !recEnd, head = { nextRecLine: recStart }, line;
+      let emitEnd = v1.emitEnd,
+        recEnd = v2.recEnd,
+        recStart = v2.recStart,
+        noRecEnd = !recEnd,
+        head = {
+          nextRecLine: recStart
+        },
+        line;
       recEnd = recEnd || head;
-      const { nextRecLine } = recEnd || {};
+      const _ref = recEnd || {},
+        nextRecLine = _ref.nextRecLine;
       if (!nextRecLine) {
         line = new Line();
         Line.emit_line(v1, line);
@@ -449,7 +461,14 @@
       }
     }
     static unlink(line) {
-      let { prevEmitLine, nextEmitLine, prevRecLine, nextRecLine, upstream, downstream, nextOutLink, prevOutLink } = line;
+      let prevEmitLine = line.prevEmitLine,
+        nextEmitLine = line.nextEmitLine,
+        prevRecLine = line.prevRecLine,
+        nextRecLine = line.nextRecLine,
+        upstream = line.upstream,
+        downstream = line.downstream,
+        nextOutLink = line.nextOutLink,
+        prevOutLink = line.prevOutLink;
       line.prevEmitLine = null;
       line.nextEmitLine = null;
       line.prevRecLine = null;
@@ -572,14 +591,19 @@
     let toUnlink;
     dfs(delRoot, {
       isUp: true,
-      begin: ({ node }) => {
+      begin: ({
+        node
+      }) => {
         doUnlink(toUnlink);
         toUnlink = null;
         if (node.emitStart !== node.emitEnd) {
           return true;
         }
       },
-      complete: ({ node, notGoDeep }) => {
+      complete: ({
+        node,
+        notGoDeep
+      }) => {
         doUnlink(toUnlink);
         toUnlink = null;
         const isSingleRefed = !notGoDeep;
@@ -604,10 +628,15 @@
       if (upstream.state & State.IsScope) {
         dfs(upstream, {
           isUp: true,
-          begin: ({ node }) => {
+          begin: ({
+            node
+          }) => {
             if ((node.state & State.IsScope) === 0 || node.state & ScopeAbort) return true;
           },
-          complete: ({ node: scope, notGoDeep }) => {
+          complete: ({
+            node: scope,
+            notGoDeep
+          }) => {
             const shouldAbort = !notGoDeep;
             if (shouldAbort) {
               releaseScope(scope);
@@ -623,7 +652,6 @@
     doUnlink(this.emitStart);
   }
   function releaseScope(scope) {
-    var _a;
     let outLink = scope.outLink;
     while (outLink) {
       const memoNext = outLink.nextOutLink;
@@ -631,7 +659,7 @@
       outLink = memoNext;
     }
     scope.state |= State.ScopeAbort;
-    (_a = scope.clean) == null ? void 0 : _a.call(scope);
+    scope.clean?.();
     scope.clean = null;
   }
   function clean(cb) {
@@ -651,82 +679,65 @@
     G.PullingSignal = pulling;
   }
 
-  class Batch {
-    constructor() {
-      this.deep = 0;
-    }
-    start() {
-      this.deep++;
-    }
-    end() {
-      this.deep--;
-      if (this.deep !== 0) return;
-      for (const key in _scheduler) {
-        const instance = _scheduler[key];
-        instance.endSet();
-      }
-    }
-    inBatch() {
-      return this.deep > 0;
-    }
-  }
-  const batch = new Batch();
-
-  var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-  var __objRest = (source, exclude) => {
-    var target = {};
-    for (var prop in source)
-      if (__hasOwnProp$2.call(source, prop) && exclude.indexOf(prop) < 0)
-        target[prop] = source[prop];
-    if (source != null && __getOwnPropSymbols$2)
-      for (var prop of __getOwnPropSymbols$2(source)) {
-        if (exclude.indexOf(prop) < 0 && __propIsEnum$2.call(source, prop))
-          target[prop] = source[prop];
-      }
-    return target;
-  };
-  const markDeep = (signal) => {
-    let level = 0, updatedSchedulers = /* @__PURE__ */ new Set();
-    dfs(signal, {
-      isUp: false,
-      begin: ({ node }) => {
-        if (node.isDisabled()) {
-          return true;
-        }
-        const inPullingArea = node.state & State.Pulling;
-        const Unknown = inPullingArea ? State.PullingUnknown : State.Unknown;
-        const isEffect = level > 0;
-        const isLeaf = !node.emitStart || node.emitStart.downstream === node.scope;
+  const markDeep = root => {
+    let node = root,
+      i = -1,
+      parent;
+    const stack = [];
+    outer: do {
+      let noGoDeep = false;
+      const state = node.state,
+        emitStart = node.emitStart,
+        scheduler = node.scheduler;
+      if (node.scope && node.scope.state & State.ScopeAbort ||
+      // 是 scope 节点，且处于 ready 状态，不需要重复执行
+      node.state & ScopeExecuted) {
+        noGoDeep = true;
+      } else {
+        const inPullingArea = state & State.Pulling;
+        const isEffect = parent !== void 0;
+        const isLeaf = !emitStart || emitStart.downstream === node.scope;
         if (isEffect) {
-          node.state |= Unknown;
+          node.state |= inPullingArea ? State.PullingUnknown : State.Unknown;
         } else if (!isLeaf) {
           node.state |= State.Dirty;
         }
-        if (isLeaf && isEffect && !inPullingArea) {
-          const key = node.scheduler;
-          const instance = _scheduler[key];
-          const item = instance.addEffect(node);
-          if (!instance.firstEffectItem) {
-            instance.firstEffectItem = item;
+        if (isLeaf) {
+          noGoDeep = true;
+          if (isEffect && !inPullingArea) {
+            const instance = _scheduler[scheduler];
+            const item = instance.addEffect(node);
+            instance.firstEffectItem ??= item;
+            instance.lastEffectItem = item;
           }
-          instance.lastEffectItem = item;
-          updatedSchedulers.add(key);
         }
-        level++;
-        if (isLeaf) {
-          return true;
+      }
+      if (emitStart && !noGoDeep) {
+        stack[++i] = emitStart;
+        parent = node;
+        node = emitStart.downstream;
+        noGoDeep = false;
+        continue;
+      }
+      while (true) {
+        if (i === -1) {
+          break outer;
+        }
+        const backLine = stack[i];
+        const nextLine = backLine.nextEmitLine;
+        if (nextLine) {
+          node = nextLine.downstream;
+          stack[i] = nextLine;
+          break;
+        }
+        node = parent;
+        if (--i !== -1) {
+          parent = stack[i].upstream;
         }
       }
-    });
-    if (batch.inBatch()) return;
-    for (const key in _scheduler) {
-      const instance = _scheduler[key];
-      instance.endSet();
-    }
+    } while (true);
   };
-  const pullingPostprocess = (node) => {
+  const pullingPostprocess = node => {
     let s = node.state;
     s &= ~State.Pulling;
     if (s & State.PullingUnknown) {
@@ -734,7 +745,7 @@
     }
     node.state = s;
   };
-  const _Signal = class _Signal {
+  class Signal {
     constructor(nextValue, customPull) {
       this.nextValue = nextValue;
       this.customPull = customPull;
@@ -754,9 +765,17 @@
       /** 记录当前 effect 中 clean */
       this.clean = null;
     }
-    static create(nextValue, _a) {
-      var _b = _a, { customPull, isScope, scope, immediate } = _b, rest = __objRest(_b, ["customPull", "isScope", "scope", "immediate"]);
-      const s = new _Signal(nextValue, customPull);
+    static {
+      this.Pulling = null;
+    }
+    static create(nextValue, {
+      customPull,
+      isScope,
+      scope,
+      immediate,
+      ...rest
+    }) {
+      const s = new Signal(nextValue, customPull);
       s.pull = s.customPull || s.DEFAULT_PULL;
       Object.assign(s, rest);
       if (isScope) {
@@ -774,10 +793,9 @@
      * 递归拉取负责建立以来链
      */
     pullRecurse(shouldLink = true) {
-      var _a, _b;
       G.PullingRecurseDeep++;
       const downstream = G.PullingSignal;
-      this.linkWhenPull(downstream);
+      this.linkWhenPull(downstream, shouldLink);
       try {
         if (this.version === G.version) {
           return this.value;
@@ -785,7 +803,7 @@
         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);
+        this.clean?.();
         this.clean = null;
         let v = this.pull();
         if (this.state & State.IsScope && typeof v === "function") {
@@ -802,52 +820,63 @@
       } finally {
         this.pull = this.customPull || this.DEFAULT_PULL;
         pullingPostprocess(this);
-        const toDel = (_b = this.recEnd) == null ? void 0 : _b.nextRecLine;
+        const toDel = this.recEnd?.nextRecLine;
         unlinkRecWithScope(toDel);
         G.PullingSignal = downstream;
         G.PullingRecurseDeep--;
       }
     }
-    linkWhenPull(downstream) {
+    linkWhenPull(downstream, shouldLink) {
       const isScope = this.state & State.IsScope;
-      if (this !== downstream && // 2. 有下游
-      downstream && // 3. 下游是 watcher 不是 watch，或 是watcher 但 当前是 scope
-      ((downstream.state & State.LinkScopeOnly) === 0 || isScope) && /**4. scope 只能被一个下游节点管理，就是初始化它的那个下游节点
-       * 发生在 outEffect(() => scope(() => innerEffect(), null))
-       * 虽然通过 scope 让 innerEffect 被管理，
-       * 如果 innerEffect 在 outEffect 中被再次触发，就导致其被 outEffect 管理，
-       * 若 outEffect 后续重新触发， 则导致 innerEffect 被销毁
-       */
-      (!isScope || !this.emitStart)) {
+      if (
+      // 2. 有下游
+      downstream && shouldLink && (
+      // 3. 下游是 watcher 不是 watch，或 是watcher 但 当前是 scope
+      (downstream.state & State.LinkScopeOnly) === 0 || isScope) && (
+      /**4. scope 只能被一个下游节点管理，就是初始化它的那个下游节点
+      * 发生在 outEffect(() => scope(() => innerEffect(), null))
+      * 虽然通过 scope 让 innerEffect 被管理，
+      * 如果 innerEffect 在 outEffect 中被再次触发，就导致其被 outEffect 管理，
+      * 若 outEffect 后续重新触发， 则导致 innerEffect 被销毁
+      */
+      !isScope || !this.emitStart)) {
         Line.link(this, downstream);
       }
     }
     pullDeep() {
       const signal = this;
       if (signal.state & DirtyState) {
-        dfs(signal, {
-          isUp: true,
-          begin: ({ node }) => {
-            if (node.state & (State.Pulling | State.Dirty) || (node.state & DirtyState) === 0 || node.isDisabled()) {
-              return true;
-            }
+        let node = signal,
+          i = -1,
+          parent;
+        const stack = [];
+        outer: do {
+          let noGoDeep = false;
+          if (node.state & (State.Pulling | State.Dirty) || (node.state & DirtyState) === 0 || node.isDisabled()) {
+            noGoDeep = true;
+          } else {
             node.state |= State.Pulling;
-          },
-          complete: ({ node, notGoDeep: cleanOrDirty, walkedLine }) => {
+          }
+          const recStart = node.recStart;
+          if (recStart && !noGoDeep) {
+            stack[++i] = recStart;
+            parent = node;
+            node = recStart.upstream;
+            continue;
+          }
+          while (true) {
             const isDirty = node.state & State.Dirty;
-            let currentClean = cleanOrDirty && !isDirty;
-            if (cleanOrDirty && node.state & State.Pulling) {
+            let currentClean = noGoDeep && !isDirty;
+            if (noGoDeep && node.state & State.Pulling) {
               currentClean = true;
             }
             let noGoSibling = false;
-            const last = walkedLine[walkedLine.length - 1];
-            const downstream2 = last == null ? void 0 : last.downstream;
+            const downstream2 = parent;
+            const isEmitter = node.pull === node.DEFAULT_PULL;
             if (currentClean) ; else if (isDirty) {
-              if (node.pull === node.DEFAULT_PULL && node.value !== node.nextValue) {
+              if (isEmitter && node.value !== node.nextValue) {
                 node.markDownStreamsDirty();
                 node.state &= ~State.Dirty;
-                node.state &= ~State.Pulling;
-                return;
               } else {
                 const prevPulling = G.PullingSignal;
                 G.PullingSignal = downstream2;
@@ -863,14 +892,31 @@
             } else if (node.state & State.Unknown) {
               node.state &= ~State.Unknown;
             }
-            node.version = G.version;
+            if (!isEmitter) {
+              node.version = G.version;
+            }
             pullingPostprocess(node);
-            return noGoSibling;
+            noGoDeep = false;
+            if (i === -1) {
+              break outer;
+            }
+            const backLine = stack[i];
+            const nextLine = backLine.nextRecLine;
+            if (!noGoSibling && nextLine) {
+              node = nextLine.upstream;
+              stack[i] = nextLine;
+              break;
+            } else {
+              node = parent;
+              if (--i !== -1) {
+                parent = stack[i].downstream;
+              }
+            }
           }
-        });
+        } while (true);
       }
       const downstream = G.PullingSignal;
-      this.linkWhenPull(downstream);
+      this.linkWhenPull(downstream, true);
       return this.value;
     }
     get v() {
@@ -904,7 +950,18 @@
       this.nextValue = v;
       this.pull = this.DEFAULT_PULL;
       G.version++;
-      markDeep(this);
+      if (this.emitStart) {
+        markDeep(this);
+        if (batchDeep === 0) {
+          this.scheduleEffect();
+        }
+      }
+    }
+    scheduleEffect() {
+      for (const key in _scheduler) {
+        const instance = _scheduler[key];
+        instance.endSet();
+      }
     }
     /** 返回值为 true 表示已处理 */
     runIfDirty() {
@@ -913,42 +970,32 @@
     isDisabled() {
       return (
         // scope 被取消
-        this.scope && this.scope.state & State.ScopeAbort || // 是 scope 节点，且处于 ready 状态，不需要重复执行
-        this.state & State.IsScope && this.state & ScopeExecuted
+        this.scope && this.scope.state & State.ScopeAbort ||
+        // 是 scope 节点，且处于 ready 状态，不需要重复执行
+        this.state & ScopeExecuted
       );
     }
-  };
-  _Signal.Pulling = null;
-  let Signal = _Signal;
+  }
+  let batchDeep = 0;
+  function batchStart() {
+    batchDeep++;
+  }
+  function batchEnd() {
+    if (--batchDeep) return;
+    for (const key in _scheduler) {
+      const instance = _scheduler[key];
+      instance.endSet();
+    }
+  }
 
-  var __defProp$1 = Object.defineProperty;
-  var __defProps = Object.defineProperties;
-  var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-  var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues$1 = (a, b) => {
-    for (var prop in b || (b = {}))
-      if (__hasOwnProp$1.call(b, prop))
-        __defNormalProp$1(a, prop, b[prop]);
-    if (__getOwnPropSymbols$1)
-      for (var prop of __getOwnPropSymbols$1(b)) {
-        if (__propIsEnum$1.call(b, prop))
-          __defNormalProp$1(a, prop, b[prop]);
-      }
-    return a;
-  };
-  var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
   const deepSignal = (target, scope, deep = true) => {
-    var _a;
     const isObj = typeof target === "object" && target !== null;
     if (!isObj || target[Keys.Raw]) return target;
     const p = rawToProxy.get(target);
     if (p) return p;
-    const cells = /* @__PURE__ */ new Map();
+    const cells = /* @__PURE__ */new Map();
     const targetIsArray = Array.isArray(target);
-    const targetIsStore = Boolean((_a = target.constructor) == null ? void 0 : _a[IsStore]);
+    const targetIsStore = Boolean(target.constructor?.[IsStore]);
     const meta = {
       deep,
       scope,
@@ -997,7 +1044,7 @@
         if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop) || typeof value === "function") {
           return Reflect.set(obj, prop, value, receiver);
         }
-        batch.start();
+        batchStart();
         const success = Reflect.set(obj, prop, value, receiver);
         const cell = cells.get(prop);
         if (cell) {
@@ -1008,7 +1055,7 @@
         } else {
           triggerIter(obj, prop, value, receiver);
         }
-        batch.end();
+        batchEnd();
         return success;
       },
       // 【核心修改】拦截 delete 操作
@@ -1037,10 +1084,14 @@
       const toPaths = toPath.split(".");
       const formPaths = Array.isArray(fromPath) ? fromPath : fromPath.split(".");
       runWithPulling(() => {
-        const { target: fromTarget, key: fromKey } = getTargetAndKey(from, formPaths);
+        const _getTargetAndKey = getTargetAndKey(from, formPaths),
+          fromTarget = _getTargetAndKey.target,
+          fromKey = _getTargetAndKey.key;
         const val = fromTarget[fromKey];
         const fromSignal = fromTarget[Keys.Meta].cells.get(fromKey);
-        const { target: toTarget, key: toKey } = getTargetAndKey(to, toPaths);
+        const _getTargetAndKey2 = getTargetAndKey(to, toPaths),
+          toTarget = _getTargetAndKey2.target,
+          toKey = _getTargetAndKey2.key;
         toTarget[Keys.Meta].cells.set(toKey, fromSignal);
         toTarget[Keys.Raw][toKey] = val;
       }, null);
@@ -1059,13 +1110,16 @@
         target = target[key];
       }
     }
-    return { target, key };
+    return {
+      target,
+      key
+    };
   }
   function isIgnoreKey(ignores, key) {
     if (typeof key !== "string") {
       return ignores.includes(key);
     }
-    return ignores.some((it) => typeof it === "string" && key.startsWith(it));
+    return ignores.some(it => typeof it === "string" && key.startsWith(it));
   }
   function handleGetterAsComputed(obj, prop, receiver, cells, scope) {
     let s = cells.get(prop);
@@ -1094,18 +1148,18 @@
     }
   }
   const arrayMethodReWrites = {};
-  ["pop", "push", "shift", "splice", "unshift", "copyWithin", "reverse", "fill"].forEach((key) => {
-    arrayMethodReWrites[key] = function(...args) {
-      batch.start();
+  ["pop", "push", "shift", "splice", "unshift", "copyWithin", "reverse", "fill"].forEach(key => {
+    arrayMethodReWrites[key] = function (...args) {
+      batchStart();
       const fn = Array.prototype[key];
       const res = runWithPulling(() => fn.call(this, ...args), null);
       this[Keys.Iterator] = (this[Keys.Raw][Keys.Iterator] || 0) + 1;
-      batch.end();
+      batchEnd();
       return res;
     };
   });
-  ["includes", "indexOf", "lastIndexOf"].forEach((key) => {
-    arrayMethodReWrites[key] = function(...args) {
+  ["includes", "indexOf", "lastIndexOf"].forEach(key => {
+    arrayMethodReWrites[key] = function (...args) {
       const fn = Array.prototype[key];
       const that = toRaw(this);
       let result = fn.call(that, ...args);
@@ -1125,14 +1179,15 @@
       return result;
     };
   });
-  [Symbol.iterator, "values", "entries"].forEach((key) => {
+  [Symbol.iterator, "values", "entries"].forEach(key => {
     const isEntries = key === "entries";
-    arrayMethodReWrites[key] = function(...args) {
+    arrayMethodReWrites[key] = function (...args) {
       const fn = Array.prototype[key];
       const rawArray = toRaw(this);
       const iter = fn.call(rawArray, ...args);
       const meta = this[Keys.Meta];
-      const { deep: isDeep, scope } = meta;
+      const isDeep = meta.deep,
+        scope = meta.scope;
       if (isDeep) {
         const rawNext = iter.next.bind(iter);
         iter.next = () => {
@@ -1151,9 +1206,10 @@
       return iter;
     };
   });
-  arrayMethodReWrites.filter = function(callback, thisArg) {
+  arrayMethodReWrites.filter = function (callback, thisArg) {
     const meta = this[Keys.Meta];
-    const { deep: isDeep, scope } = meta;
+    const isDeep = meta.deep,
+      scope = meta.scope;
     const that = toRaw(this);
     const result = [];
     let resultIndex = 0;
@@ -1170,9 +1226,10 @@
     this[Keys.Iterator];
     return result;
   };
-  arrayMethodReWrites.slice = function(start, end) {
+  arrayMethodReWrites.slice = function (start, end) {
     const meta = this[Keys.Meta];
-    const { deep: isDeep, scope } = meta;
+    const isDeep = meta.deep,
+      scope = meta.scope;
     const that = toRaw(this);
     const len = that.length;
     let k = start || 0;
@@ -1197,9 +1254,10 @@
     this[Keys.Iterator];
     return result;
   };
-  arrayMethodReWrites.toReversed = function() {
+  arrayMethodReWrites.toReversed = function () {
     const meta = this[Keys.Meta];
-    const { deep: isDeep, scope } = meta;
+    const isDeep = meta.deep,
+      scope = meta.scope;
     const that = toRaw(this);
     const len = that.length;
     const result = new Array(len);
@@ -1211,9 +1269,10 @@
     this[Keys.Iterator];
     return result;
   };
-  arrayMethodReWrites.toSpliced = function(start, deleteCount, ...items) {
+  arrayMethodReWrites.toSpliced = function (start, deleteCount, ...items) {
     const meta = this[Keys.Meta];
-    const { deep: isDeep, scope } = meta;
+    const isDeep = meta.deep,
+      scope = meta.scope;
     const that = toRaw(this);
     const len = that.length;
     let relativeStart = start >> 0;
@@ -1244,9 +1303,10 @@
     this[Keys.Iterator];
     return result;
   };
-  arrayMethodReWrites.with = function(index, value) {
+  arrayMethodReWrites.with = function (index, value) {
     const meta = this[Keys.Meta];
-    const { deep: isDeep, scope } = meta;
+    const isDeep = meta.deep,
+      scope = meta.scope;
     const that = toRaw(this);
     const len = that.length;
     let relativeIndex = Number(index) || 0;
@@ -1265,9 +1325,10 @@
     this[Keys.Iterator];
     return result;
   };
-  arrayMethodReWrites.concat = function(...items) {
+  arrayMethodReWrites.concat = function (...items) {
     const meta = this[Keys.Meta];
-    const { deep: isDeep, scope } = meta;
+    const isDeep = meta.deep,
+      scope = meta.scope;
     const that = toRaw(this);
     const selfLen = that.length;
     let totalLength = selfLen;
@@ -1307,49 +1368,50 @@
     wrapReturn: false,
     wrapArgs: 1
   };
-  [
-    __spreadValues$1({
-      key: "every"
-    }, GetMethodConf),
-    __spreadValues$1({
-      key: "find",
-      wrapReturn: true
-    }, GetMethodConf),
-    __spreadProps(__spreadValues$1({
-      key: "findLast"
-    }, GetMethodConf), {
-      wrapReturn: true
-    }),
-    __spreadValues$1({
-      key: "findIndex"
-    }, GetMethodConf),
-    __spreadValues$1({
-      key: "findLastIndex"
-    }, GetMethodConf),
-    __spreadValues$1({
-      key: "forEach"
-    }, GetMethodConf),
-    __spreadValues$1({
-      key: "map"
-    }, GetMethodConf),
-    __spreadValues$1({
-      key: "some"
-    }, GetMethodConf),
-    __spreadProps(__spreadValues$1({
-      key: "reduce"
-    }, GetMethodConf), {
-      wrapArgs: 2
-    }),
-    __spreadProps(__spreadValues$1({
-      key: "reduceRight"
-    }, GetMethodConf), {
-      wrapArgs: 2
-    })
-  ].forEach(({ key, wrapReturn, wrapArgs }) => {
-    arrayMethodReWrites[key] = function(...args) {
+  [{
+    key: "every",
+    ...GetMethodConf
+  }, {
+    key: "find",
+    wrapReturn: true,
+    ...GetMethodConf
+  }, {
+    key: "findLast",
+    ...GetMethodConf,
+    wrapReturn: true
+  }, {
+    key: "findIndex",
+    ...GetMethodConf
+  }, {
+    key: "findLastIndex",
+    ...GetMethodConf
+  }, {
+    key: "forEach",
+    ...GetMethodConf
+  }, {
+    key: "map",
+    ...GetMethodConf
+  }, {
+    key: "some",
+    ...GetMethodConf
+  }, {
+    key: "reduce",
+    ...GetMethodConf,
+    wrapArgs: 2
+  }, {
+    key: "reduceRight",
+    ...GetMethodConf,
+    wrapArgs: 2
+  }].forEach(({
+    key,
+    wrapReturn,
+    wrapArgs
+  }) => {
+    arrayMethodReWrites[key] = function (...args) {
       const meta = this[Keys.Meta];
       const fn = Array.prototype[key];
-      const { deep: isDeep, scope } = meta;
+      const isDeep = meta.deep,
+        scope = meta.scope;
       const that = toRaw(this);
       warpCallbackArgs(isDeep, args, scope, wrapArgs);
       let result = fn.call(that, ...args);
@@ -1360,18 +1422,19 @@
       return result;
     };
   });
-  arrayMethodReWrites.toSorted = function(...args) {
+  arrayMethodReWrites.toSorted = function (...args) {
     const fn = Array.prototype["toSorted"];
     const meta = this[Keys.Meta];
-    const { deep: isDeep, scope } = meta;
+    const isDeep = meta.deep,
+      scope = meta.scope;
     const that = toRaw(this);
     warpCallbackArgs(isDeep, args, scope, 3);
     let result = fn.call(that, ...args);
     this[Keys.Iterator];
-    return isDeep ? result.map((it) => deepSignal(it, scope)) : result;
+    return isDeep ? result.map(it => deepSignal(it, scope)) : result;
   };
-  ["join", "toString", "toLocaleString"].forEach((key) => {
-    arrayMethodReWrites[key] = function(...args) {
+  ["join", "toString", "toLocaleString"].forEach(key => {
+    arrayMethodReWrites[key] = function (...args) {
       const fn = Array.prototype[key];
       const that = toRaw(this);
       const result = fn.call(that, ...args);
@@ -1381,7 +1444,7 @@
   });
   function warpCallbackArgs(isDeep, args, scope, wrapArgs = 1) {
     const callback = args[0];
-    const wrapCb = function(...cbArgs) {
+    const wrapCb = function (...cbArgs) {
       if (isDeep) {
         if (wrapArgs & 1) cbArgs[0] = deepSignal(cbArgs[0], scope);
         if (wrapArgs & 2) cbArgs[1] = deepSignal(cbArgs[1], scope);
@@ -1400,6 +1463,15 @@
       _Store.Current = proxy;
       return proxy;
     }
+    static {
+      this[_b] = true;
+    }
+    static {
+      this[_a] = ["ui", "raw"];
+    }
+    static {
+      this.Current = null;
+    }
     static new(keyMap = {}, staticMap = {}) {
       const parentStore = _Store.Current;
       const child = new this();
@@ -1428,27 +1500,8 @@
       this.parent = null;
     }
   };
-  _Store[_b] = true;
-  _Store[_a] = ["ui", "raw"];
-  _Store.Current = null;
   let Store = _Store;
 
-  var __defProp = Object.defineProperty;
-  var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-  var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __propIsEnum = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __spreadValues = (a, b) => {
-    for (var prop in b || (b = {}))
-      if (__hasOwnProp.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    if (__getOwnPropSymbols)
-      for (var prop of __getOwnPropSymbols(b)) {
-        if (__propIsEnum.call(b, prop))
-          __defNormalProp(a, prop, b[prop]);
-      }
-    return a;
-  };
   const DefaultCustomSignalOpt = {
     /** 三种模式
      * 1. auto:   根据值类型自动判断 默认
@@ -1462,7 +1515,10 @@
   ({
     scheduler: Scheduler.Sync});
   const $ = (init, opt = {}) => {
-    opt = __spreadValues(__spreadValues({}, DefaultCustomSignalOpt), opt);
+    opt = {
+      ...DefaultCustomSignalOpt,
+      ...opt
+    };
     let intiValue, customPull;
     if (typeof init === "function") {
       intiValue = null;
@@ -1480,15 +1536,15 @@
     return s;
   };
   const effect = (customPull, depOrOpt, opt) => {
-    var _a;
     const hasDep = Array.isArray(depOrOpt);
     opt = hasDep ? opt || {} : depOrOpt || {};
     if (!hasDep) {
-      const s2 = Signal.create(null, __spreadValues({
+      const s2 = Signal.create(null, {
         customPull,
         scheduler: Scheduler.Sync,
-        isScope: true
-      }, opt));
+        isScope: true,
+        ...opt
+      });
       s2.v;
       const bound2 = dispose.bind(s2);
       bound2.ins = s2;
@@ -1496,9 +1552,14 @@
     }
     let mounted = false;
     const deps = depOrOpt;
-    const immediate = deps.length === 0 ? true : (_a = opt.immediate) != null ? _a : true;
-    const vs = Array.from({ length: deps.length }, () => ({ old: null, val: null }));
-    const s = Signal.create(null, __spreadValues({
+    const immediate = deps.length === 0 ? true : opt.immediate ?? true;
+    const vs = Array.from({
+      length: deps.length
+    }, () => ({
+      old: null,
+      val: null
+    }));
+    const s = Signal.create(null, {
       customPull() {
         for (let i = 0; i < deps.length; i++) {
           const value = deps[i].v;
@@ -1513,8 +1574,9 @@
         mounted = true;
       },
       scheduler: Scheduler.Sync,
-      isScope: true
-    }, opt));
+      isScope: true,
+      ...opt
+    });
     s.v;
     const bound = dispose.bind(s);
     bound.ins = s;
@@ -1540,15 +1602,18 @@
     bound.ins = s;
     return bound;
   };
-  const customEffect = (opt) => {
-    return ((init, innerOpt = {}) => {
-      return effect(init, __spreadValues(__spreadValues({}, opt), innerOpt));
-    });
+  const customEffect = opt => {
+    return (init, innerOpt = {}) => {
+      return effect(init, {
+        ...opt,
+        ...innerOpt
+      });
+    };
   };
-  const isSignal = (value) => {
+  const isSignal = value => {
     return value instanceof Signal;
   };
-  const isScope = (value) => {
+  const isScope = value => {
     return value instanceof Signal;
   };
 
@@ -1560,7 +1625,8 @@
   exports.Store = Store;
   exports.StoreIgnoreKeys = StoreIgnoreKeys;
   exports.TaskQueue = TaskQueue;
-  exports.batch = batch;
+  exports.batchEnd = batchEnd;
+  exports.batchStart = batchStart;
   exports.clean = clean;
   exports.customEffect = customEffect;
   exports.deepSignal = deepSignal;