bansa 0.0.12 → 0.0.14

package/dist/index.browser.js

@@ -1 +1 @@
-var i=function(){};i.prototype.get=function(){if(this.o||(I(this),V(this)),this.state.promise)throw this.state.promise;if(this.state.error)throw this.state.error;return this.state.value};i.prototype.watch=function(e){return this.o||x(this),(this.i??=new Set).add(e),()=>{this.i.delete(e),this.i.size||V(this)}};i.prototype.subscribe=function(e){let t={y:e,c:{get signal(){return(t.t??=_()).signal}}};if(!this.o)x(this);else if(!this.state.promise&&!this.state.error)try{e(this.state.value,t.c)}catch(o){y(o)}return(this.s??=new Set).add(t),()=>{this.s.delete(t),t.t&&(t.t.abort(),t.t=void 0),this.s.size||V(this)}};i.prototype[Symbol.toPrimitive]=function(){return this.state.value};var c=function(e,t){this.u=e,this.f=t?.equals,this.state={promise:void 0,error:void 0,value:e},this.state.value=this.a=e};c.prototype.set=function(e){let t=e instanceof Function?e(this.a):e;S(t,this.state.value,this.f)||(this.a=t,d(this))};c.prototype.m=!0;c.prototype.o=!0;c.prototype.n=!1;Object.setPrototypeOf(c.prototype,i.prototype);var f=function(e,t){this.u=e,this.f=t?.equals,this.h=t?.persist,this.state={promise:P,error:void 0,value:void 0};let o=this;this.c={get signal(){return(o.t??=_()).signal}}};f.prototype.m=!1;f.prototype.o=!1;f.prototype.n=!1;f.prototype.l=0;Object.setPrototypeOf(f.prototype,i.prototype);var A=()=>A,D=()=>{};Object.setPrototypeOf(A,new Proxy(A,{get:(e,t)=>t===Symbol.toPrimitive?D:A}));var P=Promise.resolve(),m=(e,t)=>e instanceof Function?new f(e,t):new c(e,t),C=e=>m((t,o)=>{let r,n,a=e((s,h)=>{try{return t(s,h)}catch(l){if(!l)throw l;w(l)?(r??=[]).push(l):n=l}return A},o);if(n)throw n;if(r)throw Promise.all(r);return a},{equals:q}),L=(e,t)=>{let o=new WeakMap;if(t)for(let[n,a]of t)o.set(n,a instanceof i?a:m(a));let r=((n,a=!0)=>{let s=o.get(n);return a&&!(s||e&&(s=e(n,!1)))&&o.set(n,s=n.u instanceof Function?m((h,l)=>n.u((O,G)=>h(r(O),G),l)):m(n.u)),s});return r},q=(e,t)=>{if(typeof e!="object"||typeof t!="object"||!e||!t)return!1;let o=e.constructor;if(o!==t.constructor)return!1;if(o===Array){let n=e.length;if(n!==t.length)return!1;for(;(n=n-1|0)>=0;)if(!Object.is(e[n],t[n]))return!1;return!0}let r=0;for(let n in e){if(!(n in t&&Object.is(e[n],t[n])))return!1;r=r+1|0}for(let n in t)if((r=r-1|0)<0)return!1;return!0},b=!1,u=[],x=e=>{e.p||(e.p=!0,d(e))},d=e=>{e.n||(e.n=!0,u.push(e),b||(b=!0,queueMicrotask(T)))},T=()=>{b=!1;{let t=u;u=[];for(let o of t)o.state.promise=void 0,o.state.error=o.A,o.state.value=o.a,k(o)}let e=u;u=[];for(let t=e.length;t--;){let o=e[t];o.d=!1,o.p&&(o.n=!0,I(o)),o.n&&g(o)}},g=e=>{if(e.n=!1,e.r)for(let t of e.r)t.p=!0;if(e.i)for(let t of e.i)t();if(e.s&&!e.state.promise&&!e.state.error)for(let t of e.s){t.t&&(t.t.abort(),t.t=void 0);try{t.y(e.state.value,t.c)}catch(o){y(o)}}},k=e=>{if(!e.d){if(e.d=!0,e.r)for(let t of e.r)k(t);u.push(e)}},p=class{e;constructor(t){this.e=t}},I=e=>{let t=++e.l;e.o=!0,e.p=!1,e.state.promise=void 0,e.t&&(e.t.abort(),e.t=void 0);let o=e.V;o&&(e.V=new Set);try{let r=e.u((n,a=!0)=>{if(t!==e.l)throw void 0;if(e!==n&&(n.o||(I(n),n.n&&(n.n=!1,g(n))),o?.delete(n),(e.V??=new Set).add(n),(n.r??=new Set).add(e)),!a)return n.state;if(n.state.promise)throw new p(n.state.promise);if(n.state.error)throw new p(n.state.error);return n.state.value},e.c);w(r)?(e.state.promise=r,r.then(n=>{t===e.l&&(S(n,e.state.value,e.f)?e.state.promise=void 0:(e.a=n,e.A=void 0,d(e)))},n=>{t===e.l&&(n instanceof Promise?e.state.promise=void 0:(n instanceof p?n=n.e:y(n),e.A=n,d(e)))})):(++e.l,e.state.error=void 0,S(r,e.state.value,e.f)?e.n=!1:e.state.value=e.a=r)}catch(r){++e.l,r?(r instanceof p?r=r.e:y(r),w(r)?e.state.promise=r:e.state.error=r):e.n=!1}if(o)for(let r of o)r.r.delete(e),V(r)},v=!1,V=e=>{if(!e.m&&!e.h&&!e.r?.size&&!e.i?.size&&!e.s?.size){if(!v){setTimeout(()=>{v=!0,V(e),v=!1},0);return}if(e.state.promise=P,e.a=e.A=e.state.error=e.state.value=void 0,e.n=e.p=e.o=!1,e.t&&(e.t.abort(),e.t=void 0),e.V){for(let t of e.V)t.r.delete(e),V(t);e.V.clear()}}},S=(e,t,o)=>Object.is(e,t)||o!==void 0&&t!==void 0&&o(e,t),w=e=>typeof e?.then=="function",_=()=>{let e=new AbortController,t=e.signal,o=new Promise(r=>{t.then=n=>o.then(n),t.addEventListener("abort",r,{once:!0,passive:!0})});return{abort:()=>e.abort(),signal:t}},y=e=>{queueMicrotask(()=>{throw e})};export{m as $,C as $$,L as createScope,P as inactive};
+var d=class{r;p;a;o;l;get(){if(this.s||(I(this),u(this)),this.state.error)throw this.state.error;if(this.state.promise)throw this.state.promise;return this.state.value}watch(t){return this.s||k(this),(this.o||=new Set).add(t),()=>{this.o.delete(t),this.o.size||u(this)}}subscribe(t){let a={h:t,A:{get signal(){return(a.t||=q()).signal}}};if(!this.s)k(this);else if(!this.state.error&&!this.state.promise)try{t(this.state.value,a.A)}catch(n){V(n)}return(this.l||=new Set).add(a),()=>{this.l.delete(a),a.t&&(a.t.abort(),a.t=void 0),this.l.size||u(this)}}[Symbol.toPrimitive](){return this.state.value}},i=class extends d{n=!1;m=!1;constructor(t,a){super(),this.d=t,this.V=a?.equals,this.r=t,this.state={promise:void 0,error:void 0,value:t}}set(t){let a=t instanceof Function?t(this.r):t;x(a,this.state.value,this.V)||(this.r=a,y(this))}};i.prototype.y=!0;i.prototype.s=!0;i.prototype.u=!1;var m=class extends d{s=!1;u=!1;n=!1;m=!1;f=0;t;i;c;constructor(t,a){super(),this.d=t,this.V=a?.equals,this.b=!!a?.persist;let n=this;this.A={get signal(){return(n.t||=q()).signal}},this.state={promise:g,error:void 0,value:void 0}}};m.prototype.y=!1;var c=()=>c,_=()=>{};Object.setPrototypeOf(c,new Proxy(c,{get:(e,t)=>t===Symbol.toPrimitive?_:c}));var g=Promise.reject();g.catch(_);var A=(e,t)=>e instanceof Function?new m(e,t):new i(e,t),M=e=>A((t,a)=>{let n,r,l=e(f=>{let o=t(f,!1);if(o.error)r=o.error;else if(o.promise)(n||=[]).push(o.promise);else return o.value;return c},a);if(r)throw r;if(n)throw Promise.all(n);return l},{equals:L}),W=(e,t)=>{let a=new WeakMap;if(t)for(let[r,l]of t)a.set(r,l instanceof d?l:A(l));let n=(r=>{let l=a.get(r);if(!l){let f=e?.(r),o=f||r;a.set(r,l=o.d instanceof Function?A((D,T)=>o.d((E,K)=>D(n(E),K),T),{equals:o.V,persist:o.b}):f||A(o.d))}return l});return n},L=(e,t)=>{if(typeof e!="object"||typeof t!="object"||!e||!t)return!1;let a=e.constructor;if(a!==t.constructor)return!1;if(a===Array){let r=e.length;if(r!==t.length)return!1;for(;(r=r-1|0)>=0;)if(!Object.is(e[r],t[r]))return!1;return!0}let n=0;for(let r in e){if(!(r in t&&Object.is(e[r],t[r])))return!1;n=n+1|0}for(let r in t)if((n=n-1|0)<0)return!1;return!0},b=!1,h=[],v=[],k=e=>{e.u||(e.u=!0,y(e))},y=e=>{e.n||(e.n=!0,h.push(e),b||(b=!0,queueMicrotask(j)))},j=()=>{b=!1;{let t=h;h=[];for(let a of t)a.state.promise=void 0,a.state.error=a.p,a.state.value=a.r,O(a)}let e=v;v=[];for(let t=e.length;t--;){let a=e[t];a.m=!1,a.u&&(a.n=!0,I(a)),a.n&&G(a)}},G=e=>{if(e.n=!1,e.o)for(let t of e.o)try{t()}catch(a){V(a)}if(!e.state.error&&!e.state.promise){if(e.l)for(let t of e.l){t.t&&(t.t.abort(),t.t=void 0);try{t.h(e.state.value,t.A)}catch(a){V(a)}}if(e.a)for(let t of e.a)t.u=!0}},O=e=>{if(!e.m){if(e.m=!0,e.a)for(let t of e.a)O(t);v.push(e)}},s=class{e;constructor(t){this.e=t}},P=Symbol(),I=e=>{let t=++e.f;e.s=!0,e.u=!1,e.state.promise=void 0,e.t&&(e.t.abort(),e.t=void 0);try{let a=e.d((n,r=!0)=>{if(t!==e.f)throw P;if(e!==n&&(n.s||(I(n),n.n&&G(n)),(e.c||=new Set).add(n),(n.a||=new Set).add(e)),!r)return n.state;if(n.state.error)throw new s(n.state.error);if(n.state.promise)throw new s(n.state.promise);return n.state.value},e.A);C(a)?(e.state.promise=a,a.then(n=>{t===e.f&&(p(e),x(n,e.state.value,e.V)?e.state.promise=void 0:(e.r=n,e.p=void 0),y(e))},n=>{t===e.f&&(p(e),n instanceof s?n=n.e:V(n),e.p=n,y(e))})):(p(e),e.state.error=void 0,x(a,e.state.value,e.V)?e.n=!1:e.state.value=e.r=a)}catch(a){p(e),a===P?e.n=!1:(a instanceof s?a=a.e:V(a),e.state.error=a)}},p=e=>{++e.f;let t=e.i;if(e.i=e.c,t){for(let a of t)e.i?.has(a)||(a.a.delete(e),u(a));t.clear()}e.c=t},S=!1,w=new Set,u=e=>{!e.y&&!e.b&&!e.a?.size&&!e.o?.size&&!e.l?.size&&(w.add(e),S||(S=!0,setTimeout(z,0)))},z=()=>{for(let e of w)if(!e.y&&!e.b&&!e.a?.size&&!e.o?.size&&!e.l?.size&&(e.state.promise=g,e.r=e.p=e.state.error=e.state.value=void 0,e.n=e.u=e.s=!1,e.t&&(e.t.abort(),e.t=void 0),e.i)){for(let t of e.i)t.a.delete(e),u(t);if(e.i.clear(),e.c){for(let t of e.c)t.a.delete(e),u(t);e.c.clear()}}w.clear(),S=!1},x=(e,t,a)=>Object.is(e,t)||a!==void 0&&t!==void 0&&a(e,t),C=e=>typeof e?.then=="function",q=()=>{let e=new AbortController,t=e.signal,a=new Promise(n=>{t.then=r=>a.then(r),t.addEventListener("abort",n,{once:!0,passive:!0})});return{abort:()=>e.abort(),signal:t}},V=e=>{queueMicrotask(()=>{throw e})};export{A as $,M as $$,W as createScope,g as inactive};

package/dist/index.d.ts

@@ -71,9 +71,9 @@ export type AtomScope = {
 };
 export type SetLike<Key> = Key[] | Set<Key> | (Key extends object ? WeakSet<Key> : never);
 export type MapLike<Key, Value> = Map<Key, Value> | (Key extends object ? WeakMap<Key, Value> : never) | (Key extends string | number | symbol ? Record<Key, Value> : never);
-export declare const inactive: Promise<void>;
+export declare const inactive: Promise<never>;
 export declare const $: CreateAtom;
 export declare const $$: <Value>(init: AtomGetter<Value>) => DerivedAtom<Value>;
-export type AtomValuePair<Value> = [Atom<Value>, Value | Atom<Value>];
-export declare const createScope: (parentScope?: AtomScope | null, atomValuePairs?: AtomValuePair<unknown>[]) => AtomScope;
+export type AtomValuePair<Value> = [Atom<Value>, Value | PrimitiveAtom<Value>] | [DerivedAtom<Value>, Value | Atom<Value>];
+export declare const createScope: <T extends AtomValuePair<unknown>[]>(parentScope?: AtomScope | null, atomValuePairs?: T) => AtomScope;
 export {};

package/dist/index.js

@@ -1,104 +1,117 @@
-const AtomPrototype = function() {
-};
-AtomPrototype.prototype.get = function() {
-  if (!this.c) {
-    execute(this);
-    disableAtom(this);
-  }
-  if (this.state.promise) throw this.state.promise;
-  if (this.state.error) throw this.state.error;
-  return this.state.value;
-};
-AtomPrototype.prototype.watch = function(watcher) {
-  if (!this.c) {
-    requestActivate(this);
-  }
-  (this.h ??= /* @__PURE__ */ new Set()).add(watcher);
-  return () => {
-    this.h.delete(watcher);
-    if (!this.h.size) {
+class CommonAtomInternal {
+  d;
+  o;
+  b;
+  f;
+  g;
+  get() {
+    if (!this.h) {
+      execute(this);
       disableAtom(this);
     }
-  };
-};
-AtomPrototype.prototype.subscribe = function(subscriber) {
-  const atomSubscriber = {
-    r: subscriber,
-    m: {
-      get signal() {
-        return (atomSubscriber.a ??= createThenableSignal()).signal;
-      }
-    }
-  };
-  if (!this.c) {
-    requestActivate(this);
-  } else if (!this.state.promise && !this.state.error) {
-    try {
-      subscriber(this.state.value, atomSubscriber.m);
-    } catch (e) {
-      logError(e);
-    }
+    if (this.state.error) throw this.state.error;
+    if (this.state.promise) throw this.state.promise;
+    return this.state.value;
   }
-  (this.i ??= /* @__PURE__ */ new Set()).add(atomSubscriber);
-  return () => {
-    this.i.delete(atomSubscriber);
-    if (atomSubscriber.a) {
-      atomSubscriber.a.abort();
-      atomSubscriber.a = void 0;
+  watch(watcher) {
+    if (!this.h) {
+      requestActivate(this);
     }
-    if (!this.i.size) {
-      disableAtom(this);
+    (this.f ||= /* @__PURE__ */ new Set()).add(watcher);
+    return () => {
+      this.f.delete(watcher);
+      if (!this.f.size) {
+        disableAtom(this);
+      }
+    };
+  }
+  subscribe(subscriber) {
+    const atomSubscriber = {
+      t: subscriber,
+      p: {
+        get signal() {
+          return (atomSubscriber.a ||= createThenableSignal()).signal;
+        }
+      }
+    };
+    if (!this.h) {
+      requestActivate(this);
+    } else if (!this.state.error && !this.state.promise) {
+      try {
+        subscriber(this.state.value, atomSubscriber.p);
+      } catch (e) {
+        logError(e);
+      }
     }
-  };
-};
-AtomPrototype.prototype[Symbol.toPrimitive] = function() {
-  return this.state.value;
-};
-const PrimitiveAtomPrototype = function(init, options) {
-  this.j = init;
-  this.n = options?.equals;
-  this.state = {
-    promise: void 0,
-    error: void 0,
-    value: init
-  };
-  this.state.value = this.f = init;
-};
-PrimitiveAtomPrototype.prototype.set = function(value) {
-  const nextValue = value instanceof Function ? value(this.f) : value;
-  if (!equals(nextValue, this.state.value, this.n)) {
-    this.f = nextValue;
-    requestPropagate(this);
+    (this.g ||= /* @__PURE__ */ new Set()).add(atomSubscriber);
+    return () => {
+      this.g.delete(atomSubscriber);
+      if (atomSubscriber.a) {
+        atomSubscriber.a.abort();
+        atomSubscriber.a = void 0;
+      }
+      if (!this.g.size) {
+        disableAtom(this);
+      }
+    };
   }
-};
-PrimitiveAtomPrototype.prototype.p = true;
-PrimitiveAtomPrototype.prototype.c = true;
-PrimitiveAtomPrototype.prototype.b = false;
-Object.setPrototypeOf(
-  PrimitiveAtomPrototype.prototype,
-  AtomPrototype.prototype
-);
-const DerivedAtomPrototype = function(init, options) {
-  this.j = init;
-  this.n = options?.equals;
-  this.s = options?.persist;
-  this.state = {
-    promise: inactive,
-    error: void 0,
-    value: void 0
-  };
-  const self = this;
-  this.m = {
-    get signal() {
-      return (self.a ??= createThenableSignal()).signal;
+  [Symbol.toPrimitive]() {
+    return this.state.value;
+  }
+}
+class PrimitiveAtomInternal extends CommonAtomInternal {
+  c = false;
+  q = false;
+  constructor(init, options) {
+    super();
+    this.l = init;
+    this.m = options?.equals;
+    this.d = init;
+    this.state = {
+      promise: void 0,
+      error: void 0,
+      value: init
+    };
+  }
+  set(value) {
+    const nextValue = value instanceof Function ? value(this.d) : value;
+    if (!equals(nextValue, this.state.value, this.m)) {
+      this.d = nextValue;
+      requestPropagate(this);
     }
-  };
-};
-DerivedAtomPrototype.prototype.p = false;
-DerivedAtomPrototype.prototype.c = false;
-DerivedAtomPrototype.prototype.b = false;
-DerivedAtomPrototype.prototype.g = 0;
-Object.setPrototypeOf(DerivedAtomPrototype.prototype, AtomPrototype.prototype);
+  }
+}
+PrimitiveAtomInternal.prototype.r = true;
+PrimitiveAtomInternal.prototype.h = true;
+PrimitiveAtomInternal.prototype.i = false;
+class DerivedAtomInternal extends CommonAtomInternal {
+  h = false;
+  i = false;
+  c = false;
+  q = false;
+  n = 0;
+  a;
+  j;
+  k;
+  constructor(init, options) {
+    super();
+    this.l = init;
+    this.m = options?.equals;
+    this.s = !!options?.persist;
+    const self = this;
+    this.p = {
+      get signal() {
+        return (self.a ||= createThenableSignal()).signal;
+      }
+    };
+    this.state = {
+      promise: inactive,
+      error: void 0,
+      value: void 0
+    };
+  }
+}
+DerivedAtomInternal.prototype.r = false;
 const ouroboros = () => ouroboros;
 const toUndefined = () => void 0;
 Object.setPrototypeOf(
@@ -107,28 +120,21 @@ Object.setPrototypeOf(
     get: (_, k) => k === Symbol.toPrimitive ? toUndefined : ouroboros
   })
 );
-const inactive = Promise.resolve();
+const inactive = Promise.reject();
+inactive.catch(toUndefined);
 const $ = (init, options) => {
   if (init instanceof Function)
-    return new DerivedAtomPrototype(init, options);
-  return new PrimitiveAtomPrototype(init, options);
+    return new DerivedAtomInternal(init, options);
+  return new PrimitiveAtomInternal(init, options);
 };
 const $$ = (init) => $((get, options) => {
   let promises;
   let error;
-  const result = init((atom, unwrap) => {
-    try {
-      return get(atom, unwrap);
-    } catch (e) {
-      if (!e) {
-        throw e;
-      }
-      if (isPromiseLike(e)) {
-        (promises ??= []).push(e);
-      } else {
-        error = e;
-      }
-    }
+  const result = init((atom) => {
+    const state = get(atom, false);
+    if (state.error) error = state.error;
+    else if (state.promise) (promises ||= []).push(state.promise);
+    else return state.value;
     return ouroboros;
   }, options);
   if (error) throw error;
@@ -141,15 +147,25 @@ const createScope = (parentScope, atomValuePairs) => {
   const scopeMap = /* @__PURE__ */ new WeakMap();
   if (atomValuePairs) {
     for (const [atom, value] of atomValuePairs) {
-      scopeMap.set(atom, value instanceof AtomPrototype ? value : $(value));
+      scopeMap.set(atom, value instanceof CommonAtomInternal ? value : $(value));
     }
   }
-  const scope = ((baseAtom, create = true) => {
+  const scope = ((baseAtom) => {
     let scopedAtom = scopeMap.get(baseAtom);
-    if (create && !(scopedAtom || parentScope && (scopedAtom = parentScope(baseAtom, false)))) scopeMap.set(baseAtom, scopedAtom = baseAtom.j instanceof Function ? $((get, options) => baseAtom.j(
-      (atom, unwrap) => get(scope(atom), unwrap),
-      options
-    )) : $(baseAtom.j));
+    if (!scopedAtom) {
+      const parentAtom = parentScope?.(baseAtom);
+      const realBaseAtom = parentAtom || baseAtom;
+      scopeMap.set(
+        baseAtom,
+        scopedAtom = realBaseAtom.l instanceof Function ? $((get, options) => realBaseAtom.l(
+          (atom, unwrap) => get(scope(atom), unwrap),
+          options
+        ), {
+          equals: realBaseAtom.m,
+          persist: realBaseAtom.s
+        }) : parentAtom || $(realBaseAtom.l)
+      );
+    }
     return scopedAtom;
   });
   return scope;
@@ -173,17 +189,18 @@ const shallowEquals = (a, b) => {
   return true;
 };
 let pendingUpdateAtoms = false;
+let updateQueue = [];
 let stack = [];
 const requestActivate = (atom) => {
-  if (!atom.k) {
-    atom.k = true;
+  if (!atom.i) {
+    atom.i = true;
     requestPropagate(atom);
   }
 };
 const requestPropagate = (atom) => {
-  if (!atom.b) {
-    atom.b = true;
-    stack.push(atom);
+  if (!atom.c) {
+    atom.c = true;
+    updateQueue.push(atom);
     if (!pendingUpdateAtoms) {
       pendingUpdateAtoms = true;
       queueMicrotask(updateAtoms);
@@ -193,12 +210,12 @@ const requestPropagate = (atom) => {
 const updateAtoms = () => {
   pendingUpdateAtoms = false;
   {
-    const updatedAtoms = stack;
-    stack = [];
+    const updatedAtoms = updateQueue;
+    updateQueue = [];
     for (const atom of updatedAtoms) {
       atom.state.promise = void 0;
       atom.state.error = atom.o;
-      atom.state.value = atom.f;
+      atom.state.value = atom.d;
       mark(atom);
     }
   }
@@ -207,46 +224,52 @@ const updateAtoms = () => {
   for (let i = markedAtoms.length; i--; ) {
     const atom = markedAtoms[i];
     atom.q = false;
-    if (atom.k) {
-      atom.b = true;
+    if (atom.i) {
+      atom.c = true;
       execute(atom);
     }
-    if (atom.b) {
+    if (atom.c) {
       propagate(atom);
     }
   }
 };
 const propagate = (atom) => {
-  atom.b = false;
-  if (atom.d) {
-    for (const child of atom.d) {
-      child.k = true;
-    }
-  }
-  if (atom.h) {
-    for (const watcher of atom.h) {
-      watcher();
-    }
-  }
-  if (atom.i && !atom.state.promise && !atom.state.error) {
-    for (const subscriber of atom.i) {
-      if (subscriber.a) {
-        subscriber.a.abort();
-        subscriber.a = void 0;
-      }
+  atom.c = false;
+  if (atom.f) {
+    for (const watcher of atom.f) {
       try {
-        subscriber.r(atom.state.value, subscriber.m);
+        watcher();
       } catch (e) {
         logError(e);
       }
     }
   }
+  if (!atom.state.error && !atom.state.promise) {
+    if (atom.g) {
+      for (const subscriber of atom.g) {
+        if (subscriber.a) {
+          subscriber.a.abort();
+          subscriber.a = void 0;
+        }
+        try {
+          subscriber.t(atom.state.value, subscriber.p);
+        } catch (e) {
+          logError(e);
+        }
+      }
+    }
+    if (atom.b) {
+      for (const child of atom.b) {
+        child.i = true;
+      }
+    }
+  }
 };
 const mark = (atom) => {
   if (!atom.q) {
     atom.q = true;
-    if (atom.d) {
-      for (const child of atom.d) {
+    if (atom.b) {
+      for (const child of atom.b) {
         mark(child);
       }
     }
@@ -259,133 +282,144 @@ class Wrapped {
     this.e = e;
   }
 }
+const expired = Symbol();
 const execute = (atom) => {
-  const counter = ++atom.g;
-  atom.c = true;
-  atom.k = false;
+  const counter = ++atom.n;
+  atom.h = true;
+  atom.i = false;
   atom.state.promise = void 0;
   if (atom.a) {
     atom.a.abort();
     atom.a = void 0;
   }
-  const oldDependencies = atom.l;
-  if (oldDependencies) {
-    atom.l = /* @__PURE__ */ new Set();
-  }
   try {
-    const value = atom.j(
+    const value = atom.l(
       (anotherAtom, unwrap = true) => {
-        if (counter !== atom.g) throw void 0;
+        if (counter !== atom.n) throw expired;
         if (atom !== anotherAtom) {
-          if (!anotherAtom.c) {
+          if (!anotherAtom.h) {
             execute(anotherAtom);
-            if (anotherAtom.b) {
-              anotherAtom.b = false;
+            if (anotherAtom.c) {
               propagate(anotherAtom);
             }
           }
-          oldDependencies?.delete(anotherAtom);
-          (atom.l ??= /* @__PURE__ */ new Set()).add(anotherAtom);
-          (anotherAtom.d ??= /* @__PURE__ */ new Set()).add(atom);
+          (atom.k ||= /* @__PURE__ */ new Set()).add(anotherAtom);
+          (anotherAtom.b ||= /* @__PURE__ */ new Set()).add(atom);
         }
         if (!unwrap) return anotherAtom.state;
-        if (anotherAtom.state.promise)
-          throw new Wrapped(anotherAtom.state.promise);
         if (anotherAtom.state.error)
           throw new Wrapped(anotherAtom.state.error);
+        if (anotherAtom.state.promise)
+          throw new Wrapped(anotherAtom.state.promise);
         return anotherAtom.state.value;
       },
-      atom.m
+      atom.p
     );
     if (isPromiseLike(value)) {
       atom.state.promise = value;
       value.then(
         (value2) => {
-          if (counter === atom.g) {
-            if (equals(value2, atom.state.value, atom.n)) {
+          if (counter === atom.n) {
+            finalizeExecution(atom);
+            if (equals(value2, atom.state.value, atom.m)) {
               atom.state.promise = void 0;
             } else {
-              atom.f = value2;
+              atom.d = value2;
               atom.o = void 0;
-              requestPropagate(atom);
             }
+            requestPropagate(atom);
           }
         },
         (e) => {
-          if (counter === atom.g) {
-            if (e instanceof Promise) {
-              atom.state.promise = void 0;
+          if (counter === atom.n) {
+            finalizeExecution(atom);
+            if (e instanceof Wrapped) {
+              e = e.e;
             } else {
-              if (e instanceof Wrapped) {
-                e = e.e;
-              } else {
-                logError(e);
-              }
-              atom.o = e;
-              requestPropagate(atom);
+              logError(e);
             }
+            atom.o = e;
+            requestPropagate(atom);
           }
         }
       );
     } else {
-      ++atom.g;
+      finalizeExecution(atom);
       atom.state.error = void 0;
-      if (equals(value, atom.state.value, atom.n)) {
-        atom.b = false;
+      if (equals(value, atom.state.value, atom.m)) {
+        atom.c = false;
       } else {
-        atom.state.value = atom.f = value;
+        atom.state.value = atom.d = value;
       }
     }
   } catch (e) {
-    ++atom.g;
-    if (!e) {
-      atom.b = false;
+    finalizeExecution(atom);
+    if (e === expired) {
+      atom.c = false;
     } else {
       if (e instanceof Wrapped) {
         e = e.e;
       } else {
         logError(e);
       }
-      if (isPromiseLike(e)) {
-        atom.state.promise = e;
-      } else {
-        atom.state.error = e;
-      }
+      atom.state.error = e;
     }
   }
+};
+const finalizeExecution = (atom) => {
+  ++atom.n;
+  const oldDependencies = atom.j;
+  atom.j = atom.k;
   if (oldDependencies) {
     for (const dep of oldDependencies) {
-      dep.d.delete(atom);
-      disableAtom(dep);
+      if (!atom.j?.has(dep)) {
+        dep.b.delete(atom);
+        disableAtom(dep);
+      }
     }
+    oldDependencies.clear();
   }
+  atom.k = oldDependencies;
 };
-let disabling = false;
+let runningGc = false;
+let gcCandidates = /* @__PURE__ */ new Set();
 const disableAtom = (atom) => {
-  if (!atom.p && !atom.s && !atom.d?.size && !atom.h?.size && !atom.i?.size) {
-    if (!disabling) {
-      setTimeout(() => {
-        disabling = true;
-        disableAtom(atom);
-        disabling = false;
-      }, 0);
-      return;
-    }
-    atom.state.promise = inactive;
-    atom.f = atom.o = atom.state.error = atom.state.value = void 0;
-    atom.b = atom.k = atom.c = false;
-    if (atom.a) {
-      atom.a.abort();
-      atom.a = void 0;
+  if (!atom.r && !atom.s && !atom.b?.size && !atom.f?.size && !atom.g?.size) {
+    gcCandidates.add(atom);
+    if (!runningGc) {
+      runningGc = true;
+      setTimeout(gc, 0);
     }
-    if (atom.l) {
-      for (const dep of atom.l) {
-        dep.d.delete(atom);
-        disableAtom(dep);
+  }
+};
+const gc = () => {
+  for (const atom of gcCandidates) {
+    if (!atom.r && !atom.s && !atom.b?.size && !atom.f?.size && !atom.g?.size) {
+      atom.state.promise = inactive;
+      atom.d = atom.o = atom.state.error = atom.state.value = void 0;
+      atom.c = atom.i = atom.h = false;
+      if (atom.a) {
+        atom.a.abort();
+        atom.a = void 0;
+      }
+      if (atom.j) {
+        for (const dep of atom.j) {
+          dep.b.delete(atom);
+          disableAtom(dep);
+        }
+        atom.j.clear();
+        if (atom.k) {
+          for (const dep of atom.k) {
+            dep.b.delete(atom);
+            disableAtom(dep);
+          }
+          atom.k.clear();
+        }
       }
-      atom.l.clear();
     }
   }
+  gcCandidates.clear();
+  runningGc = false;
 };
 const equals = (value, prevValue, equalsFn) => Object.is(value, prevValue) || equalsFn !== void 0 && prevValue !== void 0 && equalsFn(value, prevValue);
 const isPromiseLike = (x) => typeof x?.then === "function";

package/dist/react.js

@@ -1,10 +1,10 @@
 import { jsx } from "react/jsx-runtime";
-import { createContext, use, useContext, useState, useSyncExternalStore } from "react";
+import { createContext, use, useContext, useMemo, useState, useSyncExternalStore } from "react";
 import { $, createScope } from ".";
 const ScopeContext = createContext((x) => x);
 const ScopeProvider = ({ value, children }) => {
   const parentScope = useContext(ScopeContext);
-  const scope = useState(() => createScope(parentScope, value))[0];
+  const scope = useMemo(() => createScope(parentScope, value), [parentScope]);
   return /* @__PURE__ */ jsx(ScopeContext.Provider, { value: scope, children });
 };
 const useAtomValue = (atom) => (atom = useContext(ScopeContext)(atom), useSyncExternalStore(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bansa",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",

package/tests/bansa.test.ts

@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { $, createScope, type ThenableSignal } from '../src/index';
+import { $, createScope, DerivedAtom, type ThenableSignal } from '../src/index';
 
 const flushMicrotasks = () =>
 	new Promise((resolve) => {
@@ -445,6 +445,92 @@ describe('Atom Library - Advanced Tests', () => {
 		expect(derivedAtom3.state.value).toEqual(undefined);
 	});
 
+	it('gc test', async () => {
+		const atom1 = $(10);
+
+		const metrics1 = { mounted: 0, unmounted: 0 };
+		const derivedAtom1 = $((get, { signal }) => {
+			metrics1.mounted++;
+			signal.then(() => {
+				metrics1.unmounted++;
+			});
+			return get(atom1);
+		});
+
+		const unsub = derivedAtom1.subscribe(nop);
+		await flushMicrotasks();
+		expect(metrics1).toEqual({ mounted: 1, unmounted: 0 });
+		expect(derivedAtom1.state.value).toEqual(10);
+
+		unsub();
+		await flushMicrotasks();
+		expect(metrics1).toEqual({ mounted: 1, unmounted: 0 });
+		expect(derivedAtom1.state.value).toEqual(10);
+
+		const unsub2 = derivedAtom1.subscribe(nop);
+		await flushMicrotasks();
+		expect(metrics1).toEqual({ mounted: 1, unmounted: 0 });
+		expect(derivedAtom1.state.value).toEqual(10);
+
+		atom1.set(20);
+		await flushMicrotasks();
+		expect(metrics1).toEqual({ mounted: 2, unmounted: 1 });
+		expect(derivedAtom1.state.value).toEqual(20);
+
+		unsub2();
+		await new Promise((r) => setTimeout(r, 10));
+		expect(metrics1).toEqual({ mounted: 2, unmounted: 2 });
+		expect(derivedAtom1.state.value).toEqual(undefined);
+
+		atom1.set(30);
+		await flushMicrotasks();
+		expect(metrics1).toEqual({ mounted: 2, unmounted: 2 });
+		expect(derivedAtom1.state.value).toEqual(undefined);
+	});
+
+	it('deep scope', async () => {
+		const $x1 = $(1);
+		const $x2 = $((get) => get($x1) + 1);
+		const $x3 = $((get) => get($x2) + 1);
+		const $x4 = $((get) => get($x3) + 1);
+		const $x5 = $((get) => get($x4) + 1);
+		const identity = (x: any) => x;
+		const scope0 = createScope(identity);
+		const scope1 = createScope(identity, [
+			[$x1, 11],
+		]);
+		const scope2 = createScope(identity, [
+			[$x2, 22],
+		]);
+
+		$x5.subscribe(nop);
+		await flushMicrotasks();
+
+		const $y0 = scope0($x5);
+		const $y1 = scope1($x5);
+		const $y2 = scope2($x5);
+
+		expect($x5.get()).toBe(5);
+		expect($y0.get()).toBe(5);
+		expect($y1.get()).toBe(15);
+		expect($y2.get()).toBe(25);
+
+		$x1.set(101);
+		await flushMicrotasks();
+		expect($x5.get()).toBe(105);
+		expect($y0.get()).toBe(105);
+		expect($y1.get()).toBe(15);
+		expect($y2.get()).toBe(25);
+
+		scope1($x1).set(201);
+		scope2($x1).set(201);
+		await flushMicrotasks();
+		expect($x5.get()).toBe(205);
+		expect($y0.get()).toBe(205);
+		expect($y1.get()).toBe(205);
+		expect($y2.get()).toBe(25);
+	});
+
 	it('should not provide stale values to conditional dependents', async () => {
 		const dataAtom = $([100]);
 		const hasFilterAtom = $(false);
@@ -550,26 +636,30 @@ describe('Atom Library - Advanced Tests', () => {
 			await new Promise<void>((r) => (resolve = r));
 			return count;
 		});
-		const async2Atom = $((get) => get(asyncAtom));
-		const async3Atom = $((get) => get(async2Atom));
+		const async2Atom = $((get) => get(asyncAtom) % 3);
+		const mockFn = vi.fn((get: (atom: DerivedAtom<number>) => any) => get(async2Atom));
+		const async3Atom = $(mockFn);
 
 		async3Atom.subscribe(nop);
 		await flushMicrotasks();
 		resolve();
 		await flushMicrotasks();
-		await expect(async3Atom.state.value).toBe(1);
+		expect(async3Atom.state.value).toBe(1);
+		expect(mockFn).toHaveBeenCalledTimes(2);
 
 		countAtom.set((c) => c + 1);
 		await flushMicrotasks();
 		resolve();
 		await flushMicrotasks();
-		await expect(async3Atom.state.value).toBe(2);
+		expect(async3Atom.state.value).toBe(2);
+		expect(mockFn).toHaveBeenCalledTimes(3);
 
-		countAtom.set((c) => c + 1);
+		countAtom.set((c) => c + 3);
 		await flushMicrotasks();
 		resolve();
 		await flushMicrotasks();
-		await expect(async3Atom.state.value).toBe(3);
+		expect(async3Atom.state.value).toBe(2);
+		expect(mockFn).toHaveBeenCalledTimes(3);
 	});
 });