atom.io 0.21.1 → 0.22.0

package/realtime-server/dist/index.cjs

@@ -406,12 +406,12 @@ function findRelationsInStore(token, key, store) {
       relations = {
         get [keyAB]() {
           const familyAB = myJoin.states[keyAB];
-          const state = internal.findInStore(familyAB, key, store);
+          const state = myJoin.retrieve(familyAB, key);
           return state;
         },
         get [keyBA]() {
           const familyBA = myJoin.states[keyBA];
-          const state = internal.findInStore(familyBA, key, store);
+          const state = myJoin.retrieve(familyBA, key);
           return state;
         }
       };
@@ -421,12 +421,12 @@ function findRelationsInStore(token, key, store) {
         Object.assign(relations, {
           get [entryAB]() {
             const familyAB = myJoin.states[entryAB];
-            const state = internal.findInStore(familyAB, key, store);
+            const state = myJoin.retrieve(familyAB, key);
             return state;
           },
           get [entryBA]() {
             const familyBA = myJoin.states[entryBA];
-            const state = internal.findInStore(familyBA, key, store);
+            const state = myJoin.retrieve(familyBA, key);
             return state;
           }
         });
@@ -439,12 +439,12 @@ function findRelationsInStore(token, key, store) {
       relations = {
         get [keyAB]() {
           const familyAB = myJoin.states[keyAB];
-          const state = internal.findInStore(familyAB, key, store);
+          const state = myJoin.retrieve(familyAB, key);
           return state;
         },
         get [keysBA]() {
           const familyBA = myJoin.states[keysBA];
-          const state = internal.findInStore(familyBA, key, store);
+          const state = myJoin.retrieve(familyBA, key);
           return state;
         }
       };
@@ -454,12 +454,12 @@ function findRelationsInStore(token, key, store) {
         Object.assign(relations, {
           get [entryAB]() {
             const familyAB = myJoin.states[entryAB];
-            const state = internal.findInStore(familyAB, key, store);
+            const state = myJoin.retrieve(familyAB, key);
             return state;
           },
           get [entriesBA]() {
             const familyBA = myJoin.states[entriesBA];
-            const state = internal.findInStore(familyBA, key, store);
+            const state = myJoin.retrieve(familyBA, key);
             return state;
           }
         });
@@ -472,12 +472,12 @@ function findRelationsInStore(token, key, store) {
       relations = {
         get [keysAB]() {
           const familyAB = myJoin.states[keysAB];
-          const state = internal.findInStore(familyAB, key, store);
+          const state = myJoin.retrieve(familyAB, key);
           return state;
         },
         get [keysBA]() {
           const familyBA = myJoin.states[keysBA];
-          const state = internal.findInStore(familyBA, key, store);
+          const state = myJoin.retrieve(familyBA, key);
           return state;
         }
       };
@@ -487,12 +487,12 @@ function findRelationsInStore(token, key, store) {
         Object.assign(relations, {
           get [entriesAB]() {
             const familyAB = myJoin.states[entriesAB];
-            const state = internal.findInStore(familyAB, key, store);
+            const state = myJoin.retrieve(familyAB, key);
             return state;
           },
           get [entriesBA]() {
             const familyBA = myJoin.states[entriesBA];
-            const state = internal.findInStore(familyBA, key, store);
+            const state = myJoin.retrieve(familyBA, key);
             return state;
           }
         });
@@ -767,7 +767,7 @@ function realtimeContinuitySynchronizer({
               (token) => !newKeys.includes(token.key)
             );
             const revealed = newValue.filter((token) => !oldKeys.includes(token.key)).flatMap((token) => {
-              const resourceToken = token.type === `mutable_atom` ? internal.getJsonToken(token) : token;
+              const resourceToken = token.type === `mutable_atom` ? internal.getJsonToken(token, store) : token;
               const resource = internal.getFromStore(resourceToken, store);
               return [resourceToken, resource];
             });
@@ -800,7 +800,7 @@ function realtimeContinuitySynchronizer({
       var _a;
       const initialPayload = [];
       for (const atom2 of continuity.globals) {
-        const resourceToken = atom2.type === `mutable_atom` ? internal.getJsonToken(atom2) : atom2;
+        const resourceToken = atom2.type === `mutable_atom` ? internal.getJsonToken(atom2, store) : atom2;
         initialPayload.push(resourceToken, internal.getFromStore(atom2, store));
       }
       for (const perspective of continuity.perspectives) {
@@ -813,7 +813,7 @@ function realtimeContinuitySynchronizer({
           userView
         });
         for (const visibleToken of userView) {
-          const resourceToken = visibleToken.type === `mutable_atom` ? internal.getJsonToken(visibleToken) : visibleToken;
+          const resourceToken = visibleToken.type === `mutable_atom` ? internal.getJsonToken(visibleToken, store) : visibleToken;
           const resource = internal.getFromStore(resourceToken, store);
           initialPayload.push(resourceToken, resource);
         }
@@ -1003,7 +1003,8 @@ function realtimeMutableFamilyProvider({
       for (const exposedSubKey of exposedSubKeys) {
         if (json.stringifyJson(exposedSubKey) === json.stringifyJson(subKey)) {
           const token = internal.findInStore(family, subKey, store);
-          const jsonToken = internal.getJsonToken(token);
+          internal.getFromStore(token, store);
+          const jsonToken = internal.getJsonToken(token, store);
           const updateToken = internal.getUpdateToken(token);
           socket.emit(`init:${token.key}`, internal.getFromStore(jsonToken, store));
           const unsubscribe = internal.subscribeToState(
@@ -1038,7 +1039,7 @@ function realtimeMutableProvider({
 }) {
   return function mutableProvider(token) {
     let unsubscribeFromStateUpdates = null;
-    const jsonToken = internal.getJsonToken(token);
+    const jsonToken = internal.getJsonToken(token, store);
     const trackerToken = internal.getUpdateToken(token);
     const fillUnsubRequest = () => {
       socket.off(`unsub:${token.key}`, fillUnsubRequest);

package/realtime-server/dist/index.js

@@ -1,4 +1,4 @@
-import { findRelationsInStore } from '../../dist/chunk-HITX3MO4.js';
+import { findRelationsInStore } from '../../dist/chunk-JA4V7TJY.js';
 import '../../dist/chunk-FTONNX2R.js';
 import { __spreadProps, __spreadValues } from '../../dist/chunk-F2X4B4VY.js';
 import { parseJson, stringifyJson } from 'atom.io/json';
@@ -597,7 +597,7 @@ 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) : token;
+              const resourceToken = token.type === `mutable_atom` ? getJsonToken(token, store) : token;
               const resource = getFromStore(resourceToken, store);
               return [resourceToken, resource];
             });
@@ -630,7 +630,7 @@ function realtimeContinuitySynchronizer({
       var _a;
       const initialPayload = [];
       for (const atom2 of continuity.globals) {
-        const resourceToken = atom2.type === `mutable_atom` ? getJsonToken(atom2) : atom2;
+        const resourceToken = atom2.type === `mutable_atom` ? getJsonToken(atom2, store) : atom2;
         initialPayload.push(resourceToken, getFromStore(atom2, store));
       }
       for (const perspective of continuity.perspectives) {
@@ -643,7 +643,7 @@ function realtimeContinuitySynchronizer({
           userView
         });
         for (const visibleToken of userView) {
-          const resourceToken = visibleToken.type === `mutable_atom` ? getJsonToken(visibleToken) : visibleToken;
+          const resourceToken = visibleToken.type === `mutable_atom` ? getJsonToken(visibleToken, store) : visibleToken;
           const resource = getFromStore(resourceToken, store);
           initialPayload.push(resourceToken, resource);
         }
@@ -833,7 +833,8 @@ function realtimeMutableFamilyProvider({
       for (const exposedSubKey of exposedSubKeys) {
         if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
           const token = findInStore(family, subKey, store);
-          const jsonToken = getJsonToken(token);
+          getFromStore(token, store);
+          const jsonToken = getJsonToken(token, store);
           const updateToken = getUpdateToken(token);
           socket.emit(`init:${token.key}`, getFromStore(jsonToken, store));
           const unsubscribe = subscribeToState(
@@ -868,7 +869,7 @@ function realtimeMutableProvider({
 }) {
   return function mutableProvider(token) {
     let unsubscribeFromStateUpdates = null;
-    const jsonToken = getJsonToken(token);
+    const jsonToken = getJsonToken(token, store);
     const trackerToken = getUpdateToken(token);
     const fillUnsubRequest = () => {
       socket.off(`unsub:${token.key}`, fillUnsubRequest);

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

@@ -106,7 +106,9 @@ export function realtimeContinuitySynchronizer({
 							.filter((token) => !oldKeys.includes(token.key))
 							.flatMap((token) => {
 								const resourceToken =
-									token.type === `mutable_atom` ? getJsonToken(token) : token
+									token.type === `mutable_atom`
+										? getJsonToken(token, store)
+										: token
 								const resource = getFromStore(resourceToken, store)
 								return [resourceToken, resource]
 							})
@@ -139,7 +141,7 @@ export function realtimeContinuitySynchronizer({
 			const initialPayload: Json.Serializable[] = []
 			for (const atom of continuity.globals) {
 				const resourceToken =
-					atom.type === `mutable_atom` ? getJsonToken(atom) : atom
+					atom.type === `mutable_atom` ? getJsonToken(atom, store) : atom
 				initialPayload.push(resourceToken, getFromStore(atom, store))
 			}
 			for (const perspective of continuity.perspectives) {
@@ -154,7 +156,7 @@ export function realtimeContinuitySynchronizer({
 				for (const visibleToken of userView) {
 					const resourceToken =
 						visibleToken.type === `mutable_atom`
-							? getJsonToken(visibleToken)
+							? getJsonToken(visibleToken, store)
 							: visibleToken
 					const resource = getFromStore(resourceToken, store)
 

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

@@ -44,7 +44,8 @@ export function realtimeMutableFamilyProvider({
 			for (const exposedSubKey of exposedSubKeys) {
 				if (stringifyJson(exposedSubKey) === stringifyJson(subKey)) {
 					const token = findInStore(family, subKey, store)
-					const jsonToken = getJsonToken(token)
+					getFromStore(token, store)
+					const jsonToken = getJsonToken(token, store)
 					const updateToken = getUpdateToken(token)
 					socket.emit(`init:${token.key}`, getFromStore(jsonToken, store))
 					const unsubscribe = subscribeToState(

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)
+		const jsonToken = getJsonToken(token, store)
 		const trackerToken = getUpdateToken(token)
 
 		const fillUnsubRequest = () => {

package/realtime-testing/dist/index.cjs

@@ -11,6 +11,7 @@ var RTS = require('atom.io/realtime-server');
 var Happy = require('happy-dom');
 var SocketIO = require('socket.io');
 var socket_ioClient = require('socket.io-client');
+require('atom.io/json');
 require('atom.io/transceivers/set-rtx');
 var jsxRuntime = require('react/jsx-runtime');
 
@@ -143,7 +144,10 @@ AtomIO__namespace.atom(
 var testNumber = 0;
 var setupRealtimeTestServer = (options) => {
   ++testNumber;
-  const silo = new AtomIO__namespace.Silo(`SERVER-${testNumber}`, internal.IMPLICIT.STORE);
+  const silo = new AtomIO__namespace.Silo(
+    { name: `SERVER-${testNumber}`, lifespan: `ephemeral` },
+    internal.IMPLICIT.STORE
+  );
   const httpServer = http__namespace.createServer((_, res) => res.end(`Hello World!`));
   const address = httpServer.listen(options.port).address();
   const port = typeof address === `string` ? null : address === null ? null : address.port;
@@ -198,7 +202,7 @@ var setupRealtimeTestClient = (options, name, port) => {
     const socket = socket_ioClient.io(`http://localhost:${port}/`, {
       auth: { token: `test`, username: `${name}-${testNumber}` }
     });
-    const silo = new AtomIO__namespace.Silo(name, internal.IMPLICIT.STORE);
+    const silo = new AtomIO__namespace.Silo({ name, lifespan: `ephemeral` }, internal.IMPLICIT.STORE);
     for (const [key, value] of silo.store.valueMap.entries()) {
       if (Array.isArray(value)) {
         silo.store.valueMap.set(key, [...value]);

package/realtime-testing/dist/index.js

@@ -1,8 +1,8 @@
-import { myUsernameState } from '../../dist/chunk-O47EQUM6.js';
-import { editRelationsInStore } from '../../dist/chunk-HITX3MO4.js';
-import '../../dist/chunk-FTONNX2R.js';
 import { recordToEntries } from '../../dist/chunk-3V3VWQ7X.js';
+import { myUsernameState } from '../../dist/chunk-O47EQUM6.js';
 import '../../dist/chunk-BWWVY5O5.js';
+import { editRelationsInStore } from '../../dist/chunk-JA4V7TJY.js';
+import '../../dist/chunk-FTONNX2R.js';
 import { __spreadProps, __spreadValues } from '../../dist/chunk-F2X4B4VY.js';
 import * as http from 'http';
 import { render, prettyDOM } from '@testing-library/react';
@@ -20,7 +20,10 @@ import { jsx } from 'react/jsx-runtime';
 var testNumber = 0;
 var setupRealtimeTestServer = (options) => {
   ++testNumber;
-  const silo = new AtomIO.Silo(`SERVER-${testNumber}`, IMPLICIT.STORE);
+  const silo = new AtomIO.Silo(
+    { name: `SERVER-${testNumber}`, lifespan: `ephemeral` },
+    IMPLICIT.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;
@@ -75,7 +78,7 @@ var setupRealtimeTestClient = (options, name, port) => {
     const socket = io(`http://localhost:${port}/`, {
       auth: { token: `test`, username: `${name}-${testNumber}` }
     });
-    const silo = new AtomIO.Silo(name, IMPLICIT.STORE);
+    const silo = new AtomIO.Silo({ name, lifespan: `ephemeral` }, IMPLICIT.STORE);
     for (const [key, value] of silo.store.valueMap.entries()) {
       if (Array.isArray(value)) {
         silo.store.valueMap.set(key, [...value]);

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

@@ -76,7 +76,10 @@ export const setupRealtimeTestServer = (
 	options: TestSetupOptions,
 ): RealtimeTestServer => {
 	++testNumber
-	const silo = new AtomIO.Silo(`SERVER-${testNumber}`, IMPLICIT.STORE)
+	const silo = new AtomIO.Silo(
+		{ name: `SERVER-${testNumber}`, lifespan: `ephemeral` },
+		IMPLICIT.STORE,
+	)
 
 	const httpServer = http.createServer((_, res) => res.end(`Hello World!`))
 	const address = httpServer.listen(options.port).address()
@@ -139,7 +142,7 @@ export const setupRealtimeTestClient = (
 		const socket: ClientSocket = io(`http://localhost:${port}/`, {
 			auth: { token: `test`, username: `${name}-${testNumber}` },
 		})
-		const silo = new AtomIO.Silo(name, IMPLICIT.STORE)
+		const silo = new AtomIO.Silo({ name, lifespan: `ephemeral` }, IMPLICIT.STORE)
 		for (const [key, value] of silo.store.valueMap.entries()) {
 			if (Array.isArray(value)) {
 				silo.store.valueMap.set(key, [...value])

package/src/atom.ts

@@ -57,8 +57,11 @@ export type RegularAtomFamilyTokenWithCall<
 	K extends Json.Serializable,
 > = 
 	& RegularAtomFamilyToken<T, K>
-	& /** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
-((key: K) => RegularAtomToken<T>)
+	& {
+		/** @deprecated In ephemeral stores, prefer the `findState`, `findInStore`, or `find` functions. In immortal stores, prefer the `seekState`, `seekInStore`, or `seek` functions. */
+		/* eslint-disable-next-line @typescript-eslint/prefer-function-type */
+		(key: K): RegularAtomToken<T>
+	}
 // biome-ignore format: intersection
 export type RegularAtomFamily<T, K extends Json.Serializable> = 
 	& RegularAtomFamilyToken<T, K>
@@ -100,8 +103,11 @@ export type MutableAtomFamilyTokenWithCall<
 	K extends Json.Serializable,
 > = 
 	& MutableAtomFamilyToken<T, J, K>
-	& /** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
-((key: K) => MutableAtomToken<T, J>)
+	& {
+		/** @deprecated In ephemeral stores, prefer the `findState`, `findInStore`, or `find` functions. In immortal stores, prefer the `seekState`, `seekInStore`, or `seek` functions. */
+		/* eslint-disable-next-line @typescript-eslint/prefer-function-type */	
+		(key: K): MutableAtomToken<T, J>
+	}
 // biome-ignore format: intersection
 export type MutableAtomFamily<
 	T extends Transceiver<any>,

package/src/index.ts

@@ -10,8 +10,7 @@ import type {
 } from "./selector"
 
 export * from "./atom"
-export * from "./dispose"
-export * from "./find-state"
+export * from "./dispose-state"
 export * from "./get-state"
 export * from "./logger"
 export * from "./selector"

package/src/selector.ts

@@ -53,8 +53,11 @@ export type WritableSelectorFamilyTokenWithCall<
 	K extends Json.Serializable,
 > = 
 	& WritableSelectorFamilyToken<T, K>
-	& /** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
-((key: K) => WritableSelectorToken<T>)
+	& {
+		/** @deprecated In ephemeral stores, prefer the `findState`, `findInStore`, or `find` functions. In immortal stores, prefer the `seekState`, `seekInStore`, or `seek` functions. */
+		/* eslint-disable-next-line @typescript-eslint/prefer-function-type */
+		(key: K): WritableSelectorToken<T>
+	}
 // biome-ignore format: intersection
 export type WritableSelectorFamily<T, K extends Json.Serializable> = 
 	& WritableSelectorFamilyToken<T, K> 
@@ -76,8 +79,11 @@ export type ReadonlySelectorFamilyTokenWithCall<
 	K extends Json.Serializable,
 > = 
 	& ReadonlySelectorFamilyToken<T, K>
-	& /** @deprecated Prefer the `findState`, `findInStore`, or `find` functions. */
-((key: K) => ReadonlySelectorToken<T>)
+	& {
+		/** @deprecated In ephemeral stores, prefer the `findState`, `findInStore`, or `find` functions. In immortal stores, prefer the `seekState`, `seekInStore`, or `seek` functions. */
+		/* eslint-disable-next-line @typescript-eslint/prefer-function-type */
+		(key: K): ReadonlySelectorToken<T>
+	}
 // biome-ignore format: intersection
 export type ReadonlySelectorFamily<T, K extends Json.Serializable> = 
 	& ((key: K) => ReadonlySelectorToken<T>)

package/src/silo.ts

@@ -1,3 +1,4 @@
+import type { findState } from "atom.io/ephemeral"
 import type { Transceiver } from "atom.io/internal"
 import {
 	createAtomFamily,
@@ -16,7 +17,6 @@ import type { Json } from "atom.io/json"
 
 import type {
 	AtomToken,
-	findState,
 	getState,
 	MutableAtomFamily,
 	MutableAtomFamilyOptions,
@@ -50,8 +50,8 @@ export class Silo {
 	public subscribe: typeof subscribe
 	public undo: typeof undo
 	public redo: typeof redo
-	public constructor(name: string, fromStore: Store | null = null) {
-		const s = new Store(name, fromStore)
+	public constructor(config: Store[`config`], fromStore: Store | null = null) {
+		const s = new Store(config, fromStore)
 		function _atom<T>(options: RegularAtomOptions<T>): RegularAtomToken<T>
 		function _atom<T extends Transceiver<any>, J extends Json.Serializable>(
 			options: MutableAtomOptions<T, J>,

package/src/transaction.ts

@@ -1,3 +1,4 @@
+import type { findState } from "atom.io/ephemeral"
 import type { EnvironmentData } from "atom.io/internal"
 import {
 	actUponStore,
@@ -6,8 +7,8 @@ import {
 	IMPLICIT,
 } from "atom.io/internal"
 
+import type { seekState } from "../immortal/src/seek-state"
 import type {
-	findState,
 	Func,
 	KeyedStateUpdate,
 	ReadonlySelectorToken,
@@ -40,6 +41,7 @@ export type Transactors = Readonly<{
 		newValue: New | ((oldValue: S) => New),
 	) => void
 	find: typeof findState
+	seek: typeof seekState
 }>
 export type TransactorsWithRunAndEnv = Readonly<{
 	get: <S>(state: ReadonlySelectorToken<S> | WritableToken<S>) => S
@@ -48,10 +50,11 @@ export type TransactorsWithRunAndEnv = Readonly<{
 		newValue: New | ((oldValue: S) => New),
 	) => void
 	find: typeof findState
+	seek: typeof seekState
 	run: typeof runTransaction
 	env: () => EnvironmentData
 }>
-export type ReadonlyTransactors = Pick<Transactors, `find` | `get`>
+export type ReadonlyTransactors = Pick<Transactors, `find` | `get` | `seek`>
 
 export type Read<F extends Func> = (
 	transactors: ReadonlyTransactors,

package/internal/src/store/withdraw-new-family-member.ts

@@ -1,69 +0,0 @@
-import type {
-	ReadableToken,
-	ReadonlySelectorToken,
-	RegularAtomToken,
-	WritableSelectorToken,
-	WritableToken,
-} from "atom.io"
-
-import type {
-	Atom,
-	ReadableState,
-	ReadonlySelector,
-	Store,
-	WritableSelector,
-	WritableState,
-} from ".."
-import { newest, NotFoundError, withdraw } from ".."
-
-export function withdrawOrCreate<T>(
-	token: RegularAtomToken<T>,
-	store: Store,
-): Atom<T>
-export function withdrawOrCreate<T>(
-	token: WritableSelectorToken<T>,
-	store: Store,
-): WritableSelector<T>
-export function withdrawOrCreate<T>(
-	token: ReadonlySelectorToken<T>,
-	store: Store,
-): ReadonlySelector<T>
-export function withdrawOrCreate<T>(
-	token: WritableToken<T>,
-	store: Store,
-): WritableState<T>
-export function withdrawOrCreate<T>(
-	token: ReadableToken<T>,
-	store: Store,
-): ReadableState<T>
-export function withdrawOrCreate<T>(
-	token: ReadableToken<T>,
-	store: Store,
-): ReadableState<T> {
-	try {
-		const state = withdraw(token, store)
-		return state
-	} catch (notFoundError) {
-		if (token.family) {
-			store.logger.info(
-				`👪`,
-				token.type,
-				token.key,
-				`creating new family member in store "${store.config.name}"`,
-			)
-			const target = newest(store)
-			const family = target.families.get(token.family.key)
-			if (family) {
-				const jsonSubKey = JSON.parse(token.family.subKey)
-				family(jsonSubKey)
-				const state = withdraw(token, store)
-				return state
-			}
-			throw new NotFoundError(
-				{ key: token.family.key, type: `${token.type}_family` },
-				store,
-			)
-		}
-		throw notFoundError
-	}
-}