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

package/lib/index.js

@@ -24,7 +24,7 @@ function issues(register) {
     return Library;
 }
 
-const Oops$8 = issues({
+const Oops$9 = 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;
@@ -53,7 +53,7 @@ function createEffect(callback) {
         if (unSet instanceof Promise)
             unSet = undefined;
         if (unSet && typeof unSet !== "function")
-            throw Oops$8.BadEffectCallback();
+            throw Oops$9.BadEffectCallback();
     };
 }
 function createValueEffect(callback) {
@@ -69,7 +69,7 @@ function createValueEffect(callback) {
         if (typeof out == "function")
             unSet = out;
         else
-            throw Oops$8.BadEffectCallback();
+            throw Oops$9.BadEffectCallback();
     };
 }
 function select(source, select) {
@@ -92,6 +92,179 @@ function selectRecursive(using, keys) {
     return Array.from(found);
 }
 
+class Subscriber {
+    constructor(parent, onUpdate) {
+        this.onUpdate = onUpdate;
+        this.active = false;
+        this.follows = {};
+        this.dependant = new Set();
+        if (!(parent instanceof Controller))
+            parent = manage(parent);
+        this.parent = parent;
+        this.source = parent.subject;
+        this.proxy = create(parent.subject);
+        define(this.proxy, LOCAL, this);
+        for (const key in parent.state)
+            this.spy(key);
+    }
+    spy(key) {
+        const { proxy, source } = this;
+        const { set } = getOwnPropertyDescriptor(source, key);
+        const intercept = () => {
+            this.follow(key);
+            delete proxy[key];
+            return proxy[key];
+        };
+        setAlias(intercept, `tap ${key}`);
+        defineProperty(proxy, key, {
+            get: intercept,
+            set,
+            configurable: true,
+            enumerable: true
+        });
+    }
+    follow(key, cb) {
+        this.follows[key] = cb || this.onUpdate;
+    }
+    commit() {
+        const { dependant, follows, parent } = this;
+        const onDone = parent.addListener(follows);
+        this.active = true;
+        dependant.forEach(x => x.commit());
+        return this.release = () => {
+            dependant.forEach(x => x.release());
+            onDone();
+        };
+    }
+}
+
+const Oops$8 = issues({
+    ComputeFailed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} [${parent}.${property}].`,
+    ComputedEarly: (property) => `Note: Computed values don't run until accessed, except when subscribed to. '${property}' getter may have run earlier than intended.`
+});
+const ComputedInit = new WeakSet();
+const ComputedInfo = new WeakMap();
+const ComputedUsed = new WeakMap();
+const ComputedKeys = new WeakMap();
+function prepare(parent, key, source, setter, getter) {
+    let sub;
+    const { state, subject } = parent;
+    const info = { key, parent, priority: 1 };
+    const current = getter
+        ? () => getter.call(subject, state[key], key)
+        : () => state[key];
+    const prioritize = register(parent, key, info);
+    function compute(initial) {
+        try {
+            return setter.call(sub.proxy, sub.proxy);
+        }
+        catch (err) {
+            Oops$8.ComputeFailed(subject, key, !!initial).warn();
+            throw err;
+        }
+    }
+    function update() {
+        let value;
+        try {
+            value = compute(false);
+        }
+        catch (e) {
+            console.error(e);
+        }
+        finally {
+            if (state[key] !== value) {
+                parent.update(key, value);
+                return value;
+            }
+        }
+    }
+    function create(early) {
+        sub = new Subscriber(source(), update);
+        defineProperty(state, key, {
+            value: undefined,
+            writable: true
+        });
+        defineProperty(subject, key, {
+            enumerable: true,
+            configurable: true,
+            get: current
+        });
+        try {
+            state[key] = compute(true);
+        }
+        catch (e) {
+            if (early)
+                Oops$8.ComputedEarly(key).warn();
+            throw e;
+        }
+        finally {
+            sub.commit();
+            for (const key in sub.follows)
+                prioritize(key);
+        }
+        return current();
+    }
+    setAlias(update, `try ${key}`);
+    setAlias(create, `new ${key}`);
+    setAlias(setter, `run ${key}`);
+    ComputedInit.add(create);
+    ComputedInfo.set(update, info);
+    for (const on of [state, subject])
+        defineProperty(on, key, {
+            get: create,
+            configurable: true,
+            enumerable: true
+        });
+}
+function register(on, key, info) {
+    let register = ComputedUsed.get(on);
+    if (!register)
+        ComputedUsed.set(on, register = new Map());
+    register.set(key, info);
+    return (key) => {
+        const peer = register.get(key);
+        if (peer && peer.priority >= info.priority)
+            info.priority = peer.priority + 1;
+    };
+}
+function ensure(on, keys) {
+    for (const key of keys) {
+        const desc = getOwnPropertyDescriptor(on.subject, key);
+        const getter = desc && desc.get;
+        if (ComputedInit.has(getter))
+            getter(true);
+    }
+}
+function capture(on, request) {
+    const compute = ComputedInfo.get(request);
+    const callback = request;
+    if (!compute)
+        return;
+    let pending = ComputedKeys.get(on);
+    if (!pending)
+        ComputedKeys.set(on, pending = []);
+    if (compute.parent !== on)
+        callback();
+    else {
+        const queue = pending.findIndex(peer => compute.priority > ComputedInfo.get(peer).priority);
+        pending.splice(queue + 1, 0, callback);
+    }
+    return true;
+}
+function flush(on) {
+    const handled = on.frame;
+    let pending = ComputedKeys.get(on);
+    if (pending) {
+        while (pending.length) {
+            const compute = pending.shift();
+            const { key } = ComputedInfo.get(compute);
+            if (!handled.has(key))
+                compute();
+        }
+        ComputedKeys.delete(on);
+    }
+}
+
 const Lifecycle = {
     WILL_RENDER: "willRender",
     WILL_UPDATE: "willUpdate",
@@ -147,9 +320,20 @@ const Pending = new Map();
 function manage(src) {
     return src[CONTROL];
 }
-function does(instruction, label) {
-    const placeholder = Symbol(`${label} instruction`);
-    Pending.set(placeholder, instruction);
+function set(instruction, label) {
+    const name = label || instruction.name || "pending";
+    const placeholder = Symbol(`${name} instruction`);
+    Pending.set(placeholder, function set(key) {
+        let output = instruction.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);
+    });
     return placeholder;
 }
 class Controller {
@@ -273,276 +457,6 @@ function keys(from, using) {
     return from.select(using);
 }
 
-class Subscriber {
-    constructor(parent, onUpdate) {
-        this.onUpdate = onUpdate;
-        this.active = false;
-        this.follows = {};
-        this.dependant = new Set();
-        if (!(parent instanceof Controller))
-            parent = manage(parent);
-        this.parent = parent;
-        this.source = parent.subject;
-        this.proxy = create(parent.subject);
-        define(this.proxy, LOCAL, this);
-        for (const key in parent.state)
-            this.spy(key);
-    }
-    spy(key) {
-        const { proxy, source } = this;
-        const { set } = getOwnPropertyDescriptor(source, key);
-        const intercept = () => {
-            this.follow(key);
-            delete proxy[key];
-            return proxy[key];
-        };
-        setAlias(intercept, `tap ${key}`);
-        defineProperty(proxy, key, {
-            get: intercept,
-            set,
-            configurable: true,
-            enumerable: true
-        });
-    }
-    follow(key, cb) {
-        this.follows[key] = cb || this.onUpdate;
-    }
-    commit() {
-        const { dependant, follows, parent } = this;
-        const onDone = parent.addListener(follows);
-        this.active = true;
-        dependant.forEach(x => x.commit());
-        return this.release = () => {
-            dependant.forEach(x => x.release());
-            onDone();
-        };
-    }
-}
-
-const Oops$7 = issues({
-    ComputeFailed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} [${parent}.${property}].`,
-    ComputedEarly: (property) => `Note: Computed values don't run until accessed, except when subscribed to. '${property}' getter may have run earlier than intended.`
-});
-const ComputedInit = new WeakSet();
-const ComputedInfo = new WeakMap();
-const ComputedUsed = new WeakMap();
-const ComputedKeys = new WeakMap();
-function getRegister(on) {
-    let register = ComputedUsed.get(on);
-    if (!register)
-        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);
-    const info = {
-        key, parent: on, priority: 1
-    };
-    let sub;
-    defined.set(key, info);
-    function compute(initial) {
-        try {
-            return getter.call(sub.proxy, sub.proxy);
-        }
-        catch (err) {
-            Oops$7.ComputeFailed(subject, key, !!initial).warn();
-            throw err;
-        }
-    }
-    function update() {
-        let value;
-        try {
-            value = compute(false);
-        }
-        catch (e) {
-            console.error(e);
-        }
-        finally {
-            if (state[key] !== value) {
-                on.update(key, value);
-                return value;
-            }
-        }
-    }
-    function create(early) {
-        sub = new Subscriber(on, update);
-        ComputedInfo.set(update, info);
-        defineProperty(state, key, {
-            value: undefined,
-            writable: true
-        });
-        defineProperty(subject, key, {
-            enumerable: true,
-            configurable: true,
-            get: () => state[key],
-            set: setter
-        });
-        try {
-            return state[key] = compute(true);
-        }
-        catch (e) {
-            if (early)
-                Oops$7.ComputedEarly(key).warn();
-            throw e;
-        }
-        finally {
-            sub.commit();
-            for (const key in sub.follows) {
-                const peer = defined.get(key);
-                if (peer && peer.priority >= info.priority)
-                    info.priority = peer.priority + 1;
-            }
-        }
-    }
-    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}`);
-    ComputedInit.add(create);
-    for (const on of [state, subject])
-        defineProperty(on, key, {
-            get: create,
-            set: setter || revert,
-            configurable: true,
-            enumerable: true
-        });
-    return info;
-}
-function ensure(on, keys) {
-    for (const key of keys) {
-        const desc = getOwnPropertyDescriptor(on.subject, key);
-        const getter = desc && desc.get;
-        if (ComputedInit.has(getter))
-            getter(true);
-    }
-}
-function capture(on, request) {
-    const compute = ComputedInfo.get(request);
-    const callback = request;
-    if (!compute)
-        return;
-    let pending = ComputedKeys.get(on);
-    if (!pending)
-        ComputedKeys.set(on, pending = []);
-    if (compute.parent !== on)
-        callback();
-    else {
-        const queue = pending.findIndex(peer => compute.priority > ComputedInfo.get(peer).priority);
-        pending.splice(queue + 1, 0, callback);
-    }
-    return true;
-}
-function flush(on) {
-    const handled = on.frame;
-    let pending = ComputedKeys.get(on);
-    if (pending) {
-        while (pending.length) {
-            const compute = pending.shift();
-            const { key } = ComputedInfo.get(compute);
-            if (!handled.has(key))
-                compute();
-        }
-        ComputedKeys.delete(on);
-    }
-}
-
-const Oops$6 = issues({
-    DuplicateAction: (key) => `Invoked action ${key} but one is already active.`,
-    SourceNotSupported: () => `Computed from-instruction does not support source other than 'this'.`
-});
-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.setter(key, cb && createValueEffect(cb));
-    defineProperty(refObjectFunction, "current", {
-        set: refObjectFunction,
-        get: () => this.state[key]
-    });
-    return {
-        value: refObjectFunction
-    };
-});
-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;
-    const get = () => factory.call(source);
-    if (defer)
-        defineLazy(source, key, get);
-    else
-        define(source, key, get());
-});
-const lazy = (value) => set(function lazy(key) {
-    const source = this.subject;
-    source[key] = value;
-    defineProperty(this.state, key, {
-        get: () => source[key]
-    });
-});
-const act = (task) => set(function act(key) {
-    let pending = false;
-    const invoke = (...args) => {
-        if (pending)
-            return Promise.reject(Oops$6.DuplicateAction(key));
-        pending = true;
-        this.update(key);
-        return new Promise(res => {
-            res(task.apply(this.subject, args));
-        }).finally(() => {
-            pending = false;
-            this.update(key);
-        });
-    };
-    setAlias(invoke, `run ${key}`);
-    defineProperty(invoke, "active", {
-        get: () => pending
-    });
-    return {
-        value: invoke,
-        writable: false
-    };
-});
-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;
-        }
-        prepare(this, key, getter);
-    });
-}
-
 const attach = (from, name) => set(function attach(key) {
     const proxyCache = new WeakMap();
     const getCurrent = from.call(this, key);
@@ -580,7 +494,7 @@ const attach = (from, name) => set(function attach(key) {
     };
 }, name || from.name);
 
-const Oops$5 = issues({
+const Oops$7 = issues({
     HasPropertyUndefined: (control, property) => `${control}.${property} is marked as required for this render.`
 });
 const useElementLifecycle = lifecycle("element");
@@ -609,7 +523,7 @@ function useWatcher(target, focus, expected) {
             defineProperty(sub, "proxy", {
                 get() {
                     if (src[key] === undefined && expected)
-                        throw Oops$5.HasPropertyUndefined(target, key);
+                        throw Oops$7.HasPropertyUndefined(target, key);
                     return src[key];
                 }
             });
@@ -697,7 +611,7 @@ class Lookup {
     }
 }
 
-const Oops$4 = issues({
+const Oops$6 = 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.`
@@ -707,7 +621,7 @@ const useLookup = () => react.useContext(LookupContext);
 function useFromContext(Type, strict) {
     const instance = useLookup().get(Type);
     if (!instance && strict)
-        throw Oops$4.NothingInContext(Type.name);
+        throw Oops$6.NothingInContext(Type.name);
     return instance;
 }
 function Consumer(props) {
@@ -718,13 +632,13 @@ function Consumer(props) {
     if (typeof callback == "function")
         callback(Control.get(!!has));
     else
-        throw Oops$4.BadConsumerProps();
+        throw Oops$6.BadConsumerProps();
     return null;
 }
 function useNewContext(from, inject) {
     return react.useMemo(() => {
         if (!inject)
-            throw Oops$4.NoProviderType();
+            throw Oops$6.NoProviderType();
         const context = from.push(inject);
         for (const instance of context.local)
             for (const apply of getPending(instance))
@@ -767,30 +681,32 @@ function Provider(props) {
         : render);
 }
 
-const Oops$3 = issues({
+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.`
 });
 const PendingContext = new WeakMap();
 const ContextWasUsed = new WeakMap();
 const tap = (type, argument) => attach(function tap(key) {
+    return pendingAccess(this.subject, type, key, argument);
+});
+function pendingAccess(from, type, key, argument) {
     if ("current" in type)
         return () => type.current;
-    const to = this.subject;
-    if ("current" in to.constructor)
-        throw Oops$3.CantAttachGlobal(to, type.name);
+    if ("current" in from.constructor)
+        throw Oops$5.CantAttachGlobal(from, type.name);
     let instance;
-    getPending(to).push(context => {
+    getPending(from).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);
+            throw Oops$5.AmbientRequired(type.name, from, key);
     });
     return () => instance;
-});
+}
 function usePeerContext(subject) {
     if (ContextWasUsed.has(subject)) {
         if (ContextWasUsed.get(subject))
@@ -813,17 +729,15 @@ function getPending(subject) {
     return pending;
 }
 
-const Oops$2 = issues({
+const Oops$4 = issues({
     StrictUpdate: (expected) => `Strict update() did ${expected ? "not " : ""}find pending updates.`,
     NoChaining: () => `Then called with undefined; update promise will never catch nor supports chaining.`
 });
 class State {
-    constructor(computeGetters) {
-        const control = Controller.setup(this);
+    constructor() {
+        Controller.setup(this);
         define(this, "get", this);
         define(this, "set", this);
-        if (computeGetters !== false)
-            prepareGetters(control);
     }
     import(from, subset) {
         for (const key of keys(manage(this), subset))
@@ -843,15 +757,18 @@ class State {
             arg = select(this, arg);
         if (typeof arg == "boolean") {
             if (!control.pending === arg)
-                return Promise.reject(Oops$2.StrictUpdate(arg));
+                return Promise.reject(Oops$4.StrictUpdate(arg));
         }
         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]();
+            if (1 in arguments && arg in this) {
+                const method = this[arg];
+                if (typeof method == "function")
+                    if (typeof tag != "boolean")
+                        method.call(this, tag);
+                    else if (tag)
+                        method.call(this);
+            }
         }
         return {
             then(callback) {
@@ -861,7 +778,7 @@ class State {
                     else
                         callback(false);
                 else
-                    throw Oops$2.NoChaining();
+                    throw Oops$4.NoChaining();
             }
         };
     }
@@ -872,7 +789,9 @@ class State {
         return this.constructor.name;
     }
     tap(path, expect) {
-        return useWatcher(this, path, expect);
+        const proxy = useWatcher(this, path, expect);
+        this.update("willRender", true);
+        return proxy;
     }
     static create(...args) {
         const instance = new this(...args);
@@ -880,7 +799,9 @@ class State {
         return instance;
     }
     static new(args, callback) {
-        return useLazy(this, args, callback);
+        const instance = useLazy(this, args, callback);
+        instance.update("willRender", true);
+        return instance;
     }
     static use(args, callback) {
         return useModel(this, args, callback);
@@ -907,7 +828,7 @@ class State {
                 instance);
     }
     static tap(key, expect) {
-        return useWatcher(this.find(true), key, expect);
+        return this.find(true).tap(key, expect);
     }
     static isTypeof(maybe) {
         return (typeof maybe == "function" &&
@@ -921,9 +842,6 @@ State.LOCAL = LOCAL;
 
 const useComponentLifecycle = lifecycle("component");
 class Model extends State {
-    constructor() {
-        super(false);
-    }
     [CREATE](using) {
         defer(using, "on");
         defer(using, "effect");
@@ -986,7 +904,7 @@ class Model extends State {
         return instance;
     }
     static tag(id) {
-        return useSubscriber(this.find(true), id);
+        return this.find(true).tag(id);
     }
     static meta(path) {
         return useWatcher(this, path);
@@ -1008,7 +926,7 @@ function defer(on, method) {
 }
 
 const Parent = new WeakMap();
-const Oops$1 = issues({
+const Oops$3 = 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.`,
@@ -1034,7 +952,7 @@ const use = (input, argument) => attach(function use(key) {
         if (typeof argument == "function")
             argument(instance);
         else if (!instance && argument !== false)
-            throw Oops$1.UndefinedNotAllowed(key);
+            throw Oops$3.UndefinedNotAllowed(key);
     };
     if (input) {
         instance =
@@ -1042,7 +960,7 @@ const use = (input, argument) => attach(function use(key) {
                 input instanceof Model ? input :
                     typeof input === "function" ? input() :
                         typeof input === "object" ? bootstrap(input) :
-                            Oops$1.BadArgument(typeof input).throw();
+                            Oops$3.BadArgument(typeof input).throw();
         if (instance)
             update(instance);
     }
@@ -1057,13 +975,156 @@ const parent = (Expects, required) => set(function parent() {
     const value = Parent.get(this.subject);
     if (!value) {
         if (required)
-            throw Oops$1.ParentRequired(expected, child);
+            throw Oops$3.ParentRequired(expected, child);
     }
     else if (!(value instanceof Expects))
-        throw Oops$1.UnexpectedParent(expected, child, value);
+        throw Oops$3.UnexpectedParent(expected, child, value);
     return { value };
 });
 
+const Oops$2 = issues({
+    DuplicateAction: (key) => `Invoked action ${key} but one is already active.`,
+    BadComputedSource: (model, property, got) => `Bad from-instruction provided to ${model}.${property}. Expects an arrow-function or a Model as source. Got ${got}.`,
+    PeerNotAllowed: (model, property) => `Attempted to use an instruction result (probably use or tap) as computed source for ${model}.${property}. This is not possible.`
+});
+function ref(cb) {
+    return set(function ref(key) {
+        const refObjectFunction = this.setter(key, cb && createValueEffect(cb));
+        defineProperty(refObjectFunction, "current", {
+            set: refObjectFunction,
+            get: () => this.state[key]
+        });
+        return {
+            value: refObjectFunction
+        };
+    });
+}
+function on(initial, cb) {
+    return set(function on(key) {
+        this.manage(key, initial, cb && createValueEffect(cb));
+    });
+}
+function memo(factory, defer) {
+    return set(function memo(key) {
+        const source = this.subject;
+        const get = () => factory.call(source);
+        if (defer)
+            defineLazy(source, key, get);
+        else
+            define(source, key, get());
+    });
+}
+function lazy(value) {
+    return set(function lazy(key) {
+        const source = this.subject;
+        source[key] = value;
+        defineProperty(this.state, key, {
+            get: () => source[key]
+        });
+    });
+}
+function act(task) {
+    return set(function act(key) {
+        let pending = false;
+        const invoke = (...args) => {
+            if (pending)
+                return Promise.reject(Oops$2.DuplicateAction(key));
+            pending = true;
+            this.update(key);
+            return new Promise(res => {
+                res(task.apply(this.subject, args));
+            }).finally(() => {
+                pending = false;
+                this.update(key);
+            });
+        };
+        setAlias(invoke, `run ${key}`);
+        defineProperty(invoke, "active", {
+            get: () => pending
+        });
+        return {
+            value: invoke,
+            writable: false
+        };
+    });
+}
+function from(source, setter, getter) {
+    return set(function from(key) {
+        const { subject } = this;
+        let getSource;
+        // Easy mistake, using a peer, will always be unresolved.
+        if (typeof source == "symbol")
+            throw Oops$2.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 to ambiguous so not allowed.
+        else
+            throw Oops$2.BadComputedSource(subject, key, source);
+        prepare(this, key, getSource, setter, getter);
+    });
+}
+
+const Oops$1 = issues({
+    ValueNotReady: (model, key) => `Value ${model}.${key} value is not yet available.`
+});
+/**
+ * Create suspense promise also interpretable as an error.
+ * React will handle it but other contexts probably won't.
+ */
+function suspense(model, key) {
+    const { message, stack } = Oops$1.ValueNotReady(model, key);
+    const promise = new Promise(resolve => {
+        const release = model.on(key, (value) => {
+            if (value !== undefined)
+                release(), resolve();
+        });
+    });
+    return Object.assign(promise, { message, stack });
+}
+function pending(source, compute) {
+    if (typeof source == "function" && !source.prototype)
+        return suspendForAsync(source);
+    else
+        return from(source, compute, function getter(value, key) {
+            if (value === undefined)
+                throw suspense(this, key);
+            return value;
+        });
+}
+function suspendForAsync(source) {
+    return set(function suspense(key) {
+        let waiting = true;
+        let output;
+        let error;
+        return () => {
+            if (waiting) {
+                const issue = Oops$1.ValueNotReady(this.subject, key);
+                const promise = source
+                    .call(this.subject, key)
+                    .catch(err => error = err)
+                    .then((value) => output = value)
+                    .finally(() => waiting = false);
+                throw Object.assign(promise, {
+                    message: issue.message,
+                    stack: issue.stack
+                });
+            }
+            if (error)
+                throw error;
+            return output;
+        };
+    });
+}
+
 const Oops = issues({
     GlobalDoesNotExist: (name) => `Tried to access singleton ${name}, but none exist! Did you forget to initialize?\nCall ${name}.create() before attempting to access, or consider using ${name}.use() instead.`,
     GlobalExists: (name) => `Shared instance of ${name} already exists! Consider unmounting existing, or use ${name}.reset() to force-delete it.`
@@ -1112,12 +1173,13 @@ exports.Singleton = Singleton;
 exports.State = State;
 exports.act = act;
 exports.attach = attach;
-exports.default = Model;
+exports["default"] = Model;
 exports.from = from;
 exports.lazy = lazy;
 exports.memo = memo;
 exports.on = on;
 exports.parent = parent;
+exports.pending = pending;
 exports.ref = ref;
 exports.set = set;
 exports.tap = tap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expressive/mvc",
-  "version": "1.0.0-beta.17",
+  "version": "1.0.0-beta.20",
   "description": "Use classes to define state in React!",
   "author": {
     "name": "Gabe Klein",
@@ -14,7 +14,7 @@
   },
   "keywords": [
     "react",
-    "hooks"
+    "mvc"
   ],
   "main": "lib/index.js",
   "types": "types/index.d.ts",
@@ -24,14 +24,9 @@
   ],
   "scripts": {
     "build": "rollup --config",
-    "watch": "rollup --config --sourcemap --watch",
-    "prebuild": "rm -rf lib/",
-    "publish:pre": "npm version prerelease --preid=beta",
-    "preversion": "jest --coverage",
-    "postversion": "npm run build; npm publish",
-    "postpublish": "git push; git push --tags; rm -rf lib",
-    "coverage": "jest --collectCoverage",
-    "test": "jest --watchAll"
+    "watch": "jest --watchAll",
+    "test": "jest --collectCoverage",
+    "prebuild": "rm -rf lib/"
   },
   "peerDependencies": {
     "react": ">=17.0.2"

package/types/instructions.d.ts

@@ -1,4 +1,4 @@
-import Model, { Selector } from '.';
+import Model from '.';
 import { Async, Class, InstanceOf, InterceptCallback } from './types';
 
 /**
@@ -143,16 +143,25 @@ export function act <T extends Async> (action: T): T & { active: boolean };
  *
  * @param fn - Factory function to generate a getter to subscribe dependancies.
  */
-export function from <R> (fn: (property: string) => (this: any, on: any) => R): R;
+export function from <R> (fn: (property: string) => (this: any, state: any) => R): R;
 
 /**
  * Implement a computed value; output will be generated by provided function.
  *
- * @param source - Source model from which computed value will be subscribed.
- * **Note:** Currently will only support `this`.
+ * @param source - Source Model to find and subscribe to, for input.
  * 
  * @param fn - Compute function. Bound to a subscriber-proxy of source, returns output value.
- * Will update automatically as accessed values change.
+ * Will update automatically as input values change.
+ */
+export function from <T extends Class, R> (source: T, fn: (this: InstanceOf<T>, on: InstanceOf<T>) => R): R;
+
+/**
+ * Implement a computed value; output will be generated by provided function.
+ *
+ * @param source - Source model from which computed value will be a subscriber.
+ * 
+ * @param fn - Compute function. Bound to a subscriber-proxy of source, returns output value.
+ * Will update automatically as input values change.
  */
 export function from <T, R> (source: T, fn: (this: T, on: T) => R): R;
 
@@ -170,4 +179,24 @@ export function memo <T> (compute: () => T, lazy?: boolean): T;
  *
  * @param value - starting value of property.
  */
-export function lazy <T> (value?: T): T;
+export function lazy <T> (value?: T): T;
+
+/**
+ * Suspend during the execution of given function to obtain value.
+ * 
+ * @param waitFor - Async function to suspend for.
+ */
+export function pending (waitFor: () => Promise<void>): undefined;
+export function pending <T> (waitFor: () => Promise<T>): T;
+
+/**
+ * Suspend for a computed value; output will be generated by provided function.
+ * Will throw a promise if value is accessed while undefined, promise will
+ * resolve once value gains any value.
+ *
+ * @param source - Source model from which computed value will be a subscriber.
+ * 
+ * @param fn - Compute function. Bound to a subscriber-proxy of source, returns output value.
+ * Will update automatically as input values change.
+ */
+ export function pending <T, R> (source: T, fn: (this: T, on: T) => R): Exclude<R, undefined>;

package/types/model.d.ts

@@ -1,6 +1,8 @@
+import { Key } from 'react';
+
 import Lifecycle from './lifecycle';
 import { Select, Selector } from './selector';
-import { Class, InstanceOf, Key } from './types';
+import { BunchOf, Callback, Class, InstanceOf, Query, RequestCallback, UpdateCallback } from './types';
 
 interface PropertyDescriptor<T> {
     configurable?: boolean;
@@ -428,7 +430,7 @@ export abstract class Model extends State {
      * 
      * @param id - Argument passed to controller-lifecycle methods. Use to identify the consumer.
      */
-    tag(id?: Key): this;
+    tag(id?: any): this;
 
      /**
       * **React Hook** - Attach to instance of this controller within ambient component.
@@ -437,7 +439,7 @@ export abstract class Model extends State {
       * 
       * @param idFactory - Will be invoked with fetched instance. Use this to register a tag as-needed.
       */
-    tag(idFactory: (idFactory: this) => Key | void): this;
+    tag(idFactory: (idFactory: this) => any): this;
 
 
     /**

package/types/types.d.ts

@@ -12,4 +12,7 @@ export type EffectCallback<T, A = T> = (this: T, argument: A) => Callback | Prom
 export type UpdateCallback<T, P> = (this: T, value: IfApplicable<T, P>, changed: P) => void;
 export type InterceptCallback<T> = (argument: T) => ((next: T) => void) | Promise<any> | void | boolean;
 
-export type RefFunction = (e: HTMLElement | null) => void;
+export type RefFunction = (e: HTMLElement | null) => void;
+
+export type Recursive<T> = { [K in keyof T]: Recursive<Omit<T, K>> };
+export type Query = (select: Recursive<{}>) => void;