@expressive/mvc 1.0.0-beta.34 → 1.0.0-beta.37

package/lib/index.js

@@ -2,7 +2,11 @@
 
 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() {
@@ -13,9 +17,6 @@ class Issue extends Error {
     warn() {
         console.warn(this.message);
     }
-    throw() {
-        throw this;
-    }
 }
 function issues(register) {
     const Library = {};
@@ -24,10 +25,10 @@ function issues(register) {
     return Library;
 }
 
-const Oops$9 = 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: keys$1, values } = Object;
+const { assign, create, defineProperty, entries, getPrototypeOf, getOwnPropertyNames, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
 function define(target, key, value) {
     defineProperty(target, key, { value });
 }
@@ -53,7 +54,7 @@ function createEffect(callback) {
         if (unSet instanceof Promise)
             unSet = undefined;
         if (unSet && typeof unSet !== "function")
-            throw Oops$9.BadEffectCallback();
+            throw Oops$d.BadEffectCallback();
     };
 }
 function createValueEffect(callback) {
@@ -61,7 +62,7 @@ function createValueEffect(callback) {
     return function (value) {
         if (typeof unSet == "function")
             unSet(value);
-        const out = callback.call(this, value);
+        const out = callback.call(this, value, this);
         if (typeof out == "boolean")
             return out;
         if (!out || out instanceof Promise)
@@ -69,88 +70,235 @@ function createValueEffect(callback) {
         if (typeof out == "function")
             unSet = out;
         else
-            throw Oops$9.BadEffectCallback();
+            throw Oops$d.BadEffectCallback();
     };
-}
-function select(source, select) {
-    const proxy = {};
-    for (const k in source)
-        proxy[k] = k;
-    return select(proxy);
-}
-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;
+}
+
+const UPDATE = new WeakMap();
+function applyUpdate(subject, keys) {
+    UPDATE.set(subject, keys);
+    return () => {
+        setTimeout(() => {
+            UPDATE.delete(subject);
+        }, 0);
+    };
+}
+
+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.frame = new Set();
+        this.waiting = new Set();
+        this.onDestroy = new Set();
+        this.followers = new Set();
+        this.proxy = Object.create(subject);
+    }
+    start() {
+        for (const key in this.subject)
+            this.manage(key);
+        this.emit([]);
+    }
+    stop() {
+        this.followers.clear();
+        this.onDestroy.forEach(x => x());
+    }
+    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)
+                return;
+            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
+        });
+    }
+    ref(key, handler) {
+        const { state, subject } = this;
+        return (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 (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();
             }
+        };
+    }
+}
+function control(subject, cb) {
+    let control = subject[CONTROL];
+    const ready = READY.has(control);
+    if (!control) {
+        control = new Controller(subject);
+        define(subject, CONTROL, control);
+    }
+    if (!cb) {
+        if (!ready) {
+            READY.add(control);
+            control.start();
+        }
+        return control;
+    }
+    if (!ready) {
+        let done;
+        control.requestUpdate(() => {
+            done = cb(control);
         });
-    using(spy);
-    return Array.from(found);
+        return () => done && done();
+    }
+    return cb(control);
 }
 
 class Subscriber {
     constructor(parent, onUpdate) {
         this.onUpdate = onUpdate;
         this.active = false;
-        this.using = {};
         this.dependant = new Set();
+        this.watch = {};
         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, () => {
-            const update = [];
-            this.notify = keys => {
-                update.splice(0, update.length, ...keys.filter(k => k in this.using));
-            };
-            return update;
-        });
-        for (const key in parent.state)
-            this.spy(key);
-    }
-    spy(key) {
-        const { proxy } = this;
-        const existing = getOwnPropertyDescriptor(this.source, key);
-        const isUsing = () => {
-            this.using[key] = true;
-            delete proxy[key];
-            return proxy[key];
-        };
-        setAlias(isUsing, `tap ${key}`);
-        defineProperty(proxy, key, {
-            set: existing.set,
-            get: isUsing,
+            parent = control(parent);
+        let reset;
+        const proxy = create(parent.proxy);
+        const controller = parent;
+        define(proxy, LOCAL, this);
+        defineProperty(this, "proxy", {
             configurable: true,
-            enumerable: true
+            get() {
+                if (reset)
+                    setTimeout(reset, 0);
+                return proxy;
+            }
         });
-    }
-    commit() {
-        const onDone = this.parent.addListener((key, source) => {
-            const handler = this.using[key];
+        const onEvent = (key) => {
+            const handler = this.watch[key];
             if (!handler)
                 return;
             if (typeof handler == "function")
                 handler();
-            const notify = this.onUpdate(key, source);
-            source.onUpdate(notify);
-            source.onUpdate(this.notify);
-        });
-        this.active = true;
-        this.dependant.forEach(x => x.commit());
-        return this.release = () => {
-            this.dependant.forEach(x => x.release());
-            onDone();
+            const notify = this.onUpdate(key, controller);
+            const getWhy = (keys) => {
+                reset = applyUpdate(proxy, keys.filter(k => k in this.watch));
+            };
+            if (notify) {
+                controller.requestUpdate(getWhy);
+                controller.requestUpdate(notify);
+            }
+        };
+        this.commit = () => {
+            const release = controller.addListener(onEvent);
+            this.active = true;
+            this.dependant.forEach(x => x.commit());
+            return this.release = () => {
+                this.dependant.forEach(x => x.release());
+                release();
+            };
         };
     }
 }
 
-const Oops$8 = issues({
+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.`
 });
@@ -168,15 +316,12 @@ function prepare(parent, key, source, setter, getter) {
         USED.set(parent, register);
     }
     register.set(key, info);
-    const current = getter
-        ? () => getter(parent, key)
-        : () => state[key];
     function compute(initial) {
         try {
             return setter.call(sub.proxy, sub.proxy);
         }
         catch (err) {
-            Oops$8.ComputeFailed(subject, key, !!initial).warn();
+            Oops$b.ComputeFailed(subject, key, !!initial).warn();
             throw err;
         }
     }
@@ -212,44 +357,40 @@ function prepare(parent, key, source, setter, getter) {
             value: undefined,
             writable: true
         });
-        defineProperty(subject, key, {
-            enumerable: true,
-            configurable: true,
-            get: current
-        });
         try {
-            state[key] = compute(true);
+            return state[key] = compute(true);
         }
         catch (e) {
             if (early)
-                Oops$8.ComputedEarly(key).warn();
+                Oops$b.ComputedEarly(key).warn();
             throw e;
         }
         finally {
             sub.commit();
-            for (const key in sub.using) {
+            for (const key in sub.watch) {
                 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}`);
     INIT.add(create);
     INFO.set(update, info);
-    for (const on of [state, subject])
-        defineProperty(on, key, {
-            get: create,
-            configurable: true,
-            enumerable: true
-        });
+    defineProperty(state, key, {
+        get: create,
+        configurable: true,
+        enumerable: true
+    });
+    return getter
+        ? () => getter(parent, key)
+        : {};
 }
 function ensure(on, keys) {
     for (const key of keys) {
-        const desc = getOwnPropertyDescriptor(on.subject, key);
+        const desc = getOwnPropertyDescriptor(on.state, key);
         const getter = desc && desc.get;
         if (INIT.has(getter))
             getter(true);
@@ -270,377 +411,212 @@ function flush(on) {
     KEYS.delete(on);
 }
 
-const Lifecycle = {
-    WILL_RENDER: "willRender",
-    WILL_UPDATE: "willUpdate",
-    WILL_MOUNT: "willMount",
-    WILL_UNMOUNT: "willUnmount",
-    DID_MOUNT: "didMount"
-};
-const lifecycleEvents = [
-    "didCreate",
-    "willDestroy",
-    ...values(Lifecycle)
-];
-function lifecycle(prefix) {
-    const type = eventsFor(prefix);
-    return function useLifecycle(sub, tag) {
-        const emit = react.useMemo(() => {
-            const subject = sub.source;
-            const id = typeof tag == "function" ? tag(subject) : tag;
-            return (name) => {
-                for (const key of [name, type(name)])
-                    subject.update(key, id);
-            };
-        }, [sub, tag]);
-        emit(Lifecycle.WILL_RENDER);
-        emit(sub.active
-            ? Lifecycle.WILL_UPDATE
-            : Lifecycle.WILL_MOUNT);
-        react.useLayoutEffect(() => {
-            sub.commit();
-            emit(Lifecycle.DID_MOUNT);
-            return () => {
-                emit(Lifecycle.WILL_UNMOUNT);
-                sub.release();
-            };
-        }, [sub]);
-    };
-}
-function eventsFor(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);
+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);
     }
-    return (e) => map.get(e);
-}
-
-const CONTROL = Symbol("control");
-const UPDATE = Symbol("update");
-const LOCAL = Symbol("local");
-const STATE = Symbol("state");
-function manage(src) {
-    return src[CONTROL];
-}
-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") {
-            const getter = output;
-            output = Object.assign(Object.assign({}, getOwnPropertyDescriptor(this.subject, key)), { get() {
-                    return getter(this[LOCAL]);
-                } });
-        }
-        if (output)
-            defineProperty(this.subject, key, output);
+    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;
+        });
     }
-    Pending.set(placeholder, setup);
-    return placeholder;
-}
-class Controller {
-    constructor(subject) {
-        this.subject = subject;
-        this.state = {};
-        this.frame = new Set();
-        this.waiting = new Set();
-        this.followers = new Set();
+    once(select, callback, squash) {
+        if (callback)
+            return this.on(select, callback, squash, true);
+        return new Promise(resolve => {
+            this.on(select, resolve, true, true);
+        });
     }
-    static setup(onto) {
-        const control = new this(onto);
-        defineLazy(onto, CONTROL, () => {
-            onto[STATE] = control.state;
-            control.start();
-            if (onto.didCreate)
-                onto.didCreate();
-            return control;
+    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 invoke = () => {
+                effect.call(this.get, this.get);
+            };
+            invoke();
+            if (!select.length) {
+                control.onDestroy.add(invoke);
+                return () => {
+                    control.onDestroy.delete(invoke);
+                };
+            }
+            return control.addListener(key => {
+                if (select.includes(key))
+                    return invoke;
+            });
         });
-        return control;
     }
-    get pending() {
-        return this.frame.size > 0;
+    // 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];
     }
-    onUpdate(cb) {
-        if (typeof cb == "function")
-            this.waiting.add(cb);
+    export(subset) {
+        const { state } = control(this);
+        const output = {};
+        if (!subset)
+            subset = getOwnPropertyNames(state);
+        for (const key of subset)
+            output[key] = state[key];
+        return output;
     }
-    start() {
-        const { subject } = this;
-        for (const key in subject) {
-            const desc = getOwnPropertyDescriptor(subject, key);
-            if (desc && "value" in desc) {
-                const { value } = desc;
-                const instruction = Pending.get(value);
-                if (instruction) {
-                    Pending.delete(value);
-                    delete subject[key];
-                    instruction.call(this, key, this);
-                }
-                else if (typeof value !== "function" || /^[A-Z]/.test(key))
-                    this.manage(key, value);
+    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);
             }
+            arg = undefined;
         }
-        this.emit();
-        return this;
-    }
-    select(using) {
-        const keys = getOwnPropertyNames(this.state);
-        return using
-            ? selectRecursive(using, keys.concat(lifecycleEvents))
-            : keys;
-    }
-    manage(key, initial, effect) {
-        const { state, subject } = this;
-        state[key] = initial;
-        defineProperty(subject, key, {
-            enumerable: true,
-            configurable: true,
-            get: () => state[key],
-            set: this.setter(key, effect)
-        });
+        return target.requestUpdate(arg);
     }
-    setter(key, handler) {
-        const { state, subject } = this;
-        return (value) => {
-            if (state[key] == value)
-                return;
-            if (handler)
-                switch (handler.call(subject, value)) {
-                    case true:
-                        this.update(key);
-                    case false:
-                        return;
-                }
-            this.update(key, value);
-        };
+    /**
+     * Mark this instance for garbage-collection and send `willDestroy` event to all listeners.
+     */
+    destroy() {
+        control(this).stop();
     }
-    addListener(listener) {
-        this.followers.add(listener);
-        return () => {
-            this.followers.delete(listener);
-        };
+    toString() {
+        return this.constructor.name;
     }
-    update(key, value) {
-        if (1 in arguments)
-            this.state[key] = value;
-        if (this.frame.has(key))
-            return;
-        if (!this.frame.size)
-            setTimeout(() => this.emit(), 0);
-        this.frame.add(key);
-        for (const callback of this.followers)
-            this.onUpdate(callback(key, this));
+    /**
+     * 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;
     }
-    emit() {
-        flush(this);
-        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);
-            }
-            catch (e) { }
-        });
+    /**
+     * 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);
     }
 }
-function keys(from, using) {
-    if (typeof using == "string")
-        return [using];
-    if (typeof using == "object") {
-        using = Array.from(using);
-        if (using.length === 0)
-            using = undefined;
+defineLazy(Model, CONTROL, function () {
+    return new Controller(this);
+});
+
+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 (!output)
+            return;
+        if ("explicit" in output) {
+            defineProperty(this.subject, key, output);
+            return;
+        }
+        if ("recursive" in output)
+            output = Object.assign(Object.assign({}, output), { get: recursive(this, key) });
+        if (typeof output == "function")
+            return { get: output };
         else
-            return using;
+            return output;
     }
-    return from.select(using);
-}
-
-function child(source, name) {
-    return apply(function child(key) {
-        const context = new WeakMap();
-        const current = source.call(this, key);
-        function subscribe(sub) {
-            let child;
-            function start() {
-                const instance = current();
-                if (instance) {
-                    child = new Subscriber(instance, sub.onUpdate);
-                    if (sub.active)
-                        child.commit();
-                    sub.dependant.add(child);
-                    context.set(sub, child.proxy);
-                }
+    Pending.set(placeholder, setup);
+    return placeholder;
+}
+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;
             }
-            function restart() {
-                if (child) {
-                    child.release();
-                    sub.dependant.delete(child);
-                    context.set(sub, undefined);
-                    child = undefined;
-                }
-                start();
+            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);
             }
-            start();
-            sub.using[key] = restart;
-        }
-        return (local) => {
-            if (!local)
-                return current();
-            if (!context.has(local))
-                subscribe(local);
-            return context.get(local);
         };
-    }, name || source.name);
+        init();
+        parent.watch[key] = init;
+    };
+    return (value, local) => {
+        if (!local)
+            return value;
+        if (!context.has(local))
+            subscribe(local);
+        return context.get(local);
+    };
 }
 
-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.`
+const Oops$a = issues({
+    DuplicateAction: (key) => `Invoked action ${key} but one is already active.`
 });
-function lazy(value) {
-    return apply(function lazy(key) {
-        const source = this.subject;
-        source[key] = value;
-        defineProperty(this.state, key, {
-            get: () => source[key]
-        });
-    });
-}
-function set(factory, argument) {
-    return apply(function set(key) {
-        let onSet;
-        let onGet;
-        const required = argument === true || argument === undefined;
-        if (factory === undefined)
-            onGet = () => pendingValue(this, key);
-        else if (typeof factory !== "function")
-            throw Oops$7.BadFactory();
-        else {
-            onGet = pendingFactory(this, key, factory);
-            if (required)
-                try {
-                    onGet();
-                }
-                catch (err) {
-                    if (err instanceof Promise)
-                        ;
-                    else {
-                        Oops$7.FactoryFailed(this.subject, key).warn();
-                        throw err;
-                    }
-                }
-        }
-        if (typeof argument == "function")
-            onSet = createValueEffect(argument);
-        else if (required)
-            onSet = (value) => {
-                if (value === undefined)
-                    throw Oops$7.NonOptional(this.subject, key);
-            };
-        return {
-            set: this.setter(key, onSet),
-            get: onGet
-        };
-    });
-}
-function on(initial, onUpdate) {
-    return set(initial && (() => initial), onUpdate);
-}
-
-const Oops$6 = issues({
-    CantAttachGlobal: (parent, child) => `Singleton '${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 tap(type, argument) {
-    return child(function tap(key) {
-        return pendingAccess(this.subject, type, key, argument);
-    });
-}
-function pendingAccess(from, type, key, argument) {
-    if ("current" in type)
-        return () => type.current;
-    if ("current" in from.constructor)
-        throw Oops$6.CantAttachGlobal(from, type.name);
-    let instance;
-    getPending(from).push(context => {
-        instance = context.get(type);
-        if (typeof argument == "function") {
-            if (argument(instance) === false)
-                instance = undefined;
-        }
-        else if (!instance && argument)
-            throw Oops$6.AmbientRequired(type.name, from, key);
-    });
-    return () => instance;
-}
-function usePeerContext(subject) {
-    if (ContextWasUsed.has(subject)) {
-        if (ContextWasUsed.get(subject))
-            useLookup();
-        return;
-    }
-    const pending = PendingContext.get(subject);
-    if (pending) {
-        const local = useLookup();
-        for (const init of pending)
-            init(local);
-        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$5 = 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}.`,
-    PeerNotAllowed: (model, property) => `Attempted to use an instruction result (probably use or tap) as computed source for ${model}.${property}. This is not possible.`
-});
-function createRef(key, cb) {
-    const refObjectFunction = this.setter(key, cb && createValueEffect(cb));
-    defineProperty(refObjectFunction, "current", {
-        set: refObjectFunction,
-        get: () => this.state[key]
-    });
-    return refObjectFunction;
-}
-function ref(arg) {
-    return apply(function ref(key) {
-        let value = {};
-        if (typeof arg == "object") {
-            const source = manage(arg);
-            for (const key in source.state)
-                defineLazy(value, key, createRef.bind(source, key));
-        }
-        else
-            value = createRef.call(this, key, arg);
-        return { value };
-    });
-}
 function act(task) {
     return apply(function act(key) {
         let pending = false;
         const invoke = (...args) => {
             if (pending)
-                return Promise.reject(Oops$5.DuplicateAction(key));
+                return Promise.reject(Oops$a.DuplicateAction(key));
             pending = true;
             this.update(key);
             return new Promise(res => {
@@ -657,50 +633,14 @@ function act(task) {
         });
         return {
             value: invoke,
-            writable: false
+            set: false
         };
     });
-}
-function from(source, setter, argument) {
-    return apply(function from(key) {
-        let getSource;
-        const { subject } = this;
-        const getter = argument === true
-            ? pendingValue
-            : argument || undefined;
-        // Easy mistake, using a peer, will always be unresolved.
-        if (typeof source == "symbol")
-            throw Oops$5.PeerNotAllowed(subject, key);
-        // replace source controller in-case different
-        if (typeof source == "object")
-            getSource = () => manage(source);
-        // specifically an arrow function (getter factory)
-        else if (!source.prototype) {
-            setter = source.call(subject, key);
-            getSource = () => this;
-        }
-        // is a peer Model (constructor)
-        else if (Model.isTypeof(source))
-            getSource = pendingAccess(subject, source, key, true);
-        // Regular function is too ambiguous so not allowed.
-        else
-            throw Oops$5.BadComputedSource(subject, key, source);
-        prepare(this, key, getSource, setter, getter);
-    });
 }
 
-const Oops$4 = issues({
+const Oops$9 = issues({
     ValueNotReady: (model, key) => `Value ${model}.${key} value is not yet available.`
 });
-/* deprecated - ignore coverage */
-/* istanbul ignore next */
-function pending(source, compute) {
-    if (source === undefined)
-        return set();
-    if (typeof source == "function" && !source.prototype)
-        return set(source);
-    return from(source, compute, true);
-}
 /**
  * Get value, suspend instead if undefined.
  *
@@ -732,7 +672,7 @@ function pendingFactory(via, key, fn) {
             throw error = err;
         }
         if (output instanceof Promise) {
-            const issue = Oops$4.ValueNotReady(subject, key);
+            const issue = Oops$9.ValueNotReady(subject, key);
             output
                 .catch(err => error = err)
                 .then(out => state[key] = out)
@@ -748,7 +688,7 @@ function pendingFactory(via, key, fn) {
     };
 }
 function suspend(source, key) {
-    const error = Oops$4.ValueNotReady(source.subject, key);
+    const error = Oops$9.ValueNotReady(source.subject, key);
     const promise = new Promise(resolve => {
         const release = source.addListener(forKey => {
             if (forKey == key)
@@ -768,99 +708,153 @@ function suspend(source, key) {
     });
 }
 
-function use$1(init) {
-    const [state, update] = react.useState(() => [
-        init(() => update(state.concat()))
-    ]);
-    return state[0];
-}
-function useLazy(Type, callback) {
-    const instance = react.useMemo(() => {
-        const instance = Type.create();
-        if (callback)
-            callback(instance);
-        return instance;
-    }, []);
-    react.useLayoutEffect(() => () => instance.destroy(), []);
-    return instance;
-}
-function useWatcher(target, focus, expected) {
-    const hook = use$1(refresh => {
-        const sub = new Subscriber(target, () => refresh);
-        if (focus) {
-            const source = sub.proxy;
-            defineProperty(sub, "proxy", {
-                get() {
-                    const value = source[focus];
-                    if (value === undefined && expected)
-                        throw suspend(sub.parent, focus);
-                    return value;
-                }
-            });
+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;
         }
-        return sub;
+        // Regular function is too ambiguous so not allowed.
+        else
+            throw Oops$8.BadComputedSource(subject, key, source);
+        return prepare(this, key, getSource, setter, getter);
     });
-    react.useLayoutEffect(() => hook.commit(), []);
-    return hook.proxy;
-}
-function useComputed(target, compute, expected) {
-    const hook = use$1(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;
+}
+
+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 {
-            sub.commit();
-            update = () => {
-                const next = compute.call(spy, spy);
-                if (value != next)
-                    set(next);
+            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);
         }
-        const get = expected
-            ? () => {
-                if (value === undefined)
-                    throw new Promise(res => retry = res);
-                return value;
-            }
-            : () => value;
-        defineProperty(sub, "proxy", { get });
-        return sub;
+        else if (!(value instanceof Expects))
+            throw Oops$6.UnexpectedParent(expected, child, value);
+        return { value };
     });
-    react.useLayoutEffect(() => hook.release, []);
-    return hook.proxy;
-}
-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((key) => {
-            if (key == Lifecycle.WILL_UNMOUNT)
-                return () => {
-                    instance.destroy();
-                    release();
-                };
-        });
-        if (callback)
-            callback(instance);
-        return sub;
+}
+
+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;
+        };
+        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
+        };
     });
-    return hook.proxy;
 }
 
 class Lookup {
@@ -868,7 +862,9 @@ class Lookup {
         this.table = new Map();
     }
     get local() {
-        return getOwnPropertySymbols(this).map((symbol) => this[symbol]);
+        return [
+            ...new Set(getOwnPropertySymbols(this).map(symbol => this[symbol]))
+        ];
     }
     key(T) {
         let key = this.table.get(T);
@@ -902,8 +898,12 @@ class Lookup {
             I = I.create();
         }
         do {
-            defineProperty(this, this.key(T), {
-                value: I, writable
+            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);
@@ -912,352 +912,306 @@ class Lookup {
     pop() {
         for (const key of getOwnPropertySymbols(this)) {
             const entry = getOwnPropertyDescriptor(this, key);
-            if (entry.writable)
+            if (entry.writable && entry.value)
                 entry.value.destroy();
         }
     }
 }
 
-const Oops$3 = issues({
-    NoProviderType: () => `Provider 'of' prop must be Model, typeof Model or a collection of them.`,
-    NothingInContext: (name) => `Couldn't find ${name} in context; did you forget to use a Provider?`,
-    BadConsumerProps: () => `Provider expects either a render function, 'get' or 'has' props.`
+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?`
 });
-const LookupContext = react.createContext(new Lookup());
-const useLookup = () => react.useContext(LookupContext);
-function useFromContext(Type, strict) {
+function useInContext(Type, arg) {
     const instance = useLookup().get(Type);
-    if (!instance && strict)
-        throw Oops$3.NothingInContext(Type.name);
-    return instance;
-}
-function Consumer(props) {
-    const { get, has, children, of: Control } = props;
-    if (typeof children == "function")
-        return children(Control.tap());
-    const callback = has || get;
-    if (typeof callback == "function")
-        callback(Control.get(!!has));
-    else
-        throw Oops$3.BadConsumerProps();
-    return null;
-}
-function useNewContext(from, inject) {
-    return react.useMemo(() => {
-        if (!inject)
-            throw Oops$3.NoProviderType();
-        const context = from.push(inject);
-        for (const instance of context.local)
-            for (const apply of getPending(instance))
-                apply(context);
-        return context;
-    }, []);
-}
-function useAppliedProps(within, props) {
-    const update = react.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 (key in into)
-                            into[key] = value;
-        };
-    }, []);
-    update(props);
-}
-function RenderFunction(props) {
-    const hook = use$1(refresh => {
-        const targets = props.context.local;
-        if (targets.length == 1)
-            return new Subscriber(targets[0], () => refresh);
-        return {};
-    });
-    if (hook.commit)
-        react.useLayoutEffect(() => hook.commit(), []);
-    return props.render(hook.proxy);
-}
-function Provider(props) {
-    const render = props.children;
-    const current = useLookup();
-    const context = useNewContext(current, props.of);
-    useAppliedProps(context, props);
-    react.useLayoutEffect(() => () => context.pop(), []);
-    return react.createElement(LookupContext.Provider, { value: context }, typeof render == "function"
-        ? react.createElement(RenderFunction, { context, render })
-        : render);
+    if (!instance && arg !== false)
+        throw Oops$4.NothingInContext(Type.name);
+    return typeof arg == "string" ?
+        instance[arg] :
+        instance;
 }
 
-const Oops$2 = 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 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 useElementLifecycle = lifecycle("element");
-const useComponentLifecycle = lifecycle("component");
-class Model {
-    constructor() {
-        const control = Controller.setup(this);
-        define(this, "get", this);
-        define(this, "set", this);
-        defer(control, "on");
-        defer(control, "effect");
-        control.onUpdate(() => {
-            delete this.on;
-            delete this.effect;
-        });
-    }
-    tap(path, expect) {
-        if (typeof path == "function")
-            return useComputed(this, path, expect);
-        const proxy = useWatcher(this, path, expect);
-        this.update("willRender", true);
-        return proxy;
-    }
-    tag(id) {
-        const hook = use$1(refresh => (new Subscriber(this, () => refresh)));
-        useElementLifecycle(hook, id || 0);
-        return hook.proxy;
+const PendingContext = new WeakMap();
+const ContextWasUsed = new WeakMap();
+function tap(type, argument) {
+    return apply(function tap(key) {
+        if ("set" in type)
+            this.state[key] = type.get();
+        else {
+            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 usePeerContext(subject) {
+    if (ContextWasUsed.has(subject)) {
+        if (ContextWasUsed.get(subject))
+            useLookup();
+        return;
     }
-    use(callback) {
-        const hook = use$1(refresh => {
-            if (callback)
-                callback(this);
-            return new Subscriber(this, () => refresh);
-        });
-        useComponentLifecycle(hook);
-        return hook.proxy;
+    const pending = PendingContext.get(subject);
+    if (pending) {
+        const local = useLookup();
+        for (const init of pending)
+            init(local);
+        PendingContext.delete(subject);
     }
-    on(subset, handler, squash, once) {
-        const control = manage(this);
-        const request = keys(control, subset);
-        const callback = squash
-            ? handler.bind(this)
-            : frame => frame
-                .filter(k => request.includes(k))
-                .forEach(k => handler.call(this, control.state[k], k));
-        const trigger = once
-            ? frame => { remove(); callback(frame); }
-            : callback;
-        ensure(control, request);
-        const remove = control.addListener(key => {
-            if (request.includes(key))
-                return trigger;
-        });
-        return remove;
+    ContextWasUsed.set(subject, !!pending);
+}
+function getPending(subject) {
+    let pending = PendingContext.get(subject);
+    if (!pending)
+        PendingContext.set(subject, pending = []);
+    return pending;
+}
+
+function use(init) {
+    const [state, update] = React__default["default"].useState(() => [
+        init(() => update(state.concat()))
+    ]);
+    return state[0];
+}
+
+function useModel(source, arg, callback) {
+    const instance = React__default["default"].useMemo(() => {
+        const cb = callback || 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;
     }
-    once(select, callback, squash) {
-        if (callback)
-            return this.on(select, callback, squash, true);
-        return new Promise(resolve => {
-            this.on(select, resolve, true, true);
+    else {
+        const local = use(refresh => {
+            return new Subscriber(instance, () => refresh);
         });
+        React__default["default"].useLayoutEffect(() => {
+            local.commit();
+            return () => {
+                local.release();
+                if (Model.isTypeof(source))
+                    instance.destroy();
+            };
+        }, []);
+        return local.proxy;
     }
-    effect(callback, select) {
-        const control = manage(this);
-        let target = this;
-        const effect = createEffect(callback);
-        const invoke = () => effect.call(target, target);
-        if (select) {
-            invoke();
-            return this.on(select, invoke, true);
+}
+
+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;
         }
-        const sub = new Subscriber(control, () => invoke);
-        target = sub.proxy;
-        invoke();
-        return sub.commit();
-    }
-    import(from, subset) {
-        for (const key of keys(manage(this), subset))
-            if (key in from)
-                this[key] = from[key];
-    }
-    export(subset) {
-        const control = manage(this);
-        const output = {};
-        for (const key of keys(control, subset))
-            output[key] = control.state[key];
-        return output;
-    }
-    update(arg, tag) {
-        const control = manage(this);
-        if (typeof arg == "function")
-            arg = select(this, arg);
-        if (typeof arg == "boolean") {
-            if (!control.pending === arg)
-                return Promise.reject(Oops$2.StrictUpdate(arg));
+        else {
+            sub.commit();
+            update = () => {
+                const next = compute.call(spy, spy);
+                if (value != next)
+                    set(next);
+            };
         }
-        else if (arg) {
-            control.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);
+        defineProperty(sub, "proxy", {
+            get() {
+                if (value === undefined && suspend)
+                    throw new Promise(res => retry = res);
+                return value;
             }
+        });
+        return sub;
+    });
+    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 {
-            then(callback) {
-                if (callback)
-                    if (control.pending)
-                        control.waiting.add(callback);
-                    else
-                        callback(false);
-                else
-                    throw Oops$2.NoChaining();
-            }
-        };
-    }
-    destroy() {
-        this.update("willDestroy", true);
-    }
-    toString() {
-        return this.constructor.name;
-    }
-    static create(...args) {
-        const instance = new this(...args);
-        manage(instance);
-        return instance;
-    }
-    static new(callback) {
-        const instance = useLazy(this, callback);
-        instance.update("willRender", true);
-        return instance;
+        return sub;
+    });
+    React__default["default"].useLayoutEffect(() => local.commit(), []);
+    return local.proxy;
+}
+
+class MVC extends Model {
+    tap(path, expect) {
+        return useTap(this, path, expect);
     }
-    static find(strict) {
-        return useFromContext(this, strict);
+    use(arg, callback) {
+        return useModel(this, arg, callback);
     }
-    static get(key) {
-        const instance = this.find(!!key);
-        return (typeof key == "function" ?
-            key(instance) :
-            typeof key == "string" ?
-                instance[key] :
-                instance);
+    static get(required) {
+        return useInContext(this, required);
     }
     static tap(key, expect) {
-        return this.find(true).tap(key, expect);
-    }
-    static tag(id) {
-        return this.find(true).tag(id);
+        return useTap(this, key, expect);
+    }
+    /**
+     * **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 use(callback) {
-        const instance = useModel(this, callback);
-        useComponentLifecycle(instance[LOCAL]);
+    static use(arg, callback) {
+        const instance = useModel(this, arg, callback);
         usePeerContext(instance.get);
         return instance;
     }
-    static uses(props, only) {
+    static uses(data, only) {
         return this.use(instance => {
-            instance.import(props, only);
+            instance.import(data, only);
         });
     }
-    static using(props, only) {
+    static using(data, only) {
         const instance = this.use();
-        instance.import(props, only);
+        instance.import(data, only);
         return instance;
     }
-    static meta(path) {
-        return typeof path == "function"
-            ? useComputed(this, path)
-            : useWatcher(this, path);
+    static meta(path, expect) {
+        return useTap(() => this, path, expect);
     }
-    static isTypeof(maybe) {
-        return (typeof maybe == "function" &&
-            maybe.prototype instanceof this);
-    }
-}
-Model.CONTROL = CONTROL;
-Model.STATE = STATE;
-Model.LOCAL = LOCAL;
-Model.WHY = UPDATE;
-defineLazy(Model, CONTROL, function () {
-    return new Controller(this).start();
+}
+
+const Oops$2 = issues({
+    BadConsumerProps: () => `Provider expects either a render function, 'get' or 'has' props.`
 });
-function defer(on, method) {
-    const { subject, waiting } = on;
-    const real = subject[method];
-    subject[method] = (...args) => {
-        let done;
-        waiting.add(() => {
-            done = real.apply(subject, args);
-        });
-        return () => done();
-    };
+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 Parent = 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}.`,
-    UndefinedNotAllowed: (key) => `Child property ${key} may not be undefined.`,
-    BadArgument: (type) => `Instruction \`use\` cannot accept argument type of ${type}.`,
-    IsReadOnly: (owner, key) => `${owner}.${key} is set to read-only, but tried to reassign assign.`,
-    MustBeDefined: (owner, key) => `${owner}.${key} must have initial value, as a read-only property.`
+    NoProviderType: () => `Provider 'of' prop must be Model, typeof Model or a collection of them.`
 });
-function bootstrap(object) {
-    const breakdown = getOwnPropertyDescriptors(object);
-    const control = new Model();
-    for (const key in breakdown)
-        defineProperty(control, key, breakdown[key]);
-    return control;
+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 use(input, argument) {
-    return child(function use(key) {
-        const { subject } = this;
-        // `true` => readonly
-        // `false` => writable, may be undefined
-        // `undefined` => writable (default)
-        let mode = argument;
-        let current;
-        const onUpdate = (next, initial) => {
-            if (mode === true && !initial)
-                throw Oops$1.IsReadOnly(subject, key);
-            if (next) {
-                current = next instanceof Model
-                    ? next : bootstrap(next);
-                Parent.set(current, subject);
-                manage(current);
-            }
-            else if (mode === undefined)
-                throw Oops$1.UndefinedNotAllowed(key);
-            else
-                current = undefined;
-            if (typeof argument == "function")
-                return argument(current);
+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;
         };
-        if (input) {
-            current =
-                Model.isTypeof(input) ? new input() :
-                    input instanceof Model ? input :
-                        typeof input === "function" ? input() :
-                            typeof input === "object" ? bootstrap(input) :
-                                Oops$1.BadArgument(typeof input).throw();
-            if (current)
-                mode = onUpdate(current, true) || mode;
-            else if (mode == true)
-                throw Oops$1.MustBeDefined(subject, key);
-        }
-        else
-            mode = false;
-        this.manage(key, current, onUpdate);
-        return () => current;
-    });
+    }, []);
+    update(props);
 }
-function parent(Expects, required) {
-    return apply(function parent() {
-        const child = this.subject;
-        const expected = Expects.name;
-        const value = Parent.get(this.subject);
-        if (!value) {
-            if (required)
-                throw Oops$1.ParentRequired(expected, child);
-        }
-        else if (!(value instanceof Expects))
-            throw Oops$1.UnexpectedParent(expected, child, value);
-        return { value };
+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({
@@ -1265,35 +1219,38 @@ const Oops = issues({
     GlobalExists: (name) => `Shared instance of ${name} already exists! Consider unmounting existing, or use ${name}.reset() to force-delete it.`
 });
 const Active = new WeakMap();
-class Singleton extends Model {
-    static get current() {
-        return Active.get(this);
-    }
+class Global extends MVC {
     static create(...args) {
         const Type = this;
         if (Active.has(Type))
             throw Oops.GlobalExists(this.name);
-        let instance = super.create(...args);
+        const instance = super.create(...args);
         Active.set(Type, instance);
         return instance;
     }
-    static update(updates) {
-        const instance = this.current || this.create();
+    /**
+     * 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 is() {
-        return this.find(true);
-    }
-    static find(strict) {
-        const instance = this.current;
-        if (!instance && strict)
+    static get(arg) {
+        const instance = Active.get(this);
+        if (!instance && arg !== false)
             throw Oops.GlobalDoesNotExist(this.name);
-        return instance;
+        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();
@@ -1301,22 +1258,25 @@ class Singleton extends Model {
     }
 }
 
+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.STATE = STATE;
+exports.WHY = WHY;
 exports.act = act;
 exports.apply = apply;
-exports.child = child;
-exports["default"] = Model;
+exports["default"] = MVC;
 exports.from = from;
-exports.lazy = lazy;
-exports.memo = set;
-exports.on = on;
 exports.parent = parent;
-exports.pending = pending;
 exports.ref = ref;
 exports.set = set;
 exports.tap = tap;
-exports.use = use;
+exports.use = use$1;
+exports.useFrom = useFrom;
+exports.useInContext = useInContext;
+exports.useModel = useModel;
+exports.useTap = useTap;
 //# sourceMappingURL=index.js.map