@expressive/mvc 0.36.0 → 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;
@@ -54,7 +54,7 @@ interface Model {
     is: this;
 }
 declare class Model {
-    constructor(id?: string | number | (() => void | (() => void)));
+    constructor(arg?: string | (() => void | (() => void)));
     /** Pull current values from state. Flattens all models and exotic values recursively. */
     get(): Model.State<this>;
     /** Run a function which will run automatically when accessed values change. */

package/dist/index.js

@@ -159,50 +159,39 @@ var NOTIFY = /* @__PURE__ */ new WeakMap();
 var PENDING2 = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
-  constructor(id) {
+  constructor(arg) {
     let Type = this.constructor;
-    const state = {};
     define(this, "is", { value: this });
-    if (typeof id == "function") {
-      const cb = id;
-      id = void 0;
-      this.get(() => cb());
-    }
-    STATE.set(this, state);
-    ID.set(this, id ? String(id) : `${Type}-${uid()}`);
+    STATE.set(this, {});
+    ID.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
     while (true) {
       new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
       if (Type === _Model)
         break;
       Type = Object.getPrototypeOf(Type);
     }
-    addListener(this, () => {
-      for (const key in this) {
-        const desc = Object.getOwnPropertyDescriptor(this, key);
-        if ("value" in desc) {
-          state[key] = desc.value;
-          define(this, key, {
-            enumerable: true,
-            set: (x) => update(this, key, x),
-            get() {
-              return watch(this, key, state[key]);
-            }
-          });
-        }
-      }
+    addListener(this, bootstrap);
+    if (typeof arg == "function")
       addListener(this, () => {
-        for (const [_, value] of this)
-          if (value instanceof _Model && PARENT.get(value) === this)
-            value.set(null);
-        Object.freeze(state);
-      }, null);
-      return null;
-    });
+        const cleanup = arg();
+        if (typeof cleanup == "function")
+          addListener(this, cleanup, null);
+        return null;
+      });
   }
   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") {
@@ -286,6 +275,29 @@ define(Model, "toString", {
     return this.name;
   }
 });
+function bootstrap() {
+  const state = STATE.get(this);
+  for (const key in this) {
+    const desc = Object.getOwnPropertyDescriptor(this, key);
+    if ("value" in desc) {
+      state[key] = desc.value;
+      define(this, key, {
+        configurable: false,
+        set: (x) => update(this, key, x),
+        get() {
+          return watch(this, key, state[key]);
+        }
+      });
+    }
+  }
+  addListener(this, () => {
+    for (const [_, value] of this)
+      if (value instanceof Model && PARENT.get(value) === this)
+        value.set(null);
+    Object.freeze(state);
+  }, null);
+  return null;
+}
 function fetch(subject, property, required) {
   const state = STATE.get(subject);
   if (property in state || required === false) {
@@ -363,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

@@ -126,50 +126,39 @@ var NOTIFY = /* @__PURE__ */ new WeakMap();
 var PENDING2 = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
-  constructor(id) {
+  constructor(arg) {
     let Type = this.constructor;
-    const state = {};
     define(this, "is", { value: this });
-    if (typeof id == "function") {
-      const cb = id;
-      id = void 0;
-      this.get(() => cb());
-    }
-    STATE.set(this, state);
-    ID.set(this, id ? String(id) : `${Type}-${uid()}`);
+    STATE.set(this, {});
+    ID.set(this, typeof arg == "string" ? arg : `${Type}-${uid()}`);
     while (true) {
       new Set(NOTIFY.get(Type)).forEach((x) => addListener(this, x));
       if (Type === _Model)
         break;
       Type = Object.getPrototypeOf(Type);
     }
-    addListener(this, () => {
-      for (const key in this) {
-        const desc = Object.getOwnPropertyDescriptor(this, key);
-        if ("value" in desc) {
-          state[key] = desc.value;
-          define(this, key, {
-            enumerable: true,
-            set: (x) => update(this, key, x),
-            get() {
-              return watch(this, key, state[key]);
-            }
-          });
-        }
-      }
+    addListener(this, bootstrap);
+    if (typeof arg == "function")
       addListener(this, () => {
-        for (const [_, value] of this)
-          if (value instanceof _Model && PARENT.get(value) === this)
-            value.set(null);
-        Object.freeze(state);
-      }, null);
-      return null;
-    });
+        const cleanup = arg();
+        if (typeof cleanup == "function")
+          addListener(this, cleanup, null);
+        return null;
+      });
   }
   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") {
@@ -253,6 +242,29 @@ define(Model, "toString", {
     return this.name;
   }
 });
+function bootstrap() {
+  const state = STATE.get(this);
+  for (const key in this) {
+    const desc = Object.getOwnPropertyDescriptor(this, key);
+    if ("value" in desc) {
+      state[key] = desc.value;
+      define(this, key, {
+        configurable: false,
+        set: (x) => update(this, key, x),
+        get() {
+          return watch(this, key, state[key]);
+        }
+      });
+    }
+  }
+  addListener(this, () => {
+    for (const [_, value] of this)
+      if (value instanceof Model && PARENT.get(value) === this)
+        value.set(null);
+    Object.freeze(state);
+  }, null);
+  return null;
+}
 function fetch(subject, property, required) {
   const state = STATE.get(subject);
   if (property in state || required === false) {
@@ -330,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.0",
-  "gitHead": "09b42668a6cdd0eb10be56985e0b72bbead26a88"
+  "version": "0.36.2",
+  "gitHead": "6bd9a56d67a2972248ed85a27e22f96d8577495a"
 }