aoye 0.0.43 → 0.0.45

package/dist/index.umd.js

@@ -20,12 +20,120 @@
     return ret;
   }
 
+  let ScheduleType = function (ScheduleType) {
+    ScheduleType[ScheduleType["Sync"] = 1] = "Sync";
+    ScheduleType[ScheduleType["Pre"] = 2] = "Pre";
+    ScheduleType[ScheduleType["Render"] = 4] = "Render";
+    ScheduleType[ScheduleType["Post"] = 8] = "Post";
+    return ScheduleType;
+  }({});
+
+  class MultiScheduler {
+    hasTask = 0;
+    taskMap = {};
+    constructor(queueCount) {
+      for (let i = 0; i < queueCount; i++) {
+        this.taskMap[1 << i] = {
+          head: null,
+          tail: null
+        };
+      }
+    }
+    addTask(queueId, task) {
+      const queue = this.taskMap[queueId];
+      const tail = queue.tail;
+      const item = {
+        value: task,
+        next: null
+      };
+      if (tail) {
+        tail.next = item;
+      } else {
+        queue.head = item;
+      }
+      queue.tail = item;
+      this.hasTask |= queueId;
+    }
+    flushAllTask() {
+      while (this.hasTask) {
+        const hasTask = this.hasTask;
+        const highest = hasTask & ~hasTask + 1;
+        const task = this.consumeTask(highest).value;
+        task.get();
+      }
+    }
+    consumeTask(queueId) {
+      const queue = this.taskMap[queueId];
+      const head = queue.head,
+        tail = queue.tail;
+      const next = head.next;
+      head.next = null;
+      if (head === tail) {
+        queue.head = null;
+        queue.tail = null;
+        this.hasTask &= ~queueId;
+      } else {
+        head.next = null;
+        queue.head = next;
+      }
+      return head;
+    }
+  }
+  const multiScheduler = new MultiScheduler(4);
+
+  let Keys = function (Keys) {
+    Keys["Iterator"] = "__AOYE_ITERATOR";
+    Keys["Raw"] = "__AOYE_RAW";
+    Keys["Meta"] = "__AOYE_META";
+    Keys["ProxyFreeObject"] = "__AOYE_PROXY_FREE_OBJECT";
+    return Keys;
+  }({});
+  const IsStore = Symbol('__AOYE_IS_STORE'),
+    StoreIgnoreKeys = Symbol('__AOYE_IGNORE_KEYS');
+
+  const ide = globalThis.requestIdleCallback || (globalThis.requestAnimationFrame ? fn => globalThis.requestAnimationFrame(() => {
+    setTimeout(() => {
+      fn();
+    });
+  }) : globalThis.setTimeout);
+  const now = () => {
+    const timer = globalThis.performance || globalThis.Date;
+    return timer.now();
+  };
+  let channel = globalThis.MessageChannel ? new MessageChannel() : null;
+  if (globalThis.MessageChannel) {
+    channel = new MessageChannel();
+  }
+  let msgId = 0;
+  const macro = fn => {
+    if (!channel) {
+      setTimeout(fn);
+    }
+    const memoId = msgId;
+    function onMessage(e) {
+      if (memoId === e.data) {
+        fn();
+        channel.port2.removeEventListener('message', onMessage);
+      }
+    }
+    channel.port2.addEventListener('message', onMessage);
+    channel.port1.postMessage(msgId++);
+  };
+  const p = Promise.resolve();
+  const micro = cb => {
+    p.then(cb);
+  };
+  const toRaw = a => {
+    if (typeof a === 'object' && a !== null && a[Keys.Raw]) {
+      return toRaw(a[Keys.Raw]);
+    }
+    return a;
+  };
+
   function mark(signal) {
     let line = signal.emitHead;
     while (line) {
-      const _line = line,
-        down = _line.down;
-        _line.up;
+      const down = line.down;
       const scope = down.scope,
         emitHead = down.emitHead,
         state = down.state;
@@ -34,7 +142,11 @@
         down.state |= notLocked ? 2 : 16;
         if (state & 32) {
           if (notLocked && state & 512) {
-            addEffect(down);
+            if (down.type === ScheduleType.Sync) {
+              addEffect(down);
+            } else {
+              multiScheduler.addTask(down.type, down);
+            }
           }
         } else if (emitHead) {
           markUnknownDeep(emitHead);
@@ -51,9 +163,7 @@
       let line = stack[--len];
       stack[len] = null;
       while (line) {
-        const _line2 = line,
-          down = _line2.down;
-          _line2.up;
+        const down = line.down;
         const state = down.state,
           scope = down.scope;
         if (scope && scope.state & 128 || noPulling && state & 6) ; else {
@@ -61,7 +171,11 @@
           down.state |= notLocked ? 4 : 8;
           if (state & 32) {
             if (notLocked && state & 512) {
-              addEffect(down);
+              if (down.type === ScheduleType.Sync) {
+                addEffect(down);
+              } else {
+                multiScheduler.addTask(down.type, down);
+              }
             }
           } else if (down.emitHead) {
             stack[len++] = down.emitHead;
@@ -105,8 +219,8 @@
             if (noGoSibling = value !== prevValue) {
               let line = node.emitHead;
               while (line) {
-                const _line3 = line,
-                  down = _line3.down;
+                const _line = line,
+                  down = _line.down;
                 down.state &= -5;
                 down.state |= 2;
                 line = line.nextEmitLine;
@@ -150,7 +264,7 @@
   function addEffect(effect) {
     effectQueue[++produceI] = effect;
   }
-  function flushEffect() {
+  function flushSyncEffect() {
     if (consumeI !== -1) {
       return;
     }
@@ -164,12 +278,20 @@
     consumeI = -1;
     produceI = -1;
   }
+  function flushMicroEffect() {
+    if (multiScheduler.hasTask) {
+      micro(() => {
+        multiScheduler.flushAllTask();
+      });
+    }
+  }
   let _batchDeep = 0;
   const batchStart = () => _batchDeep++;
   const batchEnd = () => {
     _batchDeep--;
     if (_batchDeep === 0) {
-      flushEffect();
+      flushSyncEffect();
+      flushMicroEffect();
     }
   };
   const batchDeep = () => _batchDeep;
@@ -497,7 +619,8 @@
       if (this.emitHead) {
         mark(this);
         if (batchDeep() === 0) {
-          flushEffect();
+          flushSyncEffect();
+          flushMicroEffect();
         }
       }
     }
@@ -513,8 +636,9 @@
     scope = getPulling();
     outLink = null;
     clean = null;
-    constructor(callback) {
+    constructor(callback, type = ScheduleType.Sync) {
       this.callback = callback;
+      this.type = type;
       this.get();
     }
     get(shouldLink = true, notForceUpdate = true) {
@@ -581,16 +705,6 @@
   }
   Scope.prototype.dispose = dispose;
 
-  let Keys = function (Keys) {
-    Keys["Iterator"] = "__AOYE_ITERATOR";
-    Keys["Raw"] = "__AOYE_RAW";
-    Keys["Meta"] = "__AOYE_META";
-    Keys["ProxyFreeObject"] = "__AOYE_PROXY_FREE_OBJECT";
-    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";
@@ -609,45 +723,6 @@
   State.ScopeReady | State.ScopeAbort;
   State.ScopeAbort;
 
-  const ide = globalThis.requestIdleCallback || (globalThis.requestAnimationFrame ? fn => globalThis.requestAnimationFrame(() => {
-    setTimeout(() => {
-      fn();
-    });
-  }) : globalThis.setTimeout);
-  const now = () => {
-    const timer = globalThis.performance || globalThis.Date;
-    return timer.now();
-  };
-  let channel = globalThis.MessageChannel ? new MessageChannel() : null;
-  if (globalThis.MessageChannel) {
-    channel = new MessageChannel();
-  }
-  let msgId = 0;
-  const macro = fn => {
-    if (!channel) {
-      setTimeout(fn);
-    }
-    const memoId = msgId;
-    function onMessage(e) {
-      if (memoId === e.data) {
-        fn();
-        channel.port2.removeEventListener('message', onMessage);
-      }
-    }
-    channel.port2.addEventListener('message', onMessage);
-    channel.port1.postMessage(msgId++);
-  };
-  const p = Promise.resolve();
-  const micro = cb => {
-    p.then(cb);
-  };
-  const toRaw = a => {
-    if (typeof a === 'object' && a !== null && a[Keys.Raw]) {
-      return toRaw(a[Keys.Raw]);
-    }
-    return a;
-  };
-
   const deepSignal = (target, scope, deep = true) => {
     const isObj = typeof target === 'object' && target !== null;
     if (!isObj || target[Keys.Raw] || target[Keys.ProxyFreeObject]) return target;
@@ -1173,11 +1248,14 @@
       };
     }
   }
+  ({
+    type: ScheduleType.Sync
+  });
   function effectUt(callback, depOrOpt, opt) {
     const hasDep = Array.isArray(depOrOpt);
     opt = hasDep ? opt || {} : depOrOpt || {};
     if (!hasDep) {
-      const ef = new Effect(callback);
+      const ef = new Effect(callback, opt.type);
       const run = ef.dispose.bind(ef);
       run.ins = ef;
       return run;
@@ -1191,19 +1269,19 @@
       old: null,
       val: null
     }));
-    const ef = new Effect(() => {
+    const ef = new Effect(eff => {
       for (let i = 0; i < deps.length; i++) {
         const value = deps[i].v;
         vs[i].old = vs[i].val;
         vs[i].val = value;
       }
       if (mounted || immediate) {
-        ef.state |= 256;
+        eff.state |= 256;
         callback(...vs);
-        ef.state &= -257;
+        eff.state &= -257;
       }
       mounted = true;
-    });
+    }, opt.type);
     const run = ef.dispose.bind(ef);
     run.ins = ef;
     return run;
@@ -1212,7 +1290,7 @@
     const hasDep = Array.isArray(depOrOpt);
     opt = hasDep ? opt || {} : depOrOpt || {};
     if (!hasDep) {
-      const ef = new Effect(callback);
+      const ef = new Effect(callback, opt.type);
       return ef;
     }
     let mounted = false;
@@ -1236,7 +1314,7 @@
         eff.state &= -257;
       }
       mounted = true;
-    });
+    }, opt.type);
     return ef;
   }
   function scope(...args) {
@@ -1255,6 +1333,7 @@
   exports.Effect = Effect;
   exports.IsStore = IsStore;
   exports.Keys = Keys;
+  exports.ScheduleType = ScheduleType;
   exports.Scope = Scope;
   exports.Signal = Signal;
   exports.Store = Store;