@expressive/mvc 0.21.8 → 0.23.0

package/lib/index.d.ts

@@ -77,12 +77,12 @@ declare namespace Control {
         render: () => T;
     } | void;
     type GetHook = <T>(adapter: GetAdapter<T>) => T | null;
-    type UseAdapter<T extends Model> = (refresh: RequestRefresh) => {
-        instance: T;
+    type UseAdapter<T extends Model, R> = (refresh: RequestRefresh) => {
+        local: T;
         mount: () => (() => void) | void;
-        render: (props: Model.Compat<T>) => T;
+        render: R;
     };
-    type UseHook = <T extends Model>(adapter: UseAdapter<T>) => (props: Model.Compat<T>) => T;
+    type UseHook = <T extends Model, R>(adapter: UseAdapter<T, R>) => R;
 }
 declare class Control<T extends Model = any> {
     subject: T;
@@ -171,7 +171,7 @@ declare function get$1<T extends Model, R>(this: Model.Type<T>, compute: Model.G
 declare function get$1<T extends Model, R>(this: Model.Type<T>, compute: Model.GetCallback<T, Promise<R>>, expect?: boolean): NoVoid<R> | null;
 declare function get$1<T extends Model, R>(this: Model.Type<T>, compute: Model.GetCallback<T, R>, expect?: boolean): NoVoid<R>;
 
-declare function use$1<T extends Model>(this: Model.New<T>, callback?: (instance: T) => void): T;
+declare function use$1<T extends Model>(this: Model.New<T>, callback?: (instance: T) => void, repeat?: boolean): T;
 declare function use$1<T extends Model>(this: Model.New<T>, apply?: Model.Compat<T>, repeat?: boolean): T;
 
 type InstanceOf<T> = T extends {

package/lib/index.esm.js

@@ -296,14 +296,12 @@ const notEqual = (a, b) => (b !== a && (!Array.isArray(a) ||
 function use$1(arg1, arg2) {
     const render = Control.use(dispatch => {
         const instance = this.new();
-        const proxy = Control.watch(instance, () => onUpdate);
+        const local = Control.watch(instance, () => onUpdate);
         const refresh = () => dispatch(x => x + 1);
         let onUpdate;
-        let applyProps = typeof arg1 === "object";
-        if (typeof arg1 == "function")
-            arg1(instance);
+        let apply = !!arg1;
         return {
-            instance,
+            local,
             mount() {
                 onUpdate = refresh;
                 return () => {
@@ -312,15 +310,19 @@ function use$1(arg1, arg2) {
                 };
             },
             render(props) {
-                if (applyProps) {
+                if (apply) {
                     onUpdate = undefined;
-                    applyProps = !!arg2;
-                    for (const key in props)
-                        if (instance.hasOwnProperty(key))
-                            instance[key] = props[key];
+                    if (typeof props == "function")
+                        props(instance);
+                    else if (props)
+                        for (const key in instance)
+                            if (props.hasOwnProperty(key))
+                                instance[key] = props[key];
+                    if (!arg2)
+                        apply = false;
                     instance.on(0).then(() => onUpdate = refresh);
                 }
-                return proxy;
+                return local;
             }
         };
     });
@@ -446,12 +448,12 @@ class Control {
         }
         else if (value instanceof Model)
             setRecursive(this, key, value);
-        else if (typeof value != "function")
+        else
             this.watch(key, { value });
     }
     watch(key, output) {
         const { state } = this;
-        const { get, set, enumerable } = output;
+        const { get, set, enumerable = true } = output;
         const subs = new Set();
         this.observers.set(key, subs);
         if ("value" in output)

package/lib/index.js

@@ -300,14 +300,12 @@ const notEqual = (a, b) => (b !== a && (!Array.isArray(a) ||
 function use$1(arg1, arg2) {
     const render = Control.use(dispatch => {
         const instance = this.new();
-        const proxy = Control.watch(instance, () => onUpdate);
+        const local = Control.watch(instance, () => onUpdate);
         const refresh = () => dispatch(x => x + 1);
         let onUpdate;
-        let applyProps = typeof arg1 === "object";
-        if (typeof arg1 == "function")
-            arg1(instance);
+        let apply = !!arg1;
         return {
-            instance,
+            local,
             mount() {
                 onUpdate = refresh;
                 return () => {
@@ -316,15 +314,19 @@ function use$1(arg1, arg2) {
                 };
             },
             render(props) {
-                if (applyProps) {
+                if (apply) {
                     onUpdate = undefined;
-                    applyProps = !!arg2;
-                    for (const key in props)
-                        if (instance.hasOwnProperty(key))
-                            instance[key] = props[key];
+                    if (typeof props == "function")
+                        props(instance);
+                    else if (props)
+                        for (const key in instance)
+                            if (props.hasOwnProperty(key))
+                                instance[key] = props[key];
+                    if (!arg2)
+                        apply = false;
                     instance.on(0).then(() => onUpdate = refresh);
                 }
-                return proxy;
+                return local;
             }
         };
     });
@@ -450,12 +452,12 @@ class Control {
         }
         else if (value instanceof Model)
             setRecursive(this, key, value);
-        else if (typeof value != "function")
+        else
             this.watch(key, { value });
     }
     watch(key, output) {
         const { state } = this;
-        const { get, set, enumerable } = output;
+        const { get, set, enumerable = true } = output;
         const subs = new Set();
         this.observers.set(key, subs);
         if ("value" in output)

package/package.json

@@ -27,5 +27,5 @@
     "preversion": "npm run test && npm run build",
     "postversion": "git push & npm publish"
   },
-  "version": "0.21.8"
+  "version": "0.23.0"
 }