atom.io 0.21.1 → 0.22.0

package/json/dist/index.cjs

@@ -19,9 +19,43 @@ 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
@@ -30,7 +64,7 @@ function selectJsonFamily(family, transform, store = internal.IMPLICIT.STORE) {
     `store=${store.config.name}::json-selector-family`,
     (token) => {
       if (token.family) {
-        jsonFamily(parseJson(token.family.subKey));
+        internal.seekInStore(jsonFamily, parseJson(token.family.subKey), store);
       }
     }
   );

package/json/dist/index.js

@@ -1,7 +1,7 @@
-import { parseJson } from '../../dist/chunk-BF4MVQF6.js';
+import { stringifyJson, 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';
 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,9 +19,43 @@ 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
@@ -30,7 +64,7 @@ function selectJsonFamily(family, transform, store = IMPLICIT.STORE) {
     `store=${store.config.name}::json-selector-family`,
     (token) => {
       if (token.family) {
-        jsonFamily(parseJson(token.family.subKey));
+        seekInStore(jsonFamily, parseJson(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,12 +44,46 @@ 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) => {
+					// set(seek(family, key), transform.fromJson(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,
@@ -53,7 +92,7 @@ export function selectJsonFamily<
 		`store=${store.config.name}::json-selector-family`,
 		(token) => {
 			if (token.family) {
-				jsonFamily(parseJson(token.family.subKey) as K)
+				seekInStore(jsonFamily, parseJson(token.family.subKey) as K, store)
 			}
 		},
 	)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.21.1",
+  "version": "0.22.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.9.0",
+    "@typescript-eslint/rule-tester": "7.9.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.2",
     "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.4",
+    "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)
 }

package/react-devtools/dist/index.cjs

@@ -5,6 +5,7 @@ var introspection = require('atom.io/introspection');
 var react$1 = require('atom.io/react');
 var framerMotion = require('framer-motion');
 var react = require('react');
+var ephemeral = require('atom.io/ephemeral');
 var jsxRuntime = require('react/jsx-runtime');
 
 var __defProp = Object.defineProperty;
@@ -1718,8 +1719,8 @@ var StateIndexTreeNode = ({ node, isOpenState }) => {
   const setIsOpen = react$1.useI(isOpenState);
   const isOpen = react$1.useO(isOpenState);
   for (const [key, childNode] of node.familyMembers) {
-    atom_io.findState(findViewIsOpenState, key);
-    atom_io.findState(findStateTypeState, childNode);
+    ephemeral.findState(findViewIsOpenState, key);
+    ephemeral.findState(findStateTypeState, childNode);
   }
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     /* @__PURE__ */ jsxRuntime.jsxs("header", { children: [
@@ -1740,8 +1741,8 @@ var StateIndexTreeNode = ({ node, isOpenState }) => {
       StateIndexNode,
       {
         node: childNode,
-        isOpenState: atom_io.findState(findViewIsOpenState, childNode.key),
-        typeState: atom_io.findState(findStateTypeState, childNode)
+        isOpenState: ephemeral.findState(findViewIsOpenState, childNode.key),
+        typeState: ephemeral.findState(findStateTypeState, childNode)
       },
       key
     )) : null
@@ -1764,8 +1765,8 @@ var StateIndex = ({ tokenIndex }) => {
       StateIndexNode,
       {
         node,
-        isOpenState: atom_io.findState(findViewIsOpenState, node.key),
-        typeState: atom_io.findState(findStateTypeState, node)
+        isOpenState: ephemeral.findState(findViewIsOpenState, node.key),
+        typeState: ephemeral.findState(findStateTypeState, node)
       },
       key
     );
@@ -1992,8 +1993,8 @@ var TimelineIndex = () => {
       TimelineLog,
       {
         token,
-        isOpenState: atom_io.findState(findViewIsOpenState, token.key),
-        timelineState: atom_io.findState(findTimelineState, token.key)
+        isOpenState: ephemeral.findState(findViewIsOpenState, token.key),
+        timelineState: ephemeral.findState(findTimelineState, token.key)
       },
       token.key
     );
@@ -2046,8 +2047,8 @@ var TransactionIndex = () => {
       TransactionLog,
       {
         token,
-        isOpenState: atom_io.findState(findViewIsOpenState, token.key),
-        logState: atom_io.findState(findTransactionLogState, token.key)
+        isOpenState: ephemeral.findState(findViewIsOpenState, token.key),
+        logState: ephemeral.findState(findTransactionLogState, token.key)
       },
       token.key
     );

package/react-devtools/dist/index.js

@@ -2,11 +2,12 @@ import { pipe, ifDefined, isArray, isRecord, doesExtend, isPlainObject, raiseErr
 import { lazyLocalStorageEffect } from '../../dist/chunk-BWWVY5O5.js';
 import { JSON_TYPE_NAMES, isString, isNumber, isBoolean, stringifyJson, JSON_DEFAULTS } from '../../dist/chunk-BF4MVQF6.js';
 import { __spreadProps, __spreadValues, __objRest, __restKey } from '../../dist/chunk-F2X4B4VY.js';
-import { selectorFamily, atom, atomFamily, findState, undo, redo, getState } from 'atom.io';
+import { selectorFamily, atom, atomFamily, undo, redo, getState } from 'atom.io';
 import { attachIntrospectionStates } from 'atom.io/introspection';
 import { useI, useO } from 'atom.io/react';
 import { motion, spring, LayoutGroup } from 'framer-motion';
 import { forwardRef, useRef, useState, useImperativeHandle, useLayoutEffect, Fragment as Fragment$1, Component, useId } from 'react';
+import { findState } from 'atom.io/ephemeral';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 
 // ../anvl/src/refinement/can-exist.ts

package/react-devtools/src/StateIndex.tsx

@@ -3,7 +3,8 @@ import type {
 	ReadonlySelectorToken,
 	RegularAtomToken,
 } from "atom.io"
-import { findState, getState, selectorFamily } from "atom.io"
+import { getState, selectorFamily } from "atom.io"
+import { findState } from "atom.io/ephemeral"
 import type { FamilyNode, WritableTokenIndex } from "atom.io/introspection"
 import { useI, useO } from "atom.io/react"
 import type { FC } from "react"

package/react-devtools/src/TimelineIndex.tsx

@@ -3,7 +3,8 @@ import type {
 	RegularAtomToken,
 	TimelineToken,
 } from "atom.io"
-import { findState, redo, undo } from "atom.io"
+import { redo, undo } from "atom.io"
+import { findState } from "atom.io/ephemeral"
 import type { Timeline } from "atom.io/internal"
 import { useI, useO } from "atom.io/react"
 import { type FC, Fragment } from "react"

package/react-devtools/src/TransactionIndex.tsx

@@ -1,11 +1,11 @@
-import {
-	findState,
-	type Func,
-	type ReadonlySelectorToken,
-	type RegularAtomToken,
-	type TransactionToken,
-	type TransactionUpdate,
+import type {
+	Func,
+	ReadonlySelectorToken,
+	RegularAtomToken,
+	TransactionToken,
+	TransactionUpdate,
 } from "atom.io"
+import { findState } from "atom.io/ephemeral"
 import { useI, useO } from "atom.io/react"
 import type { FC } from "react"
 

package/realtime-client/dist/index.cjs

@@ -56,7 +56,7 @@ function pullAtomFamilyMember(token, socket, store) {
   };
 }
 function pullMutableAtom(token, socket, store) {
-  const jsonToken = Internal.getJsonToken(token);
+  const jsonToken = Internal.getJsonToken(token, store);
   const updateToken = Internal.getUpdateToken(token);
   socket.on(`init:${token.key}`, (data) => {
     Internal.setIntoStore(jsonToken, data, store);
@@ -83,7 +83,7 @@ function pullMutableAtomFamilyMember(token, socket, store) {
   const { key: familyKey, subKey: serializedSubKey } = token.family;
   const subKey = json.parseJson(serializedSubKey);
   socket.on(`init:${token.key}`, (data) => {
-    const jsonToken = Internal.getJsonToken(token);
+    const jsonToken = Internal.getJsonToken(token, store);
     Internal.setIntoStore(jsonToken, data, store);
   });
   socket.on(
@@ -246,7 +246,7 @@ function syncContinuity(continuity, socket, store) {
       } else {
         v = x;
         if (`type` in k && k.type === `mutable_atom`) {
-          k = Internal.getJsonToken(k);
+          k = Internal.getJsonToken(k, store);
         }
         Internal.setIntoStore(k, v, store);
       }

package/realtime-client/dist/index.js

@@ -1,4 +1,4 @@
-export { syncContinuity } from '../../dist/chunk-RT43TVKP.js';
+export { syncContinuity } from '../../dist/chunk-GVHKIJ3G.js';
 export { confirmedUpdateQueue, myIdState, myIdState__INTERNAL, myUsernameState, optimisticUpdateQueue } from '../../dist/chunk-O47EQUM6.js';
 import '../../dist/chunk-BWWVY5O5.js';
 import '../../dist/chunk-F2X4B4VY.js';
@@ -35,7 +35,7 @@ function pullAtomFamilyMember(token, socket, store) {
   };
 }
 function pullMutableAtom(token, socket, store) {
-  const jsonToken = getJsonToken(token);
+  const jsonToken = getJsonToken(token, store);
   const updateToken = getUpdateToken(token);
   socket.on(`init:${token.key}`, (data) => {
     setIntoStore(jsonToken, data, store);
@@ -62,7 +62,7 @@ function pullMutableAtomFamilyMember(token, socket, store) {
   const { key: familyKey, subKey: serializedSubKey } = token.family;
   const subKey = parseJson(serializedSubKey);
   socket.on(`init:${token.key}`, (data) => {
-    const jsonToken = getJsonToken(token);
+    const jsonToken = getJsonToken(token, store);
     setIntoStore(jsonToken, data, store);
   });
   socket.on(

package/realtime-client/src/pull-mutable-atom-family-member.ts

@@ -20,7 +20,7 @@ export function pullMutableAtomFamilyMember<
 	const { key: familyKey, subKey: serializedSubKey } = token.family
 	const subKey = parseJson(serializedSubKey)
 	socket.on(`init:${token.key}`, (data: J) => {
-		const jsonToken = getJsonToken(token)
+		const jsonToken = getJsonToken(token, store)
 		setIntoStore(jsonToken, data, store)
 	})
 	socket.on(

package/realtime-client/src/pull-mutable-atom.ts

@@ -12,7 +12,7 @@ export function pullMutableAtom<
 	socket: Socket,
 	store: Store,
 ): () => void {
-	const jsonToken = getJsonToken(token)
+	const jsonToken = getJsonToken(token, store)
 	const updateToken = getUpdateToken(token)
 	socket.on(`init:${token.key}`, (data: J) => {
 		setIntoStore(jsonToken, data, store)

package/realtime-client/src/sync-continuity.ts

@@ -40,9 +40,8 @@ export function syncContinuity<F extends AtomIO.Func>(
 				k = x
 			} else {
 				v = x
-				// console.log(`❗❗❗❗❗`, k, v)
 				if (`type` in k && k.type === `mutable_atom`) {
-					k = getJsonToken(k)
+					k = getJsonToken(k, store)
 				}
 				setIntoStore(k, v, store)
 			}

package/realtime-react/dist/index.cjs

@@ -184,7 +184,7 @@ function syncContinuity(continuity, socket, store) {
       } else {
         v = x;
         if (`type` in k && k.type === `mutable_atom`) {
-          k = internal.getJsonToken(k);
+          k = internal.getJsonToken(k, store);
         }
         internal.setIntoStore(k, v, store);
       }

package/realtime-react/dist/index.js

@@ -1,4 +1,4 @@
-import { syncContinuity } from '../../dist/chunk-RT43TVKP.js';
+import { syncContinuity } from '../../dist/chunk-GVHKIJ3G.js';
 import '../../dist/chunk-F2X4B4VY.js';
 import { useI, StoreContext, useO } from 'atom.io/react';
 import * as RTC from 'atom.io/realtime-client';