atom.io 0.27.4 → 0.28.0

package/realtime-client/dist/index.js

@@ -1,14 +1,14 @@
-import { lazyLocalStorageEffect } from '../../dist/chunk-H6EDLPKH.js';
 import '../../dist/chunk-XWL6SNVU.js';
 import * as Internal from 'atom.io/internal';
-import { setIntoStore, getJsonToken, getUpdateToken, getFromStore, assignTransactionToContinuity, subscribeToTransaction, disposeAtom, setEpochNumberOfContinuity, getEpochNumberOfContinuity, isRootStore, ingestTransactionUpdate, actUponStore } from 'atom.io/internal';
+import { setIntoStore, getJsonToken, getUpdateToken, getFromStore, assignTransactionToContinuity, subscribeToTransaction, disposeAtom, setEpochNumberOfContinuity, getEpochNumberOfContinuity, isRootStore, ingestTransactionUpdate, growMoleculeInStore, initFamilyMemberInStore, actUponStore } from 'atom.io/internal';
 import { parseJson } from 'atom.io/json';
 import * as AtomIO from 'atom.io';
+import { persistSync } from 'atom.io/web';
 import { optimisticUpdateQueue as optimisticUpdateQueue$1, confirmedUpdateQueue as confirmedUpdateQueue$1 } from 'atom.io/realtime-client';
 
 function pullAtom(token, socket, store) {
   const setServedValue = (data) => {
-    setIntoStore(token, data, store);
+    setIntoStore(store, token, data);
   };
   socket.on(`serve:${token.key}`, setServedValue);
   socket.emit(`sub:${token.key}`);
@@ -26,7 +26,7 @@ function pullAtomFamilyMember(token, socket, store) {
   const { key: familyKey, subKey: serializedSubKey } = token.family;
   const subKey = parseJson(serializedSubKey);
   socket?.on(`serve:${token.key}`, (data) => {
-    setIntoStore(token, data, store);
+    setIntoStore(store, token, data);
   });
   socket?.emit(`sub:${familyKey}`, subKey);
   return () => {
@@ -35,15 +35,15 @@ function pullAtomFamilyMember(token, socket, store) {
   };
 }
 function pullMutableAtom(token, socket, store) {
-  const jsonToken = getJsonToken(token, store);
+  const jsonToken = getJsonToken(store, token);
   const updateToken = getUpdateToken(token);
   socket.on(`init:${token.key}`, (data) => {
-    setIntoStore(jsonToken, data, store);
+    setIntoStore(store, jsonToken, data);
   });
   socket.on(
     `next:${token.key}`,
     (data) => {
-      setIntoStore(updateToken, data, store);
+      setIntoStore(store, updateToken, data);
     }
   );
   socket.emit(`sub:${token.key}`);
@@ -62,14 +62,14 @@ 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, store);
-    setIntoStore(jsonToken, data, store);
+    const jsonToken = getJsonToken(store, token);
+    setIntoStore(store, jsonToken, data);
   });
   socket.on(
     `next:${token.key}`,
     (data) => {
       const trackerToken = getUpdateToken(token);
-      setIntoStore(trackerToken, data, store);
+      setIntoStore(store, trackerToken, data);
     }
   );
   socket.emit(`sub:${familyKey}`, subKey);
@@ -164,11 +164,10 @@ var myIdState = AtomIO.selector({
   key: `mySocketId`,
   get: ({ get }) => get(myIdState__INTERNAL)
 });
-var usernameEffects = typeof window === `undefined` ? [] : [lazyLocalStorageEffect(`myUsername`)];
 var myUsernameState = AtomIO.atom({
-  key: `myUsername`,
+  key: `myName`,
   default: null,
-  effects: usernameEffects
+  effects: typeof window === `undefined` ? [] : [persistSync(window.localStorage, JSON, `myUsername`)]
 });
 var optimisticUpdateQueue = AtomIO.atom({
   key: `updateQueue`,
@@ -195,22 +194,22 @@ function serverAction(token, socket, store) {
 }
 function syncContinuity(continuity, socket, store) {
   const continuityKey = continuity.key;
-  const optimisticUpdates = getFromStore(optimisticUpdateQueue$1, store);
-  const confirmedUpdates = getFromStore(confirmedUpdateQueue$1, store);
+  const optimisticUpdates = getFromStore(store, optimisticUpdateQueue$1);
+  const confirmedUpdates = getFromStore(store, confirmedUpdateQueue$1);
   const initializeContinuity = (epoch, payload) => {
     socket.off(`continuity-init:${continuityKey}`, initializeContinuity);
     let i = 0;
-    let k = ``;
-    let v = null;
+    let k;
+    let v;
     for (const x of payload) {
       if (i % 2 === 0) {
         k = x;
       } else {
         v = x;
         if (`type` in k && k.type === `mutable_atom`) {
-          k = getJsonToken(k, store);
+          k = getJsonToken(store, k);
         }
-        setIntoStore(k, v, store);
+        setIntoStore(store, k, v);
       }
       i++;
     }
@@ -226,14 +225,10 @@ function syncContinuity(continuity, socket, store) {
         continuityKey,
         `reconciling updates`
       );
-      setIntoStore(
-        optimisticUpdateQueue$1,
-        (queue) => {
-          queue.shift();
-          return queue;
-        },
-        store
-      );
+      setIntoStore(store, optimisticUpdateQueue$1, (queue) => {
+        queue.shift();
+        return queue;
+      });
       if (optimisticUpdate.id === confirmedUpdate.id) {
         const clientResult = JSON.stringify(optimisticUpdate.updates);
         const serverResult = JSON.stringify(confirmedUpdate.updates);
@@ -356,15 +351,11 @@ function syncContinuity(continuity, socket, store) {
             `pushing confirmed update to queue`,
             confirmed
           );
-          setIntoStore(
-            confirmedUpdateQueue$1,
-            (queue) => {
-              queue.push(confirmed);
-              queue.sort((a, b) => a.epoch - b.epoch);
-              return queue;
-            },
-            store
-          );
+          setIntoStore(store, confirmedUpdateQueue$1, (queue) => {
+            queue.push(confirmed);
+            queue.sort((a, b) => a.epoch - b.epoch);
+            return queue;
+          });
         }
       }
     } else {
@@ -414,15 +405,11 @@ function syncContinuity(continuity, socket, store) {
             continuityKey,
             `pushing confirmed update #${confirmed.epoch} to queue`
           );
-          setIntoStore(
-            confirmedUpdateQueue$1,
-            (queue) => {
-              queue.push(confirmed);
-              queue.sort((a, b) => a.epoch - b.epoch);
-              return queue;
-            },
-            store
-          );
+          setIntoStore(store, confirmedUpdateQueue$1, (queue) => {
+            queue.push(confirmed);
+            queue.sort((a, b) => a.epoch - b.epoch);
+            return queue;
+          });
         }
       }
     }
@@ -450,15 +437,11 @@ function syncContinuity(continuity, socket, store) {
             continuityKey,
             `enqueuing new optimistic update`
           );
-          setIntoStore(
-            optimisticUpdateQueue$1,
-            (queue) => {
-              queue.push(clientUpdate);
-              queue.sort((a, b) => a.epoch - b.epoch);
-              return queue;
-            },
-            store
-          );
+          setIntoStore(store, optimisticUpdateQueue$1, (queue) => {
+            queue.push(clientUpdate);
+            queue.sort((a, b) => a.epoch - b.epoch);
+            return queue;
+          });
         } else {
           store.logger.info(
             `\u{1F91E}`,
@@ -466,14 +449,10 @@ function syncContinuity(continuity, socket, store) {
             continuityKey,
             `replacing existing optimistic update at index ${optimisticUpdateIndex}`
           );
-          setIntoStore(
-            optimisticUpdateQueue$1,
-            (queue) => {
-              queue[optimisticUpdateIndex] = clientUpdate;
-              return queue;
-            },
-            store
-          );
+          setIntoStore(store, optimisticUpdateQueue$1, (queue) => {
+            queue[optimisticUpdateIndex] = clientUpdate;
+            return queue;
+          });
         }
         socket.emit(`tx-run:${continuityKey}`, {
           id: clientUpdate.id,
@@ -488,14 +467,14 @@ function syncContinuity(continuity, socket, store) {
   });
   socket.on(`reveal:${continuityKey}`, (revealed) => {
     let i = 0;
-    let k = ``;
-    let v = null;
+    let k;
+    let v;
     for (const x of revealed) {
       if (i % 2 === 0) {
         k = x;
       } else {
         v = x;
-        setIntoStore(k, v, store);
+        upsertState(k, v, store);
       }
       i++;
     }
@@ -515,5 +494,20 @@ function syncContinuity(continuity, socket, store) {
     for (const unsubscribe of unsubscribeFunctions) unsubscribe();
   };
 }
+function upsertState(store, token, value) {
+  if (token.family) {
+    const family = store.families.get(token.family.key);
+    if (family) {
+      const molecule = store.molecules.get(token.family.subKey);
+      if (molecule) {
+        growMoleculeInStore(molecule, family, store);
+      } else if (store.config.lifespan === `immortal`) {
+        throw new Error(`No molecule found for key "${token.family.subKey}"`);
+      }
+      initFamilyMemberInStore(store, family, parseJson(token.family.subKey));
+    }
+  }
+  setIntoStore(store, token, value);
+}
 
 export { confirmedUpdateQueue, myIdState, myIdState__INTERNAL, myUsernameState, optimisticUpdateQueue, pullAtom, pullAtomFamilyMember, pullMutableAtom, pullMutableAtomFamilyMember, pullSelector, pullSelectorFamilyMember, pushState, serverAction, syncContinuity };

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

@@ -16,7 +16,7 @@ export function pullAtomFamilyMember<J extends Json.Serializable>(
 	const { key: familyKey, subKey: serializedSubKey } = token.family
 	const subKey = parseJson(serializedSubKey)
 	socket?.on(`serve:${token.key}`, (data: J) => {
-		setIntoStore(token, data, store)
+		setIntoStore(store, token, data)
 	})
 	socket?.emit(`sub:${familyKey}`, subKey)
 	return () => {

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

@@ -9,7 +9,7 @@ export function pullAtom<J extends Json.Serializable>(
 	store: Store,
 ): () => void {
 	const setServedValue = (data: J) => {
-		setIntoStore(token, data, store)
+		setIntoStore(store, token, data)
 	}
 	socket.on(`serve:${token.key}`, setServedValue)
 	socket.emit(`sub:${token.key}`)

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

@@ -20,14 +20,14 @@ 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, store)
-		setIntoStore(jsonToken, data, store)
+		const jsonToken = getJsonToken(store, token)
+		setIntoStore(store, jsonToken, data)
 	})
 	socket.on(
 		`next:${token.key}`,
 		(data: T extends Transceiver<infer Signal> ? Signal : never) => {
 			const trackerToken = getUpdateToken(token)
-			setIntoStore(trackerToken, data, store)
+			setIntoStore(store, trackerToken, data)
 		},
 	)
 	socket.emit(`sub:${familyKey}`, subKey)

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

@@ -12,15 +12,15 @@ export function pullMutableAtom<
 	socket: Socket,
 	store: Store,
 ): () => void {
-	const jsonToken = getJsonToken(token, store)
+	const jsonToken = getJsonToken(store, token)
 	const updateToken = getUpdateToken(token)
 	socket.on(`init:${token.key}`, (data: J) => {
-		setIntoStore(jsonToken, data, store)
+		setIntoStore(store, jsonToken, data)
 	})
 	socket.on(
 		`next:${token.key}`,
 		(data: T extends Transceiver<infer Update> ? Update : never) => {
-			setIntoStore(updateToken, data, store)
+			setIntoStore(store, updateToken, data)
 		},
 	)
 	socket.emit(`sub:${token.key}`)

package/realtime-client/src/realtime-client-stores/client-main-store.ts

@@ -1,6 +1,5 @@
 import * as AtomIO from "atom.io"
-
-import { lazyLocalStorageEffect } from "~/packages/atom.io/__unstable__/web-effects/src/storage"
+import { persistSync } from "atom.io/web"
 
 export const myIdState__INTERNAL = AtomIO.atom<string | undefined>({
 	key: `mySocketId__INTERNAL`,
@@ -11,10 +10,11 @@ export const myIdState = AtomIO.selector<string | undefined>({
 	get: ({ get }) => get(myIdState__INTERNAL),
 })
 
-const usernameEffects =
-	typeof window === `undefined` ? [] : [lazyLocalStorageEffect(`myUsername`)]
 export const myUsernameState = AtomIO.atom<string | null>({
-	key: `myUsername`,
+	key: `myName`,
 	default: null,
-	effects: usernameEffects,
+	effects:
+		typeof window === `undefined`
+			? []
+			: [persistSync(window.localStorage, JSON, `myUsername`)],
 })

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

@@ -7,13 +7,15 @@ import {
 	getEpochNumberOfContinuity,
 	getFromStore,
 	getJsonToken,
+	growMoleculeInStore,
 	ingestTransactionUpdate,
+	initFamilyMemberInStore,
 	isRootStore,
 	setEpochNumberOfContinuity,
 	setIntoStore,
 	subscribeToTransaction,
 } from "atom.io/internal"
-import type { Json } from "atom.io/json"
+import { type Json, parseJson } from "atom.io/json"
 import type { ContinuityToken } from "atom.io/realtime"
 import {
 	confirmedUpdateQueue,
@@ -27,23 +29,23 @@ export function syncContinuity<F extends Func>(
 	store: Store,
 ): () => void {
 	const continuityKey = continuity.key
-	const optimisticUpdates = getFromStore(optimisticUpdateQueue, store)
-	const confirmedUpdates = getFromStore(confirmedUpdateQueue, store)
+	const optimisticUpdates = getFromStore(store, optimisticUpdateQueue)
+	const confirmedUpdates = getFromStore(store, confirmedUpdateQueue)
 
 	const initializeContinuity = (epoch: number, payload: Json.Array) => {
 		socket.off(`continuity-init:${continuityKey}`, initializeContinuity)
 		let i = 0
-		let k: any = ``
-		let v: any = null
+		let k: any
+		let v: any
 		for (const x of payload) {
 			if (i % 2 === 0) {
 				k = x
 			} else {
 				v = x
 				if (`type` in k && k.type === `mutable_atom`) {
-					k = getJsonToken(k, store)
+					k = getJsonToken(store, k)
 				}
-				setIntoStore(k, v, store)
+				setIntoStore(store, k, v)
 			}
 			i++
 		}
@@ -65,14 +67,10 @@ export function syncContinuity<F extends Func>(
 				continuityKey,
 				`reconciling updates`,
 			)
-			setIntoStore(
-				optimisticUpdateQueue,
-				(queue) => {
-					queue.shift()
-					return queue
-				},
-				store,
-			)
+			setIntoStore(store, optimisticUpdateQueue, (queue) => {
+				queue.shift()
+				return queue
+			})
 			if (optimisticUpdate.id === confirmedUpdate.id) {
 				const clientResult = JSON.stringify(optimisticUpdate.updates)
 				const serverResult = JSON.stringify(confirmedUpdate.updates)
@@ -199,15 +197,11 @@ export function syncContinuity<F extends Func>(
 						`pushing confirmed update to queue`,
 						confirmed,
 					)
-					setIntoStore(
-						confirmedUpdateQueue,
-						(queue) => {
-							queue.push(confirmed)
-							queue.sort((a, b) => a.epoch - b.epoch)
-							return queue
-						},
-						store,
-					)
+					setIntoStore(store, confirmedUpdateQueue, (queue) => {
+						queue.push(confirmed)
+						queue.sort((a, b) => a.epoch - b.epoch)
+						return queue
+					})
 				}
 			}
 		} else {
@@ -260,15 +254,11 @@ export function syncContinuity<F extends Func>(
 						continuityKey,
 						`pushing confirmed update #${confirmed.epoch} to queue`,
 					)
-					setIntoStore(
-						confirmedUpdateQueue,
-						(queue) => {
-							queue.push(confirmed)
-							queue.sort((a, b) => a.epoch - b.epoch)
-							return queue
-						},
-						store,
-					)
+					setIntoStore(store, confirmedUpdateQueue, (queue) => {
+						queue.push(confirmed)
+						queue.sort((a, b) => a.epoch - b.epoch)
+						return queue
+					})
 				}
 			}
 		}
@@ -297,15 +287,11 @@ export function syncContinuity<F extends Func>(
 						continuityKey,
 						`enqueuing new optimistic update`,
 					)
-					setIntoStore(
-						optimisticUpdateQueue,
-						(queue) => {
-							queue.push(clientUpdate)
-							queue.sort((a, b) => a.epoch - b.epoch)
-							return queue
-						},
-						store,
-					)
+					setIntoStore(store, optimisticUpdateQueue, (queue) => {
+						queue.push(clientUpdate)
+						queue.sort((a, b) => a.epoch - b.epoch)
+						return queue
+					})
 				} else {
 					store.logger.info(
 						`🤞`,
@@ -313,14 +299,10 @@ export function syncContinuity<F extends Func>(
 						continuityKey,
 						`replacing existing optimistic update at index ${optimisticUpdateIndex}`,
 					)
-					setIntoStore(
-						optimisticUpdateQueue,
-						(queue) => {
-							queue[optimisticUpdateIndex] = clientUpdate
-							return queue
-						},
-						store,
-					)
+					setIntoStore(store, optimisticUpdateQueue, (queue) => {
+						queue[optimisticUpdateIndex] = clientUpdate
+						return queue
+					})
 				}
 				socket.emit(`tx-run:${continuityKey}`, {
 					id: clientUpdate.id,
@@ -336,14 +318,14 @@ export function syncContinuity<F extends Func>(
 
 	socket.on(`reveal:${continuityKey}`, (revealed: Json.Array) => {
 		let i = 0
-		let k: any = ``
-		let v: any = null
+		let k: any
+		let v: any
 		for (const x of revealed) {
 			if (i % 2 === 0) {
 				k = x
 			} else {
 				v = x
-				setIntoStore(k, v, store)
+				upsertState(k, v, store)
 			}
 			i++
 		}
@@ -365,3 +347,23 @@ export function syncContinuity<F extends Func>(
 		// socket.emit(`unsub:${continuityKey}`)
 	}
 }
+
+function upsertState<T>(
+	store: Store,
+	token: AtomIO.WritableToken<T>,
+	value: T,
+): void {
+	if (token.family) {
+		const family = store.families.get(token.family.key)
+		if (family) {
+			const molecule = store.molecules.get(token.family.subKey)
+			if (molecule) {
+				growMoleculeInStore(molecule, family, store)
+			} else if (store.config.lifespan === `immortal`) {
+				throw new Error(`No molecule found for key "${token.family.subKey}"`)
+			}
+			initFamilyMemberInStore(store, family, parseJson(token.family.subKey))
+		}
+	}
+	setIntoStore(store, token, value)
+}

package/realtime-react/dist/index.js

@@ -88,7 +88,7 @@ function usePullAtom(token) {
 }
 function usePullAtomFamilyMember(family, subKey) {
   const store = React.useContext(StoreContext);
-  const token = findInStore(family, subKey, store);
+  const token = findInStore(store, family, subKey);
   useRealtimeService(
     `pull:${token.key}`,
     (socket) => RTC.pullAtomFamilyMember(token, socket, store)
@@ -105,7 +105,7 @@ function usePullMutable(token) {
 }
 function usePullMutableAtomFamilyMember(familyToken, key) {
   const store = React.useContext(StoreContext);
-  const token = findInStore(familyToken, key, store);
+  const token = findInStore(store, familyToken, key);
   useRealtimeService(
     `pull:${token.key}`,
     (socket) => RTC.pullMutableAtomFamilyMember(token, socket, store)
@@ -122,7 +122,7 @@ function usePullSelector(token) {
 }
 function usePullSelectorFamilyMember(familyToken, key) {
   const store = React.useContext(StoreContext);
-  const token = findInStore(familyToken, key, store);
+  const token = findInStore(store, familyToken, key);
   useRealtimeService(
     `pull:${token.key}`,
     (socket) => RTC.pullSelectorFamilyMember(token, socket, store)

package/realtime-react/src/use-pull-atom-family-member.ts

@@ -13,7 +13,7 @@ export function usePullAtomFamilyMember<
 	Key extends K,
 >(family: AtomIO.RegularAtomFamilyToken<J, K>, subKey: Key): J {
 	const store = React.useContext(StoreContext)
-	const token = findInStore(family, subKey, store)
+	const token = findInStore(store, family, subKey)
 	useRealtimeService(`pull:${token.key}`, (socket) =>
 		RTC.pullAtomFamilyMember(token, socket, store),
 	)

package/realtime-react/src/use-pull-mutable-family-member.ts

@@ -15,7 +15,7 @@ export function usePullMutableAtomFamilyMember<
 	Key extends K,
 >(familyToken: AtomIO.MutableAtomFamilyToken<T, J, K>, key: Key): T {
 	const store = React.useContext(StoreContext)
-	const token = findInStore(familyToken, key, store)
+	const token = findInStore(store, familyToken, key)
 	useRealtimeService(`pull:${token.key}`, (socket) =>
 		RTC.pullMutableAtomFamilyMember(token, socket, store),
 	)

package/realtime-react/src/use-pull-selector-family-member.ts

@@ -13,7 +13,7 @@ export function usePullSelectorFamilyMember<
 	Key extends K,
 >(familyToken: AtomIO.SelectorFamilyToken<T, K>, key: Key): T {
 	const store = React.useContext(StoreContext)
-	const token = findInStore(familyToken, key, store)
+	const token = findInStore(store, familyToken, key)
 	useRealtimeService(`pull:${token.key}`, (socket) =>
 		RTC.pullSelectorFamilyMember(token, socket, store),
 	)