atom.io 0.30.0 → 0.30.2

package/realtime-server/dist/index.d.ts

@@ -2,7 +2,7 @@ import { Subject, Transceiver, Store } from 'atom.io/internal';
 import { Json, stringified, JsonIO, Canonical } from 'atom.io/json';
 import { ChildProcessWithoutNullStreams } from 'node:child_process';
 import * as AtomIO from 'atom.io';
-import { TransactionUpdateContent, TransactionUpdate, WritableToken } from 'atom.io';
+import { TransactionUpdateContent, TransactionUpdate, Hierarchy, WritableToken } from 'atom.io';
 import { ContinuityToken, UserInRoomMeta } from 'atom.io/realtime';
 import * as atom_io_data from 'atom.io/data';
 import { Loadable } from 'atom.io/data';
@@ -112,10 +112,19 @@ declare const actionOcclusionAtoms: AtomIO.RegularAtomFamilyToken<{
 }, string>;
 declare const userUnacknowledgedQueues: AtomIO.RegularAtomFamilyToken<Pick<TransactionUpdate<any>, "key" | "epoch" | "id" | "updates" | "output">[], string>;
 
-declare const socketAtoms: AtomIO.RegularAtomFamilyToken<Socket | null, string>;
-declare const socketIndex: AtomIO.MutableAtomToken<SetRTX<string>, SetRTXJson<string>>;
-declare const userIndex: AtomIO.MutableAtomToken<SetRTX<string>, SetRTXJson<string>>;
-declare const usersOfSockets: atom_io_data.JoinToken<"user", "socket", "1:1", null>;
+type SocketKey = `socket::${string}`;
+type UserKey = `user::${string}`;
+type RoomKey = `room::${string}`;
+type SocketSystemHierarchy = Hierarchy<[
+    {
+        above: `root`;
+        below: [UserKey, SocketKey, RoomKey];
+    }
+]>;
+declare const socketAtoms: AtomIO.RegularAtomFamilyToken<Socket | null, `socket::${string}`>;
+declare const socketIndex: AtomIO.MutableAtomToken<SetRTX<`socket::${string}`>, SetRTXJson<`socket::${string}`>>;
+declare const userIndex: AtomIO.MutableAtomToken<SetRTX<`user::${string}`>, SetRTXJson<`user::${string}`>>;
+declare const usersOfSockets: atom_io_data.JoinToken<"user", `user::${string}`, "socket", `socket::${string}`, "1:1", null>;
 
 type StateProvider = ReturnType<typeof realtimeStateProvider>;
 declare function realtimeStateProvider({ socket, store, }: ServerConfig): <J extends Json.Serializable>(token: AtomIO.WritableToken<J>) => () => void;
@@ -136,4 +145,4 @@ type ServerConfig = {
     store?: Store;
 };
 
-export { type ActionReceiver, ChildSocket, type CreateRoomIO, CustomSocket, type EventBuffer, type Events, type FamilyProvider, type JoinRoomIO, type LeaveRoomIO, type MutableFamilyProvider, type MutableProvider, ParentSocket, type RealtimeContinuitySynchronizer, type RoomArguments, type ServerConfig, type Socket, type StateProvider, type StateReceiver, type StringifiedEvent, SubjectSocket, actionOcclusionAtoms, createRoomTX, destroyRoomTX, joinRoomTX, leaveRoomTX, realtimeActionReceiver, realtimeAtomFamilyProvider, realtimeContinuitySynchronizer, realtimeMutableFamilyProvider, realtimeMutableProvider, realtimeStateProvider, realtimeStateReceiver, redactTransactionUpdateContent, roomArgumentsAtoms, roomSelectors, socketAtoms, socketIndex, userIndex, userUnacknowledgedQueues, usersOfSockets };
+export { type ActionReceiver, ChildSocket, type CreateRoomIO, CustomSocket, type EventBuffer, type Events, type FamilyProvider, type JoinRoomIO, type LeaveRoomIO, type MutableFamilyProvider, type MutableProvider, ParentSocket, type RealtimeContinuitySynchronizer, type RoomArguments, type RoomKey, type ServerConfig, type Socket, type SocketKey, type SocketSystemHierarchy, type StateProvider, type StateReceiver, type StringifiedEvent, SubjectSocket, type UserKey, actionOcclusionAtoms, createRoomTX, destroyRoomTX, joinRoomTX, leaveRoomTX, realtimeActionReceiver, realtimeAtomFamilyProvider, realtimeContinuitySynchronizer, realtimeMutableFamilyProvider, realtimeMutableProvider, realtimeStateProvider, realtimeStateReceiver, redactTransactionUpdateContent, roomArgumentsAtoms, roomSelectors, socketAtoms, socketIndex, userIndex, userUnacknowledgedQueues, usersOfSockets };

package/realtime-server/dist/index.js

@@ -468,7 +468,9 @@ var userIndex = atom({
 var usersOfSockets = join({
   key: `usersOfSockets`,
   between: [`user`, `socket`],
-  cardinality: `1:1`
+  cardinality: `1:1`,
+  isAType: (s) => s.startsWith(`user::`),
+  isBType: (s) => s.startsWith(`socket::`)
 });
 
 // realtime-server/src/realtime-continuity-synchronizer.ts
@@ -481,7 +483,7 @@ function realtimeContinuitySynchronizer({
     const continuityKey = continuity.key;
     const userKeyState = findRelationsInStore(
       usersOfSockets,
-      socket.id,
+      `socket::${socket.id}`,
       store
     ).userKeyOfSocket;
     const userKey = getFromStore(store, userKeyState);

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

@@ -15,7 +15,7 @@ import {
 import type { Json, JsonIO } from "atom.io/json"
 import type { ContinuityToken } from "atom.io/realtime"
 
-import type { ServerConfig, Socket } from "."
+import type { ServerConfig, Socket, SocketKey } from "."
 import { socketAtoms, usersOfSockets } from "."
 import {
 	redactTransactionUpdateContent,
@@ -35,7 +35,7 @@ export function realtimeContinuitySynchronizer({
 		const continuityKey = continuity.key
 		const userKeyState = findRelationsInStore(
 			usersOfSockets,
-			socket.id,
+			`socket::${socket.id}`,
 			store,
 		).userKeyOfSocket
 		const userKey = getFromStore(store, userKeyState)

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

@@ -1,3 +1,4 @@
+import type { Hierarchy } from "atom.io"
 import { atom, atomFamily } from "atom.io"
 import { join } from "atom.io/data"
 import type { SetRTXJson } from "atom.io/transceivers/set-rtx"
@@ -5,22 +6,35 @@ import { SetRTX } from "atom.io/transceivers/set-rtx"
 
 import type { Socket } from ".."
 
-export const socketAtoms = atomFamily<Socket | null, string>({
+export type SocketKey = `socket::${string}`
+export type UserKey = `user::${string}`
+export type RoomKey = `room::${string}`
+
+export type SocketSystemHierarchy = Hierarchy<
+	[
+		{
+			above: `root`
+			below: [UserKey, SocketKey, RoomKey]
+		},
+	]
+>
+
+export const socketAtoms = atomFamily<Socket | null, SocketKey>({
 	key: `sockets`,
 	default: null,
 })
 
-export const socketIndex = atom<SetRTX<string>, SetRTXJson<string>>({
+export const socketIndex = atom<SetRTX<SocketKey>, SetRTXJson<SocketKey>>({
 	key: `socketsIndex`,
 	mutable: true,
-	default: () => new SetRTX<string>(),
+	default: () => new SetRTX(),
 	toJson: (set) => set.toJSON(),
 	fromJson: (json) => SetRTX.fromJSON(json),
 })
-export const userIndex = atom<SetRTX<string>, SetRTXJson<string>>({
+export const userIndex = atom<SetRTX<UserKey>, SetRTXJson<UserKey>>({
 	key: `usersIndex`,
 	mutable: true,
-	default: () => new SetRTX<string>(),
+	default: () => new SetRTX(),
 	toJson: (set) => set.toJSON(),
 	fromJson: (json) => SetRTX.fromJSON(json),
 })
@@ -28,4 +42,6 @@ export const usersOfSockets = join({
 	key: `usersOfSockets`,
 	between: [`user`, `socket`],
 	cardinality: `1:1`,
+	isAType: (s): s is UserKey => s.startsWith(`user::`),
+	isBType: (s): s is SocketKey => s.startsWith(`socket::`),
 })

package/realtime-testing/dist/index.d.ts

@@ -6,6 +6,9 @@ import { Socket } from 'socket.io-client';
 
 type TestSetupOptions = {
     port: number;
+    immortal?: {
+        server?: boolean;
+    };
     server: (tools: {
         socket: SocketIO.Socket;
         silo: AtomIO.Silo;

package/realtime-testing/dist/index.js

@@ -2,6 +2,7 @@ import '../../dist/chunk-XWL6SNVU.js';
 import * as http from 'node:http';
 import { render, prettyDOM } from '@testing-library/react';
 import * as AtomIO from 'atom.io';
+import { realm } from 'atom.io';
 import { editRelationsInStore, findRelationsInStore } from 'atom.io/data';
 import { IMPLICIT, findInStore, setIntoStore, getFromStore, clearStore } from 'atom.io/internal';
 import { toEntries } from 'atom.io/json';
@@ -32,9 +33,13 @@ function prefixLogger(store, prefix) {
 var setupRealtimeTestServer = (options) => {
   ++testNumber;
   const silo = new AtomIO.Silo(
-    { name: `SERVER-${testNumber}`, lifespan: `ephemeral` },
+    {
+      name: `SERVER-${testNumber}`,
+      lifespan: options.immortal?.server ? `immortal` : `ephemeral`
+    },
     IMPLICIT.STORE
   );
+  const socketRealm = realm(silo.store);
   const httpServer = http.createServer((_, res) => res.end(`Hello World!`));
   const address = httpServer.listen(options.port).address();
   const port = typeof address === `string` ? null : address === null ? null : address.port;
@@ -42,17 +47,23 @@ 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(silo.store, RTS.socketAtoms, socket.id);
+      const userClaim = socketRealm.allocate(`root`, `user::${username}`);
+      const socketClaim = socketRealm.allocate(`root`, `socket::${socket.id}`);
+      const socketState = findInStore(silo.store, RTS.socketAtoms, socketClaim);
       setIntoStore(silo.store, socketState, socket);
       editRelationsInStore(
         RTS.usersOfSockets,
         (relations) => {
-          relations.set(socket.id, username);
+          relations.set(userClaim, socketClaim);
         },
         silo.store
       );
-      setIntoStore(silo.store, RTS.userIndex, (index) => index.add(username));
-      setIntoStore(silo.store, RTS.socketIndex, (index) => index.add(socket.id));
+      setIntoStore(silo.store, RTS.userIndex, (index) => index.add(userClaim));
+      setIntoStore(
+        silo.store,
+        RTS.socketIndex,
+        (index) => index.add(socketClaim)
+      );
       console.log(`${username} connected on ${socket.id}`);
       next();
     } else {
@@ -64,7 +75,7 @@ var setupRealtimeTestServer = (options) => {
     function enableLogging() {
       const userKeyState = findRelationsInStore(
         RTS.usersOfSockets,
-        socket.id,
+        `socket::${socket.id}`,
         silo.store
       ).userKeyOfSocket;
       userKey = getFromStore(silo.store, userKeyState);

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

@@ -3,6 +3,7 @@ import * as http from "node:http"
 import type { RenderResult } from "@testing-library/react"
 import { prettyDOM, render } from "@testing-library/react"
 import * as AtomIO from "atom.io"
+import { realm } from "atom.io"
 import { editRelationsInStore, findRelationsInStore } from "atom.io/data"
 import type { Store } from "atom.io/internal"
 import {
@@ -44,6 +45,7 @@ function prefixLogger(store: Store, prefix: string) {
 
 export type TestSetupOptions = {
 	port: number
+	immortal?: { server?: boolean }
 	server: (tools: {
 		socket: SocketIO.Socket
 		silo: AtomIO.Silo
@@ -97,9 +99,13 @@ export const setupRealtimeTestServer = (
 ): RealtimeTestServer => {
 	++testNumber
 	const silo = new AtomIO.Silo(
-		{ name: `SERVER-${testNumber}`, lifespan: `ephemeral` },
+		{
+			name: `SERVER-${testNumber}`,
+			lifespan: options.immortal?.server ? `immortal` : `ephemeral`,
+		},
 		IMPLICIT.STORE,
 	)
+	const socketRealm = realm<RTS.SocketSystemHierarchy>(silo.store)
 
 	const httpServer = http.createServer((_, res) => res.end(`Hello World!`))
 	const address = httpServer.listen(options.port).address()
@@ -110,17 +116,21 @@ 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(silo.store, RTS.socketAtoms, socket.id)
+			const userClaim = socketRealm.allocate(`root`, `user::${username}`)
+			const socketClaim = socketRealm.allocate(`root`, `socket::${socket.id}`)
+			const socketState = findInStore(silo.store, RTS.socketAtoms, socketClaim)
 			setIntoStore(silo.store, socketState, socket)
 			editRelationsInStore(
 				RTS.usersOfSockets,
 				(relations) => {
-					relations.set(socket.id, username)
+					relations.set(userClaim, socketClaim)
 				},
 				silo.store,
 			)
-			setIntoStore(silo.store, RTS.userIndex, (index) => index.add(username))
-			setIntoStore(silo.store, RTS.socketIndex, (index) => index.add(socket.id))
+			setIntoStore(silo.store, RTS.userIndex, (index) => index.add(userClaim))
+			setIntoStore(silo.store, RTS.socketIndex, (index) =>
+				index.add(socketClaim),
+			)
 			console.log(`${username} connected on ${socket.id}`)
 			next()
 		} else {
@@ -133,7 +143,7 @@ export const setupRealtimeTestServer = (
 		function enableLogging() {
 			const userKeyState = findRelationsInStore(
 				RTS.usersOfSockets,
-				socket.id,
+				`socket::${socket.id}`,
 				silo.store,
 			).userKeyOfSocket
 			userKey = getFromStore(silo.store, userKeyState)

package/src/allocate.ts

@@ -29,7 +29,6 @@ export function allocateIntoStore<
 	A extends Above<V, H>,
 >(store: Store, provenance: A, key: V): Claim<H, V, A> {
 	const stringKey = stringifyJson(key)
-
 	try {
 		const above: Molecule<any>[] = []
 
@@ -38,7 +37,7 @@ export function allocateIntoStore<
 			// biome-ignore lint/style/noNonNullAssertion: let's assume we made the root molecule to get here
 			above.push(store.molecules.get(`"root"`)!)
 			allocationAttachmentStyle = `all`
-		} else if (provenance[0][0] === T$) {
+		} else if (typeof provenance === `string` && provenance.startsWith(T$)) {
 			allocationAttachmentStyle = `any`
 			const provenanceKey = stringifyJson(provenance as Canonical)
 			const provenanceMolecule = store.molecules.get(provenanceKey)
@@ -49,7 +48,7 @@ export function allocateIntoStore<
 			}
 			above.push(provenanceMolecule)
 		} else {
-			const allocationIsCompound = key[0][0] === T$
+			const allocationIsCompound = key.startsWith(`T$--`)
 			if (allocationIsCompound) {
 				allocationAttachmentStyle = `all`
 				for (const claim of provenance as SingularTypedKey[]) {
@@ -150,11 +149,11 @@ export function deallocateFromStore<
 	}
 	for (const child of molecule.below.values()) {
 		if (child.dependsOn === `all`) {
-			deallocateFromStore(store, child.key)
+			deallocateFromStore<any, any, any>(store, child.key)
 		} else {
 			child.above.delete(molecule.stringKey)
 			if (child.above.size === 0) {
-				deallocateFromStore(store, child.key)
+				deallocateFromStore<any, any, any>(store, child.key)
 			}
 		}
 	}
@@ -203,13 +202,13 @@ export function realm<H extends Hierarchy>(store: Store) {
 
 export const T$ = `T$`
 export type T$ = typeof T$
-export type TypeTag<T extends string> = [T$, T]
-export type SingularTypedKey<T extends string = string> = [T, string]
+export type TypeTag<T extends string> = `${T$}--${T}`
+export type SingularTypedKey<T extends string = string> = `${T}::${string}`
 export type CompoundTypedKey<
 	A extends string = string,
 	B extends string = string,
 	C extends string = string,
-> = [TypeTag<A>, TypedKey<B>, TypedKey<C>]
+> = `${TypeTag<A>}==${SingularTypedKey<B>}++${SingularTypedKey<C>}`
 export type TypedKey<
 	A extends string = string,
 	B extends string = string,

package/src/index.ts

@@ -7,6 +7,7 @@ import type {
 	WritableSelectorFamilyToken,
 } from "./selector"
 
+export * from "./allocate"
 export * from "./atom"
 export * from "./dispose-state"
 export * from "./get-state"

package/src/molecule.ts

@@ -38,12 +38,14 @@ export type CtorToolkit<K extends Canonical> = Flat<
 		bond<T>(family: ReadonlySelectorFamilyToken<T, K>): ReadonlySelectorToken<T>
 		bond<T>(family: WritableFamilyToken<T, K>): WritableToken<T>
 		bond<T>(family: ReadableFamilyToken<T, K>): ReadableToken<T>
-		bond<J extends JoinToken<any, any, any, any>>(
+		bond<J extends JoinToken<any, any, any, any, any, any>>(
 			joinToken: J,
 			role: {
-				as: J extends JoinToken<infer A, infer B, any, any> ? A | B : never
+				as: J extends JoinToken<infer A, string, infer B, string, any, any>
+					? A | B
+					: never
 			},
-		): J extends JoinToken<any, any, any, infer Content>
+		): J extends JoinToken<any, any, any, any, any, infer Content>
 			? Content extends null
 				? { relatedKeys: ReadonlySelectorToken<string[]> }
 				: {

package/dist/chunk-ZKG6ZA4I.js

@@ -1,20 +0,0 @@
-import { createMoleculeFamily, IMPLICIT, makeMoleculeInStore, Molecule } from 'atom.io/internal';
-import { stringifyJson } from 'atom.io/json';
-
-// src/molecule.ts
-function moleculeFamily(options) {
-  return createMoleculeFamily(IMPLICIT.STORE, options);
-}
-function makeMolecule(context, family, key, ...params) {
-  return makeMoleculeInStore(IMPLICIT.STORE, context, family, key, ...params);
-}
-function makeRootMoleculeInStore(key, store = IMPLICIT.STORE) {
-  const molecule = new Molecule(void 0, key);
-  store.molecules.set(stringifyJson(key), molecule);
-  return {
-    key,
-    type: `molecule`
-  };
-}
-
-export { makeMolecule, makeRootMoleculeInStore, moleculeFamily };