atom.io 0.40.4 → 0.40.6

package/dist/react/index.d.ts

@@ -23,17 +23,19 @@ declare function useLoadable<T, E>(token: ReadableToken<Loadable<T>, any, E>): `
   loading: boolean;
   value: E | T;
 };
-declare function useLoadable<T, K extends Canonical, E>(token: ReadableFamilyToken<Loadable<T>, K, E>, key: K): `LOADING` | {
+declare function useLoadable<T, K extends Canonical, Key extends K, E>(token: ReadableFamilyToken<Loadable<T>, K, E>, key: Key): `LOADING` | {
   loading: boolean;
   value: E | T;
 };
 declare function useLoadable<T, F extends T, E>(token: ReadableToken<Loadable<T>, any, E>, fallback: F): {
   loading: boolean;
   value: T;
+  error?: E;
 };
-declare function useLoadable<T, K extends Canonical, F extends T, E>(token: ReadableFamilyToken<Loadable<T>, K, E>, key: K, fallback: F): {
+declare function useLoadable<T, K extends Canonical, F extends T, Key extends K, E>(token: ReadableFamilyToken<Loadable<T>, K, E>, key: Key, fallback: F): {
   loading: boolean;
-  value: E | T;
+  value: T;
+  error?: E;
 };
 //#endregion
 //#region src/react/use-o.d.ts

package/dist/react/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":["StoreContext: React.Context<RootStore>","StoreProvider: React.FC<{\n\tchildren: React.ReactNode\n\tstore?: RootStore\n}>"],"sources":["../../src/react/store-context.tsx","../../src/react/use-i.ts","../../src/react/use-json.ts","../../src/react/use-loadable.ts","../../src/react/use-o.ts","../../src/react/use-tl.ts"],"sourcesContent":[],"mappings":";;;;;;cAIaA,cAAc,OAAA,CAAM,QAAQ;cAI5BC,eAAe,OAAA,CAAM;YACvB,OAAA,CAAM;UACR;AANT,CAAA,CAAA;;;iBCIgB,eACR,cAAc,4BACN,SAAS,aAAa,MAAM;iBAE5B,kBAAkB,WDRlC,YCQyD,CDR5CD,CAA4B,CAAA,KAAA,ECSjC,mBDTiC,CCSb,CDTa,ECSV,CDTU,EAAA,GAAA,CAAA,EAAA,GAAA,ECUnC,GDVmC,CAAA,EAAA,CAAA,YCWzB,CDXyB,CAAA,CAAA,IAAA,ECWhB,GDXgB,GAAA,CAAA,CAAA,GAAA,ECWH,CDXG,EAAA,GCWG,GDXH,CAAA,EAAA,GAAA,IAAA;;;iBEKzB,kBAAkB,mCAC1B,iBAAiB,KACtB,OAAO;iBAEM,kBACL,4BFVX,UEWW,SFX8B,CAAA,CAAA,KAAA,EEYhC,sBFZgC,CEYT,CFZS,EEYN,CFZM,CAAA,EAAA,GAAA,EEYG,CFZH,CAAA,EEYO,MFZP,CEYc,CFZd,CAAA;;;iBGEzB,iBHFhB,CAAA,KAAaA,EGGL,aHHiC,CGGnB,QHHmB,CGGV,CHHU,CAAA,EAAA,GAAA,EGGD,CHHC,CAAA,CAAA,EAAA,SAAA,GAAA;EAAA,OAAA,EAAA,OAAA;SGIC,CHJD,GGIK,CHJL;;iBGMzB,YHFhB,CAAA,YGEyC,mBHAhC,EGCD,mBHDC,CGCmB,QHDnB,CGC4B,CHD5B,CAAA,EGCgC,CHDhC,EGCmC,CHDnC,CAAA,EAAA,GAAA,EGEH,CHFG,CAAA,EAAA,SAAA,GAAA;SAFmB,EAAA,OAAM;SGKQ,IAAI;;iBAE9B,eFPhB,UEOyC,CFPzB,EAAA,CAAA,OACM,EEOd,aFPc,CEOA,QFPA,CEOS,CFPT,CAAA,EAAA,GAAA,EEOkB,CFPlB,CAAA,EAAA,QAAA,EEQX,CFRW,CAAA,EAAA;SAAd,EAAA,OAAA;SESsB,CFRd;;AAAsB,iBEUtB,WFVsB,cEUG,WFRzC,UEQ8D,CFR9C,EAAA,CAAA,OAAkB,EES1B,mBFT0B,CESN,QFTM,CESG,CFTH,CAAA,EESO,CFTP,EESU,CFTV,CAAA,EAAA,GAAA,EEU5B,CFV4B,EAAA,QAAA,EEWvB,CFXuB,CAAA,EAAA;SAAuB,EAAA,OAAA;SEY3B,CFXF,GEWM,CFXN;;;;iBGLZ,kBAAkB,cAAc,QAAQ,KAAK,IAAI;AJJpDA,iBIMG,IJNyB,CAAA,CAAA,YIMP,SJNO,cIMgB,CJN9B,IAI3B,CAAA,KAAaC,EIGL,mBJHKA,CIGe,CJHfA,EIGkB,CJHlBA,EIGqB,CJHrBA,CAAAA,EAAAA,GAAAA,EIIP,GJJOA,CAAAA,EIKV,CJLUA,GIKN,CJLMA;;;KKDD,YAAA;;;;;ALHZ,CAAA;AAAyC,iBKUzB,KAAA,CLVyB,KAAA,EKUZ,aLVY,CAAA,GAAA,CAAA,CAAA,EKUS,YLVT"}
+{"version":3,"file":"index.d.ts","names":["StoreContext: React.Context<RootStore>","StoreProvider: React.FC<{\n\tchildren: React.ReactNode\n\tstore?: RootStore\n}>"],"sources":["../../src/react/store-context.tsx","../../src/react/use-i.ts","../../src/react/use-json.ts","../../src/react/use-loadable.ts","../../src/react/use-o.ts","../../src/react/use-tl.ts"],"sourcesContent":[],"mappings":";;;;;;cAIaA,cAAc,OAAA,CAAM,QAAQ;cAI5BC,eAAe,OAAA,CAAM;YACvB,OAAA,CAAM;UACR;AANT,CAAA,CAAA;;;iBCIgB,eACR,cAAc,4BACN,SAAS,aAAa,MAAM;iBAE5B,kBAAkB,WDRlC,YCQyD,CDR5CD,CAA4B,CAAA,KAAA,ECSjC,mBDTiC,CCSb,CDTa,ECSV,CDTU,EAAA,GAAA,CAAA,EAAA,GAAA,ECUnC,GDVmC,CAAA,EAAA,CAAA,YCWzB,CDXyB,CAAA,CAAA,IAAA,ECWhB,GDXgB,GAAA,CAAA,CAAA,GAAA,ECWH,CDXG,EAAA,GCWG,GDXH,CAAA,EAAA,GAAA,IAAA;;;iBEKzB,kBAAkB,mCAC1B,iBAAiB,KACtB,OAAO;iBAEM,kBACL,4BFVX,UEWW,SFX8B,CAAA,CAAA,KAAA,EEYhC,sBFZgC,CEYT,CFZS,EEYN,CFZM,CAAA,EAAA,GAAA,EEYG,CFZH,CAAA,EEYO,MFZP,CEYc,CFZd,CAAA;;;iBGGzB,iBHHhB,CAAA,KAAaA,EGIL,aHJiC,CGInB,QHJmB,CGIV,CHJU,CAAA,EAAA,GAAA,EGID,CHJC,CAAA,CAAA,EAAA,SAAA,GAAA;EAAA,OAAA,EAAA,OAAA;SGKC,CHLD,GGKK,CHLL;;iBGOzB,YHHhB,CAAA,YGGyC,uBAAuB,CHFrD,UADiB,EGIpB,mBHJ0B,CGIN,QHJM,CGIG,CHJH,CAAA,EGIO,CHJP,EGIU,CHJV,CAAA,EAAA,GAAA,EGK5B,GHL4B,CAAA,EAAA,SAAA,GAAA;;SGMQ,IAAI;;iBAE9B,YFRhB,CAAA,EAAgB,UEQyB,CFRzB,UACR,EEQA,aFRA,CEQc,QFRd,CEQuB,CFRvB,CAAA,EAAA,GAAA,EEQgC,CFRhC,CAAA,EAAA,QAAA,EESG,CFTH,CAAA,EAAA;SACQ,EAAA,OAAA;SESc,CFTL;QAAa,EESG,CFTH;;iBEWtB,YFThB,CAAA,EAAgB,UEWL,SFXK,YEYL,CFZuB,cEarB,CFb4C,UAC1B,EEevB,mBFfuB,CEeH,QFfG,CEeM,CFfN,CAAA,EEeU,CFfV,EEea,CFfb,CAAA,EAAA,GAAA,EEgBzB,GFhByB,EAAA,QAAA,EEiBpB,CFjBoB,CAAA,EAAA;SAAvB,EAAA,OAAA;SEkBsB,CFjBxB;QACU,EEgByB,CFhBzB;;;;iBGPA,kBAAkB,cAAc,QAAQ,KAAK,IAAI;AJJpDA,iBIMG,IJNyB,CAAA,CAAA,YIMP,SJNO,cIMgB,CJN9B,IAI3B,CAAA,KAAaC,EIGL,mBJHKA,CIGe,CJHfA,EIGkB,CJHlBA,EIGqB,CJHrBA,CAAAA,EAAAA,GAAAA,EIIP,GJJOA,CAAAA,EIKV,CJLUA,GIKN,CJLMA;;;KKDD,YAAA;;;;;ALHZ,CAAA;AAAyC,iBKUzB,KAAA,CLVyB,KAAA,EKUZ,aLVY,CAAA,GAAA,CAAA,CAAA,EKUS,YLVT"}

package/dist/react/index.js

@@ -3,7 +3,7 @@ import { redo, undo } from "atom.io";
 import * as React$1 from "react";
 import React from "react";
 import { jsx } from "react/jsx-runtime";
-import { useO as useO$1 } from "atom.io/react";
+import { StoreContext as StoreContext$1, useO as useO$1 } from "atom.io/react";
 
 //#region src/react/store-context.tsx
 const StoreContext = React$1.createContext(IMPLICIT.STORE);
@@ -57,6 +57,8 @@ function useJSON(token, key) {
 //#endregion
 //#region src/react/use-loadable.ts
 function useLoadable(...params) {
+	const store = React.useContext(StoreContext$1);
+	let value;
 	let state;
 	let fallback;
 	const [token] = params;
@@ -68,7 +70,8 @@ function useLoadable(...params) {
 		case `readonly_pure_selector`:
 		case `writable_held_selector`:
 		case `writable_pure_selector`:
-			state = useO$1(token);
+			value = useO$1(token);
+			state = withdraw(store, token);
 			fallback = params[1];
 			break;
 		case `atom_family`:
@@ -78,31 +81,49 @@ function useLoadable(...params) {
 		case `writable_held_selector_family`:
 		case `writable_pure_selector_family`:
 			key = params[1];
-			state = useO$1(token, key);
+			value = useO$1(token, key);
+			state = withdraw(store, findInStore(store, token, key));
 			fallback = params[2];
 	}
+	const isErr = `catch` in state && state.catch.some((E) => value instanceof E);
 	const wrapperRef = React.useRef({
 		loading: false,
 		value: null
 	});
-	const lastLoadedRef = React.useRef(fallback ?? (state instanceof Promise ? `LOADING` : state));
+	const lastLoadedRef = React.useRef(fallback ?? (value instanceof Promise ? `LOADING` : value));
 	const { current: lastLoaded } = lastLoadedRef;
 	let { current: wrapper } = wrapperRef;
-	if (state instanceof Promise) {
+	const wasErr = `catch` in state && state.catch.some((E) => lastLoaded instanceof E);
+	if (value instanceof Promise) {
 		if (lastLoaded === `LOADING`) return `LOADING`;
-		wrapper = wrapperRef.current = {
+		if (wasErr && fallback) wrapper = wrapperRef.current = {
+			loading: true,
+			value: fallback,
+			error: lastLoaded
+		};
+		else wrapper = wrapperRef.current = {
 			loading: true,
 			value: lastLoaded
 		};
 	} else {
-		lastLoadedRef.current = state;
-		if (wrapper.loading === true) wrapper = wrapperRef.current = {
+		lastLoadedRef.current = value;
+		if (wrapper.loading === true) if (isErr && fallback) wrapper = wrapperRef.current = {
 			loading: false,
-			value: state
+			value: fallback,
+			error: value
 		};
-		else {
+		else wrapper = wrapperRef.current = {
+			loading: false,
+			value
+		};
+		else if (isErr && fallback) {
+			wrapper.loading = false;
+			wrapper.value = fallback;
+			wrapper.error = value;
+		} else {
 			wrapper.loading = false;
-			wrapper.value = state;
+			wrapper.value = value;
+			delete wrapper.error;
 		}
 	}
 	return wrapper;

package/dist/react/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["StoreContext: React.Context<RootStore>","React","StoreProvider: React.FC<{\n\tchildren: React.ReactNode\n\tstore?: RootStore\n}>","token: ReadableToken<any, any, any>","React","setter: React.RefObject<\n\t\t(<New extends T>(next: New | ((old: T) => New)) => void) | null\n\t>","React","React","stateToken: MutableAtomToken<any>","state: unknown","fallback: unknown","key: Canonical","useO","React"],"sources":["../../src/react/store-context.tsx","../../src/react/parse-state-overloads.ts","../../src/react/use-i.ts","../../src/react/use-o.ts","../../src/react/use-json.ts","../../src/react/use-loadable.ts","../../src/react/use-tl.ts"],"sourcesContent":["import type { RootStore } from \"atom.io/internal\"\nimport { IMPLICIT } from \"atom.io/internal\"\nimport * as React from \"react\"\n\nexport const StoreContext: React.Context<RootStore> = React.createContext(\n\tIMPLICIT.STORE,\n)\n\nexport const StoreProvider: React.FC<{\n\tchildren: React.ReactNode\n\tstore?: RootStore\n}> = ({ children, store = IMPLICIT.STORE }) => (\n\t<StoreContext.Provider value={store}>{children}</StoreContext.Provider>\n)\n","import type {\n\tReadableFamilyToken,\n\tReadableToken,\n\tWritableFamilyToken,\n\tWritableToken,\n} from \"atom.io\"\nimport type { Store } from \"atom.io/internal\"\nimport { findInStore } from \"atom.io/internal\"\nimport type { Canonical } from \"atom.io/json\"\n\nexport function parseStateOverloads<T, K extends Canonical, Key extends K, E>(\n\tstore: Store,\n\t...rest: [WritableFamilyToken<T, K, E>, Key] | [WritableToken<T, any, E>]\n): WritableToken<T, K, E>\n\nexport function parseStateOverloads<T, K extends Canonical, Key extends K, E>(\n\tstore: Store,\n\t...rest: [ReadableFamilyToken<T, K, E>, Key] | [ReadableToken<T, any, E>]\n): ReadableToken<T, K, E>\n\nexport function parseStateOverloads<T, K extends Canonical, Key extends K, E>(\n\tstore: Store,\n\t...rest: [ReadableFamilyToken<T, K, E>, Key] | [ReadableToken<T, any, E>]\n): ReadableToken<T, K, E> {\n\tlet token: ReadableToken<any, any, any>\n\tif (rest.length === 2) {\n\t\tconst family = rest[0]\n\t\tconst key = rest[1]\n\n\t\ttoken = findInStore(store, family, key)\n\t} else {\n\t\ttoken = rest[0]\n\t}\n\treturn token\n}\n","import type { WritableFamilyToken, WritableToken } from \"atom.io\"\nimport { setIntoStore } from \"atom.io/internal\"\nimport type { Canonical } from \"atom.io/json\"\nimport * as React from \"react\"\n\nimport { parseStateOverloads } from \"./parse-state-overloads\"\nimport { StoreContext } from \"./store-context\"\n\nexport function useI<T>(\n\ttoken: WritableToken<T, any, any>,\n): <New extends T>(next: New | ((old: T) => New)) => void\n\nexport function useI<T, K extends Canonical, Key extends K>(\n\ttoken: WritableFamilyToken<T, K, any>,\n\tkey: Key,\n): <New extends T>(next: New | ((old: T) => New)) => void\n\nexport function useI<T, K extends Canonical, Key extends K>(\n\t...params: [WritableFamilyToken<T, K, any>, Key] | [WritableToken<T, any, any>]\n): <New extends T>(next: New | ((old: T) => New)) => void {\n\tconst store = React.useContext(StoreContext)\n\tconst token = parseStateOverloads(store, ...params)\n\tconst setter: React.RefObject<\n\t\t(<New extends T>(next: New | ((old: T) => New)) => void) | null\n\t> = React.useRef(null)\n\tsetter.current ??= (next) => {\n\t\tsetIntoStore(store, token, next)\n\t}\n\treturn setter.current\n}\n","import type { ReadableFamilyToken, ReadableToken } from \"atom.io\"\nimport { getFromStore, subscribeToState } from \"atom.io/internal\"\nimport type { Canonical } from \"atom.io/json\"\nimport * as React from \"react\"\n\nimport { parseStateOverloads } from \"./parse-state-overloads\"\nimport { StoreContext } from \"./store-context\"\n\nexport function useO<T, E>(token: ReadableToken<T, any, E>): E | T\n\nexport function useO<T, K extends Canonical, Key extends K, E>(\n\ttoken: ReadableFamilyToken<T, K, E>,\n\tkey: Key,\n): E | T\n\nexport function useO<T, K extends Canonical, Key extends K, E>(\n\t...params: [ReadableFamilyToken<T, K, E>, Key] | [ReadableToken<T, any, E>]\n): E | T {\n\tconst store = React.useContext(StoreContext)\n\tconst token = parseStateOverloads(store, ...params)\n\tconst id = React.useId()\n\treturn React.useSyncExternalStore<E | T>(\n\t\t(dispatch) => subscribeToState(store, token, `use-o:${id}`, dispatch),\n\t\t() => getFromStore(store, token),\n\t\t() => getFromStore(store, token),\n\t)\n}\n","import type { MutableAtomFamilyToken, MutableAtomToken } from \"atom.io\"\nimport type { AsJSON, Transceiver } from \"atom.io/internal\"\nimport { findInStore, getJsonToken } from \"atom.io/internal\"\nimport type { Canonical, Json } from \"atom.io/json\"\nimport * as React from \"react\"\n\nimport { StoreContext } from \"./store-context\"\nimport { useO } from \"./use-o\"\n\nexport function useJSON<T extends Transceiver<any, any, any>>(\n\ttoken: MutableAtomToken<T>,\n): AsJSON<T>\n\nexport function useJSON<\n\tT extends Transceiver<any, any, any>,\n\tK extends Canonical,\n>(token: MutableAtomFamilyToken<T, K>, key: K): AsJSON<T>\n\nexport function useJSON(\n\ttoken: MutableAtomFamilyToken<any, any> | MutableAtomToken<any>,\n\tkey?: Canonical,\n): Json.Serializable {\n\tconst store = React.useContext(StoreContext)\n\tconst stateToken: MutableAtomToken<any> =\n\t\ttoken.type === `mutable_atom_family` ? findInStore(store, token, key) : token\n\tconst jsonToken = getJsonToken(store, stateToken)\n\treturn useO(jsonToken)\n}\n","/** biome-ignore-all lint/correctness/useHookAtTopLevel: params are used in an invariant way */\nimport type { Loadable, ReadableFamilyToken, ReadableToken } from \"atom.io\"\nimport type { Canonical } from \"atom.io/json\"\nimport { useO } from \"atom.io/react\"\nimport React from \"react\"\n\nexport function useLoadable<T, E>(\n\ttoken: ReadableToken<Loadable<T>, any, E>,\n): `LOADING` | { loading: boolean; value: E | T }\n\nexport function useLoadable<T, K extends Canonical, E>(\n\ttoken: ReadableFamilyToken<Loadable<T>, K, E>,\n\tkey: K,\n): `LOADING` | { loading: boolean; value: E | T }\n\nexport function useLoadable<T, F extends T, E>(\n\ttoken: ReadableToken<Loadable<T>, any, E>,\n\tfallback: F,\n): { loading: boolean; value: T }\n\nexport function useLoadable<T, K extends Canonical, F extends T, E>(\n\ttoken: ReadableFamilyToken<Loadable<T>, K, E>,\n\tkey: K,\n\tfallback: F,\n): { loading: boolean; value: E | T }\n\nexport function useLoadable(\n\t...params:\n\t\t| readonly [ReadableFamilyToken<any, Canonical, any>, Canonical, unknown]\n\t\t| readonly [ReadableFamilyToken<any, Canonical, any>, Canonical]\n\t\t| readonly [ReadableToken<any, any, any>, unknown]\n\t\t| readonly [ReadableToken<any, any, any>]\n): `LOADING` | { loading: boolean; value: unknown } {\n\tlet state: unknown\n\tlet fallback: unknown\n\n\tconst [token] = params\n\tlet key: Canonical\n\tswitch (token.type) {\n\t\tcase `atom`:\n\t\tcase `mutable_atom`:\n\t\tcase `readonly_held_selector`:\n\t\tcase `readonly_pure_selector`:\n\t\tcase `writable_held_selector`:\n\t\tcase `writable_pure_selector`:\n\t\t\tstate = useO(token)\n\t\t\tfallback = params[1]\n\t\t\tbreak\n\t\tcase `atom_family`:\n\t\tcase `mutable_atom_family`:\n\t\tcase `readonly_held_selector_family`:\n\t\tcase `readonly_pure_selector_family`:\n\t\tcase `writable_held_selector_family`:\n\t\tcase `writable_pure_selector_family`:\n\t\t\tkey = params[1] as Canonical\n\t\t\tstate = useO(token, key)\n\t\t\tfallback = params[2]\n\t}\n\n\tconst wrapperRef = React.useRef({ loading: false, value: null as unknown })\n\tconst lastLoadedRef = React.useRef(\n\t\tfallback ?? (state instanceof Promise ? `LOADING` : state),\n\t)\n\n\tconst { current: lastLoaded } = lastLoadedRef\n\tlet { current: wrapper } = wrapperRef\n\n\tif (state instanceof Promise) {\n\t\tif (lastLoaded === `LOADING`) {\n\t\t\treturn `LOADING`\n\t\t}\n\t\twrapper = wrapperRef.current = { loading: true, value: lastLoaded }\n\t} else {\n\t\tlastLoadedRef.current = state\n\t\tif (wrapper.loading === true) {\n\t\t\twrapper = wrapperRef.current = { loading: false, value: state }\n\t\t} else {\n\t\t\twrapper.loading = false\n\t\t\twrapper.value = state\n\t\t}\n\t}\n\n\treturn wrapper\n}\n","import type { TimelineToken } from \"atom.io\"\nimport { redo, undo } from \"atom.io\"\nimport { subscribeToTimeline, withdraw } from \"atom.io/internal\"\nimport * as React from \"react\"\n\nimport { StoreContext } from \"./store-context\"\n\nexport type TimelineMeta = {\n\tat: number\n\tlength: number\n\tundo: () => void\n\tredo: () => void\n}\n\nexport function useTL(token: TimelineToken<any>): TimelineMeta {\n\tconst store = React.useContext(StoreContext)\n\tconst id = React.useId()\n\tconst timeline = withdraw(store, token)\n\tconst tokenRef = React.useRef(token)\n\tconst rebuildMeta = () => {\n\t\treturn {\n\t\t\tat: timeline.at,\n\t\t\tlength: timeline.history.length,\n\t\t\tundo: () => {\n\t\t\t\tundo(token)\n\t\t\t},\n\t\t\tredo: () => {\n\t\t\t\tredo(token)\n\t\t\t},\n\t\t}\n\t}\n\tconst meta = React.useRef<TimelineMeta>(rebuildMeta())\n\tconst retrieve = () => {\n\t\tif (\n\t\t\tmeta.current.at !== timeline?.at ||\n\t\t\tmeta.current.length !== timeline?.history.length ||\n\t\t\ttokenRef.current !== token\n\t\t) {\n\t\t\ttokenRef.current = token\n\t\t\tmeta.current = rebuildMeta()\n\t\t}\n\t\treturn meta.current\n\t}\n\treturn React.useSyncExternalStore<TimelineMeta>(\n\t\t(dispatch) => subscribeToTimeline(store, token, `use-tl:${id}`, dispatch),\n\t\tretrieve,\n\t\tretrieve,\n\t)\n}\n"],"mappings":";;;;;;;;AAIA,MAAaA,eAAyCC,QAAM,cAC3D,SAAS;AAGV,MAAaC,iBAGP,EAAE,UAAU,QAAQ,SAAS,YAClC,oBAAC,aAAa;CAAS,OAAO;CAAQ;;;;;ACQvC,SAAgB,oBACf,OACA,GAAG,MACsB;CACzB,IAAIC;AACJ,KAAI,KAAK,WAAW,GAAG;EACtB,MAAM,SAAS,KAAK;EACpB,MAAM,MAAM,KAAK;AAEjB,UAAQ,YAAY,OAAO,QAAQ;OAEnC,SAAQ,KAAK;AAEd,QAAO;;;;;AChBR,SAAgB,KACf,GAAG,QACsD;CACzD,MAAM,QAAQC,QAAM,WAAW;CAC/B,MAAM,QAAQ,oBAAoB,OAAO,GAAG;CAC5C,MAAMC,SAEFD,QAAM,OAAO;AACjB,QAAO,aAAa,SAAS;AAC5B,eAAa,OAAO,OAAO;;AAE5B,QAAO,OAAO;;;;;ACbf,SAAgB,KACf,GAAG,QACK;CACR,MAAM,QAAQE,QAAM,WAAW;CAC/B,MAAM,QAAQ,oBAAoB,OAAO,GAAG;CAC5C,MAAM,KAAKA,QAAM;AACjB,QAAOA,QAAM,sBACX,aAAa,iBAAiB,OAAO,OAAO,SAAS,MAAM,iBACtD,aAAa,OAAO,cACpB,aAAa,OAAO;;;;;ACN5B,SAAgB,QACf,OACA,KACoB;CACpB,MAAM,QAAQC,QAAM,WAAW;CAC/B,MAAMC,aACL,MAAM,SAAS,wBAAwB,YAAY,OAAO,OAAO,OAAO;CACzE,MAAM,YAAY,aAAa,OAAO;AACtC,QAAO,KAAK;;;;;ACAb,SAAgB,YACf,GAAG,QAKgD;CACnD,IAAIC;CACJ,IAAIC;CAEJ,MAAM,CAAC,SAAS;CAChB,IAAIC;AACJ,SAAQ,MAAM,MAAd;EACC,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;AACJ,WAAQC,OAAK;AACb,cAAW,OAAO;AAClB;EACD,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;AACJ,SAAM,OAAO;AACb,WAAQA,OAAK,OAAO;AACpB,cAAW,OAAO;;CAGpB,MAAM,aAAa,MAAM,OAAO;EAAE,SAAS;EAAO,OAAO;;CACzD,MAAM,gBAAgB,MAAM,OAC3B,aAAa,iBAAiB,UAAU,YAAY;CAGrD,MAAM,EAAE,SAAS,eAAe;CAChC,IAAI,EAAE,SAAS,YAAY;AAE3B,KAAI,iBAAiB,SAAS;AAC7B,MAAI,eAAe,UAClB,QAAO;AAER,YAAU,WAAW,UAAU;GAAE,SAAS;GAAM,OAAO;;QACjD;AACN,gBAAc,UAAU;AACxB,MAAI,QAAQ,YAAY,KACvB,WAAU,WAAW,UAAU;GAAE,SAAS;GAAO,OAAO;;OAClD;AACN,WAAQ,UAAU;AAClB,WAAQ,QAAQ;;;AAIlB,QAAO;;;;;ACpER,SAAgB,MAAM,OAAyC;CAC9D,MAAM,QAAQC,QAAM,WAAW;CAC/B,MAAM,KAAKA,QAAM;CACjB,MAAM,WAAW,SAAS,OAAO;CACjC,MAAM,WAAWA,QAAM,OAAO;CAC9B,MAAM,oBAAoB;AACzB,SAAO;GACN,IAAI,SAAS;GACb,QAAQ,SAAS,QAAQ;GACzB,YAAY;AACX,SAAK;;GAEN,YAAY;AACX,SAAK;;;;CAIR,MAAM,OAAOA,QAAM,OAAqB;CACxC,MAAM,iBAAiB;AACtB,MACC,KAAK,QAAQ,OAAO,UAAU,MAC9B,KAAK,QAAQ,WAAW,UAAU,QAAQ,UAC1C,SAAS,YAAY,OACpB;AACD,YAAS,UAAU;AACnB,QAAK,UAAU;;AAEhB,SAAO,KAAK;;AAEb,QAAOA,QAAM,sBACX,aAAa,oBAAoB,OAAO,OAAO,UAAU,MAAM,WAChE,UACA"}
+{"version":3,"file":"index.js","names":["StoreContext: React.Context<RootStore>","React","StoreProvider: React.FC<{\n\tchildren: React.ReactNode\n\tstore?: RootStore\n}>","token: ReadableToken<any, any, any>","React","setter: React.RefObject<\n\t\t(<New extends T>(next: New | ((old: T) => New)) => void) | null\n\t>","React","React","stateToken: MutableAtomToken<any>","StoreContext","value: unknown","state: ReadableState<any, any>","fallback: unknown","key: Canonical","useO","React"],"sources":["../../src/react/store-context.tsx","../../src/react/parse-state-overloads.ts","../../src/react/use-i.ts","../../src/react/use-o.ts","../../src/react/use-json.ts","../../src/react/use-loadable.ts","../../src/react/use-tl.ts"],"sourcesContent":["import type { RootStore } from \"atom.io/internal\"\nimport { IMPLICIT } from \"atom.io/internal\"\nimport * as React from \"react\"\n\nexport const StoreContext: React.Context<RootStore> = React.createContext(\n\tIMPLICIT.STORE,\n)\n\nexport const StoreProvider: React.FC<{\n\tchildren: React.ReactNode\n\tstore?: RootStore\n}> = ({ children, store = IMPLICIT.STORE }) => (\n\t<StoreContext.Provider value={store}>{children}</StoreContext.Provider>\n)\n","import type {\n\tReadableFamilyToken,\n\tReadableToken,\n\tWritableFamilyToken,\n\tWritableToken,\n} from \"atom.io\"\nimport type { Store } from \"atom.io/internal\"\nimport { findInStore } from \"atom.io/internal\"\nimport type { Canonical } from \"atom.io/json\"\n\nexport function parseStateOverloads<T, K extends Canonical, Key extends K, E>(\n\tstore: Store,\n\t...rest: [WritableFamilyToken<T, K, E>, Key] | [WritableToken<T, any, E>]\n): WritableToken<T, K, E>\n\nexport function parseStateOverloads<T, K extends Canonical, Key extends K, E>(\n\tstore: Store,\n\t...rest: [ReadableFamilyToken<T, K, E>, Key] | [ReadableToken<T, any, E>]\n): ReadableToken<T, K, E>\n\nexport function parseStateOverloads<T, K extends Canonical, Key extends K, E>(\n\tstore: Store,\n\t...rest: [ReadableFamilyToken<T, K, E>, Key] | [ReadableToken<T, any, E>]\n): ReadableToken<T, K, E> {\n\tlet token: ReadableToken<any, any, any>\n\tif (rest.length === 2) {\n\t\tconst family = rest[0]\n\t\tconst key = rest[1]\n\n\t\ttoken = findInStore(store, family, key)\n\t} else {\n\t\ttoken = rest[0]\n\t}\n\treturn token\n}\n","import type { WritableFamilyToken, WritableToken } from \"atom.io\"\nimport { setIntoStore } from \"atom.io/internal\"\nimport type { Canonical } from \"atom.io/json\"\nimport * as React from \"react\"\n\nimport { parseStateOverloads } from \"./parse-state-overloads\"\nimport { StoreContext } from \"./store-context\"\n\nexport function useI<T>(\n\ttoken: WritableToken<T, any, any>,\n): <New extends T>(next: New | ((old: T) => New)) => void\n\nexport function useI<T, K extends Canonical, Key extends K>(\n\ttoken: WritableFamilyToken<T, K, any>,\n\tkey: Key,\n): <New extends T>(next: New | ((old: T) => New)) => void\n\nexport function useI<T, K extends Canonical, Key extends K>(\n\t...params: [WritableFamilyToken<T, K, any>, Key] | [WritableToken<T, any, any>]\n): <New extends T>(next: New | ((old: T) => New)) => void {\n\tconst store = React.useContext(StoreContext)\n\tconst token = parseStateOverloads(store, ...params)\n\tconst setter: React.RefObject<\n\t\t(<New extends T>(next: New | ((old: T) => New)) => void) | null\n\t> = React.useRef(null)\n\tsetter.current ??= (next) => {\n\t\tsetIntoStore(store, token, next)\n\t}\n\treturn setter.current\n}\n","import type { ReadableFamilyToken, ReadableToken } from \"atom.io\"\nimport { getFromStore, subscribeToState } from \"atom.io/internal\"\nimport type { Canonical } from \"atom.io/json\"\nimport * as React from \"react\"\n\nimport { parseStateOverloads } from \"./parse-state-overloads\"\nimport { StoreContext } from \"./store-context\"\n\nexport function useO<T, E>(token: ReadableToken<T, any, E>): E | T\n\nexport function useO<T, K extends Canonical, Key extends K, E>(\n\ttoken: ReadableFamilyToken<T, K, E>,\n\tkey: Key,\n): E | T\n\nexport function useO<T, K extends Canonical, Key extends K, E>(\n\t...params: [ReadableFamilyToken<T, K, E>, Key] | [ReadableToken<T, any, E>]\n): E | T {\n\tconst store = React.useContext(StoreContext)\n\tconst token = parseStateOverloads(store, ...params)\n\tconst id = React.useId()\n\treturn React.useSyncExternalStore<E | T>(\n\t\t(dispatch) => subscribeToState(store, token, `use-o:${id}`, dispatch),\n\t\t() => getFromStore(store, token),\n\t\t() => getFromStore(store, token),\n\t)\n}\n","import type { MutableAtomFamilyToken, MutableAtomToken } from \"atom.io\"\nimport type { AsJSON, Transceiver } from \"atom.io/internal\"\nimport { findInStore, getJsonToken } from \"atom.io/internal\"\nimport type { Canonical, Json } from \"atom.io/json\"\nimport * as React from \"react\"\n\nimport { StoreContext } from \"./store-context\"\nimport { useO } from \"./use-o\"\n\nexport function useJSON<T extends Transceiver<any, any, any>>(\n\ttoken: MutableAtomToken<T>,\n): AsJSON<T>\n\nexport function useJSON<\n\tT extends Transceiver<any, any, any>,\n\tK extends Canonical,\n>(token: MutableAtomFamilyToken<T, K>, key: K): AsJSON<T>\n\nexport function useJSON(\n\ttoken: MutableAtomFamilyToken<any, any> | MutableAtomToken<any>,\n\tkey?: Canonical,\n): Json.Serializable {\n\tconst store = React.useContext(StoreContext)\n\tconst stateToken: MutableAtomToken<any> =\n\t\ttoken.type === `mutable_atom_family` ? findInStore(store, token, key) : token\n\tconst jsonToken = getJsonToken(store, stateToken)\n\treturn useO(jsonToken)\n}\n","/** biome-ignore-all lint/correctness/useHookAtTopLevel: params are used in an invariant way */\nimport type { Loadable, ReadableFamilyToken, ReadableToken } from \"atom.io\"\nimport { findInStore, type ReadableState, withdraw } from \"atom.io/internal\"\nimport type { Canonical } from \"atom.io/json\"\nimport { StoreContext, useO } from \"atom.io/react\"\nimport React from \"react\"\n\nexport function useLoadable<T, E>(\n\ttoken: ReadableToken<Loadable<T>, any, E>,\n): `LOADING` | { loading: boolean; value: E | T }\n\nexport function useLoadable<T, K extends Canonical, Key extends K, E>(\n\ttoken: ReadableFamilyToken<Loadable<T>, K, E>,\n\tkey: Key,\n): `LOADING` | { loading: boolean; value: E | T }\n\nexport function useLoadable<T, F extends T, E>(\n\ttoken: ReadableToken<Loadable<T>, any, E>,\n\tfallback: F,\n): { loading: boolean; value: T; error?: E }\n\nexport function useLoadable<\n\tT,\n\tK extends Canonical,\n\tF extends T,\n\tKey extends K,\n\tE,\n>(\n\ttoken: ReadableFamilyToken<Loadable<T>, K, E>,\n\tkey: Key,\n\tfallback: F,\n): { loading: boolean; value: T; error?: E }\n\nexport function useLoadable(\n\t...params:\n\t\t| readonly [ReadableFamilyToken<any, Canonical, any>, Canonical, unknown]\n\t\t| readonly [ReadableFamilyToken<any, Canonical, any>, Canonical]\n\t\t| readonly [ReadableToken<any, any, any>, unknown]\n\t\t| readonly [ReadableToken<any, any, any>]\n): `LOADING` | { loading: boolean; value: unknown; error?: unknown } {\n\tconst store = React.useContext(StoreContext)\n\n\tlet value: unknown\n\tlet state: ReadableState<any, any>\n\tlet fallback: unknown\n\n\tconst [token] = params\n\tlet key: Canonical\n\tswitch (token.type) {\n\t\tcase `atom`:\n\t\tcase `mutable_atom`:\n\t\tcase `readonly_held_selector`:\n\t\tcase `readonly_pure_selector`:\n\t\tcase `writable_held_selector`:\n\t\tcase `writable_pure_selector`:\n\t\t\tvalue = useO(token)\n\t\t\tstate = withdraw(store, token)\n\t\t\tfallback = params[1]\n\t\t\tbreak\n\t\tcase `atom_family`:\n\t\tcase `mutable_atom_family`:\n\t\tcase `readonly_held_selector_family`:\n\t\tcase `readonly_pure_selector_family`:\n\t\tcase `writable_held_selector_family`:\n\t\tcase `writable_pure_selector_family`:\n\t\t\tkey = params[1] as Canonical\n\t\t\tvalue = useO(token, key)\n\t\t\tstate = withdraw(store, findInStore(store, token, key))\n\t\t\tfallback = params[2]\n\t}\n\n\tconst isErr = `catch` in state && state.catch.some((E) => value instanceof E)\n\n\tconst wrapperRef = React.useRef<{\n\t\tloading: boolean\n\t\tvalue: unknown\n\t\terror?: unknown\n\t}>({ loading: false, value: null as unknown })\n\tconst lastLoadedRef = React.useRef(\n\t\tfallback ?? (value instanceof Promise ? `LOADING` : value),\n\t)\n\n\tconst { current: lastLoaded } = lastLoadedRef\n\tlet { current: wrapper } = wrapperRef\n\n\tconst wasErr =\n\t\t`catch` in state && state.catch.some((E) => lastLoaded instanceof E)\n\n\tif (value instanceof Promise) {\n\t\tif (lastLoaded === `LOADING`) {\n\t\t\treturn `LOADING`\n\t\t}\n\t\tif (wasErr && fallback) {\n\t\t\twrapper = wrapperRef.current = {\n\t\t\t\tloading: true,\n\t\t\t\tvalue: fallback,\n\t\t\t\terror: lastLoaded,\n\t\t\t}\n\t\t} else {\n\t\t\twrapper = wrapperRef.current = { loading: true, value: lastLoaded }\n\t\t}\n\t} else {\n\t\tlastLoadedRef.current = value\n\t\tif (wrapper.loading === true) {\n\t\t\tif (isErr && fallback) {\n\t\t\t\twrapper = wrapperRef.current = {\n\t\t\t\t\tloading: false,\n\t\t\t\t\tvalue: fallback,\n\t\t\t\t\terror: value,\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\twrapper = wrapperRef.current = { loading: false, value: value }\n\t\t\t}\n\t\t} else {\n\t\t\tif (isErr && fallback) {\n\t\t\t\twrapper.loading = false\n\t\t\t\twrapper.value = fallback\n\t\t\t\twrapper.error = value\n\t\t\t} else {\n\t\t\t\twrapper.loading = false\n\t\t\t\twrapper.value = value\n\t\t\t\tdelete wrapper.error\n\t\t\t}\n\t\t}\n\t}\n\n\treturn wrapper\n}\n","import type { TimelineToken } from \"atom.io\"\nimport { redo, undo } from \"atom.io\"\nimport { subscribeToTimeline, withdraw } from \"atom.io/internal\"\nimport * as React from \"react\"\n\nimport { StoreContext } from \"./store-context\"\n\nexport type TimelineMeta = {\n\tat: number\n\tlength: number\n\tundo: () => void\n\tredo: () => void\n}\n\nexport function useTL(token: TimelineToken<any>): TimelineMeta {\n\tconst store = React.useContext(StoreContext)\n\tconst id = React.useId()\n\tconst timeline = withdraw(store, token)\n\tconst tokenRef = React.useRef(token)\n\tconst rebuildMeta = () => {\n\t\treturn {\n\t\t\tat: timeline.at,\n\t\t\tlength: timeline.history.length,\n\t\t\tundo: () => {\n\t\t\t\tundo(token)\n\t\t\t},\n\t\t\tredo: () => {\n\t\t\t\tredo(token)\n\t\t\t},\n\t\t}\n\t}\n\tconst meta = React.useRef<TimelineMeta>(rebuildMeta())\n\tconst retrieve = () => {\n\t\tif (\n\t\t\tmeta.current.at !== timeline?.at ||\n\t\t\tmeta.current.length !== timeline?.history.length ||\n\t\t\ttokenRef.current !== token\n\t\t) {\n\t\t\ttokenRef.current = token\n\t\t\tmeta.current = rebuildMeta()\n\t\t}\n\t\treturn meta.current\n\t}\n\treturn React.useSyncExternalStore<TimelineMeta>(\n\t\t(dispatch) => subscribeToTimeline(store, token, `use-tl:${id}`, dispatch),\n\t\tretrieve,\n\t\tretrieve,\n\t)\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.40.4",
+  "version": "0.40.6",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,

package/src/internal/get-state/read-or-compute-value.ts

@@ -2,7 +2,7 @@ import type { ViewOf } from "atom.io"
 
 import type { ReadableState } from ".."
 import { readFromCache, writeToCache } from "../caching"
-import { isFn } from "../is-fn"
+import { safeCompute } from "../safe-compute"
 import type { Store } from "../store"
 
 export function readOrComputeValue<T, E>(
@@ -30,83 +30,10 @@ export function readOrComputeValue<T, E>(
 		case `writable_held_selector`:
 			target.logger.info(`🧮`, state.type, key, `computing value`)
 			return state.getFrom(target)
+		case `writable_pure_selector`:
 		case `readonly_pure_selector`:
-		case `writable_pure_selector`: {
-			let val: E | T
-			target.logger.info(`🧮`, state.type, key, `computing value`)
-			try {
-				val = state.getFrom(target)
-				if (val instanceof Promise) {
-					return (val as Promise<E & T>).catch((thrown) => {
-						target.logger.error(`💥`, state.type, key, `rejected:`, thrown)
-						if (state.catch) {
-							for (const Class of state.catch) {
-								if (thrown instanceof Class) {
-									return thrown
-								}
-							}
-						}
-						throw thrown
-					}) as E | T
-				}
-			} catch (e) {
-				target.logger.error(`💥`, state.type, key, `rejected:`, e)
-				if (state.catch) {
-					for (const Class of state.catch) {
-						if (e instanceof Class) {
-							return writeToCache(target, state, e)
-						}
-					}
-				}
-				throw e
-			}
-			const cachedValue = writeToCache(target, state, val)
-			return cachedValue
-		}
-		case `atom`: {
-			let def: E | T
-			if (isFn(state.default)) {
-				try {
-					def = state.default()
-					if (def instanceof Promise) {
-						def = (def as Promise<T> & T).catch<E | T>((thrown) => {
-							target.logger.error(`💥`, state.type, key, `rejected:`, thrown)
-							if (state.catch) {
-								for (const Class of state.catch) {
-									if (thrown instanceof Class) {
-										return thrown
-									}
-								}
-							}
-							throw thrown
-						}) as E | T
-					}
-				} catch (e) {
-					target.logger.error(`💥`, state.type, key, `rejected:`, e)
-					if (state.catch) {
-						for (const Class of state.catch) {
-							if (e instanceof Class) {
-								def = writeToCache(target, state, e)
-								target.logger.info(
-									`✨`,
-									state.type,
-									key,
-									`computed default`,
-									def,
-								)
-								return def
-							}
-						}
-					}
-					throw e
-				}
-			} else {
-				def = state.default
-				target.logger.info(`✨`, state.type, key, `using static default`, def)
-			}
-			const cachedValue = writeToCache(target, state, def)
-			return cachedValue
-		}
+		case `atom`:
+			return safeCompute(target, state)
 		case `mutable_atom`: {
 			const instance = new state.class()
 			target.logger.info(`✨`, state.type, key, `created new instance`, instance)

package/src/internal/safe-compute.ts

@@ -0,0 +1,90 @@
+import type { PureSelector, RegularAtom } from "."
+import { writeToCache } from "./caching"
+import { isFn } from "./is-fn"
+import type { Store } from "./store"
+
+export function safeCompute<T, E>(
+	target: Store,
+	state: PureSelector<T, E> | RegularAtom<T, E>,
+): E | T {
+	const { type, key, catch: canCatch } = state
+	switch (type) {
+		case `readonly_pure_selector`:
+		case `writable_pure_selector`: {
+			let val: E | T
+			target.logger.info(`🧮`, type, key, `computing value`)
+			try {
+				val = state.getFrom(target)
+				if (val instanceof Promise) {
+					return (val as Promise<E & T>).catch((thrown) => {
+						target.logger.error(`💥`, type, key, `rejected:`, thrown)
+						if (canCatch) {
+							for (const Class of canCatch) {
+								if (thrown instanceof Class) {
+									return thrown
+								}
+							}
+						}
+						throw thrown
+					}) as E | T
+				}
+			} catch (e) {
+				target.logger.error(`💥`, type, key, `rejected:`, e)
+				if (canCatch) {
+					for (const Class of canCatch) {
+						if (e instanceof Class) {
+							return writeToCache(target, state, e)
+						}
+					}
+				}
+				throw e
+			}
+			const cachedValue = writeToCache(target, state, val)
+			return cachedValue
+		}
+		case `atom`: {
+			let def: E | T
+			if (isFn(state.default)) {
+				try {
+					def = state.default()
+					if (def instanceof Promise) {
+						def = (def as Promise<T> & T).catch<E | T>((thrown) => {
+							target.logger.error(`💥`, type, key, `rejected:`, thrown)
+							if (canCatch) {
+								for (const Class of canCatch) {
+									if (thrown instanceof Class) {
+										return thrown
+									}
+								}
+							}
+							throw thrown
+						}) as E | T
+					}
+				} catch (e) {
+					target.logger.error(`💥`, type, key, `rejected:`, e)
+					if (canCatch) {
+						for (const Class of canCatch) {
+							if (e instanceof Class) {
+								def = writeToCache(target, state, e)
+								target.logger.info(
+									`✨`,
+									state.type,
+									key,
+									`computed default`,
+									def,
+								)
+								return def
+							}
+						}
+					}
+					throw e
+				}
+			} else {
+				def = state.default
+				target.logger.info(`✨`, state.type, key, `using static default`, def)
+			}
+			const cachedValue = writeToCache(target, state, def)
+			return cachedValue
+		}
+	}
+}

package/src/internal/set-state/reset-atom-or-selector.ts

@@ -1,6 +1,7 @@
 import type { Atom, OpenOperation, Store, WritableState } from ".."
 import { traceRootSelectorAtoms } from ".."
 import { isFn } from "../is-fn"
+import { safeCompute } from "../safe-compute"
 import { dispatchOrDeferStateUpdate } from "./dispatch-state-update"
 import type { ProtoUpdate } from "./operate-on-store"
 import { setAtom } from "./set-atom"
@@ -13,8 +14,9 @@ function resetAtom<T, E>(
 		case `mutable_atom`:
 			return setAtom(target, atom, new atom.class())
 		case `atom`: {
-			let def = atom.default
-			if (isFn(def)) def = def()
+			let def: E | T
+			if (isFn(atom.default)) def = safeCompute(target, atom)
+			else def = atom.default
 			return setAtom(target, atom, def)
 		}
 	}
@@ -30,16 +32,26 @@ export function resetAtomOrSelector<T, E>(
 		case `mutable_atom`:
 			protoUpdate = resetAtom(target, state)
 			break
-		case `writable_pure_selector`:
 		case `writable_held_selector`:
 			{
-				const oldValue = state.getFrom(target)
 				const atoms = traceRootSelectorAtoms(target, state.key)
 				for (const atom of atoms.values()) {
 					const rootProtoUpdate = resetAtom(target, atom)
 					dispatchOrDeferStateUpdate(target, state, rootProtoUpdate, false)
 				}
-				const newValue = state.getFrom(target)
+				const value = state.getFrom(target)
+				protoUpdate = { oldValue: value, newValue: value }
+			}
+			break
+		case `writable_pure_selector`:
+			{
+				const oldValue = safeCompute(target, state)
+				const atoms = traceRootSelectorAtoms(target, state.key)
+				for (const atom of atoms.values()) {
+					const rootProtoUpdate = resetAtom(target, atom)
+					dispatchOrDeferStateUpdate(target, state, rootProtoUpdate, false)
+				}
+				const newValue = safeCompute(target, state)
 				protoUpdate = { oldValue, newValue }
 			}
 			break

package/src/react/use-loadable.ts

@@ -1,28 +1,35 @@
 /** biome-ignore-all lint/correctness/useHookAtTopLevel: params are used in an invariant way */
 import type { Loadable, ReadableFamilyToken, ReadableToken } from "atom.io"
+import { findInStore, type ReadableState, withdraw } from "atom.io/internal"
 import type { Canonical } from "atom.io/json"
-import { useO } from "atom.io/react"
+import { StoreContext, useO } from "atom.io/react"
 import React from "react"
 
 export function useLoadable<T, E>(
 	token: ReadableToken<Loadable<T>, any, E>,
 ): `LOADING` | { loading: boolean; value: E | T }
 
-export function useLoadable<T, K extends Canonical, E>(
+export function useLoadable<T, K extends Canonical, Key extends K, E>(
 	token: ReadableFamilyToken<Loadable<T>, K, E>,
-	key: K,
+	key: Key,
 ): `LOADING` | { loading: boolean; value: E | T }
 
 export function useLoadable<T, F extends T, E>(
 	token: ReadableToken<Loadable<T>, any, E>,
 	fallback: F,
-): { loading: boolean; value: T }
+): { loading: boolean; value: T; error?: E }
 
-export function useLoadable<T, K extends Canonical, F extends T, E>(
+export function useLoadable<
+	T,
+	K extends Canonical,
+	F extends T,
+	Key extends K,
+	E,
+>(
 	token: ReadableFamilyToken<Loadable<T>, K, E>,
-	key: K,
+	key: Key,
 	fallback: F,
-): { loading: boolean; value: E | T }
+): { loading: boolean; value: T; error?: E }
 
 export function useLoadable(
 	...params:
@@ -30,8 +37,11 @@ export function useLoadable(
 		| readonly [ReadableFamilyToken<any, Canonical, any>, Canonical]
 		| readonly [ReadableToken<any, any, any>, unknown]
 		| readonly [ReadableToken<any, any, any>]
-): `LOADING` | { loading: boolean; value: unknown } {
-	let state: unknown
+): `LOADING` | { loading: boolean; value: unknown; error?: unknown } {
+	const store = React.useContext(StoreContext)
+
+	let value: unknown
+	let state: ReadableState<any, any>
 	let fallback: unknown
 
 	const [token] = params
@@ -43,7 +53,8 @@ export function useLoadable(
 		case `readonly_pure_selector`:
 		case `writable_held_selector`:
 		case `writable_pure_selector`:
-			state = useO(token)
+			value = useO(token)
+			state = withdraw(store, token)
 			fallback = params[1]
 			break
 		case `atom_family`:
@@ -53,30 +64,63 @@ export function useLoadable(
 		case `writable_held_selector_family`:
 		case `writable_pure_selector_family`:
 			key = params[1] as Canonical
-			state = useO(token, key)
+			value = useO(token, key)
+			state = withdraw(store, findInStore(store, token, key))
 			fallback = params[2]
 	}
 
-	const wrapperRef = React.useRef({ loading: false, value: null as unknown })
+	const isErr = `catch` in state && state.catch.some((E) => value instanceof E)
+
+	const wrapperRef = React.useRef<{
+		loading: boolean
+		value: unknown
+		error?: unknown
+	}>({ loading: false, value: null as unknown })
 	const lastLoadedRef = React.useRef(
-		fallback ?? (state instanceof Promise ? `LOADING` : state),
+		fallback ?? (value instanceof Promise ? `LOADING` : value),
 	)
 
 	const { current: lastLoaded } = lastLoadedRef
 	let { current: wrapper } = wrapperRef
 
-	if (state instanceof Promise) {
+	const wasErr =
+		`catch` in state && state.catch.some((E) => lastLoaded instanceof E)
+
+	if (value instanceof Promise) {
 		if (lastLoaded === `LOADING`) {
 			return `LOADING`
 		}
-		wrapper = wrapperRef.current = { loading: true, value: lastLoaded }
+		if (wasErr && fallback) {
+			wrapper = wrapperRef.current = {
+				loading: true,
+				value: fallback,
+				error: lastLoaded,
+			}
+		} else {
+			wrapper = wrapperRef.current = { loading: true, value: lastLoaded }
+		}
 	} else {
-		lastLoadedRef.current = state
+		lastLoadedRef.current = value
 		if (wrapper.loading === true) {
-			wrapper = wrapperRef.current = { loading: false, value: state }
+			if (isErr && fallback) {
+				wrapper = wrapperRef.current = {
+					loading: false,
+					value: fallback,
+					error: value,
+				}
+			} else {
+				wrapper = wrapperRef.current = { loading: false, value: value }
+			}
 		} else {
-			wrapper.loading = false
-			wrapper.value = state
+			if (isErr && fallback) {
+				wrapper.loading = false
+				wrapper.value = fallback
+				wrapper.error = value
+			} else {
+				wrapper.loading = false
+				wrapper.value = value
+				delete wrapper.error
+			}
 		}
 	}