atom.io 0.24.6 → 0.24.8

package/internal/dist/index.cjs

@@ -765,6 +765,20 @@ function createAtomFamily(options, store) {
   return createRegularAtomFamily(options, store);
 }
 
+// internal/src/get-state/get-from-store.ts
+function getFromStore(token, store) {
+  if (token.type === `molecule`) {
+    try {
+      const molecule = withdraw(token, store);
+      return molecule.instance;
+    } catch (_) {
+      return void 0;
+    }
+  }
+  const state = withdraw(token, store);
+  return readOrComputeValue(state, store);
+}
+
 // internal/src/keys.ts
 var isAtomKey = (key, store) => newest(store).atoms.has(key);
 var isSelectorKey = (key, store) => newest(store).selectors.has(key);
@@ -778,21 +792,18 @@ var getSelectorDependencyKeys = (key, store) => {
 };
 
 // internal/src/selector/trace-selector-atoms.ts
-var traceSelectorAtoms = (selectorKey, directDependencyKey, store) => {
+var traceSelectorAtoms = (directDependencyKey, covered, store) => {
   const rootKeys = [];
   const indirectDependencyKeys = getSelectorDependencyKeys(
     directDependencyKey,
     store
   );
-  let depth = 0;
   while (indirectDependencyKeys.length > 0) {
     const indirectDependencyKey = indirectDependencyKeys.shift();
-    ++depth;
-    if (depth > 99999) {
-      throw new Error(
-        `Maximum selector dependency depth exceeded (> 99999) in selector "${selectorKey}". This is likely due to a circular dependency.`
-      );
+    if (covered.has(indirectDependencyKey)) {
+      continue;
     }
+    covered.add(indirectDependencyKey);
     if (!isAtomKey(indirectDependencyKey, store)) {
       indirectDependencyKeys.push(
         ...getSelectorDependencyKeys(indirectDependencyKey, store)
@@ -806,13 +817,14 @@ var traceSelectorAtoms = (selectorKey, directDependencyKey, store) => {
 var traceAllSelectorAtoms = (selector, store) => {
   const selectorKey = selector.key;
   const directDependencyKeys = getSelectorDependencyKeys(selectorKey, store);
+  const covered = /* @__PURE__ */ new Set();
   return directDependencyKeys.flatMap(
-    (depKey) => isAtomKey(depKey, store) ? depKey : traceSelectorAtoms(selectorKey, depKey, store)
+    (depKey) => isAtomKey(depKey, store) ? depKey : traceSelectorAtoms(depKey, covered, store)
   );
 };
 
 // internal/src/selector/update-selector-atoms.ts
-var updateSelectorAtoms = (selectorKey, dependency, store) => {
+var updateSelectorAtoms = (selectorKey, dependency, covered, store) => {
   const target = newest(store);
   if (dependency.type === `atom` || dependency.type === `mutable_atom`) {
     target.selectorAtoms.set({
@@ -826,7 +838,7 @@ var updateSelectorAtoms = (selectorKey, dependency, store) => {
       `discovers root atom "${dependency.key}"`
     );
   } else {
-    const rootKeys = traceSelectorAtoms(selectorKey, dependency.key, store);
+    const rootKeys = traceSelectorAtoms(dependency.key, covered, store);
     store.logger.info(
       `\u{1F50D}`,
       `selector`,
@@ -840,12 +852,16 @@ var updateSelectorAtoms = (selectorKey, dependency, store) => {
       });
     }
   }
+  covered.add(dependency.key);
 };
 
 // internal/src/selector/register-selector.ts
-var registerSelector = (selectorKey, store) => ({
+var registerSelector = (selectorKey, covered, store) => ({
   get: (dependency) => {
     const target = newest(store);
+    if (dependency.type === `molecule`) {
+      return getFromStore(dependency, store);
+    }
     const dependencyState = withdraw(dependency, store);
     const dependencyValue = readOrComputeValue(dependencyState, store);
     store.logger.info(
@@ -865,7 +881,7 @@ var registerSelector = (selectorKey, store) => ({
         source: dependency.key
       }
     );
-    updateSelectorAtoms(selectorKey, dependency, store);
+    updateSelectorAtoms(selectorKey, dependency, covered, store);
     return dependencyValue;
   },
   set: (WritableToken, newValue) => {
@@ -882,10 +898,16 @@ var registerSelector = (selectorKey, store) => ({
 var createReadonlySelector = (options, family, store) => {
   const target = newest(store);
   const subject = new Subject();
-  const { get, find, seek, json } = registerSelector(options.key, target);
+  const covered = /* @__PURE__ */ new Set();
+  const { get, find, seek, json } = registerSelector(
+    options.key,
+    covered,
+    target
+  );
   const getSelf = () => {
     const value = options.get({ get, find, seek, json });
     cacheValue(options.key, value, subject, newest(store));
+    covered.clear();
     return value;
   };
   const readonlySelector = __spreadValues(__spreadProps(__spreadValues({}, options), {
@@ -917,12 +939,14 @@ var createReadonlySelector = (options, family, store) => {
 var createWritableSelector = (options, family, store) => {
   const target = newest(store);
   const subject = new Subject();
-  const transactors = registerSelector(options.key, target);
+  const covered = /* @__PURE__ */ new Set();
+  const transactors = registerSelector(options.key, covered, target);
   const { find, get, seek, json } = transactors;
   const readonlyTransactors = { find, get, seek, json };
   const getSelf = (innerTarget = newest(store)) => {
     const value = options.get(readonlyTransactors);
     cacheValue(options.key, value, subject, innerTarget);
+    covered.clear();
     return value;
   };
   const setSelf = (next) => {
@@ -1323,20 +1347,6 @@ function getEnvironmentData(store) {
     store
   };
 }
-
-// internal/src/get-state/get-from-store.ts
-function getFromStore(token, store) {
-  if (token.type === `molecule`) {
-    try {
-      const molecule = withdraw(token, store);
-      return molecule.instance;
-    } catch (_) {
-      return void 0;
-    }
-  }
-  const state = withdraw(token, store);
-  return readOrComputeValue(state, store);
-}
 var Molecule = class {
   constructor(ctx, key, family) {
     this.key = key;

package/internal/dist/index.d.ts

@@ -523,12 +523,12 @@ declare function disposeSelector(selectorToken: ReadonlySelectorToken<unknown> |
 
 declare const getSelectorDependencyKeys: (key: string, store: Store) => (AtomKey<unknown> | ReadonlySelectorKey<unknown> | SelectorKey<unknown>)[];
 
-declare const registerSelector: (selectorKey: string, store: Store) => Transactors;
+declare const registerSelector: (selectorKey: string, covered: Set<string>, store: Store) => Transactors;
 
-declare const traceSelectorAtoms: (selectorKey: string, directDependencyKey: StateKey<unknown>, store: Store) => AtomKey<unknown>[];
+declare const traceSelectorAtoms: (directDependencyKey: StateKey<unknown>, covered: Set<string>, store: Store) => AtomKey<unknown>[];
 declare const traceAllSelectorAtoms: (selector: Selector<any>, store: Store) => AtomKey<unknown>[];
 
-declare const updateSelectorAtoms: (selectorKey: string, dependency: ReadonlySelectorToken<unknown> | WritableToken<unknown>, store: Store) => void;
+declare const updateSelectorAtoms: (selectorKey: string, dependency: ReadonlySelectorToken<unknown> | WritableToken<unknown>, covered: Set<string>, store: Store) => void;
 
 type Modify<T> = (thing: T) => T;
 declare const become: <T>(nextVersionOfThing: Modify<T> | T) => (originalThing: T) => T;

package/internal/dist/index.js

@@ -490,6 +490,20 @@ function createAtomFamily(options, store) {
   return createRegularAtomFamily(options, store);
 }
 
+// internal/src/get-state/get-from-store.ts
+function getFromStore(token, store) {
+  if (token.type === `molecule`) {
+    try {
+      const molecule = withdraw(token, store);
+      return molecule.instance;
+    } catch (_) {
+      return void 0;
+    }
+  }
+  const state = withdraw(token, store);
+  return readOrComputeValue(state, store);
+}
+
 // internal/src/keys.ts
 var isAtomKey = (key, store) => newest(store).atoms.has(key);
 var isSelectorKey = (key, store) => newest(store).selectors.has(key);
@@ -503,21 +517,18 @@ var getSelectorDependencyKeys = (key, store) => {
 };
 
 // internal/src/selector/trace-selector-atoms.ts
-var traceSelectorAtoms = (selectorKey, directDependencyKey, store) => {
+var traceSelectorAtoms = (directDependencyKey, covered, store) => {
   const rootKeys = [];
   const indirectDependencyKeys = getSelectorDependencyKeys(
     directDependencyKey,
     store
   );
-  let depth = 0;
   while (indirectDependencyKeys.length > 0) {
     const indirectDependencyKey = indirectDependencyKeys.shift();
-    ++depth;
-    if (depth > 99999) {
-      throw new Error(
-        `Maximum selector dependency depth exceeded (> 99999) in selector "${selectorKey}". This is likely due to a circular dependency.`
-      );
+    if (covered.has(indirectDependencyKey)) {
+      continue;
     }
+    covered.add(indirectDependencyKey);
     if (!isAtomKey(indirectDependencyKey, store)) {
       indirectDependencyKeys.push(
         ...getSelectorDependencyKeys(indirectDependencyKey, store)
@@ -531,13 +542,14 @@ var traceSelectorAtoms = (selectorKey, directDependencyKey, store) => {
 var traceAllSelectorAtoms = (selector, store) => {
   const selectorKey = selector.key;
   const directDependencyKeys = getSelectorDependencyKeys(selectorKey, store);
+  const covered = /* @__PURE__ */ new Set();
   return directDependencyKeys.flatMap(
-    (depKey) => isAtomKey(depKey, store) ? depKey : traceSelectorAtoms(selectorKey, depKey, store)
+    (depKey) => isAtomKey(depKey, store) ? depKey : traceSelectorAtoms(depKey, covered, store)
   );
 };
 
 // internal/src/selector/update-selector-atoms.ts
-var updateSelectorAtoms = (selectorKey, dependency, store) => {
+var updateSelectorAtoms = (selectorKey, dependency, covered, store) => {
   const target = newest(store);
   if (dependency.type === `atom` || dependency.type === `mutable_atom`) {
     target.selectorAtoms.set({
@@ -551,7 +563,7 @@ var updateSelectorAtoms = (selectorKey, dependency, store) => {
       `discovers root atom "${dependency.key}"`
     );
   } else {
-    const rootKeys = traceSelectorAtoms(selectorKey, dependency.key, store);
+    const rootKeys = traceSelectorAtoms(dependency.key, covered, store);
     store.logger.info(
       `\u{1F50D}`,
       `selector`,
@@ -565,12 +577,16 @@ var updateSelectorAtoms = (selectorKey, dependency, store) => {
       });
     }
   }
+  covered.add(dependency.key);
 };
 
 // internal/src/selector/register-selector.ts
-var registerSelector = (selectorKey, store) => ({
+var registerSelector = (selectorKey, covered, store) => ({
   get: (dependency) => {
     const target = newest(store);
+    if (dependency.type === `molecule`) {
+      return getFromStore(dependency, store);
+    }
     const dependencyState = withdraw(dependency, store);
     const dependencyValue = readOrComputeValue(dependencyState, store);
     store.logger.info(
@@ -590,7 +606,7 @@ var registerSelector = (selectorKey, store) => ({
         source: dependency.key
       }
     );
-    updateSelectorAtoms(selectorKey, dependency, store);
+    updateSelectorAtoms(selectorKey, dependency, covered, store);
     return dependencyValue;
   },
   set: (WritableToken, newValue) => {
@@ -607,10 +623,16 @@ var registerSelector = (selectorKey, store) => ({
 var createReadonlySelector = (options, family, store) => {
   const target = newest(store);
   const subject = new Subject();
-  const { get, find, seek, json } = registerSelector(options.key, target);
+  const covered = /* @__PURE__ */ new Set();
+  const { get, find, seek, json } = registerSelector(
+    options.key,
+    covered,
+    target
+  );
   const getSelf = () => {
     const value = options.get({ get, find, seek, json });
     cacheValue(options.key, value, subject, newest(store));
+    covered.clear();
     return value;
   };
   const readonlySelector = __spreadValues(__spreadProps(__spreadValues({}, options), {
@@ -642,12 +664,14 @@ var createReadonlySelector = (options, family, store) => {
 var createWritableSelector = (options, family, store) => {
   const target = newest(store);
   const subject = new Subject();
-  const transactors = registerSelector(options.key, target);
+  const covered = /* @__PURE__ */ new Set();
+  const transactors = registerSelector(options.key, covered, target);
   const { find, get, seek, json } = transactors;
   const readonlyTransactors = { find, get, seek, json };
   const getSelf = (innerTarget = newest(store)) => {
     const value = options.get(readonlyTransactors);
     cacheValue(options.key, value, subject, innerTarget);
+    covered.clear();
     return value;
   };
   const setSelf = (next) => {
@@ -1048,20 +1072,6 @@ function getEnvironmentData(store) {
     store
   };
 }
-
-// internal/src/get-state/get-from-store.ts
-function getFromStore(token, store) {
-  if (token.type === `molecule`) {
-    try {
-      const molecule = withdraw(token, store);
-      return molecule.instance;
-    } catch (_) {
-      return void 0;
-    }
-  }
-  const state = withdraw(token, store);
-  return readOrComputeValue(state, store);
-}
 var Molecule = class {
   constructor(ctx, key, family) {
     this.key = key;

package/internal/src/selector/create-readonly-selector.ts

@@ -18,11 +18,16 @@ export const createReadonlySelector = <T>(
 ): ReadonlySelectorToken<T> => {
 	const target = newest(store)
 	const subject = new Subject<{ newValue: T; oldValue: T }>()
-
-	const { get, find, seek, json } = registerSelector(options.key, target)
+	const covered = new Set<string>()
+	const { get, find, seek, json } = registerSelector(
+		options.key,
+		covered,
+		target,
+	)
 	const getSelf = () => {
 		const value = options.get({ get, find, seek, json })
 		cacheValue(options.key, value, subject, newest(store))
+		covered.clear()
 		return value
 	}
 

package/internal/src/selector/create-writable-selector.ts

@@ -21,13 +21,15 @@ export const createWritableSelector = <T>(
 ): WritableSelectorToken<T> => {
 	const target = newest(store)
 	const subject = new Subject<{ newValue: T; oldValue: T }>()
-	const transactors = registerSelector(options.key, target)
+	const covered = new Set<string>()
+	const transactors = registerSelector(options.key, covered, target)
 	const { find, get, seek, json } = transactors
 	const readonlyTransactors = { find, get, seek, json }
 
 	const getSelf = (innerTarget = newest(store)): T => {
 		const value = options.get(readonlyTransactors)
 		cacheValue(options.key, value, subject, innerTarget)
+		covered.clear()
 		return value
 	}
 

package/internal/src/selector/register-selector.ts

@@ -1,8 +1,14 @@
-import type { Transactors } from "atom.io"
+import type {
+	MoleculeConstructor,
+	MoleculeToken,
+	ReadableToken,
+	Transactors,
+} from "atom.io"
 import type { findState } from "atom.io/ephemeral"
 import type { seekState } from "atom.io/immortal"
 
 import { findInStore, seekInStore } from "../families"
+import { getFromStore } from "../get-state"
 import { readOrComputeValue } from "../get-state/read-or-compute-value"
 import { newest } from "../lineage"
 import { getJsonToken } from "../mutable"
@@ -13,11 +19,16 @@ import { updateSelectorAtoms } from "./update-selector-atoms"
 
 export const registerSelector = (
 	selectorKey: string,
+	covered: Set<string>,
 	store: Store,
 ): Transactors => ({
-	get: (dependency) => {
+	get: (dependency: MoleculeToken<MoleculeConstructor> | ReadableToken<any>) => {
 		const target = newest(store)
 
+		if (dependency.type === `molecule`) {
+			return getFromStore(dependency, store)
+		}
+
 		const dependencyState = withdraw(dependency, store)
 		const dependencyValue = readOrComputeValue(dependencyState, store)
 
@@ -39,7 +50,7 @@ export const registerSelector = (
 				source: dependency.key,
 			},
 		)
-		updateSelectorAtoms(selectorKey, dependency, store)
+		updateSelectorAtoms(selectorKey, dependency, covered, store)
 		return dependencyValue
 	},
 	set: (WritableToken, newValue) => {

package/internal/src/selector/trace-selector-atoms.ts

@@ -4,8 +4,8 @@ import { isAtomKey } from "../keys"
 import { getSelectorDependencyKeys } from "./get-selector-dependency-keys"
 
 export const traceSelectorAtoms = (
-	selectorKey: string,
 	directDependencyKey: StateKey<unknown>,
+	covered: Set<string>,
 	store: Store,
 ): AtomKey<unknown>[] => {
 	const rootKeys: AtomKey<unknown>[] = []
@@ -14,16 +14,13 @@ export const traceSelectorAtoms = (
 		directDependencyKey,
 		store,
 	)
-	let depth = 0
 	while (indirectDependencyKeys.length > 0) {
 		// biome-ignore lint/style/noNonNullAssertion: just checked length ^^^
 		const indirectDependencyKey = indirectDependencyKeys.shift()!
-		++depth
-		if (depth > 99999) {
-			throw new Error(
-				`Maximum selector dependency depth exceeded (> 99999) in selector "${selectorKey}". This is likely due to a circular dependency.`,
-			)
+		if (covered.has(indirectDependencyKey)) {
+			continue
 		}
+		covered.add(indirectDependencyKey)
 
 		if (!isAtomKey(indirectDependencyKey, store)) {
 			indirectDependencyKeys.push(
@@ -43,9 +40,10 @@ export const traceAllSelectorAtoms = (
 ): AtomKey<unknown>[] => {
 	const selectorKey = selector.key
 	const directDependencyKeys = getSelectorDependencyKeys(selectorKey, store)
+	const covered = new Set<string>()
 	return directDependencyKeys.flatMap((depKey) =>
 		isAtomKey(depKey, store)
 			? depKey
-			: traceSelectorAtoms(selectorKey, depKey, store),
+			: traceSelectorAtoms(depKey, covered, store),
 	)
 }

package/internal/src/selector/update-selector-atoms.ts

@@ -7,6 +7,7 @@ import { traceSelectorAtoms } from "./trace-selector-atoms"
 export const updateSelectorAtoms = (
 	selectorKey: string,
 	dependency: ReadonlySelectorToken<unknown> | WritableToken<unknown>,
+	covered: Set<string>,
 	store: Store,
 ): void => {
 	const target = newest(store)
@@ -22,7 +23,7 @@ export const updateSelectorAtoms = (
 			`discovers root atom "${dependency.key}"`,
 		)
 	} else {
-		const rootKeys = traceSelectorAtoms(selectorKey, dependency.key, store)
+		const rootKeys = traceSelectorAtoms(dependency.key, covered, store)
 		store.logger.info(
 			`🔍`,
 			`selector`,
@@ -38,4 +39,5 @@ export const updateSelectorAtoms = (
 			})
 		}
 	}
+	covered.add(dependency.key)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.24.6",
+  "version": "0.24.8",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,
@@ -56,8 +56,8 @@
     "@types/npmlog": "7.0.0",
     "@types/react": "18.3.3",
     "@types/tmp": "0.2.6",
-    "@typescript-eslint/parser": "7.13.1",
-    "@typescript-eslint/rule-tester": "7.13.1",
+    "@typescript-eslint/parser": "7.14.1",
+    "@typescript-eslint/rule-tester": "7.14.1",
     "@vitest/coverage-v8": "1.6.0",
     "@vitest/ui": "1.6.0",
     "concurrently": "8.2.2",
@@ -65,7 +65,7 @@
     "drizzle-orm": "0.31.2",
     "eslint": "npm:eslint@8.57.0",
     "eslint-v9": "npm:eslint@9.5.0",
-    "framer-motion": "11.2.11",
+    "framer-motion": "11.2.12",
     "happy-dom": "14.12.3",
     "http-proxy": "1.18.1",
     "npmlog": "7.0.1",
@@ -73,7 +73,7 @@
     "preact": "10.22.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.23.1",
+    "react-router-dom": "6.24.0",
     "socket.io": "4.7.5",
     "socket.io-client": "4.7.5",
     "tmp": "0.2.3",