bansa 0.0.18 → 0.0.20

package/dist/atom.d.ts

@@ -74,6 +74,7 @@ export type MapLike<Key, Value> = Map<Key, Value> | (Key extends object ? WeakMa
 export declare const inactive: Promise<never>;
 export declare const $: CreateAtom;
 export declare const isAtom: (x: unknown) => x is Atom<unknown>;
+export declare const isPrimitiveAtom: (x: unknown) => x is PrimitiveAtom<unknown>;
 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/atom.js

@@ -121,6 +121,7 @@ const $ = (init, options) => {
   return new PrimitiveAtomInternal(init, options);
 };
 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();
@@ -146,7 +147,10 @@ const createScope = (parentScope, atomValuePairs) => {
   });
   if (atomValuePairs) {
     for (const [atom, value] of atomValuePairs) {
-      scopeMap.set(atom, isAtom(value) ? scope(value) : $(value));
+      scopeMap.set(
+        atom,
+        isAtom(value) ? (parentScope || scope)(value) : $(value)
+      );
     }
   }
   return scope;
@@ -410,5 +414,6 @@ export {
   $,
   createScope,
   inactive,
-  isAtom
+  isAtom,
+  isPrimitiveAtom
 };

package/dist/index.browser.js

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

package/dist/utils.d.ts

@@ -1,15 +1,19 @@
 import { type PrimitiveAtom, type Atom, type AtomGetter, type DerivedAtom } from "./atom";
-type Atomized<T> = T extends object ? {
+export type Atomized<T> = T extends object ? {
     [K in keyof T]: Atomized<T[K]>;
 } : PrimitiveAtom<T>;
-type CollectedAtoms<T> = T extends Atom<infer U> ? U : T extends object ? {
+export type CollectedAtoms<T> = T extends Atom<infer U> ? U : T extends object ? {
     [K in keyof T]: CollectedAtoms<T[K]>;
 } : T;
 type CollectAtom = {
     <Value>(init: AtomGetter<Value>): DerivedAtom<Value>;
     <Value>(init: Value): DerivedAtom<CollectedAtoms<Value>>;
 };
+export type RecursiveOptional<T> = T | (T extends object ? {
+    [P in keyof T]: RecursiveOptional<T[P]>;
+} : never);
 export declare const atomize: <T>(tree: T) => Atomized<T>;
 export declare const collectAtoms: <T>(tree: T, get?: <T_1>(atom: Atom<T_1>) => T_1) => CollectedAtoms<T>;
+export declare const setAtoms: <T>(tree: T, values: RecursiveOptional<CollectedAtoms<T>>) => void;
 export declare const $$: CollectAtom;
 export {};

package/dist/utils.js

@@ -1,4 +1,4 @@
-import { $, isAtom } from "./atom";
+import { $, isAtom, isPrimitiveAtom } from "./atom";
 const ouroboros = () => ouroboros;
 const toUndefined = () => void 0;
 Object.setPrototypeOf(
@@ -26,6 +26,18 @@ const collectAtoms = (tree, get = getAtom) => {
   };
   return recurse(tree);
 };
+const setAtoms = (tree, values) => {
+  const recurse = (t, v) => {
+    if (typeof t === "object" && t !== null) {
+      if (isAtom(t)) {
+        if (isPrimitiveAtom(t)) t.set(v);
+      } else {
+        for (const k in v) recurse(t[k], v[k]);
+      }
+    }
+  };
+  recurse(tree, values);
+};
 const $$ = (init) => init instanceof Function ? $((get, options) => {
   let promises;
   let error;
@@ -63,5 +75,6 @@ const shallowEquals = (a, b) => {
 export {
   $$,
   atomize,
-  collectAtoms
+  collectAtoms,
+  setAtoms
 };

package/package.json

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

package/tests/bansa.test.ts

@@ -587,6 +587,29 @@ describe('Atom Library - Advanced Tests', () => {
 		expect($y2.get()).toBe(810);
 	});
 
+	it('deep scope (self referenced)', async () => {
+		const $x = $(1);
+		const identity = (x: any) => x;
+		const scope1 = createScope(identity, [
+			[$x, $((get) => get($x) + 1)],
+		]);
+		const scope2 = createScope(scope1, [
+			[$x, $((get) => get($x) + 1)],
+		]);
+
+		await flushMicrotasks();
+
+		expect($x.get()).toBe(1);
+		expect(scope1($x).get()).toBe(2);
+		expect(scope2($x).get()).toBe(3);
+
+		$x.set(11);
+		await flushMicrotasks();
+		expect($x.get()).toBe(11);
+		expect(scope1($x).get()).toBe(12);
+		expect(scope2($x).get()).toBe(13);
+	});
+
 	it('should not provide stale values to conditional dependents', async () => {
 		const dataAtom = $([100]);
 		const hasFilterAtom = $(false);