atom.io 0.31.0 → 0.32.0

package/realtime-server/src/continuity/prepare-to-serve-transaction-request.ts

@@ -20,9 +20,9 @@ export function prepareToServeTransactionRequest(
 		performance.mark(performanceKeyStart)
 		try {
 			actUponStore(
+				store,
 				{ type: `transaction`, key: transactionKey },
 				updateId,
-				store,
 			)(...update.params)
 		} catch (thrown) {
 			if (thrown instanceof Error) {

package/realtime-server/src/continuity/prepare-to-sync-realtime-continuity.ts

@@ -1,6 +1,6 @@
-import { findRelationsInStore } from "atom.io/data"
 import {
 	findInStore,
+	findRelationsInStore,
 	getFromStore,
 	IMPLICIT,
 	subscribeToState,
@@ -50,7 +50,9 @@ export function prepareToExposeRealtimeContinuity({
 			store,
 		).socketKeyOfUser
 		const unsubscribeFromSocketTracking = subscribeToState(
+			store,
 			socketKeyState,
+			`sync-continuity:${continuityKey}:${userKey}`,
 			({ newValue: newSocketKey }) => {
 				store.logger.info(
 					`👋`,
@@ -77,8 +79,6 @@ export function prepareToExposeRealtimeContinuity({
 					)
 				}
 			},
-			`sync-continuity:${continuityKey}:${userKey}`,
-			store,
 		)
 
 		const userUnacknowledgedUpdates = getFromStore(

package/realtime-server/src/continuity/subscribe-to-continuity-actions.ts

@@ -28,7 +28,9 @@ export function subscribeToContinuityActions(
 
 	for (const transaction of continuity.actions) {
 		const unsubscribeFromTransaction = subscribeToTransaction(
+			store,
 			transaction,
+			`sync-continuity:${continuityKey}:${userKey}`,
 			(update) => {
 				try {
 					const visibleKeys = continuity.globals
@@ -97,8 +99,6 @@ export function subscribeToContinuityActions(
 					}
 				}
 			},
-			`sync-continuity:${continuityKey}:${userKey}`,
-			store,
 		)
 		unsubscribeFunctions.push(unsubscribeFromTransaction)
 	}

package/realtime-server/src/continuity/subscribe-to-continuity-perpectives.ts

@@ -22,7 +22,9 @@ export function subscribeToContinuityPerspectives(
 		const { viewAtoms } = perspective
 		const userViewState = findInStore(store, viewAtoms, userKey)
 		const unsubscribeFromUserView = subscribeToState(
+			store,
 			userViewState,
+			`sync-continuity:${continuityKey}:${userKey}:perspective:${perspective.resourceAtoms.key}`,
 			({ oldValue, newValue }) => {
 				const oldKeys = oldValue.map((token) => token.key)
 				const newKeys = newValue.map((token) => token.key)
@@ -51,8 +53,6 @@ export function subscribeToContinuityPerspectives(
 					socket?.emit(`conceal:${continuityKey}`, concealed)
 				}
 			},
-			`sync-continuity:${continuityKey}:${userKey}:perspective:${perspective.resourceAtoms.key}`,
-			store,
 		)
 		unsubFns.push(unsubscribeFromUserView)
 	}

package/realtime-server/src/ipc-sockets/child-socket.ts

@@ -1,5 +1,4 @@
 import type { ChildProcessWithoutNullStreams } from "node:child_process"
-import type { Console } from "node:console"
 
 import type { Json } from "atom.io/json"
 import { parseJson } from "atom.io/json"

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

@@ -19,7 +19,7 @@ export function realtimeActionReceiver({
 			const performanceKeyStart = `${performanceKey}:start`
 			const performanceKeyEnd = `${performanceKey}:end`
 			performance.mark(performanceKeyStart)
-			actUponStore<F>(tx, update.id, store)(...update.params)
+			actUponStore<F>(store, tx, update.id)(...update.params)
 			performance.mark(performanceKeyEnd)
 			const metric = performance.measure(
 				performanceKey,

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

@@ -40,12 +40,12 @@ export function realtimeAtomFamilyProvider({
 					const token = findInStore(store, family, subKey)
 					socket.emit(`serve:${token.key}`, getFromStore(store, token))
 					const unsubscribe = subscribeToState(
+						store,
 						token,
+						`expose-family:${family.key}:${socket.id}`,
 						({ newValue }) => {
 							socket.emit(`serve:${token.key}`, newValue)
 						},
-						`expose-family:${family.key}:${socket.id}`,
-						store,
 					)
 					unsubCallbacksByKey.set(token.key, unsubscribe)
 					socket.on(`unsub:${token.key}`, () => {

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

@@ -49,12 +49,12 @@ export function realtimeMutableFamilyProvider({
 					const updateToken = getUpdateToken(token)
 					socket.emit(`init:${token.key}`, getFromStore(store, jsonToken))
 					const unsubscribe = subscribeToState(
+						store,
 						updateToken,
+						`expose-family:${family.key}:${socket.id}`,
 						({ newValue }) => {
 							socket.emit(`next:${token.key}`, newValue)
 						},
-						`expose-family:${family.key}:${socket.id}`,
-						store,
 					)
 					unsubCallbacksByKey.set(token.key, unsubscribe)
 					socket.on(`unsub:${token.key}`, () => {

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

@@ -34,12 +34,12 @@ export function realtimeMutableProvider({
 		const fillSubRequest = () => {
 			socket.emit(`init:${token.key}`, getFromStore(store, jsonToken))
 			unsubscribeFromStateUpdates = subscribeToState(
+				store,
 				trackerToken,
+				`expose-single:${socket.id}`,
 				({ newValue }) => {
 					socket.emit(`next:${token.key}`, newValue)
 				},
-				`expose-single:${socket.id}`,
-				store,
 			)
 			socket.on(`unsub:${token.key}`, fillUnsubRequest)
 		}

package/realtime-server/src/realtime-server-stores/server-room-external-actions.ts

@@ -1,5 +1,6 @@
+import type { Loadable } from "atom.io"
 import * as AtomIO from "atom.io"
-import { editRelations, editRelationsInStore, type Loadable } from "atom.io/data"
+import { editRelationsInStore } from "atom.io/internal"
 import type { UserInRoomMeta } from "atom.io/realtime"
 import { roomIndex, usersInRooms } from "atom.io/realtime"
 

package/realtime-server/src/realtime-server-stores/server-room-external-store.ts

@@ -1,8 +1,8 @@
 import type { ChildProcessWithoutNullStreams } from "node:child_process"
 import { spawn } from "node:child_process"
 
+import type { Loadable } from "atom.io"
 import { atomFamily, selectorFamily } from "atom.io"
-import type { Loadable } from "atom.io/data"
 
 import { ChildSocket } from "../ipc-sockets"
 

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

@@ -1,6 +1,5 @@
 import type { Hierarchy } from "atom.io"
-import { atom, atomFamily } from "atom.io"
-import { join } from "atom.io/data"
+import { atom, atomFamily, join } from "atom.io"
 import type { SetRTXJson } from "atom.io/transceivers/set-rtx"
 import { SetRTX } from "atom.io/transceivers/set-rtx"
 

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

@@ -18,12 +18,12 @@ export function realtimeStateProvider({
 			socket.emit(`serve:${token.key}`, getFromStore(store, token))
 
 			unsubscribeFromStateUpdates = subscribeToState(
+				store,
 				token,
+				`expose-single:${socket.id}`,
 				({ newValue }) => {
 					socket.emit(`serve:${token.key}`, newValue)
 				},
-				`expose-single:${socket.id}`,
-				store,
 			)
 
 			const fillUnsubRequest = () => {