@expressive/mvc 0.36.1 → 0.36.2

package/dist/index.d.ts

@@ -28,7 +28,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 Effect<T> = (this: T, current: T, updated: Set<Model.Key<T>>) => ((update: boolean | null) => void) | Promise<void> | null | void;
     type Event<T extends Model> = (this: T, key: unknown, source: T) => (() => void) | void | null;
     namespace Instruction {
         type Getter<T> = (source: Model) => 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") {
@@ -366,7 +375,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;

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") {
@@ -333,7 +342,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;

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.2",
+  "gitHead": "6bd9a56d67a2972248ed85a27e22f96d8577495a"
 }