aoye 0.0.24 → 0.0.26

package/dist/index.d.ts

@@ -1,39 +1,7 @@
-declare const enum State {
-    Clean = 0,
-    /** Computed 首屏时一定要执行 */
-    IsEffect = 512,
-    /** watch 节点执行 watcher 时只连接 scope */
-    LinkScopeOnly = 256,
-    /** 仅用于 scope 节点是否 abort */
-    ScopeAbort = 128,
-    /** 仅用于 scope 节点是否 ready */
-    ScopeReady = 64,
-    /** 当前节点是 scope 节点 */
-    IsScope = 32,
-    /** 当前节点正在 pull 递归中标记为 dirty, 保证 pulling 过程中不影响 dirty 传播 */
-    PullingNeedCompute = 16,
-    /** 当前节点正在 pull 递归中标记为 unknown, 保证 pulling 过程中不影响 dirty 传播 */
-    PullingUnknown = 8,
-    /** 当前节点可能变化 */
-    Unknown = 4,
-    /** 节点需要重新计算 */
-    NeedCompute = 2,
-    /** 给正在拉取的节点上 PullLock 锁 */
-    PullLock = 1
-}
-
-declare class Signal<T = any> {
-    value: T;
-    scope: Effect | Scope;
-    emitHead: Link;
-    emitTail: Link;
-    state: State;
-    constructor(value: T);
-    get(shouldLink?: boolean): T;
-    set(v: T): void;
-}
-
-type SignalNode = Partial<Signal & Effect & Scope & Computed>;
+type OnClean = (isDestroy: boolean) => any;
+type SignalNode = Partial<Omit<Computed, 'callback'> & {
+    dispose(): void;
+}>;
 type Link = {
     execId: number;
     up: SignalNode;
@@ -50,7 +18,7 @@ type OutLink = Link & {
 type SideEffect = Effect | Computed;
 
 declare class Scope {
-    callback: () => any;
+    callback: () => OnClean | any;
     emitHead: Link;
     emitTail: Link;
     recHead: Link;
@@ -58,8 +26,8 @@ declare class Scope {
     state: number;
     scope: Effect | Scope;
     outLink: OutLink;
-    clean?: () => void;
-    constructor(callback: () => any);
+    clean: OnClean;
+    constructor(callback: () => OnClean | any);
     get(shouldLink?: boolean): void;
 }
 interface Scope {
@@ -67,7 +35,7 @@ interface Scope {
 }
 
 declare class Effect {
-    callback: (thisArg: SignalNode) => any;
+    callback: (thisArg: Effect) => OnClean | void;
     emitHead: Link;
     emitTail: Link;
     recHead: Link;
@@ -75,16 +43,40 @@ declare class Effect {
     state: number;
     scope: Effect | Scope;
     outLink: OutLink;
-    clean: () => void;
-    constructor(callback: (thisArg: SignalNode) => any);
+    clean: OnClean;
+    constructor(callback: (thisArg: Effect) => OnClean | void);
     get(shouldLink?: boolean, notForceUpdate?: boolean): void;
 }
 interface Effect {
     dispose(): void;
 }
 
+declare const enum State {
+    Clean = 0,
+    /** Computed 首屏时一定要执行 */
+    IsEffect = 512,
+    /** watch 节点执行 watcher 时只连接 scope */
+    LinkScopeOnly = 256,
+    /** 仅用于 scope 节点是否 abort */
+    ScopeAbort = 128,
+    /** 仅用于 scope 节点是否 ready */
+    ScopeReady = 64,
+    /** 当前节点是 scope 节点 */
+    IsScope = 32,
+    /** 当前节点正在 pull 递归中标记为 dirty, 保证 pulling 过程中不影响 dirty 传播 */
+    PullingNeedCompute = 16,
+    /** 当前节点正在 pull 递归中标记为 unknown, 保证 pulling 过程中不影响 dirty 传播 */
+    PullingUnknown = 8,
+    /** 当前节点可能变化 */
+    Unknown = 4,
+    /** 节点需要重新计算 */
+    NeedCompute = 2,
+    /** 给正在拉取的节点上 PullLock 锁 */
+    PullLock = 1
+}
+
 declare class Computed<T = any> {
-    callback: (thisArgs: SignalNode) => T;
+    callback: (thisArgs: Computed) => T;
     emitHead: Link;
     emitTail: Link;
     recHead: Link;
@@ -92,13 +84,24 @@ declare class Computed<T = any> {
     state: State;
     scope: Effect | Scope;
     value: T;
-    constructor(callback: (thisArgs: SignalNode) => T);
+    constructor(callback: (thisArgs: Computed) => T);
     get(shouldLink?: boolean, notForceUpdate?: boolean): T;
 }
 
+declare class Signal<T = any> {
+    value: T;
+    scope: Effect | Scope;
+    emitHead: Link;
+    emitTail: Link;
+    state: State;
+    constructor(value: T);
+    get(shouldLink?: boolean): T;
+    set(v: T): void;
+}
+
 declare const batchStart: () => number;
 declare const batchEnd: () => void;
-declare function clean(onClean: () => any): void;
+declare function clean(onClean: OnClean): void;
 
 declare const execIdInc: () => number;
 /** effect、computed 回调执行的唯一 id
@@ -106,7 +109,9 @@ declare const execIdInc: () => number;
  */
 declare const execId: () => number;
 declare const setExecId: (v: number) => number;
-declare const setPulling: (v: SignalNode) => any;
+declare const setPulling: (v: SignalNode) => Partial<Omit<Computed<any>, "callback"> & {
+    dispose(): void;
+}>;
 declare const getPulling: () => any;
 declare function runWithPulling<T extends (...args: any[]) => any>(fn: T, scope: any): ReturnType<T>;
 
@@ -187,8 +192,8 @@ declare const DefaultCustomEffectOpt: {
 };
 type CustomEffectOpt = Partial<typeof DefaultCustomEffectOpt>;
 declare function effectUt(callback: (...args: ValueDiff[]) => void, depOrOpt?: any[] | CustomEffectOpt, opt?: CustomEffectOpt): any;
-declare function effect(callback: (...args: ValueDiff[]) => void, depOrOpt?: any[] | CustomEffectOpt, opt?: CustomEffectOpt): any;
+declare function effect(callback: (...args: ValueDiff[]) => void, depOrOpt?: any[] | CustomEffectOpt, opt?: CustomEffectOpt): Effect;
 declare function scope(...args: any[]): any;
 
 export { $, Computed, Effect, IsStore, Keys, Scope, Signal, Store, StoreIgnoreKeys, batchEnd, batchStart, clean, deepSignal, effect, effectUt, execId, execIdInc, getPulling, ide, macro, micro, now, runWithPulling, scope, setExecId, setPulling, shareSignal, toRaw };
-export type { CreateScope, CreateTaskProps, CustomEffectOpt, DeepOmitPath, DeepPath, DeepValue, Dispose, Key, Link, MatchValue, Mix, OutLink, PRecord, SideEffect, SignalNode, SignalType, Task, TaskControlReturn, ValueDiff };
+export type { CreateScope, CreateTaskProps, CustomEffectOpt, DeepOmitPath, DeepPath, DeepValue, Dispose, Key, Link, MatchValue, Mix, OnClean, OutLink, PRecord, SideEffect, SignalNode, SignalType, Task, TaskControlReturn, ValueDiff };

package/dist/index.umd.js

@@ -284,7 +284,7 @@
       outLink = next;
     }
     scope.state |= 128;
-    scope.clean?.();
+    scope.clean?.(true);
     scope.clean = null;
   }
 
@@ -525,7 +525,7 @@
       } else {
         this.state |= 1;
         setPulling(null);
-        this.clean?.();
+        this.clean?.(false);
         this.clean = null;
         const nextId = execIdInc();
         const prevId = execId();
@@ -561,6 +561,7 @@
     state = ScopeAndLinkScopeOnly;
     scope = getPulling();
     outLink = null;
+    clean = null;
     constructor(callback) {
       this.callback = callback;
     }
@@ -580,6 +581,15 @@
   }
   Scope.prototype.dispose = dispose;
 
+  let Keys = function (Keys) {
+    Keys["Iterator"] = "__AOYE_ITERATOR";
+    Keys["Raw"] = "__AOYE_RAW";
+    Keys["Meta"] = "__AOYE_META";
+    return Keys;
+  }({});
+  const IsStore = Symbol('__AOYE_IS_STORE'),
+    StoreIgnoreKeys = Symbol('__AOYE_IGNORE_KEYS');
+
   const rawToProxy = new WeakMap();
   let State = function (State) {
     State[State["Clean"] = 0] = "Clean";
@@ -598,15 +608,6 @@
   State.ScopeReady | State.ScopeAbort;
   State.ScopeAbort;
 
-  let Keys = function (Keys) {
-    Keys["Iterator"] = "__AOYE_ITERATOR";
-    Keys["Raw"] = "__AOYE_RAW";
-    Keys["Meta"] = "__AOYE_META";
-    return Keys;
-  }({});
-  const IsStore = Symbol('__AOYE_IS_STORE'),
-    StoreIgnoreKeys = Symbol('__AOYE_IGNORE_KEYS');
-
   const ide = globalThis.requestIdleCallback || (globalThis.requestAnimationFrame ? fn => globalThis.requestAnimationFrame(() => {
     setTimeout(() => {
       fn();
@@ -691,6 +692,7 @@
         }
         const wrappedValue = deep ? deepSignal(value, scope) : value;
         s = new Signal(wrappedValue);
+        s.scope = scope;
         cells.set(prop, s);
         return s.get();
       },
@@ -1210,9 +1212,7 @@
     opt = hasDep ? opt || {} : depOrOpt || {};
     if (!hasDep) {
       const ef = new Effect(callback);
-      const run = ef.dispose.bind(ef);
-      run.ins = ef;
-      return run;
+      return ef;
     }
     let mounted = false;
     const deps = depOrOpt;
@@ -1236,9 +1236,7 @@
       }
       mounted = true;
     });
-    const run = ef.dispose.bind(ef);
-    run.ins = ef;
-    return run;
+    return ef;
   }
   function scope(...args) {
     const ins = new Scope(args[0]);