aoye 0.0.19 → 0.0.21

package/dist/index.d.ts

@@ -88,6 +88,7 @@ type ValueDiff = {
     old: any;
     val: any;
 };
+type CreateScope = (customPull: () => void, scope?: Signal) => Dispose;
 type Dispose = {
     (): void;
     ins: Signal;
@@ -135,7 +136,7 @@ declare class Line {
 }
 
 declare class Signal<T = any> implements Vertex {
-    private nextValue;
+    nextValue: T;
     /** 为什么是 shallow，因为 pullDeep 会把
      * 上游节点 get 执行完成，让其可以直接拿到缓存值
      */
@@ -165,6 +166,7 @@ declare class Signal<T = any> implements Vertex {
      * 递归拉取负责建立以来链
      */
     pullRecurse(shouldLink?: boolean): T;
+    linkWhenPull(downstream: Signal): void;
     pullDeep(): T;
     get v(): T;
     markDownStreamsDirty(): void;
@@ -257,6 +259,8 @@ declare class Batch {
 }
 declare const batch: Batch;
 
+declare const toRaw: <T>(a: T) => any;
+
 declare const DefaultCustomSignalOpt: {
     /** 三种模式
      * 1. auto:   根据值类型自动判断 默认
@@ -281,7 +285,7 @@ type CreateSignal = {
 };
 declare const $: CreateSignal;
 declare const effect: (customPull: (...args: ValueDiff[]) => void, depOrOpt?: Signal<any>[] | CustomEffectOpt, opt?: CustomEffectOpt) => Dispose;
-declare const scope: (customPull: () => void) => Dispose;
+declare const scope: CreateScope;
 /**
  * 数据变化时，自定义 触发订阅函数的时机
  * @param {CustomSignalOpt} opt 配置如下:
@@ -292,5 +296,5 @@ declare const customEffect: (opt?: CustomEffectOpt) => typeof effect;
 declare const isSignal: (value: unknown) => value is Signal;
 declare const isScope: (value: any) => boolean;
 
-export { $, IsStore, Keys, Scheduler, Signal, Store, StoreIgnoreKeys, TaskQueue, batch, clean, customEffect, deepSignal, effect, getPulling, isScope, isSignal, registerScheduler, runWithPulling, scope, setPulling, shareSignal };
-export type { CreateSignal, CreateTaskProps, CustomEffectOpt, CustomSignalOpt, DFSCtxBegin, DFSCtxCompete, DeepOmitPath, DeepPath, DeepValue, Dispose, Getter, Key, MatchValue, Mix, PRecord, ScheduleHandler, SignalOpt, SignalType, Task, TaskControlReturn, ValueDiff, Vertex };
+export { $, IsStore, Keys, Scheduler, Signal, Store, StoreIgnoreKeys, TaskQueue, batch, clean, customEffect, deepSignal, effect, getPulling, isScope, isSignal, registerScheduler, runWithPulling, scope, setPulling, shareSignal, toRaw };
+export type { CreateScope, CreateSignal, CreateTaskProps, CustomEffectOpt, CustomSignalOpt, DFSCtxBegin, DFSCtxCompete, DeepOmitPath, DeepPath, DeepValue, Dispose, Getter, Key, MatchValue, Mix, PRecord, ScheduleHandler, SignalOpt, SignalType, Task, TaskControlReturn, ValueDiff, Vertex };

package/dist/index.umd.js

@@ -245,9 +245,9 @@
       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;
@@ -263,8 +263,8 @@
   class SyncScheduler extends Scheduler {
     onOneSetEffectsAdded(subQueue, queue) {
       subQueue.forEach((effect, item) => {
-        effect.runIfDirty();
         queue.delete(item);
+        effect.runIfDirty();
       });
     }
   }
@@ -276,8 +276,8 @@
     onOneSetEffectsAdded(subQueue, queue) {
       const task = () => {
         subQueue.forEach((effect, item) => {
-          effect.runIfDirty();
           queue.delete(item);
+          effect.runIfDirty();
         });
         return {
           finished: true,
@@ -296,8 +296,8 @@
     onOneSetEffectsAdded(subQueue, queue) {
       const task = () => {
         subQueue.forEach((effect, item) => {
-          effect.runIfDirty();
           queue.delete(item);
+          effect.runIfDirty();
         });
       };
       task.time = Date.now();
@@ -312,8 +312,8 @@
     onOneSetEffectsAdded(subQueue, queue) {
       const task = () => {
         subQueue.forEach((effect, item) => {
-          effect.runIfDirty();
           queue.delete(item);
+          effect.runIfDirty();
         });
       };
       task.time = Date.now();
@@ -326,6 +326,7 @@
     [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;
@@ -714,6 +715,9 @@
           updatedSchedulers.add(key);
         }
         level++;
+        if (isLeaf) {
+          return true;
+        }
       }
     });
     if (batch.inBatch()) return;
@@ -773,13 +777,7 @@
       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;
@@ -790,7 +788,7 @@
         (_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;
@@ -810,6 +808,20 @@
         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) {
@@ -858,11 +870,7 @@
         });
       }
       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() {
@@ -1030,10 +1038,11 @@
       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");
@@ -1511,13 +1520,21 @@
     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;
@@ -1539,6 +1556,7 @@
   exports.IsStore = IsStore;
   exports.Keys = Keys;
   exports.Scheduler = Scheduler;
+  exports.Signal = Signal;
   exports.Store = Store;
   exports.StoreIgnoreKeys = StoreIgnoreKeys;
   exports.TaskQueue = TaskQueue;
@@ -1555,6 +1573,7 @@
   exports.scope = scope;
   exports.setPulling = setPulling;
   exports.shareSignal = shareSignal;
+  exports.toRaw = toRaw;
 
 }));
 //# sourceMappingURL=index.umd.js.map