atom.io 0.25.0 → 0.25.1

package/internal/dist/index.cjs

@@ -78,6 +78,12 @@ function newest(scion) {
   }
   return scion;
 }
+function eldest(scion) {
+  while (scion.parent !== null) {
+    scion = scion.parent;
+  }
+  return scion;
+}
 
 // internal/src/store/deposit.ts
 function deposit(state) {
@@ -430,7 +436,7 @@ var NotFoundError = class extends Error {
     const store = params.length === 2 ? params[1] : params[2];
     if (params.length === 2) {
       super(
-        `${prettyPrintTokenType(token)} "${token.key}" not found in store "${store.config.name}".`
+        `${prettyPrintTokenType(token)} ${json.stringifyJson(token.key)} not found in store "${store.config.name}".`
       );
     } else {
       const key = params[1];
@@ -1454,6 +1460,7 @@ function capitalize2(string) {
   return string[0].toUpperCase() + string.slice(1);
 }
 function makeMoleculeInStore(store, context, familyToken, key, ...params) {
+  const rootStore = eldest(store);
   const target = newest(store);
   const stringKey = json.stringifyJson(key);
   target.moleculeInProgress = stringKey;
@@ -1477,22 +1484,22 @@ function makeMoleculeInStore(store, context, familyToken, key, ...params) {
     owner.below.set(molecule.stringKey, molecule);
   }
   const toolkit = {
-    get: (t) => getFromStore(t, void 0, newest(store)),
-    set: (t, newValue) => {
-      setIntoStore(t, newValue, newest(store));
+    get: (...ps) => getFromStore(...ps, newest(rootStore)),
+    set: (...ps) => {
+      setIntoStore(...ps, newest(rootStore));
     },
-    seek: (t, k) => seekInStore(t, k, newest(store)),
-    json: (t) => getJsonToken(t, newest(store)),
+    seek: (t, k) => seekInStore(t, k, newest(rootStore)),
+    json: (t) => getJsonToken(t, newest(rootStore)),
     run: (t, i = arbitrary()) => actUponStore(t, i, newest(store)),
-    make: (ctx, f, k, ...args) => makeMoleculeInStore(newest(store), ctx, f, k, ...args),
+    make: (ctx, f, k, ...args) => makeMoleculeInStore(newest(rootStore), ctx, f, k, ...args),
     dispose: (t) => {
-      disposeFromStore(t, newest(store));
+      disposeFromStore(t, newest(rootStore));
     },
-    env: () => getEnvironmentData(newest(store)),
+    env: () => getEnvironmentData(newest(rootStore)),
     bond: (token2, maybeRole) => {
       if (token2.type === `join`) {
         const { as: role } = maybeRole;
-        const join = data.getJoin(token2, store);
+        const join = data.getJoin(token2, rootStore);
         join.molecules.set(stringKey, molecule);
         molecule.joins.set(token2.key, join);
         const unsubFromFamily = family.subject.subscribe(
@@ -1517,7 +1524,11 @@ function makeMoleculeInStore(store, context, familyToken, key, ...params) {
         }
         return tokens;
       }
-      return growMoleculeInStore(molecule, withdraw(token2, store), newest(store));
+      return growMoleculeInStore(
+        molecule,
+        withdraw(token2, rootStore),
+        newest(rootStore)
+      );
     },
     claim: (below, options) => {
       const { exclusive } = options;
@@ -3324,6 +3335,7 @@ exports.disposeAtom = disposeAtom;
 exports.disposeFromStore = disposeFromStore;
 exports.disposeMolecule = disposeMolecule;
 exports.disposeSelector = disposeSelector;
+exports.eldest = eldest;
 exports.evictCachedValue = evictCachedValue;
 exports.findInStore = findInStore;
 exports.getContinuityKey = getContinuityKey;

package/internal/dist/index.d.ts

@@ -162,6 +162,7 @@ interface Lineage {
     child: typeof this | null;
 }
 declare function newest<T extends Lineage>(scion: T): T;
+declare function eldest<T extends Lineage>(scion: T): T;
 
 type OperationProgress = {
     open: false;
@@ -583,4 +584,4 @@ type Selector<T> = ReadonlySelector<T> | WritableSelector<T>;
 type WritableState<T> = Atom<T> | WritableSelector<T>;
 type ReadableState<T> = Atom<T> | Selector<T>;
 
-export { type Atom, type AtomIOState, type AtomKey, type ChildStore, type EnvironmentData, FamilyTracker, Future, IMPLICIT, LazyMap, type Lineage, type Modify, Molecule, type MutableAtom, NotFoundError, type OperationProgress, type ReadableState, type ReadonlySelector, type ReadonlySelectorKey, type RegularAtom, type RootStore, type Selector, type SelectorKey, type Signal, type StateKey, StatefulSubject, Store, Subject, TRANSACTION_PHASES, type Timeline, type TimelineAtomUpdate, type TimelineMoleculeCreation, type TimelineMoleculeDisposal, type TimelineSelectorUpdate, type TimelineStateCreation, type TimelineStateDisposal, type TimelineTransactionUpdate, Tracker, type Transaction, type TransactionEpoch, type TransactionPhase, type TransactionProgress, type Transceiver, type TransceiverMode, type Withdrawable, type WritableSelector, type WritableState, abortTransaction, actUponStore, applyTransaction, arbitrary, assignTransactionToContinuity, become, buildTransaction, cacheValue, clearStore, closeOperation, createAtomFamily, createMoleculeFamily, createMutableAtom, createMutableAtomFamily, createReadonlySelector, createReadonlySelectorFamily, createRegularAtom, createRegularAtomFamily, createSelectorFamily, createStandaloneAtom, createStandaloneSelector, createTimeline, createTransaction, createWritableSelector, deposit, disposeAtom, disposeFromStore, disposeMolecule, disposeSelector, evictCachedValue, findInStore, getContinuityKey, getEnvironmentData, getEpochNumberOfAction, getEpochNumberOfContinuity, getFromStore, getJsonFamily, getJsonToken, getSelectorDependencyKeys, getUpdateToken, growMoleculeInStore, ingestAtomUpdate, ingestCreationEvent, ingestDisposalEvent, ingestMoleculeCreationEvent, ingestMoleculeDisposalEvent, ingestSelectorUpdate, ingestTransactionUpdate, initFamilyMemberInStore, isAtomDefault, isAtomKey, isChildStore, isDone, isMutable, isReadonlySelectorKey, isRootStore, isSelectorKey, isStateKey, isTransceiver, makeMoleculeInStore, markAtomAsDefault, markAtomAsNotDefault, markDone, newest, openOperation, readCachedValue, readOrComputeValue, registerSelector, seekInStore, setAtomOrSelector, setEpochNumberOfAction, setEpochNumberOfContinuity, setIntoStore, subscribeToRootAtoms, subscribeToState, subscribeToTimeline, subscribeToTransaction, timeTravel, traceAllSelectorAtoms, traceSelectorAtoms, updateSelectorAtoms, withdraw };
+export { type Atom, type AtomIOState, type AtomKey, type ChildStore, type EnvironmentData, FamilyTracker, Future, IMPLICIT, LazyMap, type Lineage, type Modify, Molecule, type MutableAtom, NotFoundError, type OperationProgress, type ReadableState, type ReadonlySelector, type ReadonlySelectorKey, type RegularAtom, type RootStore, type Selector, type SelectorKey, type Signal, type StateKey, StatefulSubject, Store, Subject, TRANSACTION_PHASES, type Timeline, type TimelineAtomUpdate, type TimelineMoleculeCreation, type TimelineMoleculeDisposal, type TimelineSelectorUpdate, type TimelineStateCreation, type TimelineStateDisposal, type TimelineTransactionUpdate, Tracker, type Transaction, type TransactionEpoch, type TransactionPhase, type TransactionProgress, type Transceiver, type TransceiverMode, type Withdrawable, type WritableSelector, type WritableState, abortTransaction, actUponStore, applyTransaction, arbitrary, assignTransactionToContinuity, become, buildTransaction, cacheValue, clearStore, closeOperation, createAtomFamily, createMoleculeFamily, createMutableAtom, createMutableAtomFamily, createReadonlySelector, createReadonlySelectorFamily, createRegularAtom, createRegularAtomFamily, createSelectorFamily, createStandaloneAtom, createStandaloneSelector, createTimeline, createTransaction, createWritableSelector, deposit, disposeAtom, disposeFromStore, disposeMolecule, disposeSelector, eldest, evictCachedValue, findInStore, getContinuityKey, getEnvironmentData, getEpochNumberOfAction, getEpochNumberOfContinuity, getFromStore, getJsonFamily, getJsonToken, getSelectorDependencyKeys, getUpdateToken, growMoleculeInStore, ingestAtomUpdate, ingestCreationEvent, ingestDisposalEvent, ingestMoleculeCreationEvent, ingestMoleculeDisposalEvent, ingestSelectorUpdate, ingestTransactionUpdate, initFamilyMemberInStore, isAtomDefault, isAtomKey, isChildStore, isDone, isMutable, isReadonlySelectorKey, isRootStore, isSelectorKey, isStateKey, isTransceiver, makeMoleculeInStore, markAtomAsDefault, markAtomAsNotDefault, markDone, newest, openOperation, readCachedValue, readOrComputeValue, registerSelector, seekInStore, setAtomOrSelector, setEpochNumberOfAction, setEpochNumberOfContinuity, setIntoStore, subscribeToRootAtoms, subscribeToState, subscribeToTimeline, subscribeToTransaction, timeTravel, traceAllSelectorAtoms, traceSelectorAtoms, updateSelectorAtoms, withdraw };

package/internal/dist/index.js

@@ -58,6 +58,12 @@ function newest(scion) {
   }
   return scion;
 }
+function eldest(scion) {
+  while (scion.parent !== null) {
+    scion = scion.parent;
+  }
+  return scion;
+}
 
 // internal/src/store/deposit.ts
 function deposit(state) {
@@ -155,7 +161,7 @@ var NotFoundError = class extends Error {
     const store = params.length === 2 ? params[1] : params[2];
     if (params.length === 2) {
       super(
-        `${prettyPrintTokenType(token)} "${token.key}" not found in store "${store.config.name}".`
+        `${prettyPrintTokenType(token)} ${stringifyJson(token.key)} not found in store "${store.config.name}".`
       );
     } else {
       const key = params[1];
@@ -1179,6 +1185,7 @@ function capitalize2(string) {
   return string[0].toUpperCase() + string.slice(1);
 }
 function makeMoleculeInStore(store, context, familyToken, key, ...params) {
+  const rootStore = eldest(store);
   const target = newest(store);
   const stringKey = stringifyJson(key);
   target.moleculeInProgress = stringKey;
@@ -1202,22 +1209,22 @@ function makeMoleculeInStore(store, context, familyToken, key, ...params) {
     owner.below.set(molecule.stringKey, molecule);
   }
   const toolkit = {
-    get: (t) => getFromStore(t, void 0, newest(store)),
-    set: (t, newValue) => {
-      setIntoStore(t, newValue, newest(store));
+    get: (...ps) => getFromStore(...ps, newest(rootStore)),
+    set: (...ps) => {
+      setIntoStore(...ps, newest(rootStore));
     },
-    seek: (t, k) => seekInStore(t, k, newest(store)),
-    json: (t) => getJsonToken(t, newest(store)),
+    seek: (t, k) => seekInStore(t, k, newest(rootStore)),
+    json: (t) => getJsonToken(t, newest(rootStore)),
     run: (t, i = arbitrary()) => actUponStore(t, i, newest(store)),
-    make: (ctx, f, k, ...args) => makeMoleculeInStore(newest(store), ctx, f, k, ...args),
+    make: (ctx, f, k, ...args) => makeMoleculeInStore(newest(rootStore), ctx, f, k, ...args),
     dispose: (t) => {
-      disposeFromStore(t, newest(store));
+      disposeFromStore(t, newest(rootStore));
     },
-    env: () => getEnvironmentData(newest(store)),
+    env: () => getEnvironmentData(newest(rootStore)),
     bond: (token2, maybeRole) => {
       if (token2.type === `join`) {
         const { as: role } = maybeRole;
-        const join = getJoin(token2, store);
+        const join = getJoin(token2, rootStore);
         join.molecules.set(stringKey, molecule);
         molecule.joins.set(token2.key, join);
         const unsubFromFamily = family.subject.subscribe(
@@ -1242,7 +1249,11 @@ function makeMoleculeInStore(store, context, familyToken, key, ...params) {
         }
         return tokens;
       }
-      return growMoleculeInStore(molecule, withdraw(token2, store), newest(store));
+      return growMoleculeInStore(
+        molecule,
+        withdraw(token2, rootStore),
+        newest(rootStore)
+      );
     },
     claim: (below, options) => {
       const { exclusive } = options;
@@ -3009,4 +3020,4 @@ var timeTravel = (action, token, store) => {
   );
 };
 
-export { FamilyTracker, Future, IMPLICIT, LazyMap, Molecule, NotFoundError, StatefulSubject, Store, Subject, TRANSACTION_PHASES, Tracker, abortTransaction, actUponStore, applyTransaction, arbitrary, assignTransactionToContinuity, become, buildTransaction, cacheValue, clearStore, closeOperation, createAtomFamily, createMoleculeFamily, createMutableAtom, createMutableAtomFamily, createReadonlySelector, createReadonlySelectorFamily, createRegularAtom, createRegularAtomFamily, createSelectorFamily, createStandaloneAtom, createStandaloneSelector, createTimeline, createTransaction, createWritableSelector, deposit, disposeAtom, disposeFromStore, disposeMolecule, disposeSelector, evictCachedValue, findInStore, getContinuityKey, getEnvironmentData, getEpochNumberOfAction, getEpochNumberOfContinuity, getFromStore, getJsonFamily, getJsonToken, getSelectorDependencyKeys, getUpdateToken, growMoleculeInStore, ingestAtomUpdate, ingestCreationEvent, ingestDisposalEvent, ingestMoleculeCreationEvent, ingestMoleculeDisposalEvent, ingestSelectorUpdate, ingestTransactionUpdate, initFamilyMemberInStore, isAtomDefault, isAtomKey, isChildStore, isDone, isMutable, isReadonlySelectorKey, isRootStore, isSelectorKey, isStateKey, isTransceiver, makeMoleculeInStore, markAtomAsDefault, markAtomAsNotDefault, markDone, newest, openOperation, readCachedValue, readOrComputeValue, registerSelector, seekInStore, setAtomOrSelector, setEpochNumberOfAction, setEpochNumberOfContinuity, setIntoStore, subscribeToRootAtoms, subscribeToState, subscribeToTimeline, subscribeToTransaction, timeTravel, traceAllSelectorAtoms, traceSelectorAtoms, updateSelectorAtoms, withdraw };
+export { FamilyTracker, Future, IMPLICIT, LazyMap, Molecule, NotFoundError, StatefulSubject, Store, Subject, TRANSACTION_PHASES, Tracker, abortTransaction, actUponStore, applyTransaction, arbitrary, assignTransactionToContinuity, become, buildTransaction, cacheValue, clearStore, closeOperation, createAtomFamily, createMoleculeFamily, createMutableAtom, createMutableAtomFamily, createReadonlySelector, createReadonlySelectorFamily, createRegularAtom, createRegularAtomFamily, createSelectorFamily, createStandaloneAtom, createStandaloneSelector, createTimeline, createTransaction, createWritableSelector, deposit, disposeAtom, disposeFromStore, disposeMolecule, disposeSelector, eldest, evictCachedValue, findInStore, getContinuityKey, getEnvironmentData, getEpochNumberOfAction, getEpochNumberOfContinuity, getFromStore, getJsonFamily, getJsonToken, getSelectorDependencyKeys, getUpdateToken, growMoleculeInStore, ingestAtomUpdate, ingestCreationEvent, ingestDisposalEvent, ingestMoleculeCreationEvent, ingestMoleculeDisposalEvent, ingestSelectorUpdate, ingestTransactionUpdate, initFamilyMemberInStore, isAtomDefault, isAtomKey, isChildStore, isDone, isMutable, isReadonlySelectorKey, isRootStore, isSelectorKey, isStateKey, isTransceiver, makeMoleculeInStore, markAtomAsDefault, markAtomAsNotDefault, markDone, newest, openOperation, readCachedValue, readOrComputeValue, registerSelector, seekInStore, setAtomOrSelector, setEpochNumberOfAction, setEpochNumberOfContinuity, setIntoStore, subscribeToRootAtoms, subscribeToState, subscribeToTimeline, subscribeToTransaction, timeTravel, traceAllSelectorAtoms, traceSelectorAtoms, updateSelectorAtoms, withdraw };

package/internal/src/lineage.ts

@@ -10,3 +10,10 @@ export function newest<T extends Lineage>(scion: T): T {
 	}
 	return scion
 }
+
+export function eldest<T extends Lineage>(scion: T): T {
+	while (scion.parent !== null) {
+		scion = scion.parent
+	}
+	return scion
+}

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

@@ -1,5 +1,6 @@
 import type {
 	CtorToolkit,
+	getState,
 	MK,
 	MoleculeConstructor,
 	MoleculeCreation,
@@ -8,6 +9,7 @@ import type {
 	MoleculeParams,
 	MoleculeToken,
 	ReadableFamilyToken,
+	setState,
 } from "atom.io"
 import { findRelations, getJoin, type JoinToken } from "atom.io/data"
 import type { seekState } from "atom.io/immortal"
@@ -17,7 +19,7 @@ import { arbitrary } from "../arbitrary"
 import { disposeFromStore, seekInStore } from "../families"
 import { getEnvironmentData } from "../get-environment-data"
 import { getFromStore } from "../get-state"
-import { newest } from "../lineage"
+import { eldest, newest } from "../lineage"
 import { getJsonToken } from "../mutable"
 import { setIntoStore } from "../set-state"
 import type { Store } from "../store"
@@ -37,6 +39,7 @@ export function makeMoleculeInStore<M extends MoleculeConstructor>(
 	key: MoleculeKey<M>,
 	...params: MoleculeParams<M>
 ): MoleculeToken<M> {
+	const rootStore = eldest(store)
 	const target = newest(store)
 	const stringKey = stringifyJson(key)
 
@@ -65,26 +68,27 @@ export function makeMoleculeInStore<M extends MoleculeConstructor>(
 	}
 
 	const toolkit = {
-		get: (t) => getFromStore(t, undefined, newest(store)),
-		set: (t, newValue) => {
-			setIntoStore(t, newValue, newest(store))
-		},
-		seek: ((t, k) => seekInStore(t, k, newest(store))) as typeof seekState,
-		json: (t) => getJsonToken(t, newest(store)),
+		get: ((...ps: Parameters<typeof getState>) =>
+			getFromStore(...ps, newest(rootStore))) as typeof getState,
+		set: ((...ps: Parameters<typeof setState>) => {
+			setIntoStore(...ps, newest(rootStore))
+		}) as typeof setState,
+		seek: ((t, k) => seekInStore(t, k, newest(rootStore))) as typeof seekState,
+		json: (t) => getJsonToken(t, newest(rootStore)),
 		run: (t, i = arbitrary()) => actUponStore(t, i, newest(store)),
 		make: (ctx, f, k, ...args) =>
-			makeMoleculeInStore(newest(store), ctx, f, k, ...args),
+			makeMoleculeInStore(newest(rootStore), ctx, f, k, ...args),
 		dispose: (t) => {
-			disposeFromStore(t, newest(store))
+			disposeFromStore(t, newest(rootStore))
 		},
-		env: () => getEnvironmentData(newest(store)),
+		env: () => getEnvironmentData(newest(rootStore)),
 		bond: ((
 			token: JoinToken<any, any, any, any> | ReadableFamilyToken<any, any>,
 			maybeRole,
 		) => {
 			if (token.type === `join`) {
 				const { as: role } = maybeRole
-				const join = getJoin(token, store)
+				const join = getJoin(token, rootStore)
 				join.molecules.set(stringKey, molecule)
 				molecule.joins.set(token.key, join)
 				const unsubFromFamily = family.subject.subscribe(
@@ -119,7 +123,11 @@ export function makeMoleculeInStore<M extends MoleculeConstructor>(
 				}
 				return tokens
 			}
-			return growMoleculeInStore(molecule, withdraw(token, store), newest(store))
+			return growMoleculeInStore(
+				molecule,
+				withdraw(token, rootStore),
+				newest(rootStore),
+			)
 		}) as CtorToolkit<MK<M>>[`bond`],
 		claim: (below, options) => {
 			const { exclusive } = options

package/internal/src/not-found-error.ts

@@ -54,7 +54,7 @@ export class NotFoundError extends Error {
 
 		if (params.length === 2) {
 			super(
-				`${prettyPrintTokenType(token)} "${token.key}" not found in store "${
+				`${prettyPrintTokenType(token)} ${stringifyJson(token.key)} not found in store "${
 					store.config.name
 				}".`,
 			)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,