@esmj/signals 0.0.2 → 0.0.4

package/dist/index.d.mts

@@ -25,11 +25,18 @@ class Watcher extends Observable {
 
     this.pipe((observable) => {
       const originalSubscribe = observable.subscribe.bind(observable);
+      const originalUnsubscribe = observable.unsubscribe.bind(observable);
+
       observable.subscribe = (observer) => {
         originalSubscribe(observer);
         this.#pendings.add(observer);
       };
 
+      observable.unsubscribe = (observer) => {
+        originalUnsubscribe(observer);
+        this.#pendings.delete(observer);
+      };
+
       return observable;
     });
   }
@@ -38,6 +45,8 @@ class Watcher extends Observable {
     if (typeof signal.next !== 'function') {
       signal.next = () => {
         return untrack(() => {
+          this.#pendings.add(signal);
+
           this.#notify();
         });
       };
@@ -52,6 +61,8 @@ class Watcher extends Observable {
       const originalNext = signal.next.bind(signal);
       signal.next = () => {
         return untrack(() => {
+          this.#pendings.add(signal);
+
           originalNext();
 
           this.#notify();
@@ -64,7 +75,20 @@ class Watcher extends Observable {
   }
 
   getPending() {
-    return Array.from(this.#pendings);
+    const pendings = Array.from(this.#pendings).map((pending) => {
+      const originalGet = pending.get.bind(pending);
+
+      pending.get = () => {
+        return untrack(() => {
+          this.#pendings.delete(pending);
+          return originalGet();
+        });
+      };
+
+      return pending;
+    });
+
+    return pendings;
   }
 
   unwatch(signal) {
@@ -79,14 +103,14 @@ let w = null;
 function createWatcher(notify) {
   w = new Watcher(notify);
 }
-
+let timer = null;
 createWatcher(() => {
   // TODO performance improvement
-  setTimeout(() => {
+
+  clearTimeout(timer);
+  timer = setTimeout(() => {
     getPending().forEach((pending) => {
-      untrack(() => {
-        pending.get();
-      });
+      pending.get();
     });
   }, 0);
 });
@@ -117,6 +141,8 @@ class Computed extends Observer {
     this.#callback = callback;
     this.#options = options;
 
+    this.debug = options?.debug;
+
     this.get = this.get.bind(this);
   }
 
@@ -208,7 +234,7 @@ function computed(callback, options) {
   return instance;
 }
 
-function effect(callback) {
+function effect(callback, options) {
   let destructor;
 
   let c = computed(
@@ -216,7 +242,7 @@ function effect(callback) {
       destructor?.();
       destructor = callback();
     },
-    { equals: () => false },
+    { equals: () => false, debug: 'effect', ...options },
   );
   c.get();
 

package/dist/index.d.ts

@@ -25,11 +25,18 @@ class Watcher extends Observable {
 
     this.pipe((observable) => {
       const originalSubscribe = observable.subscribe.bind(observable);
+      const originalUnsubscribe = observable.unsubscribe.bind(observable);
+
       observable.subscribe = (observer) => {
         originalSubscribe(observer);
         this.#pendings.add(observer);
       };
 
+      observable.unsubscribe = (observer) => {
+        originalUnsubscribe(observer);
+        this.#pendings.delete(observer);
+      };
+
       return observable;
     });
   }
@@ -38,6 +45,8 @@ class Watcher extends Observable {
     if (typeof signal.next !== 'function') {
       signal.next = () => {
         return untrack(() => {
+          this.#pendings.add(signal);
+
           this.#notify();
         });
       };
@@ -52,6 +61,8 @@ class Watcher extends Observable {
       const originalNext = signal.next.bind(signal);
       signal.next = () => {
         return untrack(() => {
+          this.#pendings.add(signal);
+
           originalNext();
 
           this.#notify();
@@ -64,7 +75,20 @@ class Watcher extends Observable {
   }
 
   getPending() {
-    return Array.from(this.#pendings);
+    const pendings = Array.from(this.#pendings).map((pending) => {
+      const originalGet = pending.get.bind(pending);
+
+      pending.get = () => {
+        return untrack(() => {
+          this.#pendings.delete(pending);
+          return originalGet();
+        });
+      };
+
+      return pending;
+    });
+
+    return pendings;
   }
 
   unwatch(signal) {
@@ -79,14 +103,14 @@ let w = null;
 function createWatcher(notify) {
   w = new Watcher(notify);
 }
-
+let timer = null;
 createWatcher(() => {
   // TODO performance improvement
-  setTimeout(() => {
+
+  clearTimeout(timer);
+  timer = setTimeout(() => {
     getPending().forEach((pending) => {
-      untrack(() => {
-        pending.get();
-      });
+      pending.get();
     });
   }, 0);
 });
@@ -117,6 +141,8 @@ class Computed extends Observer {
     this.#callback = callback;
     this.#options = options;
 
+    this.debug = options?.debug;
+
     this.get = this.get.bind(this);
   }
 
@@ -208,7 +234,7 @@ function computed(callback, options) {
   return instance;
 }
 
-function effect(callback) {
+function effect(callback, options) {
   let destructor;
 
   let c = computed(
@@ -216,7 +242,7 @@ function effect(callback) {
       destructor?.();
       destructor = callback();
     },
-    { equals: () => false },
+    { equals: () => false, debug: 'effect', ...options },
   );
   c.get();
 

package/dist/index.js

@@ -1 +1 @@
-'use strict';var observable=require('@esmj/observable');var r=null;function h(n){let t=r;r=null;let e=n();return r=t,e}var x=Symbol("internal observable"),c=Symbol("original next"),f=class extends observable.Observable{#t=new Set;#e=null;constructor(t){super(),this.#e=t,this.pipe(e=>{let s=e.subscribe.bind(e);return e.subscribe=i=>{s(i),this.#t.add(i);},e});}watch(t){if(typeof t.next!="function"&&(t.next=()=>h(()=>{this.#e();}),t.next[c]=void 0),t instanceof o&&t.next[c]===void 0){let e=t.next.bind(t);t.next=()=>h(()=>{e(),this.#e();}),t.next[c]=e;}return this.subscribe(t)}getPending(){return Array.from(this.#t)}unwatch(t){return t.next=t.next[c],this.unsubscribe(t)}},u=null;function w(n){u=new f(n);}w(()=>{setTimeout(()=>{y().forEach(n=>{h(()=>{n.get();});});},0);});function y(){return u.getPending()}function g(n){return u.watch(n)}function m(n){return u.unwatch(n)}var o=class extends observable.Observer{#t=!0;#e=null;#n=null;#r=this.#u();#s=null;#i=null;constructor(t,e){super(),this.#s=t,this.#i=e,this.get=this.get.bind(this);}#o(){Array.from(this.#r.dependencies.values()).forEach(({unsubscribe:t})=>{t();}),this.#r.dependencies.clear();}#u(){return {dependencies:new Map,observer:this}}#h(){this.#e=r,r=this.#r;}#f(){r=this.#e;}next(){this.#t=!0,this.#n[x].next();}get(){return this.#n||(this.#n=d(this.#c(),this.#i)),this.#t&&this.#c(),this.#n.get()}#c(){this.#t=!1,this.#o(),this.#h();let t;try{t=this.#s();}catch(e){t=e;}if(this.#f(),t instanceof Promise&&(t=t.then(e=>e).catch(e=>{throw e})),this.#n&&this.#n.set(t),t instanceof Error)throw t;return t}};function E(n,t){return new o(n,t)}function P(n){let t,e=E(()=>{t?.(),t=n();},{equals:()=>!1});return e.get(),g(e),()=>{t?.(),m(e);}}function d(n,t={}){let e=t?.equals??Object.is,s=new observable.Observable;function i(){if(typeof r=="object"&&r!==null&&r.dependencies.set(s,s.subscribe(r.observer)),n instanceof Error)throw n;return n}function b(l){return e(n,l)||(n=l,s.next()),n}return {get:i,set:b,[x]:s}}var S=d;exports.computed=E;exports.createSignal=d;exports.createWatcher=w;exports.effect=P;exports.getPending=y;exports.state=S;exports.untrack=h;exports.unwatch=m;exports.watch=g;
+'use strict';var observable=require('@esmj/observable');var i=null;function f(n){let t=i;i=null;let e=n();return i=t,e}var b=Symbol("internal observable"),c=Symbol("original next"),d=class extends observable.Observable{#t=new Set;#e=null;constructor(t){super(),this.#e=t,this.pipe(e=>{let r=e.subscribe.bind(e),h=e.unsubscribe.bind(e);return e.subscribe=s=>{r(s),this.#t.add(s);},e.unsubscribe=s=>{h(s),this.#t.delete(s);},e});}watch(t){if(typeof t.next!="function"&&(t.next=()=>f(()=>{this.#t.add(t),this.#e();}),t.next[c]=void 0),t instanceof u&&t.next[c]===void 0){let e=t.next.bind(t);t.next=()=>f(()=>{this.#t.add(t),e(),this.#e();}),t.next[c]=e;}return this.subscribe(t)}getPending(){return Array.from(this.#t).map(e=>{let r=e.get.bind(e);return e.get=()=>f(()=>(this.#t.delete(e),r())),e})}unwatch(t){return t.next=t.next[c],this.unsubscribe(t)}},o=null;function g(n){o=new d(n);}var a=null;g(()=>{clearTimeout(a),a=setTimeout(()=>{m().forEach(n=>{n.get();});},0);});function m(){return o.getPending()}function y(n){return o.watch(n)}function E(n){return o.unwatch(n)}var u=class extends observable.Observer{#t=!0;#e=null;#n=null;#r=this.#o();#i=null;#s=null;constructor(t,e){super(),this.#i=t,this.#s=e,this.debug=e?.debug,this.get=this.get.bind(this);}#u(){Array.from(this.#r.dependencies.values()).forEach(({unsubscribe:t})=>{t();}),this.#r.dependencies.clear();}#o(){return {dependencies:new Map,observer:this}}#h(){this.#e=i,i=this.#r;}#f(){i=this.#e;}next(){this.#t=!0,this.#n[b].next();}get(){return this.#n||(this.#n=p(this.#c(),this.#s)),this.#t&&this.#c(),this.#n.get()}#c(){this.#t=!1,this.#u(),this.#h();let t;try{t=this.#i();}catch(e){t=e;}if(this.#f(),t instanceof Promise&&(t=t.then(e=>e).catch(e=>{throw e})),this.#n&&this.#n.set(t),t instanceof Error)throw t;return t}};function N(n,t){return new u(n,t)}function S(n,t){let e,r=N(()=>{e?.(),e=n();},{equals:()=>!1,debug:"effect",...t});return r.get(),y(r),()=>{e?.(),E(r);}}function p(n,t={}){let e=t?.equals??Object.is,r=new observable.Observable;function h(){if(typeof i=="object"&&i!==null&&i.dependencies.set(r,r.subscribe(i.observer)),n instanceof Error)throw n;return n}function s(l){return e(n,l)||(n=l,r.next()),n}return {get:h,set:s,[b]:r}}var A=p;exports.computed=N;exports.createSignal=p;exports.createWatcher=g;exports.effect=S;exports.getPending=m;exports.state=A;exports.untrack=f;exports.unwatch=E;exports.watch=y;

package/dist/index.mjs

@@ -1 +1 @@
-import {Observable,Observer}from'@esmj/observable';var r=null;function h(n){let t=r;r=null;let e=n();return r=t,e}var x=Symbol("internal observable"),c=Symbol("original next"),f=class extends Observable{#t=new Set;#e=null;constructor(t){super(),this.#e=t,this.pipe(e=>{let s=e.subscribe.bind(e);return e.subscribe=i=>{s(i),this.#t.add(i);},e});}watch(t){if(typeof t.next!="function"&&(t.next=()=>h(()=>{this.#e();}),t.next[c]=void 0),t instanceof o&&t.next[c]===void 0){let e=t.next.bind(t);t.next=()=>h(()=>{e(),this.#e();}),t.next[c]=e;}return this.subscribe(t)}getPending(){return Array.from(this.#t)}unwatch(t){return t.next=t.next[c],this.unsubscribe(t)}},u=null;function w(n){u=new f(n);}w(()=>{setTimeout(()=>{y().forEach(n=>{h(()=>{n.get();});});},0);});function y(){return u.getPending()}function g(n){return u.watch(n)}function m(n){return u.unwatch(n)}var o=class extends Observer{#t=!0;#e=null;#n=null;#r=this.#u();#s=null;#i=null;constructor(t,e){super(),this.#s=t,this.#i=e,this.get=this.get.bind(this);}#o(){Array.from(this.#r.dependencies.values()).forEach(({unsubscribe:t})=>{t();}),this.#r.dependencies.clear();}#u(){return {dependencies:new Map,observer:this}}#h(){this.#e=r,r=this.#r;}#f(){r=this.#e;}next(){this.#t=!0,this.#n[x].next();}get(){return this.#n||(this.#n=d(this.#c(),this.#i)),this.#t&&this.#c(),this.#n.get()}#c(){this.#t=!1,this.#o(),this.#h();let t;try{t=this.#s();}catch(e){t=e;}if(this.#f(),t instanceof Promise&&(t=t.then(e=>e).catch(e=>{throw e})),this.#n&&this.#n.set(t),t instanceof Error)throw t;return t}};function E(n,t){return new o(n,t)}function P(n){let t,e=E(()=>{t?.(),t=n();},{equals:()=>!1});return e.get(),g(e),()=>{t?.(),m(e);}}function d(n,t={}){let e=t?.equals??Object.is,s=new Observable;function i(){if(typeof r=="object"&&r!==null&&r.dependencies.set(s,s.subscribe(r.observer)),n instanceof Error)throw n;return n}function b(l){return e(n,l)||(n=l,s.next()),n}return {get:i,set:b,[x]:s}}var S=d;export{E as computed,d as createSignal,w as createWatcher,P as effect,y as getPending,S as state,h as untrack,m as unwatch,g as watch};
+import {Observable,Observer}from'@esmj/observable';var i=null;function f(n){let t=i;i=null;let e=n();return i=t,e}var b=Symbol("internal observable"),c=Symbol("original next"),d=class extends Observable{#t=new Set;#e=null;constructor(t){super(),this.#e=t,this.pipe(e=>{let r=e.subscribe.bind(e),h=e.unsubscribe.bind(e);return e.subscribe=s=>{r(s),this.#t.add(s);},e.unsubscribe=s=>{h(s),this.#t.delete(s);},e});}watch(t){if(typeof t.next!="function"&&(t.next=()=>f(()=>{this.#t.add(t),this.#e();}),t.next[c]=void 0),t instanceof u&&t.next[c]===void 0){let e=t.next.bind(t);t.next=()=>f(()=>{this.#t.add(t),e(),this.#e();}),t.next[c]=e;}return this.subscribe(t)}getPending(){return Array.from(this.#t).map(e=>{let r=e.get.bind(e);return e.get=()=>f(()=>(this.#t.delete(e),r())),e})}unwatch(t){return t.next=t.next[c],this.unsubscribe(t)}},o=null;function g(n){o=new d(n);}var a=null;g(()=>{clearTimeout(a),a=setTimeout(()=>{m().forEach(n=>{n.get();});},0);});function m(){return o.getPending()}function y(n){return o.watch(n)}function E(n){return o.unwatch(n)}var u=class extends Observer{#t=!0;#e=null;#n=null;#r=this.#o();#i=null;#s=null;constructor(t,e){super(),this.#i=t,this.#s=e,this.debug=e?.debug,this.get=this.get.bind(this);}#u(){Array.from(this.#r.dependencies.values()).forEach(({unsubscribe:t})=>{t();}),this.#r.dependencies.clear();}#o(){return {dependencies:new Map,observer:this}}#h(){this.#e=i,i=this.#r;}#f(){i=this.#e;}next(){this.#t=!0,this.#n[b].next();}get(){return this.#n||(this.#n=p(this.#c(),this.#s)),this.#t&&this.#c(),this.#n.get()}#c(){this.#t=!1,this.#u(),this.#h();let t;try{t=this.#i();}catch(e){t=e;}if(this.#f(),t instanceof Promise&&(t=t.then(e=>e).catch(e=>{throw e})),this.#n&&this.#n.set(t),t instanceof Error)throw t;return t}};function N(n,t){return new u(n,t)}function S(n,t){let e,r=N(()=>{e?.(),e=n();},{equals:()=>!1,debug:"effect",...t});return r.get(),y(r),()=>{e?.(),E(r);}}function p(n,t={}){let e=t?.equals??Object.is,r=new Observable;function h(){if(typeof i=="object"&&i!==null&&i.dependencies.set(r,r.subscribe(i.observer)),n instanceof Error)throw n;return n}function s(l){return e(n,l)||(n=l,r.next()),n}return {get:h,set:s,[b]:r}}var A=p;export{N as computed,p as createSignal,g as createWatcher,S as effect,m as getPending,A as state,f as untrack,E as unwatch,y as watch};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esmj/signals",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Tiny reactive signals.",
   "keywords": [
     "signals",
@@ -20,7 +20,7 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "lint:cmd": "eslint -c ./.eslintrc.js --ignore-path ./.prettierignore  --no-eslintrc",
-    "lint": "npm run lint:cmd -- 'src/**/*.ts'",
+    "lint": "npm run lint:cmd -- 'src/**/*.mjs' 'src/*.mjs'",
     "lint:fix": "npm run lint -- --fix",
     "dev": "node_modules/.bin/tsup --dts --watch --onSuccess 'node ./dist/index.mjs'",
     "test": "node --test",
@@ -79,6 +79,6 @@
     "tsup": "^8.3.5"
   },
   "dependencies": {
-    "@esmj/observable": "^0.1.1"
+    "@esmj/observable": "^0.2.2"
   }
 }