@expressive/mvc 1.0.0-beta.12 → 1.0.0-beta.17

package/lib/index.js

@@ -44,13 +44,11 @@ function defineLazy(object, property, init) {
 function setAlias(func, displayName) {
     assign(func, { displayName });
 }
-function entriesIn(object) {
-    return entries(getOwnPropertyDescriptors(object));
-}
 function createEffect(callback) {
     let unSet;
     return function (value) {
-        typeof unSet == "function" && unSet();
+        if (typeof unSet == "function")
+            unSet();
         unSet = callback.call(this, value);
         if (unSet instanceof Promise)
             unSet = undefined;
@@ -58,6 +56,28 @@ function createEffect(callback) {
             throw Oops$8.BadEffectCallback();
     };
 }
+function createValueEffect(callback) {
+    let unSet;
+    return function (value) {
+        if (typeof unSet == "function")
+            unSet(value);
+        const out = callback.call(this, value);
+        if (typeof out == "boolean")
+            return out;
+        if (!out || out instanceof Promise)
+            return;
+        if (typeof out == "function")
+            unSet = out;
+        else
+            throw Oops$8.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 = {};
@@ -72,6 +92,187 @@ function selectRecursive(using, keys) {
     return Array.from(found);
 }
 
+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);
+    }
+    return (e) => map.get(e);
+}
+
+const CONTROL = Symbol("control");
+const CREATE = Symbol("start");
+const LOCAL = Symbol("local");
+const STATE = Symbol("state");
+const Pending = new Map();
+function manage(src) {
+    return src[CONTROL];
+}
+function does(instruction, label) {
+    const placeholder = Symbol(`${label} instruction`);
+    Pending.set(placeholder, instruction);
+    return placeholder;
+}
+class Controller {
+    constructor(subject) {
+        this.subject = subject;
+        this.state = {};
+        this.frame = new Set();
+        this.handles = new Set();
+        this.waiting = [];
+    }
+    static setup(onto) {
+        const create = onto[CREATE];
+        const control = new this(onto);
+        const after = create && create.call(onto, control);
+        defineLazy(onto, CONTROL, () => {
+            onto[STATE] = control.state;
+            control.start();
+            if (after)
+                after();
+            if (onto.didCreate)
+                onto.didCreate();
+            return control;
+        });
+        return control;
+    }
+    get pending() {
+        return this.frame.size > 0;
+    }
+    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);
+            }
+        }
+        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)
+        });
+    }
+    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);
+        };
+    }
+    addListener(batch) {
+        this.handles.add(batch);
+        return () => {
+            this.handles.delete(batch);
+        };
+    }
+    include(to) {
+        if (capture(this, to))
+            return;
+        else
+            this.waiting.push(to);
+    }
+    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 subscription of this.handles)
+            if (key in subscription)
+                this.include(subscription[key]);
+    }
+    emit() {
+        flush(this);
+        const keys = Array.from(this.frame);
+        const handle = new Set(this.waiting.splice(0));
+        this.frame.clear();
+        handle.forEach(callback => {
+            try {
+                callback(keys);
+            }
+            catch (e) { }
+        });
+    }
+}
+function keys(from, using) {
+    if (typeof using == "string")
+        return [using];
+    if (typeof using == "object")
+        return Array.from(using);
+    return from.select(using);
+}
+
 class Subscriber {
     constructor(parent, onUpdate) {
         this.onUpdate = onUpdate;
@@ -132,6 +333,15 @@ function getRegister(on) {
         ComputedUsed.set(on, register = new Map());
     return register;
 }
+function prepareGetters(on) {
+    const defined = getRegister(on);
+    for (let scan = on.subject; scan.constructor !== Object; scan = getPrototypeOf(scan))
+        for (const key of getOwnPropertyNames(scan)) {
+            const { get, set } = getOwnPropertyDescriptor(scan, key);
+            if (get && !defined.has(key))
+                prepare(on, key, get, set);
+        }
+}
 function prepare(on, key, getter, setter) {
     const { state, subject } = on;
     const defined = getRegister(on);
@@ -194,6 +404,14 @@ function prepare(on, key, getter, setter) {
             }
         }
     }
+    function revert(value) {
+        delete state[key];
+        defineProperty(subject, key, {
+            enumerable: true,
+            configurable: true,
+            value
+        });
+    }
     setAlias(update, `try ${key}`);
     setAlias(create, `new ${key}`);
     setAlias(getter, `run ${key}`);
@@ -201,6 +419,7 @@ function prepare(on, key, getter, setter) {
     for (const on of [state, subject])
         defineProperty(on, key, {
             get: create,
+            set: setter || revert,
             configurable: true,
             enumerable: true
         });
@@ -216,16 +435,17 @@ function ensure(on, keys) {
 }
 function capture(on, request) {
     const compute = ComputedInfo.get(request);
+    const callback = request;
     if (!compute)
         return;
     let pending = ComputedKeys.get(on);
     if (!pending)
         ComputedKeys.set(on, pending = []);
     if (compute.parent !== on)
-        request();
+        callback();
     else {
-        const byPriorty = (sib) => compute.priority > ComputedInfo.get(sib).priority;
-        pending.splice(pending.findIndex(byPriorty) + 1, 0, request);
+        const queue = pending.findIndex(peer => compute.priority > ComputedInfo.get(peer).priority);
+        pending.splice(queue + 1, 0, callback);
     }
     return true;
 }
@@ -244,36 +464,22 @@ function flush(on) {
 }
 
 const Oops$6 = issues({
-    DuplicateAction: (key) => `Invoked action ${key} but one is already active.`
+    DuplicateAction: (key) => `Invoked action ${key} but one is already active.`,
+    SourceNotSupported: () => `Computed from-instruction does not support source other than 'this'.`
 });
-const Pending = new Map();
-function apply(on, key, value) {
-    const instruction = Pending.get(value);
-    if (instruction) {
-        Pending.delete(value);
-        delete on.subject[key];
-        instruction.call(on, key);
-        return true;
-    }
-}
-function set(instruction, name = instruction.name || "pending") {
-    const placeholder = Symbol(`${name} instruction`);
-    function apply(key) {
-        let output = instruction.call(this, key);
-        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);
-    }
-    Pending.set(placeholder, apply);
-    return placeholder;
-}
+const set = (fn, name) => does(function set(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);
+}, name || fn.name || "pending");
 const ref = (cb) => set(function ref(key) {
-    const refObjectFunction = this.sets(key, cb && createEffect(cb));
+    const refObjectFunction = this.setter(key, cb && createValueEffect(cb));
     defineProperty(refObjectFunction, "current", {
         set: refObjectFunction,
         get: () => this.state[key]
@@ -282,8 +488,8 @@ const ref = (cb) => set(function ref(key) {
         value: refObjectFunction
     };
 });
-const on = (value, cb) => set(function on(key) {
-    this.manage(key, value, cb && createEffect(cb));
+const on = (initial, cb) => set(function on(key) {
+    this.manage(key, initial, cb && createValueEffect(cb));
 });
 const memo = (factory, defer) => set(function memo(key) {
     const source = this.subject;
@@ -314,279 +520,83 @@ const act = (task) => set(function act(key) {
             this.update(key);
         });
     };
-    setAlias(invoke, `run ${key}`);
-    defineProperty(invoke, "active", {
-        get: () => pending
-    });
-    return {
-        value: invoke,
-        writable: false
-    };
-});
-const from = (getter) => set(function from(key) {
-    prepare(this, key, getter);
-});
-
-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 { parent } = sub;
-            const { subject } = parent;
-            const id = typeof tag == "function" ? tag(subject) : tag;
-            return (name) => {
-                for (const key of [name, type(name)]) {
-                    const handler = subject[key];
-                    if (handler)
-                        handler.call(subject, id);
-                    parent.update(key);
-                }
-            };
-        }, [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);
-    }
-    return (e) => map.get(e);
-}
-
-const CONTROL = Symbol("control");
-const LOCAL = Symbol("local");
-const STATE = Symbol("state");
-function manage(src) {
-    return src[CONTROL];
-}
-class Controller {
-    constructor(subject) {
-        this.subject = subject;
-        this.state = {};
-        this.frame = new Set();
-        this.handles = new Set();
-        this.waiting = [];
-    }
-    static init(onto, after) {
-        const control = new this(onto);
-        defer(control, "on");
-        defer(control, "effect");
-        defineLazy(onto, CONTROL, () => {
-            delete onto.on;
-            delete onto.effect;
-            onto[STATE] = control.state;
-            control.start();
-            after && after();
-            return control;
-        });
-    }
-    get pending() {
-        return this.frame.size > 0;
-    }
-    start() {
-        entriesIn(this.subject).forEach(([key, desc]) => {
-            if (desc && desc.enumerable && "value" in desc) {
-                const { value } = desc;
-                if (apply(this, key, value))
-                    return;
-                if (typeof value !== "function" || /^[A-Z]/.test(key))
-                    this.manage(key, value);
-            }
-        });
-        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.sets(key, effect)
-        });
-    }
-    sets(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);
-        };
-    }
-    watch(subset, handler, squash, once) {
-        const set = keys(this, subset);
-        const batch = {};
-        const remove = this.addListener(batch);
-        const callback = squash
-            ? handler.bind(this.subject)
-            : (frame) => {
-                for (const key of frame)
-                    if (set.includes(key))
-                        handler.call(this.subject, this.state[key], key);
-            };
-        const handle = once
-            ? (k) => { remove(); callback(k); }
-            : callback;
-        for (const key of set)
-            batch[key] = handle;
-        ensure(this, set);
-        return remove;
-    }
-    addListener(batch) {
-        this.handles.add(batch);
-        return () => {
-            this.handles.delete(batch);
-        };
-    }
-    include(to) {
-        if (capture(this, to))
-            return;
-        else
-            this.waiting.push(to);
-    }
-    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 subscription of this.handles)
-            if (key in subscription)
-                this.include(subscription[key]);
-    }
-    emit() {
-        flush(this);
-        const keys = Array.from(this.frame);
-        const handle = new Set(this.waiting.splice(0));
-        this.frame.clear();
-        handle.forEach(cb => {
-            try {
-                cb(keys);
-            }
-            catch (e) { }
-        });
-    }
-}
-function keys(from, using) {
-    if (typeof using == "string")
-        return [using];
-    if (typeof using == "object")
-        return Array.from(using);
-    return from.select(using);
-}
-function defer(on, method) {
-    const { subject, waiting } = on;
-    const real = subject[method];
-    subject[method] = (...args) => {
-        let done;
-        waiting.push(() => {
-            done = real.apply(subject, args);
-        });
-        return () => done();
-    };
-}
-
-const Oops$5 = 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.`
+    setAlias(invoke, `run ${key}`);
+    defineProperty(invoke, "active", {
+        get: () => pending
+    });
+    return {
+        value: invoke,
+        writable: false
+    };
 });
-const PendingContext = new WeakMap();
-const ContextWasUsed = new WeakMap();
-const tap = (type, argument) => child(function tap(key) {
-    if ("current" in type)
-        return () => type.current;
-    const to = this.subject;
-    if ("current" in to.constructor)
-        throw Oops$5.CantAttachGlobal(to, type.name);
-    let instance;
-    getPending(to).push(context => {
-        instance = context.get(type);
-        if (typeof argument == "function") {
-            if (argument(instance) === false)
-                instance = undefined;
+function from(source, fn) {
+    return set(function from(key) {
+        let getter;
+        if (typeof source == "function")
+            getter = source.call(this.subject, key);
+        else {
+            if (source !== this.subject)
+                throw Oops$6.SourceNotSupported();
+            getter = fn;
         }
-        else if (!instance && argument)
-            throw Oops$5.AmbientRequired(type.name, to, key);
+        prepare(this, key, getter);
     });
-    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$4 = issues({
+const attach = (from, name) => set(function attach(key) {
+    const proxyCache = new WeakMap();
+    const getCurrent = from.call(this, key);
+    function subscribe(sub) {
+        let child;
+        function start() {
+            const instance = getCurrent();
+            if (instance) {
+                child = new Subscriber(instance, sub.onUpdate);
+                if (sub.active)
+                    child.commit();
+                sub.dependant.add(child);
+                proxyCache.set(sub, child.proxy);
+            }
+        }
+        function refresh() {
+            if (child) {
+                child.release();
+                sub.dependant.delete(child);
+                proxyCache.set(sub, undefined);
+                child = undefined;
+            }
+            start();
+            sub.onUpdate();
+        }
+        start();
+        sub.follow(key, refresh);
+    }
+    return (local) => {
+        if (!local)
+            return getCurrent();
+        if (!proxyCache.has(local))
+            subscribe(local);
+        return proxyCache.get(local);
+    };
+}, name || from.name);
+
+const Oops$5 = issues({
     HasPropertyUndefined: (control, property) => `${control}.${property} is marked as required for this render.`
 });
 const useElementLifecycle = lifecycle("element");
-const useComponentLifecycle = lifecycle("component");
 function use$1(init) {
     const [state, update] = react.useState(() => [
         init(() => update(state.concat()))
     ]);
     return state[0];
 }
-function useLazy(Type, args) {
-    const instance = react.useMemo(() => Type.create(...args), []);
+function useLazy(Type, args, callback) {
+    const instance = react.useMemo(() => {
+        const instance = Type.create(...args || []);
+        if (callback)
+            callback(instance);
+        return instance;
+    }, []);
     react.useLayoutEffect(() => () => instance.destroy(), []);
     return instance;
 }
@@ -599,7 +609,7 @@ function useWatcher(target, focus, expected) {
             defineProperty(sub, "proxy", {
                 get() {
                     if (src[key] === undefined && expected)
-                        throw Oops$4.HasPropertyUndefined(target, key);
+                        throw Oops$5.HasPropertyUndefined(target, key);
                     return src[key];
                 }
             });
@@ -616,17 +626,19 @@ function useSubscriber(target, tag) {
 }
 function useModel(Type, args, callback) {
     const hook = use$1(refresh => {
-        const instance = new Type(...args);
-        const sub = new Subscriber(instance, refresh);
-        instance.on(Lifecycle.WILL_UNMOUNT, () => {
-            instance.destroy();
+        const instance = new Type(...args || []);
+        const control = manage(instance);
+        const sub = new Subscriber(control, refresh);
+        const release = control.addListener({
+            [Lifecycle.WILL_UNMOUNT]() {
+                instance.destroy();
+                release();
+            }
         });
         if (callback)
             callback(instance);
         return sub;
     });
-    usePeerContext(hook.parent.subject);
-    useComponentLifecycle(hook);
     return hook.proxy;
 }
 
@@ -670,10 +682,10 @@ class Lookup {
         }
         do {
             defineProperty(this, this.key(T), {
-                value: I,
-                writable
+                value: I, writable
             });
-        } while (T = T.inherits);
+            T = getPrototypeOf(T);
+        } while (T !== Model);
         return I;
     }
     pop() {
@@ -685,7 +697,7 @@ class Lookup {
     }
 }
 
-const Oops$3 = issues({
+const Oops$4 = 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.`
@@ -695,7 +707,7 @@ const useLookup = () => react.useContext(LookupContext);
 function useFromContext(Type, strict) {
     const instance = useLookup().get(Type);
     if (!instance && strict)
-        throw Oops$3.NothingInContext(Type.name);
+        throw Oops$4.NothingInContext(Type.name);
     return instance;
 }
 function Consumer(props) {
@@ -706,13 +718,13 @@ function Consumer(props) {
     if (typeof callback == "function")
         callback(Control.get(!!has));
     else
-        throw Oops$3.BadConsumerProps();
+        throw Oops$4.BadConsumerProps();
     return null;
 }
 function useNewContext(from, inject) {
     return react.useMemo(() => {
         if (!inject)
-            throw Oops$3.NoProviderType();
+            throw Oops$4.NoProviderType();
         const context = from.push(inject);
         for (const instance of context.local)
             for (const apply of getPending(instance))
@@ -755,50 +767,63 @@ function Provider(props) {
         : render);
 }
 
+const Oops$3 = 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();
+const tap = (type, argument) => attach(function tap(key) {
+    if ("current" in type)
+        return () => type.current;
+    const to = this.subject;
+    if ("current" in to.constructor)
+        throw Oops$3.CantAttachGlobal(to, type.name);
+    let instance;
+    getPending(to).push(context => {
+        instance = context.get(type);
+        if (typeof argument == "function") {
+            if (argument(instance) === false)
+                instance = undefined;
+        }
+        else if (!instance && argument)
+            throw Oops$3.AmbientRequired(type.name, to, 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$2 = issues({
-    StrictUpdate: (expected) => `Strict update() did ${expected ? "not " : ""}find pending updates.`
+    StrictUpdate: (expected) => `Strict update() did ${expected ? "not " : ""}find pending updates.`,
+    NoChaining: () => `Then called with undefined; update promise will never catch nor supports chaining.`
 });
-class Model {
-    constructor() {
+class State {
+    constructor(computeGetters) {
+        const control = Controller.setup(this);
         define(this, "get", this);
         define(this, "set", this);
-        Controller.init(this, () => {
-            if (this.didCreate)
-                this.didCreate();
-        });
-    }
-    tap(path, expect) {
-        return useWatcher(this, path, expect);
-    }
-    tag(id) {
-        return useSubscriber(this, id);
-    }
-    on(select, callback, squash, once) {
-        return manage(this).watch(select, callback, squash, once);
-    }
-    once(select, callback, squash) {
-        if (callback)
-            return this.on(select, callback, squash, true);
-        else
-            return new Promise(resolve => {
-                this.on(select, resolve, true, true);
-            });
-    }
-    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);
-        }
-        else {
-            const sub = new Subscriber(control, invoke);
-            target = sub.proxy;
-            invoke();
-            return sub.commit();
-        }
+        if (computeGetters !== false)
+            prepareGetters(control);
     }
     import(from, subset) {
         for (const key of keys(manage(this), subset))
@@ -812,46 +837,66 @@ class Model {
             output[key] = control.state[key];
         return output;
     }
-    update(arg) {
+    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 if (arg)
-            for (const key of keys(control, arg))
-                control.update(key);
-        if (control.pending)
-            return new Promise(cb => control.include(cb));
-        return Promise.resolve(false);
+        else if (arg) {
+            control.update(arg);
+            if (1 in arguments && arg in this)
+                if (typeof tag != "boolean")
+                    this[arg](tag);
+                else if (tag)
+                    this[arg]();
+        }
+        return {
+            then(callback) {
+                if (callback)
+                    if (control.pending)
+                        control.include(callback);
+                    else
+                        callback(false);
+                else
+                    throw Oops$2.NoChaining();
+            }
+        };
     }
     destroy() {
-        if (this.willDestroy)
-            this.willDestroy();
+        this.update("willDestroy", true);
     }
     toString() {
         return this.constructor.name;
     }
+    tap(path, expect) {
+        return useWatcher(this, path, expect);
+    }
     static create(...args) {
         const instance = new this(...args);
         manage(instance);
         return instance;
     }
-    static use(...args) {
-        return useModel(this, args);
+    static new(args, callback) {
+        return useLazy(this, args, callback);
+    }
+    static use(args, callback) {
+        return useModel(this, args, callback);
     }
     static uses(props, only) {
-        return useModel(this, [], instance => {
+        return this.use([], instance => {
             instance.import(props, only);
         });
     }
     static using(props, only) {
-        const instance = useModel(this, []);
+        const instance = this.use([]);
         instance.import(props, only);
         return instance;
     }
-    static new(...args) {
-        return useLazy(this, args);
+    static find(strict) {
+        return useFromContext(this, strict);
     }
     static get(key) {
         const instance = this.find(!!key);
@@ -864,31 +909,103 @@ class Model {
     static tap(key, expect) {
         return useWatcher(this.find(true), key, expect);
     }
+    static isTypeof(maybe) {
+        return (typeof maybe == "function" &&
+            maybe.prototype instanceof this);
+    }
+}
+State.CONTROL = CONTROL;
+State.STATE = STATE;
+State.INIT = CREATE;
+State.LOCAL = LOCAL;
+
+const useComponentLifecycle = lifecycle("component");
+class Model extends State {
+    constructor() {
+        super(false);
+    }
+    [CREATE](using) {
+        defer(using, "on");
+        defer(using, "effect");
+        return () => {
+            delete this.on;
+            delete this.effect;
+        };
+    }
+    on(subset, handler, squash, once) {
+        const control = manage(this);
+        const set = keys(control, subset);
+        const batch = {};
+        const remove = control.addListener(batch);
+        const callback = squash
+            ? handler.bind(this)
+            : (frame) => {
+                for (const key of frame)
+                    if (set.includes(key))
+                        handler.call(this, control.state[key], key);
+            };
+        const handle = once
+            ? (k) => { remove(); callback(k); }
+            : callback;
+        for (const key of set)
+            batch[key] = handle;
+        ensure(control, set);
+        return remove;
+    }
+    once(select, callback, squash) {
+        if (callback)
+            return this.on(select, callback, squash, true);
+        else
+            return new Promise(resolve => {
+                this.on(select, resolve, true, true);
+            });
+    }
+    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);
+        }
+        else {
+            const sub = new Subscriber(control, invoke);
+            target = sub.proxy;
+            invoke();
+            return sub.commit();
+        }
+    }
+    tag(id) {
+        return useSubscriber(this, id);
+    }
+    static use(args, callback) {
+        const instance = useModel(this, args, callback);
+        useComponentLifecycle(instance[LOCAL]);
+        usePeerContext(instance.get);
+        return instance;
+    }
     static tag(id) {
         return useSubscriber(this.find(true), id);
     }
     static meta(path) {
         return useWatcher(this, path);
     }
-    static find(strict) {
-        return useFromContext(this, strict);
-    }
-    static isTypeof(maybe) {
-        return (typeof maybe == "function" &&
-            maybe.prototype instanceof this);
-    }
-    static get inherits() {
-        const I = getPrototypeOf(this);
-        if (I !== Model)
-            return I;
-    }
 }
-Model.STATE = STATE;
-Model.CONTROL = CONTROL;
-Model.LOCAL = LOCAL;
 defineLazy(Model, CONTROL, function () {
     return new Controller(this).start();
-});
+});
+function defer(on, method) {
+    const { subject, waiting } = on;
+    const real = subject[method];
+    subject[method] = (...args) => {
+        let done;
+        waiting.push(() => {
+            done = real.apply(subject, args);
+        });
+        return () => done();
+    };
+}
 
 const Parent = new WeakMap();
 const Oops$1 = issues({
@@ -897,7 +1014,14 @@ const Oops$1 = issues({
     UndefinedNotAllowed: (key) => `Child property ${key} may not be undefined.`,
     BadArgument: (type) => `Instruction \`use\` cannot accept argument type of ${type}.`
 });
-const use = (input, argument) => child(function use(key) {
+function bootstrap(object) {
+    const breakdown = getOwnPropertyDescriptors(object);
+    const control = new Model();
+    for (const key in breakdown)
+        defineProperty(control, key, breakdown[key]);
+    return control;
+}
+const use = (input, argument) => attach(function use(key) {
     let instance;
     const update = (next) => {
         instance =
@@ -927,52 +1051,6 @@ const use = (input, argument) => child(function use(key) {
     this.manage(key, instance, update);
     return () => instance;
 });
-function bootstrap(object) {
-    const breakdown = getOwnPropertyDescriptors(object);
-    const control = new Model();
-    for (const key in breakdown)
-        defineProperty(control, key, breakdown[key]);
-    return control;
-}
-const child = (from, name) => {
-    function child(key) {
-        const proxyCache = new WeakMap();
-        const getCurrent = from.call(this, key);
-        function subscribe(sub) {
-            let child;
-            function start() {
-                const instance = getCurrent();
-                if (instance) {
-                    child = new Subscriber(instance, sub.onUpdate);
-                    if (sub.active)
-                        child.commit();
-                    sub.dependant.add(child);
-                    proxyCache.set(sub, child.proxy);
-                }
-            }
-            function refresh() {
-                if (child) {
-                    child.release();
-                    sub.dependant.delete(child);
-                    proxyCache.set(sub, undefined);
-                    child = undefined;
-                }
-                start();
-                sub.onUpdate();
-            }
-            start();
-            sub.follow(key, refresh);
-        }
-        return (local) => {
-            if (!local)
-                return getCurrent();
-            if (!proxyCache.has(local))
-                subscribe(local);
-            return proxyCache.get(local);
-        };
-    }
-    return set(child, name || from.name);
-};
 const parent = (Expects, required) => set(function parent() {
     const child = this.subject;
     const expected = Expects.name;
@@ -1003,10 +1081,19 @@ class Singleton extends Model {
         Active.set(Type, instance);
         return instance;
     }
-    static find() {
-        if (this.current)
-            return this.current;
-        throw Oops.GlobalDoesNotExist(this.name);
+    static update(updates) {
+        const instance = this.current || this.create();
+        instance.import(updates);
+        return instance.update();
+    }
+    static is() {
+        return this.find(true);
+    }
+    static find(strict) {
+        const instance = this.current;
+        if (!instance && strict)
+            throw Oops.GlobalDoesNotExist(this.name);
+        return instance;
     }
     static reset() {
         if (this.current)
@@ -1022,8 +1109,9 @@ exports.Consumer = Consumer;
 exports.Model = Model;
 exports.Provider = Provider;
 exports.Singleton = Singleton;
+exports.State = State;
 exports.act = act;
-exports.child = child;
+exports.attach = attach;
 exports.default = Model;
 exports.from = from;
 exports.lazy = lazy;