bansa 0.0.22 → 0.0.24

package/dist/atom.js

@@ -1,11 +1,11 @@
 class CommonAtomInternal {
-  d;
+  f;
   o;
   b;
-  f;
   g;
+  h;
   get() {
-    if (!this.h) {
+    if (!this.d) {
       execute(this);
       disableAtom(this);
     }
@@ -14,13 +14,13 @@ class CommonAtomInternal {
     return this.state.value;
   }
   watch(watcher) {
-    if (!this.h) {
+    if (!this.d) {
       requestActivate(this);
     }
-    (this.f ||= /* @__PURE__ */ new Set()).add(watcher);
+    (this.g ||= /* @__PURE__ */ new Set()).add(watcher);
     return () => {
-      this.f.delete(watcher);
-      if (!this.f.size) {
+      this.g.delete(watcher);
+      if (!this.g.size) {
         disableAtom(this);
       }
     };
@@ -34,7 +34,7 @@ class CommonAtomInternal {
         }
       }
     };
-    if (!this.h) {
+    if (!this.d) {
       requestActivate(this);
     } else if (!this.state.error && !this.state.promise) {
       try {
@@ -43,14 +43,14 @@ class CommonAtomInternal {
         logError(e);
       }
     }
-    (this.g ||= /* @__PURE__ */ new Set()).add(atomSubscriber);
+    (this.h ||= /* @__PURE__ */ new Set()).add(atomSubscriber);
     return () => {
-      this.g.delete(atomSubscriber);
+      this.h.delete(atomSubscriber);
       if (atomSubscriber.a) {
         atomSubscriber.a.abort();
         atomSubscriber.a = void 0;
       }
-      if (!this.g.size) {
+      if (!this.h.size) {
         disableAtom(this);
       }
     };
@@ -66,7 +66,7 @@ class PrimitiveAtomInternal extends CommonAtomInternal {
     super();
     this.l = init;
     this.m = options?.equals;
-    this.d = init;
+    this.f = init;
     this.state = {
       promise: void 0,
       error: void 0,
@@ -74,18 +74,18 @@ class PrimitiveAtomInternal extends CommonAtomInternal {
     };
   }
   set(value) {
-    const nextValue = value instanceof Function ? value(this.d) : value;
+    const nextValue = value instanceof Function ? value(this.f) : value;
     if (!equals(nextValue, this.state.value, this.m)) {
-      this.d = nextValue;
+      this.f = nextValue;
       requestPropagate(this);
     }
   }
 }
 PrimitiveAtomInternal.prototype.r = true;
-PrimitiveAtomInternal.prototype.h = true;
+PrimitiveAtomInternal.prototype.d = true;
 PrimitiveAtomInternal.prototype.i = false;
 class DerivedAtomInternal extends CommonAtomInternal {
-  h = false;
+  d = false;
   i = false;
   c = false;
   q = false;
@@ -124,7 +124,7 @@ const isAtom = (x) => x instanceof CommonAtomInternal;
 const isPrimitiveAtom = (x) => x instanceof PrimitiveAtomInternal;
 const createScope = (parentScope, atomValuePairs) => {
   const scopeMap = /* @__PURE__ */ new WeakMap();
-  const atomMap = /* @__PURE__ */ new WeakMap();
+  const atomMap = parentScope ? /* @__PURE__ */ new WeakMap() : scopeMap;
   const scope = ((baseAtom, strict = false) => {
     let scopedAtom = scopeMap.get(baseAtom);
     if (!strict) scopedAtom ||= atomMap.get(baseAtom);
@@ -182,7 +182,7 @@ const updateAtoms = () => {
     for (const atom of updatedAtoms) {
       atom.state.promise = void 0;
       atom.state.error = atom.o;
-      atom.state.value = atom.d;
+      atom.state.value = atom.f;
       mark(atom);
     }
   }
@@ -202,8 +202,8 @@ const updateAtoms = () => {
 };
 const propagate = (atom) => {
   atom.c = false;
-  if (atom.f) {
-    for (const watcher of atom.f) {
+  if (atom.g) {
+    for (const watcher of atom.g) {
       try {
         watcher();
       } catch (e) {
@@ -212,8 +212,8 @@ const propagate = (atom) => {
     }
   }
   if (!atom.state.error && !atom.state.promise) {
-    if (atom.g) {
-      for (const subscriber of atom.g) {
+    if (atom.h) {
+      for (const subscriber of atom.h) {
         if (subscriber.a) {
           subscriber.a.abort();
           subscriber.a = void 0;
@@ -252,7 +252,8 @@ class Wrapped {
 const expired = Symbol();
 const execute = (atom) => {
   const counter = ++atom.n;
-  atom.h = true;
+  const prevActive = atom.d;
+  atom.d = true;
   atom.i = false;
   atom.state.promise = void 0;
   if (atom.a) {
@@ -264,7 +265,7 @@ const execute = (atom) => {
       (anotherAtom, unwrap = true) => {
         if (counter !== atom.n) throw expired;
         if (atom !== anotherAtom) {
-          if (!anotherAtom.h) {
+          if (!anotherAtom.d) {
             execute(anotherAtom);
             if (anotherAtom.c) {
               propagate(anotherAtom);
@@ -288,10 +289,10 @@ const execute = (atom) => {
         (value2) => {
           if (counter === atom.n) {
             finalizeExecution(atom);
-            if (equals(value2, atom.state.value, atom.m)) {
+            if (prevActive && equals(value2, atom.state.value, atom.m)) {
               atom.state.promise = void 0;
             } else {
-              atom.d = value2;
+              atom.f = value2;
               atom.o = void 0;
             }
             requestPropagate(atom);
@@ -313,10 +314,10 @@ const execute = (atom) => {
     } else {
       finalizeExecution(atom);
       atom.state.error = void 0;
-      if (equals(value, atom.state.value, atom.m)) {
+      if (prevActive && equals(value, atom.state.value, atom.m)) {
         atom.c = false;
       } else {
-        atom.state.value = atom.d = value;
+        atom.state.value = atom.f = value;
       }
     }
   } catch (e) {
@@ -351,7 +352,7 @@ const finalizeExecution = (atom) => {
 let runningGc = false;
 let gcCandidates = /* @__PURE__ */ new Set();
 const disableAtom = (atom) => {
-  if (!atom.r && !atom.s && !atom.b?.size && !atom.f?.size && !atom.g?.size) {
+  if (!atom.r && !atom.s && !atom.b?.size && !atom.g?.size && !atom.h?.size) {
     gcCandidates.add(atom);
     if (!runningGc) {
       runningGc = true;
@@ -361,10 +362,10 @@ const disableAtom = (atom) => {
 };
 const gc = () => {
   for (const atom of gcCandidates) {
-    if (!atom.r && !atom.s && !atom.b?.size && !atom.f?.size && !atom.g?.size) {
+    if (!atom.r && !atom.s && !atom.b?.size && !atom.g?.size && !atom.h?.size) {
       atom.state.promise = inactive;
-      atom.d = atom.o = atom.state.error = atom.state.value = void 0;
-      atom.c = atom.i = atom.h = false;
+      atom.f = atom.o = atom.state.error = atom.state.value = void 0;
+      atom.c = atom.i = atom.d = false;
       if (atom.a) {
         atom.a.abort();
         atom.a = void 0;

package/dist/index.browser.js

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

package/package.json

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

package/tests/bansa.test.ts

@@ -144,6 +144,27 @@ describe('Atom Library - Basic Tests', () => {
 		expect(mockFn).not.toHaveBeenCalled();
 	});
 
+	it('derived atom undefined value', async () => {
+		const atom = $(0);
+		const derivedAtom = $((get) => get(atom) === 0 ? undefined : true);
+
+		const mockFn = vi.fn();
+		const unsub = derivedAtom.subscribe(mockFn);
+		await flushMicrotasks();
+		expect(mockFn).toHaveBeenCalledWith(undefined, expect.anything());
+		mockFn.mockClear();
+
+		atom.set(1);
+		await flushMicrotasks();
+		expect(mockFn).toHaveBeenCalledWith(true, expect.anything());
+		mockFn.mockClear();
+
+		unsub();
+		atom.set(0);
+		await flushMicrotasks();
+		expect(mockFn).not.toHaveBeenCalled();
+	});
+
 	it('atom watch', async () => {
 		const atom = $(42);
 		const derivedAtom = $((get) => Promise.resolve(get(atom) * 2));