@expressive/mvc 0.35.6 → 0.36.1

package/dist/index.d.ts

@@ -54,7 +54,7 @@ interface Model {
     is: this;
 }
 declare class Model {
-    constructor(id?: string | number);
+    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. */
@@ -298,4 +298,21 @@ declare class Context {
     pop(): void;
 }
 
+declare global {
+    /**
+     * Defines MVC specific matchers for [Jest](https://jestjs.io/) test suites.
+     *
+     * For these to work you will need to add `@expressive/mvc/jest`
+     * under `setupFilesAfterEnv` in your Jest configuration.
+     */
+    namespace jest {
+        interface Matchers<R> {
+            /** Assert model does have one or more updates pending. */
+            toUpdate(timeout?: number): Promise<R>;
+            /** Assert model did update with keys specified. */
+            toHaveUpdated<R>(...keys: (string | symbol | number)[]): Promise<R>;
+        }
+    }
+}
+
 export { Context, Model, add, Model as default, get, ref, set, use };

package/dist/index.js

@@ -38,15 +38,15 @@ var LISTENER = /* @__PURE__ */ new WeakMap();
 function onReady() {
   return null;
 }
-function addListener(to, fn, select) {
-  let subs = LISTENER.get(to);
+function addListener(subject, callback, select) {
+  let subs = LISTENER.get(subject);
   if (!subs)
-    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, false));
+    LISTENER.set(subject, subs = (/* @__PURE__ */ new Map()).set(onReady, false));
   const filter = 2 in arguments && /* @__PURE__ */ new Set([select]);
   if (!filter && !subs.has(onReady))
-    fn(true, to);
-  subs.set(fn, filter);
-  return () => subs.delete(fn);
+    callback(true, subject);
+  subs.set(callback, filter);
+  return () => subs.delete(callback);
 }
 function watch(from, key, value) {
   const listeners = LISTENER.get(from);
@@ -64,17 +64,30 @@ function watch(from, key, value) {
   }
   return value;
 }
+var PENDING = /* @__PURE__ */ new WeakMap();
 function event(source, key) {
   const subs = LISTENER.get(source);
-  subs.forEach((select, callback) => {
-    let after;
-    if (!select || select.has(key)) {
-      if (after = callback.call(source, key, source))
-        queue(after);
-    }
-    if (after === null || key === null)
-      subs.delete(callback);
+  let pending = PENDING.get(source);
+  if (pending) {
+    pending.add(key);
+    return;
+  }
+  PENDING.set(source, pending = new Set(
+    key !== true && subs.has(onReady) ? [true, key] : [key]
+  ));
+  pending.forEach((key2) => {
+    pending.delete(key2);
+    subs.forEach((select, callback) => {
+      let after;
+      if (!select || select.has(key2)) {
+        if (after = callback.call(source, key2, source))
+          queue(after);
+      }
+      if (after === null || key2 === null)
+        subs.delete(callback);
+    });
   });
+  PENDING.delete(source);
 }
 function queue(event2) {
   if (!DISPATCH.size)
@@ -143,45 +156,28 @@ var ID = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
 var NOTIFY = /* @__PURE__ */ new WeakMap();
-var PENDING = /* @__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 });
-    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);
     }
-    const remove = addListener(this, (key) => {
-      remove();
-      if (key !== true)
-        event(this, true);
-      for (const key2 in this) {
-        const desc = Object.getOwnPropertyDescriptor(this, key2);
-        if ("value" in desc) {
-          state[key2] = desc.value;
-          define(this, key2, {
-            enumerable: true,
-            set: (x) => update(this, key2, x),
-            get() {
-              return watch(this, key2, state[key2]);
-            }
-          });
-        }
-      }
+    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);
-    });
+        const cleanup = arg();
+        if (typeof cleanup == "function")
+          addListener(this, cleanup, null);
+        return null;
+      });
   }
   get(arg1, arg2) {
     const self = this.is;
@@ -215,13 +211,13 @@ var Model = class _Model {
         update(self, arg1, arg2, arg3);
       else
         push(self, arg1);
-    if (PENDING.has(self))
+    if (PENDING2.has(self))
       return {
         then: (res) => new Promise((res2) => {
           const remove = addListener(self, (key) => {
             if (key !== true) {
               remove();
-              return res2.bind(null, Array.from(PENDING.get(self)));
+              return res2.bind(null, Array.from(PENDING2.get(self)));
             }
           });
         }).then(res)
@@ -270,6 +266,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) {
@@ -308,12 +327,12 @@ function update(subject, key, value, silent) {
   push(subject, key);
 }
 function push(subject, key) {
-  let pending = PENDING.get(subject);
+  let pending = PENDING2.get(subject);
   if (!pending) {
-    PENDING.set(subject, pending = /* @__PURE__ */ new Set());
+    PENDING2.set(subject, pending = /* @__PURE__ */ new Set());
     queue(() => {
       event(subject, false);
-      PENDING.delete(subject);
+      PENDING2.delete(subject);
     });
   }
   pending.add(key);
@@ -347,11 +366,10 @@ function add(instruction) {
 }
 Model.on((_, subject) => {
   const state = STATE.get(subject);
-  for (const key in subject) {
-    const { value } = Object.getOwnPropertyDescriptor(subject, key);
+  Object.entries(Object.getOwnPropertyDescriptors(subject)).forEach(([key, { value }]) => {
     const instruction = INSTRUCT.get(value);
     if (!instruction)
-      continue;
+      return;
     INSTRUCT.delete(value);
     delete subject[key];
     const output = instruction.call(subject, key, subject, state);
@@ -385,7 +403,7 @@ Model.on((_, subject) => {
         );
       }
     });
-  }
+  });
   return null;
 });
 

package/dist/index.mjs

@@ -5,15 +5,15 @@ var LISTENER = /* @__PURE__ */ new WeakMap();
 function onReady() {
   return null;
 }
-function addListener(to, fn, select) {
-  let subs = LISTENER.get(to);
+function addListener(subject, callback, select) {
+  let subs = LISTENER.get(subject);
   if (!subs)
-    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, false));
+    LISTENER.set(subject, subs = (/* @__PURE__ */ new Map()).set(onReady, false));
   const filter = 2 in arguments && /* @__PURE__ */ new Set([select]);
   if (!filter && !subs.has(onReady))
-    fn(true, to);
-  subs.set(fn, filter);
-  return () => subs.delete(fn);
+    callback(true, subject);
+  subs.set(callback, filter);
+  return () => subs.delete(callback);
 }
 function watch(from, key, value) {
   const listeners = LISTENER.get(from);
@@ -31,17 +31,30 @@ function watch(from, key, value) {
   }
   return value;
 }
+var PENDING = /* @__PURE__ */ new WeakMap();
 function event(source, key) {
   const subs = LISTENER.get(source);
-  subs.forEach((select, callback) => {
-    let after;
-    if (!select || select.has(key)) {
-      if (after = callback.call(source, key, source))
-        queue(after);
-    }
-    if (after === null || key === null)
-      subs.delete(callback);
+  let pending = PENDING.get(source);
+  if (pending) {
+    pending.add(key);
+    return;
+  }
+  PENDING.set(source, pending = new Set(
+    key !== true && subs.has(onReady) ? [true, key] : [key]
+  ));
+  pending.forEach((key2) => {
+    pending.delete(key2);
+    subs.forEach((select, callback) => {
+      let after;
+      if (!select || select.has(key2)) {
+        if (after = callback.call(source, key2, source))
+          queue(after);
+      }
+      if (after === null || key2 === null)
+        subs.delete(callback);
+    });
   });
+  PENDING.delete(source);
 }
 function queue(event2) {
   if (!DISPATCH.size)
@@ -110,45 +123,28 @@ var ID = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
 var NOTIFY = /* @__PURE__ */ new WeakMap();
-var PENDING = /* @__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 });
-    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);
     }
-    const remove = addListener(this, (key) => {
-      remove();
-      if (key !== true)
-        event(this, true);
-      for (const key2 in this) {
-        const desc = Object.getOwnPropertyDescriptor(this, key2);
-        if ("value" in desc) {
-          state[key2] = desc.value;
-          define(this, key2, {
-            enumerable: true,
-            set: (x) => update(this, key2, x),
-            get() {
-              return watch(this, key2, state[key2]);
-            }
-          });
-        }
-      }
+    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);
-    });
+        const cleanup = arg();
+        if (typeof cleanup == "function")
+          addListener(this, cleanup, null);
+        return null;
+      });
   }
   get(arg1, arg2) {
     const self = this.is;
@@ -182,13 +178,13 @@ var Model = class _Model {
         update(self, arg1, arg2, arg3);
       else
         push(self, arg1);
-    if (PENDING.has(self))
+    if (PENDING2.has(self))
       return {
         then: (res) => new Promise((res2) => {
           const remove = addListener(self, (key) => {
             if (key !== true) {
               remove();
-              return res2.bind(null, Array.from(PENDING.get(self)));
+              return res2.bind(null, Array.from(PENDING2.get(self)));
             }
           });
         }).then(res)
@@ -237,6 +233,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) {
@@ -275,12 +294,12 @@ function update(subject, key, value, silent) {
   push(subject, key);
 }
 function push(subject, key) {
-  let pending = PENDING.get(subject);
+  let pending = PENDING2.get(subject);
   if (!pending) {
-    PENDING.set(subject, pending = /* @__PURE__ */ new Set());
+    PENDING2.set(subject, pending = /* @__PURE__ */ new Set());
     queue(() => {
       event(subject, false);
-      PENDING.delete(subject);
+      PENDING2.delete(subject);
     });
   }
   pending.add(key);
@@ -314,11 +333,10 @@ function add(instruction) {
 }
 Model.on((_, subject) => {
   const state = STATE.get(subject);
-  for (const key in subject) {
-    const { value } = Object.getOwnPropertyDescriptor(subject, key);
+  Object.entries(Object.getOwnPropertyDescriptors(subject)).forEach(([key, { value }]) => {
     const instruction = INSTRUCT.get(value);
     if (!instruction)
-      continue;
+      return;
     INSTRUCT.delete(value);
     delete subject[key];
     const output = instruction.call(subject, key, subject, state);
@@ -352,7 +370,7 @@ Model.on((_, subject) => {
         );
       }
     });
-  }
+  });
   return null;
 });
 

package/package.json

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