@expressive/mvc 0.14.0 → 0.15.1

package/lib/index.d.ts

@@ -61,7 +61,10 @@ declare namespace Model {
     export { Subscriber };
     /** Including but not limited to T. */
     type Extends<T> = T | (string & Record<never, never>);
-    export type Type<T extends Model = Model> = typeof Model & (new () => T);
+    /** Any typeof Model, using class constructor as the reference. */
+    export type Type<T extends Model = Model> = (new (...args: any[]) => T);
+    /** A typeof Model, specifically one which may be created without arguments. */
+    export type New<T extends Model = Model> = (new () => T) & typeof Model;
     export type Effect<T> = (this: T, argument: T) => Callback | Promise<any> | void;
     /** Exotic value, actual value is contained. */
     export type Ref<T = any> = {
@@ -105,7 +108,7 @@ declare namespace Model {
     export type Get<T, K extends Key<T> = Key<T>> = {
         [P in K]: Value<T[P]>;
     };
-    export type Export<T, E extends Model = Model> = {
+    export type Export<T> = {
         [P in Key<T>]: Value<T[P]>;
     };
 }
@@ -386,7 +389,7 @@ declare function use<T extends Model>(from: () => T, required: boolean): T;
 /**
  * Create a new child instance of model.
  */
-declare function use<T extends Model>(Type: Model.Type<T>, callback?: (i: T) => void): T;
+declare function use<T extends Model>(Type: Model.New<T>, callback?: (i: T) => void): T;
 /**
  * Create a managed child from factory function.
  */
@@ -418,8 +421,19 @@ declare function has<T extends Model>(Type: Model.Type<T>, required?: true): T;
 declare namespace MVC {
     type EffectCallback<T = MVC> = (found: T) => Callback | void;
     type ForceUpdate = {
+        /** Force an update in current component. */
         (): void;
+        /**
+         * Force an update and again after promise either resolves or rejects.
+         * Will return a duplicate of given Promise, which resolves after refresh.
+         */
         <T = void>(passthru?: Promise<T>): Promise<T>;
+        /**
+         * Force a update while calling async function.
+         * A refresh will occur both before and after given function.
+         * Any actions performed before first `await` will occur before refresh!
+         */
+        <T = void>(invoke?: () => Promise<T>): Promise<T>;
     };
     type TapCallback<T extends Model, R> = (this: T, model: T, update: MVC.ForceUpdate) => R;
 }
@@ -482,9 +496,9 @@ declare class MVC extends Model {
 declare function useContext<T extends Model>(Type: Model.Type<T>, required: false): T | undefined;
 declare function useContext<T extends Model>(Type: Model.Type<T>, required?: boolean): T;
 
-declare function useNew<T extends Model>(source: Model.Type<T> | (() => T), callback?: (instance: T) => void): T;
-declare function useNew<T extends Model>(source: Model.Type<T> | (() => T), watch: Model.Key<T>[], callback?: (instance: T) => void): T;
-declare function useNew<T extends Model>(source: Model.Type<T> | (() => T), apply: Model.Compat<T>, keys?: Model.Event<T>[]): T;
+declare function useNew<T extends Model>(source: Model.New<T> | (() => T), callback?: (instance: T) => void): T;
+declare function useNew<T extends Model>(source: Model.New<T> | (() => T), watch: Model.Key<T>[], callback?: (instance: T) => void): T;
+declare function useNew<T extends Model>(source: Model.New<T> | (() => T), apply: Model.Compat<T>, keys?: Model.Event<T>[]): T;
 
 declare namespace useTap {
     type Source<T extends Model> = T | Model.Type<T> | (() => T | Model.Type<T>);
@@ -537,7 +551,7 @@ declare namespace Consumer {
 declare function Consumer<T extends Class>(props: Consumer.Props<T>): any;
 
 declare namespace Provider {
-    type Item = Model | Model.Type;
+    type Item = Model | Model.New;
     type Multiple<T extends Item = Item> = T[] | {
         [key: string]: T;
     };
@@ -546,13 +560,13 @@ declare namespace Provider {
         for: E;
         fallback?: React.ReactNode;
         children?: React.ReactNode | ((instance: I) => React.ReactNode);
-        and?: Model.Compat<I>;
+        use?: Model.Compat<I>;
     };
     type MultipleProps<T extends Item> = {
         for: Multiple<T>;
         fallback?: React.ReactNode;
         children?: React.ReactNode;
-        and?: Model.Compat<Instance<T>>;
+        use?: Model.Compat<Instance<T>>;
     };
     type Props<T extends Item> = MultipleProps<T> | NormalProps<T>;
 }

package/lib/index.esm.js

@@ -1356,6 +1356,8 @@ function useCompute(source, compute, suspend) {
         const spy = sub.proxy;
         let make = () => compute.call(spy, spy, forceUpdate);
         function forceUpdate(passthru) {
+            if (typeof passthru == "function")
+                passthru = passthru();
             if (make)
                 reassign(make());
             else
@@ -1526,7 +1528,7 @@ const Oops = issues({
     NoType: () => "Provider 'for' prop must be Model, typeof Model or a collection of them."
 });
 function Provider(props) {
-    const context = useNewContext(props.for, props.and);
+    const context = useNewContext(props.for, props.use);
     return (React.createElement(LookupContext.Provider, { value: context }, props.fallback === false
         ? props.children
         : (React.createElement(Suspense, { fallback: props.fallback || null }, props.children))));

package/lib/index.js

@@ -1364,6 +1364,8 @@ function useCompute(source, compute, suspend) {
         const spy = sub.proxy;
         let make = () => compute.call(spy, spy, forceUpdate);
         function forceUpdate(passthru) {
+            if (typeof passthru == "function")
+                passthru = passthru();
             if (make)
                 reassign(make());
             else
@@ -1534,7 +1536,7 @@ const Oops = issues({
     NoType: () => "Provider 'for' prop must be Model, typeof Model or a collection of them."
 });
 function Provider(props) {
-    const context = useNewContext(props.for, props.and);
+    const context = useNewContext(props.for, props.use);
     return (React__default["default"].createElement(LookupContext.Provider, { value: context }, props.fallback === false
         ? props.children
         : (React__default["default"].createElement(React.Suspense, { fallback: props.fallback || null }, props.children))));

package/package.json

@@ -49,5 +49,5 @@
     "tslib": "^2.3.0",
     "typescript": "4.6.3"
   },
-  "version": "0.14.0"
+  "version": "0.15.1"
 }