@expressive/mvc 0.4.3 → 0.4.4

package/lib/index.js

@@ -172,11 +172,10 @@ const Oops$a = issues({
     Failed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} [${parent}.${property}].`
 });
 const INFO = new WeakMap();
-const USED = new WeakMap();
 const KEYS = new WeakMap();
+const ORDER = new WeakMap();
 function from(source, arg1, arg2) {
     return apply(function from(key) {
-        const parent = this;
         const { subject, state } = this;
         const required = arg2 === true || arg1 === true;
         let getSource;
@@ -197,14 +196,13 @@ function from(source, arg1, arg2) {
         else
             throw Oops$a.BadSource(subject, key, source);
         const setter = arg1;
-        const info = { key, parent, priority: 1 };
+        const info = { key, parent: this };
         let sub;
-        let register = USED.get(parent);
-        if (!register)
-            USED.set(parent, register = new Map());
+        let order = ORDER.get(this);
+        if (!order)
+            ORDER.set(this, order = []);
         state.set(key, undefined);
-        register.set(key, info);
-        function compute(initial) {
+        const compute = (initial) => {
             try {
                 return setter.call(sub.proxy, sub.proxy);
             }
@@ -212,8 +210,8 @@ function from(source, arg1, arg2) {
                 Oops$a.Failed(subject, key, initial).warn();
                 throw err;
             }
-        }
-        function update() {
+        };
+        const refreshValue = () => {
             let value;
             try {
                 value = compute(false);
@@ -223,26 +221,25 @@ function from(source, arg1, arg2) {
             }
             finally {
                 if (state.get(key) !== value) {
-                    parent.state.set(key, value);
-                    parent.update(key);
+                    state.set(key, value);
+                    this.update(key);
                     return value;
                 }
             }
-        }
-        function defer(_key, from) {
-            let pending = KEYS.get(from);
-            if (!pending)
-                KEYS.set(from, pending = []);
-            if (info.parent !== from)
-                update();
-            else {
-                const after = pending.findIndex(peer => (info.priority > INFO.get(peer).priority));
-                pending.splice(after + 1, 0, update);
+        };
+        const dependancyDidUpdate = (_key, source) => {
+            if (source !== this) {
+                refreshValue();
+                return;
             }
-        }
-        function create() {
+            let pending = KEYS.get(this);
+            if (!pending)
+                KEYS.set(this, pending = []);
+            pending.push(refreshValue);
+        };
+        const create = () => {
             const control = getSource();
-            sub = control.subscribe(defer);
+            sub = control.subscribe(dependancyDidUpdate);
             try {
                 const value = compute(true);
                 state.set(key, value);
@@ -253,14 +250,10 @@ function from(source, arg1, arg2) {
             }
             finally {
                 sub.commit();
-                for (const key of control.state.keys()) {
-                    const peer = register.get(key);
-                    if (peer && peer.priority >= info.priority)
-                        info.priority = peer.priority + 1;
-                }
+                order.push(refreshValue);
             }
-        }
-        INFO.set(update, info);
+        };
+        INFO.set(refreshValue, info);
         return () => {
             const value = sub ? state.get(key) : create();
             if (value === undefined && required)
@@ -273,8 +266,11 @@ function flush(control) {
     const pending = KEYS.get(control);
     if (!pending)
         return;
+    const list = ORDER.get(control);
     while (pending.length) {
-        const compute = pending.shift();
+        const compute = pending
+            .sort((a, b) => list.indexOf(b) - list.indexOf(a))
+            .pop();
         const { key } = INFO.get(compute);
         if (!control.frame.has(key))
             compute();
@@ -299,18 +295,16 @@ class Subscriber {
             }
         });
         const release = parent.addListener(key => {
-            if (!this.active || !using.has(key))
+            if (!this.active)
                 return;
             const handler = using.get(key);
             let notify;
             if (typeof handler == "function") {
                 const callback = handler();
-                if (typeof callback == "function")
-                    notify = callback;
-                else if (callback === true)
+                if (callback === true)
                     notify = this.onUpdate(key, parent);
             }
-            else
+            else if (handler === true)
                 notify = this.onUpdate(key, parent);
             const getWhy = () => {
                 const update = getUpdate(parent.subject);
@@ -332,7 +326,7 @@ class Subscriber {
             release();
         };
         this.add = (key, value) => {
-            if (value)
+            if (value !== undefined)
                 using.set(key, value);
             else if (!using.has(key))
                 using.set(key, true);
@@ -406,17 +400,15 @@ class Controller {
         else if (!frame.size)
             setTimeout(() => {
                 flush(this);
-                const callback = Array.from(waiting);
-                const keys = Array.from(frame);
-                frame.clear();
-                waiting.clear();
-                UPDATE.set(subject, keys);
+                UPDATE.set(subject, Array.from(frame));
                 setTimeout(() => {
                     UPDATE.delete(subject);
                 }, 0);
-                for (const cb of callback)
+                frame.clear();
+                for (const notify of waiting)
                     try {
-                        cb();
+                        waiting.delete(notify);
+                        notify();
                     }
                     catch (err) {
                         console.error(err);
@@ -667,6 +659,14 @@ function apply(fn, label) {
         const desc = output;
         if ("value" in desc)
             state.set(key, desc.value);
+        if ("destroy" in output) {
+            const { destroy } = output;
+            if (destroy)
+                this.addListener((key) => {
+                    if (key == null)
+                        destroy();
+                });
+        }
         const { get: onGet, set: onSet, enumerable, suspense } = desc;
         const set = onSet !== false
             ? this.ref(key, onSet)
@@ -948,39 +948,31 @@ const ANY$1 = Symbol("any");
 function managedMap(control, property, initial) {
     const managed = new ManagedMap(initial, emit);
     const context = new WeakMap();
-    const lastUpdate = new Set();
+    const observers = new Set();
+    const frozen = new Set();
     function reset() {
-        lastUpdate.clear();
+        frozen.clear();
     }
     function emit(key) {
-        lastUpdate.add(key);
+        observers.forEach(notify => notify(key));
         control.update(property);
         control.waiting.add(reset);
     }
-    function setValue(next) {
-        control.state.set(property, next);
-        managed.source = next;
-        emit(ANY$1);
-    }
-    function getValue(local) {
-        if (!local)
-            return managed;
-        if (context.has(local))
-            return context.get(local);
-        const refresh = local.onUpdate(property, control);
+    function init(local) {
         const proxy = create(managed);
         const using = new Set();
-        const update = () => {
-            if (using.has(ANY$1) || lastUpdate.has(ANY$1) && using.size)
-                refresh();
-            else
-                for (const key of lastUpdate)
-                    if (using.has(key)) {
-                        refresh();
-                        break;
-                    }
-        };
-        local.add(property, () => update);
+        observers.add(key => {
+            if (frozen.has(local))
+                return;
+            if (using.has(key) || using.has(ANY$1) || key === ANY$1 && using.size) {
+                const refresh = local.onUpdate(property, control);
+                if (refresh) {
+                    frozen.add(local);
+                    refresh();
+                }
+            }
+        });
+        local.add(property, false);
         context.set(local, proxy);
         proxy.watch = (key) => {
             if (!local.active)
@@ -990,8 +982,21 @@ function managedMap(control, property, initial) {
     }
     return {
         value: initial,
-        set: setValue,
-        get: getValue
+        get(local) {
+            if (!local)
+                return managed;
+            if (context.has(local))
+                return context.get(local);
+            return init(local);
+        },
+        set(next) {
+            managed.source = next;
+            control.state.set(property, next);
+            emit(ANY$1);
+        },
+        destroy() {
+            observers.clear();
+        }
     };
 }
 class ManagedMap {
@@ -1053,39 +1058,31 @@ const ANY = Symbol("any");
 function managedSet(control, property, initial) {
     const managed = new ManagedSet(initial, emit);
     const context = new WeakMap();
-    const lastUpdate = new Set();
+    const observers = new Set();
+    const frozen = new Set();
     function reset() {
-        lastUpdate.clear();
+        frozen.clear();
     }
     function emit(key) {
-        lastUpdate.add(key);
+        observers.forEach(notify => notify(key));
         control.update(property);
         control.waiting.add(reset);
     }
-    function setValue(next) {
-        managed.source = next;
-        control.state.set(property, next);
-        emit(ANY);
-    }
-    function getValue(local) {
-        if (!local)
-            return managed;
-        if (context.has(local))
-            return context.get(local);
-        const refresh = local.onUpdate(property, control);
+    function init(local) {
         const proxy = create(managed);
         const using = new Set();
-        const update = () => {
-            if (using.has(ANY) || lastUpdate.has(ANY) && using.size)
-                refresh();
-            else
-                for (const key of lastUpdate)
-                    if (using.has(key)) {
-                        refresh();
-                        break;
-                    }
-        };
-        local.add(property, () => update);
+        observers.add(key => {
+            if (frozen.has(local))
+                return;
+            if (using.has(key) || using.has(ANY) || key === ANY && using.size) {
+                const refresh = local.onUpdate(property, control);
+                if (refresh) {
+                    frozen.add(local);
+                    refresh();
+                }
+            }
+        });
+        local.add(property, false);
         context.set(local, proxy);
         proxy.watch = (key) => {
             if (!local.active)
@@ -1095,8 +1092,21 @@ function managedSet(control, property, initial) {
     }
     return {
         value: initial,
-        set: setValue,
-        get: getValue
+        get(local) {
+            if (!local)
+                return managed;
+            if (context.has(local))
+                return context.get(local);
+            return init(local);
+        },
+        set(next) {
+            managed.source = next;
+            control.state.set(property, next);
+            emit(ANY);
+        },
+        destroy() {
+            observers.clear();
+        }
     };
 }
 class ManagedSet {
@@ -1106,8 +1116,9 @@ class ManagedSet {
     }
     watch(_key) { }
     add(key) {
+        this.source.add(key);
         this.emit(key);
-        return this.source.add(key);
+        return this;
     }
     ;
     delete(key) {