@expressive/mvc 0.9.0 → 0.9.1

package/lib/index.js

@@ -81,8 +81,11 @@ function computeMode(self, source, setter, key, required) {
     const { subject, state } = self;
     let sub;
     let order = ORDER.get(self);
+    let pending = KEYS.get(self);
     if (!order)
-        ORDER.set(self, order = []);
+        ORDER.set(self, order = new Map());
+    if (!pending)
+        KEYS.set(self, pending = new Set());
     const compute = (initial) => {
         try {
             return setter.call(sub.proxy, sub.proxy);
@@ -108,18 +111,13 @@ function computeMode(self, source, setter, key, required) {
             }
         }
     };
-    const update = (_key, source) => {
-        if (source !== self) {
-            refresh();
-            return;
-        }
-        let pending = KEYS.get(self);
-        if (!pending)
-            KEYS.set(self, pending = []);
-        pending.push(refresh);
-    };
     const create = () => {
-        sub = source.subscribe(update);
+        sub = source.subscribe((_, source) => {
+            if (source !== self)
+                refresh();
+            else
+                pending.add(refresh);
+        });
         try {
             const value = compute(true);
             state.set(key, value);
@@ -130,11 +128,15 @@ function computeMode(self, source, setter, key, required) {
         }
         finally {
             sub.commit();
-            order.push(refresh);
+            order.set(refresh, order.size);
         }
     };
     INFO.set(refresh, key);
     return () => {
+        if (pending.has(refresh)) {
+            pending.delete(refresh);
+            refresh();
+        }
         const value = sub ? state.get(key) : create();
         if (value === undefined && required)
             throw suspend(self, key);
@@ -143,18 +145,20 @@ function computeMode(self, source, setter, key, required) {
 }
 function flush(control) {
     const pending = KEYS.get(control);
-    if (!pending)
+    if (!pending || !pending.size)
         return;
-    const list = ORDER.get(control);
-    while (pending.length) {
-        const compute = pending
-            .sort((a, b) => list.indexOf(b) - list.indexOf(a))
-            .pop();
+    const priority = ORDER.get(control);
+    while (pending.size) {
+        let compute;
+        for (const item of pending)
+            if (!compute || priority.get(item) < priority.get(compute))
+                compute = item;
+        pending.delete(compute);
         const key = INFO.get(compute);
         if (!control.frame.has(key))
             compute();
     }
-    KEYS.delete(control);
+    pending.clear();
 }
 
 const REGISTER$1 = new WeakMap();