aoye 0.0.19 → 0.0.21

package/dist/aoye.cjs.js

@@ -243,9 +243,9 @@ class Scheduler {
     var _a;
     if (!this.firstEffectItem) return;
     const subQueue = this.effectQueue.subRef(this.firstEffectItem, this.lastEffectItem);
-    (_a = this.onOneSetEffectsAdded) == null ? void 0 : _a.call(this, subQueue, this.effectQueue);
     this.firstEffectItem = null;
     this.lastEffectItem = null;
+    (_a = this.onOneSetEffectsAdded) == null ? void 0 : _a.call(this, subQueue, this.effectQueue);
   }
   addEffect(effect) {
     var _a;
@@ -261,8 +261,8 @@ Scheduler.Macro = "__Macro_";
 class SyncScheduler extends Scheduler {
   onOneSetEffectsAdded(subQueue, queue) {
     subQueue.forEach((effect, item) => {
-      effect.runIfDirty();
       queue.delete(item);
+      effect.runIfDirty();
     });
   }
 }
@@ -274,8 +274,8 @@ class MicroScheduler extends Scheduler {
   onOneSetEffectsAdded(subQueue, queue) {
     const task = () => {
       subQueue.forEach((effect, item) => {
-        effect.runIfDirty();
         queue.delete(item);
+        effect.runIfDirty();
       });
       return {
         finished: true,
@@ -294,8 +294,8 @@ class MacroScheduler extends Scheduler {
   onOneSetEffectsAdded(subQueue, queue) {
     const task = () => {
       subQueue.forEach((effect, item) => {
-        effect.runIfDirty();
         queue.delete(item);
+        effect.runIfDirty();
       });
     };
     task.time = Date.now();
@@ -310,8 +310,8 @@ class LayoutScheduler extends Scheduler {
   onOneSetEffectsAdded(subQueue, queue) {
     const task = () => {
       subQueue.forEach((effect, item) => {
-        effect.runIfDirty();
         queue.delete(item);
+        effect.runIfDirty();
       });
     };
     task.time = Date.now();
@@ -324,6 +324,7 @@ const _scheduler = {
   [Scheduler.Macro]: new MacroScheduler(),
   [Scheduler.Layout]: new LayoutScheduler()
 };
+globalThis["sche"] = _scheduler[Scheduler.Sync];
 const registerScheduler = (key, Ctor) => _scheduler[key] = new Ctor();
 
 var __defProp$2 = Object.defineProperty;
@@ -712,6 +713,9 @@ const markDeep = (signal) => {
         updatedSchedulers.add(key);
       }
       level++;
+      if (isLeaf) {
+        return true;
+      }
     }
   });
   if (batch.inBatch()) return;
@@ -771,13 +775,7 @@ const _Signal = class _Signal {
     var _a, _b;
     G.PullingRecurseDeep++;
     const downstream = G.PullingSignal;
-    const isScope = this.state & State.IsScope;
-    if (this !== downstream && // 1. 外部支持 link
-    shouldLink && // 2. 有下游
-    downstream && // 3. 下游是 watcher，不链接非 scope
-    ((downstream.state & State.LinkScopeOnly) === 0 || isScope)) {
-      Line.link(this, downstream);
-    }
+    this.linkWhenPull(downstream);
     try {
       if (this.version === G.version) {
         return this.value;
@@ -788,7 +786,7 @@ const _Signal = class _Signal {
       (_a = this.clean) == null ? void 0 : _a.call(this);
       this.clean = null;
       let v = this.pull();
-      if (isScope && typeof v === "function") {
+      if (this.state & State.IsScope && typeof v === "function") {
         const fn = v;
         this.clean = () => runWithPulling(fn, null);
         v = this.value;
@@ -808,6 +806,20 @@ const _Signal = class _Signal {
       G.PullingRecurseDeep--;
     }
   }
+  linkWhenPull(downstream) {
+    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)) {
+      Line.link(this, downstream);
+    }
+  }
   pullDeep() {
     const signal = this;
     if (signal.state & DirtyState) {
@@ -856,11 +868,7 @@ const _Signal = class _Signal {
       });
     }
     const downstream = G.PullingSignal;
-    if (this !== downstream && // 2. 有下游
-    downstream && // 3. 下游是 watcher 不是 watch，或 是watcher 但 当前是 scope
-    ((downstream.state & State.LinkScopeOnly) === 0 || this.state & State.IsScope)) {
-      Line.link(this, downstream);
-    }
+    this.linkWhenPull(downstream);
     return this.value;
   }
   get v() {
@@ -1028,10 +1036,11 @@ const shareSignal = (from, fromPath, to, toPath) => {
     const formPaths = Array.isArray(fromPath) ? fromPath : fromPath.split(".");
     runWithPulling(() => {
       const { target: fromTarget, key: fromKey } = getTargetAndKey(from, formPaths);
-      fromTarget[fromKey];
+      const val = fromTarget[fromKey];
       const fromSignal = fromTarget[Keys.Meta].cells.get(fromKey);
       const { target: toTarget, key: toKey } = getTargetAndKey(to, toPaths);
       toTarget[Keys.Meta].cells.set(toKey, fromSignal);
+      toTarget[Keys.Raw][toKey] = val;
     }, null);
   } catch (error) {
     console.error("\u6620\u5C04\u4E86\u4E0D\u5B58\u5728\u7684Key\uFF01");
@@ -1509,13 +1518,21 @@ const effect = (customPull, depOrOpt, opt) => {
   bound.ins = s;
   return bound;
 };
-const scope = (customPull) => {
+const scope = (...args) => {
+  const hasScope = args.length > 1;
   const s = Signal.create(null, {
-    customPull,
+    customPull: args[0],
     scheduler: Scheduler.Sync,
-    isScope: true
+    isScope: true,
+    scope: hasScope ? args[1] : G.PullingSignal
   });
-  s.v;
+  if (hasScope) {
+    runWithPulling(() => {
+      s.v;
+    }, args[1]);
+  } else {
+    s.v;
+  }
   s.state |= State.ScopeReady;
   const bound = dispose.bind(s);
   bound.ins = s;
@@ -1537,6 +1554,7 @@ exports.$ = $;
 exports.IsStore = IsStore;
 exports.Keys = Keys;
 exports.Scheduler = Scheduler;
+exports.Signal = Signal;
 exports.Store = Store;
 exports.StoreIgnoreKeys = StoreIgnoreKeys;
 exports.TaskQueue = TaskQueue;
@@ -1553,4 +1571,5 @@ exports.runWithPulling = runWithPulling;
 exports.scope = scope;
 exports.setPulling = setPulling;
 exports.shareSignal = shareSignal;
+exports.toRaw = toRaw;
 //# sourceMappingURL=aoye.cjs.js.map