@expressive/mvc 1.0.0-beta.23 → 1.0.0-beta.24

package/types/instructions.d.ts

@@ -113,8 +113,10 @@ export function tap <T extends Class> (Type: T, required?: boolean): InstanceOf<
  * @param initialValue - Beginning value of host property.
  * @param onUpdate - Effect-callback fired upon set of host property.
  */
-export function on <T = any> (initialValue: undefined, onUpdate: InterceptCallback<T>): T | undefined;
-export function on <T = any> (initialValue: T, onUpdate: InterceptCallback<T>): T;
+export function on <T> (initialValue: undefined, onUpdate: InterceptCallback<T>): T | undefined;
+export function on <T> (initialValue: T, onUpdate: InterceptCallback<T>): T;
+export function on <T, S> (initialValue: undefined, onUpdate: InterceptCallback<T, S>): T | undefined;
+export function on <T, S> (initialValue: T, onUpdate: InterceptCallback<T, S>): T;
 
 /** Object with references to all managed values of `T`. */
 export type Refs <T extends Model> = { [P in Model.Fields<T>]: Model.Ref<T[P]> };
@@ -138,6 +140,7 @@ export function ref <T extends Model> (target: T): Refs<T>;
  * @param callback - Optional callback to synchronously fire when reference is first set or does update.
  */
 export function ref <T = HTMLElement> (callback?: InterceptCallback<T>): Model.Ref<T>;
+export function ref <T, S> (callback?: InterceptCallback<T, S>): Model.Ref<T>;
 
 /**
  * Sets an exotic method with managed ready-state. Property accepts an async function.
@@ -149,14 +152,16 @@ export function ref <T = HTMLElement> (callback?: InterceptCallback<T>): Model.R
  *
  * @param action - Action to fire when resulting property is invoked.
  */
-export function act <T extends Async> (action: T): T & { active: boolean };
+export function act (action: Async): typeof action & { active: boolean };
+export function act <S> (action: Async<S>): typeof action & { active: boolean };
 
 /**
  * Implement a computed value; output is returned by function from provided factory.
  *
  * @param compute - Factory function to generate a getter to subscribe dependancies.
  */
-export function from <R> (compute: (property: string) => (this: any, state: any) => R): R;
+export function from <R> (compute: (property: string) => <T>(this: T, state: T) => R): R;
+export function from <R, T> (compute: (property: string) => (this: T, state: T) => R): R;
 
 /**
  * Implement a computed value; output will be generated by provided function.
@@ -176,7 +181,7 @@ export function from <T extends Class, R> (source: T, compute: (this: InstanceOf
  * @param compute - Compute function. Bound to a subscriber-proxy of source, returns output value.
  * Will update automatically as input values change.
  */
-export function from <T, R> (source: T, compute: (this: T, on: T) => R): R;
+export function from <R, T> (source: T, compute: (this: T, on: T) => R): R;
 
 /**
  * Memoized value. Computes and stores a value returned by provided factory. 
@@ -185,7 +190,8 @@ export function from <T, R> (source: T, compute: (this: T, on: T) => R): R;
  * @param compute - Factory for memoized value.
  * @param lazy - Wait until accessed to introduce value.
  */
-export function memo <T> (compute: () => T, lazy?: boolean): T;
+export function memo <R> (compute: () => R, lazy?: boolean): R;
+export function memo <R, T> (compute: (this: T) => R, lazy?: boolean): R;
  
 /**
  * Flag property as not to be tracked. Useful if changes often with no real-time impact.
@@ -198,7 +204,7 @@ export function lazy <T> (value?: T): T;
  * Pending value. Will suspend unless value is defined,
  * suspense resolves when a value is aquired. 
  */
-export function pending <T = boolean> (): Exclude<T, undefined>;
+export function pending <T = boolean> (): T;
 
 /**
  * Suspend during the execution of given function to obtain value.
@@ -206,7 +212,9 @@ export function pending <T = boolean> (): Exclude<T, undefined>;
  * @param waitFor - Async function to suspend for.
  */
 export function pending (waitFor: () => Promise<void>): undefined;
-export function pending <T> (waitFor: () => Promise<T>): T;
+export function pending <T> (waitFor: (this: T) => Promise<void>): undefined;
+export function pending <R> (waitFor: () => Promise<R>): R;
+export function pending <R, T> (waitFor: (this: T) => Promise<R>): R;
 
 /**
  * Suspend for a computed value, returned by syncronous function.
@@ -225,4 +233,4 @@ export function pending <T> (waitFor: () => Promise<T>): T;
  * @param compute - Compute function returns output value. Bound to a subscriber of source.
  * Will re-run automatically as input values change.
  */
- export function pending <T, R> (source: T, compute: (this: T, on: T) => R): Exclude<R, undefined>;
+ export function pending <R, T> (source: T, compute: (this: T, on: T) => R): R;

package/types/model.d.ts

@@ -309,7 +309,7 @@ export abstract class Model {
     effect(callback: (this: this, state: this) => void, select?: (keyof this)[]): Callback;
 
     /**
-     * **React Hook** - Attach to instance of this controller within ambient component.
+     * **React Hook** - Attach to instance of this controller within a component.
      * 
      * This method will fire lifecycle events on given controller.
      * 
@@ -318,14 +318,23 @@ export abstract class Model {
     tag(id?: any): this;
 
      /**
-      * **React Hook** - Attach to instance of this controller within ambient component.
+      * **React Hook** - Subscribe to instance of controller within a component.
       * 
-      * This method will fire lifecycle events on given controller.
+      * This method will fire lifecycle events on given controller (as element)..
       * 
       * @param idFactory - Will be invoked with fetched instance. Use this to register a tag as-needed.
       */
     tag(idFactory: (idFactory: this) => any): this;
 
+    /**
+     * **React Hook** - Subscribe to instance of controller within a component.
+     * 
+     * This method will fire lifecycle events on given controller (as component).
+     * 
+     * @param callback - Run once before subscription begins.
+     */
+    use(callback?: (instance: this) => void): this;
+
     /** Use symbol to access controller of a model. */
     static CONTROL: typeof CONTROL;
 
@@ -350,20 +359,18 @@ export abstract class Model {
      * Differs from `use()` in lacking subscription and lifecycle events.
      * Much more efficient if you don't need hook-based features.
      * 
-     * @param args - Arguments passed to constructor of `this`
      * @param callback - Run after creation of instance.
      */
-    static new <T extends Class> (this: T, args?: ConstructorParameters<T>, callback?: (instance: InstanceOf<T>) => void): InstanceOf<T>;
+    static new <T extends Class> (this: T, callback?: (instance: InstanceOf<T>) => void): InstanceOf<T>;
 
     /**
      * **React Hook** - Create and attach an instance of this controller a react component.
      * 
      * Note: Model will be destroyed when ambient component unmounts!
      * 
-     * @param args - Arguments passed to constructor of `this`
      * @param callback - Run after creation of instance.
      */
-    static use <T extends Class> (this: T, args?: ConstructorParameters<T>, callback?: (instance: InstanceOf<T>) => void): InstanceOf<T>;
+    static use <T extends Class> (this: T, callback?: (instance: InstanceOf<T>) => void): InstanceOf<T>;
 
     /**
      * **React Hook** - Similar to `use`, will instanciate a controller bound to ambient component.

package/types/types.d.ts

@@ -1,5 +1,5 @@
 export type Key = string | symbol | number;
-export type Async = (...args: any[]) => Promise<any>;
+export type Async<T = any> = (this: T, ...args: any[]) => Promise<any>;
 export type BunchOf<T> = { [key: string]: T };
 
 export type Class = new (...args: any[]) => any;
@@ -10,7 +10,7 @@ export type Callback = () => void;
 export type RequestCallback = (keys?: string[]) => void;
 export type EffectCallback<T, A = T> = (this: T, argument: A) => Callback | Promise<any> | void;
 export type UpdateCallback<T, P> = (this: T, value: IfApplicable<T, P>, changed: P) => void;
-export type InterceptCallback<T> = (argument: T) => ((next: T) => void) | Promise<any> | void | boolean;
+export type InterceptCallback<T, S = any> = (this: S, argument: T) => ((next: T) => void) | Promise<any> | void | boolean;
 
 export type RefFunction = (e: HTMLElement | null) => void;