@expressive/mvc 0.8.1 → 0.8.2

package/lib/index.js

@@ -25,7 +25,7 @@ function issues(register) {
     return Library;
 }
 
-const Oops$c = issues({
+const Oops$d = issues({
     BadCallback: () => `Callback for effect-callback may only return a function.`
 });
 const { assign, create, defineProperty, entries, getPrototypeOf, getOwnPropertyNames, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
@@ -38,7 +38,7 @@ function createEffect(callback) {
         if (unSet instanceof Promise)
             unSet = undefined;
         if (unSet && typeof unSet !== "function")
-            throw Oops$c.BadCallback();
+            throw Oops$d.BadCallback();
     };
 }
 function createValueEffect(callback) {
@@ -54,15 +54,15 @@ function createValueEffect(callback) {
         if (typeof out == "function")
             unSet = out;
         else
-            throw Oops$c.BadCallback();
+            throw Oops$d.BadCallback();
     };
 }
 
-const Oops$b = issues({
+const Oops$c = issues({
     NotReady: (model, key) => `Value ${model}.${key} value is not yet available.`,
 });
 function suspend(source, key) {
-    const error = Oops$b.NotReady(source.subject, key);
+    const error = Oops$c.NotReady(source.subject, key);
     const promise = new Promise(resolve => {
         const release = source.addListener(forKey => {
             if (forKey == key)
@@ -102,7 +102,7 @@ function mayRetry(fn) {
     return compute();
 }
 
-const Oops$a = issues({
+const Oops$b = issues({
     Failed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} [${parent}.${property}].`
 });
 const INFO = new WeakMap();
@@ -119,7 +119,7 @@ function computeMode(self, source, setter, key, required) {
             return setter.call(sub.proxy, sub.proxy);
         }
         catch (err) {
-            Oops$a.Failed(subject, key, initial).warn();
+            Oops$b.Failed(subject, key, initial).warn();
             throw err;
         }
     };
@@ -261,6 +261,7 @@ class Subscriber {
 }
 
 const REGISTER = new WeakMap();
+const PENDING = new Map();
 class Control {
     constructor(subject) {
         this.subject = subject;
@@ -378,7 +379,6 @@ class Control {
     }
 }
 
-const PENDING = new Map();
 /**
  * Run instruction as controller sets itself up.
  * This will specialize the behavior of a given property.
@@ -489,7 +489,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-const Oops$9 = issues({
+const Oops$a = issues({
     DuplicatePending: (key) => `Invoked action ${key} but one is already active.`
 });
 function act(task) {
@@ -497,7 +497,7 @@ function act(task) {
         let pending = false;
         const invoke = (...args) => __awaiter(this, void 0, void 0, function* () {
             if (pending)
-                return Promise.reject(Oops$9.DuplicatePending(key));
+                return Promise.reject(Oops$a.DuplicatePending(key));
             pending = true;
             this.update(key);
             try {
@@ -519,6 +519,9 @@ function act(task) {
     });
 }
 
+const Oops$9 = issues({
+    NotReady: (model, key) => `Value ${model}.${key} value is not yet available.`
+});
 function factoryMode(self, output, key, required) {
     const { subject, state } = self;
     let pending;
@@ -540,7 +543,7 @@ function factoryMode(self, output, key, required) {
     const suspend = () => {
         if (required === false)
             return undefined;
-        const issue = Oops$8.NotReady(subject, key);
+        const issue = Oops$9.NotReady(subject, key);
         assign(pending, {
             message: issue.message,
             stack: issue.stack
@@ -558,12 +561,8 @@ function factoryMode(self, output, key, required) {
 }
 
 const Oops$8 = issues({
-    // BadSource: (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: (model, key) => `Generating initial value for ${model}.${key} failed.`,
-    NotReady: (model, key) => `Value ${model}.${key} value is not yet available.`,
-    FactoryFailed: (model, key) => `Generating initial value for ${model}.${key} failed.`,
     Failed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} [${parent}.${property}].`
 });
 function get(arg0, arg1, arg2) {
@@ -1297,10 +1296,10 @@ function useTap(source, arg1, arg2) {
     const instance = React.useMemo(() => {
         if (typeof source == "object")
             return () => source;
-        if (MVC.isTypeof(source))
-            return () => source.get(true);
         if (Model.isTypeof(source))
-            return () => useContext(source);
+            return "get" in source
+                ? () => source.get(true)
+                : () => useContext(source);
         return source;
     }, [])();
     if (typeof arg1 == "function")