@expressive/mvc 1.0.0-beta.4 → 1.0.0-beta.40

package/lib/index.js

@@ -2,14 +2,20 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var react = require('react');
+var React = require('react');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 class Issue extends Error {
     constructor() {
         super(...arguments);
         // drop first line (error factory) in stack trace.
         this.stack = this.stack.replace(/\n.+/, "");
-        this.warn = () => console.warn(this.message);
+    }
+    warn() {
+        console.warn(this.message);
     }
 }
 function issues(register) {
@@ -19,10 +25,10 @@ function issues(register) {
     return Library;
 }
 
-const Oops$8 = issues({
+const Oops$d = issues({
     BadEffectCallback: () => `Callback for effect-callback may only return a function.`
 });
-const { assign, create, defineProperty, entries, getPrototypeOf, getOwnPropertyNames, getOwnPropertyDescriptor, getOwnPropertyDescriptors, getOwnPropertySymbols, keys, values } = Object;
+const { assign, create, defineProperty, entries, getPrototypeOf, getOwnPropertyNames, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
 function define(target, key, value) {
     defineProperty(target, key, { value });
 }
@@ -36,494 +42,926 @@ function defineLazy(object, property, init) {
         }
     });
 }
-function fn(x) {
-    return typeof x == "function";
-}
-function alias(fn, displayName) {
-    assign(fn, { displayName });
-}
-function entriesIn(object) {
-    return entries(getOwnPropertyDescriptors(object));
-}
-function debounce(callback) {
-    let throttle;
-    return () => {
-        if (!throttle) {
-            throttle = true;
-            callback();
-            setTimeout(() => {
-                throttle = false;
-            }, 0);
-        }
-    };
+function setAlias(func, displayName) {
+    assign(func, { displayName });
 }
 function createEffect(callback) {
     let unSet;
-    return (value, callee = value) => {
-        typeof unSet == "function" && unSet();
-        unSet = callback.call(callee, value);
+    return function (value) {
+        if (typeof unSet == "function")
+            unSet();
+        unSet = callback.call(this, value);
         if (unSet instanceof Promise)
             unSet = undefined;
-        if (unSet && !fn(unSet))
-            throw Oops$8.BadEffectCallback();
+        if (unSet && typeof unSet !== "function")
+            throw Oops$d.BadEffectCallback();
     };
 }
-function selectRecursive(using, keys) {
-    const found = new Set();
-    const spy = {};
-    for (const key of new Set(keys))
-        defineProperty(spy, key, {
-            get() {
-                found.add(key);
-                return spy;
-            }
-        });
-    using(spy);
-    return Array.from(found);
-}
-function insertAfter(into, item, predicate) {
-    const matchIndex = into.findIndex(predicate);
-    into.splice(matchIndex + 1, 0, item);
-}
-
-const Oops$7 = issues({
-    NothingInContext: (name) => `Couldn't find ${name} in context; did you forget to use a Provider?`,
-    BadProviderProps: () => `Provider expects either 'of' or 'for' props.`,
-    BadConsumerProps: () => `Provider expects either a render function, 'get' or 'has' props.`
-});
-class Lookup {
-    constructor() {
-        this.table = new Map();
-    }
-    key(T) {
-        let key = this.table.get(T);
-        if (!key) {
-            key = Symbol(T.name);
-            this.table.set(T, key);
-        }
-        return key;
-    }
-    get(T, strict) {
-        const instance = this[this.key(T)];
-        if (!instance && strict)
-            throw Oops$7.NothingInContext(T.name);
-        return instance;
-    }
-    push(items) {
-        const next = create(this);
-        for (let I of items) {
-            let managed = true;
-            let T;
-            if (I instanceof Model) {
-                managed = false;
-                T = I.constructor;
-            }
-            else {
-                T = I;
-                I = I.create();
-            }
-            do {
-                defineProperty(next, this.key(T), {
-                    value: I,
-                    writable: managed
-                });
-            } while (T = T.inherits);
-        }
-        return next;
-    }
-    pop() {
-        for (const key of getOwnPropertySymbols(this)) {
-            const desc = getOwnPropertyDescriptor(this, key);
-            if (desc.writable)
-                desc.value.destroy();
-        }
-    }
-}
-const LookupContext = react.createContext(new Lookup());
-const LookupProvider = LookupContext.Provider;
-function useLookup() {
-    return react.useContext(LookupContext);
-}
-function useIncluding(insert, dependancy) {
-    const current = useLookup();
-    const next = () => current.push(insert instanceof Model ? [insert] : values(insert));
-    return react.useMemo(next, [dependancy]);
-}
-const Consumer = (props) => {
-    const { get, has, children: render, of: Control } = props;
-    if (fn(render))
-        return render(Control.tap());
-    const callback = has || get;
-    if (fn(callback))
-        callback(Control.get(!!has));
-    else
-        throw Oops$7.BadConsumerProps();
-    return null;
-};
-function Provider(props) {
-    const { children, of: target } = props;
-    const data = assign({}, props, { children: null, of: null });
-    if (Model.isTypeof(target))
-        return react.createElement(ParentProvider, { target, data }, children);
-    else if (target instanceof Model)
-        return react.createElement(DirectProvider, { target, data }, children);
-    else if (typeof target == "object")
-        return react.createElement(MultiProvider, { types: target }, children);
-    else
-        throw Oops$7.BadProviderProps();
-}
-function ParentProvider(props) {
-    let { children, target, data } = props;
-    const instance = target.using(data);
-    const value = useIncluding(instance.get, target);
-    if (fn(children))
-        children = children(instance);
-    return react.createElement(LookupProvider, { value }, children);
-}
-function DirectProvider(props) {
-    const { children, data, target } = props;
-    const value = useIncluding(target, target);
-    target.import(data);
-    return react.createElement(LookupProvider, { value }, children);
-}
-function MultiProvider(props) {
-    const { children, types } = props;
-    const value = useIncluding(types);
-    react.useLayoutEffect(() => () => value.pop(), []);
-    return react.createElement(LookupProvider, { value }, children);
+function createValueEffect(callback) {
+    let unSet;
+    return function (value) {
+        if (typeof unSet == "function")
+            unSet(value);
+        const out = callback.call(this, value, this);
+        if (typeof out == "boolean")
+            return out;
+        if (!out || out instanceof Promise)
+            return;
+        if (typeof out == "function")
+            unSet = out;
+        else
+            throw Oops$d.BadEffectCallback();
+    };
 }
 
-const Lifecycle = {
-    WILL_RENDER: "willRender",
-    WILL_UPDATE: "willUpdate",
-    WILL_MOUNT: "willMount",
-    WILL_UNMOUNT: "willUnmount",
-    DID_MOUNT: "didMount"
-};
-const lifecycleEvents = [
-    "didCreate",
-    "willDestroy",
-    ...values(Lifecycle)
-];
-function forAlias(prefix) {
-    const map = new Map();
-    for (const name of values(Lifecycle)) {
-        const alias = prefix + name[0].toUpperCase() + name.slice(1);
-        lifecycleEvents.push(alias);
-        map.set(name, alias);
-    }
-    return (name) => map.get(name);
+const UPDATE = new WeakMap();
+function applyUpdate(subject, keys) {
+    UPDATE.set(subject, keys);
+    return () => {
+        setTimeout(() => {
+            UPDATE.delete(subject);
+        }, 0);
+    };
 }
 
-class Observer {
+const Oops$c = issues({
+    StrictUpdate: (expected) => `Strict update() did ${expected ? "not " : ""}find pending updates.`,
+    NoChaining: () => `Then called with undefined; update promise will never catch nor supports chaining.`
+});
+const READY = new WeakSet();
+class Controller {
     constructor(subject) {
         this.subject = subject;
         this.state = {};
-        this.listeners = new Set();
-        this.waiting = [];
-        implementGetters(this);
+        this.frame = new Set();
+        this.waiting = new Set();
+        this.onDestroy = new Set();
+        this.followers = new Set();
+        this.proxy = Object.create(subject);
     }
     start() {
-        for (const [key, desc] of entriesIn(this.subject))
-            this.setup(key, desc);
-        this.emit();
+        for (const key in this.subject)
+            this.manage(key);
+        this.emit([]);
     }
-    setup(key, desc) {
-        const { value, get, enumerable } = desc;
-        if (enumerable && !get && (!fn(value) || /^[A-Z]/.test(key)))
-            this.register(key, value);
+    stop() {
+        this.followers.clear();
+        this.onDestroy.forEach(x => x());
     }
-    register(key, initial, effect) {
-        this.state[key] = initial;
-        this.override(key, {
-            get: () => this.state[key],
-            set: this.setter(key, effect)
+    manage(key) {
+        const { proxy, state, subject } = this;
+        const { value: entry } = getOwnPropertyDescriptor(subject, key);
+        if (typeof entry == "function")
+            return;
+        let onGet;
+        let onSet;
+        let enumerable;
+        const instruction = Pending.get(entry);
+        if (instruction) {
+            Pending.delete(entry);
+            delete subject[key];
+            const desc = instruction.call(this, key, this);
+            if (desc === false)
+                return;
+            if (typeof desc == "object") {
+                if ("value" in desc)
+                    state[key] = desc.value;
+                onSet = desc.set;
+                onGet = desc.get;
+                enumerable = desc.enumerable;
+            }
+        }
+        else
+            state[key] = entry;
+        const set = onSet !== false
+            ? this.ref(key, onSet)
+            : undefined;
+        function get() {
+            const local = this[LOCAL];
+            const value = state[key];
+            if (local && !local.watch[key])
+                local.watch[key] = true;
+            return onGet ? onGet(value, local) : value;
+        }
+        setAlias(get, `tap ${key}`);
+        defineProperty(subject, key, {
+            enumerable,
+            set,
+            get: onGet
+                ? () => onGet(state[key])
+                : () => state[key]
+        });
+        defineProperty(proxy, key, {
+            enumerable,
+            set,
+            get
         });
     }
-    override(key, desc) {
-        defineProperty(this.subject, key, Object.assign({ enumerable: true }, desc));
-    }
-    setter(key, effect) {
-        const callback = effect && createEffect(effect);
+    ref(key, handler) {
+        const { state, subject } = this;
         return (value) => {
-            if (this.state[key] == value)
+            if (state[key] == value)
                 return;
+            if (handler)
+                switch (handler.call(subject, value, state)) {
+                    case true:
+                        this.update(key);
+                    case false:
+                        return;
+                }
+            this.update(key, value);
+        };
+    }
+    addListener(listener) {
+        this.followers.add(listener);
+        return () => {
+            this.followers.delete(listener);
+        };
+    }
+    emit(keys) {
+        const waiting = [...this.waiting];
+        this.waiting.clear();
+        applyUpdate(this.subject, keys)();
+        for (const callback of waiting)
+            try {
+                callback(keys);
+            }
+            catch (err) {
+                console.error(err);
+            }
+    }
+    update(key, value) {
+        if (1 in arguments)
             this.state[key] = value;
-            if (callback)
-                callback(value, this.subject);
-            this.update(key);
+        if (this.frame.has(key))
+            return;
+        if (!this.frame.size)
+            setTimeout(() => {
+                flush(this);
+                const keys = Object.freeze([...this.frame]);
+                this.frame.clear();
+                this.emit(keys);
+            }, 0);
+        this.frame.add(key);
+        for (const callback of this.followers) {
+            const event = callback(key, this);
+            if (typeof event == "function")
+                this.waiting.add(event);
+        }
+    }
+    requestUpdate(arg) {
+        if (typeof arg == "function") {
+            this.waiting.add(arg);
+            return;
+        }
+        if (typeof arg == "boolean" && arg !== this.frame.size > 0)
+            return Promise.reject(Oops$c.StrictUpdate(arg));
+        return {
+            then: (callback) => {
+                if (callback)
+                    if (this.frame.size)
+                        this.waiting.add(callback);
+                    else
+                        callback(false);
+                else
+                    throw Oops$c.NoChaining();
+            }
         };
     }
-    watch(target, handler, squash, once) {
-        const keys = [].concat(target);
-        const callback = squash
-            ? handler.bind(this.subject)
-            : (frame) => {
-                for (const key of frame)
-                    if (keys.includes(key))
-                        handler.call(this.subject, this.state[key], key);
-            };
-        return this.addListener(keys, callback, once);
+}
+function control(subject, cb) {
+    let control = subject[CONTROL];
+    const ready = READY.has(control);
+    if (!control) {
+        control = new Controller(subject);
+        define(subject, CONTROL, control);
     }
-    addListener(keys, callback, once) {
-        const remove = () => { this.listeners.delete(listener); };
-        const handler = once ? (k) => { remove(); callback(k); } : callback;
-        const listener = {};
-        for (const key of keys) {
-            ensureValue(this.subject, key);
-            listener[key] = handler;
+    if (!cb) {
+        if (!ready) {
+            READY.add(control);
+            control.start();
         }
-        this.listeners.add(listener);
-        return remove;
+        return control;
     }
-    update(key) {
-        (this.pending || this.sync())(key);
+    if (!ready) {
+        let done;
+        control.requestUpdate(() => {
+            done = cb(control);
+        });
+        return () => done && done();
     }
-    emit(frame) {
-        const current = this.waiting;
-        this.waiting = [];
-        this.pending = undefined;
-        for (const handle of current)
-            try {
-                handle(frame);
+    return cb(control);
+}
+
+class Subscriber {
+    constructor(target, onUpdate) {
+        this.onUpdate = onUpdate;
+        this.active = false;
+        this.dependant = new Set();
+        this.watch = {};
+        const parent = target instanceof Controller
+            ? target : control(target);
+        const proxy = create(parent.proxy);
+        let reset;
+        define(proxy, LOCAL, this);
+        defineProperty(this, "proxy", {
+            configurable: true,
+            get() {
+                if (reset)
+                    setTimeout(reset, 0);
+                return proxy;
             }
-            catch (e) { }
-    }
-    sync() {
-        const handled = new Set();
-        const { queueComputed, flushComputed } = computeContext(this, handled);
-        const include = (key) => {
-            if (handled.has(key))
+        });
+        const release = parent.addListener(key => {
+            const handler = this.watch[key];
+            if (!handler || !this.active)
                 return;
-            handled.add(key);
-            for (const subscription of this.listeners)
-                if (key in subscription) {
-                    const request = subscription[key];
-                    if (queueComputed(request))
-                        continue;
-                    this.waiting.push(request);
-                }
+            if (typeof handler == "function")
+                handler();
+            const notify = this.onUpdate(key, parent);
+            const getWhy = (keys) => {
+                reset = applyUpdate(proxy, keys.filter(k => k in this.watch));
+            };
+            if (notify) {
+                parent.requestUpdate(getWhy);
+                parent.requestUpdate(notify);
+            }
+        });
+        this.commit = () => {
+            this.active = true;
+            this.dependant.forEach(x => x.commit());
+            return this.release;
         };
-        const close = () => {
-            flushComputed();
-            this.emit(Array.from(handled));
+        this.release = () => {
+            this.dependant.forEach(x => x.release());
+            release();
         };
-        setTimeout(close, 0);
-        return this.pending = include;
     }
 }
 
-const LOCAL = Symbol("current_subscriber");
-function local(fn) {
-    return setup((key, on) => {
-        defineLazy(on.subject, key, function () {
-            return fn(key, on, this[LOCAL]);
+const Oops$b = 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 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);
+    function compute(initial) {
+        try {
+            return setter.call(sub.proxy, sub.proxy);
+        }
+        catch (err) {
+            Oops$b.ComputeFailed(subject, key, !!initial).warn();
+            throw err;
+        }
+    }
+    function update() {
+        let value;
+        try {
+            value = compute(false);
+        }
+        catch (e) {
+            console.error(e);
+        }
+        finally {
+            if (state[key] !== value) {
+                parent.update(key, value);
+                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);
+        }
+    }
+    function create(early) {
+        sub = new Subscriber(source(), defer);
+        defineProperty(state, key, {
+            value: undefined,
+            writable: true
         });
+        try {
+            return state[key] = compute(true);
+        }
+        catch (e) {
+            if (early)
+                Oops$b.ComputedEarly(key).warn();
+            throw e;
+        }
+        finally {
+            sub.commit();
+            for (const key in sub.watch) {
+                const peer = register.get(key);
+                if (peer && peer.priority >= info.priority)
+                    info.priority = peer.priority + 1;
+            }
+        }
+    }
+    setAlias(update, `try ${key}`);
+    setAlias(create, `new ${key}`);
+    setAlias(setter, `run ${key}`);
+    INIT.add(create);
+    INFO.set(update, info);
+    defineProperty(state, key, {
+        get: create,
+        configurable: true,
+        enumerable: true
     });
+    if (getter)
+        return () => getter(parent, key);
 }
-class Subscriber {
-    constructor(subject, callback, metadata) {
-        this.subject = subject;
-        this.callback = callback;
-        this.metadata = metadata;
-        this.dependant = new Set();
-        this.following = {};
-        this.listen = () => {
-            this.dependant.forEach(x => x.listen());
-            this.parent.listeners.add(this.following);
-            // for(const key in this.proxy)
-            //   delete this.proxy[key];
-            return () => this.release();
-        };
-        const { state } = this.parent = Controller.ensure(subject);
-        this.proxy = create(subject);
-        define(this.proxy, LOCAL, this);
-        for (const key in state)
-            this.spyOn(key);
+function ensure(on, keys) {
+    for (const key of keys) {
+        const desc = getOwnPropertyDescriptor(on.state, key);
+        const getter = desc && desc.get;
+        if (INIT.has(getter))
+            getter(true);
     }
-    release() {
-        this.dependant.forEach(x => x.release());
-        this.parent.listeners.delete(this.following);
+}
+function flush(on) {
+    const handled = on.frame;
+    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);
     }
-    spyOn(key) {
-        const access = () => {
-            let value = this.subject[key];
-            if (value instanceof Model)
-                return this.delegate(key);
-            this.follow(key, this.callback);
-            delete this.proxy[key];
-            return value;
-        };
-        alias(access, `tap ${key}`);
-        defineProperty(this.proxy, key, {
-            get: access,
-            set: this.parent.setter(key),
-            configurable: true
+    KEYS.delete(on);
+}
+
+const CONTROL = Symbol("CONTROL");
+const WHY = Symbol("UPDATE");
+const LOCAL = Symbol("LOCAL");
+const STATE = Symbol("STATE");
+class Model {
+    constructor() {
+        define(this, CONTROL, new Controller(this));
+        define(this, "get", this);
+        define(this, "set", this);
+    }
+    get [STATE]() {
+        return this[CONTROL].state;
+    }
+    get [WHY]() {
+        return UPDATE.get(this);
+    }
+    on(select, handler, squash, once) {
+        return control(this, control => {
+            if (typeof select == "function")
+                return control.addListener(select);
+            const keys = typeof select == "string" ? [select] :
+                !select.length ? getOwnPropertyNames(control.state) :
+                    select;
+            ensure(control, keys);
+            const callback = squash
+                ? handler.bind(this)
+                : frame => frame
+                    .filter(k => keys.includes(k))
+                    .forEach(k => handler.call(this, control.state[k], k));
+            const trigger = once
+                ? frame => { remove(); callback(frame); }
+                : callback;
+            const remove = control.addListener(key => {
+                if (keys.includes(key))
+                    return trigger;
+            });
+            return remove;
         });
     }
-    follow(key, cb) {
-        if (this.metadata)
-            metaData(cb, this.metadata);
-        this.following[key] = cb;
+    once(select, callback, squash) {
+        if (callback)
+            return this.on(select, callback, squash, true);
+        return new Promise(resolve => {
+            this.on(select, resolve, true, true);
+        });
     }
-    recursive(key, onUpdate) {
-        let child;
-        const start = (mounted) => {
-            child = onUpdate();
-            if (child) {
-                this.dependant.add(child);
-                if (mounted)
-                    child.listen();
+    effect(callback, select) {
+        const effect = createEffect(callback);
+        return control(this, control => {
+            if (!select) {
+                const sub = new Subscriber(control, () => invoke);
+                const invoke = () => {
+                    const x = sub.proxy;
+                    effect.call(x, x);
+                };
+                invoke();
+                return sub.commit();
             }
-        };
-        const reset = () => {
-            if (child) {
-                child.release();
-                this.dependant.delete(child);
+            const invoke = () => {
+                effect.call(this.get, this.get);
+            };
+            invoke();
+            if (!select.length) {
+                control.onDestroy.add(invoke);
+                return () => {
+                    control.onDestroy.delete(invoke);
+                };
             }
-            start(true);
-            this.callback();
-        };
-        this.follow(key, reset);
-        start();
+            return control.addListener(key => {
+                if (select.includes(key))
+                    return invoke;
+            });
+        });
+    }
+    // TODO: account for exotic properties
+    import(source, select) {
+        const { subject } = control(this);
+        if (!select)
+            select = getOwnPropertyNames(subject);
+        for (const key of select)
+            if (key in source)
+                this[key] = source[key];
     }
-    delegate(key) {
-        let sub;
-        this.recursive(key, () => {
-            let value = this.subject[key];
-            if (value instanceof Model) {
-                let child = sub = new Subscriber(value, this.callback, this.metadata);
-                defineProperty(this.proxy, key, {
-                    get: () => child.proxy,
-                    set: it => this.subject[key] = it,
-                    configurable: true
-                });
-                return child;
+    export(subset) {
+        const { state } = control(this);
+        const output = {};
+        if (!subset)
+            subset = getOwnPropertyNames(state);
+        for (const key of subset)
+            output[key] = state[key];
+        return output;
+    }
+    update(arg, tag) {
+        const target = control(this);
+        if (typeof arg == "string") {
+            target.update(arg);
+            if (1 in arguments && arg in this) {
+                const method = this[arg];
+                if (typeof method == "function")
+                    if (typeof tag != "boolean")
+                        method.call(this, tag);
+                    else if (tag)
+                        method.call(this);
             }
-        });
-        return sub && sub.proxy;
+            arg = undefined;
+        }
+        return target.requestUpdate(arg);
     }
-}
+    /**
+     * Mark this instance for garbage-collection and send `willDestroy` event to all listeners.
+     */
+    destroy() {
+        control(this).stop();
+    }
+    toString() {
+        return this.constructor.name;
+    }
+    /**
+     * Creates a new instance of this controller.
+     *
+     * Beyond `new this(...)`, method will activate managed-state.
+     *
+     * @param args - arguments sent to constructor
+     */
+    static create(...args) {
+        const instance = new this(...args);
+        control(instance);
+        return instance;
+    }
+    /**
+     * Static equivalent of `x instanceof this`.
+     *
+     * Will determine if provided class is a subtype of this one.
+     */
+    static isTypeof(maybe) {
+        return (typeof maybe == "function" &&
+            maybe.prototype instanceof this);
+    }
+}
+defineLazy(Model, CONTROL, function () {
+    return new Controller(this);
+});
 
-const Oops$6 = issues({
-    StrictUpdate: (expected) => `Strict requestUpdate() did ${expected ? "not " : ""}find pending updates.`
-});
-const Pending = new WeakSet();
-function setup(fn) {
-    Pending.add(fn);
-    return fn;
+const Pending = new Map();
+function apply(fn, label) {
+    const name = label || fn.name || "pending";
+    const placeholder = Symbol(`${name} instruction`);
+    function setup(key) {
+        let output = fn.call(this, key, this);
+        if (typeof output == "function")
+            return { get: output };
+        if (typeof output !== "object")
+            return output || undefined;
+        if ("explicit" in output && output.explicit) {
+            defineProperty(this.subject, key, output);
+            return false;
+        }
+        if ("recursive" in output)
+            output = Object.assign(Object.assign({}, output), { get: recursive(this, key) });
+        return output;
+    }
+    Pending.set(placeholder, setup);
+    return placeholder;
 }
-const CONTROL = Symbol("controller");
-class Controller extends Observer {
-    constructor() {
-        super(...arguments);
-        this.on = (select, listener, squash, once) => {
-            return this.watch(select, listener, squash, once);
-        };
-        this.once = (select, listener, squash) => {
-            if (listener)
-                return this.watch(select, listener, squash, true);
-            else
-                return new Promise(resolve => {
-                    this.watch(select, resolve, true, true);
-                });
+function recursive(source, key) {
+    const context = new WeakMap();
+    const subscribe = (parent) => {
+        let child;
+        const init = () => {
+            if (child) {
+                child.release();
+                parent.dependant.delete(child);
+                context.set(parent, undefined);
+                child = undefined;
+            }
+            const value = source.state[key];
+            if (value && CONTROL in value) {
+                child = new Subscriber(value, parent.onUpdate);
+                if (parent.active)
+                    child.commit();
+                parent.dependant.add(child);
+                context.set(parent, child.proxy);
+            }
         };
-        this.effect = (callback, select) => {
-            let target = this.subject;
-            const effect = createEffect(callback);
-            const invoke = debounce(() => effect(target));
-            if (select)
-                return this.watch(select, invoke, true);
-            return this.do(() => {
-                const sub = new Subscriber(target, invoke);
-                effect(target = sub.proxy);
-                return sub.listen();
+        init();
+        parent.watch[key] = init;
+    };
+    return (value, local) => {
+        if (!local)
+            return value;
+        if (!context.has(local))
+            subscribe(local);
+        return context.get(local);
+    };
+}
+
+const Oops$a = issues({
+    DuplicateAction: (key) => `Invoked action ${key} but one is already active.`
+});
+function act(task) {
+    return apply(function act(key) {
+        let pending = false;
+        const invoke = (...args) => {
+            if (pending)
+                return Promise.reject(Oops$a.DuplicateAction(key));
+            pending = true;
+            this.update(key);
+            return new Promise(res => {
+                res(task.apply(this.subject, args));
+            }).finally(() => {
+                pending = false;
+                this.update(key);
             });
         };
-        this.import = (from, select) => {
-            const keys = this.select(select);
-            for (const key of keys)
-                if (key in from)
-                    this.subject[key] = from[key];
-        };
-        this.export = (select) => {
-            const keys = this.select(select);
-            const data = {};
-            for (const key of keys)
-                data[key] = this.state[key];
-            return data;
+        this.state[key] = undefined;
+        setAlias(invoke, `run ${key}`);
+        defineProperty(invoke, "active", {
+            get: () => pending
+        });
+        return {
+            value: invoke,
+            set: false
         };
-        this.update = (select) => {
-            for (const key of this.select(select))
-                super.update(key);
+    });
+}
+
+const Oops$9 = issues({
+    ValueNotReady: (model, key) => `Value ${model}.${key} value is not yet available.`
+});
+/**
+ * Get value, suspend instead if undefined.
+ *
+ * Throws suspense promise also interpretable as an error.
+ * React could handle it but other contexts probably not.
+ */
+function pendingValue(via, key) {
+    const value = via.state[key];
+    if (value === undefined)
+        throw suspend(via, key);
+    return value;
+}
+function pendingFactory(via, key, fn) {
+    const { subject, state } = via;
+    let waiting;
+    let error;
+    return () => {
+        if (waiting)
+            throw waiting;
+        if (error)
+            throw error;
+        if (key in state)
+            return state[key];
+        let output;
+        try {
+            output = fn.call(subject, key, subject);
+        }
+        catch (err) {
+            throw error = err;
+        }
+        if (output instanceof Promise) {
+            const issue = Oops$9.ValueNotReady(subject, key);
+            output
+                .catch(err => error = err)
+                .then(out => state[key] = out)
+                .finally(() => waiting = undefined);
+            throw waiting = Object.assign(output, {
+                message: issue.message,
+                stack: issue.stack
+            });
+        }
+        else {
+            return state[key] = output;
+        }
+    };
+}
+function suspend(source, key) {
+    const error = Oops$9.ValueNotReady(source.subject, key);
+    const promise = new Promise(resolve => {
+        const release = source.addListener(forKey => {
+            if (forKey == key)
+                return () => {
+                    if (source.state[key] !== undefined) {
+                        release();
+                        resolve();
+                    }
+                };
+        });
+    });
+    return Object.assign(promise, {
+        toString: () => String(error),
+        name: "Suspense",
+        message: error.message,
+        stack: error.stack
+    });
+}
+
+const Oops$8 = issues({
+    BadComputedSource: (model, property, got) => `Bad from-instruction provided to ${model}.${property}. Expects an arrow-function or a Model as source. Got ${got}.`,
+    PeerNotAllowed: (model, property) => `Attempted to use an instruction result (probably use or tap) as computed source for ${model}.${property}. This is not possible.`
+});
+function from(source, setter, arg) {
+    return apply(function from(key) {
+        const { subject } = this;
+        let getSource;
+        let getter;
+        if (arg === true || setter === true)
+            getter = pendingValue;
+        if (typeof setter == "boolean")
+            setter = undefined;
+        // Easy mistake, using a peer, will always be unresolved.
+        if (typeof source == "symbol")
+            throw Oops$8.PeerNotAllowed(subject, key);
+        // replace source controller in-case it is different
+        if (typeof source == "object")
+            getSource = () => control(source);
+        // specifically an arrow function (getter factory)
+        else if (!source.prototype) {
+            setter = source.call(subject, key);
+            getSource = () => this;
+        }
+        // Regular function is too ambiguous so not allowed.
+        else
+            throw Oops$8.BadComputedSource(subject, key, source);
+        return prepare(this, key, getSource, setter, getter);
+    });
+}
+
+function ref(arg) {
+    return apply(function ref(key) {
+        let value = {};
+        if (typeof arg == "object") {
+            const source = control(arg);
+            for (const key in source.state)
+                defineLazy(value, key, createRef.bind(source, key));
+        }
+        else
+            value = createRef.call(this, key, arg);
+        return { value, explicit: true };
+    });
+}
+function createRef(key, cb) {
+    const refObjectFunction = this.ref(key, cb && createValueEffect(cb));
+    defineProperty(refObjectFunction, "current", {
+        set: refObjectFunction,
+        get: () => this.state[key]
+    });
+    return refObjectFunction;
+}
+
+const Oops$7 = issues({
+    NonOptional: (Parent, key) => `Property ${Parent}.${key} is marked as required.`,
+    BadFactory: () => `Set instruction can only accept a factory or undefined.`,
+    FactoryFailed: (model, key) => `Generating initial value for ${model}.${key} failed.`
+});
+function set(factory, argument) {
+    return apply(function set(key) {
+        let set;
+        let get;
+        const required = argument === true || argument === undefined;
+        if (factory === undefined)
+            get = () => pendingValue(this, key);
+        else if (typeof factory !== "function")
+            throw Oops$7.BadFactory();
+        else {
+            get = pendingFactory(this, key, factory);
+            if (required)
+                try {
+                    get();
+                }
+                catch (err) {
+                    if (err instanceof Promise)
+                        ;
+                    else {
+                        Oops$7.FactoryFailed(this.subject, key).warn();
+                        throw err;
+                    }
+                }
+        }
+        if (typeof argument == "function")
+            set = createValueEffect(argument);
+        else
+            set = (value) => {
+                if (value === undefined && required)
+                    throw Oops$7.NonOptional(this.subject, key);
+            };
+        return { set, get };
+    });
+}
+
+const Parent = new WeakMap();
+const Oops$6 = issues({
+    ParentRequired: (expects, child) => `New ${child} created standalone but requires parent of type ${expects}. Did you remember to create via use(${child})?`,
+    UnexpectedParent: (expects, child, got) => `New ${child} created as child of ${got}, but must be instanceof ${expects}.`,
+});
+function parent(Expects, required) {
+    return apply(function parent() {
+        const child = this.subject;
+        const value = Parent.get(child);
+        const expected = Expects.name;
+        if (!value) {
+            if (required !== false)
+                throw Oops$6.ParentRequired(expected, child);
+        }
+        else if (!(value instanceof Expects))
+            throw Oops$6.UnexpectedParent(expected, child, value);
+        return { value };
+    });
+}
+
+const Oops$5 = issues({
+    BadArgument: (type) => `Instruction \`use\` cannot accept argument type of ${type}.`,
+});
+function use$1(input, argument) {
+    return apply(function use(key) {
+        const { subject } = this;
+        const onUpdate = (next) => {
+            this.state[key] = next;
+            if (next) {
+                Parent.set(next, subject);
+                control(next);
+            }
+            if (typeof argument == "function")
+                argument(next);
+            return true;
         };
-        this.requestUpdate = (argument) => {
-            const { pending, waiting } = this;
-            if (fn(argument))
-                waiting.push(argument);
-            else if (!pending === argument)
-                return Promise.reject(Oops$6.StrictUpdate(argument));
-            else if (pending)
-                return new Promise(cb => waiting.push(cb));
-            else
-                return Promise.resolve(false);
+        if (input) {
+            const value = Model.isTypeof(input)
+                ? new input() :
+                typeof input === "object"
+                    ? input :
+                    typeof input === "function"
+                        ? input()
+                        : null;
+            if (value === null)
+                throw Oops$5.BadArgument(typeof input);
+            if (value)
+                onUpdate(value);
+        }
+        return {
+            set: onUpdate,
+            recursive: true
         };
+    });
+}
+
+class Lookup {
+    constructor() {
+        this.table = new Map();
     }
-    static ensure(from) {
-        return from[CONTROL];
+    get local() {
+        return [
+            ...new Set(getOwnPropertySymbols(this).map(symbol => this[symbol]))
+        ];
+    }
+    key(T) {
+        let key = this.table.get(T);
+        if (!key) {
+            key = Symbol(T.name);
+            this.table.set(T, key);
+        }
+        return key;
     }
-    do(fn) {
-        return fn();
+    get(T) {
+        return this[this.key(T)];
     }
-    setup(key, desc) {
-        if (Pending.has(desc.value))
-            desc.value(key, this);
+    push(I) {
+        const next = create(this);
+        if (I instanceof Model || typeof I == "function")
+            next.register(I);
         else
-            super.setup(key, desc);
+            for (const i of values(I))
+                next.register(i);
+        return next;
     }
-    select(using) {
-        const keys = getOwnPropertyNames(this.state);
-        if (!using)
-            return keys;
-        if (typeof using == "string")
-            return [using];
-        if (fn(using))
-            return selectRecursive(using, keys.concat(lifecycleEvents));
-        return Array.from(using);
+    register(I) {
+        let writable = true;
+        let T;
+        if (I instanceof Model) {
+            T = I.constructor;
+            writable = false;
+        }
+        else {
+            T = I;
+            I = I.create();
+        }
+        do {
+            const key = this.key(T);
+            const conflict = this.hasOwnProperty(key);
+            defineProperty(this, key, {
+                value: conflict ? null : I,
+                configurable: true,
+                writable
+            });
+            T = getPrototypeOf(T);
+        } while (T !== Model);
+        return I;
     }
-    watch(target, handler, squash, once) {
-        return this.do(() => super.watch(this.select(target), handler, squash, once));
+    pop() {
+        for (const key of getOwnPropertySymbols(this)) {
+            const entry = getOwnPropertyDescriptor(this, key);
+            if (entry.writable && entry.value)
+                entry.value.destroy();
+        }
     }
 }
 
-const Oops$5 = issues({
-    CantAttachGlobal: (parent, child) => `Singleton '${parent}' attempted to attach '${child}' but it is not also a singleton.`,
+const LookupContext = React__default["default"].createContext(new Lookup());
+const useLookup = () => React__default["default"].useContext(LookupContext);
+const Oops$4 = issues({
+    NothingInContext: (name) => `Couldn't find ${name} in context; did you forget to use a Provider?`
+});
+function useInContext(Type, arg) {
+    const instance = useLookup().get(Type);
+    if (!instance && arg !== false)
+        throw Oops$4.NothingInContext(Type.name);
+    return typeof arg == "string" ?
+        instance[arg] :
+        instance;
+}
+
+const Oops$3 = issues({
+    CantAttachGlobal: (parent, child) => `Global '${parent}' attempted to attach '${child}' but it is not also a singleton.`,
     AmbientRequired: (requested, requester, key) => `Attempted to find an instance of ${requested} in context. It is required for [${requester}.${key}], but one could not be found.`
 });
 const PendingContext = new WeakMap();
 const ContextWasUsed = new WeakMap();
-function setPeer(type, required) {
-    return setup((key, { subject }) => {
-        const Self = subject.constructor.name;
-        if ("current" in type)
-            defineLazy(subject, key, () => type.current);
-        else if ("current" in subject.constructor)
-            throw Oops$5.CantAttachGlobal(subject.constructor.name, type.name);
+function tap(type, argument) {
+    return apply(function tap(key) {
+        if ("set" in type)
+            this.state[key] = type.get();
         else {
-            let pending = PendingContext.get(subject);
-            if (!pending)
-                PendingContext.set(subject, pending = []);
-            function insert(context) {
-                const remote = context.get(type);
-                if (!remote && required)
-                    throw Oops$5.AmbientRequired(type.name, Self, key);
-                define(subject, key, remote);
-            }
-            pending.push(insert);
+            const { subject } = this;
+            if ("set" in subject.constructor)
+                throw Oops$3.CantAttachGlobal(subject, type.name);
+            getPending(subject).push(context => {
+                let instance = context.get(type);
+                if (typeof argument == "function") {
+                    if (argument(instance) === false)
+                        instance = undefined;
+                }
+                else if (!instance && argument)
+                    throw Oops$3.AmbientRequired(type.name, subject, key);
+                this.update(key, instance);
+            });
         }
+        return {
+            recursive: true
+        };
     });
 }
-function usePeers(subject) {
+function usePeerContext(subject) {
     if (ContextWasUsed.has(subject)) {
         if (ContextWasUsed.get(subject))
             useLookup();
@@ -537,505 +975,321 @@ function usePeers(subject) {
         PendingContext.delete(subject);
     }
     ContextWasUsed.set(subject, !!pending);
+}
+function getPending(subject) {
+    let pending = PendingContext.get(subject);
+    if (!pending)
+        PendingContext.set(subject, pending = []);
+    return pending;
 }
 
-const Oops$4 = issues({
-    HasPropertyUndefined: (control, property) => `${control}.${property} is marked as required for this render.`
-});
-const subscriberEvent = forAlias("element");
-const componentEvent = forAlias("component");
-class HookSubscriber extends Subscriber {
-    constructor(subject, callback, tag) {
-        super(subject, callback);
-        this.subject = subject;
-        this.callback = callback;
-        this.tag = tag;
-        this.alias = subscriberEvent;
-        this.isMounted = false;
-        this.useLifecycle = () => {
-            this.at(Lifecycle.WILL_RENDER);
-            this.at(this.isMounted
-                ? Lifecycle.WILL_UPDATE
-                : Lifecycle.WILL_MOUNT);
-            react.useLayoutEffect(() => {
-                this.listen();
-                this.isMounted = true;
-                this.at(Lifecycle.DID_MOUNT);
-                return () => {
-                    this.at(Lifecycle.WILL_UNMOUNT);
-                    this.release();
-                };
-            });
-        };
+function use(init) {
+    const [state, update] = React__default["default"].useState(() => [
+        init(() => update(state.concat()))
+    ]);
+    return state[0];
+}
+
+function useModel(source, arg, arg2) {
+    const instance = React__default["default"].useMemo(() => {
+        const cb = arg2 || arg;
+        const instance = typeof source == "function" ?
+            source.prototype instanceof Model ?
+                new source() :
+                source() :
+            source;
+        control(instance);
+        if (typeof cb == "function")
+            cb(instance);
+        return instance;
+    }, []);
+    if (Array.isArray(arg)) {
+        const update = React.useState(0)[1];
+        React__default["default"].useLayoutEffect(() => {
+            if (arg.length && instance instanceof Model)
+                instance.on(arg, () => update(x => x + 1), true);
+            return () => {
+                if (Model.isTypeof(source))
+                    instance.destroy();
+            };
+        }, []);
+        return instance;
     }
-    at(name) {
-        const also = this.alias(name);
-        for (const key of [name, also]) {
-            const on = this.subject;
-            const handle = on[key];
-            handle && handle.call(on, this.tag);
-            this.parent.update(key);
+    else {
+        const local = use(refresh => (new Subscriber(instance, () => refresh)));
+        if (typeof arg == "object") {
+            local.active = false;
+            if (typeof arg2 !== "object")
+                arg2 = getOwnPropertyNames(instance);
+            for (const key of arg2)
+                if (key in arg)
+                    instance[key] = arg[key];
+            React__default["default"].useLayoutEffect(() => {
+                local.active = true;
+            });
         }
+        React__default["default"].useLayoutEffect(() => {
+            local.commit();
+            return () => {
+                local.release();
+                if (Model.isTypeof(source))
+                    instance.destroy();
+            };
+        }, []);
+        return local.proxy;
     }
-}
-class ElementSubscriber extends HookSubscriber {
-    focus(key, expect) {
-        const source = this.subject;
-        if (fn(key)) {
-            const available = {};
-            for (const key in source)
-                available[key] = key;
-            key = key(available);
+}
+
+function useFrom(target, compute, suspend) {
+    const local = use(refresh => {
+        const sub = new Subscriber(target, () => update);
+        const spy = sub.proxy;
+        let value = compute.call(spy, spy);
+        let update;
+        let retry;
+        const set = (next) => {
+            value = next;
+            if (retry) {
+                retry();
+                retry = undefined;
+            }
+            else
+                refresh();
+        };
+        if (value instanceof Promise) {
+            value.then(set);
+            value = undefined;
+        }
+        else {
+            sub.commit();
+            update = () => {
+                const next = compute.call(spy, spy);
+                if (value != next)
+                    set(next);
+            };
         }
-        this.recursive(key, () => {
-            let value = source[key];
-            if (value instanceof Model) {
-                const child = new Subscriber(value, this.callback);
-                this.proxy = child.proxy;
-                return child;
+        defineProperty(sub, "proxy", {
+            get() {
+                if (value === undefined && suspend)
+                    throw new Promise(res => retry = res);
+                return value;
             }
-            if (value === undefined && expect)
-                throw Oops$4.HasPropertyUndefined(source.constructor.name, key);
-            this.proxy = value;
         });
-    }
-}
-class ComponentSubscriber extends HookSubscriber {
-    constructor() {
-        super(...arguments);
-        this.alias = componentEvent;
-    }
-    release() {
-        super.release();
-        this.subject.destroy();
-    }
-}
-function useRefresh(init) {
-    const [state, update] = react.useState(() => [
-        init(() => update(state.concat()))
-    ]);
-    return state[0];
-}
-function useLazy(Type, args) {
-    const instance = react.useMemo(() => Type.create(...args), []);
-    react.useEffect(() => () => instance.destroy(), []);
-    return instance;
-}
-function usePassive(target, select) {
-    const instance = target.find(!!select);
-    if (!instance)
-        return;
-    if (fn(select))
-        return select(instance);
-    if (typeof select == "string")
-        return instance[select];
-    return instance;
-}
-function useWatcher(target, path, expected) {
-    const hook = useRefresh(trigger => {
-        const sub = new ElementSubscriber(target, trigger);
-        if (path)
-            sub.focus(path, expected);
         return sub;
     });
-    react.useEffect(hook.listen, []);
-    return hook.proxy;
-}
-function useSubscriber(target, tag) {
-    const hook = useRefresh(trigger => {
-        const key = fn(tag) ? tag(target) : tag || 0;
-        return new HookSubscriber(target, trigger, key);
-    });
-    hook.useLifecycle();
-    return hook.proxy;
-}
-function useModel(Type, args, callback) {
-    const hook = useRefresh(trigger => {
-        const instance = Type.create(...args);
-        const sub = new ComponentSubscriber(instance, trigger);
-        if (callback)
-            callback(instance);
+    React__default["default"].useLayoutEffect(() => local.release, []);
+    return local.proxy;
+}
+
+function useTap(source, path, expect) {
+    const instance = React.useMemo(() => {
+        if (typeof source == "object")
+            return () => source;
+        if ("get" in source)
+            return () => source.get();
+        if ("prototype" in source)
+            return () => useInContext(source);
+        else
+            return source;
+    }, [])();
+    if (typeof path == "function")
+        return useFrom(instance, path, expect);
+    const local = use(refresh => {
+        const parent = control(instance);
+        const sub = new Subscriber(parent, () => refresh);
+        if (typeof path == "string") {
+            const source = sub.proxy;
+            defineProperty(sub, "proxy", {
+                get() {
+                    const value = source[path];
+                    if (value === undefined && expect)
+                        throw suspend(parent, path);
+                    return value;
+                }
+            });
+        }
         return sub;
     });
-    usePeers(hook.subject);
-    hook.useLifecycle();
-    return hook.proxy;
+    React__default["default"].useLayoutEffect(local.commit, []);
+    return local.proxy;
 }
 
-class Model {
-    constructor() {
-        const control = new Controller(this);
-        for (const [key, value] of entries(control))
-            if (fn(value))
-                define(this, key, value);
-        control.do = (fn) => {
-            let release;
-            this.requestUpdate(() => release = fn());
-            return () => release();
-        };
-        defineLazy(this, CONTROL, () => {
-            delete control.do;
-            control.start();
-            if (this.didCreate)
-                this.didCreate();
-            return control;
-        });
-        define(this, "get", this);
-        define(this, "set", this);
-    }
+/* istanbul ignore file */
+class MVC extends Model {
     tap(path, expect) {
-        return useWatcher(this, path, expect);
-    }
-    tag(id) {
-        return useSubscriber(this, id);
-    }
-    destroy() {
-        if (this.willDestroy)
-            this.willDestroy();
-    }
-    static create(...args) {
-        const instance = new this(...args);
-        Controller.ensure(instance);
-        return instance;
-    }
-    static use(...args) {
-        return useModel(this, args);
-    }
-    static uses(props, only) {
-        return useModel(this, [], instance => {
-            instance.import(props, only);
-        });
+        return useTap(this, path, expect);
     }
-    static using(props, only) {
-        const instance = useModel(this, []);
-        instance.import(props, only);
-        return instance;
-    }
-    static new(...args) {
-        return useLazy(this, args);
+    use(arg, callback) {
+        return useModel(this, arg, callback);
     }
-    static get(key) {
-        return usePassive(this, key);
+    static get(required) {
+        return useInContext(this, required);
     }
     static tap(key, expect) {
-        return useWatcher(this.find(true), key, expect);
-    }
-    static tag(id) {
-        return useSubscriber(this.find(true), id);
-    }
-    static meta(path) {
-        return useWatcher(this, path);
+        return useTap(this, key, expect);
     }
-    static find(strict) {
-        return useLookup().get(this, strict);
+    /**
+     * **React Hook** - Spawn and maintain a controller from within a component.
+     *
+     * More efficient than `use()` if you don't need hook-based features.
+     *
+     * @param callback - Run after creation of instance.
+     */
+    static new(callback) {
+        return useModel(this, [], callback);
     }
-    static isTypeof(maybe) {
-        return (fn(maybe) &&
-            maybe.prototype instanceof this);
-    }
-    static get inherits() {
-        const I = getPrototypeOf(this);
-        if (I !== Model)
-            return I;
-    }
-}
-defineLazy(Model, CONTROL, function () {
-    const dispatch = new Controller(this);
-    dispatch.start();
-    return dispatch;
-});
-
-const Oops$3 = issues({
-    AssignToGetter: (name) => `Property ${name} is only a getter. Ignoring assignment.`,
-    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 ComputedFor = new WeakMap();
-function metaData(x, set) {
-    if (set)
-        ComputedInfo.set(x, set);
-    else
-        return ComputedInfo.get(x);
-}
-function implementGetters(on) {
-    let scan = on.subject;
-    while (scan !== Model && scan.constructor !== Model) {
-        for (let [key, { get, set }] of entriesIn(scan))
-            if (get)
-                prepareComputed(on, key, get, set);
-        scan = getPrototypeOf(scan);
+    static use(a, b) {
+        const instance = useModel(this, a, b);
+        usePeerContext(instance.get);
+        return instance;
     }
-}
-function prepareComputed(on, key, getter, setter) {
-    let sub;
-    let defined = ComputedFor.get(on);
-    if (!defined)
-        ComputedFor.set(on, defined = new Map());
-    if (defined.has(key))
-        return;
-    const { state, subject } = on;
-    const info = {
-        key,
-        parent: on,
-        priority: 1
-    };
-    defined.set(key, info);
-    const compute = (initial) => {
-        try {
-            return getter.call(sub.proxy, sub.proxy);
-        }
-        catch (err) {
-            Oops$3.ComputeFailed(subject.constructor.name, key, !!initial).warn();
-            throw err;
-        }
-    };
-    const update = () => {
-        let value;
-        try {
-            value = compute(false);
-        }
-        catch (e) {
-            console.error(e);
-        }
-        finally {
-            if (state[key] !== value) {
-                on.update(key);
-                return state[key] = value;
-            }
-        }
-    };
-    const create = (early) => {
-        sub = new Subscriber(subject, update, info);
-        defineProperty(state, key, {
-            value: undefined,
-            writable: true
+    /**
+     * @deprecated consider doing this manually - not worth minor efficiency gain over using.
+    */
+    static uses(apply, keys) {
+        return this.use(instance => {
+            instance.import(apply, keys);
         });
-        on.override(key, {
-            get: () => state[key],
-            set: setter
-        });
-        try {
-            return state[key] = compute(true);
-        }
-        catch (e) {
-            if (early)
-                Oops$3.ComputedEarly(key).warn();
-            throw e;
-        }
-        finally {
-            sub.listen();
-            for (const key in sub.following) {
-                const compute = defined.get(key);
-                if (compute && compute.priority >= info.priority)
-                    info.priority = compute.priority + 1;
-            }
-        }
-    };
-    alias(update, `try ${key}`);
-    alias(create, `new ${key}`);
-    alias(getter, `run ${key}`);
-    if (!setter)
-        setter = Oops$3.AssignToGetter(key).warn;
-    ComputedInit.add(create);
-    const initial = {
-        get: create,
-        set: setter,
-        configurable: true,
-        enumerable: true
-    };
-    defineProperty(state, key, initial);
-    defineProperty(subject, key, initial);
-}
-function ensureValue(from, key) {
-    const desc = getOwnPropertyDescriptor(from, key);
-    const getter = desc && desc.get;
-    if (ComputedInit.has(getter))
-        getter(true);
-}
-function computeContext(parent, handled) {
-    const pending = [];
-    function queueComputed(request) {
-        const compute = metaData(request);
-        if (!compute)
-            return false;
-        if (compute.parent !== parent)
-            request();
-        else
-            insertAfter(pending, request, sib => compute.priority > metaData(sib).priority);
-        return true;
     }
-    function flushComputed() {
-        while (pending.length) {
-            const compute = pending.shift();
-            const { key } = metaData(compute);
-            if (!handled.has(key))
-                compute();
-        }
+    /**
+     * @deprecated is now replaced by overload of `use` method.
+    */
+    static using(apply, keys) {
+        return this.use(apply, keys);
+    }
+    static meta(path, expect) {
+        return useTap(() => this, path, expect);
     }
-    return {
-        queueComputed,
-        flushComputed
-    };
 }
 
 const Oops$2 = issues({
-    SetActionProperty: (key) => `Attempted assignment of ${key}. Action properties do not allow this.`,
-    DuplicateAction: (key) => `Invoked action ${key} but one is already active.`
+    BadConsumerProps: () => `Provider expects either a render function, 'get' or 'has' props.`
 });
-function setRefMediator(effect) {
-    return setup((key, on) => {
-        const refObjectFunction = on.setter(key, effect);
-        defineProperty(refObjectFunction, "current", {
-            set: refObjectFunction,
-            get: () => on.state[key]
-        });
-        on.override(key, {
-            value: refObjectFunction
-        });
-    });
-}
-function setEffect(value, effect) {
-    return setup((key, on) => {
-        if (!effect) {
-            effect = value;
-            value = undefined;
-        }
-        on.register(key, value, effect);
-    });
-}
-function setMemo(factory, defer) {
-    return setup((key, { subject }) => {
-        const get = () => factory.call(subject);
-        if (defer)
-            defineLazy(subject, key, get);
-        else
-            define(subject, key, get());
-    });
-}
-function setIgnored(value) {
-    return setup((key, on) => {
-        const real = on.subject;
-        real[key] = value;
-        defineProperty(on.state, key, {
-            get: () => real[key]
-        });
-    });
-}
-function setAction(action) {
-    return setup((key, on) => {
-        let pending = false;
-        function invoke(...args) {
-            if (pending)
-                return Promise.reject(Oops$2.DuplicateAction(key));
-            pending = true;
-            on.update(key);
-            return action
-                .apply(on.subject, args)
-                .finally(() => {
-                pending = false;
-                on.update(key);
-            });
-        }
-        alias(invoke, `run ${key}`);
-        defineProperty(invoke, "active", {
-            get: () => pending
-        });
-        on.override(key, {
-            get: () => invoke,
-            set: () => {
-                throw Oops$2.SetActionProperty(key);
-            }
-        });
-    });
-}
-function setComputed(fn) {
-    return setup((key, on) => {
-        prepareComputed(on, key, fn);
-    });
+function Consumer(props) {
+    const { get, has, children, of: Control } = props;
+    if (typeof children == "function")
+        return children(useTap(Control));
+    const callback = has || get;
+    if (typeof callback == "function")
+        callback(useInContext(Control, !!has));
+    else
+        throw Oops$2.BadConsumerProps();
+    return null;
 }
 
-const ParentRelationship = new WeakMap();
 const Oops$1 = issues({
-    ParentRequired: (expects, child) => `New ${child} created standalone but requires parent of type ${expects}. Did you remember to create via use(${child})?`,
-    UnexpectedParent: (expects, child, got) => `New ${child} created as child of ${got}, but must be instanceof ${expects}.`
+    NoProviderType: () => `Provider 'of' prop must be Model, typeof Model or a collection of them.`
 });
-function setChild(Peer, callback) {
-    return setup((key, on) => {
-        const instance = new Peer();
-        on.register(key, instance);
-        ParentRelationship.set(instance, on.subject);
-        Controller.ensure(instance);
-        if (callback)
-            callback(instance);
-    });
+function Provider(props) {
+    const context = useNewContext(props.of);
+    const render = props.children;
+    useAppliedProps(context, props);
+    React__default["default"].useLayoutEffect(() => () => context.pop(), []);
+    return React__default["default"].createElement(LookupContext.Provider, { value: context }, typeof render == "function"
+        ? React__default["default"].createElement(RenderFunction, { context, render })
+        : render);
 }
-function setParent(Expects, required) {
-    return setup((key, { subject }) => {
-        const expectsType = Expects.name;
-        const onType = subject.constructor.name;
-        const parent = ParentRelationship.get(subject);
-        if (!parent) {
-            if (required)
-                throw Oops$1.ParentRequired(expectsType, onType);
-        }
-        else if (!(parent instanceof Expects)) {
-            const gotType = parent.constructor.name;
-            throw Oops$1.UnexpectedParent(expectsType, onType, gotType);
-        }
-        define(subject, key, parent);
+function useNewContext(inject) {
+    const from = useLookup();
+    return React__default["default"].useMemo(() => {
+        if (!inject)
+            throw Oops$1.NoProviderType();
+        const context = from.push(inject);
+        for (const instance of context.local)
+            if (instance)
+                for (const apply of getPending(instance))
+                    apply(context);
+        return context;
+    }, []);
+}
+function useAppliedProps(within, props) {
+    const update = React__default["default"].useMemo(() => {
+        const targets = within.local;
+        return function integrate(props) {
+            for (const [key, value] of entries(props))
+                if (key != "of" && key != "children")
+                    for (const into of targets)
+                        if (into && key in into)
+                            into[key] = value;
+        };
+    }, []);
+    update(props);
+}
+function RenderFunction(props) {
+    const hook = use(refresh => {
+        const targets = props.context.local;
+        if (targets.length == 1)
+            return new Subscriber(targets[0], () => refresh);
+        return {};
     });
+    if (hook.commit)
+        React__default["default"].useLayoutEffect(hook.commit, []);
+    return props.render(hook.proxy);
 }
 
 const Oops = issues({
     GlobalDoesNotExist: (name) => `Tried to access singleton ${name}, but none exist! Did you forget to initialize?\nCall ${name}.create() before attempting to access, or consider using ${name}.use() instead.`,
     GlobalExists: (name) => `Shared instance of ${name} already exists! Consider unmounting existing, or use ${name}.reset() to force-delete it.`
 });
-const Register = new WeakMap();
-class Singleton extends Model {
-    static get current() {
-        return Register.get(this);
-    }
+const Active = new WeakMap();
+class Global extends MVC {
     static create(...args) {
         const Type = this;
-        let instance = Register.get(Type);
-        if (instance)
+        if (Active.has(Type))
             throw Oops.GlobalExists(this.name);
-        instance = super.create(...args);
-        Register.set(Type, instance);
+        const instance = super.create(...args);
+        Active.set(Type, instance);
         return instance;
     }
-    static find() {
-        const { current } = this;
-        if (!current)
+    /**
+     * Update the active instance of this class.
+     * Returns a thenable; resolves after successful update.
+     * If instance does not already exist, one will be created.
+     */
+    static set(updates) {
+        const instance = Active.get(this) || this.create();
+        instance.import(updates);
+        return instance.update();
+    }
+    static get(arg) {
+        const instance = Active.get(this);
+        if (!instance && arg !== false)
             throw Oops.GlobalDoesNotExist(this.name);
-        else
-            return current;
+        return (typeof arg == "string" ?
+            instance[arg] :
+            instance);
     }
+    /** Destroy current instance of Global, if it exists. */
     static reset() {
-        if (this.current)
-            this.current.destroy();
+        const current = Active.get(this);
+        if (current)
+            current.destroy();
     }
     destroy() {
         super.destroy();
-        Register.delete(this.constructor);
+        Active.delete(this.constructor);
     }
 }
 
+exports.CONTROL = CONTROL;
 exports.Consumer = Consumer;
-exports.Model = Model;
+exports.Global = Global;
+exports.LOCAL = LOCAL;
+exports.Model = MVC;
 exports.Provider = Provider;
-exports.Singleton = Singleton;
-exports.act = setAction;
-exports.default = Model;
-exports.from = setComputed;
-exports.lazy = setIgnored;
-exports.local = local;
-exports.memo = setMemo;
-exports.on = setEffect;
-exports.parent = setParent;
-exports.ref = setRefMediator;
-exports.setup = setup;
-exports.tap = setPeer;
-exports.use = setChild;
+exports.STATE = STATE;
+exports.WHY = WHY;
+exports.act = act;
+exports.apply = apply;
+exports["default"] = MVC;
+exports.from = from;
+exports.parent = parent;
+exports.ref = ref;
+exports.set = set;
+exports.tap = tap;
+exports.use = use$1;
+exports.useFrom = useFrom;
+exports.useInContext = useInContext;
+exports.useModel = useModel;
+exports.useTap = useTap;
+//# sourceMappingURL=index.js.map