@webreflection/signals 0.1.8 → 0.1.9

package/README.md

@@ -76,9 +76,9 @@ You know, nowadays it's hard to find libraries that are still 100% under control
 #### The Beauty
 
   * [signal](https://github.com/WebReflection/signals/blob/main/src/signal.js) is 26 LOC.
-  * [computed](https://github.com/WebReflection/signals/blob/main/src/computed.js) is 33 LOC.
+  * [computed](https://github.com/WebReflection/signals/blob/main/src/computed.js) is 31 LOC.
   * the shared [stack](https://github.com/WebReflection/signals/blob/main/src/stack.js) is 18 LOC.
-  * [effect](https://github.com/WebReflection/signals/blob/main/src/effect.js) is where business happens, 74 LOC.
+  * [effect](https://github.com/WebReflection/signals/blob/main/src/effect.js) is where business happens, 65 LOC.
   * [disposable](https://github.com/WebReflection/signals/blob/main/src/disposable.js) is 10 LOC, based on the core library mentioned in the previous points.
   * [branded](https://github.com/WebReflection/signals/blob/main/src/branded.js) is 25 LOC extra needed only for libraries building on top.
 

package/dist/branded.js

@@ -1 +1 @@
-var c=!0,l=t=>{c=t},n,a=t=>{c&&n&&t.add(n)},i=(t,e)=>{let r=n;n=t;try{return e()}finally{n=r}};var u=new WeakSet,p=new WeakMap,f,W=t=>{let e=f;e||(f=[]);try{return t()}finally{if(!e){[e,f]=[f,e];for(let[r,o]of e)u.has(r)||o()}}},d=t=>{let e=p.get(t);if(e.length)for(let o of e.splice(0))b(o)},b=t=>{u.add(t),d(t),p.delete(t)},x=t=>{let e=()=>{o||u.has(e)||(o=!0,n||(f?f.push([e,r]):r()))},r=()=>{for(;o;)if(o=!1,d(e),s?.(),s=i(e,t),u.has(e))return},o=!0,s;return n&&p.get(n).push(e),p.set(e,[]),r(),()=>{p.has(e)&&(s?.(),b(e))}};var h=t=>{let e=new Set,r=!0,o,s=()=>{for(;r;)r=!1,o=i(k,t);return o},k=()=>{if(r)return;r=!0;let w=e;e=new Set;for(let y of w)y()};return{get value(){return a(e),s()},peek:s}};var g=t=>{let e=new Set;return{get value(){return a(e),t},set value(r){if(t=r,c){let o=e;e=new Set;for(let s of o)s()}},peek(){return t}}};var z=t=>{let e=c;l(!1);try{return t()}finally{l(e)}};var H=t=>function(...r){let o,s=x(()=>{o??=t.apply(this,r)??this});return o[Symbol.dispose]=s,o};var m=new WeakSet,N=t=>{let e=h(t);return m.add(e),e},O=t=>m.has(t),P=t=>{let e=g(t);return m.add(e),e};export{W as batch,N as computed,H as disposable,x as effect,O as isSignal,P as signal,z as untracked};
+var f=!0,l=t=>{f=t},s,u=t=>{f&&s&&t.add(s)},a=(t,e)=>{let r=s;s=t;try{return e()}finally{s=r}};var i=new WeakMap,p,S=t=>{let e=p;e||(p=[]);try{return t()}finally{if(!e){[e,p]=[p,e];for(let[r,o]of e)i.has(r)&&o()}}},d=t=>{t.c?.(),t.s.length&&t.s.splice(0).forEach(x)},x=t=>{let e=i.get(t);e.d=!0,d(e),i.delete(t)},b=t=>{let e=()=>{o||c.d||(o=!0,s||(p?p.push([e,r]):r()))},r=()=>{for(;o;)if(o=!1,d(c),c.c=a(e,t),c.d)return},o=!0,n,c={s:[],d:!o,c:n};return s&&i.get(s).s.push(e),i.set(e,c),r(),()=>{c.d||x(e)}};var g=t=>{let e=new Set,r=!0,o,n=()=>{for(;r;)r=!1,o=a(c,t);return o},c=()=>{if(r)return;r=!0;let k=e;e=new Set;for(let w of k)w()};return{get value(){return u(e),n()},peek:n}};var h=t=>{let e=new Set;return{get value(){return u(e),t},set value(r){if(t=r,f){let o=e;e=new Set;for(let n of o)n()}},peek(){return t}}};var j=t=>{let e=f;l(!1);try{return t()}finally{l(e)}};var G=t=>function(...r){let o,n=b(()=>{o??=t.apply(this,r)??this});return o[Symbol.dispose]=n,o};var m=new WeakSet,L=t=>{let e=g(t);return m.add(e),e},N=t=>m.has(t),O=t=>{let e=h(t);return m.add(e),e};export{S as batch,L as computed,G as disposable,b as effect,N as isSignal,O as signal,j as untracked};

package/dist/disposable.js

@@ -1 +1 @@
-var c=!0,a=t=>{c=t},n,i=t=>{c&&n&&t.add(n)},p=(t,e)=>{let r=n;n=t;try{return e()}finally{n=r}};var l=new WeakSet,u=new WeakMap,f,y=t=>{let e=f;e||(f=[]);try{return t()}finally{if(!e){[e,f]=[f,e];for(let[r,o]of e)l.has(r)||o()}}},b=t=>{let e=u.get(t);if(e.length)for(let o of e.splice(0))h(o)},h=t=>{l.add(t),b(t),u.delete(t)},m=t=>{let e=()=>{o||l.has(e)||(o=!0,n||(f?f.push([e,r]):r()))},r=()=>{for(;o;)if(o=!1,b(e),s?.(),s=p(e,t),l.has(e))return},o=!0,s;return n&&u.get(n).push(e),u.set(e,[]),r(),()=>{u.has(e)&&(s?.(),h(e))}};var T=t=>{let e=new Set,r=!0,o,s=()=>{for(;r;)r=!1,o=p(d,t);return o},d=()=>{if(r)return;r=!0;let x=e;e=new Set;for(let g of x)g()};return{get value(){return i(e),s()},peek:s}};var U=t=>{let e=new Set;return{get value(){return i(e),t},set value(r){if(t=r,c){let o=e;e=new Set;for(let s of o)s()}},peek(){return t}}};var z=t=>{let e=c;a(!1);try{return t()}finally{a(e)}};var H=t=>function(...r){let o,s=m(()=>{o??=t.apply(this,r)??this});return o[Symbol.dispose]=s,o};export{y as batch,T as computed,H as disposable,m as effect,U as signal,z as untracked};
+var c=!0,a=t=>{c=t},s,p=t=>{c&&s&&t.add(s)},l=(t,e)=>{let r=s;s=t;try{return e()}finally{s=r}};var i=new WeakMap,u,y=t=>{let e=u;e||(u=[]);try{return t()}finally{if(!e){[e,u]=[u,e];for(let[r,o]of e)i.has(r)&&o()}}},b=t=>{t.c?.(),t.s.length&&t.s.splice(0).forEach(m)},m=t=>{let e=i.get(t);e.d=!0,b(e),i.delete(t)},d=t=>{let e=()=>{o||f.d||(o=!0,s||(u?u.push([e,r]):r()))},r=()=>{for(;o;)if(o=!1,b(f),f.c=l(e,t),f.d)return},o=!0,n,f={s:[],d:!o,c:n};return s&&i.get(s).s.push(e),i.set(e,f),r(),()=>{f.d||m(e)}};var S=t=>{let e=new Set,r=!0,o,n=()=>{for(;r;)r=!1,o=l(f,t);return o},f=()=>{if(r)return;r=!0;let x=e;e=new Set;for(let h of x)h()};return{get value(){return p(e),n()},peek:n}};var M=t=>{let e=new Set;return{get value(){return p(e),t},set value(r){if(t=r,c){let o=e;e=new Set;for(let n of o)n()}},peek(){return t}}};var j=t=>{let e=c;a(!1);try{return t()}finally{a(e)}};var G=t=>function(...r){let o,n=d(()=>{o??=t.apply(this,r)??this});return o[Symbol.dispose]=n,o};export{y as batch,S as computed,G as disposable,d as effect,M as signal,j as untracked};

package/dist/signals.js

@@ -1 +1 @@
-var c=!0,p=t=>{c=t},s,a=t=>{c&&s&&t.add(s)},i=(t,e)=>{let r=s;s=t;try{return e()}finally{s=r}};var l=new WeakSet,u=new WeakMap,f,w=t=>{let e=f;e||(f=[]);try{return t()}finally{if(!e){[e,f]=[f,e];for(let[r,o]of e)l.has(r)||o()}}},b=t=>{let e=u.get(t);if(e.length)for(let o of e.splice(0))h(o)},h=t=>{l.add(t),b(t),u.delete(t)},v=t=>{let e=()=>{o||l.has(e)||(o=!0,s||(f?f.push([e,r]):r()))},r=()=>{for(;o;)if(o=!1,b(e),n?.(),n=i(e,t),l.has(e))return},o=!0,n;return s&&u.get(s).push(e),u.set(e,[]),r(),()=>{u.has(e)&&(n?.(),h(e))}};var T=t=>{let e=new Set,r=!0,o,n=()=>{for(;r;)r=!1,o=i(x,t);return o},x=()=>{if(r)return;r=!0;let d=e;e=new Set;for(let g of d)g()};return{get value(){return a(e),n()},peek:n}};var U=t=>{let e=new Set;return{get value(){return a(e),t},set value(r){if(t=r,c){let o=e;e=new Set;for(let n of o)n()}},peek(){return t}}};var z=t=>{let e=c;p(!1);try{return t()}finally{p(e)}};export{w as batch,T as computed,v as effect,U as signal,z as untracked};
+var f=!0,a=t=>{f=t},s,l=t=>{f&&s&&t.add(s)},p=(t,e)=>{let r=s;s=t;try{return e()}finally{s=r}};var i=new WeakMap,u,k=t=>{let e=u;e||(u=[]);try{return t()}finally{if(!e){[e,u]=[u,e];for(let[r,o]of e)i.has(r)&&o()}}},b=t=>{t.c?.(),t.s.length&&t.s.splice(0).forEach(x)},x=t=>{let e=i.get(t);e.d=!0,b(e),i.delete(t)},w=t=>{let e=()=>{o||n.d||(o=!0,s||(u?u.push([e,r]):r()))},r=()=>{for(;o;)if(o=!1,b(n),n.c=p(e,t),n.d)return},o=!0,c,n={s:[],d:!o,c};return s&&i.get(s).s.push(e),i.set(e,n),r(),()=>{n.d||x(e)}};var S=t=>{let e=new Set,r=!0,o,c=()=>{for(;r;)r=!1,o=p(n,t);return o},n=()=>{if(r)return;r=!0;let d=e;e=new Set;for(let m of d)m()};return{get value(){return l(e),c()},peek:c}};var M=t=>{let e=new Set;return{get value(){return l(e),t},set value(r){if(t=r,f){let o=e;e=new Set;for(let c of o)c()}},peek(){return t}}};var j=t=>{let e=f;a(!1);try{return t()}finally{a(e)}};export{k as batch,S as computed,w as effect,M as signal,j as untracked};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webreflection/signals",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "A minimalistic Preact-like signals implementation",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/effect.js

@@ -1,45 +1,40 @@
 import { run, stack } from './stack.js';
 
-const disposed = new WeakSet;
 const effects = new WeakMap;
 
 let batches;
 
 /** @type {<T>(fn: () => T) => T} */
 export const batch = fn => {
-  let updates = batches;
-  if (!updates) batches = [];
+  let before = batches;
+  if (!before) batches = [];
   try { return fn() }
   finally {
-    if (!updates) {
-      [updates, batches] = [batches, updates];
-      for (const [subscriber, run] of updates) {
-        if (!disposed.has(subscriber)) run();
+    if (!before) {
+      [before, batches] = [batches, before];
+      for (const [sub, loop] of before) {
+        if (effects.has(sub)) loop();
       }
     }
   }
 };
 
-const cleanUp = subscriber => {
-  const subscribers = effects.get(subscriber);
-  const length = subscribers.length;
-  if (length) {
-    for (const subscriber of subscribers.splice(0)) {
-      drop(subscriber);
-    }
-  }
+const cleanUp = state => {
+  state.c?.();
+  if (state.s.length) state.s.splice(0).forEach(dispose);
 };
 
-const drop = subscriber => {
-  disposed.add(subscriber);
-  cleanUp(subscriber);
+const dispose = subscriber => {
+  const state = effects.get(subscriber);
+  state.d = true;
+  cleanUp(state);
   effects.delete(subscriber);
 };
 
 /** @type {(fn: (() => void | (() => void))) => (() => void)} */
 export const effect = fn => {
   const subscriber = () => {
-    if (invalid || disposed.has(subscriber)) return;
+    if (invalid || state.d) return;
     invalid = true;
     if (!stack) {
       if (batches) batches.push([subscriber, loop]);
@@ -50,25 +45,21 @@ export const effect = fn => {
   const loop = () => {
     while (invalid) {
       invalid = false;
-      cleanUp(subscriber);
-      clean?.();
-      clean = run(subscriber, fn);
-      if (disposed.has(subscriber)) return;
+      cleanUp(state);
+      state.c = run(subscriber, fn);
+      if (state.d) return;
     }
   };
 
-  let invalid = true, clean;
+  let invalid = true, c, state = { s: [], d: !invalid, c };
 
-  if (stack) effects.get(stack).push(subscriber);
+  if (stack) effects.get(stack).s.push(subscriber);
 
-  effects.set(subscriber, []);
+  effects.set(subscriber, state);
 
   loop();
 
   return () => {
-    if (effects.has(subscriber)) {
-      clean?.();
-      drop(subscriber);
-    }
+    if (!state.d) dispose(subscriber);
   };
 };