atom.io 0.30.7 → 0.31.1

package/src/silo.ts

@@ -3,7 +3,6 @@ import {
 	actUponStore,
 	arbitrary,
 	createAtomFamily,
-	createMoleculeFamily,
 	createSelectorFamily,
 	createStandaloneAtom,
 	createStandaloneSelector,
@@ -12,18 +11,18 @@ import {
 	disposeFromStore,
 	findInStore,
 	getFromStore,
-	makeMoleculeInStore,
+	IMPLICIT,
 	setIntoStore,
 	Store,
 	subscribeInStore,
 	timeTravel,
 } from "atom.io/internal"
 
+import { installIntoStore } from "../internal/src/install-into-store"
 import type {
+	AtomIOToken,
 	disposeState,
 	getState,
-	makeMolecule,
-	moleculeFamily,
 	redo,
 	setState,
 	subscribe,
@@ -49,12 +48,11 @@ export class Silo {
 	public subscribe: typeof subscribe
 	public undo: typeof undo
 	public redo: typeof redo
-	public moleculeFamily: typeof moleculeFamily
-	public makeMolecule: typeof makeMolecule
 	public runTransaction: typeof runTransaction
+	public install: (tokens: AtomIOToken[], store?: Store) => void
+
 	public constructor(config: Store[`config`], fromStore: Store | null = null) {
-		const s = new Store(config, fromStore)
-		this.store = s
+		const s = (this.store = new Store(config, fromStore))
 		this.atom = ((options: Parameters<typeof atom>[0]) =>
 			createStandaloneAtom(s, options)) as typeof atom
 		this.atomFamily = ((options: Parameters<typeof atomFamily>[0]) =>
@@ -83,12 +81,9 @@ export class Silo {
 		this.redo = (token) => {
 			timeTravel(s, `redo`, token)
 		}
-		this.moleculeFamily = ((options: Parameters<typeof moleculeFamily>[0]) => {
-			return createMoleculeFamily(s, options)
-		}) as typeof moleculeFamily
-		this.makeMolecule = (...params: Parameters<typeof makeMolecule>) => {
-			return makeMoleculeInStore(s, ...params)
-		}
 		this.runTransaction = (token, id = arbitrary()) => actUponStore(token, id, s)
+		this.install = (tokens, source = IMPLICIT.STORE) => {
+			installIntoStore(tokens, s, source)
+		}
 	}
 }

package/src/timeline.ts

@@ -1,4 +1,3 @@
-import type { MoleculeFamilyToken } from "atom.io"
 import type {
 	Timeline,
 	TimelineAtomUpdate,
@@ -31,7 +30,7 @@ export type TimelineToken<M> = {
 
 export type TimelineOptions<ManagedAtom extends TimelineManageable> = {
 	key: string
-	scope: (ManagedAtom | MoleculeFamilyToken<any>)[]
+	scope: ManagedAtom[]
 	shouldCapture?: (
 		update: TimelineUpdate<ManagedAtom>,
 		timeline: Timeline<TimelineManageable>,
@@ -40,7 +39,7 @@ export type TimelineOptions<ManagedAtom extends TimelineManageable> = {
 
 export type TimelineUpdate<ManagedAtom extends TimelineManageable> =
 	| TimelineAtomUpdate<ManagedAtom>
-	| TimelineMoleculeCreation<any>
+	| TimelineMoleculeCreation
 	| TimelineMoleculeDisposal
 	| TimelineSelectorUpdate<ManagedAtom>
 	| TimelineStateCreation<AtomOnly<ManagedAtom>>

package/src/transaction.ts

@@ -1,12 +1,4 @@
-import type {
-	getState,
-	makeMolecule,
-	MoleculeConstructor,
-	MoleculeFamilyToken,
-	MoleculeParams,
-	MoleculeToken,
-	setState,
-} from "atom.io"
+import type { getState, setState } from "atom.io"
 import type { findState } from "atom.io/ephemeral"
 import type { seekState } from "atom.io/immortal"
 import type { EnvironmentData, Func, Transceiver } from "atom.io/internal"
@@ -16,7 +8,7 @@ import {
 	createTransaction,
 	IMPLICIT,
 } from "atom.io/internal"
-import type { Canonical, Json } from "atom.io/json"
+import type { Canonical, Json, stringified } from "atom.io/json"
 
 import type {
 	disposeState,
@@ -37,50 +29,46 @@ export type StateCreation<Token extends ReadableToken<any>> = {
 	type: `state_creation`
 	token: Token
 }
-export type StateDisposal<Token extends ReadableToken<any>> = {
+export type AtomDisposal<Token extends ReadableToken<any>> = {
 	type: `state_disposal`
+	subType: `atom`
 	token: Token
-	value?: TokenType<Token>
+	value: TokenType<Token>
 }
-
-export type MoleculeCreationClassic<M extends MoleculeConstructor> = {
-	type: `molecule_creation`
-	subType: `classic`
-	token: MoleculeToken<M>
-	family: MoleculeFamilyToken<M>
-	context: MoleculeToken<any>[]
-	params: MoleculeParams<M>
+export type SelectorDisposal<Token extends ReadableToken<any>> = {
+	type: `state_disposal`
+	subType: `selector`
+	token: Token
 }
-export type MoleculeCreationModern = {
+export type StateDisposal<Token extends ReadableToken<any>> =
+	| AtomDisposal<Token>
+	| SelectorDisposal<Token>
+
+export type MoleculeCreation = {
 	type: `molecule_creation`
-	subType: `modern`
 	key: Canonical
 	provenance: Canonical
 }
-export type MoleculeCreation<M extends MoleculeConstructor> =
-	| MoleculeCreationClassic<M>
-	| MoleculeCreationModern
-export type MoleculeDisposalClassic = {
+
+export type MoleculeDisposal = {
 	type: `molecule_disposal`
-	subType: `classic`
-	token: MoleculeToken<any>
-	family: MoleculeFamilyToken<any>
-	context: MoleculeToken<any>[]
+	key: Canonical
+	provenance: stringified<Canonical>[]
 	values: [key: string, value: any][]
 }
-export type MoleculeDisposalModern = {
-	type: `molecule_disposal`
-	subType: `modern`
+
+export type MoleculeTransfer = {
+	type: `molecule_transfer`
 	key: Canonical
-	provenance: Canonical
-	values: [key: string, value: any][]
+	from: Canonical[]
+	to: Canonical[]
 }
-export type MoleculeDisposal = MoleculeDisposalClassic | MoleculeDisposalModern
 
 export type TransactionUpdateContent =
 	| KeyedStateUpdate<unknown>
-	| MoleculeCreation<any>
+	| MoleculeCreation
 	| MoleculeDisposal
+	| MoleculeTransfer
 	| StateCreation<ReadableToken<unknown>>
 	| StateDisposal<ReadableToken<unknown>>
 	| TransactionUpdate<Func>
@@ -113,7 +101,6 @@ export type ActorToolkit = Readonly<{
 	json: <T extends Transceiver<any>, J extends Json.Serializable>(
 		state: MutableAtomToken<T, J>,
 	) => WritableSelectorToken<J>
-	make: typeof makeMolecule
 	dispose: typeof disposeState
 	run: typeof runTransaction
 	env: () => EnvironmentData

package/transceivers/set-rtx/dist/index.js

@@ -85,7 +85,10 @@ var SetRTX = class _SetRTX extends Set {
         this.emit(`tx:${this.transactionUpdates.join(`;`)}`);
       }
     } catch (thrown) {
-      console.error(`Failed to apply transaction to SetRTX:`, thrown);
+      console.warn(
+        `Did not apply transaction to SetRTX; this error was thrown:`,
+        thrown
+      );
       throw thrown;
     } finally {
       unsubscribe();

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

@@ -111,7 +111,10 @@ export class SetRTX<P extends primitive>
 			}
 		} catch (thrown) {
 			/* eslint-disable-next-line no-console */
-			console.error(`Failed to apply transaction to SetRTX:`, thrown)
+			console.warn(
+				`Did not apply transaction to SetRTX; this error was thrown:`,
+				thrown,
+			)
 			throw thrown
 		} finally {
 			unsubscribe()

package/dist/chunk-ADMEAXYU.js

@@ -1,167 +0,0 @@
-import { createMoleculeFamily, IMPLICIT, makeMoleculeInStore, Molecule, newest, isChildStore, disposeFromStore } 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`
-  };
-}
-var $provenance = Symbol(`provenance`);
-function allocateIntoStore(store, provenance, key) {
-  const stringKey = stringifyJson(key);
-  try {
-    const above = [];
-    let allocationAttachmentStyle;
-    if (provenance === `root`) {
-      above.push(store.molecules.get(`"root"`));
-      allocationAttachmentStyle = `all`;
-    } else if (typeof provenance === `string` && provenance.startsWith(T$)) {
-      allocationAttachmentStyle = `any`;
-      const provenanceKey = stringifyJson(provenance);
-      const provenanceMolecule = store.molecules.get(provenanceKey);
-      if (!provenanceMolecule) {
-        throw new Error(
-          `Molecule ${provenanceKey} not found in store "${store.config.name}"`
-        );
-      }
-      above.push(provenanceMolecule);
-    } else {
-      const allocationIsCompound = key.startsWith(`T$--`);
-      if (allocationIsCompound) {
-        allocationAttachmentStyle = `all`;
-        for (const claim of provenance) {
-          const provenanceKey = stringifyJson(claim);
-          const provenanceMolecule = store.molecules.get(provenanceKey);
-          if (!provenanceMolecule) {
-            throw new Error(
-              `Molecule ${provenanceKey} not found in store "${store.config.name}"`
-            );
-          }
-          above.push(provenanceMolecule);
-        }
-      } else {
-        allocationAttachmentStyle = `any`;
-        const provenanceKey = stringifyJson(provenance);
-        const provenanceMolecule = store.molecules.get(provenanceKey);
-        if (!provenanceMolecule) {
-          throw new Error(
-            `Molecule ${provenanceKey} not found in store "${store.config.name}"`
-          );
-        }
-        above.push(provenanceMolecule);
-      }
-    }
-    const molecule = new Molecule(above, key);
-    molecule._dependsOn = allocationAttachmentStyle;
-    store.molecules.set(stringKey, molecule);
-    for (const aboveMolecule of above) {
-      aboveMolecule.below.set(molecule.stringKey, molecule);
-    }
-    const creationEvent = {
-      type: `molecule_creation`,
-      subType: `modern`,
-      key: molecule.key,
-      provenance
-    };
-    const target = newest(store);
-    const isTransaction = isChildStore(target) && target.transactionMeta.phase === `building`;
-    if (isTransaction) {
-      target.transactionMeta.update.updates.push(creationEvent);
-    } else {
-      target.on.moleculeCreationStart.next(creationEvent);
-    }
-  } catch (thrown) {
-    if (thrown instanceof Error) {
-      store.logger.error(
-        `\u274C`,
-        `molecule`,
-        stringKey,
-        `allocation failed:`,
-        thrown.message
-      );
-    }
-  }
-  return key;
-}
-function deallocateFromStore(store, claim) {
-  const stringKey = stringifyJson(claim);
-  const molecule = store.molecules.get(stringKey);
-  if (!molecule) {
-    throw new Error(
-      `Molecule ${stringKey} not found in store "${store.config.name}"`
-    );
-  }
-  for (const join of molecule.joins.values()) {
-    join.relations.delete(molecule.key);
-    join.molecules.delete(molecule.stringKey);
-  }
-  let provenance;
-  if (molecule.above.size === 1) {
-    const above = molecule.above.values().next().value;
-    provenance = above.key;
-  } else {
-    provenance = [...molecule.above.values()].map(({ key }) => key);
-  }
-  const values = [];
-  for (const stateToken of molecule.tokens.values()) {
-    const tokenFamily = stateToken.family;
-    values.push([tokenFamily.key, store.valueMap.get(stateToken.key)]);
-  }
-  for (const state of molecule.tokens.values()) {
-    disposeFromStore(store, state);
-  }
-  for (const child of molecule.below.values()) {
-    if (child.dependsOn === `all`) {
-      deallocateFromStore(store, child.key);
-    } else {
-      child.above.delete(molecule.stringKey);
-      if (child.above.size === 0) {
-        deallocateFromStore(store, child.key);
-      }
-    }
-  }
-  molecule.below.clear();
-  const disposalEvent = {
-    type: `molecule_disposal`,
-    subType: `modern`,
-    key: molecule.key,
-    values,
-    provenance
-  };
-  const target = newest(store);
-  const isTransaction = isChildStore(target) && target.transactionMeta.phase === `building`;
-  if (isTransaction) {
-    target.transactionMeta.update.updates.push(disposalEvent);
-  } else {
-    target.on.moleculeDisposal.next(disposalEvent);
-  }
-  target.molecules.delete(molecule.stringKey);
-  for (const parent of molecule.above.values()) {
-    parent.below.delete(molecule.stringKey);
-  }
-}
-function realm(store) {
-  const root = makeRootMoleculeInStore(`root`, store);
-  return {
-    root,
-    allocate: (provenance, key) => {
-      return allocateIntoStore(store, provenance, key);
-    },
-    deallocate: (claim) => {
-      deallocateFromStore(store, claim);
-    }
-  };
-}
-var T$ = `T$`;
-
-export { $provenance, T$, allocateIntoStore, deallocateFromStore, makeMolecule, makeRootMoleculeInStore, moleculeFamily, realm };

package/internal/src/molecule/create-molecule-family.ts

@@ -1,30 +0,0 @@
-import type {
-	MoleculeConstructor,
-	MoleculeCreationClassic,
-	MoleculeFamily,
-	MoleculeFamilyOptions,
-	MoleculeFamilyToken,
-} from "atom.io"
-
-import type { Store } from "../store"
-import { Subject } from "../subject"
-
-export function createMoleculeFamily<M extends MoleculeConstructor>(
-	store: Store,
-	options: MoleculeFamilyOptions<M>,
-): MoleculeFamilyToken<M> {
-	const subject = new Subject<MoleculeCreationClassic<M>>()
-
-	const token = {
-		type: `molecule_family`,
-		key: options.key,
-		dependsOn: options.dependsOn ?? `all`,
-	} as const satisfies MoleculeFamilyToken<M>
-	const family = {
-		...token,
-		subject,
-		new: options.new,
-	} satisfies MoleculeFamily<M>
-	store.moleculeFamilies.set(options.key, family)
-	return token
-}

package/internal/src/molecule/dispose-molecule.ts

@@ -1,79 +0,0 @@
-import type {
-	MoleculeConstructor,
-	MoleculeDisposal,
-	MoleculeDisposalClassic,
-	MoleculeToken,
-} from "atom.io"
-
-import { disposeFromStore } from "../families"
-import type { Store } from "../store"
-import { deposit, withdraw } from "../store"
-import { isChildStore } from "../transaction"
-import type { Molecule } from "./molecule-internal"
-
-export function disposeMolecule<M extends MoleculeConstructor>(
-	token: MoleculeToken<M>,
-	store: Store,
-): void {
-	let molecule: Molecule<M>
-	molecule = withdraw(token, store)
-	const { family } = token
-
-	for (const join of molecule.joins.values()) {
-		join.relations.delete(molecule.key)
-		join.molecules.delete(molecule.stringKey)
-	}
-
-	const context: MoleculeToken<any>[] = []
-	for (const above of molecule.above.values()) {
-		context.push(deposit(above))
-	}
-	const values: [string, any][] = []
-	for (const stateToken of molecule.tokens.values()) {
-		// biome-ignore lint/style/noNonNullAssertion: tokens of molecules must have a family
-		const tokenFamily = stateToken.family!
-		values.push([tokenFamily.key, store.valueMap.get(stateToken.key)])
-	}
-
-	if (family) {
-		const Formula = withdraw(family, store)
-		const disposalEvent: MoleculeDisposalClassic = {
-			type: `molecule_disposal`,
-			subType: `classic`,
-			token,
-			family,
-			context,
-			values,
-		}
-		if (token.family) {
-			disposalEvent.family = token.family
-		}
-		for (const state of molecule.tokens.values()) {
-			disposeFromStore(store, state)
-		}
-		for (const child of molecule.below.values()) {
-			if (child.dependsOn === `all`) {
-				disposeMolecule(child, store)
-			} else {
-				child.above.delete(molecule.stringKey)
-				if (child.above.size === 0) {
-					disposeMolecule(child, store)
-				}
-			}
-		}
-		molecule.below.clear()
-
-		const isTransaction =
-			isChildStore(store) && store.transactionMeta.phase === `building`
-		if (isTransaction) {
-			store.transactionMeta.update.updates.push(disposalEvent)
-		} else {
-			Formula.subject.next(disposalEvent)
-		}
-		store.molecules.delete(molecule.stringKey)
-	}
-
-	for (const parent of molecule.above.values()) {
-		parent.below.delete(molecule.stringKey)
-	}
-}

package/internal/src/molecule/grow-molecule-in-store.ts

@@ -1,95 +0,0 @@
-import type {
-	AtomFamilyToken,
-	AtomToken,
-	MutableAtomFamilyToken,
-	MutableAtomToken,
-	ReadableFamilyToken,
-	ReadableToken,
-	ReadonlySelectorFamilyToken,
-	ReadonlySelectorToken,
-	RegularAtomFamilyToken,
-	RegularAtomToken,
-	SelectorFamilyToken,
-	SelectorToken,
-	WritableFamilyToken,
-	WritableSelectorFamilyToken,
-	WritableSelectorToken,
-	WritableToken,
-} from "atom.io"
-import type { Canonical, Json } from "atom.io/json"
-
-import type {
-	AtomFamily,
-	MutableAtomFamily,
-	ReadableFamily,
-	ReadonlySelectorFamily,
-	RegularAtomFamily,
-	SelectorFamily,
-	WritableFamily,
-	WritableSelectorFamily,
-} from ".."
-import { initFamilyMemberInStore } from "../families"
-import type { Transceiver } from "../mutable"
-import type { Store } from "../store"
-import { isChildStore } from "../transaction"
-import type { Molecule } from "./molecule-internal"
-
-export function growMoleculeInStore<
-	T extends Transceiver<any>,
-	J extends Json.Serializable,
-	K extends Canonical,
->(
-	molecule: Molecule<any>,
-	family: MutableAtomFamilyToken<T, J, K>,
-	store: Store,
-): MutableAtomToken<T, J>
-export function growMoleculeInStore<T, K extends Canonical>(
-	molecule: Molecule<any>,
-	family: RegularAtomFamilyToken<T, K>,
-	store: Store,
-): RegularAtomToken<T>
-export function growMoleculeInStore<T, K extends Canonical>(
-	molecule: Molecule<any>,
-	family: AtomFamilyToken<T, K>,
-	store: Store,
-): AtomToken<T>
-export function growMoleculeInStore<T, K extends Canonical>(
-	molecule: Molecule<any>,
-	family: WritableSelectorFamilyToken<T, K>,
-	store: Store,
-): WritableSelectorToken<T>
-export function growMoleculeInStore<T, K extends Canonical>(
-	molecule: Molecule<any>,
-	family: ReadonlySelectorFamilyToken<T, K>,
-	store: Store,
-): ReadonlySelectorToken<T>
-export function growMoleculeInStore<T, K extends Canonical>(
-	molecule: Molecule<any>,
-	family: SelectorFamilyToken<T, K>,
-	store: Store,
-): SelectorToken<T>
-export function growMoleculeInStore<T, K extends Canonical>(
-	molecule: Molecule<any>,
-	family: WritableFamilyToken<T, K>,
-	store: Store,
-): WritableToken<T>
-export function growMoleculeInStore<T, K extends Canonical>(
-	molecule: Molecule<any>,
-	family: ReadableFamilyToken<T, K>,
-	store: Store,
-): ReadableToken<T>
-export function growMoleculeInStore(
-	molecule: Molecule<any>,
-	family: ReadableFamilyToken<any, any>,
-	store: Store,
-): ReadableToken<any> {
-	const stateToken = initFamilyMemberInStore(store, family, molecule.key)
-	molecule.tokens.set(stateToken.key, stateToken)
-	const isTransaction =
-		isChildStore(store) && store.transactionMeta.phase === `building`
-	const moleculeInProgress = store.moleculeInProgress === molecule.key
-	if (!isTransaction && !moleculeInProgress) {
-		molecule.subject.next({ type: `state_creation`, token: stateToken })
-	}
-	return stateToken
-}

package/internal/src/molecule/index.ts

@@ -1,5 +0,0 @@
-export * from "./create-molecule-family"
-export * from "./dispose-molecule"
-export * from "./grow-molecule-in-store"
-export * from "./make-molecule-in-store"
-export * from "./molecule-internal"