atom.io 0.21.0 → 0.22.0

package/realtime-testing/src/setup-realtime-test.tsx

@@ -76,7 +76,10 @@ export const setupRealtimeTestServer = (
 	options: TestSetupOptions,
 ): RealtimeTestServer => {
 	++testNumber
-	const silo = new AtomIO.Silo(`SERVER-${testNumber}`, IMPLICIT.STORE)
+	const silo = new AtomIO.Silo(
+		{ name: `SERVER-${testNumber}`, lifespan: `ephemeral` },
+		IMPLICIT.STORE,
+	)
 
 	const httpServer = http.createServer((_, res) => res.end(`Hello World!`))
 	const address = httpServer.listen(options.port).address()
@@ -139,7 +142,7 @@ export const setupRealtimeTestClient = (
 		const socket: ClientSocket = io(`http://localhost:${port}/`, {
 			auth: { token: `test`, username: `${name}-${testNumber}` },
 		})
-		const silo = new AtomIO.Silo(name, IMPLICIT.STORE)
+		const silo = new AtomIO.Silo({ name, lifespan: `ephemeral` }, IMPLICIT.STORE)
 		for (const [key, value] of silo.store.valueMap.entries()) {
 			if (Array.isArray(value)) {
 				silo.store.valueMap.set(key, [...value])

package/src/atom.ts

@@ -57,8 +57,11 @@ export type RegularAtomFamilyTokenWithCall<
 	K extends Json.Serializable,
 > = 
 	& RegularAtomFamilyToken<T, K>
-	& /** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
-((key: K) => RegularAtomToken<T>)
+	& {
+		/** @deprecated In ephemeral stores, prefer the `findState`, `findInStore`, or `find` functions. In immortal stores, prefer the `seekState`, `seekInStore`, or `seek` functions. */
+		/* eslint-disable-next-line @typescript-eslint/prefer-function-type */
+		(key: K): RegularAtomToken<T>
+	}
 // biome-ignore format: intersection
 export type RegularAtomFamily<T, K extends Json.Serializable> = 
 	& RegularAtomFamilyToken<T, K>
@@ -100,8 +103,11 @@ export type MutableAtomFamilyTokenWithCall<
 	K extends Json.Serializable,
 > = 
 	& MutableAtomFamilyToken<T, J, K>
-	& /** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
-((key: K) => MutableAtomToken<T, J>)
+	& {
+		/** @deprecated In ephemeral stores, prefer the `findState`, `findInStore`, or `find` functions. In immortal stores, prefer the `seekState`, `seekInStore`, or `seek` functions. */
+		/* eslint-disable-next-line @typescript-eslint/prefer-function-type */	
+		(key: K): MutableAtomToken<T, J>
+	}
 // biome-ignore format: intersection
 export type MutableAtomFamily<
 	T extends Transceiver<any>,

package/src/index.ts

@@ -10,8 +10,7 @@ import type {
 } from "./selector"
 
 export * from "./atom"
-export * from "./dispose"
-export * from "./find-state"
+export * from "./dispose-state"
 export * from "./get-state"
 export * from "./logger"
 export * from "./selector"

package/src/selector.ts

@@ -53,8 +53,11 @@ export type WritableSelectorFamilyTokenWithCall<
 	K extends Json.Serializable,
 > = 
 	& WritableSelectorFamilyToken<T, K>
-	& /** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
-((key: K) => WritableSelectorToken<T>)
+	& {
+		/** @deprecated In ephemeral stores, prefer the `findState`, `findInStore`, or `find` functions. In immortal stores, prefer the `seekState`, `seekInStore`, or `seek` functions. */
+		/* eslint-disable-next-line @typescript-eslint/prefer-function-type */
+		(key: K): WritableSelectorToken<T>
+	}
 // biome-ignore format: intersection
 export type WritableSelectorFamily<T, K extends Json.Serializable> = 
 	& WritableSelectorFamilyToken<T, K> 
@@ -76,8 +79,11 @@ export type ReadonlySelectorFamilyTokenWithCall<
 	K extends Json.Serializable,
 > = 
 	& ReadonlySelectorFamilyToken<T, K>
-	& /** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
-((key: K) => ReadonlySelectorToken<T>)
+	& {
+		/** @deprecated In ephemeral stores, prefer the `findState`, `findInStore`, or `find` functions. In immortal stores, prefer the `seekState`, `seekInStore`, or `seek` functions. */
+		/* eslint-disable-next-line @typescript-eslint/prefer-function-type */
+		(key: K): ReadonlySelectorToken<T>
+	}
 // biome-ignore format: intersection
 export type ReadonlySelectorFamily<T, K extends Json.Serializable> = 
 	& ((key: K) => ReadonlySelectorToken<T>)

package/src/silo.ts

@@ -1,3 +1,4 @@
+import type { findState } from "atom.io/ephemeral"
 import type { Transceiver } from "atom.io/internal"
 import {
 	createAtomFamily,
@@ -16,7 +17,6 @@ import type { Json } from "atom.io/json"
 
 import type {
 	AtomToken,
-	findState,
 	getState,
 	MutableAtomFamily,
 	MutableAtomFamilyOptions,
@@ -50,8 +50,8 @@ export class Silo {
 	public subscribe: typeof subscribe
 	public undo: typeof undo
 	public redo: typeof redo
-	public constructor(name: string, fromStore: Store | null = null) {
-		const s = new Store(name, fromStore)
+	public constructor(config: Store[`config`], fromStore: Store | null = null) {
+		const s = new Store(config, fromStore)
 		function _atom<T>(options: RegularAtomOptions<T>): RegularAtomToken<T>
 		function _atom<T extends Transceiver<any>, J extends Json.Serializable>(
 			options: MutableAtomOptions<T, J>,

package/src/transaction.ts

@@ -1,3 +1,4 @@
+import type { findState } from "atom.io/ephemeral"
 import type { EnvironmentData } from "atom.io/internal"
 import {
 	actUponStore,
@@ -6,8 +7,8 @@ import {
 	IMPLICIT,
 } from "atom.io/internal"
 
+import type { seekState } from "../immortal/src/seek-state"
 import type {
-	findState,
 	Func,
 	KeyedStateUpdate,
 	ReadonlySelectorToken,
@@ -40,6 +41,7 @@ export type Transactors = Readonly<{
 		newValue: New | ((oldValue: S) => New),
 	) => void
 	find: typeof findState
+	seek: typeof seekState
 }>
 export type TransactorsWithRunAndEnv = Readonly<{
 	get: <S>(state: ReadonlySelectorToken<S> | WritableToken<S>) => S
@@ -48,10 +50,11 @@ export type TransactorsWithRunAndEnv = Readonly<{
 		newValue: New | ((oldValue: S) => New),
 	) => void
 	find: typeof findState
+	seek: typeof seekState
 	run: typeof runTransaction
 	env: () => EnvironmentData
 }>
-export type ReadonlyTransactors = Pick<Transactors, `find` | `get`>
+export type ReadonlyTransactors = Pick<Transactors, `find` | `get` | `seek`>
 
 export type Read<F extends Func> = (
 	transactors: ReadonlyTransactors,

package/src/validators.ts

@@ -1,19 +1,13 @@
 import type {
-	MutableAtomFamily,
 	MutableAtomFamilyToken,
 	MutableAtomToken,
-	ReadableFamily,
 	ReadableFamilyToken,
 	ReadableToken,
-	ReadonlySelectorFamily,
 	ReadonlySelectorFamilyToken,
 	ReadonlySelectorToken,
-	RegularAtomFamily,
 	RegularAtomFamilyToken,
 	RegularAtomToken,
-	WritableFamily,
 	WritableFamilyToken,
-	WritableSelectorFamily,
 	WritableSelectorFamilyToken,
 	WritableSelectorToken,
 	WritableToken,

package/internal/src/store/withdraw-new-family-member.ts

@@ -1,69 +0,0 @@
-import type {
-	ReadableToken,
-	ReadonlySelectorToken,
-	RegularAtomToken,
-	WritableSelectorToken,
-	WritableToken,
-} from "atom.io"
-
-import type {
-	Atom,
-	ReadableState,
-	ReadonlySelector,
-	Store,
-	WritableSelector,
-	WritableState,
-} from ".."
-import { newest, NotFoundError, withdraw } from ".."
-
-export function withdrawOrCreate<T>(
-	token: RegularAtomToken<T>,
-	store: Store,
-): Atom<T>
-export function withdrawOrCreate<T>(
-	token: WritableSelectorToken<T>,
-	store: Store,
-): WritableSelector<T>
-export function withdrawOrCreate<T>(
-	token: ReadonlySelectorToken<T>,
-	store: Store,
-): ReadonlySelector<T>
-export function withdrawOrCreate<T>(
-	token: WritableToken<T>,
-	store: Store,
-): WritableState<T>
-export function withdrawOrCreate<T>(
-	token: ReadableToken<T>,
-	store: Store,
-): ReadableState<T>
-export function withdrawOrCreate<T>(
-	token: ReadableToken<T>,
-	store: Store,
-): ReadableState<T> {
-	try {
-		const state = withdraw(token, store)
-		return state
-	} catch (notFoundError) {
-		if (token.family) {
-			store.logger.info(
-				`👪`,
-				token.type,
-				token.key,
-				`creating new family member in store "${store.config.name}"`,
-			)
-			const target = newest(store)
-			const family = target.families.get(token.family.key)
-			if (family) {
-				const jsonSubKey = JSON.parse(token.family.subKey)
-				family(jsonSubKey)
-				const state = withdraw(token, store)
-				return state
-			}
-			throw new NotFoundError(
-				{ key: token.family.key, type: `${token.type}_family` },
-				store,
-			)
-		}
-		throw notFoundError
-	}
-}