atom.io 0.27.3 → 0.27.5

package/introspection/src/attach-transaction-logs.ts

@@ -12,35 +12,29 @@ export const attachTransactionLogs = (
 	const transactionUpdateLogAtoms = createRegularAtomFamily<
 		TransactionUpdate<Func>[],
 		string
-	>(
-		{
-			key: `👁‍🗨 Transaction Update Log (Internal)`,
-			default: () => [],
-			effects: (key) => [
-				({ setSelf }) => {
-					const tx = store.transactions.get(key)
-					tx?.subject.subscribe(`introspection`, (transactionUpdate) => {
-						if (transactionUpdate.key === key) {
-							setSelf((state) => [...state, transactionUpdate])
-						}
-					})
-				},
-			],
-		},
-		store,
-	)
+	>(store, {
+		key: `👁‍🗨 Transaction Update Log (Internal)`,
+		default: () => [],
+		effects: (key) => [
+			({ setSelf }) => {
+				const tx = store.transactions.get(key)
+				tx?.subject.subscribe(`introspection`, (transactionUpdate) => {
+					if (transactionUpdate.key === key) {
+						setSelf((state) => [...state, transactionUpdate])
+					}
+				})
+			},
+		],
+	})
 	const findTransactionUpdateLogState = createSelectorFamily<
 		TransactionUpdate<Func>[],
 		string
-	>(
-		{
-			key: `👁‍🗨 Transaction Update Log`,
-			get:
-				(key) =>
-				({ get }) =>
-					get(transactionUpdateLogAtoms, key),
-		},
-		store,
-	)
+	>(store, {
+		key: `👁‍🗨 Transaction Update Log`,
+		get:
+			(key) =>
+			({ get }) =>
+				get(transactionUpdateLogAtoms, key),
+	})
 	return findTransactionUpdateLogState
 }

package/json/dist/index.js

@@ -1,6 +1,6 @@
 import { stringifyJson, parseJson } from '../../dist/chunk-AK23DRMD.js';
 export { parseJson, stringifyJson } from '../../dist/chunk-AK23DRMD.js';
-import { createWritableSelectorFamily } from '../../dist/chunk-ETCFHO7J.js';
+import { createWritableSelectorFamily } from '../../dist/chunk-6ABWLAGY.js';
 import '../../dist/chunk-IBTHB2PI.js';
 import '../../dist/chunk-XWL6SNVU.js';
 import { createStandaloneSelector, IMPLICIT, growMoleculeInStore, initFamilyMemberInStore, withdraw, seekInStore } from 'atom.io/internal';
@@ -10,19 +10,17 @@ function fromEntries(entries) {
   return Object.fromEntries(entries);
 }
 var selectJson = (atom, transform, store = IMPLICIT.STORE) => {
-  return createStandaloneSelector(
-    {
-      key: `${atom.key}:JSON`,
-      get: ({ get }) => transform.toJson(get(atom)),
-      set: ({ set }, newValue) => {
-        set(atom, transform.fromJson(newValue));
-      }
-    },
-    store
-  );
+  return createStandaloneSelector(store, {
+    key: `${atom.key}:JSON`,
+    get: ({ get }) => transform.toJson(get(atom)),
+    set: ({ set }, newValue) => {
+      set(atom, transform.fromJson(newValue));
+    }
+  });
 };
 function selectJsonFamily(atomFamilyToken, transform, store = IMPLICIT.STORE) {
   const jsonFamily = createWritableSelectorFamily(
+    store,
     {
       key: `${atomFamilyToken.key}:JSON`,
       get: (key) => ({ seek, get }) => {
@@ -39,7 +37,7 @@ function selectJsonFamily(atomFamilyToken, transform, store = IMPLICIT.STORE) {
         if (store.config.lifespan === `immortal`) {
           throw new Error(`No molecule found for key "${stringKey}"`);
         }
-        const newToken = initFamilyMemberInStore(atomFamilyToken, key, store);
+        const newToken = initFamilyMemberInStore(store, atomFamilyToken, key);
         return transform.toJson(get(newToken));
       },
       set: (key) => ({ seek, set }, newValue) => {
@@ -57,14 +55,13 @@ function selectJsonFamily(atomFamilyToken, transform, store = IMPLICIT.STORE) {
               throw new Error(`No molecule found for key "${stringKey}"`);
             }
             set(
-              initFamilyMemberInStore(atomFamilyToken, key, store),
+              initFamilyMemberInStore(store, atomFamilyToken, key),
               transform.fromJson(newValue)
             );
           }
         }
       }
     },
-    store,
     [`mutable`, `json`]
   );
   const atomFamily = withdraw(atomFamilyToken, store);
@@ -72,7 +69,7 @@ function selectJsonFamily(atomFamilyToken, transform, store = IMPLICIT.STORE) {
     `store=${store.config.name}::json-selector-family`,
     (event) => {
       if (event.token.family) {
-        seekInStore(jsonFamily, parseJson(event.token.family.subKey), store);
+        seekInStore(store, jsonFamily, parseJson(event.token.family.subKey));
       }
     }
   );

package/json/src/select-json-family.ts

@@ -42,6 +42,7 @@ export function selectJsonFamily<
 	store: Store = IMPLICIT.STORE,
 ): AtomIO.WritableSelectorFamilyToken<J, K> {
 	const jsonFamily = createWritableSelectorFamily<J, K>(
+		store,
 		{
 			key: `${atomFamilyToken.key}:JSON`,
 			get:
@@ -60,7 +61,7 @@ export function selectJsonFamily<
 					if (store.config.lifespan === `immortal`) {
 						throw new Error(`No molecule found for key "${stringKey}"`)
 					}
-					const newToken = initFamilyMemberInStore(atomFamilyToken, key, store)
+					const newToken = initFamilyMemberInStore(store, atomFamilyToken, key)
 					return transform.toJson(get(newToken))
 				},
 			set:
@@ -80,14 +81,13 @@ export function selectJsonFamily<
 								throw new Error(`No molecule found for key "${stringKey}"`)
 							}
 							set(
-								initFamilyMemberInStore(atomFamilyToken, key, store),
+								initFamilyMemberInStore(store, atomFamilyToken, key),
 								transform.fromJson(newValue),
 							)
 						}
 					}
 				},
 		},
-		store,
 		[`mutable`, `json`],
 	)
 	const atomFamily = withdraw(atomFamilyToken, store)
@@ -95,7 +95,7 @@ export function selectJsonFamily<
 		`store=${store.config.name}::json-selector-family`,
 		(event) => {
 			if (event.token.family) {
-				seekInStore(jsonFamily, parseJson(event.token.family.subKey) as K, store)
+				seekInStore(store, jsonFamily, parseJson(event.token.family.subKey) as K)
 			}
 		},
 	)

package/json/src/select-json.ts

@@ -9,14 +9,11 @@ export const selectJson = <T, J extends Json.Serializable>(
 	transform: JsonInterface<T, J>,
 	store: Store = IMPLICIT.STORE,
 ): AtomIO.WritableSelectorToken<J> => {
-	return createStandaloneSelector(
-		{
-			key: `${atom.key}:JSON`,
-			get: ({ get }) => transform.toJson(get(atom)),
-			set: ({ set }, newValue) => {
-				set(atom, transform.fromJson(newValue))
-			},
+	return createStandaloneSelector(store, {
+		key: `${atom.key}:JSON`,
+		get: ({ get }) => transform.toJson(get(atom)),
+		set: ({ set }, newValue) => {
+			set(atom, transform.fromJson(newValue))
 		},
-		store,
-	)
+	})
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.27.3",
+  "version": "0.27.5",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,
@@ -67,7 +67,7 @@
     "drizzle-kit": "0.24.0",
     "drizzle-orm": "0.33.0",
     "eslint": "9.9.0",
-    "framer-motion": "11.3.24",
+    "framer-motion": "11.3.28",
     "happy-dom": "14.12.3",
     "http-proxy": "1.18.1",
     "npmlog": "7.0.1",
@@ -75,14 +75,14 @@
     "preact": "10.23.2",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.26.0",
+    "react-router-dom": "6.26.1",
     "socket.io": "4.7.5",
     "socket.io-client": "4.7.5",
     "tmp": "0.2.3",
     "tsup": "8.2.4",
     "tsx": "4.17.0",
     "typescript": "5.5.4",
-    "vite": "5.4.0",
+    "vite": "5.4.1",
     "vite-tsconfig-paths": "5.0.1",
     "vitest": "2.0.5"
   },

package/react/dist/index.js

@@ -12,13 +12,13 @@ function parseStateOverloads(store, ...rest) {
     const family = rest[0];
     const key = rest[1];
     if (store.config.lifespan === `immortal`) {
-      const maybeToken = seekInStore(family, key, store);
+      const maybeToken = seekInStore(store, family, key);
       if (!maybeToken) {
         throw new NotFoundError(family, key, store);
       }
       token = maybeToken;
     } else {
-      token = findInStore(family, key, store);
+      token = findInStore(store, family, key);
     }
   } else {
     token = rest[0];
@@ -33,7 +33,7 @@ function useI(...params) {
   const setter = React5.useRef(null);
   if (setter.current === null) {
     setter.current = (next) => {
-      setIntoStore(token, next, store);
+      setIntoStore(store, token, next);
     };
   }
   return setter.current;
@@ -44,16 +44,16 @@ function useO(...params) {
   const id = React5.useId();
   return React5.useSyncExternalStore(
     (dispatch) => subscribeToState(token, dispatch, `use-o:${id}`, store),
-    () => getFromStore(token, store),
-    () => getFromStore(token, store)
+    () => getFromStore(store, token),
+    () => getFromStore(store, token)
   );
 }
 
 // react/src/use-json.ts
 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, store);
+  const stateToken = token.type === `mutable_atom_family` ? findInStore(store, token, key) : token;
+  const jsonToken = getJsonToken(store, stateToken);
   return useO(jsonToken);
 }
 function useTL(token) {

package/react/src/parse-state-overloads.ts

@@ -28,13 +28,13 @@ export function parseStateOverloads<T, K extends Canonical>(
 		const key = rest[1]
 
 		if (store.config.lifespan === `immortal`) {
-			const maybeToken = seekInStore(family, key, store)
+			const maybeToken = seekInStore(store, family, key)
 			if (!maybeToken) {
 				throw new NotFoundError(family, key, store)
 			}
 			token = maybeToken
 		} else {
-			token = findInStore(family, key, store)
+			token = findInStore(store, family, key)
 		}
 	} else {
 		token = rest[0]

package/react/src/use-i.ts

@@ -25,7 +25,7 @@ export function useI<T, K extends Canonical>(
 	> = React.useRef(null)
 	if (setter.current === null) {
 		setter.current = (next) => {
-			setIntoStore(token, next, store)
+			setIntoStore(store, token, next)
 		}
 	}
 	return setter.current

package/react/src/use-json.ts

@@ -31,8 +31,8 @@ export function useJSON<
 	const store = React.useContext(StoreContext)
 	const stateToken: ReadableToken<any> =
 		token.type === `mutable_atom_family`
-			? findInStore(token, key as Key, store)
+			? findInStore(store, token, key as Key)
 			: token
-	const jsonToken = getJsonToken(stateToken, store)
+	const jsonToken = getJsonToken(store, stateToken)
 	return useO(jsonToken)
 }

package/react/src/use-o.ts

@@ -21,7 +21,7 @@ export function useO<T, K extends Canonical>(
 	const id = React.useId()
 	return React.useSyncExternalStore<T>(
 		(dispatch) => subscribeToState(token, dispatch, `use-o:${id}`, store),
-		() => getFromStore(token, store),
-		() => getFromStore(token, store),
+		() => getFromStore(store, token),
+		() => getFromStore(store, token),
 	)
 }

package/realtime-client/dist/index.js

@@ -8,7 +8,7 @@ import { optimisticUpdateQueue as optimisticUpdateQueue$1, confirmedUpdateQueue
 
 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);
@@ -195,8 +195,8 @@ 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;
@@ -208,9 +208,9 @@ function syncContinuity(continuity, socket, store) {
       } 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 +226,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 +352,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 +406,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 +438,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 +450,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,

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}`)