@expressive/mvc 0.2.0 → 0.2.1

package/lib/index.js

@@ -832,28 +832,74 @@ 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.`,
     NotReady: (model, key) => `Value ${model}.${key} value is not yet available.`,
     Failed: (model, key) => `Generating initial value for ${model}.${key} failed.`
 });
 function set(factory, argument) {
     return apply(function set(key) {
+        const { subject, state } = this;
+        const required = argument === true || argument === undefined;
         let set;
         let get;
         let suspense;
-        const required = argument === true || argument === undefined;
         if (factory === undefined)
             suspense = true;
-        else if (typeof factory === "function")
-            get = pendingFactory(this, key, factory, required);
-        else
-            throw Oops$7.BadFactory();
+        else {
+            let pending;
+            let error;
+            const init = () => {
+                const output = typeof factory == "function" ?
+                    mayRetry(() => factory.call(subject, key, subject)) :
+                    factory;
+                if (output instanceof Promise) {
+                    pending = output
+                        .catch(err => error = err)
+                        .then(val => state[key] = val)
+                        .finally(() => {
+                        pending = undefined;
+                        this.update(key);
+                    });
+                    return;
+                }
+                return state[key] = output;
+            };
+            const suspend = () => {
+                if (required === false)
+                    return undefined;
+                const issue = Oops$7.NotReady(subject, key);
+                Object.assign(pending, {
+                    message: issue.message,
+                    stack: issue.stack
+                });
+                throw pending;
+            };
+            if (required)
+                try {
+                    init();
+                }
+                catch (err) {
+                    Oops$7.Failed(subject, key).warn();
+                    throw err;
+                }
+            get = () => {
+                if (pending)
+                    return suspend();
+                if (error)
+                    throw error;
+                if (key in state)
+                    return state[key];
+                let output = init();
+                return pending
+                    ? suspend()
+                    : output;
+            };
+        }
         if (typeof argument == "function")
             set = createValueEffect(argument);
         else
             set = (value) => {
                 if (value === undefined && required)
-                    throw Oops$7.NonOptional(this.subject, key);
+                    throw Oops$7.NonOptional(subject, key);
             };
         return {
             set,
@@ -861,57 +907,6 @@ function set(factory, argument) {
             suspense
         };
     });
-}
-function pendingFactory(parent, key, fn, required) {
-    const { subject, state } = parent;
-    let pending;
-    let error;
-    const init = () => {
-        const output = mayRetry(() => {
-            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.NotReady(subject, key);
-        Object.assign(pending, {
-            message: issue.message,
-            stack: issue.stack
-        });
-        throw pending;
-    };
-    if (required)
-        try {
-            init();
-        }
-        catch (err) {
-            Oops$7.Failed(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();