atom.io 0.21.1 → 0.23.0

package/realtime-server/dist/index.cjs

@@ -4,6 +4,7 @@ var json = require('atom.io/json');
 var internal = require('atom.io/internal');
 var setRtx = require('atom.io/transceivers/set-rtx');
 var AtomIO = require('atom.io');
+require('atom.io/immortal');
 var realtime = require('atom.io/realtime');
 var data = require('atom.io/data');
 var child_process = require('child_process');
@@ -406,12 +407,12 @@ function findRelationsInStore(token, key, store) {
       relations = {
         get [keyAB]() {
           const familyAB = myJoin.states[keyAB];
-          const state = internal.findInStore(familyAB, key, store);
+          const state = myJoin.retrieve(familyAB, key);
           return state;
         },
         get [keyBA]() {
           const familyBA = myJoin.states[keyBA];
-          const state = internal.findInStore(familyBA, key, store);
+          const state = myJoin.retrieve(familyBA, key);
           return state;
         }
       };
@@ -421,12 +422,12 @@ function findRelationsInStore(token, key, store) {
         Object.assign(relations, {
           get [entryAB]() {
             const familyAB = myJoin.states[entryAB];
-            const state = internal.findInStore(familyAB, key, store);
+            const state = myJoin.retrieve(familyAB, key);
             return state;
           },
           get [entryBA]() {
             const familyBA = myJoin.states[entryBA];
-            const state = internal.findInStore(familyBA, key, store);
+            const state = myJoin.retrieve(familyBA, key);
             return state;
           }
         });
@@ -439,12 +440,12 @@ function findRelationsInStore(token, key, store) {
       relations = {
         get [keyAB]() {
           const familyAB = myJoin.states[keyAB];
-          const state = internal.findInStore(familyAB, key, store);
+          const state = myJoin.retrieve(familyAB, key);
           return state;
         },
         get [keysBA]() {
           const familyBA = myJoin.states[keysBA];
-          const state = internal.findInStore(familyBA, key, store);
+          const state = myJoin.retrieve(familyBA, key);
           return state;
         }
       };
@@ -454,12 +455,12 @@ function findRelationsInStore(token, key, store) {
         Object.assign(relations, {
           get [entryAB]() {
             const familyAB = myJoin.states[entryAB];
-            const state = internal.findInStore(familyAB, key, store);
+            const state = myJoin.retrieve(familyAB, key);
             return state;
           },
           get [entriesBA]() {
             const familyBA = myJoin.states[entriesBA];
-            const state = internal.findInStore(familyBA, key, store);
+            const state = myJoin.retrieve(familyBA, key);
             return state;
           }
         });
@@ -472,12 +473,12 @@ function findRelationsInStore(token, key, store) {
       relations = {
         get [keysAB]() {
           const familyAB = myJoin.states[keysAB];
-          const state = internal.findInStore(familyAB, key, store);
+          const state = myJoin.retrieve(familyAB, key);
           return state;
         },
         get [keysBA]() {
           const familyBA = myJoin.states[keysBA];
-          const state = internal.findInStore(familyBA, key, store);
+          const state = myJoin.retrieve(familyBA, key);
           return state;
         }
       };
@@ -487,12 +488,12 @@ function findRelationsInStore(token, key, store) {
         Object.assign(relations, {
           get [entriesAB]() {
             const familyAB = myJoin.states[entriesAB];
-            const state = internal.findInStore(familyAB, key, store);
+            const state = myJoin.retrieve(familyAB, key);
             return state;
           },
           get [entriesBA]() {
             const familyBA = myJoin.states[entriesBA];
-            const state = internal.findInStore(familyBA, key, store);
+            const state = myJoin.retrieve(familyBA, key);
             return state;
           }
         });
@@ -642,19 +643,29 @@ var destroyRoomTX = AtomIO__namespace.transaction({
 });
 function redactTransactionUpdateContent(visibleStateKeys, updates) {
   return updates.map((update) => {
-    if (`newValue` in update) {
-      return update;
+    switch (update.type) {
+      case `transaction_update`: {
+        const redacted = redactTransactionUpdateContent(
+          visibleStateKeys,
+          update.updates
+        );
+        return __spreadProps(__spreadValues({}, update), { updates: redacted });
+      }
+      default:
+        return update;
     }
-    const redacted = redactTransactionUpdateContent(
-      visibleStateKeys,
-      update.updates
-    );
-    return __spreadProps(__spreadValues({}, update), { updates: redacted });
   }).filter((update) => {
-    if (`newValue` in update) {
-      return visibleStateKeys.includes(update.key);
+    switch (update.type) {
+      case `atom_update`:
+      case `selector_update`:
+        return visibleStateKeys.includes(update.key);
+      case `state_creation`:
+        return visibleStateKeys.includes(update.token.key);
+      case `molecule_creation`:
+        return true;
+      case `transaction_update`:
+        return true;
     }
-    return true;
   });
 }
 var actionOcclusionAtoms = AtomIO.atomFamily({
@@ -767,7 +778,7 @@ function realtimeContinuitySynchronizer({
               (token) => !newKeys.includes(token.key)
             );
             const revealed = newValue.filter((token) => !oldKeys.includes(token.key)).flatMap((token) => {
-              const resourceToken = token.type === `mutable_atom` ? internal.getJsonToken(token) : token;
+              const resourceToken = token.type === `mutable_atom` ? internal.getJsonToken(token, store) : token;
               const resource = internal.getFromStore(resourceToken, store);
               return [resourceToken, resource];
             });
@@ -800,7 +811,7 @@ function realtimeContinuitySynchronizer({
       var _a;
       const initialPayload = [];
       for (const atom2 of continuity.globals) {
-        const resourceToken = atom2.type === `mutable_atom` ? internal.getJsonToken(atom2) : atom2;
+        const resourceToken = atom2.type === `mutable_atom` ? internal.getJsonToken(atom2, store) : atom2;
         initialPayload.push(resourceToken, internal.getFromStore(atom2, store));
       }
       for (const perspective of continuity.perspectives) {
@@ -813,7 +824,7 @@ function realtimeContinuitySynchronizer({
           userView
         });
         for (const visibleToken of userView) {
-          const resourceToken = visibleToken.type === `mutable_atom` ? internal.getJsonToken(visibleToken) : visibleToken;
+          const resourceToken = visibleToken.type === `mutable_atom` ? internal.getJsonToken(visibleToken, store) : visibleToken;
           const resource = internal.getFromStore(resourceToken, store);
           initialPayload.push(resourceToken, resource);
         }
@@ -1003,7 +1014,8 @@ function realtimeMutableFamilyProvider({
       for (const exposedSubKey of exposedSubKeys) {
         if (json.stringifyJson(exposedSubKey) === json.stringifyJson(subKey)) {
           const token = internal.findInStore(family, subKey, store);
-          const jsonToken = internal.getJsonToken(token);
+          internal.getFromStore(token, store);
+          const jsonToken = internal.getJsonToken(token, store);
           const updateToken = internal.getUpdateToken(token);
           socket.emit(`init:${token.key}`, internal.getFromStore(jsonToken, store));
           const unsubscribe = internal.subscribeToState(
@@ -1038,7 +1050,7 @@ function realtimeMutableProvider({
 }) {
   return function mutableProvider(token) {
     let unsubscribeFromStateUpdates = null;
-    const jsonToken = internal.getJsonToken(token);
+    const jsonToken = internal.getJsonToken(token, store);
     const trackerToken = internal.getUpdateToken(token);
     const fillUnsubRequest = () => {
       socket.off(`unsub:${token.key}`, fillUnsubRequest);

package/realtime-server/dist/index.d.ts

@@ -112,7 +112,7 @@ declare function redactTransactionUpdateContent(visibleStateKeys: string[], upda
 declare const actionOcclusionAtoms: AtomIO.RegularAtomFamilyTokenWithCall<{
     occlude: (updates: TransactionUpdateContent[]) => TransactionUpdateContent[];
 }, string>;
-declare const userUnacknowledgedQueues: AtomIO.RegularAtomFamilyTokenWithCall<Pick<TransactionUpdate<any>, "key" | "epoch" | "id" | "updates" | "output">[], string>;
+declare const userUnacknowledgedQueues: AtomIO.RegularAtomFamilyTokenWithCall<Pick<TransactionUpdate<any>, "key" | "id" | "epoch" | "updates" | "output">[], string>;
 
 declare const socketAtoms: AtomIO.RegularAtomFamilyTokenWithCall<Socket | null, string>;
 declare const socketIndex: AtomIO.MutableAtomToken<SetRTX<string>, SetRTXJson<string>>;

package/realtime-server/dist/index.js

@@ -1,4 +1,4 @@
-import { findRelationsInStore } from '../../dist/chunk-HITX3MO4.js';
+import { findRelationsInStore } from '../../dist/chunk-7DT3PVS3.js';
 import '../../dist/chunk-FTONNX2R.js';
 import { __spreadProps, __spreadValues } from '../../dist/chunk-F2X4B4VY.js';
 import { parseJson, stringifyJson } from 'atom.io/json';
@@ -472,19 +472,29 @@ var destroyRoomTX = AtomIO.transaction({
 });
 function redactTransactionUpdateContent(visibleStateKeys, updates) {
   return updates.map((update) => {
-    if (`newValue` in update) {
-      return update;
+    switch (update.type) {
+      case `transaction_update`: {
+        const redacted = redactTransactionUpdateContent(
+          visibleStateKeys,
+          update.updates
+        );
+        return __spreadProps(__spreadValues({}, update), { updates: redacted });
+      }
+      default:
+        return update;
     }
-    const redacted = redactTransactionUpdateContent(
-      visibleStateKeys,
-      update.updates
-    );
-    return __spreadProps(__spreadValues({}, update), { updates: redacted });
   }).filter((update) => {
-    if (`newValue` in update) {
-      return visibleStateKeys.includes(update.key);
+    switch (update.type) {
+      case `atom_update`:
+      case `selector_update`:
+        return visibleStateKeys.includes(update.key);
+      case `state_creation`:
+        return visibleStateKeys.includes(update.token.key);
+      case `molecule_creation`:
+        return true;
+      case `transaction_update`:
+        return true;
     }
-    return true;
   });
 }
 var actionOcclusionAtoms = atomFamily({
@@ -597,7 +607,7 @@ function realtimeContinuitySynchronizer({
               (token) => !newKeys.includes(token.key)
             );
             const revealed = newValue.filter((token) => !oldKeys.includes(token.key)).flatMap((token) => {
-              const resourceToken = token.type === `mutable_atom` ? getJsonToken(token) : token;
+              const resourceToken = token.type === `mutable_atom` ? getJsonToken(token, store) : token;
               const resource = getFromStore(resourceToken, store);
               return [resourceToken, resource];
             });
@@ -630,7 +640,7 @@ function realtimeContinuitySynchronizer({
       var _a;
       const initialPayload = [];
       for (const atom2 of continuity.globals) {
-        const resourceToken = atom2.type === `mutable_atom` ? getJsonToken(atom2) : atom2;
+        const resourceToken = atom2.type === `mutable_atom` ? getJsonToken(atom2, store) : atom2;
         initialPayload.push(resourceToken, getFromStore(atom2, store));
       }
       for (const perspective of continuity.perspectives) {
@@ -643,7 +653,7 @@ function realtimeContinuitySynchronizer({
           userView
         });
         for (const visibleToken of userView) {
-          const resourceToken = visibleToken.type === `mutable_atom` ? getJsonToken(visibleToken) : visibleToken;
+          const resourceToken = visibleToken.type === `mutable_atom` ? getJsonToken(visibleToken, store) : visibleToken;
           const resource = getFromStore(resourceToken, store);
           initialPayload.push(resourceToken, resource);
         }
@@ -833,7 +843,8 @@ function realtimeMutableFamilyProvider({
       for (const exposedSubKey of exposedSubKeys) {
         if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
           const token = findInStore(family, subKey, store);
-          const jsonToken = getJsonToken(token);
+          getFromStore(token, store);
+          const jsonToken = getJsonToken(token, store);
           const updateToken = getUpdateToken(token);
           socket.emit(`init:${token.key}`, getFromStore(jsonToken, store));
           const unsubscribe = subscribeToState(
@@ -868,7 +879,7 @@ function realtimeMutableProvider({
 }) {
   return function mutableProvider(token) {
     let unsubscribeFromStateUpdates = null;
-    const jsonToken = getJsonToken(token);
+    const jsonToken = getJsonToken(token, store);
     const trackerToken = getUpdateToken(token);
     const fillUnsubRequest = () => {
       socket.off(`unsub:${token.key}`, fillUnsubRequest);

package/realtime-server/src/realtime-continuity-synchronizer.ts

@@ -106,7 +106,9 @@ export function realtimeContinuitySynchronizer({
 							.filter((token) => !oldKeys.includes(token.key))
 							.flatMap((token) => {
 								const resourceToken =
-									token.type === `mutable_atom` ? getJsonToken(token) : token
+									token.type === `mutable_atom`
+										? getJsonToken(token, store)
+										: token
 								const resource = getFromStore(resourceToken, store)
 								return [resourceToken, resource]
 							})
@@ -139,7 +141,7 @@ export function realtimeContinuitySynchronizer({
 			const initialPayload: Json.Serializable[] = []
 			for (const atom of continuity.globals) {
 				const resourceToken =
-					atom.type === `mutable_atom` ? getJsonToken(atom) : atom
+					atom.type === `mutable_atom` ? getJsonToken(atom, store) : atom
 				initialPayload.push(resourceToken, getFromStore(atom, store))
 			}
 			for (const perspective of continuity.perspectives) {
@@ -154,7 +156,7 @@ export function realtimeContinuitySynchronizer({
 				for (const visibleToken of userView) {
 					const resourceToken =
 						visibleToken.type === `mutable_atom`
-							? getJsonToken(visibleToken)
+							? getJsonToken(visibleToken, store)
 							: visibleToken
 					const resource = getFromStore(resourceToken, store)
 

package/realtime-server/src/realtime-mutable-family-provider.ts

@@ -44,7 +44,8 @@ export function realtimeMutableFamilyProvider({
 			for (const exposedSubKey of exposedSubKeys) {
 				if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
 					const token = findInStore(family, subKey, store)
-					const jsonToken = getJsonToken(token)
+					getFromStore(token, store)
+					const jsonToken = getJsonToken(token, store)
 					const updateToken = getUpdateToken(token)
 					socket.emit(`init:${token.key}`, getFromStore(jsonToken, store))
 					const unsubscribe = subscribeToState(

package/realtime-server/src/realtime-mutable-provider.ts

@@ -22,7 +22,7 @@ export function realtimeMutableProvider({
 	>(token: AtomIO.MutableAtomToken<Core, SerializableCore>): () => void {
 		let unsubscribeFromStateUpdates: (() => void) | null = null
 
-		const jsonToken = getJsonToken(token)
+		const jsonToken = getJsonToken(token, store)
 		const trackerToken = getUpdateToken(token)
 
 		const fillUnsubRequest = () => {

package/realtime-server/src/realtime-server-stores/server-sync-store.ts

@@ -1,5 +1,5 @@
 import type { TransactionUpdate, TransactionUpdateContent } from "atom.io"
-import { atomFamily, selectorFamily } from "atom.io"
+import { atomFamily } from "atom.io"
 
 // export const completeUpdateAtoms = atomFamily<
 // 	TransactionUpdate<any> | null,
@@ -15,20 +15,30 @@ export function redactTransactionUpdateContent(
 ): TransactionUpdateContent[] {
 	return updates
 		.map((update): TransactionUpdateContent => {
-			if (`newValue` in update) {
-				return update
+			switch (update.type) {
+				case `transaction_update`: {
+					const redacted = redactTransactionUpdateContent(
+						visibleStateKeys,
+						update.updates,
+					)
+					return { ...update, updates: redacted }
+				}
+				default:
+					return update
 			}
-			const redacted = redactTransactionUpdateContent(
-				visibleStateKeys,
-				update.updates,
-			)
-			return { ...update, updates: redacted }
 		})
 		.filter((update) => {
-			if (`newValue` in update) {
-				return visibleStateKeys.includes(update.key)
+			switch (update.type) {
+				case `atom_update`:
+				case `selector_update`:
+					return visibleStateKeys.includes(update.key)
+				case `state_creation`:
+					return visibleStateKeys.includes(update.token.key)
+				case `molecule_creation`:
+					return true
+				case `transaction_update`:
+					return true
 			}
-			return true
 		})
 }
 

package/realtime-testing/dist/index.cjs

@@ -11,6 +11,8 @@ var RTS = require('atom.io/realtime-server');
 var Happy = require('happy-dom');
 var SocketIO = require('socket.io');
 var socket_ioClient = require('socket.io-client');
+require('atom.io/immortal');
+require('atom.io/json');
 require('atom.io/transceivers/set-rtx');
 var jsxRuntime = require('react/jsx-runtime');
 
@@ -143,7 +145,10 @@ AtomIO__namespace.atom(
 var testNumber = 0;
 var setupRealtimeTestServer = (options) => {
   ++testNumber;
-  const silo = new AtomIO__namespace.Silo(`SERVER-${testNumber}`, internal.IMPLICIT.STORE);
+  const silo = new AtomIO__namespace.Silo(
+    { name: `SERVER-${testNumber}`, lifespan: `ephemeral` },
+    internal.IMPLICIT.STORE
+  );
   const httpServer = http__namespace.createServer((_, res) => res.end(`Hello World!`));
   const address = httpServer.listen(options.port).address();
   const port = typeof address === `string` ? null : address === null ? null : address.port;
@@ -198,7 +203,7 @@ var setupRealtimeTestClient = (options, name, port) => {
     const socket = socket_ioClient.io(`http://localhost:${port}/`, {
       auth: { token: `test`, username: `${name}-${testNumber}` }
     });
-    const silo = new AtomIO__namespace.Silo(name, internal.IMPLICIT.STORE);
+    const silo = new AtomIO__namespace.Silo({ name, lifespan: `ephemeral` }, internal.IMPLICIT.STORE);
     for (const [key, value] of silo.store.valueMap.entries()) {
       if (Array.isArray(value)) {
         silo.store.valueMap.set(key, [...value]);

package/realtime-testing/dist/index.js

@@ -1,8 +1,8 @@
-import { myUsernameState } from '../../dist/chunk-O47EQUM6.js';
-import { editRelationsInStore } from '../../dist/chunk-HITX3MO4.js';
-import '../../dist/chunk-FTONNX2R.js';
 import { recordToEntries } from '../../dist/chunk-3V3VWQ7X.js';
+import { myUsernameState } from '../../dist/chunk-O47EQUM6.js';
 import '../../dist/chunk-BWWVY5O5.js';
+import { editRelationsInStore } from '../../dist/chunk-7DT3PVS3.js';
+import '../../dist/chunk-FTONNX2R.js';
 import { __spreadProps, __spreadValues } from '../../dist/chunk-F2X4B4VY.js';
 import * as http from 'http';
 import { render, prettyDOM } from '@testing-library/react';
@@ -20,7 +20,10 @@ import { jsx } from 'react/jsx-runtime';
 var testNumber = 0;
 var setupRealtimeTestServer = (options) => {
   ++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();
   const port = typeof address === `string` ? null : address === null ? null : address.port;
@@ -75,7 +78,7 @@ var setupRealtimeTestClient = (options, name, port) => {
     const socket = 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/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

@@ -6,7 +6,13 @@ import {
 } from "atom.io/internal"
 import type { Json, JsonInterface } from "atom.io/json"
 
-import type { AtomToken, MutableAtomToken, RegularAtomToken } from "."
+import type {
+	AtomToken,
+	MutableAtomToken,
+	RegularAtomToken,
+	StateCreation,
+	StateDisposal,
+} from "."
 
 export type Effectors<T> = {
 	setSelf: <V extends T>(next: V | ((oldValue: T) => V)) => void
@@ -57,14 +63,17 @@ 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>
 	& {
 		(key: K): RegularAtomToken<T>
-		subject: Subject<RegularAtomToken<T>>
+		subject: Subject<StateCreation<AtomToken<T>> | StateDisposal<AtomToken<T>>>
 		install: (store: Store) => void
 	}
 
@@ -100,8 +109,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>,
@@ -112,7 +124,7 @@ export type MutableAtomFamily<
 	& MutableAtomFamilyToken<T, J, K>
 	& {
 			(key: K): MutableAtomToken<T, J>
-			subject: Subject<MutableAtomToken<T, J>>
+			subject: Subject<StateCreation<MutableAtomToken<T, J>> | StateDisposal<MutableAtomToken<T, J>>>
 			install: (store: Store) => void
 		}
 

package/src/dispose-state.ts

@@ -0,0 +1,10 @@
+import type { MoleculeToken } from "atom.io/immortal"
+import * as Internal from "atom.io/internal"
+
+import type { ReadableToken } from "."
+
+export function disposeState(
+	token: MoleculeToken<any, any, any> | ReadableToken<any>,
+): void {
+	Internal.disposeFromStore(token, Internal.IMPLICIT.STORE)
+}

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"
@@ -24,6 +23,10 @@ export * from "./validators"
 
 export type Func = (...parameters: any[]) => any
 
+export type Flat<R extends { [K in PropertyKey]: any }> = {
+	[K in keyof R]: R[K]
+}
+
 export type RegularAtomToken<T> = {
 	key: string
 	type: `atom`

package/src/selector.ts

@@ -7,7 +7,7 @@ import {
 import type { Json } from "atom.io/json"
 
 import type { ReadonlySelectorToken, WritableSelectorToken } from "."
-import type { Read, Write } from "./transaction"
+import type { Read, StateCreation, StateDisposal, Write } from "./transaction"
 
 export type WritableSelectorOptions<T> = {
 	key: string
@@ -53,14 +53,17 @@ 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> 
 	& {
 		(key: K): WritableSelectorToken<T>
-		subject: Subject<WritableSelectorToken<T>>
+		subject: Subject<StateCreation<WritableSelectorToken<T>> | StateDisposal<WritableSelectorToken<T>>>
 		install: (store: Store) => void
 	}
 
@@ -76,15 +79,18 @@ 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>)
 	& {
 		key: string
 		type: `readonly_selector_family`
-		subject: Subject<ReadonlySelectorToken<T>>
+		subject: Subject<StateCreation<ReadonlySelectorToken<T>> | StateDisposal<ReadonlySelectorToken<T>>>
 		install: (store: Store) => void
 		__T?: T
 		__K?: K

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/subscribe.ts

@@ -9,6 +9,7 @@ import {
 
 import type {
 	FamilyMetadata,
+	Flat,
 	Func,
 	ReadableToken,
 	TimelineManageable,
@@ -19,10 +20,13 @@ import type {
 } from "."
 
 export type StateUpdate<T> = { newValue: T; oldValue: T }
-export type KeyedStateUpdate<T> = StateUpdate<T> & {
-	key: string
-	family?: FamilyMetadata
-}
+export type KeyedStateUpdate<T> = Flat<
+	StateUpdate<T> & {
+		key: string
+		type: `atom_update` | `selector_update`
+		family?: FamilyMetadata
+	}
+>
 export type UpdateHandler<T> = (update: StateUpdate<T>) => void
 
 export type TransactionUpdateHandler<F extends Func> = (