atom.io 0.21.1 → 0.23.0

package/introspection/src/attach-atom-index.ts

@@ -41,59 +41,49 @@ export const attachAtomIndex = (
 			},
 			effects: [
 				({ setSelf }) => {
-					const unsubscribeFromAtomCreation = store.on.atomCreation.subscribe(
-						`introspection`,
-						(atomToken) => {
-							if (atomToken.key.includes(`👁‍🗨`)) {
-								return
-							}
+					store.on.atomCreation.subscribe(`introspection`, (atomToken) => {
+						if (atomToken.key.includes(`👁‍🗨`)) {
+							return
+						}
 
-							setSelf((self) => {
-								if (atomToken.family) {
-									const { key: familyKey, subKey } = atomToken.family
-									let familyNode = self.get(familyKey)
-									if (
-										familyNode === undefined ||
-										!(`familyMembers` in familyNode)
-									) {
-										familyNode = {
-											key: familyKey,
-											familyMembers: new Map(),
-										}
-										self.set(familyKey, familyNode)
+						setSelf((self) => {
+							if (atomToken.family) {
+								const { key: familyKey, subKey } = atomToken.family
+								let familyNode = self.get(familyKey)
+								if (
+									familyNode === undefined ||
+									!(`familyMembers` in familyNode)
+								) {
+									familyNode = {
+										key: familyKey,
+										familyMembers: new Map(),
 									}
-									familyNode.familyMembers.set(subKey, atomToken)
-								} else {
-									self.set(atomToken.key, atomToken)
+									self.set(familyKey, familyNode)
 								}
-								return self
-							})
-						},
-					)
-					const unsubscribeFromAtomDisposal = store.on.atomDisposal.subscribe(
-						`introspection`,
-						(atomToken) => {
-							setSelf((self) => {
-								if (atomToken.family) {
-									const { key: familyKey, subKey } = atomToken.family
-									const familyNode = self.get(familyKey)
-									if (familyNode && `familyMembers` in familyNode) {
-										familyNode.familyMembers.delete(subKey)
-										if (familyNode.familyMembers.size === 0) {
-											self.delete(familyKey)
-										}
+								familyNode.familyMembers.set(subKey, atomToken)
+							} else {
+								self.set(atomToken.key, atomToken)
+							}
+							return self
+						})
+					})
+					store.on.atomDisposal.subscribe(`introspection`, (atomToken) => {
+						setSelf((self) => {
+							if (atomToken.family) {
+								const { key: familyKey, subKey } = atomToken.family
+								const familyNode = self.get(familyKey)
+								if (familyNode && `familyMembers` in familyNode) {
+									familyNode.familyMembers.delete(subKey)
+									if (familyNode.familyMembers.size === 0) {
+										self.delete(familyKey)
 									}
-								} else {
-									self.delete(atomToken.key)
 								}
-								return self
-							})
-						},
-					)
-					return () => {
-						unsubscribeFromAtomCreation()
-						unsubscribeFromAtomDisposal()
-					}
+							} else {
+								self.delete(atomToken.key)
+							}
+							return self
+						})
+					})
 				},
 			],
 		},

package/introspection/src/attach-selector-index.ts

@@ -44,61 +44,56 @@ export const attachSelectorIndex = (
 				},
 				effects: [
 					({ setSelf }) => {
-						const unsubscribeFromSelectorCreation =
-							store.on.selectorCreation.subscribe(
-								`introspection`,
-								(selectorToken) => {
-									if (selectorToken.key.includes(`👁‍🗨`)) {
-										return
-									}
+						store.on.selectorCreation.subscribe(
+							`introspection`,
+							(selectorToken) => {
+								if (selectorToken.key.includes(`👁‍🗨`)) {
+									return
+								}
 
-									setSelf((self) => {
-										if (selectorToken.family) {
-											const { key: familyKey, subKey } = selectorToken.family
-											let familyNode = self.get(familyKey)
-											if (
-												familyNode === undefined ||
-												!(`familyMembers` in familyNode)
-											) {
-												familyNode = {
-													key: familyKey,
-													familyMembers: new Map(),
-												}
-												self.set(familyKey, familyNode)
+								setSelf((self) => {
+									if (selectorToken.family) {
+										const { key: familyKey, subKey } = selectorToken.family
+										let familyNode = self.get(familyKey)
+										if (
+											familyNode === undefined ||
+											!(`familyMembers` in familyNode)
+										) {
+											familyNode = {
+												key: familyKey,
+												familyMembers: new Map(),
 											}
-											familyNode.familyMembers.set(subKey, selectorToken)
-										} else {
-											self.set(selectorToken.key, selectorToken)
+											self.set(familyKey, familyNode)
 										}
-										return self
-									})
-								},
-							)
-						const unsubscribeFromSelectorDisposal =
-							store.on.selectorDisposal.subscribe(
-								`introspection`,
-								(selectorToken) => {
-									setSelf((self) => {
-										if (selectorToken.family) {
-											const { key: familyKey, subKey } = selectorToken.family
-											const familyNode = self.get(familyKey)
-											if (familyNode && `familyMembers` in familyNode) {
-												familyNode.familyMembers.delete(subKey)
-												if (familyNode.familyMembers.size === 0) {
-													self.delete(familyKey)
-												}
+										familyNode.familyMembers.set(subKey, selectorToken)
+									} else {
+										self.set(selectorToken.key, selectorToken)
+									}
+									return self
+								})
+							},
+						)
+
+						store.on.selectorDisposal.subscribe(
+							`introspection`,
+							(selectorToken) => {
+								setSelf((self) => {
+									if (selectorToken.family) {
+										const { key: familyKey, subKey } = selectorToken.family
+										const familyNode = self.get(familyKey)
+										if (familyNode && `familyMembers` in familyNode) {
+											familyNode.familyMembers.delete(subKey)
+											if (familyNode.familyMembers.size === 0) {
+												self.delete(familyKey)
 											}
-										} else {
-											self.delete(selectorToken.key)
 										}
-										return self
-									})
-								},
-							)
-						return () => {
-							unsubscribeFromSelectorCreation()
-							unsubscribeFromSelectorDisposal()
-						}
+									} else {
+										self.delete(selectorToken.key)
+									}
+									return self
+								})
+							},
+						)
 					},
 				],
 			},

package/introspection/src/attach-timeline-family.ts

@@ -27,6 +27,7 @@ export const attachTimelineFamily = (
 					transactionKey: null,
 					install: () => {},
 					subject: new Subject(),
+					subscriptions: new Map(),
 				},
 			effects: (key) => [
 				({ setSelf }) => {

package/json/dist/index.cjs

@@ -19,18 +19,52 @@ function selectJsonFamily(family, transform, store = internal.IMPLICIT.STORE) {
   const jsonFamily = internal.createSelectorFamily(
     {
       key: `${family.key}:JSON`,
-      get: (key) => ({ get }) => transform.toJson(get(family(key))),
-      set: (key) => ({ set }, newValue) => {
-        set(family(key), transform.fromJson(newValue));
+      get: (key) => ({ seek, get }) => {
+        const existingState = seek(family, key);
+        if (existingState) {
+          return transform.toJson(get(existingState));
+        }
+        const stringKey = stringifyJson(key);
+        const molecule = store.molecules.get(stringKey);
+        if (molecule) {
+          const atom = molecule.bond(family);
+          return transform.toJson(get(atom));
+        }
+        if (store.config.lifespan === `immortal`) {
+          throw new Error(`No molecule found for key "${stringKey}"`);
+        }
+        const newToken = internal.initFamilyMember(family, key, store);
+        return transform.toJson(get(newToken));
+      },
+      set: (key) => ({ seek, set }, newValue) => {
+        const existingState = seek(family, key);
+        if (existingState) {
+          set(existingState, transform.fromJson(newValue));
+        } else {
+          const stringKey = stringifyJson(key);
+          const molecule = store.molecules.get(stringKey);
+          if (molecule) {
+            const atom = molecule.bond(family);
+            set(atom, transform.fromJson(newValue));
+          } else {
+            if (store.config.lifespan === `immortal`) {
+              throw new Error(`No molecule found for key "${stringKey}"`);
+            }
+            set(
+              internal.initFamilyMember(family, key, store),
+              transform.fromJson(newValue)
+            );
+          }
+        }
       }
     },
     store
   );
   family.subject.subscribe(
     `store=${store.config.name}::json-selector-family`,
-    (token) => {
-      if (token.family) {
-        jsonFamily(parseJson(token.family.subKey));
+    (event) => {
+      if (event.token.family) {
+        internal.seekInStore(jsonFamily, parseJson(event.token.family.subKey), store);
       }
     }
   );

package/json/dist/index.js

@@ -1,7 +1,8 @@
-import { parseJson } from '../../dist/chunk-BF4MVQF6.js';
-export { JSON_DEFAULTS, JSON_TYPE_NAMES, isBoolean, isNull, isNumber, isPrimitive, isString, parseJson, stringSetJsonInterface, stringifyJson } from '../../dist/chunk-BF4MVQF6.js';
+export { isBoolean, isNull, isNumber, isPrimitive, isString } from '../../dist/chunk-6MLFYN32.js';
+import { stringifyJson, parseJson } from '../../dist/chunk-OAYGID5B.js';
+export { JSON_DEFAULTS, JSON_TYPE_NAMES, parseJson, stringSetJsonInterface, stringifyJson } from '../../dist/chunk-OAYGID5B.js';
 import '../../dist/chunk-F2X4B4VY.js';
-import { createStandaloneSelector, IMPLICIT, createSelectorFamily } from 'atom.io/internal';
+import { createStandaloneSelector, IMPLICIT, createSelectorFamily, initFamilyMember, seekInStore } from 'atom.io/internal';
 
 var selectJson = (atom, transform, store = IMPLICIT.STORE) => {
   return createStandaloneSelector(
@@ -19,18 +20,52 @@ function selectJsonFamily(family, transform, store = IMPLICIT.STORE) {
   const jsonFamily = createSelectorFamily(
     {
       key: `${family.key}:JSON`,
-      get: (key) => ({ get }) => transform.toJson(get(family(key))),
-      set: (key) => ({ set }, newValue) => {
-        set(family(key), transform.fromJson(newValue));
+      get: (key) => ({ seek, get }) => {
+        const existingState = seek(family, key);
+        if (existingState) {
+          return transform.toJson(get(existingState));
+        }
+        const stringKey = stringifyJson(key);
+        const molecule = store.molecules.get(stringKey);
+        if (molecule) {
+          const atom = molecule.bond(family);
+          return transform.toJson(get(atom));
+        }
+        if (store.config.lifespan === `immortal`) {
+          throw new Error(`No molecule found for key "${stringKey}"`);
+        }
+        const newToken = initFamilyMember(family, key, store);
+        return transform.toJson(get(newToken));
+      },
+      set: (key) => ({ seek, set }, newValue) => {
+        const existingState = seek(family, key);
+        if (existingState) {
+          set(existingState, transform.fromJson(newValue));
+        } else {
+          const stringKey = stringifyJson(key);
+          const molecule = store.molecules.get(stringKey);
+          if (molecule) {
+            const atom = molecule.bond(family);
+            set(atom, transform.fromJson(newValue));
+          } else {
+            if (store.config.lifespan === `immortal`) {
+              throw new Error(`No molecule found for key "${stringKey}"`);
+            }
+            set(
+              initFamilyMember(family, key, store),
+              transform.fromJson(newValue)
+            );
+          }
+        }
       }
     },
     store
   );
   family.subject.subscribe(
     `store=${store.config.name}::json-selector-family`,
-    (token) => {
-      if (token.family) {
-        jsonFamily(parseJson(token.family.subKey));
+    (event) => {
+      if (event.token.family) {
+        seekInStore(jsonFamily, parseJson(event.token.family.subKey), store);
       }
     }
   );

package/json/src/select-json-family.ts

@@ -1,9 +1,14 @@
 import type * as AtomIO from "atom.io"
 import type { Store, Transceiver } from "atom.io/internal"
-import { createSelectorFamily, IMPLICIT } from "atom.io/internal"
+import {
+	createSelectorFamily,
+	IMPLICIT,
+	initFamilyMember,
+	seekInStore,
+} from "atom.io/internal"
 
 import type { Json, JsonInterface } from "."
-import { parseJson } from "."
+import { parseJson, stringifyJson } from "."
 
 export function selectJsonFamily<
 	T extends Transceiver<any>,
@@ -39,21 +44,54 @@ export function selectJsonFamily<
 			key: `${family.key}:JSON`,
 			get:
 				(key) =>
-				({ get }) =>
-					transform.toJson(get(family(key))),
+				({ seek, get }) => {
+					const existingState = seek(family, key)
+					if (existingState) {
+						return transform.toJson(get(existingState))
+					}
+					const stringKey = stringifyJson(key)
+					const molecule = store.molecules.get(stringKey)
+					if (molecule) {
+						const atom = molecule.bond(family)
+						return transform.toJson(get(atom))
+					}
+					if (store.config.lifespan === `immortal`) {
+						throw new Error(`No molecule found for key "${stringKey}"`)
+					}
+					const newToken = initFamilyMember(family, key, store)
+					return transform.toJson(get(newToken))
+				},
 			set:
 				(key) =>
-				({ set }, newValue) => {
-					set(family(key), transform.fromJson(newValue))
+				({ seek, set }, newValue) => {
+					const existingState = seek(family, key)
+					if (existingState) {
+						set(existingState, transform.fromJson(newValue))
+					} else {
+						const stringKey = stringifyJson(key)
+						const molecule = store.molecules.get(stringKey)
+						if (molecule) {
+							const atom = molecule.bond(family)
+							set(atom, transform.fromJson(newValue))
+						} else {
+							if (store.config.lifespan === `immortal`) {
+								throw new Error(`No molecule found for key "${stringKey}"`)
+							}
+							set(
+								initFamilyMember(family, key, store),
+								transform.fromJson(newValue),
+							)
+						}
+					}
 				},
 		},
 		store,
 	)
 	family.subject.subscribe(
 		`store=${store.config.name}::json-selector-family`,
-		(token) => {
-			if (token.family) {
-				jsonFamily(parseJson(token.family.subKey) as K)
+		(event) => {
+			if (event.token.family) {
+				seekInStore(jsonFamily, parseJson(event.token.family.subKey) as K, store)
 			}
 		},
 	)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.21.1",
+  "version": "0.23.0",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,
@@ -54,26 +54,26 @@
     "@types/estree": "1.0.5",
     "@types/http-proxy": "1.17.14",
     "@types/npmlog": "7.0.0",
-    "@types/react": "18.3.1",
+    "@types/react": "18.3.2",
     "@types/tmp": "0.2.6",
-    "@typescript-eslint/parser": "7.8.0",
-    "@typescript-eslint/rule-tester": "7.8.0",
+    "@typescript-eslint/parser": "7.10.0",
+    "@typescript-eslint/rule-tester": "7.10.0",
     "@vitest/coverage-v8": "1.6.0",
     "@vitest/ui": "1.6.0",
     "concurrently": "8.2.2",
-    "drizzle-kit": "0.20.18",
+    "drizzle-kit": "0.21.3",
     "drizzle-orm": "0.30.10",
     "eslint": "npm:eslint@8.57.0",
-    "eslint-v9": "npm:eslint@9.2.0",
-    "framer-motion": "11.1.9",
-    "happy-dom": "14.10.1",
+    "eslint-v9": "npm:eslint@9.3.0",
+    "framer-motion": "11.2.6",
+    "happy-dom": "14.11.0",
     "http-proxy": "1.18.1",
     "npmlog": "7.0.1",
     "postgres": "3.4.4",
-    "preact": "10.21.0",
+    "preact": "10.22.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.23.0",
+    "react-router-dom": "6.23.1",
     "socket.io": "4.7.5",
     "socket.io-client": "4.7.5",
     "tmp": "0.2.3",
@@ -92,9 +92,15 @@
     "data/dist",
     "data/package.json",
     "data/src",
+    "ephemeral/dist",
+    "ephemeral/package.json",
+    "ephemeral/src",
     "eslint-plugin/dist",
     "eslint-plugin/package.json",
     "eslint-plugin/src",
+    "immortal/dist",
+    "immortal/package.json",
+    "immortal/src",
     "internal/dist",
     "internal/package.json",
     "internal/src",
@@ -144,6 +150,13 @@
       "import": "./data/dist/index.js",
       "require": "./data/dist/index.cjs"
     },
+    "./ephemeral/package.json": "./ephemeral/package.json",
+    "./ephemeral": {
+      "types": "./ephemeral/dist/index.d.ts",
+      "browser": "./ephemeral/dist/index.js",
+      "import": "./ephemeral/dist/index.js",
+      "require": "./ephemeral/dist/index.cjs"
+    },
     "./eslint-plugin/package.json": "./eslint-plugin/package.json",
     "./eslint-plugin": {
       "types": "./eslint-plugin/dist/index.d.ts",
@@ -151,6 +164,13 @@
       "import": "./eslint-plugin/dist/index.js",
       "require": "./eslint-plugin/dist/index.cjs"
     },
+    "./immortal/package.json": "./immortal/package.json",
+    "./immortal": {
+      "types": "./immortal/dist/index.d.ts",
+      "browser": "./immortal/dist/index.js",
+      "import": "./immortal/dist/index.js",
+      "require": "./immortal/dist/index.cjs"
+    },
     "./internal/package.json": "./internal/package.json",
     "./internal": {
       "types": "./internal/dist/index.d.ts",

package/react/dist/index.cjs

@@ -54,7 +54,7 @@ function useO(token, key) {
 function useJSON(token, key) {
   const store = React5__namespace.useContext(StoreContext);
   const stateToken = token.type === `mutable_atom_family` ? internal.findInStore(token, key, store) : token;
-  const jsonToken = internal.getJsonToken(stateToken);
+  const jsonToken = internal.getJsonToken(stateToken, store);
   return useO(jsonToken);
 }
 function useTL(token) {

package/react/dist/index.js

@@ -32,7 +32,7 @@ function useO(token, key) {
 function useJSON(token, key) {
   const store = React5.useContext(StoreContext);
   const stateToken = token.type === `mutable_atom_family` ? findInStore(token, key, store) : token;
-  const jsonToken = getJsonToken(stateToken);
+  const jsonToken = getJsonToken(stateToken, store);
   return useO(jsonToken);
 }
 function useTL(token) {

package/react/src/use-json.ts

@@ -33,6 +33,6 @@ export function useJSON<
 		token.type === `mutable_atom_family`
 			? findInStore(token, key as Key, store)
 			: token
-	const jsonToken = getJsonToken(stateToken)
+	const jsonToken = getJsonToken(stateToken, store)
 	return useO(jsonToken)
 }