bansa 0.0.13 → 0.0.14

package/dist/index.browser.js

@@ -1 +1 @@
-var d=class{r;V;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,p:{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.p)}catch(n){f(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;A=!1;constructor(t,a){super(),this.d=t,this.m=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.m)||(this.r=a,m(this))}};i.prototype.y=!0;i.prototype.s=!0;i.prototype.u=!1;var A=class extends d{s=!1;u=!1;n=!1;A=!1;f=0;t;i;c;constructor(t,a){super(),this.d=t,this.m=a?.equals,this.b=!!a?.persist;let n=this;this.p={get signal(){return(n.t||=q()).signal}},this.state={promise:g,error:void 0,value:void 0}}};A.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 p=(e,t)=>e instanceof Function?new A(e,t):new i(e,t),z=e=>p((t,a)=>{let n,r,o=e(y=>{let l=t(y,!1);if(l.error)r=l.error;else if(l.promise)(n||=[]).push(l.promise);else return l.value;return c},a);if(r)throw r;if(n)throw Promise.all(n);return o},{equals:T}),C=(e,t)=>{let a=new WeakMap;if(t)for(let[r,o]of t)a.set(r,o instanceof d?o:p(o));let n=(r=>{let o=a.get(r);return o||a.set(r,o=r.d instanceof Function?p((y,l)=>r.d((D,E)=>y(n(D),E),l)):e?.(r)||p(r.d)),o});return n},T=(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,m(e))},m=e=>{e.n||(e.n=!0,h.push(e),b||(b=!0,queueMicrotask(K)))},K=()=>{b=!1;{let t=h;h=[];for(let a of t)a.state.promise=void 0,a.state.error=a.V,a.state.value=a.r,O(a)}let e=v;v=[];for(let t=e.length;t--;){let a=e[t];a.A=!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){f(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.p)}catch(a){f(a)}}if(e.a)for(let t of e.a)t.u=!0}},O=e=>{if(!e.A){if(e.A=!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.p);j(a)?(e.state.promise=a,a.then(n=>{t===e.f&&(V(e),x(n,e.state.value,e.m)?e.state.promise=void 0:(e.r=n,e.V=void 0),m(e))},n=>{t===e.f&&(V(e),n instanceof s?n=n.e:f(n),e.V=n,m(e))})):(V(e),e.state.error=void 0,x(a,e.state.value,e.m)?e.n=!1:e.state.value=e.r=a)}catch(a){V(e),a===P?e.n=!1:(a instanceof s?a=a.e:f(a),e.state.error=a)}},V=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(L,0)))},L=()=>{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.V=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),j=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}},f=e=>{queueMicrotask(()=>{throw e})};export{p as $,z as $$,C as createScope,g 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

@@ -74,6 +74,6 @@ 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 $$: <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,6 +1,6 @@
 class CommonAtomInternal {
   d;
-  n;
+  o;
   b;
   f;
   g;
@@ -28,7 +28,7 @@ class CommonAtomInternal {
   subscribe(subscriber) {
     const atomSubscriber = {
       t: subscriber,
-      o: {
+      p: {
         get signal() {
           return (atomSubscriber.a ||= createThenableSignal()).signal;
         }
@@ -38,7 +38,7 @@ class CommonAtomInternal {
       requestActivate(this);
     } else if (!this.state.error && !this.state.promise) {
       try {
-        subscriber(this.state.value, atomSubscriber.o);
+        subscriber(this.state.value, atomSubscriber.p);
       } catch (e) {
         logError(e);
       }
@@ -61,11 +61,11 @@ class CommonAtomInternal {
 }
 class PrimitiveAtomInternal extends CommonAtomInternal {
   c = false;
-  p = false;
+  q = false;
   constructor(init, options) {
     super();
     this.l = init;
-    this.q = options?.equals;
+    this.m = options?.equals;
     this.d = init;
     this.state = {
       promise: void 0,
@@ -75,7 +75,7 @@ class PrimitiveAtomInternal extends CommonAtomInternal {
   }
   set(value) {
     const nextValue = value instanceof Function ? value(this.d) : value;
-    if (!equals(nextValue, this.state.value, this.q)) {
+    if (!equals(nextValue, this.state.value, this.m)) {
       this.d = nextValue;
       requestPropagate(this);
     }
@@ -88,18 +88,18 @@ class DerivedAtomInternal extends CommonAtomInternal {
   h = false;
   i = false;
   c = false;
-  p = false;
-  m = 0;
+  q = false;
+  n = 0;
   a;
   j;
   k;
   constructor(init, options) {
     super();
     this.l = init;
-    this.q = options?.equals;
+    this.m = options?.equals;
     this.s = !!options?.persist;
     const self = this;
-    this.o = {
+    this.p = {
       get signal() {
         return (self.a ||= createThenableSignal()).signal;
       }
@@ -152,13 +152,20 @@ const createScope = (parentScope, atomValuePairs) => {
   }
   const scope = ((baseAtom) => {
     let scopedAtom = scopeMap.get(baseAtom);
-    if (!scopedAtom) scopeMap.set(
-      baseAtom,
-      scopedAtom = baseAtom.l instanceof Function ? $((get, options) => baseAtom.l(
-        (atom, unwrap) => get(scope(atom), unwrap),
-        options
-      )) : parentScope?.(baseAtom) || $(baseAtom.l)
-    );
+    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;
@@ -207,7 +214,7 @@ const updateAtoms = () => {
     updateQueue = [];
     for (const atom of updatedAtoms) {
       atom.state.promise = void 0;
-      atom.state.error = atom.n;
+      atom.state.error = atom.o;
       atom.state.value = atom.d;
       mark(atom);
     }
@@ -216,7 +223,7 @@ const updateAtoms = () => {
   stack = [];
   for (let i = markedAtoms.length; i--; ) {
     const atom = markedAtoms[i];
-    atom.p = false;
+    atom.q = false;
     if (atom.i) {
       atom.c = true;
       execute(atom);
@@ -245,7 +252,7 @@ const propagate = (atom) => {
           subscriber.a = void 0;
         }
         try {
-          subscriber.t(atom.state.value, subscriber.o);
+          subscriber.t(atom.state.value, subscriber.p);
         } catch (e) {
           logError(e);
         }
@@ -259,8 +266,8 @@ const propagate = (atom) => {
   }
 };
 const mark = (atom) => {
-  if (!atom.p) {
-    atom.p = true;
+  if (!atom.q) {
+    atom.q = true;
     if (atom.b) {
       for (const child of atom.b) {
         mark(child);
@@ -277,7 +284,7 @@ class Wrapped {
 }
 const expired = Symbol();
 const execute = (atom) => {
-  const counter = ++atom.m;
+  const counter = ++atom.n;
   atom.h = true;
   atom.i = false;
   atom.state.promise = void 0;
@@ -288,7 +295,7 @@ const execute = (atom) => {
   try {
     const value = atom.l(
       (anotherAtom, unwrap = true) => {
-        if (counter !== atom.m) throw expired;
+        if (counter !== atom.n) throw expired;
         if (atom !== anotherAtom) {
           if (!anotherAtom.h) {
             execute(anotherAtom);
@@ -306,32 +313,32 @@ const execute = (atom) => {
           throw new Wrapped(anotherAtom.state.promise);
         return anotherAtom.state.value;
       },
-      atom.o
+      atom.p
     );
     if (isPromiseLike(value)) {
       atom.state.promise = value;
       value.then(
         (value2) => {
-          if (counter === atom.m) {
+          if (counter === atom.n) {
             finalizeExecution(atom);
-            if (equals(value2, atom.state.value, atom.q)) {
+            if (equals(value2, atom.state.value, atom.m)) {
               atom.state.promise = void 0;
             } else {
               atom.d = value2;
-              atom.n = void 0;
+              atom.o = void 0;
             }
             requestPropagate(atom);
           }
         },
         (e) => {
-          if (counter === atom.m) {
+          if (counter === atom.n) {
             finalizeExecution(atom);
             if (e instanceof Wrapped) {
               e = e.e;
             } else {
               logError(e);
             }
-            atom.n = e;
+            atom.o = e;
             requestPropagate(atom);
           }
         }
@@ -339,7 +346,7 @@ const execute = (atom) => {
     } else {
       finalizeExecution(atom);
       atom.state.error = void 0;
-      if (equals(value, atom.state.value, atom.q)) {
+      if (equals(value, atom.state.value, atom.m)) {
         atom.c = false;
       } else {
         atom.state.value = atom.d = value;
@@ -360,7 +367,7 @@ const execute = (atom) => {
   }
 };
 const finalizeExecution = (atom) => {
-  ++atom.m;
+  ++atom.n;
   const oldDependencies = atom.j;
   atom.j = atom.k;
   if (oldDependencies) {
@@ -389,7 +396,7 @@ 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.n = atom.state.error = atom.state.value = void 0;
+      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();

package/package.json

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