atom.io 0.40.8 → 0.40.10

package/src/internal/mutable/tracker.ts

@@ -136,27 +136,27 @@ export class Tracker<T extends Transceiver<any, any, any>> {
 						return
 					}
 
-					const mutable = getFromStore(target, mutableState)
-					const updateNumber = mutable.getUpdateNumber(newValue)
-					const eventOffset = updateNumber - mutable.cacheUpdateNumber
-					if (newValue && eventOffset === 1) {
-						setIntoStore(
-							target,
-							mutableState,
-							(transceiver) => (transceiver.do(newValue), transceiver),
-						)
-					} else {
-						const expected = mutable.cacheUpdateNumber + 1
-						target.logger.info(
-							`❌`,
-							`mutable_atom`,
-							mutableState.key,
-							`could not be updated. Expected update number`,
-							expected,
-							`but got`,
-							updateNumber,
-						)
-					}
+					// const mutable = getFromStore(target, mutableState)
+					// const updateNumber = mutable.getUpdateNumber(newValue)
+					// const eventOffset = updateNumber - mutable.cacheUpdateNumber
+					// if (newValue && eventOffset === 1) {
+					setIntoStore(
+						target,
+						mutableState,
+						(transceiver) => (transceiver.do(newValue), transceiver),
+					)
+					// } else {
+					// 	const expected = mutable.cacheUpdateNumber + 1
+					// 	target.logger.info(
+					// 		`❌`,
+					// 		`mutable_atom`,
+					// 		mutableState.key,
+					// 		`could not be updated. Expected update number`,
+					// 		expected,
+					// 		`but got`,
+					// 		updateNumber,
+					// 	)
+					// }
 				},
 				{ inboundTracker: true },
 			),

package/src/internal/mutable/transceiver.ts

@@ -9,8 +9,8 @@ export interface Transceiver<
 	do: (update: S) => number | `OUT_OF_RANGE` | null
 	undo: (update: S) => void
 	subscribe: (key: string, fn: (update: S) => void) => () => void
-	cacheUpdateNumber: number
-	getUpdateNumber: (update: S) => number
+	// cacheUpdateNumber: number
+	// getUpdateNumber: (update: S) => number
 	toJSON: () => J
 }
 
@@ -31,8 +31,8 @@ export function isTransceiver(
 		`do` in value &&
 		`undo` in value &&
 		`subscribe` in value &&
-		`cacheUpdateNumber` in value &&
-		`getUpdateNumber` in value &&
+		// `cacheUpdateNumber` in value &&
+		// `getUpdateNumber` in value &&
 		`READONLY_VIEW` in value &&
 		`toJSON` in value
 	)

package/src/internal/set-state/index.ts

@@ -1,5 +1,6 @@
 export * from "./become"
 export * from "./evict-downstream"
+export * from "./operate-on-store"
 export * from "./reset-atom-or-selector"
 export * from "./reset-in-store"
 export * from "./set-atom-or-selector"

package/src/{realtime-server → realtime}/employ-socket.ts

@@ -1,5 +1,5 @@
-import type { Events } from "./ipc-sockets"
-import type { Socket } from "./socket-interface"
+import type { Socket } from "atom.io/realtime"
+import type { Events } from "atom.io/realtime-server"
 
 export function employSocket<I extends Events, K extends string & keyof I>(
 	socket: Socket,

package/src/realtime/index.ts

@@ -1,3 +1,5 @@
+export * from "./employ-socket"
 export * from "./mutex-store"
 export * from "./realtime-continuity"
 export * from "./shared-room-store"
+export type * from "./socket-interface"

package/src/realtime/shared-room-store.ts

@@ -4,19 +4,20 @@ import type {
 	ReadonlyPureSelectorFamilyToken,
 } from "atom.io"
 import { getInternalRelations, join, mutableAtom, selectorFamily } from "atom.io"
-import { SetRTX } from "atom.io/transceivers/set-rtx"
+import { UList } from "atom.io/transceivers/u-list"
 
-export const usersInThisRoomIndex: MutableAtomToken<SetRTX<string>> =
-	mutableAtom<SetRTX<string>>({
-		key: `usersInRoomIndex`,
-		class: SetRTX,
-	})
+export const usersInThisRoomIndex: MutableAtomToken<UList<string>> = mutableAtom<
+	UList<string>
+>({
+	key: `usersInRoomIndex`,
+	class: UList,
+})
 
-export const roomIndex: MutableAtomToken<SetRTX<string>> = mutableAtom<
-	SetRTX<string>
+export const roomIndex: MutableAtomToken<UList<string>> = mutableAtom<
+	UList<string>
 >({
 	key: `roomIndex`,
-	class: SetRTX,
+	class: UList,
 })
 
 export type UserInRoomMeta = {
@@ -44,9 +45,9 @@ export const usersInRooms: JoinToken<
 )
 
 export const usersInMyRoomView: ReadonlyPureSelectorFamilyToken<
-	MutableAtomToken<SetRTX<string>>[],
+	MutableAtomToken<UList<string>>[],
 	string
-> = selectorFamily<MutableAtomToken<SetRTX<string>>[], string>({
+> = selectorFamily<MutableAtomToken<UList<string>>[], string>({
 	key: `usersInMyRoomView`,
 	get:
 		(myUsername) =>

package/src/realtime-client/continuity/register-and-attempt-confirmed-update.ts

@@ -7,11 +7,11 @@ import {
 	setEpochNumberOfContinuity,
 	setIntoStore,
 } from "atom.io/internal"
+import type { Socket } from "atom.io/realtime"
 import {
 	confirmedUpdateQueue,
 	optimisticUpdateQueue,
 } from "atom.io/realtime-client"
-import type { Socket } from "atom.io/realtime-server"
 
 export const useRegisterAndAttemptConfirmedUpdate =
 	(

package/src/realtime-client/push-state.ts

@@ -2,8 +2,7 @@ import type { WritableToken } from "atom.io"
 import type { Store } from "atom.io/internal"
 import { setIntoStore, subscribeToState } from "atom.io/internal"
 import type { Json } from "atom.io/json"
-import { mutexAtoms } from "atom.io/realtime/mutex-store"
-import { employSocket } from "atom.io/realtime-server/employ-socket"
+import { employSocket, mutexAtoms } from "atom.io/realtime"
 import type { Socket } from "socket.io-client"
 
 export function pushState<J extends Json.Serializable>(

package/src/realtime-react/use-single-effect.ts

@@ -1,6 +1,6 @@
 /** biome-ignore-all lint/correctness/useHookAtTopLevel: intentional */
 
-import { isFn } from "atom.io/internal/is-fn"
+import { isFn } from "atom.io/internal"
 import * as React from "react"
 
 export function useSingleEffect(

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

@@ -5,7 +5,7 @@ import type {
 } from "atom.io"
 import { atomFamily } from "atom.io"
 
-import type { UserKey } from "../realtime-server-stores/server-user-store"
+import type { UserKey } from "../realtime-server-stores"
 
 export function redactTransactionUpdateContent(
 	visibleStateKeys: string[],

package/src/realtime-server/continuity/provide-outcomes.ts

@@ -7,9 +7,9 @@ import {
 	subscribeToTransaction,
 } from "atom.io/internal"
 import type { Json } from "atom.io/json"
-import type { ContinuityToken } from "atom.io/realtime"
+import type { ContinuityToken, Socket } from "atom.io/realtime"
 
-import type { Socket, UserKey } from ".."
+import type { UserKey } from ".."
 import {
 	redactTransactionUpdateContent,
 	unacknowledgedUpdatesAtoms,

package/src/realtime-server/continuity/provide-perspectives.ts

@@ -5,9 +5,8 @@ import {
 	getJsonToken,
 	subscribeToState,
 } from "atom.io/internal"
-import type { ContinuityToken } from "atom.io/realtime"
+import type { ContinuityToken, Socket } from "atom.io/realtime"
 
-import type { Socket } from ".."
 import type { UserKey } from "../realtime-server-stores"
 
 export function providePerspectives(

package/src/realtime-server/continuity/provide-startup-payloads.ts

@@ -6,10 +6,10 @@ import {
 	isRootStore,
 } from "atom.io/internal"
 import type { Json } from "atom.io/json"
-import type { ContinuityToken } from "atom.io/realtime"
+import type { ContinuityToken, Socket } from "atom.io/realtime"
+import { employSocket } from "atom.io/realtime"
 
-import type { Socket, UserKey } from ".."
-import { employSocket } from "../employ-socket"
+import type { UserKey } from ".."
 
 export function provideStartupPayloads(
 	store: Store,

package/src/realtime-server/continuity/receive-action-requests.ts

@@ -2,10 +2,8 @@ import type { TransactionOutcomeEvent, TransactionToken } from "atom.io"
 import type { Store } from "atom.io/internal"
 import { actUponStore } from "atom.io/internal"
 import type { Json, JsonIO } from "atom.io/json"
-import type { ContinuityToken } from "atom.io/realtime"
-
-import { employSocket } from "../employ-socket"
-import type { Socket } from "../socket-interface"
+import type { ContinuityToken, Socket } from "atom.io/realtime"
+import { employSocket } from "atom.io/realtime"
 
 export function receiveActionRequests(
 	store: Store,

package/src/realtime-server/continuity/track-acknowledgements.ts

@@ -1,10 +1,9 @@
 import type { Store } from "atom.io/internal"
 import { getFromStore, setIntoStore } from "atom.io/internal"
-import type { ContinuityToken } from "atom.io/realtime"
+import type { ContinuityToken, Socket } from "atom.io/realtime"
+import { employSocket } from "atom.io/realtime"
 
-import { employSocket } from "../employ-socket"
 import type { UserKey } from "../realtime-server-stores"
-import type { Socket } from "../socket-interface"
 import { unacknowledgedUpdatesAtoms } from "./continuity-store"
 
 export function trackAcknowledgements(

package/src/realtime-server/index.ts

@@ -7,4 +7,3 @@ export * from "./realtime-server-stores"
 export * from "./realtime-state-provider"
 export * from "./realtime-state-receiver"
 export type * from "./server-config"
-export type * from "./socket-interface"

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

@@ -1,6 +1,5 @@
 import type { Json, stringified } from "atom.io/json"
-
-import type { Socket } from "../socket-interface"
+import type { Socket } from "atom.io/realtime"
 
 export type Events = Json.Object<string, Json.Serializable[]>
 

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

@@ -3,7 +3,7 @@ import type { Readable, Writable } from "node:stream"
 import { Subject } from "atom.io/internal"
 import type { Json } from "atom.io/json"
 import { parseJson, stringifyJson } from "atom.io/json"
-import { SetRTX } from "atom.io/transceivers/set-rtx"
+import { UList } from "atom.io/transceivers/u-list"
 
 import type { UserKey } from "../realtime-server-stores"
 import type { StderrLog } from "./child-socket"
@@ -76,9 +76,7 @@ export class ParentSocket<
 		this.proc.stderr.write(
 			stringifyJson(
 				args.map((arg) =>
-					arg instanceof SetRTX
-						? `{ ${arg.toJSON().members.join(` | `)} }`
-						: arg,
+					arg instanceof UList ? `{ ${arg.toJSON().members.join(` | `)} }` : arg,
 				),
 			) + `\x03`,
 		)

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

@@ -7,9 +7,9 @@ import {
 } from "atom.io/internal"
 import type { Canonical, Json, stringified } from "atom.io/json"
 import { stringifyJson } from "atom.io/json"
+import { employSocket } from "atom.io/realtime"
 
 import type { ServerConfig } from "."
-import { employSocket } from "./employ-socket"
 
 export type FamilyProvider = ReturnType<typeof realtimeAtomFamilyProvider>
 export function realtimeAtomFamilyProvider({

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

@@ -10,9 +10,9 @@ import {
 } from "atom.io/internal"
 import type { Canonical, stringified } from "atom.io/json"
 import { stringifyJson } from "atom.io/json"
+import { employSocket } from "atom.io/realtime"
 
 import type { ServerConfig } from "."
-import { employSocket } from "./employ-socket"
 
 export type MutableFamilyProvider = ReturnType<
 	typeof realtimeMutableFamilyProvider

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

@@ -8,9 +8,9 @@ import {
 	subscribeToState,
 } from "atom.io/internal"
 import type { Json } from "atom.io/json"
+import { employSocket } from "atom.io/realtime"
 
 import type { ServerConfig } from "."
-import { employSocket } from "./employ-socket"
 
 export type MutableProvider = ReturnType<typeof realtimeMutableProvider>
 export function realtimeMutableProvider({

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

@@ -4,8 +4,8 @@ import { spawn } from "node:child_process"
 import type { TransactionIO, TransactionToken } from "atom.io"
 import { transaction } from "atom.io"
 import { editRelationsInStore } from "atom.io/internal"
-import type { UserInRoomMeta } from "atom.io/realtime/shared-room-store"
-import { roomIndex, usersInRooms } from "atom.io/realtime/shared-room-store"
+import type { UserInRoomMeta } from "atom.io/realtime"
+import { roomIndex, usersInRooms } from "atom.io/realtime"
 
 import { ChildSocket } from "../ipc-sockets"
 import type { RoomKey } from "./server-user-store"

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

@@ -6,9 +6,8 @@ import type {
 	RegularAtomFamilyToken,
 } from "atom.io"
 import { atomFamily, join, mutableAtom, selectorFamily } from "atom.io"
-import { SetRTX } from "atom.io/transceivers/set-rtx"
-
-import type { Socket } from ".."
+import type { Socket } from "atom.io/realtime"
+import { UList } from "atom.io/transceivers/u-list"
 
 export type SocketKey = `socket::${string}`
 export type UserKey = `user::${string}`
@@ -29,17 +28,17 @@ export const socketAtoms: RegularAtomFamilyToken<Socket | null, SocketKey> =
 		default: null,
 	})
 
-export const socketIndex: MutableAtomToken<SetRTX<SocketKey>> = mutableAtom<
-	SetRTX<SocketKey>
+export const socketIndex: MutableAtomToken<UList<SocketKey>> = mutableAtom<
+	UList<SocketKey>
 >({
 	key: `socketsIndex`,
-	class: SetRTX,
+	class: UList,
 })
-export const userIndex: MutableAtomToken<SetRTX<UserKey>> = mutableAtom<
-	SetRTX<UserKey>
+export const userIndex: MutableAtomToken<UList<UserKey>> = mutableAtom<
+	UList<UserKey>
 >({
 	key: `usersIndex`,
-	class: SetRTX,
+	class: UList,
 })
 export const usersOfSockets: JoinToken<
 	`user`,

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

@@ -1,9 +1,9 @@
 import type * as AtomIO from "atom.io"
 import { getFromStore, IMPLICIT, subscribeToState } from "atom.io/internal"
 import type { Json } from "atom.io/json"
+import { employSocket } from "atom.io/realtime"
 
 import type { ServerConfig } from "."
-import { employSocket } from "./employ-socket"
 
 export type StateProvider = ReturnType<typeof realtimeStateProvider>
 export function realtimeStateProvider({

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

@@ -3,18 +3,15 @@ import {
 	findInStore,
 	getFromStore,
 	IMPLICIT,
+	operateOnStore,
+	OWN_OP,
 	setIntoStore,
 	subscribeToState,
 } from "atom.io/internal"
-import {
-	operateOnStore,
-	OWN_OP,
-} from "atom.io/internal/set-state/operate-on-store"
 import type { Json } from "atom.io/json"
-import { mutexAtoms } from "atom.io/realtime/mutex-store"
+import { employSocket, mutexAtoms } from "atom.io/realtime"
 
 import type { ServerConfig } from "."
-import { employSocket } from "./employ-socket"
 
 export type StateReceiver = ReturnType<typeof realtimeStateReceiver>
 export function realtimeStateReceiver({

package/src/realtime-server/server-config.ts

@@ -1,6 +1,5 @@
 import type { RootStore } from "atom.io/internal"
-
-import type { Socket } from "./socket-interface"
+import type { Socket } from "atom.io/realtime"
 
 export type ServerConfig = {
 	socket: Socket

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

@@ -19,7 +19,7 @@ import * as AR from "atom.io/react"
 import * as RTC from "atom.io/realtime-client"
 import * as RTR from "atom.io/realtime-react"
 import * as RTS from "atom.io/realtime-server"
-import { SetRTX } from "atom.io/transceivers/set-rtx"
+import { UList } from "atom.io/transceivers/u-list"
 import * as Happy from "happy-dom"
 import * as React from "react"
 import * as SocketIO from "socket.io"
@@ -45,9 +45,8 @@ function prefixLogger(store: Store, prefix: string) {
 				if (param instanceof ChildProcess) {
 					params[idx] = `ChildProcess:${param.pid}`
 				}
-				if (param instanceof SetRTX) {
-					params[idx] =
-						`SetRTX(${param.size}) {${[...param].join(`, `)}} at ${param.cacheIdx}`
+				if (param instanceof UList) {
+					params[idx] = `UList(${param.size}) {${[...param].join(`, `)}}`
 				}
 				idx++
 			}

package/src/transceivers/o-list/index.ts

@@ -0,0 +1 @@
+export * from "./o-list"