@expressive/mvc 0.53.3 → 0.53.6

package/dist/index.d.ts

@@ -16,14 +16,14 @@ declare function addListener<T extends Model>(subject: T, callback: OnUpdate<T>,
 declare function createProxy<T extends Model>(from: T, observer: OnAccess<T>): T;
 /**
  * Create a side-effect which will update whenever values accessed change.
- * Callback is called immediately and if ever values are stale.
+ * Callback is called immediately and whenever values are stale.
  *
  * @param target - Instance of Model to observe.
  * @param callback - Function to invoke when values change.
  * @param requireValues - If `true` will throw if accessing a value which is `undefined`.
  */
 declare function createEffect<T extends Model>(target: T, callback: Effect<Required<T>>, requireValues: true): () => void;
-declare function createEffect<T extends Model>(target: T, callback: Effect<T>, requireValues?: boolean): () => void;
+declare function createEffect<T extends Model>(target: T, callback: Effect<T>, recursive?: boolean): () => void;
 
 declare namespace Model {
     /** Any type of Model, using own class constructor as its identifier. */

package/dist/index.js

@@ -18,8 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   Context: () => Context,
   Model: () => Model,
   addListener: () => addListener,
@@ -32,7 +32,7 @@ __export(src_exports, {
   set: () => set,
   use: () => use
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/control.ts
 var onReady = () => null;
@@ -129,7 +129,7 @@ function watch(from, key2, value) {
   const access = OBSERVER.get(from);
   return access ? access(from, key2, value) : value;
 }
-function createEffect(target, callback, requireValues) {
+function createEffect(target, callback, argument) {
   const listeners = LISTENERS.get(target);
   let unset;
   let reset;
@@ -148,7 +148,7 @@ function createEffect(target, callback, requireValues) {
       return reset;
     }
     function access(from, key2, value) {
-      if (value === void 0 && requireValues)
+      if (value === void 0 && argument)
         throw new Error(`${from}.${key2} is required in this context.`);
       const listeners2 = LISTENERS.get(from);
       let listener = listeners2.get(onUpdate);
@@ -164,9 +164,15 @@ function createEffect(target, callback, requireValues) {
       return value;
     }
     try {
-      const out = callback.call(subscriber, subscriber);
-      unset = typeof out == "function" ? out : void 0;
-      reset = out === null ? out : invoke;
+      const ctx = context(argument === false);
+      const ret = callback.call(subscriber, subscriber);
+      const flush = ctx();
+      reset = ret === null ? null : invoke;
+      unset = (key2) => {
+        if (typeof ret == "function")
+          ret(key2);
+        flush();
+      };
     } catch (err) {
       if (err instanceof Promise) {
         reset = void 0;
@@ -175,6 +181,14 @@ function createEffect(target, callback, requireValues) {
         throw err;
     }
   }
+  function cleanup() {
+    if (unset)
+      unset(false);
+    reset = null;
+  }
+  ;
+  if (EffectContext && argument !== false)
+    EffectContext.add(cleanup);
   addListener(target, (key2) => {
     if (key2 === true)
       invoke();
@@ -183,10 +197,20 @@ function createEffect(target, callback, requireValues) {
     if (key2 === null && unset)
       unset(null);
   });
+  return cleanup;
+}
+var EffectContext;
+function context(ignore) {
+  if (ignore)
+    return () => () => {
+    };
+  const current = EffectContext;
+  const ctx = EffectContext = /* @__PURE__ */ new Set();
   return () => {
-    if (unset)
-      unset(false);
-    reset = null;
+    EffectContext = current;
+    return () => {
+      ctx.forEach((fn) => fn());
+    };
   };
 }
 
@@ -210,7 +234,7 @@ var Model = class {
       let pending2 = /* @__PURE__ */ new Set();
       return createEffect(self, (proxy) => {
         const cb = arg1.call(proxy, proxy, pending2);
-        return cb === null ? cb : (update2) => {
+        return cb === null ? null : (update2) => {
           pending2 = PENDING_KEYS.get(self);
           if (typeof cb == "function")
             cb(update2);
@@ -300,10 +324,8 @@ function prepare(model) {
   while (T.name) {
     for (const cb of NOTIFY.get(T) || [])
       addListener(model, cb);
-    if (T === Model)
-      break;
-    else
-      chain.unshift(T);
+    if (T === Model) break;
+    else chain.unshift(T);
     T = Object.getPrototypeOf(T);
   }
   for (const type of chain) {
@@ -316,9 +338,9 @@ function prepare(model) {
       Object.getOwnPropertyDescriptors(type.prototype)
     )) {
       let bind2 = function(method = value) {
-        const value2 = method.bind(model);
+        const value2 = method.bind(this.is);
         METHOD.set(value2, method);
-        define(model, key2, { value: value2, writable: true });
+        define(this.is, key2, { value: value2, writable: true });
         return value2;
       };
       var bind = bind2;
@@ -670,8 +692,8 @@ function get(arg0, arg1) {
       if (!hasParent) {
         if (arg1 === true)
           throw new Error(`${subject} may only exist as a child of type ${arg0}.`);
-        Context.get(subject, (context) => {
-          const model = context.get(arg0);
+        Context.get(subject, (context2) => {
+          const model = context2.get(arg0);
           if (model)
             assign2(model);
           else if (arg1 !== false)
@@ -708,7 +730,7 @@ function get(arg0, arg1) {
             event(subject, key2, true);
           }
         };
-      });
+      }, false);
     }
     function compute(initial) {
       let next;
@@ -763,18 +785,23 @@ function ref(arg, arg2) {
     else if (typeof arg == "object")
       throw new Error("ref instruction does not support object which is not 'this'");
     else {
-      let unSet;
+      let unset;
       const get2 = () => state[key2];
       const set2 = (value2) => {
         if (!update(subject, key2, value2) || !arg)
           return;
-        if (unSet)
-          unSet = void unSet(value2);
-        if (value2 !== null || arg2 === false) {
-          const out = arg.call(subject, value2);
+        if (unset)
+          unset = void unset(value2);
+        if (value2 === null && arg2 !== false)
+          return;
+        const ctx = context();
+        const out = arg.call(subject, value2);
+        const flush = ctx();
+        unset = (key3) => {
           if (typeof out == "function")
-            unSet = out;
-        }
+            out(key3);
+          flush();
+        };
       };
       state[key2] = null;
       value = Object.defineProperties(set2, {
@@ -789,7 +816,7 @@ function ref(arg, arg2) {
 // src/instruction/set.ts
 function set(value, argument) {
   return use((key2, subject) => {
-    const output = {};
+    const property = {};
     if (typeof value == "function" || value instanceof Promise) {
       let init3 = function() {
         if (typeof value == "function")
@@ -799,14 +826,14 @@ function set(value, argument) {
             console.warn(`Generating initial value for ${subject}.${key2} failed.`);
             throw err;
           }
-        output.get = argument === true;
+        property.get = argument === true;
         if (value instanceof Promise) {
           value.then((value2) => {
             update(subject, key2, value2);
             return value2;
           }).catch((err) => {
             event(subject, key2);
-            output.get = () => {
+            property.get = () => {
               throw err;
             };
           });
@@ -819,26 +846,31 @@ function set(value, argument) {
       if (argument)
         init3();
       else
-        output.get = init3;
+        property.get = init3;
     } else if (value !== void 0)
-      output.value = value;
+      property.value = value;
     if (typeof argument == "function") {
-      let unSet;
-      output.set = function(value2, previous) {
+      let unset;
+      property.set = function(value2, previous) {
+        const ctx = context();
         const out = argument.call(this, value2, previous);
+        const flush = ctx();
         if (out === false)
           return out;
-        if (typeof unSet == "function")
-          unSet = void unSet(value2);
-        if (typeof out == "function")
-          unSet = out;
+        if (typeof unset == "function")
+          unset(value2);
+        unset = (next) => {
+          if (typeof out == "function")
+            out(next);
+          flush();
+        };
       };
     } else
-      output.set = (value2) => {
-        output.get = void 0;
+      property.set = (value2) => {
+        property.get = void 0;
         update(subject, key2, value2);
       };
-    return output;
+    return property;
   });
 }
 function attempt(fn) {
@@ -868,8 +900,8 @@ function has(arg1, arg2) {
       update(subject, key2, Object.freeze(Array.from(applied)));
     };
     if (Model.is(arg1))
-      Context.get(subject, (context) => {
-        context.has(arg1, (model) => {
+      Context.get(subject, (context2) => {
+        context2.has(arg1, (model) => {
           let remove;
           let disconnect;
           if (applied.has(model))

package/package.json

@@ -15,23 +15,22 @@
     "mvc"
   ],
   "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "module": "dist/esm/index.mjs",
   "types": "dist/index.d.ts",
   "files": [
-    "dist/index.js",
-    "dist/index.mjs",
-    "dist/index.d.ts"
+    "dist"
   ],
   "scripts": {
-    "build": "tsup src/index.ts --dts --format esm,cjs",
+    "build": "tsc && tsup src/index.ts --dts",
     "test": "tsc --noEmit && jest --collectCoverage",
     "prebuild": "rm -rf dist",
     "preversion": "npm run test && npm run build"
   },
   "devDependencies": {
+    "@types/node": "^18.19.0",
     "jest": "^27.0.6",
     "tsup": "^8.0.2"
   },
-  "version": "0.53.3",
-  "gitHead": "b9418691a8602553852a47b981a3b4d407ce6ff6"
+  "version": "0.53.6",
+  "gitHead": "a6564d79b709f3d41c663885d1c0a2e3f8eddd31"
 }