bansa 0.0.2 → 0.0.4

package/README.ko.md

@@ -30,7 +30,7 @@ const $user = $({ name: 'John Doe', age: 30 });
 
 #### 파생 상태
 
-값이 동적이며, 생명 주기를 가지는 상태입니다. 값을 직접 업데이트할 수 없으며, 의존 중인 상태의 값이 바뀔 때에만 재실행될 수 있습니다. 해당 상태를 구독 중인 곳이 존재하는, 활성화된 상태가 아닐 경우 함수는 실행되지 않으며, 의존성 또한 없는 것으로 취급됩니다.
+값이 동적이며, 생명 주기를 가지는 상태입니다. 값을 직접 업데이트할 수 없으며, 의존 중인 상태의 값이 바뀔 때에만 재실행될 수 있습니다. 활성화된 상태가 아니라면, 즉 해당 상태를 구독 중인 곳이 존재하지 않는다면 함수는 실행되지 않으며, 의존성 또한 없는 것으로 취급됩니다.
 
 `$`에 함수를 전달하여 생성합니다. 전달하는 함수의 인자로는 다른 상태의 값을 읽을 수 있는 `get` 함수와 상태의 수명을 나타내는 `{ signal }`이 주어집니다. `signal`에 대해선 다른 파트에서 더 자세히 다룹니다.
 
@@ -82,7 +82,7 @@ type AtomState<Value> =
 console.log($count.get()); // 42
 console.log($countDouble.get()); // 84
 
-console.log($countDouble.state); // { promise: undefined, error: Symbol(), value: 84 }
+console.log($countDouble.state); // { promise: undefined, error: undefined, value: 84 }
 ```
 
 파생 상태는 `.get()` 했을 때 throw 될 수 있습니다. 비동기 로딩 중일 땐 해당 `Promise`를 throw하며, 오류 상태일 때는 해당 오류를 throw합니다. 값이 성공적으로 계산된 상황 위주로 처리하고, 예외 상황은 전부 `catch` 블록 등으로 밀어넣고 싶은 상황에서 유용합니다.
@@ -213,7 +213,7 @@ const $user = $(
 );
 
 const $user2 = $(
-  (get) => get($user).name,
+  (get) => get($user),
   { equals: (next, prev) => next.name === prev.name },
 );
 
@@ -232,10 +232,10 @@ userAtom.set({ id: 2, name: 'Alice' });
 
 ```javascript
 const timer = (time) => new Promise((resolve) => setTimeout(() => resolve(1), time));
-const a = [1, 2, 3, 4, 5].map(() => $(() => timer(1000)));
-const merged = $$((get) => a.map(get));
+const timerAtoms = [1, 2, 3, 4, 5].map(() => $(() => timer(1000)));
+const $timers = $$((get) => timerAtoms.map(get));
 console.time();
-merged.subscribe(() => console.timeEnd());
+$timers.subscribe(() => console.timeEnd());
 ```
 
 참고로 `$$`의 `get` 함수가 `Promise`나 에러를 만났을 때 throw 대신 반환하는 값은 다음 과정으로 만들어집니다:
@@ -246,7 +246,7 @@ const toUndefined = () => undefined;
 Object.setPrototypeOf(o, new Proxy(o, { get: (_, k) => k === Symbol.toPrimitive ? toUndefined : o }));
 ```
 
-이 코드의 `o`는 아무리 프로퍼티 접근 및 호출을 해도 같은 값을 반환합니다. `o.a.b.c().d()().asdf()()()() === o`는 `true`입니다. 따라서, 셀렉터와 filter/map/reduce 등 간단한 메서드로 이뤄진 대부분의 상태 병합 함수에서 문제 없이 전체 코드를 실행할 수 있게 만듭니다. 하지만 만능은 아니므로 약간의 주의가 필요하며, 가급적 상태 병합에만 사용해야 합니다.
+이 코드의 `o`는 아무리 프로퍼티 접근 및 호출을 해도 같은 값을 반환합니다. 예를 들어, `o.a.b.c().d()().asdf()()()() === o`는 `true`입니다. 따라서, 셀렉터와 filter/map/reduce 등 간단한 메서드로 이뤄진 대부분의 상태 병합 함수에서 문제 없이 전체 코드를 실행할 수 있게 만듭니다. 하지만 만능은 아니므로 약간의 주의가 필요하며, 가급적 상태 병합에만 사용해야 합니다.
 
 ## 상세
 

package/README.md

@@ -82,7 +82,7 @@ You can read the current value of a state using the `atom.get()` method or `atom
 console.log($count.get()); // 42
 console.log($countDouble.get()); // 84
 
-console.log($countDouble.state); // { promise: undefined, error: Symbol(), value: 84 }
+console.log($countDouble.state); // { promise: undefined, error: undefined, value: 84 }
 ```
 
 For derived states, `.get()` can throw. It throws the `Promise` during asynchronous loading and throws the error when in an error state. This is useful when you want to primarily handle the success case and push all exception handling into a `catch` block or similar.
@@ -213,7 +213,7 @@ const $user = $(
 );
 
 const $user2 = $(
-  (get) => get($user).name,
+  (get) => get($user),
   { equals: (next, prev) => next.name === prev.name },
 );
 
@@ -246,7 +246,7 @@ const toUndefined = () => undefined;
 Object.setPrototypeOf(o, new Proxy(o, { get: (_, k) => k === Symbol.toPrimitive ? toUndefined : o }));
 ```
 
-The `o` in this code returns the same value no matter how many properties are accessed or functions are called. `o.a.b.c().d()().asdf()()()() === o` is `true`. Therefore, it allows most state-merging functions composed of selectors and simple methods like filter/map/reduce to execute without issues. However, it's not a silver bullet, so some caution is needed, and it should preferably be used only for state merging.
+The `o` in this code returns the same value no matter how many properties are accessed or functions are called. For example, `o.a.b.c().d()().asdf()()()() === o` is `true`. Therefore, it allows most state-merging functions composed of selectors and simple methods like filter/map/reduce to execute without issues. However, it's not a silver bullet, so some caution is needed, and it should preferably be used only for state merging.
 
 ## In-Depth
 

package/dist/index.browser.js

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

package/dist/index.js

@@ -273,12 +273,17 @@ const execute = (atom) => {
             }
           }
         },
-        (error) => {
+        (e) => {
           if (counter === atom.g) {
-            if (error instanceof Promise) {
+            if (e instanceof Promise) {
               atom.state.promise = void 0;
             } else {
-              atom.n = error;
+              if (e instanceof Wrapped) {
+                e = e.e;
+              } else {
+                console.error(e);
+              }
+              atom.n = e;
               requestPropagate(atom);
             }
           }

package/dist/react.d.ts

@@ -1,5 +1,4 @@
 import type { Atom, DerivedAtom, PrimitiveAtom } from '.';
-export * from '.';
 export declare const useAtom: <Value>(atom: PrimitiveAtom<Value>) => readonly [Value, (value: import(".").AtomUpdater<Value>) => void];
 export declare const useAtomValue: <Value>(atom: Atom<Value>) => Value;
 export declare const useAtomState: <Value>(atom: DerivedAtom<Value>) => import(".").AtomState<Value>;

package/dist/react.js

@@ -1,5 +1,4 @@
 import { useState, useSyncExternalStore } from "react";
-export * from ".";
 const useAtom = (atom) => [useSyncExternalStore(atom.watch, atom.get), atom.set];
 const useAtomValue = (atom) => useSyncExternalStore(atom.watch, atom.get);
 const useAtomState = (atom) => useSyncExternalStore(atom.watch, () => {

package/package.json

@@ -1,21 +1,19 @@
 {
   "name": "bansa",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "",
   "type": "module",
-  "main": "./index.js",
-  "types": "./index.d.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
+    "./react": {
+      "types": "./dist/react.d.ts",
+      "default": "./dist/react.js"
+    },
     ".": {
-      "react": {
-        "types": "./dist/react.d.ts",
-        "default": "./dist/react.js"
-      },
-      "default": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "devDependencies": {

package/src/index.ts

@@ -1,604 +0,0 @@
-export type Atom<Value> = PrimitiveAtom<Value> | DerivedAtom<Value>;
-export type CommonAtom<Value> = {
-	readonly get: () => Value;
-	readonly watch: (watcher: AtomWatcher) => () => void;
-	readonly subscribe: (subscriber: AtomSubscribe<Value>) => () => void;
-	readonly state: AtomState<Value>;
-};
-export type PrimitiveAtom<Value> = CommonAtom<Value> & {
-	readonly set: (value: AtomUpdater<Value>) => void;
-	readonly state: AtomSuccessState<Value>;
-};
-export type DerivedAtom<Value> = CommonAtom<Value>;
-
-export type AtomWatcher = () => void;
-export type AtomSubscribe<Value> = (
-	value: Value,
-	options: AtomSubscriberOptions,
-) => void;
-export type AtomInit<Value> = Value | AtomGetter<Value>;
-export type AtomUpdater<Value> = Value | AtomReducer<Value>;
-// TODO: readonly
-export type AtomInactiveState<Value> = {
-	promise: typeof inactive;
-	error: any;
-	value?: Value;
-};
-export type AtomPromiseState<Value> = {
-	promise: PromiseLike<Value>;
-	error: any;
-	value?: Value;
-};
-export type AtomSuccessState<Value> = {
-	promise: undefined;
-	error: undefined;
-	value: Value;
-};
-export type AtomErrorState<Value> = {
-	promise: undefined;
-	error: any;
-	value?: Value;
-};
-export type AtomState<Value> =
-	| AtomInactiveState<Value>
-	| AtomPromiseState<Value>
-	| AtomSuccessState<Value>
-	| AtomErrorState<Value>;
-
-export type AtomSubscriberOptions = { readonly signal: ThenableSignal };
-export type AtomGetter<Value> = (
-	get: GetAtom,
-	options: AtomGetOptions,
-) => Value | PromiseLike<Value>;
-export type AtomReducer<Value> = (value: Value) => Value;
-
-export type AtomGetOptions = { readonly signal: ThenableSignal };
-export type ThenableSignal = AbortSignal & { then: (f: () => void) => void };
-type ThenableSignalController = {
-	abort: () => void;
-	signal: ThenableSignal;
-};
-
-export type GetAtom = {
-	<Value>(anotherAtom: Atom<Value>, unwrap?: true): Value;
-	<Value>(anotherAtom: Atom<Value>, unwrap: false): AtomState<Value>;
-};
-
-type CreateAtom = {
-	<Value>(
-		init: AtomGetter<Value>,
-		options?: AtomOptions<Value>,
-	): DerivedAtom<Value>;
-	<Value>(init: Value, options?: AtomOptions<Value>): PrimitiveAtom<Value>;
-	<Value>(
-		init: Value | AtomGetter<Value>,
-		options?: AtomOptions<Value>,
-	): Atom<Value>;
-};
-export type AtomOptions<Value> = {
-	equals?: AtomEquals<Value>;
-	persist?: boolean;
-	eager?: boolean;
-};
-
-export type AtomEquals<Value> = (value: Value, prevValue: Value) => boolean;
-export type AtomScope = {
-	<Value>(baseAtom: PrimitiveAtom<Value>): PrimitiveAtom<Value>;
-	<Value>(baseAtom: DerivedAtom<Value>): DerivedAtom<Value>;
-	<Value>(baseAtom: Atom<Value>): Atom<Value>;
-} & {
-	get: {
-		<Value>(baseAtom: PrimitiveAtom<Value>): PrimitiveAtom<Value>;
-		<Value>(baseAtom: DerivedAtom<Value>): DerivedAtom<Value>;
-		<Value>(baseAtom: Atom<Value>): Atom<Value>;
-	};
-};
-
-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);
-
-type AtomInternal<Value> =
-	| PrimitiveAtomInternal<Value>
-	| DerivedAtomInternal<Value>;
-type CommonAtomInternal<Value> = {
-	_equals?: AtomEquals<Value>;
-
-	_marked: boolean;
-	_nextError?: any;
-	_nextValue?: Value;
-	_children?: Set<DerivedAtomInternal<any>>;
-	_watchers?: Set<AtomWatcher>;
-	_subscribers?: Set<AtomSubscribeInternal<Value>>;
-};
-type PrimitiveAtomInternal<Value> = CommonAtomInternal<Value> &
-	PrimitiveAtom<Value> & {
-		readonly _source: true;
-		readonly _active: true;
-		_needPropagate: boolean;
-
-		// _init: Value;
-	};
-type DerivedAtomInternal<Value> = CommonAtomInternal<Value> &
-	DerivedAtom<Value> & {
-		readonly _source: false;
-		readonly _persist: boolean;
-		_active: boolean;
-		_needExecute: boolean;
-		_needPropagate: boolean;
-
-		_init: AtomGetterInternal<Value>;
-		_options: AtomGetOptions;
-		_counter: number;
-		_ctrl?: ThenableSignalController;
-		_dependencies?: Set<AtomInternal<any>>;
-	};
-
-type GetAtomInternal = {
-	<Value>(anotherAtom: AtomInternal<Value>, unwrap?: true): Value;
-	<Value>(anotherAtom: AtomInternal<Value>, unwrap: false): AtomState<Value>;
-};
-type AtomGetterInternal<Value> = (
-	get: GetAtomInternal,
-	options: AtomGetOptions,
-) => Value | PromiseLike<Value>;
-type AtomSubscribeInternal<Value> = {
-	_subscriber: AtomSubscribe<Value>;
-	_options: AtomSubscriberOptions;
-	_ctrl?: ThenableSignalController;
-};
-
-// JS에서 자료형을 만드는 방법은 여러 가지가 있다:
-// 클로저를 활용해서 익명 함수로 메서드가 구현된 객체 반환하기
-// -> 제일 쉽고 직관적이지만 공통 메서드/멤버 변수가 매번 새로 선언되므로 시간/메모리 측면에서 비효율적이다.
-// 공통 메서드/멤버 변수만 별도의 객체로 추출한 뒤 Object.create로 프로토타입 설정하기
-// -> Object.create가 new보다 2~3배 느린 걸로 보인다. 프로토타입 직접 건드리는 거라 그런가...
-// class 쓰기
-// -> 공통 멤버 변수를 프로토타입에 박을 방법이 없다.
-// function 쓰기
-// -> 그나마 최선의 해결책.
-
-const AtomPrototype = function <Value>(
-	this: AtomInternal<Value>,
-) {} as unknown as { new <_Value>(): AtomInternal<_Value> };
-AtomPrototype.prototype.get = function <Value>(this: AtomInternal<Value>) {
-	if (!this._active) {
-		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 <Value>(
-	this: AtomInternal<Value>,
-	watcher: AtomWatcher,
-) {
-	if (!this._active) {
-		requestActivate(this);
-	}
-	(this._watchers ??= new Set()).add(watcher);
-	return () => {
-		this._watchers!.delete(watcher);
-		if (!this._watchers!.size) {
-			disableAtom(this);
-		}
-	};
-};
-AtomPrototype.prototype.subscribe = function <Value>(
-	this: AtomInternal<Value>,
-	subscriber: AtomSubscribe<unknown>,
-) {
-	const atomSubscriber: AtomSubscribeInternal<unknown> = {
-		_subscriber: subscriber,
-		_options: {
-			get signal() {
-				return (atomSubscriber._ctrl ??= createThenableSignal()).signal;
-			},
-		},
-	};
-	if (!this._active) {
-		requestActivate(this);
-	} else if (!this.state.promise && !this.state.error) {
-		try {
-			subscriber(this.state.value!, atomSubscriber._options);
-		} catch (e) {
-			console.error(e);
-		}
-	}
-	(this._subscribers ??= new Set()).add(atomSubscriber);
-	return () => {
-		this._subscribers!.delete(atomSubscriber);
-		if (atomSubscriber._ctrl) {
-			atomSubscriber._ctrl.abort();
-			atomSubscriber._ctrl = undefined;
-		}
-		if (!this._subscribers!.size) {
-			disableAtom(this);
-		}
-	};
-};
-AtomPrototype.prototype[Symbol.toPrimitive] = function <Value>(
-	this: AtomInternal<Value>,
-) {
-	return this.state.value;
-};
-
-const PrimitiveAtomPrototype = function <Value>(
-	this: PrimitiveAtomInternal<Value>,
-	init: Value,
-	options?: AtomOptions<Value>,
-) {
-	// this._init = init;
-	this._equals = options?.equals;
-
-	(this as any).state = {
-		promise: undefined,
-		error: undefined,
-		value: init,
-	};
-	this.state.value = this._nextValue = init;
-} as unknown as {
-	new <_Value>(
-		init: _Value,
-		options?: AtomOptions<_Value>,
-	): PrimitiveAtomInternal<_Value>;
-};
-
-PrimitiveAtomPrototype.prototype.set = function <Value>(
-	this: PrimitiveAtomInternal<Value>,
-	value: AtomUpdater<unknown>,
-) {
-	const nextValue =
-		value instanceof Function ? value(this._nextValue!) : value;
-	if (!equals(nextValue, this.state.value, this._equals)) {
-		this._nextValue = nextValue;
-		requestPropagate(this);
-	}
-};
-PrimitiveAtomPrototype.prototype._source = true;
-PrimitiveAtomPrototype.prototype._active = true;
-PrimitiveAtomPrototype.prototype._needPropagate = false;
-Object.setPrototypeOf(
-	PrimitiveAtomPrototype.prototype,
-	AtomPrototype.prototype,
-);
-
-const DerivedAtomPrototype = function <Value>(
-	this: DerivedAtomInternal<Value>,
-	init: AtomGetter<Value>,
-	options?: AtomOptions<Value>,
-) {
-	this._init = init as AtomGetterInternal<Value>;
-	this._equals = options?.equals;
-	(this as any)._persist = options?.persist;
-	(this as any).state = {
-		promise: inactive,
-		error: undefined,
-		value: undefined,
-	};
-
-	const self = this;
-	this._options = {
-		get signal() {
-			return (self._ctrl ??= createThenableSignal()).signal;
-		},
-	};
-} as unknown as {
-	new <Value>(
-		init: AtomGetter<Value>,
-		options?: AtomOptions<Value>,
-	): DerivedAtomInternal<Value>;
-};
-
-DerivedAtomPrototype.prototype._source = false;
-DerivedAtomPrototype.prototype._active = false;
-DerivedAtomPrototype.prototype._needPropagate = false;
-DerivedAtomPrototype.prototype._counter = 0;
-Object.setPrototypeOf(DerivedAtomPrototype.prototype, AtomPrototype.prototype);
-
-const ouroboros: any = () => ouroboros;
-const toUndefined = () => undefined;
-Object.setPrototypeOf(
-	ouroboros,
-	new Proxy(ouroboros, {
-		get: (_, k) => (k === Symbol.toPrimitive ? toUndefined : ouroboros),
-	}),
-);
-
-export const inactive = Promise.resolve();
-export const $: CreateAtom = <Value>(
-	init: Value | AtomGetter<Value>,
-	options?: AtomOptions<Value>,
-) => {
-	if (init instanceof Function)
-		return new DerivedAtomPrototype(init, options);
-	return new PrimitiveAtomPrototype(init, options) as any;
-};
-export const $$ = <Value>(init: AtomGetter<Value>) =>
-	$((get, options) => {
-		let promises: PromiseLike<Value>[] | undefined;
-		let error: unknown;
-		const result = init((atom) => {
-			try {
-				return get(atom);
-			} catch (e) {
-				if (!e) {
-					throw e;
-				}
-				if (isPromiseLike(e)) {
-					(promises ??= []).push(e as PromiseLike<Value>);
-				} else {
-					error = e;
-				}
-			}
-			return ouroboros;
-		}, options);
-		if (error) throw error;
-		if (promises) throw Promise.all(promises);
-		return result;
-	});
-
-let pendingUpdateAtoms = false;
-let stack: AtomInternal<any>[] = [];
-const requestActivate = <Value>(atom: DerivedAtomInternal<Value>) => {
-	if (!atom._needExecute) {
-		atom._needExecute = true;
-		requestPropagate(atom);
-	}
-};
-const requestPropagate = <Value>(atom: AtomInternal<Value>) => {
-	if (!atom._needPropagate) {
-		atom._needPropagate = true;
-		stack.push(atom);
-		if (!pendingUpdateAtoms) {
-			pendingUpdateAtoms = true;
-			queueMicrotask(updateAtoms);
-		}
-	}
-};
-const updateAtoms = () => {
-	pendingUpdateAtoms = false;
-	{
-		const updatedAtoms = stack;
-		stack = [];
-		for (const atom of updatedAtoms) {
-			atom.state.promise = undefined;
-			atom.state.error = atom._nextError;
-			atom.state.value = atom._nextValue;
-			mark(atom);
-		}
-	}
-	const markedAtoms = stack as DerivedAtomInternal<any>[];
-	stack = [];
-	for (let i = markedAtoms.length; i--; ) {
-		const atom = markedAtoms[i];
-		atom._marked = false;
-		if (atom._needExecute) {
-			atom._needPropagate = true;
-			execute(atom);
-		}
-		if (atom._needPropagate) {
-			propagate(atom);
-		}
-	}
-};
-const propagate = <Value>(atom: AtomInternal<Value>) => {
-	atom._needPropagate = false;
-	if (atom._children) {
-		for (const child of atom._children) {
-			child._needExecute = true;
-		}
-	}
-	if (atom._watchers) {
-		for (const watcher of atom._watchers) {
-			watcher();
-		}
-	}
-	if (atom._subscribers && !atom.state.promise && !atom.state.error) {
-		for (const subscriber of atom._subscribers) {
-			if (subscriber._ctrl) {
-				subscriber._ctrl.abort();
-				subscriber._ctrl = undefined;
-			}
-			try {
-				subscriber._subscriber(atom.state.value!, subscriber._options);
-			} catch (e) {
-				console.error(e);
-			}
-		}
-	}
-};
-const mark = (atom: AtomInternal<any>) => {
-	if (!atom._marked) {
-		atom._marked = true;
-		if (atom._children) {
-			for (const child of atom._children) {
-				mark(child);
-			}
-		}
-		stack.push(atom);
-	}
-};
-
-class Wrapped {
-	e: unknown;
-	constructor(e: unknown) {
-		this.e = e;
-	}
-}
-const execute = <Value>(atom: DerivedAtomInternal<Value>) => {
-	const counter = ++atom._counter;
-	atom._active = true;
-	atom._needExecute = false;
-	atom.state.promise = undefined;
-
-	if (atom._ctrl) {
-		atom._ctrl.abort();
-		atom._ctrl = undefined;
-	}
-
-	// TODO: nextDependencies
-	const oldDependencies = atom._dependencies;
-	if (oldDependencies) {
-		atom._dependencies = new Set();
-	}
-	try {
-		const value = atom._init(
-			<V>(anotherAtom: AtomInternal<V>, unwrap = true) => {
-				if (counter !== atom._counter) throw undefined;
-				if ((atom as unknown) !== anotherAtom) {
-					if (!anotherAtom._active) {
-						execute(anotherAtom);
-						if (anotherAtom._needPropagate) {
-							anotherAtom._needPropagate = false;
-							propagate(anotherAtom);
-						}
-					}
-					oldDependencies?.delete(anotherAtom);
-					(atom._dependencies ??= new Set()).add(anotherAtom);
-					(anotherAtom._children ??= 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);
-				return anotherAtom.state.value as V;
-			},
-			atom._options,
-		);
-
-		if (isPromiseLike(value)) {
-			atom.state.promise = value;
-			value.then(
-				(value) => {
-					if (counter === atom._counter) {
-						if (equals(value, atom.state.value, atom._equals)) {
-							atom.state.promise = undefined;
-							// watchers 재실행 해야 할까?
-						} else {
-							atom._nextValue = value;
-							atom._nextError = undefined;
-							requestPropagate(atom);
-						}
-					}
-				},
-				(error) => {
-					if (counter === atom._counter) {
-						if (error instanceof Promise) {
-							atom.state.promise = undefined;
-						} else {
-							atom._nextError = error;
-							requestPropagate(atom);
-						}
-					}
-				},
-			);
-		} else {
-			++atom._counter;
-			atom.state.error = undefined;
-			if (equals(value, atom.state.value, atom._equals)) {
-				atom._needPropagate = false;
-			} else {
-				atom.state.value = atom._nextValue = value;
-			}
-		}
-	} catch (e) {
-		++atom._counter;
-		if (!e) {
-			atom._needPropagate = false;
-		} else {
-			if (e instanceof Wrapped) {
-				e = e.e;
-			} else {
-				console.error(e);
-			}
-			if (isPromiseLike(e)) {
-				atom.state.promise = e as PromiseLike<Value>;
-			} else {
-				atom.state.error = e;
-			}
-		}
-	}
-
-	if (oldDependencies) {
-		for (const dep of oldDependencies) {
-			dep._children!.delete(atom);
-			disableAtom(dep);
-		}
-	}
-};
-
-// TODO: 좀 대충 짜놨는데 개선할 수 있을지 고민해봐야
-let disabling = false;
-const disableAtom = <Value>(atom: AtomInternal<Value>) => {
-	if (
-		!atom._source &&
-		!atom._persist &&
-		!atom._children?.size &&
-		!atom._watchers?.size &&
-		!atom._subscribers?.size
-	) {
-		if (!disabling) {
-			setTimeout(() => {
-				disabling = true;
-				disableAtom(atom);
-				disabling = false;
-			}, 0);
-			return;
-		}
-		atom.state.promise = inactive;
-		atom._nextValue =
-			atom._nextError =
-			atom.state.error =
-			atom.state.value =
-				undefined;
-		atom._needPropagate = atom._needExecute = atom._active = false;
-		if (atom._ctrl) {
-			atom._ctrl.abort();
-			atom._ctrl = undefined;
-		}
-		if (atom._dependencies) {
-			for (const dep of atom._dependencies) {
-				dep._children!.delete(atom);
-				disableAtom(dep);
-			}
-			atom._dependencies.clear();
-		}
-	}
-};
-
-const equals = <Value>(
-	value: Value,
-	prevValue?: Value,
-	equalsFn?: (value: Value, prevValue: Value) => boolean,
-) =>
-	Object.is(value, prevValue) ||
-	(equalsFn !== undefined &&
-		prevValue !== undefined &&
-		equalsFn(value, prevValue));
-
-const isPromiseLike = (x: unknown): x is PromiseLike<unknown> =>
-	typeof (x as PromiseLike<unknown>)?.then === 'function';
-
-const createThenableSignal = () => {
-	const ctrl = new AbortController();
-	const signal = ctrl.signal as ThenableSignal;
-	const promise = new Promise((resolve) => {
-		signal.then = (f: () => void) => promise.then(f);
-		signal.addEventListener('abort', resolve, {
-			once: true,
-			passive: true,
-		});
-	});
-	return {
-		abort: () => ctrl.abort(),
-		signal,
-	};
-};

package/src/react.tsx

@@ -1,28 +0,0 @@
-import { useState, useSyncExternalStore } from 'react';
-import type { Atom, DerivedAtom, PrimitiveAtom } from '.';
-
-export * from '.';
-
-export const useAtom = <Value,>(atom: PrimitiveAtom<Value>) =>
-	[useSyncExternalStore(atom.watch, atom.get), atom.set] as const;
-
-export const useAtomValue = <Value,>(atom: Atom<Value>) =>
-	useSyncExternalStore(atom.watch, atom.get);
-
-export const useAtomState = <Value,>(atom: DerivedAtom<Value>) =>
-	useSyncExternalStore(atom.watch, () => {
-		// avoid https://github.com/facebook/react/issues/31730
-		try {
-			atom.get();
-		} catch (_) {}
-		return atom.state;
-	});
-
-export const useStateAtom = <Value,>(atom: PrimitiveAtom<Value>) => {
-	const [state, setState] = useState(() => atom.get());
-	const setStateWithAtom = (newState: Value) => {
-		setState(newState);
-		atom.set(newState);
-	};
-	return [state, setStateWithAtom] as const;
-};