@expressive/mvc 0.28.0 → 0.29.0

package/lib/index.d.ts

@@ -58,13 +58,15 @@ declare global {
   }
 }
 
+type OnValue<T, P extends Model.Key<T>> = (this: T, value: T[P], updated: Model.Event<T>[]) => void;
+type OnValues<T, P extends Model.Key<T>> = (this: T, value: Model.Export<T, P>, updated: Model.Event<T>[]) => void;
 interface Observable {
     get(): Model.Export<this>;
     get(effect: Model.Effect<this>): Callback;
     get<P extends Model.Key<this>>(select: P): this[P];
-    get<P extends Model.Key<this>>(select: Iterable<P>): Model.Export<this, P>;
-    get<P extends Model.Key<this>>(select: P, onUpdate: (this: this, value: this[P], updated: Model.Event<this>[]) => void, once?: boolean): Callback;
-    get<P extends Model.Key<this>>(select: Iterable<P>, onUpdate: (this: this, value: Model.Export<this, P>, updated: Model.Event<this>[]) => void, once?: boolean): Callback;
+    get<P extends Model.Key<this>>(select: P, onUpdate: OnValue<this, P>, once?: boolean): Callback;
+    get<P extends Model.Key<this>>(select: P[]): Model.Export<this, P>;
+    get<P extends Model.Key<this>>(select: P[], onUpdate: OnValues<this, P>, once?: boolean): Callback;
     set(): Promise<Model.Event<this>[]>;
     set(timeout: number): Promise<Model.Event<this>[] | false>;
     set<T extends Model.Values<this>>(source: T, only?: (keyof T)[]): Promise<Model.Event<T>[] | false>;
@@ -93,7 +95,7 @@ declare namespace Model {
     /** Including but not limited to `keyof T` which are not methods or defined by base Model. */
     type Event<T> = Key<T> | (string & {});
     /** Actual value stored in state. */
-    type Value<R> = R extends Ref<infer T> ? T : R;
+    type Value<R> = R extends Ref<infer T> ? T : R extends Observable ? Export<R> : R;
     /** Object comperable to data found in T. */
     type Values<T> = {
         [P in Key<T>]?: Value<T[P]>;
@@ -137,7 +139,7 @@ declare class Model {
      *
      * Will determine if provided class is a subtype of this one.
      */
-    static isTypeof<T extends Model.Type>(this: T, maybe: any): maybe is T;
+    static is<T extends Model.Type>(this: T, maybe: any): maybe is T;
 }
 
 declare namespace get {

package/lib/index.esm.js

@@ -40,7 +40,7 @@ function issues(register) {
     return Library;
 }
 
-const { assign, create, defineProperties, defineProperty, entries, getPrototypeOf, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
+const { assign, create, defineProperties, defineProperty, entries, keys, getPrototypeOf, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
 
 const Oops$7 = issues({
     NotFound: (name) => `Could not find ${name} in context.`
@@ -275,18 +275,20 @@ function getMethod(argument, callback, once) {
     if (typeof argument == "function")
         return createEffect(this, argument);
     const self = control(this, true);
-    function get() {
-        if (typeof argument == "string")
-            return self.state[argument];
-        if (!argument)
-            return Object.assign({}, self.state);
-        const output = {};
-        for (const key of argument)
-            output[key] = self.state[key];
-        return output;
+    function get(key) {
+        const value = self.state[key];
+        return value instanceof Model ? value.get() : value;
     }
+    const extract = typeof argument == "string"
+        ? () => get(argument)
+        : () => {
+            const output = {};
+            for (const key of argument || keys(self.state))
+                output[key] = get(key);
+            return output;
+        };
     if (typeof callback != "function")
-        return get();
+        return extract();
     const select = typeof argument == "string" ? [argument] : argument;
     if (select)
         for (const key of select)
@@ -302,7 +304,7 @@ function getMethod(argument, callback, once) {
         if (!select || select.includes(key)) {
             if (once)
                 remove();
-            return () => callback(get(), self.latest);
+            return () => callback(extract(), self.latest);
         }
     });
     return remove;
@@ -370,20 +372,38 @@ class Model {
      *
      * Will determine if provided class is a subtype of this one.
      */
-    static isTypeof(maybe) {
+    static is(maybe) {
         return (typeof maybe == "function" &&
             maybe.prototype instanceof this);
     }
 }
 Model.get = get$1;
 Model.use = use$1;
+defineProperty(Model, "toString", {
+    value() {
+        return this.name;
+    }
+});
 defineProperties(Model.prototype, {
     get: { value: getMethod },
     set: { value: setMethod },
+    toString: {
+        configurable: true,
+        value() {
+            return `${this.constructor.name}-${control(this).id}`;
+        }
+    }
+});
+/* TODO: Remove below on 1.0.0 release. */
+defineProperty(Model, "isTypeof", {
+    get() {
+        throw new Error("Model.isTypeof method was renamed. Use Model.is instead.");
+    }
+});
+defineProperties(Model.prototype, {
     is: {
         configurable: true,
         get() {
-            // TODO: Remove this method on 1.0
             throw new Error("Model.is property is now is only available from a hook.");
         }
     },
@@ -391,20 +411,8 @@ defineProperties(Model.prototype, {
         configurable: true,
         writable: true,
         value() {
-            // TODO: Remove this method on 1.0
             throw new Error("Model.on() is deprecated. Use Model.get or Model.set instead.");
         }
-    },
-    toString: {
-        configurable: true,
-        value() {
-            return `${this.constructor.name}-${control(this).id}`;
-        }
-    }
-});
-defineProperty(Model, "toString", {
-    value() {
-        return this.name;
     }
 });
 
@@ -649,7 +657,7 @@ function get(arg0, arg1) {
         let source = cb => cb(subject);
         if (arg0 instanceof Model)
             subject = arg0;
-        else if (Model.isTypeof(arg0)) {
+        else if (Model.is(arg0)) {
             const hasParent = parent(subject);
             if (!hasParent) {
                 if (arg1 === true)

package/lib/index.js

@@ -44,7 +44,7 @@ function issues(register) {
     return Library;
 }
 
-const { assign, create, defineProperties, defineProperty, entries, getPrototypeOf, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
+const { assign, create, defineProperties, defineProperty, entries, keys, getPrototypeOf, getOwnPropertyDescriptor, getOwnPropertySymbols, values } = Object;
 
 const Oops$7 = issues({
     NotFound: (name) => `Could not find ${name} in context.`
@@ -279,18 +279,20 @@ function getMethod(argument, callback, once) {
     if (typeof argument == "function")
         return createEffect(this, argument);
     const self = control(this, true);
-    function get() {
-        if (typeof argument == "string")
-            return self.state[argument];
-        if (!argument)
-            return Object.assign({}, self.state);
-        const output = {};
-        for (const key of argument)
-            output[key] = self.state[key];
-        return output;
+    function get(key) {
+        const value = self.state[key];
+        return value instanceof Model ? value.get() : value;
     }
+    const extract = typeof argument == "string"
+        ? () => get(argument)
+        : () => {
+            const output = {};
+            for (const key of argument || keys(self.state))
+                output[key] = get(key);
+            return output;
+        };
     if (typeof callback != "function")
-        return get();
+        return extract();
     const select = typeof argument == "string" ? [argument] : argument;
     if (select)
         for (const key of select)
@@ -306,7 +308,7 @@ function getMethod(argument, callback, once) {
         if (!select || select.includes(key)) {
             if (once)
                 remove();
-            return () => callback(get(), self.latest);
+            return () => callback(extract(), self.latest);
         }
     });
     return remove;
@@ -374,20 +376,38 @@ class Model {
      *
      * Will determine if provided class is a subtype of this one.
      */
-    static isTypeof(maybe) {
+    static is(maybe) {
         return (typeof maybe == "function" &&
             maybe.prototype instanceof this);
     }
 }
 Model.get = get$1;
 Model.use = use$1;
+defineProperty(Model, "toString", {
+    value() {
+        return this.name;
+    }
+});
 defineProperties(Model.prototype, {
     get: { value: getMethod },
     set: { value: setMethod },
+    toString: {
+        configurable: true,
+        value() {
+            return `${this.constructor.name}-${control(this).id}`;
+        }
+    }
+});
+/* TODO: Remove below on 1.0.0 release. */
+defineProperty(Model, "isTypeof", {
+    get() {
+        throw new Error("Model.isTypeof method was renamed. Use Model.is instead.");
+    }
+});
+defineProperties(Model.prototype, {
     is: {
         configurable: true,
         get() {
-            // TODO: Remove this method on 1.0
             throw new Error("Model.is property is now is only available from a hook.");
         }
     },
@@ -395,20 +415,8 @@ defineProperties(Model.prototype, {
         configurable: true,
         writable: true,
         value() {
-            // TODO: Remove this method on 1.0
             throw new Error("Model.on() is deprecated. Use Model.get or Model.set instead.");
         }
-    },
-    toString: {
-        configurable: true,
-        value() {
-            return `${this.constructor.name}-${control(this).id}`;
-        }
-    }
-});
-defineProperty(Model, "toString", {
-    value() {
-        return this.name;
     }
 });
 
@@ -653,7 +661,7 @@ function get(arg0, arg1) {
         let source = cb => cb(subject);
         if (arg0 instanceof Model)
             subject = arg0;
-        else if (Model.isTypeof(arg0)) {
+        else if (Model.is(arg0)) {
             const hasParent = parent(subject);
             if (!hasParent) {
                 if (arg1 === true)

package/package.json

@@ -26,6 +26,6 @@
     "prebuild": "rm -rf lib/",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.28.0",
-  "gitHead": "76939c2aa0ea5b471ff6fa90e9f4fa65e5e85c3f"
+  "version": "0.29.0",
+  "gitHead": "3040fe38026dbff2d9c9e94aed2a46e8c057a137"
 }