atom.io 0.18.0 → 0.18.2

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

@@ -1,12 +1,9 @@
-import type { RegularAtomToken } from "atom.io"
+import type { AtomToken } from "atom.io"
 
 import type { Store } from ".."
-import { deleteSelector, newest } from ".."
+import { deleteSelector, getUpdateToken, newest } from ".."
 
-export function deleteAtom(
-	atomToken: RegularAtomToken<unknown>,
-	store: Store,
-): void {
+export function deleteAtom(atomToken: AtomToken<unknown>, store: Store): void {
 	const target = newest(store)
 	const { key } = atomToken
 	const atom = target.atoms.get(key)
@@ -35,5 +32,9 @@ export function deleteAtom(
 	target.selectorAtoms.delete(key)
 	target.atomsThatAreDefault.delete(key)
 	target.timelineAtoms.delete(key)
+	if (atomToken.type === `mutable_atom`) {
+		const updateToken = getUpdateToken(atomToken)
+		deleteAtom(updateToken, store)
+	}
 	store.logger.info(`🔥`, `atom`, `${key}`, `deleted`)
 }

package/internal/src/caching.ts

@@ -53,12 +53,12 @@ export const readCachedValue = <T>(
 	token: ReadableState<any>,
 	target: Store,
 ): T => {
-	const value = target.valueMap.get(token.key) as T
-	// if (token.type === `mutable_atom` && isChildStore(target)) {
-	// 	const { parent } = target
-	// 	const copiedValue = copyMutableIfNeeded(token, parent, target)
-	// 	value = copiedValue
-	// }
+	let value = target.valueMap.get(token.key) as T
+	if (token.type === `mutable_atom` && isChildStore(target)) {
+		const { parent } = target
+		const copiedValue = copyMutableIfNeeded(token, parent, target)
+		value = copiedValue
+	}
 	return value
 }
 

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

@@ -10,7 +10,6 @@ import { stringifyJson } from "atom.io/json"
 
 import { createRegularAtom } from "../atom"
 import { newest } from "../lineage"
-import { deposit, withdraw } from "../store"
 import type { Store } from "../store"
 import { Subject } from "../subject"
 
@@ -24,10 +23,11 @@ export function createRegularAtomFamily<T, K extends Json.Serializable>(
 			const subKey = stringifyJson(key)
 			const family: FamilyMetadata = { key: options.key, subKey }
 			const fullKey = `${options.key}(${subKey})`
-			const existing = withdraw({ key: fullKey, type: `atom` }, store)
+			const target = newest(store)
+			const atomAlreadyCreated = target.atoms.has(fullKey)
 			let token: RegularAtomToken<any>
-			if (existing) {
-				token = deposit(existing)
+			if (atomAlreadyCreated) {
+				token = { type: `atom`, key: fullKey, family }
 			} else {
 				const individualOptions: RegularAtomOptions<any> = {
 					key: fullKey,

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

@@ -2,13 +2,10 @@ import type { ReadableToken } from "atom.io"
 
 import { NotFoundError } from "../not-found-error"
 import type { Store } from "../store"
-import { withdraw, withdrawNewFamilyMember } from "../store"
+import { withdraw, withdrawOrCreate } from "../store"
 import { readOrComputeValue } from "./read-or-compute-value"
 
 export function getFromStore<T>(token: ReadableToken<T>, store: Store): T {
-	const state = withdraw(token, store) ?? withdrawNewFamilyMember(token, store)
-	if (state === undefined) {
-		throw new NotFoundError(token, store)
-	}
+	const state = withdrawOrCreate(token, store)
 	return readOrComputeValue(state, store)
 }

package/internal/src/ingest-updates/ingest-atom-update.ts

@@ -1,4 +1,4 @@
-import type { KeyedStateUpdate } from "atom.io"
+import type { KeyedStateUpdate, RegularAtomToken } from "atom.io"
 
 import { setIntoStore } from "../set-state"
 import type { Store } from "../store"
@@ -10,5 +10,9 @@ export function ingestAtomUpdate(
 ): void {
 	const { key, newValue, oldValue } = atomUpdate
 	const value = applying === `newValue` ? newValue : oldValue
-	setIntoStore({ key, type: `atom` }, value, store)
+	const token: RegularAtomToken<unknown> = { key, type: `atom` }
+	if (atomUpdate.family) {
+		Object.assign(token, { family: atomUpdate.family })
+	}
+	setIntoStore(token, value, store)
 }

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

@@ -11,7 +11,6 @@ import { stringifyJson } from "atom.io/json"
 
 import { newest } from "../lineage"
 import { createMutableAtom } from "../mutable"
-import { deposit, withdraw } from "../store"
 import type { Store } from "../store"
 import { Subject } from "../subject"
 import { FamilyTracker } from "./tracker-family"
@@ -31,10 +30,11 @@ export function createMutableAtomFamily<
 			const subKey = stringifyJson(key)
 			const family: FamilyMetadata = { key: options.key, subKey }
 			const fullKey = `${options.key}(${subKey})`
-			const existing = withdraw({ key: fullKey, type: `mutable_atom` }, store)
+			const target = newest(store)
+			const atomAlreadyCreated = target.atoms.has(fullKey)
 			let token: MutableAtomToken<T, J>
-			if (existing) {
-				token = deposit(existing)
+			if (atomAlreadyCreated) {
+				token = { type: `mutable_atom`, key: fullKey, family }
 			} else {
 				const individualOptions: MutableAtomOptions<T, J> = {
 					key: fullKey,

package/internal/src/selector/register-selector.ts

@@ -5,7 +5,7 @@ import { readOrComputeValue } from "../get-state/read-or-compute-value"
 import { newest } from "../lineage"
 import { setAtomOrSelector } from "../set-state"
 import type { Store } from "../store"
-import { withdraw, withdrawNewFamilyMember } from "../store"
+import { withdrawOrCreate } from "../store"
 import { updateSelectorAtoms } from "./update-selector-atoms"
 
 export const registerSelector = (
@@ -15,13 +15,7 @@ export const registerSelector = (
 	get: (dependency) => {
 		const target = newest(store)
 
-		const dependencyState =
-			withdraw(dependency, store) ?? withdrawNewFamilyMember(dependency, store)
-		if (dependencyState === undefined) {
-			throw new Error(
-				`State "${dependency.key}" not found in store "${store.config.name}".`,
-			)
-		}
+		const dependencyState = withdrawOrCreate(dependency, store)
 		const dependencyValue = readOrComputeValue(dependencyState, store)
 
 		store.logger.info(
@@ -46,12 +40,7 @@ export const registerSelector = (
 		return dependencyValue
 	},
 	set: (WritableToken, newValue) => {
-		const state = withdraw(WritableToken, store)
-		if (state === undefined) {
-			throw new Error(
-				`State "${WritableToken.key}" not found in this store. Did you forget to initialize with the "atom" or "selector" function?`,
-			)
-		}
+		const state = withdrawOrCreate(WritableToken, store)
 		setAtomOrSelector(state, newValue, store)
 	},
 	find: ((token, key) => findInStore(token, key, store)) as typeof findState,

package/internal/src/set-state/copy-mutable-if-needed.ts

@@ -9,7 +9,12 @@ export function copyMutableIfNeeded<T extends Transceiver<any>>(
 ): T {
 	const originValue = origin.valueMap.get(atom.key)
 	const targetValue = target.valueMap.get(atom.key)
+
 	if (originValue === targetValue) {
+		if (originValue === undefined) {
+			return typeof atom.default === `function` ? atom.default() : atom.default
+		}
+
 		origin.logger.info(`📃`, `atom`, `${atom.key}`, `copying`)
 		const jsonValue = atom.toJson(originValue)
 		const copiedValue = atom.fromJson(jsonValue)

package/internal/src/set-state/emit-update.ts

@@ -8,16 +8,30 @@ export const emitUpdate = <T>(
 	update: StateUpdate<T>,
 	store: Store,
 ): void => {
-	store.logger.info(
-		`📢`,
-		state.type,
-		state.key,
-		`went (`,
-		update.oldValue,
-		`->`,
-		update.newValue,
-		`) subscribers:`,
-		state.subject.subscribers,
-	)
+	switch (state.type) {
+		case `mutable_atom`:
+			store.logger.info(
+				`📢`,
+				state.type,
+				state.key,
+				`is now (`,
+				update.newValue,
+				`) subscribers:`,
+				state.subject.subscribers,
+			)
+			break
+		default:
+			store.logger.info(
+				`📢`,
+				state.type,
+				state.key,
+				`went (`,
+				update.oldValue,
+				`->`,
+				update.newValue,
+				`) subscribers:`,
+				state.subject.subscribers,
+			)
+	}
 	state.subject.next(update)
 }

package/internal/src/set-state/set-atom.ts

@@ -42,12 +42,13 @@ export const setAtom = <T>(
 			const mutableKey = atom.key.slice(1)
 			const mutableAtom = target.atoms.get(mutableKey) as Atom<any>
 			let transceiver: Transceiver<any> = target.valueMap.get(mutableKey)
-			if (atom.type === `mutable_atom` && isChildStore(target)) {
+			if (mutableAtom.type === `mutable_atom` && isChildStore(target)) {
 				const { parent } = target
-				const copiedValue = copyMutableIfNeeded(atom, parent, target)
+				const copiedValue = copyMutableIfNeeded(mutableAtom, parent, target)
 				transceiver = copiedValue
 			}
-			transceiver.do(update.newValue)
+			const accepted = transceiver.do(update.newValue) === null
+			if (accepted) evictDownStream(mutableAtom, target)
 		}
 	}
 }

package/internal/src/set-state/set-into-store.ts

@@ -3,7 +3,7 @@ import type { WritableToken } from "atom.io"
 import { NotFoundError } from "../not-found-error"
 import { closeOperation, openOperation } from "../operation"
 import type { Store } from "../store"
-import { withdraw, withdrawNewFamilyMember } from "../store"
+import { withdrawOrCreate } from "../store"
 import { setAtomOrSelector } from "./set-atom-or-selector"
 
 export function setIntoStore<T, New extends T>(
@@ -15,10 +15,7 @@ export function setIntoStore<T, New extends T>(
 	if (rejection) {
 		return
 	}
-	const state = withdraw(token, store) ?? withdrawNewFamilyMember(token, store)
-	if (state === undefined) {
-		throw new NotFoundError(token, store)
-	}
+	const state = withdrawOrCreate(token, store)
 	setAtomOrSelector(state, value, store)
 	closeOperation(store)
 }

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

@@ -5,6 +5,7 @@ import type {
 	WritableSelectorToken,
 	WritableToken,
 } from "atom.io"
+
 import type {
 	Atom,
 	ReadableState,
@@ -13,47 +14,56 @@ import type {
 	WritableSelector,
 	WritableState,
 } from ".."
-import { newest, withdraw } from ".."
+import { NotFoundError, newest, withdraw } from ".."
 
-export function withdrawNewFamilyMember<T>(
+export function withdrawOrCreate<T>(
 	token: RegularAtomToken<T>,
 	store: Store,
-): Atom<T> | undefined
-export function withdrawNewFamilyMember<T>(
+): Atom<T>
+export function withdrawOrCreate<T>(
 	token: WritableSelectorToken<T>,
 	store: Store,
-): WritableSelector<T> | undefined
-export function withdrawNewFamilyMember<T>(
+): WritableSelector<T>
+export function withdrawOrCreate<T>(
 	token: ReadonlySelectorToken<T>,
 	store: Store,
-): ReadonlySelector<T> | undefined
-export function withdrawNewFamilyMember<T>(
+): ReadonlySelector<T>
+export function withdrawOrCreate<T>(
 	token: WritableToken<T>,
 	store: Store,
-): WritableState<T> | undefined
-export function withdrawNewFamilyMember<T>(
+): WritableState<T>
+export function withdrawOrCreate<T>(
 	token: ReadableToken<T>,
 	store: Store,
-): ReadableState<T> | undefined
-export function withdrawNewFamilyMember<T>(
+): ReadableState<T>
+export function withdrawOrCreate<T>(
 	token: ReadableToken<T>,
 	store: Store,
-): ReadableState<T> | undefined {
-	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
+): 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
 	}
-	return undefined
 }

package/internal/src/store/withdraw.ts

@@ -37,6 +37,8 @@ import type {
 	WritableSelector,
 	WritableState,
 } from ".."
+import { NotFoundError } from ".."
+
 import type { Timeline } from "../timeline"
 import type { Transaction } from "../transaction"
 import type { Store } from "./store"
@@ -63,40 +65,34 @@ export type Withdrawable =
 export function withdraw<T>(
 	token: RegularAtomToken<T>,
 	store: Store,
-): RegularAtom<T> | undefined
+): RegularAtom<T>
 export function withdraw<T extends Transceiver<any>>(
 	token: MutableAtomToken<T, any>,
 	store: Store,
-): MutableAtom<T, any> | undefined
-export function withdraw<T>(
-	token: AtomToken<T>,
-	store: Store,
-): Atom<T> | undefined
+): MutableAtom<T, any>
+export function withdraw<T>(token: AtomToken<T>, store: Store): Atom<T>
 export function withdraw<T>(
 	token: WritableSelectorToken<T>,
 	store: Store,
-): WritableSelector<T> | undefined
+): WritableSelector<T>
 export function withdraw<T>(
 	token: ReadonlySelectorToken<T>,
 	store: Store,
-): ReadonlySelector<T> | undefined
-export function withdraw<T>(
-	token: SelectorToken<T>,
-	store: Store,
-): Selector<T> | undefined
+): ReadonlySelector<T>
+export function withdraw<T>(token: SelectorToken<T>, store: Store): Selector<T>
 export function withdraw<T>(
 	token: WritableToken<T>,
 	store: Store,
-): WritableState<T> | undefined
+): WritableState<T>
 export function withdraw<T>(
 	token: ReadableToken<T>,
 	store: Store,
-): ReadableState<T> | undefined
+): ReadableState<T>
 
 export function withdraw<T, K extends Json.Serializable>(
 	token: RegularAtomFamilyToken<T, K>,
 	store: Store,
-): RegularAtomFamily<T, K> | undefined
+): RegularAtomFamily<T, K>
 export function withdraw<
 	T extends Transceiver<any>,
 	J extends Json.Serializable,
@@ -104,32 +100,32 @@ export function withdraw<
 >(
 	token: MutableAtomFamilyToken<T, J, K>,
 	store: Store,
-): MutableAtomFamily<T, J, K> | undefined
+): MutableAtomFamily<T, J, K>
 export function withdraw<T, K extends Json.Serializable>(
 	token: AtomFamilyToken<T>,
 	store: Store,
-): AtomFamily<T, any> | undefined
+): AtomFamily<T, any>
 export function withdraw<T, K extends Json.Serializable>(
 	token: ReadonlySelectorFamilyToken<T, K>,
 	store: Store,
-): ReadonlySelectorFamily<T, any> | undefined
+): ReadonlySelectorFamily<T, any>
 export function withdraw<T, K extends Json.Serializable>(
 	token: WritableSelectorFamilyToken<T, K>,
 	store: Store,
-): WritableSelectorFamily<T, any> | undefined
+): WritableSelectorFamily<T, any>
 export function withdraw<T, K extends Json.Serializable>(
 	token: SelectorFamilyToken<T, K>,
 	store: Store,
-): SelectorFamily<T, any> | undefined
+): SelectorFamily<T, any>
 
 export function withdraw<T>(
 	token: TransactionToken<T>,
 	store: Store,
-): Transaction<T extends ƒn ? T : never> | undefined
+): Transaction<T extends ƒn ? T : never>
 export function withdraw<T>(
 	token: TimelineToken<T>,
 	store: Store,
-): Timeline<T extends TimelineManageable ? T : never> | undefined
+): Timeline<T extends TimelineManageable ? T : never>
 export function withdraw<T>(
 	token:
 		| RegularAtomFamilyToken<T, any>
@@ -142,7 +138,7 @@ export function withdraw<T>(
 				? MutableAtomFamilyToken<T, any, any> | MutableAtomToken<T, any>
 				: never),
 	store: Store,
-): Withdrawable | undefined {
+): Withdrawable {
 	let withdrawn: Withdrawable | undefined
 	let target: Store | null = store
 	while (target !== null) {
@@ -175,4 +171,5 @@ export function withdraw<T>(
 		}
 		target = target.child
 	}
+	throw new NotFoundError(token, store)
 }

package/internal/src/subscribe/subscribe-to-state.ts

@@ -1,6 +1,6 @@
 import type { ReadableToken, UpdateHandler } from "atom.io"
 import type { Store } from "../store"
-import { withdraw, withdrawNewFamilyMember } from "../store"
+import { withdrawOrCreate } from "../store"
 import { subscribeToRootAtoms } from "./subscribe-to-root-atoms"
 
 export function subscribeToState<T>(
@@ -9,8 +9,7 @@ export function subscribeToState<T>(
 	key: string,
 	store: Store,
 ): () => void {
-	const state =
-		withdraw<T>(token, store) ?? withdrawNewFamilyMember(token, store)
+	const state = withdrawOrCreate(token, store)
 	if (state === undefined) {
 		throw new Error(
 			`State "${token.key}" not found in this store. Did you forget to initialize with the "atom" or "selector" function?`,

package/internal/src/subscribe/subscribe-to-timeline.ts

@@ -9,11 +9,6 @@ export const subscribeToTimeline = <ManagedAtom extends TimelineManageable>(
 	store: Store,
 ): (() => void) => {
 	const tl = withdraw(token, store)
-	if (tl === undefined) {
-		throw new Error(
-			`Cannot subscribe to timeline "${token.key}": timeline not found in store "${store.config.name}".`,
-		)
-	}
 	store.logger.info(`👀`, `timeline`, token.key, `Adding subscription "${key}"`)
 	const unsubscribe = tl.subject.subscribe(key, handleUpdate)
 	return () => {

package/internal/src/subscribe/subscribe-to-transaction.ts

@@ -9,11 +9,6 @@ export const subscribeToTransaction = <ƒ extends ƒn>(
 	store: Store,
 ): (() => void) => {
 	const tx = withdraw(token, store)
-	if (tx === undefined) {
-		throw new Error(
-			`Cannot subscribe to transaction "${token.key}": transaction not found in store "${store.config.name}".`,
-		)
-	}
 	store.logger.info(
 		`👀`,
 		`transaction`,

package/internal/src/timeline/add-atom-to-timeline.ts

@@ -1,4 +1,4 @@
-import type { AtomToken, TransactionUpdate, ƒn } from "atom.io"
+import type { AtomToken, TransactionToken, TransactionUpdate, ƒn } from "atom.io"
 import type { TimelineUpdate } from "atom.io"
 
 import { newest } from "../lineage"
@@ -17,16 +17,11 @@ export const addAtomToTimeline = (
 	store: Store,
 ): void => {
 	let maybeAtom = withdraw(atomToken, store)
-	if (maybeAtom?.type === `mutable_atom`) {
+	if (maybeAtom.type === `mutable_atom`) {
 		const updateToken = getUpdateToken(maybeAtom)
 		maybeAtom = withdraw(updateToken, store)
 	}
 	const atom = maybeAtom
-	if (atom === undefined) {
-		throw new Error(
-			`Cannot subscribe to atom "${atomToken.key}" because it has not been initialized in store "${store.config.name}"`,
-		)
-	}
 	store.timelineAtoms.set({ atomKey: atom.key, timelineKey: tl.key })
 
 	atom.subject.subscribe(`timeline`, (update) => {
@@ -70,15 +65,11 @@ export const addAtomToTimeline = (
 				}
 			}
 			if (currentTransactionKey) {
-				const currentTransaction = withdraw(
-					{ key: currentTransactionKey, type: `transaction` },
-					store,
-				)
-				if (currentTransaction === undefined) {
-					throw new Error(
-						`Transaction "${currentTransactionKey}" not found in store "${store.config.name}". This is surprising, because we are in the application phase of "${currentTransactionKey}".`,
-					)
+				const txToken: TransactionToken<any> = {
+					key: currentTransactionKey,
+					type: `transaction`,
 				}
+				const currentTransaction = withdraw(txToken, store)
 				if (tl.transactionKey !== currentTransactionKey) {
 					if (tl.transactionKey) {
 						store.logger.error(

package/internal/src/timeline/create-timeline.ts

@@ -89,15 +89,6 @@ export function createTimeline<ManagedAtom extends TimelineManageable>(
 		) {
 			const familyToken: AtomFamilyToken<any> = tokenOrFamily
 			const family = withdraw(familyToken, store)
-			if (family === undefined) {
-				store.logger.error(
-					`❌`,
-					`timeline`,
-					options.key,
-					`Failed to add family "${familyToken.key}" because it does not exist in the store`,
-				)
-				continue
-			}
 			const familyKey = family.key
 			target.timelineAtoms.set({ atomKey: familyKey, timelineKey })
 			family.subject.subscribe(`timeline:${options.key}`, (token) => {
@@ -110,26 +101,8 @@ export function createTimeline<ManagedAtom extends TimelineManageable>(
 			}
 		} else {
 			let atom = withdraw(tokenOrFamily, store)
-			if (atom === undefined) {
-				store.logger.error(
-					`❌`,
-					`timeline`,
-					options.key,
-					`Failed to add atom "${atomKey}" because it does not exist in the store`,
-				)
-				continue
-			}
 			if (isMutable(atom)) {
 				const updateAtom = withdraw(getUpdateToken(atom), store)
-				if (updateAtom === undefined) {
-					store.logger.error(
-						`❌`,
-						`timeline`,
-						options.key,
-						`Failed to add update atom "${atomKey}" because it does not exist in the store`,
-					)
-					continue
-				}
 				atom = updateAtom
 				atomKey = atom.key
 			}

package/internal/src/transaction/apply-transaction.ts

@@ -60,7 +60,6 @@ export const applyTransaction = <ƒ extends ƒn>(
 	}
 	ingestTransactionUpdate(`newValue`, child.transactionMeta.update, parent)
 	if (isRootStore(parent)) {
-		console.log(child.transactionMeta.update)
 		setEpochNumberOfAction(
 			child.transactionMeta.update.key,
 			child.transactionMeta.update.epoch,

package/internal/src/transaction/set-epoch-number.ts

@@ -26,6 +26,5 @@ export function setEpochNumberOfAction(
 
 	if (continuityKey !== undefined) {
 		store.transactionMeta.epoch.set(continuityKey, newEpoch)
-		console.log(`epoch is now`, newEpoch)
 	}
 }

package/json/src/index.ts

@@ -1,9 +1,9 @@
-export * from "anvl/json"
-export * from "anvl/primitive"
+export * from "~/packages/anvl/src/json"
+export * from "~/packages/anvl/src/primitive"
 
 export * from "./select-json"
 export * from "./select-json-family"
 
-import type { Json } from "anvl/json"
+import type { Json } from "~/packages/anvl/src/json"
 
 export type JsonIO = (...params: Json.Serializable[]) => Json.Serializable | void