@expressive/mvc 1.0.0-beta.26 → 1.0.0-beta.27

package/lib/index.js

@@ -96,14 +96,34 @@ class Subscriber {
     constructor(parent, onUpdate) {
         this.onUpdate = onUpdate;
         this.active = false;
-        this.follows = {};
+        this.handle = {};
         this.dependant = new Set();
+        this.debug = () => {
+            const update = [];
+            this.notify = keys => {
+                update.splice(0, update.length, ...keys.filter(k => k in this.handle));
+            };
+            return update;
+        };
+        this.listen = (key, from) => {
+            const handler = this.handle[key];
+            if (!handler)
+                return;
+            if (typeof handler == "function")
+                handler();
+            const notify = this.onUpdate(key, from);
+            if (notify)
+                from.waiting.add(notify);
+            if (this.notify)
+                from.waiting.add(this.notify);
+        };
         if (!(parent instanceof Controller))
             parent = manage(parent);
         this.parent = parent;
         this.source = parent.subject;
         this.proxy = create(parent.subject);
         define(this.proxy, LOCAL, this);
+        defineLazy(this.proxy, UPDATE, this.debug);
         for (const key in parent.state)
             this.spy(key);
     }
@@ -123,16 +143,15 @@ class Subscriber {
             enumerable: true
         });
     }
-    follow(key, cb) {
-        this.follows[key] = cb || this.onUpdate;
+    follow(key, callback) {
+        this.handle[key] = callback || true;
     }
     commit() {
-        const { dependant, follows, parent } = this;
-        const onDone = parent.addListener(follows);
+        const onDone = this.parent.addListener(this.listen);
         this.active = true;
-        dependant.forEach(x => x.commit());
+        this.dependant.forEach(x => x.commit());
         return this.release = () => {
-            dependant.forEach(x => x.release());
+            this.dependant.forEach(x => x.release());
             onDone();
         };
     }
@@ -142,18 +161,23 @@ const Oops$8 = issues({
     ComputeFailed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} [${parent}.${property}].`,
     ComputedEarly: (property) => `Note: Computed values don't run until accessed, except when subscribed to. '${property}' getter may have run earlier than intended.`
 });
-const ComputedInit = new WeakSet();
-const ComputedInfo = new WeakMap();
-const ComputedUsed = new WeakMap();
-const ComputedKeys = new WeakMap();
+const INIT = new WeakSet();
+const INFO = new WeakMap();
+const USED = new WeakMap();
+const KEYS = new WeakMap();
 function prepare(parent, key, source, setter, getter) {
     let sub;
     const { state, subject } = parent;
     const info = { key, parent, priority: 1 };
+    let register = USED.get(parent);
+    if (!register) {
+        register = new Map();
+        USED.set(parent, register);
+    }
+    register.set(key, info);
     const current = getter
         ? () => getter.call(subject, state[key], key)
         : () => state[key];
-    const prioritize = register(parent, key, info);
     function compute(initial) {
         try {
             return setter.call(sub.proxy, sub.proxy);
@@ -178,8 +202,19 @@ function prepare(parent, key, source, setter, getter) {
             }
         }
     }
+    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);
+        }
+    }
     function create(early) {
-        sub = new Subscriber(source(), update);
+        sub = new Subscriber(source(), defer);
         defineProperty(state, key, {
             value: undefined,
             writable: true
@@ -199,16 +234,19 @@ function prepare(parent, key, source, setter, getter) {
         }
         finally {
             sub.commit();
-            for (const key in sub.follows)
-                prioritize(key);
+            for (const key in sub.handle) {
+                const peer = register.get(key);
+                if (peer && peer.priority >= info.priority)
+                    info.priority = peer.priority + 1;
+            }
         }
         return current();
     }
     setAlias(update, `try ${key}`);
     setAlias(create, `new ${key}`);
     setAlias(setter, `run ${key}`);
-    ComputedInit.add(create);
-    ComputedInfo.set(update, info);
+    INIT.add(create);
+    INFO.set(update, info);
     for (const on of [state, subject])
         defineProperty(on, key, {
             get: create,
@@ -216,53 +254,27 @@ function prepare(parent, key, source, setter, getter) {
             enumerable: true
         });
 }
-function register(on, key, info) {
-    let register = ComputedUsed.get(on);
-    if (!register)
-        ComputedUsed.set(on, register = new Map());
-    register.set(key, info);
-    return (key) => {
-        const peer = register.get(key);
-        if (peer && peer.priority >= info.priority)
-            info.priority = peer.priority + 1;
-    };
-}
 function ensure(on, keys) {
     for (const key of keys) {
         const desc = getOwnPropertyDescriptor(on.subject, key);
         const getter = desc && desc.get;
-        if (ComputedInit.has(getter))
+        if (INIT.has(getter))
             getter(true);
     }
 }
-function capture(on, request) {
-    const compute = ComputedInfo.get(request);
-    const callback = request;
-    if (!compute)
-        return;
-    let pending = ComputedKeys.get(on);
-    if (!pending)
-        ComputedKeys.set(on, pending = []);
-    if (compute.parent !== on)
-        callback();
-    else {
-        const queue = pending.findIndex(peer => compute.priority > ComputedInfo.get(peer).priority);
-        pending.splice(queue + 1, 0, callback);
-    }
-    return true;
-}
 function flush(on) {
     const handled = on.frame;
-    let pending = ComputedKeys.get(on);
-    if (pending) {
-        while (pending.length) {
-            const compute = pending.shift();
-            const { key } = ComputedInfo.get(compute);
-            if (!handled.has(key))
-                compute();
-        }
-        ComputedKeys.delete(on);
-    }
+    const pending = KEYS.get(on);
+    if (!pending)
+        return;
+    while (pending.length) {
+        const why = [...handled];
+        const compute = pending.shift();
+        const { key } = INFO.get(compute);
+        if (!handled.has(key))
+            compute(why);
+    }
+    KEYS.delete(on);
 }
 
 const Lifecycle = {
@@ -313,6 +325,7 @@ function eventsFor(prefix) {
 }
 
 const CONTROL = Symbol("control");
+const UPDATE = Symbol("update");
 const LOCAL = Symbol("local");
 const STATE = Symbol("state");
 function manage(src) {
@@ -341,8 +354,8 @@ class Controller {
         this.subject = subject;
         this.state = {};
         this.frame = new Set();
-        this.handles = new Set();
-        this.waiting = [];
+        this.waiting = new Set();
+        this.followers = new Set();
     }
     static setup(onto) {
         const control = new this(onto);
@@ -408,18 +421,12 @@ class Controller {
             this.update(key, value);
         };
     }
-    addListener(batch) {
-        this.handles.add(batch);
+    addListener(listener) {
+        this.followers.add(listener);
         return () => {
-            this.handles.delete(batch);
+            this.followers.delete(listener);
         };
     }
-    include(to) {
-        if (capture(this, to))
-            return;
-        else
-            this.waiting.push(to);
-    }
     update(key, value) {
         if (1 in arguments)
             this.state[key] = value;
@@ -428,15 +435,22 @@ class Controller {
         if (!this.frame.size)
             setTimeout(() => this.emit(), 0);
         this.frame.add(key);
-        for (const subscription of this.handles)
-            if (key in subscription)
-                this.include(subscription[key]);
+        for (const subscription of this.followers) {
+            const notify = subscription(key, this);
+            if (notify)
+                this.waiting.add(notify);
+        }
     }
     emit() {
         flush(this);
-        const keys = Array.from(this.frame);
-        const handle = new Set(this.waiting.splice(0));
+        const keys = Object.freeze([...this.frame]);
+        const handle = new Set(this.waiting);
+        this.waiting.clear();
         this.frame.clear();
+        defineProperty(this.subject, UPDATE, {
+            configurable: true,
+            value: keys
+        });
         handle.forEach(callback => {
             try {
                 callback(keys);
@@ -458,43 +472,42 @@ function keys(from, using) {
     return from.select(using);
 }
 
-function child(from, name) {
+function child(source, name) {
     return apply(function child(key) {
-        const proxyCache = new WeakMap();
-        const getCurrent = from.call(this, key);
+        const context = new WeakMap();
+        const current = source.call(this, key);
         function subscribe(sub) {
             let child;
             function start() {
-                const instance = getCurrent();
+                const instance = current();
                 if (instance) {
                     child = new Subscriber(instance, sub.onUpdate);
                     if (sub.active)
                         child.commit();
                     sub.dependant.add(child);
-                    proxyCache.set(sub, child.proxy);
+                    context.set(sub, child.proxy);
                 }
             }
-            function refresh() {
+            function restart() {
                 if (child) {
                     child.release();
                     sub.dependant.delete(child);
-                    proxyCache.set(sub, undefined);
+                    context.set(sub, undefined);
                     child = undefined;
                 }
                 start();
-                sub.onUpdate();
             }
             start();
-            sub.follow(key, refresh);
+            sub.follow(key, restart);
         }
         return (local) => {
             if (!local)
-                return getCurrent();
-            if (!proxyCache.has(local))
+                return current();
+            if (!context.has(local))
                 subscribe(local);
-            return proxyCache.get(local);
+            return context.get(local);
         };
-    }, name || from.name);
+    }, name || source.name);
 }
 
 const Oops$7 = issues({
@@ -518,7 +531,7 @@ function useLazy(Type, callback) {
 }
 function useWatcher(target, focus, expected) {
     const hook = use$1(refresh => {
-        const sub = new Subscriber(target, refresh);
+        const sub = new Subscriber(target, () => refresh);
         if (focus) {
             const src = sub.proxy;
             const key = keys(sub.parent, focus)[0];
@@ -539,12 +552,13 @@ function useModel(Type, callback) {
     const hook = use$1(refresh => {
         const instance = new Type();
         const control = manage(instance);
-        const sub = new Subscriber(control, refresh);
-        const release = control.addListener({
-            [Lifecycle.WILL_UNMOUNT]() {
-                instance.destroy();
-                release();
-            }
+        const sub = new Subscriber(control, () => refresh);
+        const release = control.addListener((key) => {
+            if (key == Lifecycle.WILL_UNMOUNT)
+                return () => {
+                    instance.destroy();
+                    release();
+                };
         });
         if (callback)
             callback(instance);
@@ -710,7 +724,7 @@ function RenderFunction(props) {
     const hook = use$1(refresh => {
         const targets = props.context.local;
         if (targets.length == 1)
-            return new Subscriber(targets[0], refresh);
+            return new Subscriber(targets[0], () => refresh);
         return {};
     });
     if (hook.commit)
@@ -741,7 +755,7 @@ class Model {
         define(this, "set", this);
         defer(control, "on");
         defer(control, "effect");
-        control.include(() => {
+        control.waiting.add(() => {
             delete this.on;
             delete this.effect;
         });
@@ -753,7 +767,7 @@ class Model {
     }
     tag(id) {
         const hook = use$1(refresh => {
-            return new Subscriber(this, refresh);
+            return new Subscriber(this, () => refresh);
         });
         useElementLifecycle(hook, id || 0);
         return hook.proxy;
@@ -762,29 +776,27 @@ class Model {
         const hook = use$1(refresh => {
             if (callback)
                 callback(this);
-            return new Subscriber(this, refresh);
+            return new Subscriber(this, () => refresh);
         });
         useComponentLifecycle(hook);
         return hook.proxy;
     }
     on(subset, handler, squash, once) {
         const control = manage(this);
-        const set = keys(control, subset);
-        const batch = {};
-        const remove = control.addListener(batch);
+        const request = keys(control, subset);
         const callback = squash
             ? handler.bind(this)
-            : (frame) => {
-                for (const key of frame)
-                    if (set.includes(key))
-                        handler.call(this, control.state[key], key);
-            };
-        const handle = once
-            ? (k) => { remove(); callback(k); }
+            : frame => frame
+                .filter(k => request.includes(k))
+                .forEach(k => handler.call(this, control.state[k], k));
+        const trigger = once
+            ? frame => { remove(); callback(frame); }
             : callback;
-        for (const key of set)
-            batch[key] = handle;
-        ensure(control, set);
+        ensure(control, request);
+        const remove = control.addListener(key => {
+            if (request.includes(key))
+                return trigger;
+        });
         return remove;
     }
     once(select, callback, squash) {
@@ -805,7 +817,7 @@ class Model {
             return this.on(select, invoke, true);
         }
         else {
-            const sub = new Subscriber(control, invoke);
+            const sub = new Subscriber(control, () => invoke);
             target = sub.proxy;
             invoke();
             return sub.commit();
@@ -846,7 +858,7 @@ class Model {
             then(callback) {
                 if (callback)
                     if (control.pending)
-                        control.include(callback);
+                        control.waiting.add(callback);
                     else
                         callback(false);
                 else
@@ -914,6 +926,7 @@ class Model {
 Model.CONTROL = CONTROL;
 Model.STATE = STATE;
 Model.LOCAL = LOCAL;
+Model.WHY = UPDATE;
 defineLazy(Model, CONTROL, function () {
     return new Controller(this).start();
 });
@@ -922,7 +935,7 @@ function defer(on, method) {
     const real = subject[method];
     subject[method] = (...args) => {
         let done;
-        waiting.push(() => {
+        waiting.add(() => {
             done = real.apply(subject, args);
         });
         return () => done();
@@ -1002,6 +1015,31 @@ function parent(Expects, required) {
     });
 }
 
+function on(initial, cb) {
+    return apply(function on(key) {
+        this.manage(key, initial, cb && createValueEffect(cb));
+    });
+}
+function memo(factory, defer) {
+    return apply(function memo(key) {
+        const source = this.subject;
+        const get = () => factory.call(source);
+        if (defer)
+            defineLazy(source, key, get);
+        else
+            define(source, key, get());
+    });
+}
+function lazy(value) {
+    return apply(function lazy(key) {
+        const source = this.subject;
+        source[key] = value;
+        defineProperty(this.state, key, {
+            get: () => source[key]
+        });
+    });
+}
+
 const Oops$2 = issues({
     DuplicateAction: (key) => `Invoked action ${key} but one is already active.`,
     BadComputedSource: (model, property, got) => `Bad from-instruction provided to ${model}.${property}. Expects an arrow-function or a Model as source. Got ${got}.`,
@@ -1028,30 +1066,6 @@ function ref(arg) {
         return { value };
     });
 }
-function on(initial, cb) {
-    return apply(function on(key) {
-        this.manage(key, initial, cb && createValueEffect(cb));
-    });
-}
-function memo(factory, defer) {
-    return apply(function memo(key) {
-        const source = this.subject;
-        const get = () => factory.call(source);
-        if (defer)
-            defineLazy(source, key, get);
-        else
-            define(source, key, get());
-    });
-}
-function lazy(value) {
-    return apply(function lazy(key) {
-        const source = this.subject;
-        source[key] = value;
-        defineProperty(this.state, key, {
-            get: () => source[key]
-        });
-    });
-}
 function act(task) {
     return apply(function act(key) {
         let pending = false;
@@ -1124,13 +1138,14 @@ function pendingValue(via, key) {
         return value;
     const error = Oops$1.ValueNotReady(via.subject, key);
     const promise = new Promise(resolve => {
-        const release = via.addListener({
-            [key](value) {
-                if (value !== undefined) {
-                    release();
-                    resolve();
-                }
-            }
+        const release = via.addListener(forKey => {
+            if (forKey == key)
+                return () => {
+                    if (via.state[key] !== undefined) {
+                        release();
+                        resolve();
+                    }
+                };
         });
     });
     throw Object.assign(promise, {