@expressive/mvc 0.39.0 → 0.40.0

package/dist/index.d.ts

@@ -64,6 +64,13 @@ declare namespace Model {
      * Optional returned callback will run when once upon first access.
      */
     type Instruction<T = any, M extends Model = any> = (this: M, key: Model.Field<M> & string, thisArg: M, state: Model.State<M>) => Instruction.Descriptor<T> | Instruction.Getter<T> | void;
+    /**
+     * Model constructor callback - is called when Model finishes intializing.
+     * Returned function will call when model is destroyed.
+     */
+    type Callback = (() => void | (() => void));
+    /** Model constructor argument */
+    type Argument = string | Callback;
 }
 interface Model {
     /**
@@ -73,7 +80,7 @@ interface Model {
     is: this;
 }
 declare class Model {
-    constructor(arg?: string | (() => void | (() => void)));
+    constructor(arg?: Model.Argument);
     /** Pull current values from state. Flattens all models and exotic values recursively. */
     get(): Model.State<this>;
     /**
@@ -187,8 +194,8 @@ declare class Model {
 declare function add<T = any>(instruction: Model.Instruction): T;
 
 declare namespace get {
-    type Function<T, S = any> = (this: S, on: S) => T;
-    type Factory<R, T> = (this: T, property: string, on: T) => Function<R, T>;
+    type Function<T, S = any> = (on: S, key: string) => T;
+    type Factory<T, S = any> = (this: S, key: string, thisArg: S) => T;
     type Source<T extends Model = Model> = (resolve: (x: T) => void) => void;
 }
 /**
@@ -216,20 +223,22 @@ declare function get<T extends Model>(Type: Model.Type<T>, required?: false): T
  * @param source - Type of Model to fetch for computation.
  * @param compute - Compute function. Will update automatically as input values change.
  */
-declare function get<R, T extends Model>(Type: Model.Type<T>, compute: (this: T, on: T) => R): R;
+declare function get<R, T extends Model>(Type: Model.Type<T>, compute: get.Function<R, T>): R;
 /**
  * Implement a computed value; output will be generated by provided function.
  *
  * @param source - Source model from which computed value will be a subscriber.
  * @param compute - Compute function. Bound to a subscriber-proxy of source, returns output value. Will update automatically as input values change.
  */
-declare function get<R, T extends Model>(source: T, compute: (this: T, on: T) => R): R;
+declare function get<R, T extends Model>(source: T, compute: get.Function<R, T>): R;
 /**
  * Implement a computed value; output is returned by function from provided factory.
  *
+ * Factory is bound to owner of property.
+ *
  * @param compute - Factory function to generate a getter to subscribe dependancies.
  */
-declare function get<R, T>(compute: (property: string, on: T) => (this: T, state: T) => R): R;
+declare function get<R, T>(compute: get.Factory<R, T>): R;
 
 declare namespace ref {
     type Callback<T> = (argument: T) => ((next: T | null) => void) | Promise<void> | void | boolean;

package/dist/index.js

@@ -154,6 +154,7 @@ var STATE = /* @__PURE__ */ new WeakMap();
 var NOTIFY = /* @__PURE__ */ new WeakMap();
 var PENDING2 = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
+var METHOD = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
   constructor(arg) {
@@ -166,6 +167,22 @@ var Model = class _Model {
       new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
       if (Type === _Model)
         break;
+      const desc = Object.getOwnPropertyDescriptors(Type.prototype);
+      for (const key in desc) {
+        let { value } = desc[key];
+        if (typeof value == "function" && key !== "constructor")
+          Object.defineProperty(Type.prototype, key, {
+            get() {
+              const method = value.bind(this.is);
+              METHOD.set(method, value);
+              define(this.is, key, {
+                value: method,
+                configurable: false
+              });
+              return method;
+            }
+          });
+      }
       Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
@@ -442,8 +459,10 @@ function get(arg0, arg1) {
         from = hasParent;
       else
         throw new Error(`New ${from} created as child of ${hasParent}, but must be instanceof ${arg0}.`);
-    } else if (typeof arg0 == "function")
-      arg1 = arg0.call(from, key, from);
+    } else if (typeof arg0 == "function") {
+      const fn = METHOD.get(arg0) || arg0;
+      arg1 = (p, k) => fn.call(p, k, p);
+    }
     if (typeof arg1 == "function")
       return compute(subject, key, source, arg1);
     source((got) => subject.set(key, got));
@@ -473,7 +492,7 @@ function compute(subject, key, source, setter) {
   function compute2(initial) {
     let next;
     try {
-      next = setter.call(proxy, proxy);
+      next = setter.call(proxy, proxy, key);
     } catch (err) {
       console.warn(`An exception was thrown while ${initial ? "initializing" : "refreshing"} ${subject}.${key}.`);
       if (initial)

package/dist/index.mjs

@@ -120,6 +120,7 @@ var STATE = /* @__PURE__ */ new WeakMap();
 var NOTIFY = /* @__PURE__ */ new WeakMap();
 var PENDING2 = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
+var METHOD = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
   constructor(arg) {
@@ -132,6 +133,22 @@ var Model = class _Model {
       new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
       if (Type === _Model)
         break;
+      const desc = Object.getOwnPropertyDescriptors(Type.prototype);
+      for (const key in desc) {
+        let { value } = desc[key];
+        if (typeof value == "function" && key !== "constructor")
+          Object.defineProperty(Type.prototype, key, {
+            get() {
+              const method = value.bind(this.is);
+              METHOD.set(method, value);
+              define(this.is, key, {
+                value: method,
+                configurable: false
+              });
+              return method;
+            }
+          });
+      }
       Type = Object.getPrototypeOf(Type);
     }
     addListener(this, () => {
@@ -408,8 +425,10 @@ function get(arg0, arg1) {
         from = hasParent;
       else
         throw new Error(`New ${from} created as child of ${hasParent}, but must be instanceof ${arg0}.`);
-    } else if (typeof arg0 == "function")
-      arg1 = arg0.call(from, key, from);
+    } else if (typeof arg0 == "function") {
+      const fn = METHOD.get(arg0) || arg0;
+      arg1 = (p, k) => fn.call(p, k, p);
+    }
     if (typeof arg1 == "function")
       return compute(subject, key, source, arg1);
     source((got) => subject.set(key, got));
@@ -439,7 +458,7 @@ function compute(subject, key, source, setter) {
   function compute2(initial) {
     let next;
     try {
-      next = setter.call(proxy, proxy);
+      next = setter.call(proxy, proxy, key);
     } catch (err) {
       console.warn(`An exception was thrown while ${initial ? "initializing" : "refreshing"} ${subject}.${key}.`);
       if (initial)

package/package.json

@@ -28,6 +28,6 @@
     "prebuild": "rm -rf dist",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.39.0",
-  "gitHead": "40cda872145802a7e87964695840d7ee27053844"
+  "version": "0.40.0",
+  "gitHead": "1eb515499dc2d6571d0cc97406192ce8eb0714d2"
 }