atom.io 0.27.1 → 0.27.3

package/src/atom.ts

@@ -1,4 +1,4 @@
-import type { Store, Subject, Transceiver } from "atom.io/internal"
+import type { Transceiver } from "atom.io/internal"
 import {
 	createAtomFamily,
 	createStandaloneAtom,
@@ -6,13 +6,7 @@ import {
 } from "atom.io/internal"
 import type { Canonical, Json, JsonInterface } from "atom.io/json"
 
-import type {
-	AtomToken,
-	MutableAtomToken,
-	RegularAtomToken,
-	StateCreation,
-	StateDisposal,
-} from "."
+import type { AtomToken, MutableAtomToken, RegularAtomToken } from "."
 
 export type Effectors<T> = {
 	setSelf: <V extends T>(next: V | ((oldValue: T) => V)) => void
@@ -74,14 +68,6 @@ export type RegularAtomFamilyToken<T, K extends Canonical> = {
 	__T?: T
 	__K?: K
 }
-// biome-ignore format: intersection
-export type RegularAtomFamily<T, K extends Canonical> = 
-	& RegularAtomFamilyToken<T, K>
-	& {
-		(key: K): RegularAtomToken<T>
-		subject: Subject<StateCreation<AtomToken<T>> | StateDisposal<AtomToken<T>>>
-		install: (store: Store) => void
-	}
 
 // biome-ignore format: intersection
 export type MutableAtomFamilyOptions<
@@ -108,23 +94,7 @@ export type MutableAtomFamilyToken<
 	__J?: J
 	__K?: K
 }
-// biome-ignore format: intersection
-export type MutableAtomFamily<
-	T extends Transceiver<any>,
-	J extends Json.Serializable,
-	K extends Canonical,
-> = 
-	& JsonInterface<T, J>
-	& MutableAtomFamilyToken<T, J, K>
-	& {
-			(key: K): MutableAtomToken<T, J>
-			subject: Subject<StateCreation<MutableAtomToken<T, J>> | StateDisposal<MutableAtomToken<T, J>>>
-			install: (store: Store) => void
-		}
 
-export type AtomFamily<T, K extends Canonical = Canonical> =
-	| MutableAtomFamily<T extends Transceiver<any> ? T : never, any, K>
-	| RegularAtomFamily<T, K>
 export type AtomFamilyToken<T, K extends Canonical = Canonical> =
 	| MutableAtomFamilyToken<T extends Transceiver<any> ? T : never, any, K>
 	| RegularAtomFamilyToken<T, K>

package/src/get-state.ts

@@ -15,9 +15,9 @@ export function getState<M extends MoleculeConstructor>(
 	token: MoleculeToken<M>,
 ): InstanceType<M>
 
-export function getState<T, K extends Canonical>(
+export function getState<T, K extends Canonical, Key extends K>(
 	token: ReadableFamilyToken<T, K>,
-	key: K,
+	key: Key,
 ): T
 
 export function getState<M extends MoleculeConstructor>(

package/src/index.ts

@@ -1,11 +1,9 @@
 import type { Transceiver } from "atom.io/internal"
 import type { Canonical, Json } from "atom.io/json"
 
-import type { AtomFamily, AtomFamilyToken } from "./atom"
+import type { AtomFamilyToken } from "./atom"
 import type {
-	SelectorFamily,
 	SelectorFamilyToken,
-	WritableSelectorFamily,
 	WritableSelectorFamilyToken,
 } from "./selector"
 
@@ -61,13 +59,6 @@ export type SelectorToken<T> =
 export type WritableToken<T> = AtomToken<T> | WritableSelectorToken<T>
 export type ReadableToken<T> = AtomToken<T> | SelectorToken<T>
 
-export type WritableFamily<T, K extends Canonical> =
-	| AtomFamily<T, K>
-	| WritableSelectorFamily<T, K>
-export type ReadableFamily<T, K extends Canonical> =
-	| AtomFamily<T, K>
-	| SelectorFamily<T, K>
-
 export type WritableFamilyToken<T, K extends Canonical> =
 	| AtomFamilyToken<T, K>
 	| WritableSelectorFamilyToken<T, K>

package/src/selector.ts

@@ -1,4 +1,3 @@
-import type { Store, Subject } from "atom.io/internal"
 import {
 	createSelectorFamily,
 	createStandaloneSelector,
@@ -7,7 +6,7 @@ import {
 import type { Canonical } from "atom.io/json"
 
 import type { ReadonlySelectorToken, WritableSelectorToken } from "."
-import type { Read, StateCreation, StateDisposal, Write } from "./transaction"
+import type { Read, Write } from "./transaction"
 
 export type WritableSelectorOptions<T> = {
 	key: string
@@ -48,15 +47,6 @@ export type WritableSelectorFamilyToken<T, K extends Canonical> = {
 	__K?: K
 }
 
-// biome-ignore format: intersection
-export type WritableSelectorFamily<T, K extends Canonical> = 
-	& WritableSelectorFamilyToken<T, K> 
-	& {
-		(key: K): WritableSelectorToken<T>
-		subject: Subject<StateCreation<WritableSelectorToken<T>> | StateDisposal<WritableSelectorToken<T>>>
-		install: (store: Store) => void
-	}
-
 export type ReadonlySelectorFamilyToken<T, K extends Canonical> = {
 	key: string
 	type: `readonly_selector_family`
@@ -64,21 +54,6 @@ export type ReadonlySelectorFamilyToken<T, K extends Canonical> = {
 	__K?: K
 }
 
-// biome-ignore format: intersection
-export type ReadonlySelectorFamily<T, K extends Canonical> = 
-	& ((key: K) => ReadonlySelectorToken<T>)
-	& {
-		key: string
-		type: `readonly_selector_family`
-		subject: Subject<StateCreation<ReadonlySelectorToken<T>> | StateDisposal<ReadonlySelectorToken<T>>>
-		install: (store: Store) => void
-		__T?: T
-		__K?: K
-	}
-
-export type SelectorFamily<T, K extends Canonical> =
-	| ReadonlySelectorFamily<T, K>
-	| WritableSelectorFamily<T, K>
 export type SelectorFamilyToken<T, K extends Canonical> =
 	| ReadonlySelectorFamilyToken<T, K>
 	| WritableSelectorFamilyToken<T, K>

package/src/set-state.ts

@@ -25,9 +25,9 @@ export function setState<T, New extends T>(
  * @param value - The new value of the state.
  * @overload Streamlined
  */
-export function setState<T, K extends Canonical, New extends T>(
+export function setState<T, K extends Canonical, New extends T, Key extends K>(
 	token: WritableFamilyToken<T, K>,
-	key: K,
+	key: Key,
 	value: New | ((oldValue: T) => New),
 ): void
 

package/src/silo.ts

@@ -24,13 +24,13 @@ import type {
 	getState,
 	makeMolecule,
 	moleculeFamily,
-	MutableAtomFamily,
 	MutableAtomFamilyOptions,
+	MutableAtomFamilyToken,
 	MutableAtomOptions,
 	MutableAtomToken,
 	redo,
-	RegularAtomFamily,
 	RegularAtomFamilyOptions,
+	RegularAtomFamilyToken,
 	RegularAtomOptions,
 	RegularAtomToken,
 	setState,
@@ -74,15 +74,17 @@ export class Silo {
 			T extends Transceiver<any>,
 			J extends Json.Serializable,
 			K extends Canonical,
-		>(options: MutableAtomFamilyOptions<T, J, K>): MutableAtomFamily<T, J, K>
+		>(
+			options: MutableAtomFamilyOptions<T, J, K>,
+		): MutableAtomFamilyToken<T, J, K>
 		function _atomFamily<T, K extends Canonical>(
 			options: RegularAtomFamilyOptions<T, K>,
-		): RegularAtomFamily<T, K>
+		): RegularAtomFamilyToken<T, K>
 		function _atomFamily<T, K extends Canonical>(
 			options:
 				| MutableAtomFamilyOptions<any, any, any>
 				| RegularAtomFamilyOptions<T, K>,
-		): MutableAtomFamily<any, any, any> | RegularAtomFamily<T, K> {
+		): MutableAtomFamilyToken<any, any, any> | RegularAtomFamilyToken<T, K> {
 			return createAtomFamily(options, s)
 		}
 		this.store = s