atom.io 0.37.0 → 0.37.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.37.0",
+  "version": "0.37.1",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,
@@ -99,7 +99,7 @@
     "tsdown": "0.14.1",
     "tsx": "4.20.4",
     "typescript": "5.9.2",
-    "vite": "7.1.2",
+    "vite": "7.1.3",
     "vite-tsconfig-paths": "5.1.4",
     "vitest": "3.2.4",
     "zod": "3.25.76",

package/src/internal/atom/dispose-atom.ts

@@ -1,9 +1,10 @@
-import type { AtomDisposalEvent, AtomToken } from "atom.io"
+import type { AtomDisposalEvent, AtomToken, StateLifecycleEvent } from "atom.io"
 
-import type { Store } from ".."
+import type { Store, Subject } from ".."
 import { getUpdateToken, isChildStore, newest, withdraw } from ".."
+import { getFamilyOfToken } from "../families/get-family-of-token"
 
-export function disposeAtom(store: Store, atomToken: AtomToken<unknown>): void {
+export function disposeAtom(store: Store, atomToken: AtomToken<any>): void {
 	const target = newest(store)
 	const { key, family } = atomToken
 	const atom = withdraw(target, atomToken)
@@ -12,9 +13,14 @@ export function disposeAtom(store: Store, atomToken: AtomToken<unknown>): void {
 	} else {
 		atom.cleanup?.()
 		const lastValue = store.valueMap.get(atom.key)
-		const atomFamily = withdraw(store, { key: family.key, type: `atom_family` })
-
-		const disposal: AtomDisposalEvent<AtomToken<unknown>> = {
+		// biome-ignore lint/style/noNonNullAssertion: family has been verified
+		const familyToken = getFamilyOfToken(store, atomToken)!
+		const atomFamily = withdraw(store, familyToken)
+		const subject = atomFamily.subject as Subject<
+			StateLifecycleEvent<AtomToken<any>>
+		>
+
+		const disposal: AtomDisposalEvent<AtomToken<any>> = {
 			type: `state_disposal`,
 			subType: `atom`,
 			token: atomToken,
@@ -22,7 +28,7 @@ export function disposeAtom(store: Store, atomToken: AtomToken<unknown>): void {
 			timestamp: Date.now(),
 		}
 
-		atomFamily.subject.next(disposal)
+		subject.next(disposal)
 
 		const isChild = isChildStore(target)
 

package/src/internal/families/create-regular-atom-family.ts

@@ -61,12 +61,15 @@ export function createRegularAtomFamily<T, K extends Canonical>(
 	}
 
 	const atomFamily = Object.assign(familyFunction, familyToken, {
+		default: options.default,
 		subject,
 		install: (s: Store) => createRegularAtomFamily(s, options),
 		internalRoles,
 	}) satisfies RegularAtomFamily<T, K>
 
 	store.families.set(options.key, atomFamily)
-	store.defaults.set(options.key, options.default)
+	if (options.default instanceof Function === false) {
+		store.defaults.set(options.key, options.default)
+	}
 	return familyToken
 }

package/src/internal/get-state/get-from-store.ts

@@ -1,5 +1,5 @@
 import type { ReadableFamilyToken, ReadableToken } from "atom.io"
-import type { Canonical } from "atom.io/json"
+import { type Canonical, parseJson } from "atom.io/json"
 
 import { findInStore } from "../families"
 import type { Store } from "../store"
@@ -47,9 +47,23 @@ export function getFromStore(
 				: `No previous disposal trace was found.`,
 		)
 		switch (family.type) {
-			case `atom_family`:
-			case `mutable_atom_family`:
-				return store.defaults.get(family.key)
+			case `mutable_atom_family`: {
+				if (store.defaults.has(family.key)) {
+					return store.defaults.get(family.key)
+				}
+				const mutableFamily = withdraw(store, family)
+				const defaultValue = new mutableFamily.class()
+				store.defaults.set(family.key, defaultValue)
+				return defaultValue
+			}
+			case `atom_family`: {
+				if (store.defaults.has(family.key)) {
+					return store.defaults.get(token.family.key)
+				}
+				const defaultValue = withdraw(store, family).default(parseJson(subKey))
+				store.defaults.set(family.key, defaultValue)
+				return defaultValue
+			}
 			case `readonly_pure_selector_family`:
 			case `writable_pure_selector_family`:
 			case `readonly_held_selector_family`:
@@ -57,8 +71,7 @@ export function getFromStore(
 				if (store.defaults.has(family.key)) {
 					return store.defaults.get(token.family.key)
 				}
-				3
-				const defaultValue = withdraw(store, family).default(subKey)
+				const defaultValue = withdraw(store, family).default(parseJson(subKey))
 				store.defaults.set(family.key, defaultValue)
 				return defaultValue
 			}

package/src/internal/index.ts

@@ -1,5 +1,4 @@
 import type {
-	AtomToken,
 	FamilyMetadata,
 	MutableAtomFamilyToken,
 	MutableAtomToken,
@@ -9,8 +8,6 @@ import type {
 	ReadonlyPureSelectorToken,
 	RegularAtomFamilyToken,
 	RegularAtomToken,
-	StateCreationEvent,
-	StateDisposalEvent,
 	StateLifecycleEvent,
 	StateUpdate,
 	WritableHeldSelectorFamilyToken,
@@ -131,23 +128,26 @@ export type ReadableState<T> = Atom<T> | Selector<T>
 
 // biome-ignore format: intersection
 export type RegularAtomFamily<T, K extends Canonical> =
-	& RegularAtomFamilyToken<T, K>
-	& {
-		(key: K): RegularAtomToken<T>
-		install: (store: Store) => void
-		internalRoles: string[] | undefined
-		subject: Subject<StateCreationEvent<AtomToken<T>> | StateDisposalEvent<AtomToken<T>>>
-	}
+	& Flat<
+		& RegularAtomFamilyToken<T, K>
+		& {
+			default: T | ((key: K) => T)
+			install: (store: Store) => void
+			internalRoles: string[] | undefined
+			subject: Subject<StateLifecycleEvent<RegularAtomToken<T>>>
+		}
+	>
+	& ((key: K) => RegularAtomToken<T>)
 
 // biome-ignore format: intersection
 export type MutableAtomFamily<
-	// C extends TransceiverConstructor<any,any>,
 	T extends Transceiver<any, any, any>,
 	K extends Canonical,
 > =
 	& Flat<
 		& MutableAtomFamilyToken<T, K>
 		& {
+				class: ConstructorOf<T>
 				install: (store: Store) => void
 				internalRoles: string[] | undefined
 				subject: Subject<StateLifecycleEvent<MutableAtomToken<T>>>
@@ -167,13 +167,10 @@ export type WritablePureSelectorFamily<T, K extends Canonical> =
 			default: (key: K) => T,
 			install: (store: Store) => void
 			internalRoles: string[] | undefined
-			subject: Subject<
-				| StateCreationEvent<WritablePureSelectorToken<T>>
-				| StateDisposalEvent<WritablePureSelectorToken<T>>
-			>
+			subject: Subject<StateLifecycleEvent<WritablePureSelectorToken<T>>>
 		}
 	>
-  & ((key: K) => WritablePureSelectorToken<T>)
+	& ((key: K) => WritablePureSelectorToken<T>)
 
 // biome-ignore format: intersection
 export type WritableHeldSelectorFamily<T , K extends Canonical> =
@@ -183,13 +180,10 @@ export type WritableHeldSelectorFamily<T , K extends Canonical> =
 			default: (key: K) => T,
 			install: (store: Store) => void
 			internalRoles: string[] | undefined
-			subject: Subject<
-				| StateCreationEvent<WritableHeldSelectorToken<T>>
-				| StateDisposalEvent<WritableHeldSelectorToken<T>>
-			>
+			subject: Subject<StateLifecycleEvent<WritableHeldSelectorToken<T>>>
 		}
 	>
-  & ((key: K) => WritableHeldSelectorToken<T>)
+	& ((key: K) => WritableHeldSelectorToken<T>)
 
 // biome-ignore format: intersection
 export type ReadonlyPureSelectorFamily<T, K extends Canonical> =
@@ -199,10 +193,7 @@ export type ReadonlyPureSelectorFamily<T, K extends Canonical> =
 			default: (key: K) => T,
 			install: (store: Store) => void
 			internalRoles: string[] | undefined
-			subject: Subject<
-				| StateCreationEvent<ReadonlyPureSelectorToken<T>>
-				| StateDisposalEvent<ReadonlyPureSelectorToken<T>>
-			>
+			subject: Subject<StateLifecycleEvent<ReadonlyPureSelectorToken<T>>>
 		}
 	>
 	& ((key: K) => ReadonlyPureSelectorToken<T>)
@@ -215,10 +206,7 @@ export type ReadonlyHeldSelectorFamily<T , K extends Canonical> =
 			default: (key: K) => T,
 			install: (store: Store) => void
 			internalRoles: string[] | undefined
-			subject: Subject<
-				| StateCreationEvent<ReadonlyHeldSelectorToken<T>>
-				| StateDisposalEvent<ReadonlyHeldSelectorToken<T>>
-			>
+			subject: Subject<StateLifecycleEvent<ReadonlyHeldSelectorToken<T>>>
 		}
 	>
 	& ((key: K) => ReadonlyHeldSelectorToken<T>)

package/src/internal/mutable/create-mutable-atom-family.ts

@@ -70,6 +70,7 @@ export function createMutableAtomFamily<
 	}
 
 	const atomFamily = Object.assign(familyFunction, familyToken, {
+		class: options.class,
 		subject,
 		install: (s: Store) => createMutableAtomFamily(s, options),
 		internalRoles,