atom.io 0.36.0 → 0.36.2

package/src/react-devtools/Updates.tsx

@@ -3,7 +3,7 @@ import type {
 	TimelineUpdate,
 	TransactionUpdate,
 } from "atom.io"
-import type { Func } from "atom.io/internal"
+import type { Fn } from "atom.io/internal"
 import { discoverType, prettyJson } from "atom.io/introspection"
 import { stringifyJson } from "atom.io/json"
 import * as React from "react"
@@ -37,7 +37,7 @@ const AtomUpdateFC: React.FC<{
 
 const TransactionUpdateFC: React.FC<{
 	serialNumber: number
-	transactionUpdate: TransactionUpdate<Func>
+	transactionUpdate: TransactionUpdate<Fn>
 }> = ({ serialNumber, transactionUpdate }) => {
 	return (
 		<article

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

@@ -1,5 +1,5 @@
 import type * as AtomIO from "atom.io"
-import type { Func, Store } from "atom.io/internal"
+import type { Fn, Store } from "atom.io/internal"
 import {
 	actUponStore,
 	getEpochNumberOfContinuity,
@@ -22,7 +22,7 @@ export const useRegisterAndAttemptConfirmedUpdate =
 		optimisticUpdates: AtomIO.TransactionUpdate<any>[],
 		confirmedUpdates: AtomIO.TransactionUpdate<any>[],
 	) =>
-	(confirmed: AtomIO.TransactionUpdate<Func>): void => {
+	(confirmed: AtomIO.TransactionUpdate<Fn>): void => {
 		function reconcileEpoch(
 			optimisticUpdate: AtomIO.TransactionUpdate<any>,
 			confirmedUpdate: AtomIO.TransactionUpdate<any>,

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

@@ -1,16 +1,14 @@
 import type * as AtomIO from "atom.io"
-import type { AsJSON, Store, Transceiver } from "atom.io/internal"
+import type { AsJSON, SignalFrom, Store, Transceiver } from "atom.io/internal"
 import { getJsonToken, getUpdateToken, setIntoStore } from "atom.io/internal"
 import { parseJson } from "atom.io/json"
 import type { Socket } from "socket.io-client"
 
 /* eslint-disable no-console */
 
-export function pullMutableAtomFamilyMember<T extends Transceiver<any, any>>(
-	store: Store,
-	socket: Socket,
-	token: AtomIO.MutableAtomToken<T>,
-): () => void {
+export function pullMutableAtomFamilyMember<
+	T extends Transceiver<any, any, any>,
+>(store: Store, socket: Socket, token: AtomIO.MutableAtomToken<T>): () => void {
 	if (!(`family` in token)) {
 		console.error(`Token is not a family member:`, token)
 		return () => {}
@@ -21,13 +19,10 @@ export function pullMutableAtomFamilyMember<T extends Transceiver<any, any>>(
 		const jsonToken = getJsonToken(store, token)
 		setIntoStore(store, jsonToken, data)
 	})
-	socket.on(
-		`next:${token.key}`,
-		(data: T extends Transceiver<infer Signal, any> ? Signal : never) => {
-			const trackerToken = getUpdateToken(token)
-			setIntoStore(store, trackerToken, data)
-		},
-	)
+	socket.on(`next:${token.key}`, (data: SignalFrom<T>) => {
+		const trackerToken = getUpdateToken(token)
+		setIntoStore(store, trackerToken, data)
+	})
 	socket.emit(`sub:${familyKey}`, subKey)
 	return () => {
 		socket.off(`serve:${token.key}`)

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

@@ -1,9 +1,9 @@
 import type * as AtomIO from "atom.io"
-import type { AsJSON, Store, Transceiver } from "atom.io/internal"
+import type { AsJSON, SignalFrom, Store, Transceiver } from "atom.io/internal"
 import { getJsonToken, getUpdateToken, setIntoStore } from "atom.io/internal"
 import type { Socket } from "socket.io-client"
 
-export function pullMutableAtom<T extends Transceiver<any, any>>(
+export function pullMutableAtom<T extends Transceiver<any, any, any>>(
 	store: Store,
 	socket: Socket,
 	token: AtomIO.MutableAtomToken<T>,
@@ -13,12 +13,9 @@ export function pullMutableAtom<T extends Transceiver<any, any>>(
 	socket.on(`init:${token.key}`, (data: AsJSON<T>) => {
 		setIntoStore(store, jsonToken, data)
 	})
-	socket.on(
-		`next:${token.key}`,
-		(data: T extends Transceiver<infer Update, any> ? Update : never) => {
-			setIntoStore(store, updateToken, data)
-		},
-	)
+	socket.on(`next:${token.key}`, (data: SignalFrom<T>) => {
+		setIntoStore(store, updateToken, data)
+	})
 	socket.emit(`sub:${token.key}`)
 	return () => {
 		socket.off(`init:${token.key}`)

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

@@ -1,15 +1,16 @@
-import type * as AtomIO from "atom.io"
-import * as Internal from "atom.io/internal"
+import type { WritableToken } from "atom.io"
+import type { Store } from "atom.io/internal"
+import { subscribeToState } from "atom.io/internal"
 import type { Json } from "atom.io/json"
 import type { Socket } from "socket.io-client"
 
 export function pushState<J extends Json.Serializable>(
-	store: Internal.Store,
+	store: Store,
 	socket: Socket,
-	token: AtomIO.WritableToken<J>,
+	token: WritableToken<J>,
 ): () => void {
 	socket.emit(`claim:${token.key}`)
-	Internal.subscribeToState(store, token, `push`, ({ newValue }) => {
+	subscribeToState(store, token, `push`, ({ newValue }) => {
 		socket.emit(`pub:${token.key}`, newValue)
 	})
 	return () => {

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

@@ -1,13 +1,14 @@
 import type * as AtomIO from "atom.io"
-import * as Internal from "atom.io/internal"
+import type { Fn, Store } from "atom.io/internal"
+import { subscribeToTransaction } from "atom.io/internal"
 import type { Socket } from "socket.io-client"
 
-export function serverAction<F extends Internal.Func>(
-	store: Internal.Store,
+export function serverAction<F extends Fn>(
+	store: Store,
 	socket: Socket,
 	token: AtomIO.TransactionToken<F>,
 ): () => void {
-	const unsubscribeFromLocalUpdates = Internal.subscribeToTransaction(
+	const unsubscribeFromLocalUpdates = subscribeToTransaction(
 		store,
 		token,
 		`tx-run:${token.key}:${socket.id}`,

package/src/realtime-react/use-pull-mutable-atom.ts

@@ -6,7 +6,7 @@ import * as React from "react"
 
 import { useRealtimeService } from "./use-realtime-service"
 
-export function usePullMutable<T extends Transceiver<any, any>>(
+export function usePullMutable<T extends Transceiver<any, any, any>>(
 	token: AtomIO.MutableAtomToken<T>,
 ): T {
 	const store = React.useContext(StoreContext)

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

@@ -9,7 +9,7 @@ import * as React from "react"
 import { useRealtimeService } from "./use-realtime-service"
 
 export function usePullMutableAtomFamilyMember<
-	T extends Transceiver<any, any>,
+	T extends Transceiver<any, any, any>,
 	K extends Canonical,
 	Key extends K,
 >(familyToken: AtomIO.MutableAtomFamilyToken<T, K>, key: Key): T {

package/src/realtime-react/use-server-action.ts

@@ -1,5 +1,5 @@
 import type * as AtomIO from "atom.io"
-import type { Func } from "atom.io/internal"
+import type { Fn } from "atom.io/internal"
 import { actUponStore, arbitrary } from "atom.io/internal"
 import { StoreContext } from "atom.io/react"
 import * as RTC from "atom.io/realtime-client"
@@ -7,7 +7,7 @@ import * as React from "react"
 
 import { useRealtimeService } from "./use-realtime-service"
 
-export function useServerAction<F extends Func>(
+export function useServerAction<F extends Fn>(
 	token: AtomIO.TransactionToken<F>,
 ): (...parameters: Parameters<F>) => ReturnType<F> {
 	const store = React.useContext(StoreContext)

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

@@ -21,7 +21,7 @@ export function realtimeMutableFamilyProvider({
 	store = IMPLICIT.STORE,
 }: ServerConfig) {
 	return function mutableFamilyProvider<
-		T extends Transceiver<any, any>,
+		T extends Transceiver<any, any, any>,
 		K extends Canonical,
 	>(
 		family: AtomIO.MutableAtomFamilyToken<T, K>,

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

@@ -17,7 +17,7 @@ export function realtimeMutableProvider({
 	store = IMPLICIT.STORE,
 }: ServerConfig) {
 	return function mutableProvider<
-		Core extends Transceiver<Json.Serializable, Json.Serializable>,
+		Core extends Transceiver<any, Json.Serializable, Json.Serializable>,
 	>(token: AtomIO.MutableAtomToken<Core>): () => void {
 		let unsubscribeFromStateUpdates: (() => void) | null = null
 

package/src/transceivers/set-rtx/set-rtx.ts

@@ -7,6 +7,13 @@ export type SetUpdateType = `add` | `clear` | `del` | `tx`
 export type SetUpdate = `${SetUpdateType}:${string}`
 export type NumberedSetUpdate = `${number}=${SetUpdate}`
 
+export interface SetRTXView<P extends primitive> extends ReadonlySet<P> {
+	readonly cache: ReadonlyArray<NumberedSetUpdate | null>
+	readonly cacheLimit: number
+	readonly cacheIdx: number
+	readonly cacheUpdateNumber: number
+}
+
 export interface SetRTXJson<P extends primitive> extends Json.Object {
 	members: P[]
 	cache: (NumberedSetUpdate | null)[]
@@ -16,7 +23,9 @@ export interface SetRTXJson<P extends primitive> extends Json.Object {
 }
 export class SetRTX<P extends primitive>
 	extends Set<P>
-	implements Transceiver<NumberedSetUpdate, SetRTXJson<P>>, Lineage
+	implements
+		Transceiver<SetRTXView<P>, NumberedSetUpdate, SetRTXJson<P>>,
+		Lineage
 {
 	public mode: TransceiverMode = `record`
 	public readonly subject: Subject<SetUpdate> = new Subject<SetUpdate>()
@@ -42,6 +51,10 @@ export class SetRTX<P extends primitive>
 		}
 	}
 
+	public view(): SetRTXView<P> {
+		return this
+	}
+
 	public toJSON(): SetRTXJson<P> {
 		return {
 			members: [...this],

package/src/internal/set-state/copy-mutable-if-needed.ts

@@ -1,29 +0,0 @@
-import type { MutableAtom, Transceiver } from ".."
-import { Tracker } from "../mutable"
-import type { Store } from "../store"
-
-export function copyMutableIfNeeded<T extends Transceiver<any, any>>(
-	target: Store,
-	atom: MutableAtom<T>,
-	origin: Store,
-): T {
-	const originValue = origin.valueMap.get(atom.key) as
-		| Transceiver<any, any>
-		| undefined
-	const targetValue = target.valueMap.get(atom.key)
-
-	if (originValue !== targetValue) {
-		return targetValue
-	}
-
-	if (originValue === undefined) {
-		return new atom.class()
-	}
-
-	origin.logger.info(`📃`, `atom`, atom.key, `copying`)
-	const jsonValue = originValue.toJSON()
-	const copiedValue = atom.class.fromJSON(jsonValue)
-	target.valueMap.set(atom.key, copiedValue)
-	new Tracker(atom, origin)
-	return copiedValue
-}