atom.io 0.27.4 → 0.27.5

package/internal/src/transaction/build-transaction.ts

@@ -68,19 +68,19 @@ export const buildTransaction = (
 		},
 		toolkit: {
 			get: ((...ps: Parameters<typeof getState>) =>
-				getFromStore(...ps, child)) as typeof getState,
+				getFromStore(child, ...ps)) as typeof getState,
 			set: ((...ps: Parameters<typeof setState>) => {
-				setIntoStore(...ps, child)
+				setIntoStore(child, ...ps)
 			}) as typeof setState,
 			run: (token, identifier = arbitrary()) =>
 				actUponStore(token, identifier, child),
-			find: ((token, k) => findInStore(token, k, child)) as typeof findState,
-			seek: ((token, k) => seekInStore(token, k, child)) as typeof seekState,
-			json: (token) => getJsonToken(token, child),
+			find: ((token, k) => findInStore(child, token, k)) as typeof findState,
+			seek: ((token, k) => seekInStore(child, token, k)) as typeof seekState,
+			json: (token) => getJsonToken(child, token),
 			make: (context, family, k, ...args) =>
 				makeMoleculeInStore(child, context, family, k, ...args),
 			dispose: ((...ps: Parameters<typeof disposeState>) => {
-				disposeFromStore(...ps, child)
+				disposeFromStore(child, ...ps)
 			}) as typeof disposeState,
 			env: () => getEnvironmentData(child),
 		},

package/introspection/dist/index.js

@@ -5,6 +5,7 @@ import { getState } from 'atom.io';
 
 var attachAtomIndex = (store = IMPLICIT.STORE) => {
   const atomTokenIndexState__INTERNAL = createRegularAtom(
+    store,
     {
       key: `\u{1F441}\u200D\u{1F5E8} Atom Token Index (Internal)`,
       default: () => {
@@ -73,19 +74,16 @@ var attachAtomIndex = (store = IMPLICIT.STORE) => {
         }
       ]
     },
-    void 0,
-    store
-  );
-  return createStandaloneSelector(
-    {
-      key: `\u{1F441}\u200D\u{1F5E8} Atom Token Index`,
-      get: ({ get }) => get(atomTokenIndexState__INTERNAL)
-    },
-    store
+    void 0
   );
+  return createStandaloneSelector(store, {
+    key: `\u{1F441}\u200D\u{1F5E8} Atom Token Index`,
+    get: ({ get }) => get(atomTokenIndexState__INTERNAL)
+  });
 };
 var attachSelectorIndex = (store = IMPLICIT.STORE) => {
   const readonlySelectorTokenIndexState__INTERNAL = createRegularAtom(
+    store,
     {
       key: `\u{1F441}\u200D\u{1F5E8} Selector Token Index (Internal)`,
       default: () => {
@@ -162,56 +160,50 @@ var attachSelectorIndex = (store = IMPLICIT.STORE) => {
         }
       ]
     },
-    void 0,
-    store
-  );
-  return createStandaloneSelector(
-    {
-      key: `\u{1F441}\u200D\u{1F5E8} Selector Token Index`,
-      get: ({ get }) => get(readonlySelectorTokenIndexState__INTERNAL)
-    },
-    IMPLICIT.STORE
+    void 0
   );
+  return createStandaloneSelector(IMPLICIT.STORE, {
+    key: `\u{1F441}\u200D\u{1F5E8} Selector Token Index`,
+    get: ({ get }) => get(readonlySelectorTokenIndexState__INTERNAL)
+  });
 };
 var attachTimelineFamily = (store = IMPLICIT.STORE) => {
-  const findTimelineLogState__INTERNAL = createRegularAtomFamily(
-    {
-      key: `\u{1F441}\u200D\u{1F5E8} Timeline Update Log (Internal)`,
-      default: (key) => store.timelines.get(key) ?? {
-        type: `timeline`,
-        key: ``,
-        at: 0,
-        timeTraveling: null,
-        history: [],
-        selectorTime: null,
-        transactionKey: null,
-        install: () => {
-        },
-        subject: new Subject(),
-        subscriptions: /* @__PURE__ */ new Map()
+  const findTimelineLogState__INTERNAL = createRegularAtomFamily(store, {
+    key: `\u{1F441}\u200D\u{1F5E8} Timeline Update Log (Internal)`,
+    default: (key) => store.timelines.get(key) ?? {
+      type: `timeline`,
+      key: ``,
+      at: 0,
+      timeTraveling: null,
+      history: [],
+      selectorTime: null,
+      transactionKey: null,
+      install: () => {
       },
-      effects: (key) => [
-        ({ setSelf }) => {
-          const tl = store.timelines.get(key);
-          tl?.subject.subscribe(`introspection`, (_) => {
-            setSelf({ ...tl });
-          });
-        }
-      ]
+      subject: new Subject(),
+      subscriptions: /* @__PURE__ */ new Map()
     },
-    store
-  );
+    effects: (key) => [
+      ({ setSelf }) => {
+        const tl = store.timelines.get(key);
+        tl?.subject.subscribe(`introspection`, (_) => {
+          setSelf({ ...tl });
+        });
+      }
+    ]
+  });
   const findTimelineLogState = createSelectorFamily(
+    store,
     {
       key: `\u{1F441}\u200D\u{1F5E8} Timeline Update Log`,
       get: (key) => ({ get }) => get(findTimelineLogState__INTERNAL, key)
-    },
-    store
+    }
   );
   return findTimelineLogState;
 };
 var attachTimelineIndex = (store = IMPLICIT.STORE) => {
   const timelineTokenIndexState__INTERNAL = createRegularAtom(
+    store,
     {
       key: `\u{1F441}\u200D\u{1F5E8} Timeline Token Index (Internal)`,
       default: () => [...store.timelines].map(([key]) => {
@@ -228,20 +220,17 @@ var attachTimelineIndex = (store = IMPLICIT.STORE) => {
         }
       ]
     },
-    void 0,
-    store
-  );
-  const timelineTokenIndex = createStandaloneSelector(
-    {
-      key: `\u{1F441}\u200D\u{1F5E8} Timeline Token Index`,
-      get: ({ get }) => get(timelineTokenIndexState__INTERNAL)
-    },
-    store
+    void 0
   );
+  const timelineTokenIndex = createStandaloneSelector(store, {
+    key: `\u{1F441}\u200D\u{1F5E8} Timeline Token Index`,
+    get: ({ get }) => get(timelineTokenIndexState__INTERNAL)
+  });
   return timelineTokenIndex;
 };
 var attachTransactionIndex = (store = IMPLICIT.STORE) => {
   const transactionTokenIndexState__INTERNAL = createRegularAtom(
+    store,
     {
       key: `\u{1F441}\u200D\u{1F5E8} Transaction Token Index (Internal)`,
       default: () => [...store.transactions].map(([key]) => {
@@ -258,43 +247,33 @@ var attachTransactionIndex = (store = IMPLICIT.STORE) => {
         }
       ]
     },
-    void 0,
-    store
-  );
-  const transactionTokenIndex = createStandaloneSelector(
-    {
-      key: `\u{1F441}\u200D\u{1F5E8} Transaction Token Index`,
-      get: ({ get }) => get(transactionTokenIndexState__INTERNAL)
-    },
-    store
+    void 0
   );
+  const transactionTokenIndex = createStandaloneSelector(store, {
+    key: `\u{1F441}\u200D\u{1F5E8} Transaction Token Index`,
+    get: ({ get }) => get(transactionTokenIndexState__INTERNAL)
+  });
   return transactionTokenIndex;
 };
 var attachTransactionLogs = (store = IMPLICIT.STORE) => {
-  const transactionUpdateLogAtoms = createRegularAtomFamily(
-    {
-      key: `\u{1F441}\u200D\u{1F5E8} Transaction Update Log (Internal)`,
-      default: () => [],
-      effects: (key) => [
-        ({ setSelf }) => {
-          const tx = store.transactions.get(key);
-          tx?.subject.subscribe(`introspection`, (transactionUpdate) => {
-            if (transactionUpdate.key === key) {
-              setSelf((state) => [...state, transactionUpdate]);
-            }
-          });
-        }
-      ]
-    },
-    store
-  );
-  const findTransactionUpdateLogState = createSelectorFamily(
-    {
-      key: `\u{1F441}\u200D\u{1F5E8} Transaction Update Log`,
-      get: (key) => ({ get }) => get(transactionUpdateLogAtoms, key)
-    },
-    store
-  );
+  const transactionUpdateLogAtoms = createRegularAtomFamily(store, {
+    key: `\u{1F441}\u200D\u{1F5E8} Transaction Update Log (Internal)`,
+    default: () => [],
+    effects: (key) => [
+      ({ setSelf }) => {
+        const tx = store.transactions.get(key);
+        tx?.subject.subscribe(`introspection`, (transactionUpdate) => {
+          if (transactionUpdate.key === key) {
+            setSelf((state) => [...state, transactionUpdate]);
+          }
+        });
+      }
+    ]
+  });
+  const findTransactionUpdateLogState = createSelectorFamily(store, {
+    key: `\u{1F441}\u200D\u{1F5E8} Transaction Update Log`,
+    get: (key) => ({ get }) => get(transactionUpdateLogAtoms, key)
+  });
   return findTransactionUpdateLogState;
 };
 

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

@@ -15,6 +15,7 @@ export const attachAtomIndex = (
 	store: Store = IMPLICIT.STORE,
 ): ReadonlySelectorToken<AtomTokenIndex> => {
 	const atomTokenIndexState__INTERNAL = createRegularAtom<AtomTokenIndex>(
+		store,
 		{
 			key: `👁‍🗨 Atom Token Index (Internal)`,
 			default: () => {
@@ -88,13 +89,9 @@ export const attachAtomIndex = (
 			],
 		},
 		undefined,
-		store,
-	)
-	return createStandaloneSelector(
-		{
-			key: `👁‍🗨 Atom Token Index`,
-			get: ({ get }) => get(atomTokenIndexState__INTERNAL),
-		},
-		store,
 	)
+	return createStandaloneSelector(store, {
+		key: `👁‍🗨 Atom Token Index`,
+		get: ({ get }) => get(atomTokenIndexState__INTERNAL),
+	})
 }

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

@@ -16,6 +16,8 @@ export const attachSelectorIndex = (
 ): ReadonlySelectorToken<SelectorTokenIndex> => {
 	const readonlySelectorTokenIndexState__INTERNAL =
 		createRegularAtom<SelectorTokenIndex>(
+			store,
+
 			{
 				key: `👁‍🗨 Selector Token Index (Internal)`,
 				default: () => {
@@ -98,13 +100,9 @@ export const attachSelectorIndex = (
 				],
 			},
 			undefined,
-			store,
 		)
-	return createStandaloneSelector(
-		{
-			key: `👁‍🗨 Selector Token Index`,
-			get: ({ get }) => get(readonlySelectorTokenIndexState__INTERNAL),
-		},
-		IMPLICIT.STORE,
-	)
+	return createStandaloneSelector(IMPLICIT.STORE, {
+		key: `👁‍🗨 Selector Token Index`,
+		get: ({ get }) => get(readonlySelectorTokenIndexState__INTERNAL),
+	})
 }

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

@@ -13,34 +13,32 @@ export const attachTimelineFamily = (
 	const findTimelineLogState__INTERNAL = createRegularAtomFamily<
 		Timeline<any>,
 		string
-	>(
-		{
-			key: `👁‍🗨 Timeline Update Log (Internal)`,
-			default: (key) =>
-				store.timelines.get(key) ?? {
-					type: `timeline`,
-					key: ``,
-					at: 0,
-					timeTraveling: null,
-					history: [],
-					selectorTime: null,
-					transactionKey: null,
-					install: () => {},
-					subject: new Subject(),
-					subscriptions: new Map(),
-				},
-			effects: (key) => [
-				({ setSelf }) => {
-					const tl = store.timelines.get(key)
-					tl?.subject.subscribe(`introspection`, (_) => {
-						setSelf({ ...tl })
-					})
-				},
-			],
-		},
-		store,
-	)
+	>(store, {
+		key: `👁‍🗨 Timeline Update Log (Internal)`,
+		default: (key) =>
+			store.timelines.get(key) ?? {
+				type: `timeline`,
+				key: ``,
+				at: 0,
+				timeTraveling: null,
+				history: [],
+				selectorTime: null,
+				transactionKey: null,
+				install: () => {},
+				subject: new Subject(),
+				subscriptions: new Map(),
+			},
+		effects: (key) => [
+			({ setSelf }) => {
+				const tl = store.timelines.get(key)
+				tl?.subject.subscribe(`introspection`, (_) => {
+					setSelf({ ...tl })
+				})
+			},
+		],
+	})
 	const findTimelineLogState = createSelectorFamily<Timeline<any>, string>(
+		store,
 		{
 			key: `👁‍🗨 Timeline Update Log`,
 			get:
@@ -48,7 +46,6 @@ export const attachTimelineFamily = (
 				({ get }) =>
 					get(findTimelineLogState__INTERNAL, key),
 		},
-		store,
 	)
 	return findTimelineLogState
 }

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

@@ -12,6 +12,7 @@ export const attachTimelineIndex = (
 	const timelineTokenIndexState__INTERNAL = createRegularAtom<
 		TimelineToken<any>[]
 	>(
+		store,
 		{
 			key: `👁‍🗨 Timeline Token Index (Internal)`,
 			default: () =>
@@ -30,14 +31,10 @@ export const attachTimelineIndex = (
 			],
 		},
 		undefined,
-		store,
-	)
-	const timelineTokenIndex = createStandaloneSelector(
-		{
-			key: `👁‍🗨 Timeline Token Index`,
-			get: ({ get }) => get(timelineTokenIndexState__INTERNAL),
-		},
-		store,
 	)
+	const timelineTokenIndex = createStandaloneSelector(store, {
+		key: `👁‍🗨 Timeline Token Index`,
+		get: ({ get }) => get(timelineTokenIndexState__INTERNAL),
+	})
 	return timelineTokenIndex
 }

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

@@ -12,6 +12,7 @@ export const attachTransactionIndex = (
 	const transactionTokenIndexState__INTERNAL = createRegularAtom<
 		TransactionToken<Func>[]
 	>(
+		store,
 		{
 			key: `👁‍🗨 Transaction Token Index (Internal)`,
 			default: () =>
@@ -30,14 +31,10 @@ export const attachTransactionIndex = (
 			],
 		},
 		undefined,
-		store,
-	)
-	const transactionTokenIndex = createStandaloneSelector(
-		{
-			key: `👁‍🗨 Transaction Token Index`,
-			get: ({ get }) => get(transactionTokenIndexState__INTERNAL),
-		},
-		store,
 	)
+	const transactionTokenIndex = createStandaloneSelector(store, {
+		key: `👁‍🗨 Transaction Token Index`,
+		get: ({ get }) => get(transactionTokenIndexState__INTERNAL),
+	})
 	return transactionTokenIndex
 }

package/introspection/src/attach-transaction-logs.ts

@@ -12,35 +12,29 @@ export const attachTransactionLogs = (
 	const transactionUpdateLogAtoms = createRegularAtomFamily<
 		TransactionUpdate<Func>[],
 		string
-	>(
-		{
-			key: `👁‍🗨 Transaction Update Log (Internal)`,
-			default: () => [],
-			effects: (key) => [
-				({ setSelf }) => {
-					const tx = store.transactions.get(key)
-					tx?.subject.subscribe(`introspection`, (transactionUpdate) => {
-						if (transactionUpdate.key === key) {
-							setSelf((state) => [...state, transactionUpdate])
-						}
-					})
-				},
-			],
-		},
-		store,
-	)
+	>(store, {
+		key: `👁‍🗨 Transaction Update Log (Internal)`,
+		default: () => [],
+		effects: (key) => [
+			({ setSelf }) => {
+				const tx = store.transactions.get(key)
+				tx?.subject.subscribe(`introspection`, (transactionUpdate) => {
+					if (transactionUpdate.key === key) {
+						setSelf((state) => [...state, transactionUpdate])
+					}
+				})
+			},
+		],
+	})
 	const findTransactionUpdateLogState = createSelectorFamily<
 		TransactionUpdate<Func>[],
 		string
-	>(
-		{
-			key: `👁‍🗨 Transaction Update Log`,
-			get:
-				(key) =>
-				({ get }) =>
-					get(transactionUpdateLogAtoms, key),
-		},
-		store,
-	)
+	>(store, {
+		key: `👁‍🗨 Transaction Update Log`,
+		get:
+			(key) =>
+			({ get }) =>
+				get(transactionUpdateLogAtoms, key),
+	})
 	return findTransactionUpdateLogState
 }

package/json/dist/index.js

@@ -1,6 +1,6 @@
 import { stringifyJson, parseJson } from '../../dist/chunk-AK23DRMD.js';
 export { parseJson, stringifyJson } from '../../dist/chunk-AK23DRMD.js';
-import { createWritableSelectorFamily } from '../../dist/chunk-JRENM6KL.js';
+import { createWritableSelectorFamily } from '../../dist/chunk-6ABWLAGY.js';
 import '../../dist/chunk-IBTHB2PI.js';
 import '../../dist/chunk-XWL6SNVU.js';
 import { createStandaloneSelector, IMPLICIT, growMoleculeInStore, initFamilyMemberInStore, withdraw, seekInStore } from 'atom.io/internal';
@@ -10,19 +10,17 @@ function fromEntries(entries) {
   return Object.fromEntries(entries);
 }
 var selectJson = (atom, transform, store = IMPLICIT.STORE) => {
-  return createStandaloneSelector(
-    {
-      key: `${atom.key}:JSON`,
-      get: ({ get }) => transform.toJson(get(atom)),
-      set: ({ set }, newValue) => {
-        set(atom, transform.fromJson(newValue));
-      }
-    },
-    store
-  );
+  return createStandaloneSelector(store, {
+    key: `${atom.key}:JSON`,
+    get: ({ get }) => transform.toJson(get(atom)),
+    set: ({ set }, newValue) => {
+      set(atom, transform.fromJson(newValue));
+    }
+  });
 };
 function selectJsonFamily(atomFamilyToken, transform, store = IMPLICIT.STORE) {
   const jsonFamily = createWritableSelectorFamily(
+    store,
     {
       key: `${atomFamilyToken.key}:JSON`,
       get: (key) => ({ seek, get }) => {
@@ -39,7 +37,7 @@ function selectJsonFamily(atomFamilyToken, transform, store = IMPLICIT.STORE) {
         if (store.config.lifespan === `immortal`) {
           throw new Error(`No molecule found for key "${stringKey}"`);
         }
-        const newToken = initFamilyMemberInStore(atomFamilyToken, key, store);
+        const newToken = initFamilyMemberInStore(store, atomFamilyToken, key);
         return transform.toJson(get(newToken));
       },
       set: (key) => ({ seek, set }, newValue) => {
@@ -57,14 +55,13 @@ function selectJsonFamily(atomFamilyToken, transform, store = IMPLICIT.STORE) {
               throw new Error(`No molecule found for key "${stringKey}"`);
             }
             set(
-              initFamilyMemberInStore(atomFamilyToken, key, store),
+              initFamilyMemberInStore(store, atomFamilyToken, key),
               transform.fromJson(newValue)
             );
           }
         }
       }
     },
-    store,
     [`mutable`, `json`]
   );
   const atomFamily = withdraw(atomFamilyToken, store);
@@ -72,7 +69,7 @@ function selectJsonFamily(atomFamilyToken, transform, store = IMPLICIT.STORE) {
     `store=${store.config.name}::json-selector-family`,
     (event) => {
       if (event.token.family) {
-        seekInStore(jsonFamily, parseJson(event.token.family.subKey), store);
+        seekInStore(store, jsonFamily, parseJson(event.token.family.subKey));
       }
     }
   );

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

@@ -42,6 +42,7 @@ export function selectJsonFamily<
 	store: Store = IMPLICIT.STORE,
 ): AtomIO.WritableSelectorFamilyToken<J, K> {
 	const jsonFamily = createWritableSelectorFamily<J, K>(
+		store,
 		{
 			key: `${atomFamilyToken.key}:JSON`,
 			get:
@@ -60,7 +61,7 @@ export function selectJsonFamily<
 					if (store.config.lifespan === `immortal`) {
 						throw new Error(`No molecule found for key "${stringKey}"`)
 					}
-					const newToken = initFamilyMemberInStore(atomFamilyToken, key, store)
+					const newToken = initFamilyMemberInStore(store, atomFamilyToken, key)
 					return transform.toJson(get(newToken))
 				},
 			set:
@@ -80,14 +81,13 @@ export function selectJsonFamily<
 								throw new Error(`No molecule found for key "${stringKey}"`)
 							}
 							set(
-								initFamilyMemberInStore(atomFamilyToken, key, store),
+								initFamilyMemberInStore(store, atomFamilyToken, key),
 								transform.fromJson(newValue),
 							)
 						}
 					}
 				},
 		},
-		store,
 		[`mutable`, `json`],
 	)
 	const atomFamily = withdraw(atomFamilyToken, store)
@@ -95,7 +95,7 @@ export function selectJsonFamily<
 		`store=${store.config.name}::json-selector-family`,
 		(event) => {
 			if (event.token.family) {
-				seekInStore(jsonFamily, parseJson(event.token.family.subKey) as K, store)
+				seekInStore(store, jsonFamily, parseJson(event.token.family.subKey) as K)
 			}
 		},
 	)

package/json/src/select-json.ts

@@ -9,14 +9,11 @@ export const selectJson = <T, J extends Json.Serializable>(
 	transform: JsonInterface<T, J>,
 	store: Store = IMPLICIT.STORE,
 ): AtomIO.WritableSelectorToken<J> => {
-	return createStandaloneSelector(
-		{
-			key: `${atom.key}:JSON`,
-			get: ({ get }) => transform.toJson(get(atom)),
-			set: ({ set }, newValue) => {
-				set(atom, transform.fromJson(newValue))
-			},
+	return createStandaloneSelector(store, {
+		key: `${atom.key}:JSON`,
+		get: ({ get }) => transform.toJson(get(atom)),
+		set: ({ set }, newValue) => {
+			set(atom, transform.fromJson(newValue))
 		},
-		store,
-	)
+	})
 }

package/package.json

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

package/react/dist/index.js

@@ -12,13 +12,13 @@ function parseStateOverloads(store, ...rest) {
     const family = rest[0];
     const key = rest[1];
     if (store.config.lifespan === `immortal`) {
-      const maybeToken = seekInStore(family, key, store);
+      const maybeToken = seekInStore(store, family, key);
       if (!maybeToken) {
         throw new NotFoundError(family, key, store);
       }
       token = maybeToken;
     } else {
-      token = findInStore(family, key, store);
+      token = findInStore(store, family, key);
     }
   } else {
     token = rest[0];
@@ -33,7 +33,7 @@ function useI(...params) {
   const setter = React5.useRef(null);
   if (setter.current === null) {
     setter.current = (next) => {
-      setIntoStore(token, next, store);
+      setIntoStore(store, token, next);
     };
   }
   return setter.current;
@@ -44,16 +44,16 @@ function useO(...params) {
   const id = React5.useId();
   return React5.useSyncExternalStore(
     (dispatch) => subscribeToState(token, dispatch, `use-o:${id}`, store),
-    () => getFromStore(token, store),
-    () => getFromStore(token, store)
+    () => getFromStore(store, token),
+    () => getFromStore(store, token)
   );
 }
 
 // react/src/use-json.ts
 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, store);
+  const stateToken = token.type === `mutable_atom_family` ? findInStore(store, token, key) : token;
+  const jsonToken = getJsonToken(store, stateToken);
   return useO(jsonToken);
 }
 function useTL(token) {