aoye 0.0.44 → 0.0.46

package/dist/aoye.cjs.js

@@ -18,12 +18,126 @@ function runWithPulling(fn, scope) {
   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;
+}({});
+let ScheduleStatus = function (ScheduleStatus) {
+  ScheduleStatus[ScheduleStatus["Idle"] = 0] = "Idle";
+  ScheduleStatus[ScheduleStatus["Ready"] = 1] = "Ready";
+  ScheduleStatus[ScheduleStatus["Running"] = 2] = "Running";
+  return ScheduleStatus;
+}({});
+
+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;
@@ -32,7 +146,11 @@ function mark(signal) {
       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);
@@ -49,9 +167,7 @@ function markUnknownDeep(initialLine) {
     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 {
@@ -59,7 +175,11 @@ function markUnknownDeep(initialLine) {
         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;
@@ -103,8 +223,8 @@ function pullDeep(root) {
           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;
@@ -148,7 +268,7 @@ let consumeI = -1,
 function addEffect(effect) {
   effectQueue[++produceI] = effect;
 }
-function flushEffect() {
+function flushSyncEffect() {
   if (consumeI !== -1) {
     return;
   }
@@ -162,12 +282,24 @@ function flushEffect() {
   consumeI = -1;
   produceI = -1;
 }
+let schedulerStatus = ScheduleStatus.Idle;
+function flushMicroEffect() {
+  if (schedulerStatus === ScheduleStatus.Idle && multiScheduler.hasTask) {
+    schedulerStatus = ScheduleStatus.Ready;
+    micro(() => {
+      schedulerStatus = ScheduleStatus.Running;
+      multiScheduler.flushAllTask();
+      schedulerStatus = ScheduleStatus.Idle;
+    });
+  }
+}
 let _batchDeep = 0;
 const batchStart = () => _batchDeep++;
 const batchEnd = () => {
   _batchDeep--;
   if (_batchDeep === 0) {
-    flushEffect();
+    flushSyncEffect();
+    flushMicroEffect();
   }
 };
 const batchDeep = () => _batchDeep;
@@ -495,7 +627,8 @@ class Signal {
     if (this.emitHead) {
       mark(this);
       if (batchDeep() === 0) {
-        flushEffect();
+        flushSyncEffect();
+        flushMicroEffect();
       }
     }
   }
@@ -511,8 +644,9 @@ class Effect {
   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) {
@@ -579,16 +713,6 @@ class Scope {
 }
 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";
@@ -607,45 +731,6 @@ State.Unknown | State.Dirty;
 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;
@@ -1171,11 +1256,14 @@ function $(data) {
     };
   }
 }
+({
+  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;
@@ -1189,19 +1277,19 @@ function effectUt(callback, depOrOpt, opt) {
     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;
@@ -1210,7 +1298,7 @@ function effect(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);
     return ef;
   }
   let mounted = false;
@@ -1234,7 +1322,7 @@ function effect(callback, depOrOpt, opt) {
       eff.state &= -257;
     }
     mounted = true;
-  });
+  }, opt.type);
   return ef;
 }
 function scope(...args) {
@@ -1253,6 +1341,8 @@ exports.Computed = Computed;
 exports.Effect = Effect;
 exports.IsStore = IsStore;
 exports.Keys = Keys;
+exports.ScheduleStatus = ScheduleStatus;
+exports.ScheduleType = ScheduleType;
 exports.Scope = Scope;
 exports.Signal = Signal;
 exports.Store = Store;