@expressive/mvc 0.36.1 → 0.36.3

package/dist/index.d.ts

@@ -5,8 +5,11 @@ declare namespace Model {
     type New<T extends Model = Model> = (new () => T) & typeof Model;
     /** Subset of `keyof T` which are not methods or defined by base Model U. **/
     type Field<T> = Exclude<keyof T, keyof Model>;
+    /** Any valid key for controller, including but not limited to keyof T. */
     type Key<T> = Field<T> | (string & {}) | number | symbol;
+    /** Value for a given property managed by a controller. */
     type Value<T extends Model, K extends Key<T>> = K extends keyof T ? T[K] extends Ref<infer V> ? V : T[K] : unknown;
+    type Event<T extends Model> = (this: T, key: unknown, source: T) => (() => void) | void | null;
     type OnUpdate<T extends Model, K extends Key<T>> = (this: T, value: Value<T, K>, key: K, thisArg: K) => void;
     /** Export/Import compatible value for a given property in a Model. */
     type Export<R> = R extends Ref<infer T> ? T : R extends Model ? State<R> : R;
@@ -28,8 +31,7 @@ declare namespace Model {
         current: T | null;
     };
     /** A callback function which is subscribed to parent and updates when values change. */
-    type Effect<T> = (this: T, argument: T) => ((update: boolean | null) => void) | Promise<void> | null | void;
-    type Event<T extends Model> = (this: T, key: unknown, source: T) => (() => void) | void | null;
+    type Effect<T> = (this: T, current: T, updated: Set<Model.Key<T>>) => ((update: boolean | null) => void) | Promise<void> | null | void;
     namespace Instruction {
         type Getter<T> = (source: Model) => T;
         type Setter<T> = (value: T, previous: T) => boolean | void | (() => T);

package/dist/index.js

@@ -181,8 +181,17 @@ var Model = class _Model {
   }
   get(arg1, arg2) {
     const self = this.is;
-    if (typeof arg1 == "function")
-      return effect(self, arg1);
+    if (typeof arg1 == "function") {
+      let pending = /* @__PURE__ */ new Set();
+      return effect(self, (state) => {
+        const cb = arg1.call(state, state, pending);
+        return cb === null ? null : (update2) => {
+          pending = PENDING2.get(self);
+          if (typeof cb == "function")
+            return cb(update2);
+        };
+      });
+    }
     if (arg1 === void 0)
       return extract(self);
     if (typeof arg2 == "function") {
@@ -326,17 +335,19 @@ function update(subject, key, value, silent) {
     return;
   push(subject, key);
 }
-function push(subject, key) {
+function push(subject, key, silent) {
   let pending = PENDING2.get(subject);
   if (!pending) {
     PENDING2.set(subject, pending = /* @__PURE__ */ new Set());
-    queue(() => {
-      event(subject, false);
-      PENDING2.delete(subject);
-    });
+    if (!silent)
+      queue(() => {
+        event(subject, false);
+        PENDING2.delete(subject);
+      });
   }
   pending.add(key);
-  event(subject, key);
+  if (!silent)
+    event(subject, key);
 }
 function extract(from) {
   const cache = /* @__PURE__ */ new WeakMap();
@@ -366,7 +377,9 @@ function add(instruction) {
 }
 Model.on((_, subject) => {
   const state = STATE.get(subject);
-  Object.entries(Object.getOwnPropertyDescriptors(subject)).forEach(([key, { value }]) => {
+  Object.entries(
+    Object.getOwnPropertyDescriptors(subject)
+  ).forEach(([key, { value }]) => {
     const instruction = INSTRUCT.get(value);
     if (!instruction)
       return;
@@ -559,10 +572,10 @@ function compute(subject, key, source, setter) {
         compute2(true);
       else if (STALE.delete(compute2))
         compute2();
-      return (reason) => {
-        if (reason) {
+      return (didUpdate) => {
+        if (didUpdate) {
           STALE.add(compute2);
-          subject.set(key);
+          push(subject, key, true);
         }
       };
     });
@@ -577,7 +590,7 @@ function compute(subject, key, source, setter) {
         throw err;
       console.error(err);
     }
-    subject.set(key, next, !isAsync);
+    update(subject, key, next, !isAsync);
   }
   return () => {
     if (!proxy) {

package/dist/index.mjs

@@ -148,8 +148,17 @@ var Model = class _Model {
   }
   get(arg1, arg2) {
     const self = this.is;
-    if (typeof arg1 == "function")
-      return effect(self, arg1);
+    if (typeof arg1 == "function") {
+      let pending = /* @__PURE__ */ new Set();
+      return effect(self, (state) => {
+        const cb = arg1.call(state, state, pending);
+        return cb === null ? null : (update2) => {
+          pending = PENDING2.get(self);
+          if (typeof cb == "function")
+            return cb(update2);
+        };
+      });
+    }
     if (arg1 === void 0)
       return extract(self);
     if (typeof arg2 == "function") {
@@ -293,17 +302,19 @@ function update(subject, key, value, silent) {
     return;
   push(subject, key);
 }
-function push(subject, key) {
+function push(subject, key, silent) {
   let pending = PENDING2.get(subject);
   if (!pending) {
     PENDING2.set(subject, pending = /* @__PURE__ */ new Set());
-    queue(() => {
-      event(subject, false);
-      PENDING2.delete(subject);
-    });
+    if (!silent)
+      queue(() => {
+        event(subject, false);
+        PENDING2.delete(subject);
+      });
   }
   pending.add(key);
-  event(subject, key);
+  if (!silent)
+    event(subject, key);
 }
 function extract(from) {
   const cache = /* @__PURE__ */ new WeakMap();
@@ -333,7 +344,9 @@ function add(instruction) {
 }
 Model.on((_, subject) => {
   const state = STATE.get(subject);
-  Object.entries(Object.getOwnPropertyDescriptors(subject)).forEach(([key, { value }]) => {
+  Object.entries(
+    Object.getOwnPropertyDescriptors(subject)
+  ).forEach(([key, { value }]) => {
     const instruction = INSTRUCT.get(value);
     if (!instruction)
       return;
@@ -526,10 +539,10 @@ function compute(subject, key, source, setter) {
         compute2(true);
       else if (STALE.delete(compute2))
         compute2();
-      return (reason) => {
-        if (reason) {
+      return (didUpdate) => {
+        if (didUpdate) {
           STALE.add(compute2);
-          subject.set(key);
+          push(subject, key, true);
         }
       };
     });
@@ -544,7 +557,7 @@ function compute(subject, key, source, setter) {
         throw err;
       console.error(err);
     }
-    subject.set(key, next, !isAsync);
+    update(subject, key, next, !isAsync);
   }
   return () => {
     if (!proxy) {

package/package.json

@@ -28,6 +28,6 @@
     "prebuild": "rm -rf dist",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.36.1",
-  "gitHead": "032003a3354af0ad51cb539c6fc37e98697b77dc"
+  "version": "0.36.3",
+  "gitHead": "68142bec2c7c9bf8b9cb62e655ac9b35d6a6134f"
 }