atom.io 0.27.3 → 0.27.5

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

@@ -27,8 +27,8 @@ 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)
@@ -41,9 +41,9 @@ export function syncContinuity<F extends Func>(
 			} 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 +65,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 +195,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 +252,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 +285,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 +297,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,

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),
 	)

package/realtime-server/dist/index.js

@@ -484,7 +484,7 @@ function realtimeContinuitySynchronizer({
       socket.id,
       store
     ).userKeyOfSocket;
-    const userKey = getFromStore(userKeyState, store);
+    const userKey = getFromStore(store, userKeyState);
     if (!userKey) {
       store.logger.error(
         `\u274C`,
@@ -518,28 +518,28 @@ function realtimeContinuitySynchronizer({
           );
           return;
         }
-        const newSocketState = findInStore(socketAtoms, newSocketKey, store);
-        const newSocket = getFromStore(newSocketState, store);
+        const newSocketState = findInStore(store, socketAtoms, newSocketKey);
+        const newSocket = getFromStore(store, newSocketState);
         socket = newSocket;
       },
       `sync-continuity:${continuityKey}:${userKey}`,
       store
     );
     const userUnacknowledgedQueue = findInStore(
+      store,
       userUnacknowledgedQueues,
-      userKey,
-      store
+      userKey
     );
     getFromStore(
-      userUnacknowledgedQueue,
-      store
+      store,
+      userUnacknowledgedQueue
     );
     const unsubscribeFunctions = [];
     const revealPerspectives = () => {
       const unsubFns = [];
       for (const perspective of continuity.perspectives) {
         const { viewAtoms } = perspective;
-        const userViewState = findInStore(viewAtoms, userKey, store);
+        const userViewState = findInStore(store, viewAtoms, userKey);
         const unsubscribe = subscribeToState(
           userViewState,
           ({ oldValue, newValue }) => {
@@ -549,8 +549,8 @@ 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, store) : token;
-              const resource = getFromStore(resourceToken, store);
+              const resourceToken = token.type === `mutable_atom` ? getJsonToken(store, token) : token;
+              const resource = getFromStore(store, resourceToken);
               return [resourceToken, resource];
             });
             store.logger.info(
@@ -580,21 +580,21 @@ function realtimeContinuitySynchronizer({
     const sendInitialPayload = () => {
       const initialPayload = [];
       for (const atom2 of continuity.globals) {
-        const resourceToken = atom2.type === `mutable_atom` ? getJsonToken(atom2, store) : atom2;
-        initialPayload.push(resourceToken, getFromStore(atom2, store));
+        const resourceToken = atom2.type === `mutable_atom` ? getJsonToken(store, atom2) : atom2;
+        initialPayload.push(resourceToken, getFromStore(store, atom2));
       }
       for (const perspective of continuity.perspectives) {
         const { viewAtoms, resourceAtoms } = perspective;
-        const userViewState = findInStore(viewAtoms, userKey, store);
-        const userView = getFromStore(userViewState, store);
+        const userViewState = findInStore(store, viewAtoms, userKey);
+        const userView = getFromStore(store, userViewState);
         store.logger.info(`\u{1F441}`, `atom`, resourceAtoms.key, `${userKey} can see`, {
           viewAtoms,
           resourceAtoms,
           userView
         });
         for (const visibleToken of userView) {
-          const resourceToken = visibleToken.type === `mutable_atom` ? getJsonToken(visibleToken, store) : visibleToken;
-          const resource = getFromStore(resourceToken, store);
+          const resourceToken = visibleToken.type === `mutable_atom` ? getJsonToken(store, visibleToken) : visibleToken;
+          const resource = getFromStore(store, resourceToken);
           initialPayload.push(resourceToken, resource);
         }
       }
@@ -609,13 +609,13 @@ function realtimeContinuitySynchronizer({
                 continuity.perspectives.flatMap((perspective) => {
                   const { viewAtoms } = perspective;
                   const userPerspectiveTokenState = findInStore(
+                    store,
                     viewAtoms,
-                    userKey,
-                    store
+                    userKey
                   );
                   const visibleTokens = getFromStore(
-                    userPerspectiveTokenState,
-                    store
+                    store,
+                    userPerspectiveTokenState
                   );
                   return visibleTokens.map((token) => {
                     const key = token.type === `mutable_atom` ? `*` + token.key : token.key;
@@ -733,11 +733,11 @@ function realtimeAtomFamilyProvider({
       }
     };
     const fillSubRequest = (subKey) => {
-      const exposedSubKeys = getFromStore(index, store);
+      const exposedSubKeys = getFromStore(store, index);
       for (const exposedSubKey of exposedSubKeys) {
         if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
-          const token = findInStore(family, subKey, store);
-          socket.emit(`serve:${token.key}`, getFromStore(token, store));
+          const token = findInStore(store, family, subKey);
+          socket.emit(`serve:${token.key}`, getFromStore(store, token));
           const unsubscribe = subscribeToState(
             token,
             ({ newValue }) => {
@@ -779,14 +779,14 @@ function realtimeMutableFamilyProvider({
       }
     };
     const fillSubRequest = (subKey) => {
-      const exposedSubKeys = getFromStore(index, store);
+      const exposedSubKeys = getFromStore(store, index);
       for (const exposedSubKey of exposedSubKeys) {
         if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
-          const token = findInStore(family, subKey, store);
-          getFromStore(token, store);
-          const jsonToken = getJsonToken(token, store);
+          const token = findInStore(store, family, subKey);
+          getFromStore(store, token);
+          const jsonToken = getJsonToken(store, token);
           const updateToken = getUpdateToken(token);
-          socket.emit(`init:${token.key}`, getFromStore(jsonToken, store));
+          socket.emit(`init:${token.key}`, getFromStore(store, jsonToken));
           const unsubscribe = subscribeToState(
             updateToken,
             ({ newValue }) => {
@@ -819,7 +819,7 @@ function realtimeMutableProvider({
 }) {
   return function mutableProvider(token) {
     let unsubscribeFromStateUpdates = null;
-    const jsonToken = getJsonToken(token, store);
+    const jsonToken = getJsonToken(store, token);
     const trackerToken = getUpdateToken(token);
     const fillUnsubRequest = () => {
       socket.off(`unsub:${token.key}`, fillUnsubRequest);
@@ -827,7 +827,7 @@ function realtimeMutableProvider({
       unsubscribeFromStateUpdates = null;
     };
     const fillSubRequest = () => {
-      socket.emit(`init:${token.key}`, getFromStore(jsonToken, store));
+      socket.emit(`init:${token.key}`, getFromStore(store, jsonToken));
       unsubscribeFromStateUpdates = subscribeToState(
         trackerToken,
         ({ newValue }) => {
@@ -852,7 +852,7 @@ function realtimeStateProvider({
   return function stateProvider(token) {
     let unsubscribeFromStateUpdates;
     const fillSubRequest = () => {
-      socket.emit(`serve:${token.key}`, getFromStore(token, store));
+      socket.emit(`serve:${token.key}`, getFromStore(store, token));
       unsubscribeFromStateUpdates = subscribeToState(
         token,
         ({ newValue }) => {
@@ -886,7 +886,7 @@ function realtimeStateReceiver({
 }) {
   return function stateReceiver(token) {
     const publish = (newValue) => {
-      setIntoStore(token, newValue, store);
+      setIntoStore(store, token, newValue);
     };
     const fillPubUnclaim = () => {
       socket.off(`pub:${token.key}`, publish);

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

@@ -36,7 +36,7 @@ export function realtimeContinuitySynchronizer({
 			socket.id,
 			store,
 		).userKeyOfSocket
-		const userKey = getFromStore(userKeyState, store)
+		const userKey = getFromStore(store, userKeyState)
 		if (!userKey) {
 			store.logger.error(
 				`❌`,
@@ -70,8 +70,8 @@ export function realtimeContinuitySynchronizer({
 					)
 					return
 				}
-				const newSocketState = findInStore(socketAtoms, newSocketKey, store)
-				const newSocket = getFromStore(newSocketState, store)
+				const newSocketState = findInStore(store, socketAtoms, newSocketKey)
+				const newSocket = getFromStore(store, newSocketState)
 				socket = newSocket
 			},
 			`sync-continuity:${continuityKey}:${userKey}`,
@@ -79,13 +79,13 @@ export function realtimeContinuitySynchronizer({
 		)
 
 		const userUnacknowledgedQueue = findInStore(
+			store,
 			userUnacknowledgedQueues,
 			userKey,
-			store,
 		)
 		const userUnacknowledgedUpdates = getFromStore(
-			userUnacknowledgedQueue,
 			store,
+			userUnacknowledgedQueue,
 		)
 		const unsubscribeFunctions: (() => void)[] = []
 
@@ -93,7 +93,7 @@ export function realtimeContinuitySynchronizer({
 			const unsubFns: (() => void)[] = []
 			for (const perspective of continuity.perspectives) {
 				const { viewAtoms } = perspective
-				const userViewState = findInStore(viewAtoms, userKey, store)
+				const userViewState = findInStore(store, viewAtoms, userKey)
 				const unsubscribe = subscribeToState(
 					userViewState,
 					({ oldValue, newValue }) => {
@@ -107,9 +107,9 @@ export function realtimeContinuitySynchronizer({
 							.flatMap((token) => {
 								const resourceToken =
 									token.type === `mutable_atom`
-										? getJsonToken(token, store)
+										? getJsonToken(store, token)
 										: token
-								const resource = getFromStore(resourceToken, store)
+								const resource = getFromStore(store, resourceToken)
 								return [resourceToken, resource]
 							})
 						store.logger.info(
@@ -141,13 +141,13 @@ export function realtimeContinuitySynchronizer({
 			const initialPayload: Json.Serializable[] = []
 			for (const atom of continuity.globals) {
 				const resourceToken =
-					atom.type === `mutable_atom` ? getJsonToken(atom, store) : atom
-				initialPayload.push(resourceToken, getFromStore(atom, store))
+					atom.type === `mutable_atom` ? getJsonToken(store, atom) : atom
+				initialPayload.push(resourceToken, getFromStore(store, atom))
 			}
 			for (const perspective of continuity.perspectives) {
 				const { viewAtoms, resourceAtoms } = perspective
-				const userViewState = findInStore(viewAtoms, userKey, store)
-				const userView = getFromStore(userViewState, store)
+				const userViewState = findInStore(store, viewAtoms, userKey)
+				const userView = getFromStore(store, userViewState)
 				store.logger.info(`👁`, `atom`, resourceAtoms.key, `${userKey} can see`, {
 					viewAtoms,
 					resourceAtoms,
@@ -156,9 +156,9 @@ export function realtimeContinuitySynchronizer({
 				for (const visibleToken of userView) {
 					const resourceToken =
 						visibleToken.type === `mutable_atom`
-							? getJsonToken(visibleToken, store)
+							? getJsonToken(store, visibleToken)
 							: visibleToken
-					const resource = getFromStore(resourceToken, store)
+					const resource = getFromStore(store, resourceToken)
 
 					initialPayload.push(resourceToken, resource)
 				}
@@ -181,13 +181,13 @@ export function realtimeContinuitySynchronizer({
 									continuity.perspectives.flatMap((perspective) => {
 										const { viewAtoms } = perspective
 										const userPerspectiveTokenState = findInStore(
+											store,
 											viewAtoms,
 											userKey,
-											store,
 										)
 										const visibleTokens = getFromStore(
-											userPerspectiveTokenState,
 											store,
+											userPerspectiveTokenState,
 										)
 										return visibleTokens.map((token) => {
 											const key =

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

@@ -34,11 +34,11 @@ export function realtimeAtomFamilyProvider({
 		}
 
 		const fillSubRequest = (subKey: K) => {
-			const exposedSubKeys = getFromStore(index, store)
+			const exposedSubKeys = getFromStore(store, index)
 			for (const exposedSubKey of exposedSubKeys) {
 				if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
-					const token = findInStore(family, subKey, store)
-					socket.emit(`serve:${token.key}`, getFromStore(token, store))
+					const token = findInStore(store, family, subKey)
+					socket.emit(`serve:${token.key}`, getFromStore(store, token))
 					const unsubscribe = subscribeToState(
 						token,
 						({ newValue }) => {

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

@@ -40,14 +40,14 @@ export function realtimeMutableFamilyProvider({
 		}
 
 		const fillSubRequest = (subKey: K) => {
-			const exposedSubKeys = getFromStore(index, store)
+			const exposedSubKeys = getFromStore(store, index)
 			for (const exposedSubKey of exposedSubKeys) {
 				if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
-					const token = findInStore(family, subKey, store)
-					getFromStore(token, store)
-					const jsonToken = getJsonToken(token, store)
+					const token = findInStore(store, family, subKey)
+					getFromStore(store, token)
+					const jsonToken = getJsonToken(store, token)
 					const updateToken = getUpdateToken(token)
-					socket.emit(`init:${token.key}`, getFromStore(jsonToken, store))
+					socket.emit(`init:${token.key}`, getFromStore(store, jsonToken))
 					const unsubscribe = subscribeToState(
 						updateToken,
 						({ newValue }) => {

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, store)
+		const jsonToken = getJsonToken(store, token)
 		const trackerToken = getUpdateToken(token)
 
 		const fillUnsubRequest = () => {
@@ -32,7 +32,7 @@ export function realtimeMutableProvider({
 		}
 
 		const fillSubRequest = () => {
-			socket.emit(`init:${token.key}`, getFromStore(jsonToken, store))
+			socket.emit(`init:${token.key}`, getFromStore(store, jsonToken))
 			unsubscribeFromStateUpdates = subscribeToState(
 				trackerToken,
 				({ newValue }) => {

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

@@ -15,7 +15,7 @@ export function realtimeStateProvider({
 		let unsubscribeFromStateUpdates: (() => void) | undefined
 
 		const fillSubRequest = () => {
-			socket.emit(`serve:${token.key}`, getFromStore(token, store))
+			socket.emit(`serve:${token.key}`, getFromStore(store, token))
 
 			unsubscribeFromStateUpdates = subscribeToState(
 				token,

package/realtime-server/src/realtime-state-receiver.ts

@@ -13,7 +13,7 @@ export function realtimeStateReceiver({
 		token: WritableToken<J>,
 	): () => void {
 		const publish = (newValue: J) => {
-			setIntoStore(token, newValue, store)
+			setIntoStore(store, token, newValue)
 		}
 
 		const fillPubUnclaim = () => {

package/realtime-testing/dist/index.js

@@ -29,8 +29,8 @@ var setupRealtimeTestServer = (options) => {
   const server = new SocketIO.Server(httpServer).use((socket, next) => {
     const { token, username } = socket.handshake.auth;
     if (token === `test` && socket.id) {
-      const socketState = findInStore(RTS.socketAtoms, socket.id, silo.store);
-      setIntoStore(socketState, socket, silo.store);
+      const socketState = findInStore(silo.store, RTS.socketAtoms, socket.id);
+      setIntoStore(silo.store, socketState, socket);
       editRelationsInStore(
         RTS.usersOfSockets,
         (relations) => {
@@ -38,8 +38,8 @@ var setupRealtimeTestServer = (options) => {
         },
         silo.store
       );
-      setIntoStore(RTS.userIndex, (index) => index.add(username), silo.store);
-      setIntoStore(RTS.socketIndex, (index) => index.add(socket.id), silo.store);
+      setIntoStore(silo.store, RTS.userIndex, (index) => index.add(username));
+      setIntoStore(silo.store, RTS.socketIndex, (index) => index.add(socket.id));
       console.log(`${username} connected on ${socket.id}`);
       next();
     } else {
@@ -51,10 +51,10 @@ var setupRealtimeTestServer = (options) => {
   });
   const dispose = () => {
     server.close();
-    const roomKeys = getFromStore(RT.roomIndex, silo.store);
+    const roomKeys = getFromStore(silo.store, RT.roomIndex);
     for (const roomKey of roomKeys) {
-      const roomState = findInStore(RTS.roomSelectors, roomKey, silo.store);
-      const room = getFromStore(roomState, silo.store);
+      const roomState = findInStore(silo.store, RTS.roomSelectors, roomKey);
+      const room = getFromStore(silo.store, roomState);
       if (room && !(room instanceof Promise)) {
         room.process.kill();
       }

package/realtime-testing/src/setup-realtime-test.tsx

@@ -89,8 +89,8 @@ export const setupRealtimeTestServer = (
 	const server = new SocketIO.Server(httpServer).use((socket, next) => {
 		const { token, username } = socket.handshake.auth
 		if (token === `test` && socket.id) {
-			const socketState = findInStore(RTS.socketAtoms, socket.id, silo.store)
-			setIntoStore(socketState, socket, silo.store)
+			const socketState = findInStore(silo.store, RTS.socketAtoms, socket.id)
+			setIntoStore(silo.store, socketState, socket)
 			editRelationsInStore(
 				RTS.usersOfSockets,
 				(relations) => {
@@ -98,8 +98,8 @@ export const setupRealtimeTestServer = (
 				},
 				silo.store,
 			)
-			setIntoStore(RTS.userIndex, (index) => index.add(username), silo.store)
-			setIntoStore(RTS.socketIndex, (index) => index.add(socket.id), silo.store)
+			setIntoStore(silo.store, RTS.userIndex, (index) => index.add(username))
+			setIntoStore(silo.store, RTS.socketIndex, (index) => index.add(socket.id))
 			console.log(`${username} connected on ${socket.id}`)
 			next()
 		} else {
@@ -113,10 +113,10 @@ export const setupRealtimeTestServer = (
 
 	const dispose = () => {
 		server.close()
-		const roomKeys = getFromStore(RT.roomIndex, silo.store)
+		const roomKeys = getFromStore(silo.store, RT.roomIndex)
 		for (const roomKey of roomKeys) {
-			const roomState = findInStore(RTS.roomSelectors, roomKey, silo.store)
-			const room = getFromStore(roomState, silo.store)
+			const roomState = findInStore(silo.store, RTS.roomSelectors, roomKey)
+			const room = getFromStore(silo.store, roomState)
 			if (room && !(room instanceof Promise)) {
 				room.process.kill()
 			}

package/src/atom.ts

@@ -53,7 +53,7 @@ export function atom<T>(options: RegularAtomOptions<T>): RegularAtomToken<T>
 export function atom(
 	options: MutableAtomOptions<any, any> | RegularAtomOptions<any>,
 ): AtomToken<any> {
-	return createStandaloneAtom(options, IMPLICIT.STORE)
+	return createStandaloneAtom(IMPLICIT.STORE, options)
 }
 
 export type RegularAtomFamilyOptions<T, K extends Canonical> = {
@@ -112,5 +112,5 @@ export function atomFamily<T, K extends Canonical>(
 		| MutableAtomFamilyOptions<any, any, any>
 		| RegularAtomFamilyOptions<T, K>,
 ): MutableAtomFamilyToken<any, any, any> | RegularAtomFamilyToken<T, K> {
-	return createAtomFamily(options, IMPLICIT.STORE)
+	return createAtomFamily(IMPLICIT.STORE, options)
 }

package/src/dispose-state.ts

@@ -32,8 +32,8 @@ export function disposeState(
 	key?: Json.Serializable,
 ): void {
 	if (key) {
-		Internal.disposeFromStore(token as any, key, Internal.IMPLICIT.STORE)
+		Internal.disposeFromStore(Internal.IMPLICIT.STORE, token as any, key)
 	} else {
-		Internal.disposeFromStore(token as any, Internal.IMPLICIT.STORE)
+		Internal.disposeFromStore(Internal.IMPLICIT.STORE, token as any)
 	}
 }

package/src/get-state.ts

@@ -26,19 +26,15 @@ export function getState<M extends MoleculeConstructor>(
 ): InstanceType<M>
 
 export function getState(
-	token:
-		| MoleculeFamilyToken<any>
-		| MoleculeToken<any>
-		| ReadableFamilyToken<any, any>
-		| ReadableToken<any>,
-	key?: Canonical,
+	...params:
+		| [
+				token: MoleculeFamilyToken<any> | ReadableFamilyToken<any, any>,
+				key: Canonical,
+		  ]
+		| [token: MoleculeToken<any> | ReadableToken<any>]
 ): any {
-	if (key) {
-		return Internal.getFromStore(
-			token as any,
-			key as any,
-			Internal.IMPLICIT.STORE,
-		)
+	if (params.length === 2) {
+		return Internal.getFromStore(Internal.IMPLICIT.STORE, ...params)
 	}
-	return Internal.getFromStore(token as any, Internal.IMPLICIT.STORE)
+	return Internal.getFromStore(Internal.IMPLICIT.STORE, ...params)
 }