@expressive/mvc 0.6.0 → 0.6.3

package/lib/index.d.ts

@@ -229,10 +229,8 @@ declare function act<S>(action: Async<S>): typeof action & {
 };
 
 declare namespace get {
-    type Function<T, O = any> = (this: O, on: O) => T;
-    type Factory<T, O = any> = (key: string) => Function<T, O>;
-    type Getter = (controller: Controller, key: string) => any;
-    type Factory2<T, S = unknown> = (this: S, key: string, thisArg: S) => T;
+    type Function<T, S = any> = (this: S, on: S) => T;
+    type Factory<T, S = unknown> = (this: S, key: string, thisArg: S) => T;
 }
 /**
  * Implement a computed value; output will be generated by provided function.
@@ -249,43 +247,43 @@ declare function get<R, T>(source: T, compute: (this: T, on: T) => R, suspend?:
  * @param compute - Factory function to generate a getter to subscribe dependancies.
  * @param suspend - Value will throw suspense when evaulating to undefined.
  */
-declare function get<R, T>(compute: (property: string) => (this: T, state: T) => R, suspend: true): Exclude<R, undefined>;
-declare function get<R, T>(compute: (property: string) => (this: T, state: T) => R, suspend?: boolean): R;
+declare function get<R, T>(compute: (property: string, on: T) => (this: T, state: T) => R, suspend: true): Exclude<R, undefined>;
+declare function get<R, T>(compute: (property: string, on: T) => (this: T, state: T) => R, suspend?: boolean): R;
 /**
-  * Set property with an async function.
-  *
-  * Property cannot be accessed until factory resolves, yeilding a result.
-  * If accessed while processing, React Suspense will be thrown.
-  *
-  * - `required: true` (default) -
-  *      Run factory immediately upon creation of model instance.
-  * - `required: false` -
-  *      Run factory only if/when accessed.
-  *      Value will always throw suspense at least once - use with caution.
-  *
-  * @param factory - Callback run to derrive property value.
-  * @param required - (default: true) Run factory immediately on creation, otherwise on access.
-  */
-declare function get<T>(factory: get.Factory2<Promise<T>>, required: false): T | undefined;
-declare function get<T, S>(factory: get.Factory2<Promise<T>, S>, required: false): T | undefined;
-declare function get<T>(factory: get.Factory2<Promise<T>>, required?: boolean): T;
-declare function get<T, S>(factory: get.Factory2<Promise<T>, S>, required?: boolean): T;
+ * Set property with an async function.
+ *
+ * Property cannot be accessed until factory resolves, yeilding a result.
+ * If accessed while processing, React Suspense will be thrown.
+ *
+ * - `required: true` (default) -
+ *      Run factory immediately upon creation of model instance.
+ * - `required: false` -
+ *      Run factory only if/when accessed.
+ *      Value will always throw suspense at least once - use with caution.
+ *
+ * @param factory - Callback run to derrive property value.
+ * @param required - (default: true) Run factory immediately on creation, otherwise on access.
+ */
+declare function get<T>(factory: get.Factory<Promise<T>>, required: false): T | undefined;
+declare function get<T, S>(factory: get.Factory<Promise<T>, S>, required: false): T | undefined;
+declare function get<T>(factory: get.Factory<Promise<T>>, required?: boolean): T;
+declare function get<T, S>(factory: get.Factory<Promise<T>, S>, required?: boolean): T;
 /**
-  * Set property with a factory function.
-  *
-  * - `required: true` (default) -
-  *      Run factory immediately upon creation of model instance.
-  * - `required: false` -
-  *      Run factory only if/when accessed.
-  *      Value will always throw suspense at least once - use with caution.
-  *
-  * @param factory - Callback run to derrive property value.
-  * @param required - (default: true) Run factory immediately on creation, otherwise on access.
-  */
-declare function get<T>(factory: get.Factory2<T>, required: false): T | undefined;
-declare function get<T, S>(factory: get.Factory2<T, S>, required: false): T | undefined;
-declare function get<T>(factory: get.Factory2<T>, required?: boolean): T;
-declare function get<T, S>(factory: get.Factory2<T, S>, required?: boolean): T;
+ * Set property with a factory function.
+ *
+ * - `required: true` (default) -
+ *      Run factory immediately upon creation of model instance.
+ * - `required: false` -
+ *      Run factory only if/when accessed.
+ *      Value will always throw suspense at least once - use with caution.
+ *
+ * @param factory - Callback run to derrive property value.
+ * @param required - (default: true) Run factory immediately on creation, otherwise on access.
+ */
+declare function get<T>(factory: get.Factory<T>, required: false): T | undefined;
+declare function get<T, S>(factory: get.Factory<T, S>, required: false): T | undefined;
+declare function get<T>(factory: get.Factory<T>, required?: boolean): T;
+declare function get<T, S>(factory: get.Factory<T, S>, required?: boolean): T;
 /**
  * Assign a property with result of a promise.
  */

package/lib/index.esm.js

@@ -17,11 +17,11 @@ function issues(register) {
     return Library;
 }
 
-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)
@@ -61,106 +61,12 @@ function mayRetry(fn) {
     return compute();
 }
 
-const Oops$a = 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.`,
-    Failed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} [${parent}.${property}].`,
-    FactoryFailed: (model, key) => `Generating initial value for ${model}.${key} failed.`,
-    NotReady: (model, key) => `Value ${model}.${key} value is not yet available.`,
-    ComputeFailed: (model, key) => `Generating initial value for ${model}.${key} failed.`
+const Oops$b = issues({
+    Failed: (parent, property, initial) => `An exception was thrown while ${initial ? "initializing" : "refreshing"} [${parent}.${property}].`
 });
 const INFO = new WeakMap();
 const KEYS = new WeakMap();
 const ORDER = new WeakMap();
-function get(arg0, arg1, arg2) {
-    return apply(function get(key) {
-        const { subject } = this;
-        const computeRequired = arg1 === true || arg2 === true;
-        const factoryRequired = arg1 !== false && arg2 !== false;
-        let getter;
-        // Easy mistake, using a peer, will always be unresolved.
-        if (typeof arg0 == "symbol")
-            throw Oops$a.PeerNotAllowed(subject, key);
-        if (typeof arg0 == "function" && /^[A-Z]/.test(arg0.name))
-            throw Oops$a.BadSource(subject, key, arg0);
-        this.state.set(key, undefined);
-        const init = () => {
-            let source = this;
-            let setter;
-            if (typeof arg0 == "function") {
-                const result = mayRetry(() => arg0.call(subject, key, subject));
-                if (typeof result == "function")
-                    setter = result;
-                else {
-                    getter = factoryMode(this, result, key, factoryRequired);
-                    return;
-                }
-            }
-            else if (arg0 instanceof Promise) {
-                getter = factoryMode(this, arg0, key, factoryRequired);
-                return;
-            }
-            else if (typeof arg1 == "function") {
-                // replace source controller in-case it is different
-                source = ensure(arg0);
-                setter = arg1;
-            }
-            else
-                throw new Error(`Factory argument cannot be ${arg1}`);
-            getter = computeMode(this, source, setter, key, computeRequired);
-        };
-        if (typeof arg0 == "function" && factoryRequired)
-            try {
-                init();
-            }
-            catch (err) {
-                Oops$a.ComputeFailed(subject, key).warn();
-                throw err;
-            }
-        return () => {
-            if (!getter)
-                init();
-            return getter();
-        };
-    });
-}
-function factoryMode(self, output, key, required) {
-    const { subject, state } = self;
-    let pending;
-    let error;
-    if (output instanceof Promise) {
-        state.set(key, undefined);
-        pending = output
-            .catch(err => error = err)
-            .then(val => {
-            state.set(key, val);
-            return val;
-        })
-            .finally(() => {
-            pending = undefined;
-            self.update(key);
-        });
-    }
-    state.set(key, output);
-    const suspend = () => {
-        if (required === false)
-            return undefined;
-        const issue = Oops$a.NotReady(subject, key);
-        Object.assign(pending, {
-            message: issue.message,
-            stack: issue.stack
-        });
-        throw pending;
-    };
-    return () => {
-        if (error)
-            throw error;
-        if (pending)
-            return suspend();
-        if (state.has(key))
-            return state.get(key);
-    };
-}
 function computeMode(self, source, setter, key, required) {
     const { subject, state } = self;
     let sub;
@@ -172,7 +78,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;
         }
     };
@@ -241,7 +147,7 @@ function flush(control) {
     KEYS.delete(control);
 }
 
-const Oops$9 = issues({
+const Oops$a = issues({
     BadCallback: () => `Callback for effect-callback may only return a function.`
 });
 const { assign, create, defineProperty, entries, getPrototypeOf, getOwnPropertyNames, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
@@ -254,7 +160,7 @@ function createEffect(callback) {
         if (unSet instanceof Promise)
             unSet = undefined;
         if (unSet && typeof unSet !== "function")
-            throw Oops$9.BadCallback();
+            throw Oops$a.BadCallback();
     };
 }
 function createValueEffect(callback) {
@@ -270,11 +176,11 @@ function createValueEffect(callback) {
         if (typeof out == "function")
             unSet = out;
         else
-            throw Oops$9.BadCallback();
+            throw Oops$a.BadCallback();
     };
 }
 
-const Oops$8 = issues({
+const Oops$9 = issues({
     Timeout: (keys, timeout) => `No update for [${keys}] within ${timeout}.`,
     StrictUpdate: () => `Strict update() did not find pending updates.`,
     NoChaining: () => `Then called with undefined; update promise will never catch nor supports chaining.`
@@ -357,7 +263,7 @@ class Model {
             const invoke = (key) => {
                 if (!key) {
                     clear();
-                    reject(Oops$8.Timeout(select, typeof argument == "number"
+                    reject(Oops$9.Timeout(select, typeof argument == "number"
                         ? `${argument}ms`
                         : `lifetime of ${this}`));
                 }
@@ -444,11 +350,11 @@ class Model {
             arg = undefined;
         }
         if (!frame.size && arg === true)
-            return Promise.reject(Oops$8.StrictUpdate());
+            return Promise.reject(Oops$9.StrictUpdate());
         return {
             then: (callback) => {
                 if (!callback)
-                    throw Oops$8.NoChaining();
+                    throw Oops$9.NoChaining();
                 if (frame.size || arg !== false)
                     waiting.add(() => {
                         callback(getUpdate(this));
@@ -777,7 +683,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-const Oops$7 = issues({
+const Oops$8 = issues({
     DuplicatePending: (key) => `Invoked action ${key} but one is already active.`
 });
 function act(task) {
@@ -785,7 +691,7 @@ function act(task) {
         let pending = false;
         const invoke = (...args) => __awaiter(this, void 0, void 0, function* () {
             if (pending)
-                return Promise.reject(Oops$7.DuplicatePending(key));
+                return Promise.reject(Oops$8.DuplicatePending(key));
             pending = true;
             this.update(key);
             try {
@@ -807,6 +713,106 @@ function act(task) {
     });
 }
 
+function factoryMode(self, output, key, required) {
+    const { subject, state } = self;
+    let pending;
+    let error;
+    if (output instanceof Promise) {
+        state.set(key, undefined);
+        pending = output
+            .catch(err => error = err)
+            .then(val => {
+            state.set(key, val);
+            return val;
+        })
+            .finally(() => {
+            pending = undefined;
+            self.update(key);
+        });
+    }
+    state.set(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;
+    };
+    return () => {
+        if (error)
+            throw error;
+        if (pending)
+            return suspend();
+        if (state.has(key))
+            return state.get(key);
+    };
+}
+
+const Oops$7 = 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) {
+    return apply(function get(key) {
+        const { subject } = this;
+        const computeRequired = arg1 === true || arg2 === true;
+        const factoryRequired = arg1 !== false && arg2 !== false;
+        let getter;
+        // Easy mistake, using a peer, will always be unresolved.
+        if (typeof arg0 == "symbol")
+            throw Oops$7.PeerNotAllowed(subject, key);
+        // if(typeof arg0 == "function" && /^[A-Z]/.test(arg0.name))
+        //   throw Oops.BadSource(subject, key, arg0);
+        this.state.set(key, undefined);
+        const init = () => {
+            let source = this;
+            let setter;
+            if (typeof arg0 == "function") {
+                const result = mayRetry(() => arg0.call(subject, key, subject));
+                if (typeof result == "function")
+                    setter = result;
+                else {
+                    getter = factoryMode(this, result, key, factoryRequired);
+                    return;
+                }
+            }
+            else if (arg0 instanceof Promise) {
+                getter = factoryMode(this, arg0, key, factoryRequired);
+                return;
+            }
+            else if (typeof arg1 == "function") {
+                // replace source controller in-case it is different
+                source = ensure(arg0);
+                setter = arg1;
+            }
+            else
+                throw new Error(`Factory argument cannot be ${arg1}`);
+            getter = computeMode(this, source, setter, key, computeRequired);
+        };
+        if (typeof arg0 == "function" && factoryRequired)
+            try {
+                init();
+            }
+            catch (err) {
+                Oops$7.ComputeFailed(subject, key).warn();
+                throw err;
+            }
+        return () => {
+            if (!getter)
+                init();
+            return getter();
+        };
+    });
+}
+
 function ref(callback) {
     return apply(function ref(key) {
         const value = this.ref(key, callback && createValueEffect(callback));
@@ -993,9 +999,11 @@ function use$1(input, argument) {
         let pending;
         let error;
         let get = (_local) => state.get(key);
-        if (typeof input === "function")
-            input = /^[A-Z]/.test(input.name)
-                ? new input() : input;
+        if (typeof input === "function") {
+            if ("prototype" in input &&
+                input === input.prototype.constructor)
+                input = new input();
+        }
         else if (input && typeof input !== "object")
             throw Oops$6.BadArgument(typeof input);
         if (input instanceof Map || input instanceof Set)