atom.io 0.21.0 → 0.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,
@@ -48,32 +48,32 @@
     }
   },
   "devDependencies": {
-    "@testing-library/react": "15.0.6",
+    "@testing-library/react": "15.0.7",
     "@types/eslint": "npm:@types/eslint@8.56.10",
     "@types/eslint-v9": "npm:@types/eslint@8.56.10",
     "@types/estree": "1.0.5",
     "@types/http-proxy": "1.17.14",
     "@types/npmlog": "7.0.0",
-    "@types/react": "18.3.1",
+    "@types/react": "18.3.2",
     "@types/tmp": "0.2.6",
-    "@typescript-eslint/parser": "7.8.0",
-    "@typescript-eslint/rule-tester": "7.8.0",
+    "@typescript-eslint/parser": "7.9.0",
+    "@typescript-eslint/rule-tester": "7.9.0",
     "@vitest/coverage-v8": "1.6.0",
     "@vitest/ui": "1.6.0",
     "concurrently": "8.2.2",
-    "drizzle-kit": "0.20.17",
+    "drizzle-kit": "0.21.2",
     "drizzle-orm": "0.30.10",
     "eslint": "npm:eslint@8.57.0",
-    "eslint-v9": "npm:eslint@9.2.0",
-    "framer-motion": "11.1.7",
-    "happy-dom": "14.7.1",
+    "eslint-v9": "npm:eslint@9.3.0",
+    "framer-motion": "11.2.4",
+    "happy-dom": "14.11.0",
     "http-proxy": "1.18.1",
     "npmlog": "7.0.1",
     "postgres": "3.4.4",
-    "preact": "10.21.0",
+    "preact": "10.22.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.23.0",
+    "react-router-dom": "6.23.1",
     "socket.io": "4.7.5",
     "socket.io-client": "4.7.5",
     "tmp": "0.2.3",
@@ -92,9 +92,15 @@
     "data/dist",
     "data/package.json",
     "data/src",
+    "ephemeral/dist",
+    "ephemeral/package.json",
+    "ephemeral/src",
     "eslint-plugin/dist",
     "eslint-plugin/package.json",
     "eslint-plugin/src",
+    "immortal/dist",
+    "immortal/package.json",
+    "immortal/src",
     "internal/dist",
     "internal/package.json",
     "internal/src",
@@ -144,6 +150,13 @@
       "import": "./data/dist/index.js",
       "require": "./data/dist/index.cjs"
     },
+    "./ephemeral/package.json": "./ephemeral/package.json",
+    "./ephemeral": {
+      "types": "./ephemeral/dist/index.d.ts",
+      "browser": "./ephemeral/dist/index.js",
+      "import": "./ephemeral/dist/index.js",
+      "require": "./ephemeral/dist/index.cjs"
+    },
     "./eslint-plugin/package.json": "./eslint-plugin/package.json",
     "./eslint-plugin": {
       "types": "./eslint-plugin/dist/index.d.ts",
@@ -151,6 +164,13 @@
       "import": "./eslint-plugin/dist/index.js",
       "require": "./eslint-plugin/dist/index.cjs"
     },
+    "./immortal/package.json": "./immortal/package.json",
+    "./immortal": {
+      "types": "./immortal/dist/index.d.ts",
+      "browser": "./immortal/dist/index.js",
+      "import": "./immortal/dist/index.js",
+      "require": "./immortal/dist/index.cjs"
+    },
     "./internal/package.json": "./internal/package.json",
     "./internal": {
       "types": "./internal/dist/index.d.ts",

package/react/dist/index.cjs

@@ -54,7 +54,7 @@ function useO(token, key) {
 function useJSON(token, key) {
   const store = React5__namespace.useContext(StoreContext);
   const stateToken = token.type === `mutable_atom_family` ? internal.findInStore(token, key, store) : token;
-  const jsonToken = internal.getJsonToken(stateToken);
+  const jsonToken = internal.getJsonToken(stateToken, store);
   return useO(jsonToken);
 }
 function useTL(token) {

package/react/dist/index.js

@@ -32,7 +32,7 @@ function useO(token, key) {
 function useJSON(token, key) {
   const store = React5.useContext(StoreContext);
   const stateToken = token.type === `mutable_atom_family` ? findInStore(token, key, store) : token;
-  const jsonToken = getJsonToken(stateToken);
+  const jsonToken = getJsonToken(stateToken, store);
   return useO(jsonToken);
 }
 function useTL(token) {

package/react/src/use-json.ts

@@ -33,6 +33,6 @@ export function useJSON<
 		token.type === `mutable_atom_family`
 			? findInStore(token, key as Key, store)
 			: token
-	const jsonToken = getJsonToken(stateToken)
+	const jsonToken = getJsonToken(stateToken, store)
 	return useO(jsonToken)
 }

package/react-devtools/dist/index.cjs

@@ -5,6 +5,7 @@ var introspection = require('atom.io/introspection');
 var react$1 = require('atom.io/react');
 var framerMotion = require('framer-motion');
 var react = require('react');
+var ephemeral = require('atom.io/ephemeral');
 var jsxRuntime = require('react/jsx-runtime');
 
 var __defProp = Object.defineProperty;
@@ -1718,8 +1719,8 @@ var StateIndexTreeNode = ({ node, isOpenState }) => {
   const setIsOpen = react$1.useI(isOpenState);
   const isOpen = react$1.useO(isOpenState);
   for (const [key, childNode] of node.familyMembers) {
-    atom_io.findState(findViewIsOpenState, key);
-    atom_io.findState(findStateTypeState, childNode);
+    ephemeral.findState(findViewIsOpenState, key);
+    ephemeral.findState(findStateTypeState, childNode);
   }
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     /* @__PURE__ */ jsxRuntime.jsxs("header", { children: [
@@ -1740,8 +1741,8 @@ var StateIndexTreeNode = ({ node, isOpenState }) => {
       StateIndexNode,
       {
         node: childNode,
-        isOpenState: atom_io.findState(findViewIsOpenState, childNode.key),
-        typeState: atom_io.findState(findStateTypeState, childNode)
+        isOpenState: ephemeral.findState(findViewIsOpenState, childNode.key),
+        typeState: ephemeral.findState(findStateTypeState, childNode)
       },
       key
     )) : null
@@ -1764,8 +1765,8 @@ var StateIndex = ({ tokenIndex }) => {
       StateIndexNode,
       {
         node,
-        isOpenState: atom_io.findState(findViewIsOpenState, node.key),
-        typeState: atom_io.findState(findStateTypeState, node)
+        isOpenState: ephemeral.findState(findViewIsOpenState, node.key),
+        typeState: ephemeral.findState(findStateTypeState, node)
       },
       key
     );
@@ -1992,8 +1993,8 @@ var TimelineIndex = () => {
       TimelineLog,
       {
         token,
-        isOpenState: atom_io.findState(findViewIsOpenState, token.key),
-        timelineState: atom_io.findState(findTimelineState, token.key)
+        isOpenState: ephemeral.findState(findViewIsOpenState, token.key),
+        timelineState: ephemeral.findState(findTimelineState, token.key)
       },
       token.key
     );
@@ -2046,8 +2047,8 @@ var TransactionIndex = () => {
       TransactionLog,
       {
         token,
-        isOpenState: atom_io.findState(findViewIsOpenState, token.key),
-        logState: atom_io.findState(findTransactionLogState, token.key)
+        isOpenState: ephemeral.findState(findViewIsOpenState, token.key),
+        logState: ephemeral.findState(findTransactionLogState, token.key)
       },
       token.key
     );

package/react-devtools/dist/index.js

@@ -2,11 +2,12 @@ import { pipe, ifDefined, isArray, isRecord, doesExtend, isPlainObject, raiseErr
 import { lazyLocalStorageEffect } from '../../dist/chunk-BWWVY5O5.js';
 import { JSON_TYPE_NAMES, isString, isNumber, isBoolean, stringifyJson, JSON_DEFAULTS } from '../../dist/chunk-BF4MVQF6.js';
 import { __spreadProps, __spreadValues, __objRest, __restKey } from '../../dist/chunk-F2X4B4VY.js';
-import { selectorFamily, atom, atomFamily, findState, undo, redo, getState } from 'atom.io';
+import { selectorFamily, atom, atomFamily, undo, redo, getState } from 'atom.io';
 import { attachIntrospectionStates } from 'atom.io/introspection';
 import { useI, useO } from 'atom.io/react';
 import { motion, spring, LayoutGroup } from 'framer-motion';
 import { forwardRef, useRef, useState, useImperativeHandle, useLayoutEffect, Fragment as Fragment$1, Component, useId } from 'react';
+import { findState } from 'atom.io/ephemeral';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 
 // ../anvl/src/refinement/can-exist.ts

package/react-devtools/src/StateIndex.tsx

@@ -3,7 +3,8 @@ import type {
 	ReadonlySelectorToken,
 	RegularAtomToken,
 } from "atom.io"
-import { findState, getState, selectorFamily } from "atom.io"
+import { getState, selectorFamily } from "atom.io"
+import { findState } from "atom.io/ephemeral"
 import type { FamilyNode, WritableTokenIndex } from "atom.io/introspection"
 import { useI, useO } from "atom.io/react"
 import type { FC } from "react"

package/react-devtools/src/TimelineIndex.tsx

@@ -3,7 +3,8 @@ import type {
 	RegularAtomToken,
 	TimelineToken,
 } from "atom.io"
-import { findState, redo, undo } from "atom.io"
+import { redo, undo } from "atom.io"
+import { findState } from "atom.io/ephemeral"
 import type { Timeline } from "atom.io/internal"
 import { useI, useO } from "atom.io/react"
 import { type FC, Fragment } from "react"

package/react-devtools/src/TransactionIndex.tsx

@@ -1,11 +1,11 @@
-import {
-	findState,
-	type Func,
-	type ReadonlySelectorToken,
-	type RegularAtomToken,
-	type TransactionToken,
-	type TransactionUpdate,
+import type {
+	Func,
+	ReadonlySelectorToken,
+	RegularAtomToken,
+	TransactionToken,
+	TransactionUpdate,
 } from "atom.io"
+import { findState } from "atom.io/ephemeral"
 import { useI, useO } from "atom.io/react"
 import type { FC } from "react"
 

package/realtime-client/dist/index.cjs

@@ -56,7 +56,7 @@ function pullAtomFamilyMember(token, socket, store) {
   };
 }
 function pullMutableAtom(token, socket, store) {
-  const jsonToken = Internal.getJsonToken(token);
+  const jsonToken = Internal.getJsonToken(token, store);
   const updateToken = Internal.getUpdateToken(token);
   socket.on(`init:${token.key}`, (data) => {
     Internal.setIntoStore(jsonToken, data, store);
@@ -83,7 +83,7 @@ function pullMutableAtomFamilyMember(token, socket, store) {
   const { key: familyKey, subKey: serializedSubKey } = token.family;
   const subKey = json.parseJson(serializedSubKey);
   socket.on(`init:${token.key}`, (data) => {
-    const jsonToken = Internal.getJsonToken(token);
+    const jsonToken = Internal.getJsonToken(token, store);
     Internal.setIntoStore(jsonToken, data, store);
   });
   socket.on(
@@ -246,7 +246,7 @@ function syncContinuity(continuity, socket, store) {
       } else {
         v = x;
         if (`type` in k && k.type === `mutable_atom`) {
-          k = Internal.getJsonToken(k);
+          k = Internal.getJsonToken(k, store);
         }
         Internal.setIntoStore(k, v, store);
       }

package/realtime-client/dist/index.js

@@ -1,4 +1,4 @@
-export { syncContinuity } from '../../dist/chunk-RT43TVKP.js';
+export { syncContinuity } from '../../dist/chunk-GVHKIJ3G.js';
 export { confirmedUpdateQueue, myIdState, myIdState__INTERNAL, myUsernameState, optimisticUpdateQueue } from '../../dist/chunk-O47EQUM6.js';
 import '../../dist/chunk-BWWVY5O5.js';
 import '../../dist/chunk-F2X4B4VY.js';
@@ -35,7 +35,7 @@ function pullAtomFamilyMember(token, socket, store) {
   };
 }
 function pullMutableAtom(token, socket, store) {
-  const jsonToken = getJsonToken(token);
+  const jsonToken = getJsonToken(token, store);
   const updateToken = getUpdateToken(token);
   socket.on(`init:${token.key}`, (data) => {
     setIntoStore(jsonToken, data, store);
@@ -62,7 +62,7 @@ function pullMutableAtomFamilyMember(token, socket, store) {
   const { key: familyKey, subKey: serializedSubKey } = token.family;
   const subKey = parseJson(serializedSubKey);
   socket.on(`init:${token.key}`, (data) => {
-    const jsonToken = getJsonToken(token);
+    const jsonToken = getJsonToken(token, store);
     setIntoStore(jsonToken, data, store);
   });
   socket.on(

package/realtime-client/src/pull-mutable-atom-family-member.ts

@@ -20,7 +20,7 @@ export function pullMutableAtomFamilyMember<
 	const { key: familyKey, subKey: serializedSubKey } = token.family
 	const subKey = parseJson(serializedSubKey)
 	socket.on(`init:${token.key}`, (data: J) => {
-		const jsonToken = getJsonToken(token)
+		const jsonToken = getJsonToken(token, store)
 		setIntoStore(jsonToken, data, store)
 	})
 	socket.on(

package/realtime-client/src/pull-mutable-atom.ts

@@ -12,7 +12,7 @@ export function pullMutableAtom<
 	socket: Socket,
 	store: Store,
 ): () => void {
-	const jsonToken = getJsonToken(token)
+	const jsonToken = getJsonToken(token, store)
 	const updateToken = getUpdateToken(token)
 	socket.on(`init:${token.key}`, (data: J) => {
 		setIntoStore(jsonToken, data, store)

package/realtime-client/src/sync-continuity.ts

@@ -40,9 +40,8 @@ export function syncContinuity<F extends AtomIO.Func>(
 				k = x
 			} else {
 				v = x
-				// console.log(`❗❗❗❗❗`, k, v)
 				if (`type` in k && k.type === `mutable_atom`) {
-					k = getJsonToken(k)
+					k = getJsonToken(k, store)
 				}
 				setIntoStore(k, v, store)
 			}

package/realtime-react/dist/index.cjs

@@ -184,7 +184,7 @@ function syncContinuity(continuity, socket, store) {
       } else {
         v = x;
         if (`type` in k && k.type === `mutable_atom`) {
-          k = internal.getJsonToken(k);
+          k = internal.getJsonToken(k, store);
         }
         internal.setIntoStore(k, v, store);
       }

package/realtime-react/dist/index.js

@@ -1,4 +1,4 @@
-import { syncContinuity } from '../../dist/chunk-RT43TVKP.js';
+import { syncContinuity } from '../../dist/chunk-GVHKIJ3G.js';
 import '../../dist/chunk-F2X4B4VY.js';
 import { useI, StoreContext, useO } from 'atom.io/react';
 import * as RTC from 'atom.io/realtime-client';

package/realtime-server/dist/index.cjs

@@ -406,12 +406,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 +421,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 +439,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 +454,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 +472,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 +487,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;
           }
         });
@@ -767,7 +767,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 +800,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 +813,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 +1003,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 +1039,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.js

@@ -1,4 +1,4 @@
-import { findRelationsInStore } from '../../dist/chunk-KGZGBCYS.js';
+import { findRelationsInStore } from '../../dist/chunk-JA4V7TJY.js';
 import '../../dist/chunk-FTONNX2R.js';
 import { __spreadProps, __spreadValues } from '../../dist/chunk-F2X4B4VY.js';
 import { parseJson, stringifyJson } from 'atom.io/json';
@@ -597,7 +597,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 +630,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 +643,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 +833,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 +869,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-testing/dist/index.cjs

@@ -11,6 +11,7 @@ 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/json');
 require('atom.io/transceivers/set-rtx');
 var jsxRuntime = require('react/jsx-runtime');
 
@@ -143,7 +144,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 +202,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-KGZGBCYS.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-JA4V7TJY.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]);