@expressive/mvc 0.35.0 → 0.35.2

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-type Predicate = (key: string) => boolean | void;
 declare namespace Model {
     /** Any type of Model, using own class constructor as its identifier. */
     type Type<T extends Model = Model> = abstract new (...args: any[]) => T;
@@ -10,6 +9,7 @@ declare namespace Model {
     /** Actual value stored in state. */
     type Value<R> = R extends Ref<infer T> ? T : R extends Model ? Export<R> : R;
     type ValueOf<T extends Model, K extends Any<T>> = K extends keyof T ? T[K] extends Ref<infer V> ? V : T[K] : unknown;
+    type ValueCallback<T extends Model, K extends Any<T>> = (this: T, value: Model.ValueOf<T, K>, key: K, thisArg: K) => void;
     /**
      * Values from current state of given controller.
      * Differs from `Values` as values here will drill
@@ -28,8 +28,8 @@ 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) => Callback | Promise<void> | null | void;
-    type Event = (this: Model, key: string, value: unknown) => Callback | void;
+    type Effect<T> = (this: T, argument: T) => (() => 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;
         type Setter<T> = (value: T, previous: T) => boolean | void | (() => T);
@@ -58,41 +58,33 @@ declare class Model {
     /** Pull current values from state. Flattens all models and exotic values amongst properties. */
     get(): Model.Export<this>;
     /** Run a function which will run automatically when accessed values change. */
-    get(effect: Model.Effect<this>): Callback;
-    get<T extends string>(key: T, required: true): Exclude<Model.ValueOf<this, T>, undefined>;
+    get(effect: Model.Effect<this>): () => void;
     get<T extends string>(key: T, required?: boolean): Model.ValueOf<this, T>;
+    get<T extends string>(key: T, callback: Model.ValueCallback<this, T>): () => void;
     /**
-     * Check if update is in progress.
-     * Returns a promise which resolves updated keys. If no update, will resolve to `false`.
-     **/
-    set(): Promise<Model.Values<this> | false>;
-    /**
-     * Expect an update to state within a set time.
-     *
-     * @param timeout - milliseconds to wait for update
-     * @param predicate - optional function to filter for specific updates. If returns true, update is accepted.
+     * Get update in progress.
      *
-     * @returns a promise to resolve when next accepted update has occured.
-     */
-    set(timeout: number, predicate?: Predicate): Promise<Model.Values<this>>;
+     * @returns a promise which resolves object with updated values. Is `undefined` if no update.
+     **/
+    set(): Promise<Model.Values<this>> | undefined;
     /**
      * Call a function whenever an update occurs.
      *
      * @param callback
      *   Note: This will be called for every assignment which changes the value.
      *   To run logic on final value only, this callback may return a function.
-     *   Returning the same function for a key will ensure it is only called once.
+     *   Returning the same function for one or more will ensure it is only called once.
      *
-     * @returns a function to remove listener. Returns true if listener isn't removed already.
+     * @returns a function to remove listener. Will return `true` if removed, `false` if inactive already.
     */
-    set(callback: Model.Event): () => boolean;
+    set(callback: Model.Event<this>): () => boolean;
     /**
      * Push an update without changing the value of associated property.
      *
      * This is useful where a property value internally has changed, but the object remains the same.
      * For example: An array which has pushed a new value, or a change to nested property.
      */
-    set(key: string): void;
+    set(key: string | symbol): void;
     /**
      * Declare an end to updates. This event will freeze state.
      */
@@ -122,9 +114,10 @@ declare class Model {
      * methods and properties of this class.
      */
     static is<T extends Model.Type>(this: T, maybe: any): maybe is T;
+    static on<T extends Model>(this: Model.Type<T>, event: Model.Event<T>): () => boolean;
 }
 
-declare function add<T = any, M extends Model = any>(instruction: Model.Instruction): T;
+declare function add<T = any>(instruction: Model.Instruction): T;
 
 declare namespace get {
     type Function<T, S = any> = (this: S, on: S) => T;

package/dist/index.js

@@ -41,10 +41,10 @@ function onReady() {
 function addListener(to, fn) {
   let subs = LISTENER.get(to);
   if (!subs)
-    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, null));
+    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, void 0));
   if (!subs.has(onReady))
     fn(true, to);
-  subs.set(fn, null);
+  subs.set(fn, void 0);
   return () => subs.delete(fn);
 }
 function watch(from, key, value) {
@@ -138,28 +138,32 @@ function effect(target, callback) {
 // src/model.ts
 var ID = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
-var INSTRUCT = /* @__PURE__ */ new Map();
-var PENDING = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
+var NOTIFY = /* @__PURE__ */ new WeakMap();
+var PENDING = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
   constructor(id) {
+    let Type = this.constructor;
     const state = {};
     define(this, "is", { value: this });
-    ID.set(this, `${this.constructor}-${id ? String(id) : uid()}`);
     STATE.set(this, state);
+    ID.set(this, `${Type}-${id ? String(id) : uid()}`);
     function onNull(key) {
       if (key === null)
         Object.freeze(state);
     }
+    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 property = Object.getOwnPropertyDescriptor(this, key);
-        const instruction = INSTRUCT.get(property.value);
-        if (instruction)
-          instruction(this, key, state);
-        else {
-          state[key] = property.value;
+        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),
@@ -176,7 +180,16 @@ var Model = class _Model {
   get(arg1, arg2) {
     const self = this.is;
     if (typeof arg1 == "string")
-      return fetch(self, arg1, arg2);
+      if (typeof arg2 == "function") {
+        const state = STATE.get(self);
+        if (arg1 in state)
+          arg2.call(this, state[arg1], arg1, this);
+        return addListener(self, (key) => {
+          if (key === arg1)
+            arg2.call(this, arg1 in state ? state[key] : key, key, this);
+        });
+      } else
+        return fetch(self, arg1, arg2);
     if (arg1)
       return effect(self, arg1);
     const cache = /* @__PURE__ */ new WeakMap();
@@ -198,27 +211,19 @@ var Model = class _Model {
     if (typeof arg1 == "function")
       return addListener(self, (key) => {
         if (typeof key == "string")
-          return arg1.call(this, key, STATE.get(self)[key]);
+          return arg1.call(self, key, self);
       });
-    if (typeof arg1 == "string" || arg1 === null)
+    if (arg1 !== void 0)
       return 1 in arguments ? update(self, arg1, arg2, arg3) : update(self, arg1);
-    return new Promise((resolve, reject) => {
-      if (typeof arg1 != "number" && !PENDING.has(self)) {
-        resolve(false);
-        return;
-      }
+    if (!PENDING.has(self))
+      return;
+    return new Promise((resolve) => {
       const remove = addListener(this, (key) => {
-        if (key === true || typeof arg2 == "function" && typeof key == "string" && arg2(key) !== true)
-          return;
-        if (timeout)
-          clearTimeout(timeout);
-        remove();
-        return resolve.bind(null, PENDING.get(self));
+        if (key !== true) {
+          remove();
+          return resolve.bind(null, PENDING.get(self));
+        }
       });
-      const timeout = typeof arg1 == "number" && setTimeout(() => {
-        remove();
-        reject(arg1);
-      }, arg1);
     });
   }
   /** Iterate over managed properties in this instance of Model. */
@@ -246,6 +251,13 @@ var Model = class _Model {
   static is(maybe) {
     return typeof maybe == "function" && maybe.prototype instanceof this;
   }
+  static on(event2) {
+    let notify = NOTIFY.get(this);
+    if (!notify)
+      NOTIFY.set(this, notify = /* @__PURE__ */ new Set());
+    notify.add(event2);
+    return () => notify.delete(event2);
+  }
 };
 define(Model.prototype, "toString", {
   value() {
@@ -285,15 +297,15 @@ function fetch(subject, property, required) {
 function update(subject, key, value, silent) {
   const state = STATE.get(subject);
   let pending = PENDING.get(subject);
-  if (typeof key == "string") {
-    if (2 in arguments) {
-      const previous = state[key];
-      if (value === previous)
-        return true;
-      state[key] = value;
-      if (silent === true)
-        return;
-    }
+  if (typeof key == "string" && 2 in arguments) {
+    const previous = state[key];
+    if (value === previous)
+      return true;
+    state[key] = value;
+    if (silent === true)
+      return;
+  }
+  if (key !== true && key) {
     if (!pending) {
       PENDING.set(subject, pending = {});
       queue(() => {
@@ -301,7 +313,7 @@ function update(subject, key, value, silent) {
         PENDING.delete(subject);
       });
     }
-    pending[key] = value;
+    pending[key] = key in state ? value : true;
   }
   event(subject, key);
 }
@@ -310,10 +322,20 @@ function uid() {
 }
 
 // src/instruction/add.ts
+var INSTRUCT = /* @__PURE__ */ new Map();
 function add(instruction) {
-  const placeholder = Symbol("instruction");
-  INSTRUCT.set(placeholder, (subject, key, state) => {
-    INSTRUCT.delete(placeholder);
+  const token = Symbol("instruction");
+  INSTRUCT.set(token, instruction);
+  return token;
+}
+Model.on((_, subject) => {
+  const state = STATE.get(subject);
+  for (const key in subject) {
+    const { value } = Object.getOwnPropertyDescriptor(subject, key);
+    const instruction = INSTRUCT.get(value);
+    if (!instruction)
+      continue;
+    INSTRUCT.delete(value);
     delete subject[key];
     const output = instruction.call(subject, key, subject, state);
     if (!output)
@@ -346,9 +368,9 @@ function add(instruction) {
         );
       }
     });
-  });
-  return placeholder;
-}
+  }
+  return null;
+});
 
 // src/context.ts
 var Context = class {
@@ -416,8 +438,8 @@ var Context = class {
       if (value || I !== this[key] && !implicit)
         Object.defineProperty(this, key, {
           configurable: true,
-          value,
-          writable
+          writable,
+          value
         });
       T = Object.getPrototypeOf(T);
     } while (T !== Model);
@@ -524,24 +546,23 @@ function ref(arg, arg2) {
   return add((key, subject, state) => {
     let value = {};
     if (arg === subject)
-      for (const key2 in state)
-        if (typeof arg2 == "function")
-          define2(value, key2, {
-            configurable: true,
-            get() {
-              const out = arg2(key2);
-              define2(value, key2, { value: out });
-              return out;
-            }
-          });
-        else {
-          const ref2 = (value2) => subject.set(key2, value2);
-          define2(ref2, "current", {
-            get: () => state[key2],
-            set: ref2
-          });
-          define2(value, key2, { value: ref2 });
-        }
+      subject.get(() => {
+        for (const key2 in state)
+          if (typeof arg2 == "function")
+            define2(value, key2, {
+              configurable: true,
+              get() {
+                const out = arg2(key2);
+                define2(value, key2, { value: out });
+                return out;
+              }
+            });
+          else {
+            const set2 = (value2) => subject.set(key2, value2);
+            define2(set2, "current", { get: () => state[key2], set: set2 });
+            define2(value, key2, { value: set2 });
+          }
+      });
     else if (typeof arg == "object")
       throw new Error("ref instruction does not support object which is not 'this'");
     else {

package/dist/index.mjs

@@ -8,10 +8,10 @@ function onReady() {
 function addListener(to, fn) {
   let subs = LISTENER.get(to);
   if (!subs)
-    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, null));
+    LISTENER.set(to, subs = (/* @__PURE__ */ new Map()).set(onReady, void 0));
   if (!subs.has(onReady))
     fn(true, to);
-  subs.set(fn, null);
+  subs.set(fn, void 0);
   return () => subs.delete(fn);
 }
 function watch(from, key, value) {
@@ -105,28 +105,32 @@ function effect(target, callback) {
 // src/model.ts
 var ID = /* @__PURE__ */ new WeakMap();
 var PARENT = /* @__PURE__ */ new WeakMap();
-var INSTRUCT = /* @__PURE__ */ new Map();
-var PENDING = /* @__PURE__ */ new WeakMap();
 var STATE = /* @__PURE__ */ new WeakMap();
+var NOTIFY = /* @__PURE__ */ new WeakMap();
+var PENDING = /* @__PURE__ */ new WeakMap();
 var define = Object.defineProperty;
 var Model = class _Model {
   constructor(id) {
+    let Type = this.constructor;
     const state = {};
     define(this, "is", { value: this });
-    ID.set(this, `${this.constructor}-${id ? String(id) : uid()}`);
     STATE.set(this, state);
+    ID.set(this, `${Type}-${id ? String(id) : uid()}`);
     function onNull(key) {
       if (key === null)
         Object.freeze(state);
     }
+    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 property = Object.getOwnPropertyDescriptor(this, key);
-        const instruction = INSTRUCT.get(property.value);
-        if (instruction)
-          instruction(this, key, state);
-        else {
-          state[key] = property.value;
+        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),
@@ -143,7 +147,16 @@ var Model = class _Model {
   get(arg1, arg2) {
     const self = this.is;
     if (typeof arg1 == "string")
-      return fetch(self, arg1, arg2);
+      if (typeof arg2 == "function") {
+        const state = STATE.get(self);
+        if (arg1 in state)
+          arg2.call(this, state[arg1], arg1, this);
+        return addListener(self, (key) => {
+          if (key === arg1)
+            arg2.call(this, arg1 in state ? state[key] : key, key, this);
+        });
+      } else
+        return fetch(self, arg1, arg2);
     if (arg1)
       return effect(self, arg1);
     const cache = /* @__PURE__ */ new WeakMap();
@@ -165,27 +178,19 @@ var Model = class _Model {
     if (typeof arg1 == "function")
       return addListener(self, (key) => {
         if (typeof key == "string")
-          return arg1.call(this, key, STATE.get(self)[key]);
+          return arg1.call(self, key, self);
       });
-    if (typeof arg1 == "string" || arg1 === null)
+    if (arg1 !== void 0)
       return 1 in arguments ? update(self, arg1, arg2, arg3) : update(self, arg1);
-    return new Promise((resolve, reject) => {
-      if (typeof arg1 != "number" && !PENDING.has(self)) {
-        resolve(false);
-        return;
-      }
+    if (!PENDING.has(self))
+      return;
+    return new Promise((resolve) => {
       const remove = addListener(this, (key) => {
-        if (key === true || typeof arg2 == "function" && typeof key == "string" && arg2(key) !== true)
-          return;
-        if (timeout)
-          clearTimeout(timeout);
-        remove();
-        return resolve.bind(null, PENDING.get(self));
+        if (key !== true) {
+          remove();
+          return resolve.bind(null, PENDING.get(self));
+        }
       });
-      const timeout = typeof arg1 == "number" && setTimeout(() => {
-        remove();
-        reject(arg1);
-      }, arg1);
     });
   }
   /** Iterate over managed properties in this instance of Model. */
@@ -213,6 +218,13 @@ var Model = class _Model {
   static is(maybe) {
     return typeof maybe == "function" && maybe.prototype instanceof this;
   }
+  static on(event2) {
+    let notify = NOTIFY.get(this);
+    if (!notify)
+      NOTIFY.set(this, notify = /* @__PURE__ */ new Set());
+    notify.add(event2);
+    return () => notify.delete(event2);
+  }
 };
 define(Model.prototype, "toString", {
   value() {
@@ -252,15 +264,15 @@ function fetch(subject, property, required) {
 function update(subject, key, value, silent) {
   const state = STATE.get(subject);
   let pending = PENDING.get(subject);
-  if (typeof key == "string") {
-    if (2 in arguments) {
-      const previous = state[key];
-      if (value === previous)
-        return true;
-      state[key] = value;
-      if (silent === true)
-        return;
-    }
+  if (typeof key == "string" && 2 in arguments) {
+    const previous = state[key];
+    if (value === previous)
+      return true;
+    state[key] = value;
+    if (silent === true)
+      return;
+  }
+  if (key !== true && key) {
     if (!pending) {
       PENDING.set(subject, pending = {});
       queue(() => {
@@ -268,7 +280,7 @@ function update(subject, key, value, silent) {
         PENDING.delete(subject);
       });
     }
-    pending[key] = value;
+    pending[key] = key in state ? value : true;
   }
   event(subject, key);
 }
@@ -277,10 +289,20 @@ function uid() {
 }
 
 // src/instruction/add.ts
+var INSTRUCT = /* @__PURE__ */ new Map();
 function add(instruction) {
-  const placeholder = Symbol("instruction");
-  INSTRUCT.set(placeholder, (subject, key, state) => {
-    INSTRUCT.delete(placeholder);
+  const token = Symbol("instruction");
+  INSTRUCT.set(token, instruction);
+  return token;
+}
+Model.on((_, subject) => {
+  const state = STATE.get(subject);
+  for (const key in subject) {
+    const { value } = Object.getOwnPropertyDescriptor(subject, key);
+    const instruction = INSTRUCT.get(value);
+    if (!instruction)
+      continue;
+    INSTRUCT.delete(value);
     delete subject[key];
     const output = instruction.call(subject, key, subject, state);
     if (!output)
@@ -313,9 +335,9 @@ function add(instruction) {
         );
       }
     });
-  });
-  return placeholder;
-}
+  }
+  return null;
+});
 
 // src/context.ts
 var Context = class {
@@ -383,8 +405,8 @@ var Context = class {
       if (value || I !== this[key] && !implicit)
         Object.defineProperty(this, key, {
           configurable: true,
-          value,
-          writable
+          writable,
+          value
         });
       T = Object.getPrototypeOf(T);
     } while (T !== Model);
@@ -491,24 +513,23 @@ function ref(arg, arg2) {
   return add((key, subject, state) => {
     let value = {};
     if (arg === subject)
-      for (const key2 in state)
-        if (typeof arg2 == "function")
-          define2(value, key2, {
-            configurable: true,
-            get() {
-              const out = arg2(key2);
-              define2(value, key2, { value: out });
-              return out;
-            }
-          });
-        else {
-          const ref2 = (value2) => subject.set(key2, value2);
-          define2(ref2, "current", {
-            get: () => state[key2],
-            set: ref2
-          });
-          define2(value, key2, { value: ref2 });
-        }
+      subject.get(() => {
+        for (const key2 in state)
+          if (typeof arg2 == "function")
+            define2(value, key2, {
+              configurable: true,
+              get() {
+                const out = arg2(key2);
+                define2(value, key2, { value: out });
+                return out;
+              }
+            });
+          else {
+            const set2 = (value2) => subject.set(key2, value2);
+            define2(set2, "current", { get: () => state[key2], set: set2 });
+            define2(value, key2, { value: set2 });
+          }
+      });
     else if (typeof arg == "object")
       throw new Error("ref instruction does not support object which is not 'this'");
     else {

package/package.json

@@ -28,6 +28,6 @@
     "prebuild": "rm -rf dist",
     "preversion": "npm run test && npm run build"
   },
-  "version": "0.35.0",
-  "gitHead": "c3be06793fa1f4c61dd54c78dace08c928392d1b"
+  "version": "0.35.2",
+  "gitHead": "3ea5cde2819a66601be642a9befd8e4477caa0b8"
 }