atom.io 0.34.2 → 0.36.0

package/dist/internal/index.js

@@ -1,5 +1,5 @@
 import { Join as Join$1, arbitrary as arbitrary$1, subscribeToState as subscribeToState$1, subscribeToTimeline as subscribeToTimeline$1, subscribeToTransaction as subscribeToTransaction$1 } from "atom.io/internal";
-import { parseJson, selectJson, selectJsonFamily, stringifyJson } from "atom.io/json";
+import { parseJson, stringifyJson } from "atom.io/json";
 import { Anarchy, AtomIOLogger } from "atom.io";
 import { SetRTX } from "atom.io/transceivers/set-rtx";
 
@@ -456,16 +456,16 @@ var Future = class extends Promise {
 
 //#endregion
 //#region src/internal/set-state/copy-mutable-if-needed.ts
-function copyMutableIfNeeded(target, atom$1, origin) {
-	const originValue = origin.valueMap.get(atom$1.key);
-	const targetValue = target.valueMap.get(atom$1.key);
+function copyMutableIfNeeded(target, atom, origin) {
+	const originValue = origin.valueMap.get(atom.key);
+	const targetValue = target.valueMap.get(atom.key);
 	if (originValue !== targetValue) return targetValue;
-	if (originValue === void 0) return atom$1.default();
-	origin.logger.info(`📃`, `atom`, atom$1.key, `copying`);
-	const jsonValue = atom$1.toJson(originValue);
-	const copiedValue = atom$1.fromJson(jsonValue);
-	target.valueMap.set(atom$1.key, copiedValue);
-	new Tracker(atom$1, origin);
+	if (originValue === void 0) return new atom.class();
+	origin.logger.info(`📃`, `atom`, atom.key, `copying`);
+	const jsonValue = originValue.toJSON();
+	const copiedValue = atom.class.fromJSON(jsonValue);
+	target.valueMap.set(atom.key, copiedValue);
+	new Tracker(atom, origin);
 	return copiedValue;
 }
 
@@ -517,12 +517,12 @@ const markDone = (store, key) => {
 
 //#endregion
 //#region src/internal/set-state/evict-downstream.ts
-function evictDownStream(store, atom$1) {
+function evictDownStream(store, atom) {
 	const target = newest(store);
-	const downstreamKeys = target.selectorAtoms.getRelatedKeys(atom$1.key);
-	target.logger.info(`🧹`, atom$1.type, atom$1.key, downstreamKeys ? `evicting ${downstreamKeys.size} states downstream:` : `no downstream states`, downstreamKeys ?? `to evict`);
+	const downstreamKeys = target.selectorAtoms.getRelatedKeys(atom.key);
+	target.logger.info(`🧹`, atom.type, atom.key, downstreamKeys ? `evicting ${downstreamKeys.size} states downstream:` : `no downstream states`, downstreamKeys ?? `to evict`);
 	if (downstreamKeys) {
-		if (target.operation.open) target.logger.info(`🧹`, atom$1.type, atom$1.key, `[ ${[...target.operation.done].join(`, `)} ] already done`);
+		if (target.operation.open) target.logger.info(`🧹`, atom.type, atom.key, `[ ${[...target.operation.done].join(`, `)} ] already done`);
 		for (const key of downstreamKeys) {
 			if (isDone(target, key)) continue;
 			evictCachedValue(target, key);
@@ -560,10 +560,10 @@ function cacheValue(target, key, value, subject) {
 			const current = target.valueMap.get(key);
 			if (current === future) {
 				cacheValue(target, key, resolved, subject);
-				const atom$1 = target.atoms.get(key);
-				if (atom$1) {
-					openOperation(target, atom$1);
-					evictDownStream(target, atom$1);
+				const atom = target.atoms.get(key);
+				if (atom) {
+					openOperation(target, atom);
+					evictDownStream(target, atom);
 					closeOperation(target);
 				} else {
 					const selector = target.writableSelectors.get(key) ?? target.readonlySelectors.get(key);
@@ -619,8 +619,7 @@ const readOrComputeValue = (target, state) => {
 		case `writable_pure_selector`:
 			target.logger.info(`🧮`, state.type, state.key, `computing value`);
 			return state.get();
-		case `atom`:
-		case `mutable_atom`: {
+		case `atom`: {
 			const def = state.default;
 			let defaultValue;
 			if (def instanceof Function) defaultValue = def();
@@ -629,14 +628,21 @@ const readOrComputeValue = (target, state) => {
 			target.logger.info(`💁`, `atom`, state.key, `could not find cached value; using default`, defaultValue);
 			return cachedValue;
 		}
+		case `mutable_atom`: {
+			const Ctor = state.class;
+			const instance = new Ctor();
+			const cachedValue = cacheValue(target, state.key, instance, state.subject);
+			target.logger.info(`💁`, `mutable_atom`, state.key, `could not find cached value; using default`, instance);
+			return cachedValue;
+		}
 	}
 };
 
 //#endregion
 //#region src/internal/subscribe/subscribe-to-root-atoms.ts
-const subscribeToRootDependency = (target, selector, atom$1) => {
-	return atom$1.subject.subscribe(`${selector.type}:${selector.key}`, (atomChange) => {
-		target.logger.info(`📢`, selector.type, selector.key, `root`, atom$1.key, `went`, atomChange.oldValue, `->`, atomChange.newValue);
+const subscribeToRootDependency = (target, selector, atom) => {
+	return atom.subject.subscribe(`${selector.type}:${selector.key}`, (atomChange) => {
+		target.logger.info(`📢`, selector.type, selector.key, `root`, atom.key, `went`, atomChange.oldValue, `->`, atomChange.newValue);
 		const oldValue = recallState(target, selector);
 		const newValue = readOrComputeValue(target, selector);
 		target.logger.info(`✨`, selector.type, selector.key, `went`, oldValue, `->`, newValue);
@@ -647,55 +653,6 @@ const subscribeToRootDependency = (target, selector, atom$1) => {
 	});
 };
 
-//#endregion
-//#region src/internal/families/create-regular-atom-family.ts
-function createRegularAtomFamily(store, options, internalRoles) {
-	const familyToken = {
-		key: options.key,
-		type: `atom_family`
-	};
-	const existing = store.families.get(options.key);
-	if (existing) store.logger.error(`❗`, `atom_family`, options.key, `Overwriting an existing ${prettyPrintTokenType(existing)} "${existing.key}" in store "${store.config.name}". You can safely ignore this warning if it is due to hot module replacement.`);
-	const subject = new Subject();
-	const familyFunction = (key) => {
-		const subKey = stringifyJson(key);
-		const family = {
-			key: options.key,
-			subKey
-		};
-		const fullKey = `${options.key}(${subKey})`;
-		const target = newest(store);
-		const def = options.default;
-		const individualOptions = {
-			key: fullKey,
-			default: def instanceof Function ? () => def(key) : def
-		};
-		if (options.effects) individualOptions.effects = options.effects(key);
-		const token = createRegularAtom(target, individualOptions, family);
-		subject.next({
-			type: `state_creation`,
-			token
-		});
-		return token;
-	};
-	const atomFamily$1 = Object.assign(familyFunction, familyToken, {
-		subject,
-		install: (s) => createRegularAtomFamily(s, options),
-		internalRoles
-	});
-	store.families.set(options.key, atomFamily$1);
-	store.defaults.set(options.key, options.default);
-	return familyToken;
-}
-
-//#endregion
-//#region src/internal/families/create-atom-family.ts
-function createAtomFamily(store, options) {
-	const isMutable = `mutable` in options;
-	if (isMutable) return createMutableAtomFamily(store, options);
-	return createRegularAtomFamily(store, options);
-}
-
 //#endregion
 //#region src/internal/set-state/become.ts
 const become = (nextVersionOfThing) => (originalThing) => nextVersionOfThing instanceof Function ? nextVersionOfThing(originalThing) : nextVersionOfThing;
@@ -718,58 +675,65 @@ const emitUpdate = (store, state, update) => {
 
 //#endregion
 //#region src/internal/set-state/set-atom.ts
-const setAtom = (target, atom$1, next) => {
-	const oldValue = readOrComputeValue(target, atom$1);
+const setAtom = (target, atom, next) => {
+	const oldValue = readOrComputeValue(target, atom);
 	let newValue = oldValue;
-	if (atom$1.type === `mutable_atom` && isChildStore(target)) {
+	if (atom.type === `mutable_atom` && isChildStore(target)) {
 		const { parent } = target;
-		const copiedValue = copyMutableIfNeeded(target, atom$1, parent);
+		const copiedValue = copyMutableIfNeeded(target, atom, parent);
 		newValue = copiedValue;
 	}
 	newValue = become(next)(newValue);
-	target.logger.info(`📝`, `atom`, atom$1.key, `set to`, newValue);
-	newValue = cacheValue(target, atom$1.key, newValue, atom$1.subject);
-	markDone(target, atom$1.key);
-	evictDownStream(target, atom$1);
+	target.logger.info(`📝`, `atom`, atom.key, `set to`, newValue);
+	newValue = cacheValue(target, atom.key, newValue, atom.subject);
+	markDone(target, atom.key);
+	evictDownStream(target, atom);
 	const update = {
 		oldValue,
 		newValue
 	};
 	if (!isChildStore(target)) {
-		emitUpdate(target, atom$1, update);
+		emitUpdate(target, atom, update);
 		return;
 	}
 	if (target.on.transactionApplying.state === null) {
-		const { key } = atom$1;
+		const { key } = atom;
 		if (isTransceiver(update.newValue)) return;
 		const atomUpdate = {
 			type: `atom_update`,
 			key,
 			...update
 		};
-		if (atom$1.family) atomUpdate.family = atom$1.family;
+		if (atom.family) atomUpdate.family = atom.family;
 		target.transactionMeta.update.updates.push(atomUpdate);
 		target.logger.info(`📁`, `atom`, key, `stowed (`, update.oldValue, `->`, update.newValue, `)`);
-	} else if (atom$1.key.startsWith(`*`)) {
-		const mutableKey = atom$1.key.slice(1);
-		const mutableAtom = target.atoms.get(mutableKey);
+	} else if (atom.key.startsWith(`*`)) {
+		const mutableKey = atom.key.slice(1);
+		const mutableAtom$1 = target.atoms.get(mutableKey);
 		let transceiver = target.valueMap.get(mutableKey);
-		if (mutableAtom.type === `mutable_atom` && isChildStore(target)) {
+		if (mutableAtom$1.type === `mutable_atom` && isChildStore(target)) {
 			const { parent } = target;
-			const copiedValue = copyMutableIfNeeded(target, mutableAtom, parent);
+			const copiedValue = copyMutableIfNeeded(target, mutableAtom$1, parent);
 			transceiver = copiedValue;
 		}
 		const accepted = transceiver.do(update.newValue) === null;
-		if (accepted) evictDownStream(target, mutableAtom);
+		if (accepted) evictDownStream(target, mutableAtom$1);
 	}
 };
 
 //#endregion
 //#region src/internal/set-state/reset-atom-or-selector.ts
 function resetAtom(store, state) {
-	let def = state.default;
-	if (def instanceof Function) def = def();
-	setAtom(store, state, def);
+	switch (state.type) {
+		case `mutable_atom`:
+			setAtom(store, state, new state.class());
+			return;
+		case `atom`: {
+			let def = state.default;
+			if (def instanceof Function) def = def();
+			setAtom(store, state, def);
+		}
+	}
 }
 function resetAtomOrSelector(store, state) {
 	switch (state.type) {
@@ -781,7 +745,7 @@ function resetAtomOrSelector(store, state) {
 		case `writable_held_selector`:
 			{
 				const atoms = traceRootSelectorAtoms(store, state.key);
-				for (const atom$1 of atoms.values()) resetAtom(store, atom$1);
+				for (const atom of atoms.values()) resetAtom(store, atom);
 			}
 			break;
 	}
@@ -914,8 +878,8 @@ const traceRootSelectorAtoms = (store, selectorKey, covered = /* @__PURE__ */ ne
 		if (covered.has(dependencyKey)) continue;
 		covered.add(dependencyKey);
 		if (isAtomKey(store, dependencyKey)) {
-			const atom$1 = store.atoms.get(dependencyKey);
-			roots.set(atom$1.key, atom$1);
+			const atom = store.atoms.get(dependencyKey);
+			roots.set(atom.key, atom);
 		} else dependencies.push(...getSelectorDependencyKeys(store, dependencyKey));
 	}
 	return roots;
@@ -1259,6 +1223,7 @@ function claimWithinStore(store, newProvenance, claim, exclusive) {
 	const transferEvent = {
 		type: `molecule_transfer`,
 		key: molecule.key,
+		exclusive: Boolean(exclusive),
 		from: priorProvenance,
 		to: [newProvenanceMolecule.key]
 	};
@@ -1331,15 +1296,15 @@ function ingestMoleculeDisposalEvent(update, applying, store) {
 function ingestMoleculeTransferEvent(update, applying, store) {
 	switch (applying) {
 		case `newValue`:
-			{
-				const provenance = update.to.length === 1 ? update.to[0] : update.to;
-				claimWithinStore(store, provenance, update.key, `exclusive`);
-			}
+			for (const newOwner of update.to) claimWithinStore(store, newOwner, update.key, update.exclusive ? `exclusive` : void 0);
 			break;
 		case `oldValue`:
 			{
-				const provenance = update.from.length === 1 ? update.from[0] : update.from;
-				claimWithinStore(store, provenance, update.key, `exclusive`);
+				let exclusivity = `exclusive`;
+				for (const previousOwner of update.from) {
+					claimWithinStore(store, previousOwner, update.key, exclusivity);
+					exclusivity = void 0;
+				}
 			}
 			break;
 	}
@@ -1348,7 +1313,9 @@ function ingestMoleculeTransferEvent(update, applying, store) {
 //#endregion
 //#region src/internal/ingest-updates/ingest-selector-update.ts
 function ingestSelectorUpdate(applying, selectorUpdate, store) {
-	const updates = applying === `newValue` ? selectorUpdate.atomUpdates : selectorUpdate.atomUpdates.toReversed();
+	let updates;
+	if (applying === `newValue`) updates = selectorUpdate.atomUpdates;
+	else updates = selectorUpdate.atomUpdates.toReversed();
 	for (const atomUpdate of updates) ingestAtomUpdate(applying, atomUpdate, store);
 }
 
@@ -1742,19 +1709,18 @@ function createStandaloneSelector(store, options) {
 //#region src/internal/selector/dispose-selector.ts
 function disposeSelector(store, selectorToken) {
 	const target = newest(store);
-	const { key, type } = selectorToken;
-	const selector = withdraw(target, selectorToken);
-	if (!selector.family) store.logger.error(`❌`, type, key, `Standalone selectors cannot be disposed.`);
+	const { key, type, family: familyMeta } = selectorToken;
+	if (!familyMeta) store.logger.error(`❌`, type, key, `Standalone selectors cannot be disposed.`);
 	else {
-		const molecule = target.molecules.get(selector.family.subKey);
-		if (molecule) target.moleculeData.delete(selector.family.subKey, selector.family.key);
+		const molecule = target.molecules.get(familyMeta.subKey);
+		if (molecule) target.moleculeData.delete(familyMeta.subKey, familyMeta.key);
 		let familyToken;
 		switch (selectorToken.type) {
 			case `writable_held_selector`:
 				{
 					target.writableSelectors.delete(key);
 					familyToken = {
-						key: selector.family.key,
+						key: familyMeta.key,
 						type: `writable_held_selector_family`
 					};
 					const family = withdraw(store, familyToken);
@@ -1769,7 +1735,7 @@ function disposeSelector(store, selectorToken) {
 				{
 					target.writableSelectors.delete(key);
 					familyToken = {
-						key: selector.family.key,
+						key: familyMeta.key,
 						type: `writable_pure_selector_family`
 					};
 					const family = withdraw(store, familyToken);
@@ -1784,7 +1750,7 @@ function disposeSelector(store, selectorToken) {
 				{
 					target.readonlySelectors.delete(key);
 					familyToken = {
-						key: selector.family.key,
+						key: familyMeta.key,
 						type: `readonly_held_selector_family`
 					};
 					const family = withdraw(store, familyToken);
@@ -1799,7 +1765,7 @@ function disposeSelector(store, selectorToken) {
 				{
 					target.readonlySelectors.delete(key);
 					familyToken = {
-						key: selector.family.key,
+						key: familyMeta.key,
 						type: `readonly_pure_selector_family`
 					};
 					const family = withdraw(store, familyToken);
@@ -1814,6 +1780,7 @@ function disposeSelector(store, selectorToken) {
 		target.valueMap.delete(key);
 		target.selectorAtoms.delete(key);
 		target.selectorGraph.delete(key);
+		target.moleculeData.delete(familyMeta.key, familyMeta.subKey);
 		store.logger.info(`🔥`, selectorToken.type, key, `deleted`);
 		if (isChildStore(target) && target.transactionMeta.phase === `building`) target.transactionMeta.update.updates.push({
 			type: `state_disposal`,
@@ -1871,6 +1838,47 @@ function createReadonlyPureSelectorFamily(store, options, internalRoles) {
 	return familyToken;
 }
 
+//#endregion
+//#region src/internal/families/create-regular-atom-family.ts
+function createRegularAtomFamily(store, options, internalRoles) {
+	const familyToken = {
+		key: options.key,
+		type: `atom_family`
+	};
+	const existing = store.families.get(options.key);
+	if (existing) store.logger.error(`❗`, `atom_family`, options.key, `Overwriting an existing ${prettyPrintTokenType(existing)} "${existing.key}" in store "${store.config.name}". You can safely ignore this warning if it is due to hot module replacement.`);
+	const subject = new Subject();
+	const familyFunction = (key) => {
+		const subKey = stringifyJson(key);
+		const family = {
+			key: options.key,
+			subKey
+		};
+		const fullKey = `${options.key}(${subKey})`;
+		const target = newest(store);
+		const def = options.default;
+		const individualOptions = {
+			key: fullKey,
+			default: def instanceof Function ? () => def(key) : def
+		};
+		if (options.effects) individualOptions.effects = options.effects(key);
+		const token = createRegularAtom(target, individualOptions, family);
+		subject.next({
+			type: `state_creation`,
+			token
+		});
+		return token;
+	};
+	const atomFamily$1 = Object.assign(familyFunction, familyToken, {
+		subject,
+		install: (s) => createRegularAtomFamily(s, options),
+		internalRoles
+	});
+	store.families.set(options.key, atomFamily$1);
+	store.defaults.set(options.key, options.default);
+	return familyToken;
+}
+
 //#endregion
 //#region src/internal/families/create-readonly-held-selector-family.ts
 function createReadonlyHeldSelectorFamily(store, options, internalRoles) {
@@ -2169,7 +2177,7 @@ function subscribeToState(store, token, key, handleUpdate) {
 	let updateHandler = safelyHandleUpdate;
 	if (isSelector) {
 		readOrComputeValue(store, state);
-		for (const [atomKey, atom$1] of traceRootSelectorAtoms(store, state.key)) rootSubs.set(atomKey, subscribeToRootDependency(store, state, atom$1));
+		for (const [atomKey, atom] of traceRootSelectorAtoms(store, state.key)) rootSubs.set(atomKey, subscribeToRootDependency(store, state, atom));
 		updateHandler = function updateRootsBeforeHandlingUpdate(update) {
 			const dependencies = traceRootSelectorAtoms(store, state.key);
 			for (const [previousRootKey, unsub] of rootSubs) {
@@ -2180,7 +2188,7 @@ function subscribeToState(store, token, key, handleUpdate) {
 					rootSubs.delete(previousRootKey);
 				}
 			}
-			for (const [atomKey, atom$1] of dependencies) rootSubs.set(atomKey, subscribeToRootDependency(store, state, atom$1));
+			for (const [atomKey, atom] of dependencies) rootSubs.set(atomKey, subscribeToRootDependency(store, state, atom));
 			safelyHandleUpdate(update);
 		};
 	}
@@ -2245,66 +2253,60 @@ var Tracker = class {
 	}
 	unsubscribeFromInnerValue;
 	unsubscribeFromState;
-	observeCore(mutableState, latestUpdateState, target) {
+	captureSignalsFromCore(mutableState, latestUpdateState, target) {
 		const subscriptionKey = `tracker:${target.config.name}:${isChildStore(target) ? target.transactionMeta.update.key : `main`}:${mutableState.key}`;
-		const originalInnerValue = getFromStore(target, mutableState);
-		this.unsubscribeFromInnerValue = originalInnerValue.subscribe(subscriptionKey, (update) => {
+		const trackerCapturesOutboundSignal = (update) => {
 			setIntoStore(target, latestUpdateState, update);
-		});
-		this.unsubscribeFromState = subscribeToState(target, mutableState, subscriptionKey, (update) => {
+		};
+		const originalInnerValue = getFromStore(target, mutableState);
+		this.unsubscribeFromInnerValue = originalInnerValue.subscribe(subscriptionKey, trackerCapturesOutboundSignal);
+		this.unsubscribeFromState = subscribeToState(target, mutableState, subscriptionKey, function trackerLooksForNewReference(update) {
 			if (update.newValue !== update.oldValue) {
 				this.unsubscribeFromInnerValue();
-				this.unsubscribeFromInnerValue = update.newValue.subscribe(subscriptionKey, (transceiverUpdate) => {
-					setIntoStore(target, latestUpdateState, transceiverUpdate);
-				});
+				this.unsubscribeFromInnerValue = update.newValue.subscribe(subscriptionKey, trackerCapturesOutboundSignal);
 			}
-		});
+		}.bind(this));
 	}
-	updateCore(mutableState, latestUpdateState, target) {
+	supplySignalsToCore(mutableState, latestUpdateState, target) {
 		const subscriptionKey = `tracker:${target.config.name}:${isChildStore(target) ? target.transactionMeta.update.key : `main`}:${mutableState.key}`;
-		subscribeToState(target, latestUpdateState, subscriptionKey, ({ newValue, oldValue }) => {
+		subscribeToState(target, latestUpdateState, subscriptionKey, function trackerCapturesInboundSignal({ newValue, oldValue }) {
 			const timelineId = target.timelineTopics.getRelatedKey(latestUpdateState.key);
-			if (timelineId) {
-				const timelineData = target.timelines.get(timelineId);
-				if (timelineData?.timeTraveling) {
-					const unsubscribe$1 = subscribeToTimeline(target, {
-						key: timelineId,
-						type: `timeline`
-					}, subscriptionKey, (update) => {
-						unsubscribe$1();
-						setIntoStore(target, mutableState, (transceiver) => {
-							if (update === `redo` && newValue) transceiver.do(newValue);
-							else if (update === `undo` && oldValue) transceiver.undo(oldValue);
-							return transceiver;
-						});
+			if (timelineId && target.timelines.get(timelineId)?.timeTraveling) {
+				const unsubscribe = subscribeToTimeline(target, {
+					key: timelineId,
+					type: `timeline`
+				}, subscriptionKey, function trackerWaitsForTimeTravelToFinish(update) {
+					unsubscribe();
+					setIntoStore(target, mutableState, (transceiver) => {
+						if (update === `redo` && newValue) transceiver.do(newValue);
+						else if (update === `undo` && oldValue) transceiver.undo(oldValue);
+						return transceiver;
 					});
-					return;
-				}
+				});
+				return;
 			}
-			const unsubscribe = target.on.operationClose.subscribe(subscriptionKey, () => {
-				unsubscribe();
-				const mutable = getFromStore(target, mutableState);
-				const updateNumber = newValue === null ? -1 : mutable.getUpdateNumber(newValue);
-				const eventOffset = updateNumber - mutable.cacheUpdateNumber;
-				if (newValue && eventOffset === 1) setIntoStore(target, mutableState, (transceiver) => (transceiver.do(newValue), transceiver));
-				else target.logger.info(`❌`, `mutable_atom`, mutableState.key, `could not be updated. Expected update number ${mutable.cacheUpdateNumber + 1}, but got ${updateNumber}`);
-			});
+			const mutable = getFromStore(target, mutableState);
+			const updateNumber = mutable.getUpdateNumber(newValue);
+			const eventOffset = updateNumber - mutable.cacheUpdateNumber;
+			if (newValue && eventOffset === 1) setIntoStore(target, mutableState, (transceiver) => (transceiver.do(newValue), transceiver));
+			else target.logger.info(`❌`, `mutable_atom`, mutableState.key, `could not be updated. Expected update number ${mutable.cacheUpdateNumber + 1}, but got ${updateNumber}`);
 		});
 	}
-	mutableState;
-	latestUpdateState;
+	mutableAtomToken;
+	latestSignalToken;
 	[Symbol.dispose];
-	constructor(mutableState, store) {
-		this.mutableState = mutableState;
+	constructor(mutableAtomToken, store) {
 		const target = newest(store);
-		this.latestUpdateState = this.initializeState(mutableState, target);
-		this.observeCore(mutableState, this.latestUpdateState, target);
-		this.updateCore(mutableState, this.latestUpdateState, target);
-		target.trackers.set(mutableState.key, this);
+		const latestSignalToken = this.initializeState(mutableAtomToken, target);
+		this.mutableAtomToken = mutableAtomToken;
+		this.latestSignalToken = latestSignalToken;
+		this.captureSignalsFromCore(mutableAtomToken, latestSignalToken, target);
+		this.supplySignalsToCore(mutableAtomToken, latestSignalToken, target);
+		target.trackers.set(mutableAtomToken.key, this);
 		this[Symbol.dispose] = () => {
 			this.unsubscribeFromInnerValue();
 			this.unsubscribeFromState();
-			target.trackers.delete(mutableState.key);
+			target.trackers.delete(mutableAtomToken.key);
 		};
 	}
 };
@@ -2355,7 +2357,14 @@ function createMutableAtom(store, options, family) {
 		};
 	}
 	new Tracker(token, store);
-	if (!family) selectJson(token, options, store);
+	if (!family) createStandaloneSelector(store, {
+		key: `${key}:JSON`,
+		get: ({ get }) => get(token).toJSON(),
+		set: ({ set }, newValue) => {
+			set(token, options.class.fromJSON(newValue));
+		}
+	});
+	store.on.atomCreation.next(token);
 	return token;
 }
 
@@ -2415,10 +2424,7 @@ function createMutableAtomFamily(store, options, internalRoles) {
 		const target = newest(store);
 		const individualOptions = {
 			key: fullKey,
-			default: () => options.default(key),
-			toJson: options.toJson,
-			fromJson: options.fromJson,
-			mutable: true
+			class: options.class
 		};
 		if (options.effects) individualOptions.effects = options.effects(key);
 		const token = createMutableAtom(target, individualOptions, family);
@@ -2431,12 +2437,16 @@ function createMutableAtomFamily(store, options, internalRoles) {
 	const atomFamily$1 = Object.assign(familyFunction, familyToken, {
 		subject,
 		install: (s) => createMutableAtomFamily(s, options),
-		toJson: options.toJson,
-		fromJson: options.fromJson,
 		internalRoles
 	});
 	store.families.set(options.key, atomFamily$1);
-	selectJsonFamily(store, atomFamily$1, options);
+	createWritablePureSelectorFamily(store, {
+		key: `${options.key}:JSON`,
+		get: (key) => ({ get }) => get(familyToken, key).toJSON(),
+		set: (key) => ({ set }, newValue) => {
+			set(familyToken, key, options.class.fromJSON(newValue));
+		}
+	}, [`mutable`, `json`]);
 	new FamilyTracker(atomFamily$1, store);
 	return familyToken;
 }
@@ -2597,12 +2607,12 @@ var Store = class {
 				family.install(this);
 			}
 			const mutableHelpers = /* @__PURE__ */ new Set();
-			for (const [, atom$1] of store.atoms) {
-				if (mutableHelpers.has(atom$1.key)) continue;
-				atom$1.install(this);
-				if (atom$1.type === `mutable_atom`) {
-					const originalJsonToken = getJsonToken(store, atom$1);
-					const originalUpdateToken = getUpdateToken(atom$1);
+			for (const [, atom] of store.atoms) {
+				if (mutableHelpers.has(atom.key)) continue;
+				atom.install(this);
+				if (atom.type === `mutable_atom`) {
+					const originalJsonToken = getJsonToken(store, atom);
+					const originalUpdateToken = getUpdateToken(atom);
 					mutableHelpers.add(originalJsonToken.key);
 					mutableHelpers.add(originalUpdateToken.key);
 				}
@@ -2716,33 +2726,20 @@ function createRegularAtom(store, options, family) {
 			for (const cleanup of cleanupFunctions) cleanup();
 		};
 	}
+	store.on.atomCreation.next(token);
 	return token;
 }
 
-//#endregion
-//#region src/internal/atom/create-standalone-atom.ts
-function createStandaloneAtom(store, options) {
-	const isMutable = `mutable` in options;
-	if (isMutable) {
-		const state$1 = createMutableAtom(store, options, void 0);
-		store.on.atomCreation.next(state$1);
-		return state$1;
-	}
-	const state = createRegularAtom(store, options, void 0);
-	store.on.atomCreation.next(state);
-	return state;
-}
-
 //#endregion
 //#region src/internal/atom/dispose-atom.ts
 function disposeAtom(store, atomToken) {
 	const target = newest(store);
 	const { key, family } = atomToken;
-	const atom$1 = withdraw(target, atomToken);
+	const atom = withdraw(target, atomToken);
 	if (!family) store.logger.error(`❌`, `atom`, key, `Standalone atoms cannot be disposed.`);
 	else {
-		atom$1.cleanup?.();
-		const lastValue = store.valueMap.get(atom$1.key);
+		atom.cleanup?.();
+		const lastValue = store.valueMap.get(atom.key);
 		const atomFamily$1 = withdraw(store, {
 			key: family.key,
 			type: `atom_family`
@@ -2759,6 +2756,7 @@ function disposeAtom(store, atomToken) {
 		target.valueMap.delete(key);
 		target.selectorAtoms.delete(key);
 		target.atomsThatAreDefault.delete(key);
+		target.moleculeData.delete(family.key, family.subKey);
 		store.timelineTopics.delete(key);
 		if (atomToken.type === `mutable_atom`) {
 			const updateToken = getUpdateToken(atomToken);
@@ -2769,7 +2767,7 @@ function disposeAtom(store, atomToken) {
 		if (isChild && target.transactionMeta.phase === `building`) {
 			const mostRecentUpdate = target.transactionMeta.update.updates.at(-1);
 			const wasMoleculeDisposal = mostRecentUpdate?.type === `molecule_disposal`;
-			const updateAlreadyCaptured = wasMoleculeDisposal && mostRecentUpdate.values.some(([k]) => k === atom$1.family?.key);
+			const updateAlreadyCaptured = wasMoleculeDisposal && mostRecentUpdate.values.some(([k]) => k === atom.family?.key);
 			if (!updateAlreadyCaptured) target.transactionMeta.update.updates.push(disposal);
 		} else store.on.atomDisposal.next(atomToken);
 	}
@@ -2854,10 +2852,7 @@ var Join = class {
 		const bSide = options.between[1];
 		const relatedKeysAtoms = createMutableAtomFamily(store, {
 			key: `${options.key}/relatedKeys`,
-			default: () => new SetRTX(),
-			mutable: true,
-			fromJson: (json) => SetRTX.fromJSON(json),
-			toJson: (set) => set.toJSON()
+			class: SetRTX
 		}, [`join`, `relations`]);
 		this.core = { relatedKeysAtoms };
 		const getRelatedKeys = ({ get }, key) => get(relatedKeysAtoms, key);
@@ -3340,12 +3335,12 @@ function addAtomToTimeline(store, atomToken, tl) {
 		const updateToken = getUpdateToken(maybeAtom);
 		maybeAtom = withdraw(store, updateToken);
 	}
-	const atom$1 = maybeAtom;
+	const atom = maybeAtom;
 	store.timelineTopics.set({
-		topicKey: atom$1.key,
+		topicKey: atom.key,
 		timelineKey: tl.key
 	}, { topicType: `atom` });
-	tl.subscriptions.set(atom$1.key, atom$1.subject.subscribe(`timeline`, function timelineCapturesAtomUpdate(update) {
+	tl.subscriptions.set(atom.key, atom.subject.subscribe(`timeline`, function timelineCapturesAtomUpdate(update) {
 		const target = newest(store);
 		const currentSelectorKey = store.operation.open && store.operation.token.type === `writable_pure_selector` ? store.operation.token.key : null;
 		const currentSelectorTime = store.operation.open && store.operation.token.type === `writable_pure_selector` ? store.operation.time : null;
@@ -3362,7 +3357,7 @@ function addAtomToTimeline(store, atomToken, tl) {
 					atomUpdates: []
 				};
 				latestUpdate.atomUpdates.push({
-					key: atom$1.key,
+					key: atom.key,
 					type: `atom_update`,
 					...update
 				});
@@ -3373,7 +3368,7 @@ function addAtomToTimeline(store, atomToken, tl) {
 				tl.selectorTime = currentSelectorTime;
 			} else if (latestUpdate?.type === `selector_update`) {
 				latestUpdate.atomUpdates.push({
-					key: atom$1.key,
+					key: atom.key,
 					type: `atom_update`,
 					...update
 				});
@@ -3394,13 +3389,13 @@ function addAtomToTimeline(store, atomToken, tl) {
 			const atomUpdate = {
 				type: `atom_update`,
 				timestamp,
-				key: atom$1.key,
+				key: atom.key,
 				oldValue: update.oldValue,
 				newValue: update.newValue
 			};
-			if (atom$1.family) atomUpdate.family = atom$1.family;
+			if (atom.family) atomUpdate.family = atom.family;
 			const willCapture = tl.shouldCapture?.(atomUpdate, tl) ?? true;
-			store.logger.info(`⌛`, `timeline`, tl.key, `got an atom_update to "${atom$1.key}"`);
+			store.logger.info(`⌛`, `timeline`, tl.key, `got an atom_update to "${atom.key}"`);
 			if (willCapture) {
 				tl.history.push(atomUpdate);
 				tl.at = tl.history.length;
@@ -3418,7 +3413,7 @@ function addAtomFamilyToTimeline(store, atomFamilyToken, tl) {
 	tl.subscriptions.set(family.key, family.subject.subscribe(`timeline`, function timelineCapturesStateLifecycleEvent(creationOrDisposal) {
 		handleStateLifecycleEvent(store, creationOrDisposal, tl);
 	}));
-	for (const atom$1 of store.atoms.values()) if (atom$1.family?.key === family.key) addAtomToTimeline(store, atom$1, tl);
+	for (const atom of store.atoms.values()) if (atom.family?.key === family.key) addAtomToTimeline(store, atom, tl);
 }
 function joinTransaction(store, tl, txUpdateInProgress) {
 	const currentTxKey = txUpdateInProgress.key;
@@ -3552,5 +3547,5 @@ const timeTravel = (store, action, token) => {
 };
 
 //#endregion
-export { CircularBuffer, FAMILY_MEMBER_TOKEN_TYPES, FamilyTracker, Future, IMPLICIT, Join, Junction, LazyMap, NotFoundError, StatefulSubject, Store, Subject, TRANSACTION_PHASES, Tracker, abortTransaction, actUponStore, allocateIntoStore, applyTransaction, arbitrary, assignTransactionToContinuity, become, buildTransaction, cacheValue, capitalize, claimWithinStore, clearStore, closeOperation, counterfeit, createAtomFamily, createJoin, createMutableAtom, createMutableAtomFamily, createReadonlyHeldSelector, createReadonlyPureSelector, createReadonlyPureSelectorFamily, createRegularAtom, createRegularAtomFamily, createSelectorFamily, createStandaloneAtom, createStandaloneSelector, createTimeline, createTransaction, createWritableHeldSelector, createWritablePureSelector, createWritablePureSelectorFamily, deallocateFromStore, deposit, disposeAtom, disposeFromStore, disposeSelector, editRelationsInStore, evictCachedValue, findInStore, findRelationsInStore, fuseWithinStore, getContinuityKey, getEnvironmentData, getEpochNumberOfAction, getEpochNumberOfContinuity, getFromStore, getInternalRelationsFromStore, getJoin, getJsonFamily, getJsonToken, getSelectorDependencyKeys, getTrace, getUpdateFamily, getUpdateToken, ingestAtomUpdate, ingestCreationEvent, ingestDisposalEvent, ingestMoleculeCreationEvent, ingestMoleculeDisposalEvent, ingestMoleculeTransferEvent, ingestSelectorUpdate, ingestTransactionUpdate, initFamilyMemberInStore, installIntoStore, isAtomKey, isChildStore, isDone, isReadonlySelectorKey, isReservedIntrospectionKey, isRootStore, isSelectorKey, isStateKey, isTransceiver, makeRootMoleculeInStore, markDone, newest, openOperation, prettyPrintTokenType, readCachedValue, readOrComputeValue, recallState, registerSelector, resetAtomOrSelector, resetInStore, seekInStore, setAtomOrSelector, setEpochNumberOfAction, setEpochNumberOfContinuity, setIntoStore, subscribeInStore, subscribeToRootDependency, subscribeToState, subscribeToTimeline, subscribeToTransaction, timeTravel, traceRootSelectorAtoms, updateSelectorAtoms, withdraw };
+export { CircularBuffer, FAMILY_MEMBER_TOKEN_TYPES, FamilyTracker, Future, IMPLICIT, Join, Junction, LazyMap, NotFoundError, StatefulSubject, Store, Subject, TRANSACTION_PHASES, Tracker, abortTransaction, actUponStore, allocateIntoStore, applyTransaction, arbitrary, assignTransactionToContinuity, become, buildTransaction, cacheValue, capitalize, claimWithinStore, clearStore, closeOperation, counterfeit, createJoin, createMutableAtom, createMutableAtomFamily, createReadonlyHeldSelector, createReadonlyPureSelector, createReadonlyPureSelectorFamily, createRegularAtom, createRegularAtomFamily, createSelectorFamily, createStandaloneSelector, createTimeline, createTransaction, createWritableHeldSelector, createWritablePureSelector, createWritablePureSelectorFamily, deallocateFromStore, deposit, disposeAtom, disposeFromStore, disposeSelector, editRelationsInStore, evictCachedValue, findInStore, findRelationsInStore, fuseWithinStore, getContinuityKey, getEnvironmentData, getEpochNumberOfAction, getEpochNumberOfContinuity, getFromStore, getInternalRelationsFromStore, getJoin, getJsonFamily, getJsonToken, getSelectorDependencyKeys, getTrace, getUpdateFamily, getUpdateToken, ingestAtomUpdate, ingestCreationEvent, ingestDisposalEvent, ingestMoleculeCreationEvent, ingestMoleculeDisposalEvent, ingestMoleculeTransferEvent, ingestSelectorUpdate, ingestTransactionUpdate, initFamilyMemberInStore, installIntoStore, isAtomKey, isChildStore, isDone, isReadonlySelectorKey, isReservedIntrospectionKey, isRootStore, isSelectorKey, isStateKey, isTransceiver, makeRootMoleculeInStore, markDone, newest, openOperation, prettyPrintTokenType, readCachedValue, readOrComputeValue, recallState, registerSelector, resetAtomOrSelector, resetInStore, seekInStore, setAtomOrSelector, setEpochNumberOfAction, setEpochNumberOfContinuity, setIntoStore, subscribeInStore, subscribeToRootDependency, subscribeToState, subscribeToTimeline, subscribeToTransaction, timeTravel, traceRootSelectorAtoms, updateSelectorAtoms, withdraw };
 //# sourceMappingURL=index.js.map