@potch/munifw 2.1.0 → 2.1.1

package/dist/munifw.min.js

@@ -1 +1 @@
-const t="value",e=t=>"object"==typeof t,n=(t,e)=>[...t].map(e);export const using=(t,e)=>(e(),t());export const collect=(t,e,n=[])=>(using(t(t=>n.push(t)),e),n);export const event=(t=new Set)=>[(...e)=>n(t,t=>t(...e)),e=>(t.add(e),()=>t.delete(e))];const o=[];export const signal=(e,n=(t,e)=>t===e)=>{const[c,s]=event();return{set[t](t){n(e,t)||(e=t,c())},touch(){c()},get[t](){return o.at(-1)&&o.at(-1).add(this),e},peek:()=>e,watch:s}};export const[emitEffect,onEffect]=event();export const effect=(t,...e)=>{let c=0;o.push(new Set(e));const s=()=>{c||(c=1,t((...t)=>emitEffect(effect(...t))),c=0)};s();const r=n(o.at(-1),t=>t.watch(s));return o.pop(),()=>n(r,t=>t())};export const computed=(e,...n)=>{const o=signal();return o.teardown=effect(()=>o[t]=e(o[t]),...n),o};export const setProp=(n,o,c)=>{"ref"==o&&t in c?c[t]=n:e(c)&&t in c?emitEffect(effect(()=>setProp(n,o,c[t]))):"function"==typeof c||e(c)||o in n?n[o]&&e(n[o])?assign(n[o],c):n[o]=null===c?"":c:null!==c&&(0!=c||o.startsWith("data-")||o.startsWith("aria-"))?n.setAttribute(o,c):n.removeAttribute(o)};export const assign=(t,n)=>(n&&Object.entries(n).forEach(([n,o])=>{t.nodeType?setProp(t,n,o):e(t[n])&&e(o)?assign(t[n],o):t[n]=o}),t);export const dom=(t,n,...o)=>{let c;return"function"==typeof t?c=mount(()=>t(n,o)):(c=document.createElement(t),n&&e(n)&&!n.nodeType?assign(c,n):n&&o.unshift(n),c.append(...o.flat(1))),c};export const mount=(t,...e)=>{const n=[];let o;return emitEffect(effect(()=>{for(;n.length;)try{n.pop()()}catch(t){}collect(onEffect,()=>{const e=t()??document.createComment("");o&&o.replaceWith(e),o=e},n)},...e)),o};export const on=(t,...e)=>(t.addEventListener(...e),()=>t.removeEventListener(...e));
+const t="value",e=t=>null!==t&&"object"==typeof t,n=(t,e)=>[...t].map(e);export const using=(t,e)=>{try{e()}finally{t()}};export const collect=(t,e,n=[])=>(using(t(t=>n.push(t)),e),n);export const event=(t=new Set)=>[(...e)=>n(t,t=>t(...e)),e=>(t.add(e),()=>t.delete(e))];const o=[];export const signal=(e,n=(t,e)=>t===e)=>{const[c,r]=event();return{set[t](t){n(e,t)||(e=t,c())},touch(){c()},get[t](){return o.at(-1)&&o.at(-1).add(this),e},peek:()=>e,watch:r}};export const[emitEffect,onEffect]=event();export const effect=(t,...e)=>{let c=0;o.push(new Set(e));const r=()=>{if(!c){c=1;try{t((...t)=>emitEffect(effect(...t)))}finally{c=0}}};let s;try{r(),s=n(o.at(-1),t=>t.watch(r))}finally{o.pop()}return()=>n(s,t=>t())};export const computed=(e,...n)=>{const o=signal();return o.teardown=effect(()=>o[t]=e(o[t]),...n),o};export const setProp=(n,o,c)=>{"ref"==o&&t in c?c[t]=n:e(c)&&t in c?emitEffect(effect(()=>setProp(n,o,c[t]))):"function"==typeof c||e(c)||o in n?n[o]&&e(n[o])?assign(n[o],c):n[o]=null===c?"":c:null!==c&&(0!=c||o.startsWith("data-")||o.startsWith("aria-"))?n.setAttribute(o,c):n.removeAttribute(o)};export const assign=(t,n)=>(n&&Object.entries(n).forEach(([n,o])=>{t.nodeType?setProp(t,n,o):e(t[n])&&e(o)?assign(t[n],o):t[n]=o}),t);export const dom=(t,n,...o)=>{let c;return"function"==typeof t?c=mount(()=>t(n,o)):(c=document.createElement(t),n&&e(n)&&!n.nodeType?assign(c,n):n&&o.unshift(n),c.append(...o.flat(1))),c};export const mount=(t,...e)=>{const n=[];let o;return emitEffect(effect(()=>{for(;n.length;)try{n.pop()()}catch(t){}collect(onEffect,()=>{const e=t()??document.createComment("");o&&o.replaceWith(e),o=e},n)},...e)),o};export const on=(t,...e)=>(t.addEventListener(...e),()=>t.removeEventListener(...e));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@potch/munifw",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "A signal-driven framework for small applications",
   "main": "src/munifw.js",
   "scripts": {

package/sizes.md

@@ -2,5 +2,5 @@
 
 file                 |  original |  minified |   gzip
 :---                 |      ---: |      ---: |   ---: 
-src/munifw.js        |      5380 |      1695 |    831
+src/munifw.js        |      5506 |      1745 |    857
 src/ssr.js           |      2397 |      1088 |    649

package/src/munifw.js

@@ -2,10 +2,16 @@
 
 // prop to monitor for changes
 const val = "value";
-const isObj = (o) => typeof o === "object";
+const isObj = (o) => o !== null && typeof o === "object";
 const map = (a, fn) => [...a].map(fn);
 // utility to run a function and ensure cleanup after
-export const using = (cb, fn) => (fn(), cb());
+export const using = (cb, fn) => {
+  try {
+    fn();
+  } finally {
+    cb();
+  }
+};
 // collect event teardowns within the scope of a function
 export const collect = (onEvent, fn, collection = []) => (
   using(
@@ -69,18 +75,21 @@ export const effect = (fn, ...explicitDependencies) => {
     // prevents effects effecting themselves
     if (!inUpdate) {
       inUpdate = true;
-      fn((...args) => emitEffect(effect(...args)));
-      inUpdate = false;
+      try {
+        fn((...args) => emitEffect(effect(...args)));
+      } finally {
+        inUpdate = false;
+      }
     }
   };
 
-  update();
-
-  const teardown = map(context.at(-1), (dependency) =>
-    dependency.watch(update)
-  );
-
-  context.pop();
+  let teardown;
+  try {
+    update();
+    teardown = map(context.at(-1), (dependency) => dependency.watch(update));
+  } finally {
+    context.pop();
+  }
 
   return () => map(teardown, (fn) => fn());
 };

package/test/munifw.test.js

@@ -276,6 +276,16 @@ describe("fw", () => {
       });
       expect(fn).toHaveBeenCalled();
       expect(cb).toHaveBeenCalled();
+
+      const throwCb = vi.fn();
+
+      expect(() =>
+        using(throwCb, () => {
+          throw "oops";
+        })
+      ).toThrowError();
+
+      expect(throwCb).toHaveBeenCalled();
     });
     it("collect", () => {
       const [emit, on] = event();