@expressive/mvc 1.0.0-beta.41 → 1.0.0-beta.44

package/lib/index.esm.js

@@ -17,7 +17,7 @@ function issues(register) {
     return Library;
 }
 
-const Oops$d = issues({
+const Oops$c = issues({
     BadEffectCallback: () => `Callback for effect-callback may only return a function.`
 });
 const { assign, create, defineProperty, entries, getPrototypeOf, getOwnPropertyNames, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
@@ -34,9 +34,6 @@ function defineLazy(object, property, init) {
         }
     });
 }
-function setAlias(func, displayName) {
-    assign(func, { displayName });
-}
 function createEffect(callback) {
     let unSet;
     return function (value) {
@@ -46,7 +43,7 @@ function createEffect(callback) {
         if (unSet instanceof Promise)
             unSet = undefined;
         if (unSet && typeof unSet !== "function")
-            throw Oops$d.BadEffectCallback();
+            throw Oops$c.BadEffectCallback();
     };
 }
 function createValueEffect(callback) {
@@ -62,8 +59,28 @@ function createValueEffect(callback) {
         if (typeof out == "function")
             unSet = out;
         else
-            throw Oops$d.BadEffectCallback();
+            throw Oops$c.BadEffectCallback();
+    };
+}
+function suspenseBoundary(fn) {
+    const retry = (err) => {
+        if (err instanceof Promise)
+            return err.then(compute);
+        else
+            throw err;
     };
+    const compute = () => {
+        try {
+            const output = fn();
+            return output instanceof Promise
+                ? output.catch(retry)
+                : output;
+        }
+        catch (err) {
+            return retry(err);
+        }
+    };
+    return compute();
 }
 
 const UPDATE = new WeakMap();
@@ -76,8 +93,215 @@ function applyUpdate(subject, keys) {
     };
 }
 
-const Oops$c = issues({
-    StrictUpdate: (expected) => `Strict update() did ${expected ? "not " : ""}find pending updates.`,
+class Subscriber {
+    constructor(target, onUpdate) {
+        this.onUpdate = onUpdate;
+        this.active = false;
+        this.dependant = new Set();
+        this.watch = {};
+        const parent = target instanceof Controller
+            ? target : control(target);
+        const proxy = create(parent.proxy);
+        let reset;
+        define(proxy, LOCAL, this);
+        defineProperty(this, "proxy", {
+            configurable: true,
+            get() {
+                if (reset)
+                    setTimeout(reset, 0);
+                return proxy;
+            }
+        });
+        const release = parent.addListener(key => {
+            const handler = this.watch[key];
+            if (!handler || !this.active)
+                return;
+            if (typeof handler == "function")
+                handler();
+            const notify = this.onUpdate(key, parent);
+            const getWhy = (keys) => {
+                reset = applyUpdate(proxy, keys.filter(k => k in this.watch));
+            };
+            if (notify) {
+                parent.requestUpdate(getWhy);
+                parent.requestUpdate(notify);
+            }
+        });
+        this.commit = () => {
+            this.active = true;
+            this.dependant.forEach(x => x.commit());
+            return this.release;
+        };
+        this.release = () => {
+            this.dependant.forEach(x => x.release());
+            release();
+        };
+    }
+}
+
+const Oops$b = issues({
+    ValueNotReady: (model, key) => `Value ${model}.${key} value is not yet available.`,
+});
+function suspend(source, key) {
+    const error = Oops$b.ValueNotReady(source.subject, key);
+    const promise = new Promise(resolve => {
+        const release = source.addListener(forKey => {
+            if (forKey == key)
+                return () => {
+                    if (source.state[key] !== undefined) {
+                        release();
+                        resolve();
+                    }
+                };
+        });
+    });
+    return Object.assign(promise, {
+        toString: () => String(error),
+        name: "Suspense",
+        message: error.message,
+        stack: error.stack
+    });
+}
+
+const Oops$a = 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.`,
+    ComputeFailed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} [${parent}.${property}].`,
+    ComputedEarly: (property) => `Note: Computed values don't run until accessed, except when subscribed to. '${property}' getter may have run earlier than intended.`
+});
+const INIT = new WeakSet();
+const INFO = new WeakMap();
+const USED = new WeakMap();
+const KEYS = new WeakMap();
+function from(source, arg1, arg2) {
+    return apply(function from(key) {
+        const parent = this;
+        const { subject, state } = this;
+        let getSource;
+        let required = arg2 === true || arg1 === true;
+        if (typeof arg1 == "boolean")
+            arg1 = undefined;
+        // Easy mistake, using a peer, will always be unresolved.
+        if (typeof source == "symbol")
+            throw Oops$a.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) {
+            arg1 = source.call(subject, key);
+            getSource = () => this;
+        }
+        // Regular function is too ambiguous so not allowed.
+        else
+            throw Oops$a.BadComputedSource(subject, key, source);
+        let sub;
+        const setter = arg1;
+        const info = { key, parent, priority: 1 };
+        let register = USED.get(parent);
+        if (!register) {
+            register = new Map();
+            USED.set(parent, register);
+        }
+        register.set(key, info);
+        function compute(initial) {
+            try {
+                return setter.call(sub.proxy, sub.proxy);
+            }
+            catch (err) {
+                Oops$a.ComputeFailed(subject, key, !!initial).warn();
+                throw err;
+            }
+        }
+        function update() {
+            let value;
+            try {
+                value = compute(false);
+            }
+            catch (e) {
+                console.error(e);
+            }
+            finally {
+                if (state[key] !== value) {
+                    parent.update(key, value);
+                    return value;
+                }
+            }
+        }
+        function defer(_key, from) {
+            let pending = KEYS.get(from);
+            if (!pending)
+                KEYS.set(from, pending = []);
+            if (info.parent !== from)
+                update();
+            else {
+                const after = pending.findIndex(peer => (info.priority > INFO.get(peer).priority));
+                pending.splice(after + 1, 0, update);
+            }
+        }
+        function create(early) {
+            sub = new Subscriber(getSource(), defer);
+            defineProperty(state, key, {
+                value: undefined,
+                writable: true
+            });
+            try {
+                return state[key] = compute(true);
+            }
+            catch (e) {
+                if (early)
+                    Oops$a.ComputedEarly(key).warn();
+                throw e;
+            }
+            finally {
+                sub.commit();
+                for (const key in sub.watch) {
+                    const peer = register.get(key);
+                    if (peer && peer.priority >= info.priority)
+                        info.priority = peer.priority + 1;
+                }
+            }
+        }
+        INIT.add(create);
+        INFO.set(update, info);
+        defineProperty(state, key, {
+            get: create,
+            configurable: true,
+            enumerable: true
+        });
+        return () => {
+            const value = parent.state[key];
+            if (value === undefined && required)
+                throw suspend(this, key);
+            return value;
+        };
+    });
+}
+function ensure(on, keys) {
+    for (const key of keys) {
+        const desc = getOwnPropertyDescriptor(on.state, key);
+        const getter = desc && desc.get;
+        if (INIT.has(getter))
+            getter(true);
+    }
+}
+function flush(on) {
+    const handled = on.frame;
+    const pending = KEYS.get(on);
+    if (!pending)
+        return;
+    while (pending.length) {
+        const why = [...handled];
+        const compute = pending.shift();
+        const { key } = INFO.get(compute);
+        if (!handled.has(key))
+            compute(why);
+    }
+    KEYS.delete(on);
+}
+
+const Oops$9 = issues({
+    StrictUpdate: () => `Strict update() did not find pending updates.`,
     NoChaining: () => `Then called with undefined; update promise will never catch nor supports chaining.`
 });
 const READY = new WeakSet();
@@ -107,7 +331,9 @@ class Controller {
             return;
         let onGet;
         let onSet;
+        let set;
         let enumerable;
+        let suspense;
         const instruction = Pending.get(entry);
         if (instruction) {
             Pending.delete(entry);
@@ -120,33 +346,35 @@ class Controller {
                     state[key] = desc.value;
                 onSet = desc.set;
                 onGet = desc.get;
+                suspense = desc.suspense;
                 enumerable = desc.enumerable;
             }
         }
         else
             state[key] = entry;
-        const set = onSet !== false
-            ? this.ref(key, onSet)
-            : undefined;
-        function get() {
-            const local = this[LOCAL];
+        if (onSet !== false)
+            set = this.ref(key, onSet);
+        const get = (local) => {
+            if (!(key in state) && suspense)
+                throw suspend(this, key);
             const value = state[key];
-            if (local && !local.watch[key])
-                local.watch[key] = true;
-            return onGet ? onGet(value, local) : value;
-        }
-        setAlias(get, `tap ${key}`);
+            if (onGet)
+                return local
+                    ? onGet(value, local)
+                    : onGet(value);
+            return value;
+        };
         defineProperty(subject, key, {
-            enumerable,
-            set,
-            get: onGet
-                ? () => onGet(state[key])
-                : () => state[key]
+            enumerable, set, get
         });
         defineProperty(proxy, key, {
-            enumerable,
-            set,
-            get
+            enumerable, set,
+            get() {
+                const local = this[LOCAL];
+                if (local && !local.watch[key])
+                    local.watch[key] = true;
+                return get(local);
+            }
         });
     }
     ref(key, handler) {
@@ -206,17 +434,17 @@ class Controller {
             this.waiting.add(arg);
             return;
         }
-        if (typeof arg == "boolean" && arg !== this.frame.size > 0)
-            return Promise.reject(Oops$c.StrictUpdate(arg));
+        if (arg === true && this.frame.size < 1)
+            return Promise.reject(Oops$9.StrictUpdate());
         return {
             then: (callback) => {
                 if (callback)
-                    if (this.frame.size)
+                    if (this.frame.size || arg !== false)
                         this.waiting.add(callback);
                     else
                         callback(false);
                 else
-                    throw Oops$c.NoChaining();
+                    throw Oops$9.NoChaining();
             }
         };
     }
@@ -245,164 +473,6 @@ function control(subject, cb) {
     return cb(control);
 }
 
-class Subscriber {
-    constructor(target, onUpdate) {
-        this.onUpdate = onUpdate;
-        this.active = false;
-        this.dependant = new Set();
-        this.watch = {};
-        const parent = target instanceof Controller
-            ? target : control(target);
-        const proxy = create(parent.proxy);
-        let reset;
-        define(proxy, LOCAL, this);
-        defineProperty(this, "proxy", {
-            configurable: true,
-            get() {
-                if (reset)
-                    setTimeout(reset, 0);
-                return proxy;
-            }
-        });
-        const release = parent.addListener(key => {
-            const handler = this.watch[key];
-            if (!handler || !this.active)
-                return;
-            if (typeof handler == "function")
-                handler();
-            const notify = this.onUpdate(key, parent);
-            const getWhy = (keys) => {
-                reset = applyUpdate(proxy, keys.filter(k => k in this.watch));
-            };
-            if (notify) {
-                parent.requestUpdate(getWhy);
-                parent.requestUpdate(notify);
-            }
-        });
-        this.commit = () => {
-            this.active = true;
-            this.dependant.forEach(x => x.commit());
-            return this.release;
-        };
-        this.release = () => {
-            this.dependant.forEach(x => x.release());
-            release();
-        };
-    }
-}
-
-const Oops$b = issues({
-    ComputeFailed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} [${parent}.${property}].`,
-    ComputedEarly: (property) => `Note: Computed values don't run until accessed, except when subscribed to. '${property}' getter may have run earlier than intended.`
-});
-const INIT = new WeakSet();
-const INFO = new WeakMap();
-const USED = new WeakMap();
-const KEYS = new WeakMap();
-function prepare(parent, key, source, setter, getter) {
-    let sub;
-    const { state, subject } = parent;
-    const info = { key, parent, priority: 1 };
-    let register = USED.get(parent);
-    if (!register) {
-        register = new Map();
-        USED.set(parent, register);
-    }
-    register.set(key, info);
-    function compute(initial) {
-        try {
-            return setter.call(sub.proxy, sub.proxy);
-        }
-        catch (err) {
-            Oops$b.ComputeFailed(subject, key, !!initial).warn();
-            throw err;
-        }
-    }
-    function update() {
-        let value;
-        try {
-            value = compute(false);
-        }
-        catch (e) {
-            console.error(e);
-        }
-        finally {
-            if (state[key] !== value) {
-                parent.update(key, value);
-                return value;
-            }
-        }
-    }
-    function defer(_key, from) {
-        let pending = KEYS.get(from);
-        if (!pending)
-            KEYS.set(from, pending = []);
-        if (info.parent !== from)
-            update();
-        else {
-            const after = pending.findIndex(peer => (info.priority > INFO.get(peer).priority));
-            pending.splice(after + 1, 0, update);
-        }
-    }
-    function create(early) {
-        sub = new Subscriber(source(), defer);
-        defineProperty(state, key, {
-            value: undefined,
-            writable: true
-        });
-        try {
-            return state[key] = compute(true);
-        }
-        catch (e) {
-            if (early)
-                Oops$b.ComputedEarly(key).warn();
-            throw e;
-        }
-        finally {
-            sub.commit();
-            for (const key in sub.watch) {
-                const peer = register.get(key);
-                if (peer && peer.priority >= info.priority)
-                    info.priority = peer.priority + 1;
-            }
-        }
-    }
-    setAlias(update, `try ${key}`);
-    setAlias(create, `new ${key}`);
-    setAlias(setter, `run ${key}`);
-    INIT.add(create);
-    INFO.set(update, info);
-    defineProperty(state, key, {
-        get: create,
-        configurable: true,
-        enumerable: true
-    });
-    if (getter)
-        return () => getter(parent, key);
-}
-function ensure(on, keys) {
-    for (const key of keys) {
-        const desc = getOwnPropertyDescriptor(on.state, key);
-        const getter = desc && desc.get;
-        if (INIT.has(getter))
-            getter(true);
-    }
-}
-function flush(on) {
-    const handled = on.frame;
-    const pending = KEYS.get(on);
-    if (!pending)
-        return;
-    while (pending.length) {
-        const why = [...handled];
-        const compute = pending.shift();
-        const { key } = INFO.get(compute);
-        if (!handled.has(key))
-            compute(why);
-    }
-    KEYS.delete(on);
-}
-
 const CONTROL = Symbol("CONTROL");
 const WHY = Symbol("UPDATE");
 const LOCAL = Symbol("LOCAL");
@@ -552,17 +622,21 @@ function apply(fn, label) {
     const placeholder = Symbol(`${name} instruction`);
     function setup(key) {
         let output = fn.call(this, key, this);
-        if (typeof output == "function")
-            return { get: output };
-        if (typeof output !== "object")
-            return output || undefined;
-        if ("explicit" in output && output.explicit) {
-            defineProperty(this.subject, key, output);
-            return false;
+        switch (typeof output) {
+            case "function":
+                return { get: output };
+            case "object": {
+                if ("explicit" in output && output.explicit) {
+                    defineProperty(this.subject, key, output);
+                    return false;
+                }
+                if ("recursive" in output && output.recursive)
+                    return Object.assign(Object.assign({}, output), { get: recursive(this, key) });
+            }
+            case "boolean":
+                return output;
         }
-        if ("recursive" in output)
-            output = Object.assign(Object.assign({}, output), { get: recursive(this, key) });
-        return output;
+        return;
     }
     Pending.set(placeholder, setup);
     return placeholder;
@@ -599,7 +673,7 @@ function recursive(source, key) {
     };
 }
 
-const Oops$a = issues({
+const Oops$8 = issues({
     DuplicateAction: (key) => `Invoked action ${key} but one is already active.`
 });
 function act(task) {
@@ -607,7 +681,7 @@ function act(task) {
         let pending = false;
         const invoke = (...args) => {
             if (pending)
-                return Promise.reject(Oops$a.DuplicateAction(key));
+                return Promise.reject(Oops$8.DuplicateAction(key));
             pending = true;
             this.update(key);
             return new Promise(res => {
@@ -618,7 +692,6 @@ function act(task) {
             });
         };
         this.state[key] = undefined;
-        setAlias(invoke, `run ${key}`);
         defineProperty(invoke, "active", {
             get: () => pending
         });
@@ -629,107 +702,6 @@ function act(task) {
     });
 }
 
-const Oops$9 = issues({
-    ValueNotReady: (model, key) => `Value ${model}.${key} value is not yet available.`
-});
-/**
- * Get value, suspend instead if undefined.
- *
- * Throws suspense promise also interpretable as an error.
- * React could handle it but other contexts probably not.
- */
-function pendingValue(via, key) {
-    const value = via.state[key];
-    if (value === undefined)
-        throw suspend(via, key);
-    return value;
-}
-function pendingFactory(via, key, fn) {
-    const { subject, state } = via;
-    let waiting;
-    let error;
-    return () => {
-        if (waiting)
-            throw waiting;
-        if (error)
-            throw error;
-        if (key in state)
-            return state[key];
-        let output;
-        try {
-            output = fn.call(subject, key, subject);
-        }
-        catch (err) {
-            throw error = err;
-        }
-        if (output instanceof Promise) {
-            const issue = Oops$9.ValueNotReady(subject, key);
-            output
-                .catch(err => error = err)
-                .then(out => state[key] = out)
-                .finally(() => waiting = undefined);
-            throw waiting = Object.assign(output, {
-                message: issue.message,
-                stack: issue.stack
-            });
-        }
-        else {
-            return state[key] = output;
-        }
-    };
-}
-function suspend(source, key) {
-    const error = Oops$9.ValueNotReady(source.subject, key);
-    const promise = new Promise(resolve => {
-        const release = source.addListener(forKey => {
-            if (forKey == key)
-                return () => {
-                    if (source.state[key] !== undefined) {
-                        release();
-                        resolve();
-                    }
-                };
-        });
-    });
-    return Object.assign(promise, {
-        toString: () => String(error),
-        name: "Suspense",
-        message: error.message,
-        stack: error.stack
-    });
-}
-
-const Oops$8 = issues({
-    BadComputedSource: (model, property, got) => `Bad from-instruction provided to ${model}.${property}. Expects an arrow-function or a Model as source. Got ${got}.`,
-    PeerNotAllowed: (model, property) => `Attempted to use an instruction result (probably use or tap) as computed source for ${model}.${property}. This is not possible.`
-});
-function from(source, setter, arg) {
-    return apply(function from(key) {
-        const { subject } = this;
-        let getSource;
-        let getter;
-        if (arg === true || setter === true)
-            getter = pendingValue;
-        if (typeof setter == "boolean")
-            setter = undefined;
-        // Easy mistake, using a peer, will always be unresolved.
-        if (typeof source == "symbol")
-            throw Oops$8.PeerNotAllowed(subject, key);
-        // replace source controller in-case it is different
-        if (typeof source == "object")
-            getSource = () => control(source);
-        // specifically an arrow function (getter factory)
-        else if (!source.prototype) {
-            setter = source.call(subject, key);
-            getSource = () => this;
-        }
-        // Regular function is too ambiguous so not allowed.
-        else
-            throw Oops$8.BadComputedSource(subject, key, source);
-        return prepare(this, key, getSource, setter, getter);
-    });
-}
-
 function ref(arg) {
     return apply(function ref(key) {
         let value = {};
@@ -755,32 +727,21 @@ function createRef(key, cb) {
 const Oops$7 = issues({
     NonOptional: (Parent, key) => `Property ${Parent}.${key} is marked as required.`,
     BadFactory: () => `Set instruction can only accept a factory or undefined.`,
+    ValueNotReady: (model, key) => `Value ${model}.${key} value is not yet available.`,
     FactoryFailed: (model, key) => `Generating initial value for ${model}.${key} failed.`
 });
 function set(factory, argument) {
     return apply(function set(key) {
         let set;
         let get;
+        let suspense;
         const required = argument === true || argument === undefined;
         if (factory === undefined)
-            get = () => pendingValue(this, key);
-        else if (typeof factory !== "function")
+            suspense = true;
+        else if (typeof factory === "function")
+            get = pendingFactory(this, key, factory, required);
+        else
             throw Oops$7.BadFactory();
-        else {
-            get = pendingFactory(this, key, factory);
-            if (required)
-                try {
-                    get();
-                }
-                catch (err) {
-                    if (err instanceof Promise)
-                        ;
-                    else {
-                        Oops$7.FactoryFailed(this.subject, key).warn();
-                        throw err;
-                    }
-                }
-        }
         if (typeof argument == "function")
             set = createValueEffect(argument);
         else
@@ -788,8 +749,63 @@ function set(factory, argument) {
                 if (value === undefined && required)
                     throw Oops$7.NonOptional(this.subject, key);
             };
-        return { set, get };
+        return {
+            set,
+            get,
+            suspense
+        };
     });
+}
+function pendingFactory(parent, key, fn, required) {
+    const { subject, state } = parent;
+    let pending;
+    let error;
+    const init = () => {
+        const output = suspenseBoundary(() => {
+            return fn.call(subject, key, subject);
+        });
+        if (output instanceof Promise) {
+            pending = output
+                .catch(err => error = err)
+                .then(val => state[key] = val)
+                .finally(() => {
+                pending = undefined;
+                parent.update(key);
+            });
+            return;
+        }
+        return state[key] = output;
+    };
+    const suspend = () => {
+        if (required === false)
+            return undefined;
+        const issue = Oops$7.ValueNotReady(subject, key);
+        Object.assign(pending, {
+            message: issue.message,
+            stack: issue.stack
+        });
+        throw pending;
+    };
+    if (required)
+        try {
+            init();
+        }
+        catch (err) {
+            Oops$7.FactoryFailed(subject, key).warn();
+            throw err;
+        }
+    return () => {
+        if (pending)
+            return suspend();
+        if (error)
+            throw error;
+        if (key in state)
+            return state[key];
+        let output = init();
+        return pending
+            ? suspend()
+            : output;
+    };
 }
 
 const Parent = new WeakMap();
@@ -932,24 +948,26 @@ 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,
+                value: type.get()
+            };
+        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
+            recursive: true,
+            suspense: true
         };
     });
 }
@@ -1121,7 +1139,7 @@ class MVC extends Model {
         return useTap(this, key, expect);
     }
     static new(arg) {
-        return React.useMemo(() => {
+        const instance = React.useMemo(() => {
             const instance = new this();
             control(instance);
             if (typeof arg == "function")
@@ -1133,6 +1151,8 @@ class MVC extends Model {
                 });
             return instance;
         }, []);
+        usePeerContext(instance.get);
+        return instance;
     }
     static use(a, b) {
         const instance = useModel(this, a, b);
@@ -1245,7 +1265,7 @@ class Global extends MVC {
     static set(updates) {
         const instance = Active.get(this) || this.create();
         instance.import(updates);
-        return instance.update();
+        return instance.update(false);
     }
     static get(arg) {
         const instance = Active.get(this);