atom.io 0.21.0 → 0.21.1

package/data/dist/index.cjs

@@ -5,14 +5,14 @@ var atom_io = require('atom.io');
 var setRtx = require('atom.io/transceivers/set-rtx');
 
 // data/src/dict.ts
-function dict(findState2, index, store = internal.IMPLICIT.STORE) {
+function dict(findState, index, store = internal.IMPLICIT.STORE) {
   return internal.createStandaloneSelector(
     {
-      key: `${findState2.key}Dict`,
+      key: `${findState.key}Dict`,
       get: ({ get }) => {
         const keys = get(index);
         return keys.reduce((acc, key) => {
-          acc[key] = get(internal.findInStore(findState2, key, store));
+          acc[key] = get(internal.findInStore(findState, key, store));
           return acc;
         }, {});
       }

package/data/dist/index.js

@@ -1,4 +1,4 @@
-export { Join, editRelations, editRelationsInStore, findRelations, findRelationsInStore, getInternalRelations, getInternalRelationsFromStore, getJoin, getJoinMap, join } from '../../dist/chunk-KGZGBCYS.js';
+export { Join, editRelations, editRelationsInStore, findRelations, findRelationsInStore, getInternalRelations, getInternalRelationsFromStore, getJoin, getJoinMap, join } from '../../dist/chunk-HITX3MO4.js';
 import '../../dist/chunk-FTONNX2R.js';
 import '../../dist/chunk-F2X4B4VY.js';
 import { createStandaloneSelector, findInStore, IMPLICIT, createRegularAtom, createRegularAtomFamily, createSelectorFamily } from 'atom.io/internal';

package/data/src/join.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-types */
 import type {
+	findState,
 	MutableAtomFamily,
 	MutableAtomFamilyToken,
 	MutableAtomToken,
@@ -10,7 +11,7 @@ import type {
 	Transactors,
 	Write,
 } from "atom.io"
-import { disposeState, findState, getState, setState } from "atom.io"
+import { disposeState, getState, setState } from "atom.io"
 import type { Store } from "atom.io/internal"
 import {
 	createMutableAtomFamily,
@@ -37,12 +38,6 @@ import type {
 import { Junction } from "~/packages/rel8/junction/src"
 import type * as Rel8 from "~/packages/rel8/types/src"
 
-const TRANSACTORS: Transactors = {
-	get: getState,
-	set: setState,
-	find: findState,
-}
-
 function capitalize<S extends string>(string: S): Capitalize<S> {
 	return (string[0].toUpperCase() + string.slice(1)) as Capitalize<S>
 }

package/internal/dist/index.cjs

@@ -31,44 +31,30 @@ function arbitrary(random = Math.random) {
 // internal/src/future.ts
 var Future = class extends Promise {
   constructor(executor) {
-    let promise;
     let superResolve;
     let superReject;
     super((resolve, reject) => {
       superResolve = resolve;
       superReject = reject;
-      promise = executor instanceof Promise ? executor : new Promise(executor);
-      promise.then(
-        (value) => {
-          if (promise) {
-            this.pass(promise, value);
-          }
-        },
-        (reason) => {
-          if (promise) {
-            this.fail(promise, reason);
-          }
-        }
-      );
     });
-    this.destiny = promise;
     this.resolve = superResolve;
     this.reject = superReject;
+    this.use(executor instanceof Promise ? executor : new Promise(executor));
   }
   pass(promise, value) {
-    if (promise === this.destiny) {
+    if (promise === this.fate) {
       this.resolve(value);
     }
   }
   fail(promise, reason) {
-    if (promise === this.destiny) {
+    if (promise === this.fate) {
       this.reject(reason);
     }
   }
   use(value) {
     if (value instanceof Promise) {
       const promise = value;
-      this.destiny = promise;
+      this.fate = promise;
       promise.then(
         (resolved) => {
           this.pass(promise, resolved);
@@ -79,7 +65,7 @@ var Future = class extends Promise {
       );
     } else {
       this.resolve(value);
-      this.destiny = void 0;
+      this.fate = void 0;
     }
   }
 };
@@ -1255,10 +1241,10 @@ function disposeSelector(selectorToken, store) {
 // internal/src/subscribe/recall-state.ts
 var recallState = (state, store) => {
   const target = newest(store);
-  if (!target.operation.open) {
-    return target.valueMap.get(state.key);
+  if (target.operation.open) {
+    return target.operation.prev.get(state.key);
   }
-  return target.operation.prev.get(state.key);
+  return target.valueMap.get(state.key);
 };
 
 // internal/src/subscribe/subscribe-to-root-atoms.ts
@@ -1307,11 +1293,24 @@ var subscribeToRootAtoms = (selector, store) => {
 
 // internal/src/subscribe/subscribe-to-state.ts
 function subscribeToState(token, handleUpdate, key, store) {
+  function safelyHandleUpdate(update) {
+    if (store.operation.open) {
+      const unsubscribe2 = store.on.operationClose.subscribe(
+        `state subscription ${key}`,
+        () => {
+          unsubscribe2();
+          handleUpdate(update);
+        }
+      );
+    } else {
+      handleUpdate(update);
+    }
+  }
   const state = withdrawOrCreate(token, store);
   store.logger.info(`\u{1F440}`, state.type, state.key, `Adding subscription "${key}"`);
   const isSelector = state.type === `selector` || state.type === `readonly_selector`;
   let dependencyUnsubFunctions = null;
-  let updateHandler = handleUpdate;
+  let updateHandler = safelyHandleUpdate;
   if (isSelector) {
     dependencyUnsubFunctions = subscribeToRootAtoms(state, store);
     updateHandler = (update) => {
@@ -1319,7 +1318,7 @@ function subscribeToState(token, handleUpdate, key, store) {
         dependencyUnsubFunctions.length = 0;
         dependencyUnsubFunctions.push(...subscribeToRootAtoms(state, store));
       }
-      handleUpdate(update);
+      safelyHandleUpdate(update);
     };
   }
   const mainUnsubFunction = state.subject.subscribe(key, updateHandler);
@@ -1408,18 +1407,7 @@ var Tracker = class {
     this.unsubscribeFromInnerValue = originalInnerValue.subscribe(
       subscriptionKey,
       (update) => {
-        if (target.operation.open) {
-          const unsubscribe = target.on.operationClose.subscribe(
-            subscriptionKey,
-            () => {
-              unsubscribe();
-              setIntoStore(latestUpdateState, update, target);
-            }
-          );
-        } else {
-          setIntoStore(mutableState, (current) => current, target);
-          setIntoStore(latestUpdateState, update, target);
-        }
+        setIntoStore(latestUpdateState, update, target);
       }
     );
     this.unsubscribeFromState = subscribeToState(
@@ -1430,18 +1418,7 @@ var Tracker = class {
           this.unsubscribeFromInnerValue = update.newValue.subscribe(
             subscriptionKey,
             (transceiverUpdate) => {
-              if (target.operation.open) {
-                const unsubscribe = target.on.operationClose.subscribe(
-                  subscriptionKey,
-                  () => {
-                    unsubscribe();
-                    setIntoStore(latestUpdateState, transceiverUpdate, target);
-                  }
-                );
-              } else {
-                setIntoStore(mutableState, (current) => current, target);
-                setIntoStore(latestUpdateState, transceiverUpdate, target);
-              }
+              setIntoStore(latestUpdateState, transceiverUpdate, target);
             }
           );
         }

package/internal/dist/index.d.ts

@@ -342,7 +342,7 @@ declare const markAtomAsNotDefault: (key: string, store: Store) => void;
  * Can be constructed like a Promise, or from an existing Promise.
  */
 declare class Future<T> extends Promise<T> {
-    private destiny;
+    private fate;
     private resolve;
     private reject;
     constructor(executor: Promise<T> | ((resolve: (value: T) => void, reject: (reason?: any) => void) => void));

package/internal/dist/index.js

@@ -11,44 +11,30 @@ function arbitrary(random = Math.random) {
 // internal/src/future.ts
 var Future = class extends Promise {
   constructor(executor) {
-    let promise;
     let superResolve;
     let superReject;
     super((resolve, reject) => {
       superResolve = resolve;
       superReject = reject;
-      promise = executor instanceof Promise ? executor : new Promise(executor);
-      promise.then(
-        (value) => {
-          if (promise) {
-            this.pass(promise, value);
-          }
-        },
-        (reason) => {
-          if (promise) {
-            this.fail(promise, reason);
-          }
-        }
-      );
     });
-    this.destiny = promise;
     this.resolve = superResolve;
     this.reject = superReject;
+    this.use(executor instanceof Promise ? executor : new Promise(executor));
   }
   pass(promise, value) {
-    if (promise === this.destiny) {
+    if (promise === this.fate) {
       this.resolve(value);
     }
   }
   fail(promise, reason) {
-    if (promise === this.destiny) {
+    if (promise === this.fate) {
       this.reject(reason);
     }
   }
   use(value) {
     if (value instanceof Promise) {
       const promise = value;
-      this.destiny = promise;
+      this.fate = promise;
       promise.then(
         (resolved) => {
           this.pass(promise, resolved);
@@ -59,7 +45,7 @@ var Future = class extends Promise {
       );
     } else {
       this.resolve(value);
-      this.destiny = void 0;
+      this.fate = void 0;
     }
   }
 };
@@ -977,10 +963,10 @@ function disposeSelector(selectorToken, store) {
 // internal/src/subscribe/recall-state.ts
 var recallState = (state, store) => {
   const target = newest(store);
-  if (!target.operation.open) {
-    return target.valueMap.get(state.key);
+  if (target.operation.open) {
+    return target.operation.prev.get(state.key);
   }
-  return target.operation.prev.get(state.key);
+  return target.valueMap.get(state.key);
 };
 
 // internal/src/subscribe/subscribe-to-root-atoms.ts
@@ -1029,11 +1015,24 @@ var subscribeToRootAtoms = (selector, store) => {
 
 // internal/src/subscribe/subscribe-to-state.ts
 function subscribeToState(token, handleUpdate, key, store) {
+  function safelyHandleUpdate(update) {
+    if (store.operation.open) {
+      const unsubscribe2 = store.on.operationClose.subscribe(
+        `state subscription ${key}`,
+        () => {
+          unsubscribe2();
+          handleUpdate(update);
+        }
+      );
+    } else {
+      handleUpdate(update);
+    }
+  }
   const state = withdrawOrCreate(token, store);
   store.logger.info(`\u{1F440}`, state.type, state.key, `Adding subscription "${key}"`);
   const isSelector = state.type === `selector` || state.type === `readonly_selector`;
   let dependencyUnsubFunctions = null;
-  let updateHandler = handleUpdate;
+  let updateHandler = safelyHandleUpdate;
   if (isSelector) {
     dependencyUnsubFunctions = subscribeToRootAtoms(state, store);
     updateHandler = (update) => {
@@ -1041,7 +1040,7 @@ function subscribeToState(token, handleUpdate, key, store) {
         dependencyUnsubFunctions.length = 0;
         dependencyUnsubFunctions.push(...subscribeToRootAtoms(state, store));
       }
-      handleUpdate(update);
+      safelyHandleUpdate(update);
     };
   }
   const mainUnsubFunction = state.subject.subscribe(key, updateHandler);
@@ -1130,18 +1129,7 @@ var Tracker = class {
     this.unsubscribeFromInnerValue = originalInnerValue.subscribe(
       subscriptionKey,
       (update) => {
-        if (target.operation.open) {
-          const unsubscribe = target.on.operationClose.subscribe(
-            subscriptionKey,
-            () => {
-              unsubscribe();
-              setIntoStore(latestUpdateState, update, target);
-            }
-          );
-        } else {
-          setIntoStore(mutableState, (current) => current, target);
-          setIntoStore(latestUpdateState, update, target);
-        }
+        setIntoStore(latestUpdateState, update, target);
       }
     );
     this.unsubscribeFromState = subscribeToState(
@@ -1152,18 +1140,7 @@ var Tracker = class {
           this.unsubscribeFromInnerValue = update.newValue.subscribe(
             subscriptionKey,
             (transceiverUpdate) => {
-              if (target.operation.open) {
-                const unsubscribe = target.on.operationClose.subscribe(
-                  subscriptionKey,
-                  () => {
-                    unsubscribe();
-                    setIntoStore(latestUpdateState, transceiverUpdate, target);
-                  }
-                );
-              } else {
-                setIntoStore(mutableState, (current) => current, target);
-                setIntoStore(latestUpdateState, transceiverUpdate, target);
-              }
+              setIntoStore(latestUpdateState, transceiverUpdate, target);
             }
           );
         }

package/internal/src/future.ts

@@ -8,7 +8,7 @@
  * Can be constructed like a Promise, or from an existing Promise.
  */
 export class Future<T> extends Promise<T> {
-	private destiny: Promise<T> | undefined
+	private fate: Promise<T> | undefined
 	private resolve: (value: T) => void
 	private reject: (reason?: any) => void
 
@@ -17,38 +17,24 @@ export class Future<T> extends Promise<T> {
 			| Promise<T>
 			| ((resolve: (value: T) => void, reject: (reason?: any) => void) => void),
 	) {
-		let promise: Promise<T> | undefined
 		let superResolve: ((value: T) => void) | undefined
 		let superReject: ((reason?: any) => void) | undefined
 		super((resolve, reject) => {
 			superResolve = resolve
 			superReject = reject
-			promise = executor instanceof Promise ? executor : new Promise(executor)
-			promise.then(
-				(value) => {
-					if (promise) {
-						this.pass(promise, value)
-					}
-				},
-				(reason) => {
-					if (promise) {
-						this.fail(promise, reason)
-					}
-				},
-			)
 		})
-		this.destiny = promise
 		this.resolve = superResolve as (value: T) => void
 		this.reject = superReject as (reason?: any) => void
+		this.use(executor instanceof Promise ? executor : new Promise(executor))
 	}
 
 	private pass(promise: Promise<T>, value: T) {
-		if (promise === this.destiny) {
+		if (promise === this.fate) {
 			this.resolve(value)
 		}
 	}
 	private fail(promise: Promise<T>, reason: any) {
-		if (promise === this.destiny) {
+		if (promise === this.fate) {
 			this.reject(reason)
 		}
 	}
@@ -56,7 +42,7 @@ export class Future<T> extends Promise<T> {
 	public use(value: Promise<T> | T): void {
 		if (value instanceof Promise) {
 			const promise = value
-			this.destiny = promise
+			this.fate = promise
 			promise.then(
 				(resolved) => {
 					this.pass(promise, resolved)
@@ -67,7 +53,7 @@ export class Future<T> extends Promise<T> {
 			)
 		} else {
 			this.resolve(value)
-			this.destiny = undefined
+			this.fate = undefined
 		}
 	}
 }

package/internal/src/get-state/get-from-store.ts

@@ -1,8 +1,7 @@
 import type { ReadableToken } from "atom.io"
 
-import { NotFoundError } from "../not-found-error"
 import type { Store } from "../store"
-import { withdraw, withdrawOrCreate } from "../store"
+import { withdrawOrCreate } from "../store"
 import { readOrComputeValue } from "./read-or-compute-value"
 
 export function getFromStore<T>(token: ReadableToken<T>, store: Store): T {

package/internal/src/mutable/tracker.ts

@@ -66,18 +66,7 @@ export class Tracker<Mutable extends Transceiver<any>> {
 		this.unsubscribeFromInnerValue = originalInnerValue.subscribe(
 			subscriptionKey,
 			(update) => {
-				if (target.operation.open) {
-					const unsubscribe = target.on.operationClose.subscribe(
-						subscriptionKey,
-						() => {
-							unsubscribe()
-							setIntoStore(latestUpdateState, update, target)
-						},
-					)
-				} else {
-					setIntoStore(mutableState, (current) => current, target)
-					setIntoStore(latestUpdateState, update, target)
-				}
+				setIntoStore(latestUpdateState, update, target)
 			},
 		)
 		this.unsubscribeFromState = subscribeToState(
@@ -88,18 +77,7 @@ export class Tracker<Mutable extends Transceiver<any>> {
 					this.unsubscribeFromInnerValue = update.newValue.subscribe(
 						subscriptionKey,
 						(transceiverUpdate) => {
-							if (target.operation.open) {
-								const unsubscribe = target.on.operationClose.subscribe(
-									subscriptionKey,
-									() => {
-										unsubscribe()
-										setIntoStore(latestUpdateState, transceiverUpdate, target)
-									},
-								)
-							} else {
-								setIntoStore(mutableState, (current) => current, target)
-								setIntoStore(latestUpdateState, transceiverUpdate, target)
-							}
+							setIntoStore(latestUpdateState, transceiverUpdate, target)
 						},
 					)
 				}

package/internal/src/operation.ts

@@ -1,6 +1,5 @@
 import type { WritableToken } from "atom.io"
 
-import { newest } from "./lineage"
 import type { Store } from "./store"
 import { isChildStore } from "./transaction/is-root-store"
 

package/internal/src/subscribe/recall-state.ts

@@ -4,8 +4,8 @@ import type { Store } from "../store"
 
 export const recallState = <T>(state: ReadableState<T>, store: Store): T => {
 	const target = newest(store)
-	if (!target.operation.open) {
-		return target.valueMap.get(state.key)
+	if (target.operation.open) {
+		return target.operation.prev.get(state.key)
 	}
-	return target.operation.prev.get(state.key)
+	return target.valueMap.get(state.key)
 }

package/internal/src/subscribe/subscribe-to-state.ts

@@ -1,4 +1,4 @@
-import type { ReadableToken, UpdateHandler } from "atom.io"
+import type { ReadableToken, StateUpdate, UpdateHandler } from "atom.io"
 
 import type { Store } from "../store"
 import { withdrawOrCreate } from "../store"
@@ -10,12 +10,25 @@ export function subscribeToState<T>(
 	key: string,
 	store: Store,
 ): () => void {
+	function safelyHandleUpdate(update: StateUpdate<any>): void {
+		if (store.operation.open) {
+			const unsubscribe = store.on.operationClose.subscribe(
+				`state subscription ${key}`,
+				() => {
+					unsubscribe()
+					handleUpdate(update)
+				},
+			)
+		} else {
+			handleUpdate(update)
+		}
+	}
 	const state = withdrawOrCreate(token, store)
 	store.logger.info(`👀`, state.type, state.key, `Adding subscription "${key}"`)
 	const isSelector =
 		state.type === `selector` || state.type === `readonly_selector`
 	let dependencyUnsubFunctions: (() => void)[] | null = null
-	let updateHandler: UpdateHandler<T> = handleUpdate
+	let updateHandler: UpdateHandler<T> = safelyHandleUpdate
 	if (isSelector) {
 		dependencyUnsubFunctions = subscribeToRootAtoms(state, store)
 		updateHandler = (update) => {
@@ -23,7 +36,7 @@ export function subscribeToState<T>(
 				dependencyUnsubFunctions.length = 0
 				dependencyUnsubFunctions.push(...subscribeToRootAtoms(state, store))
 			}
-			handleUpdate(update)
+			safelyHandleUpdate(update)
 		}
 	}
 	const mainUnsubFunction = state.subject.subscribe(key, updateHandler)

package/introspection/dist/index.cjs

@@ -245,19 +245,7 @@ var attachTimelineFamily = (store = Internal2.IMPLICIT.STORE) => {
         ({ setSelf }) => {
           const tl = store.timelines.get(key);
           tl == null ? void 0 : tl.subject.subscribe(`introspection`, (_) => {
-            if (store.operation.open === true) {
-              const unsubscribe = store.on.operationClose.subscribe(
-                `introspection`,
-                (operationClose) => {
-                  if (operationClose.open === false) {
-                    unsubscribe();
-                    setSelf(__spreadValues({}, tl));
-                  }
-                }
-              );
-            } else {
-              setSelf(__spreadValues({}, tl));
-            }
+            setSelf(__spreadValues({}, tl));
           });
         }
       ]

package/introspection/dist/index.js

@@ -210,19 +210,7 @@ var attachTimelineFamily = (store = IMPLICIT.STORE) => {
         ({ setSelf }) => {
           const tl = store.timelines.get(key);
           tl == null ? void 0 : tl.subject.subscribe(`introspection`, (_) => {
-            if (store.operation.open === true) {
-              const unsubscribe = store.on.operationClose.subscribe(
-                `introspection`,
-                (operationClose) => {
-                  if (operationClose.open === false) {
-                    unsubscribe();
-                    setSelf(__spreadValues({}, tl));
-                  }
-                }
-              );
-            } else {
-              setSelf(__spreadValues({}, tl));
-            }
+            setSelf(__spreadValues({}, tl));
           });
         }
       ]

package/introspection/src/attach-introspection-states.ts

@@ -1,6 +1,5 @@
 import type {
 	Func,
-	ReadonlySelectorFamily,
 	ReadonlySelectorFamilyToken,
 	ReadonlySelectorToken,
 	TimelineToken,

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

@@ -1,7 +1,4 @@
-import type {
-	ReadonlySelectorFamily,
-	ReadonlySelectorFamilyToken,
-} from "atom.io"
+import type { ReadonlySelectorFamilyToken } from "atom.io"
 import type { Store, Timeline } from "atom.io/internal"
 import {
 	createRegularAtomFamily,
@@ -35,19 +32,7 @@ export const attachTimelineFamily = (
 				({ setSelf }) => {
 					const tl = store.timelines.get(key)
 					tl?.subject.subscribe(`introspection`, (_) => {
-						if (store.operation.open === true) {
-							const unsubscribe = store.on.operationClose.subscribe(
-								`introspection`,
-								(operationClose) => {
-									if (operationClose.open === false) {
-										unsubscribe()
-										setSelf({ ...tl })
-									}
-								},
-							)
-						} else {
-							setSelf({ ...tl })
-						}
+						setSelf({ ...tl })
 					})
 				},
 			],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,
@@ -48,7 +48,7 @@
     }
   },
   "devDependencies": {
-    "@testing-library/react": "15.0.6",
+    "@testing-library/react": "15.0.7",
     "@types/eslint": "npm:@types/eslint@8.56.10",
     "@types/eslint-v9": "npm:@types/eslint@8.56.10",
     "@types/estree": "1.0.5",
@@ -61,12 +61,12 @@
     "@vitest/coverage-v8": "1.6.0",
     "@vitest/ui": "1.6.0",
     "concurrently": "8.2.2",
-    "drizzle-kit": "0.20.17",
+    "drizzle-kit": "0.20.18",
     "drizzle-orm": "0.30.10",
     "eslint": "npm:eslint@8.57.0",
     "eslint-v9": "npm:eslint@9.2.0",
-    "framer-motion": "11.1.7",
-    "happy-dom": "14.7.1",
+    "framer-motion": "11.1.9",
+    "happy-dom": "14.10.1",
     "http-proxy": "1.18.1",
     "npmlog": "7.0.1",
     "postgres": "3.4.4",

package/realtime-server/dist/index.js

@@ -1,4 +1,4 @@
-import { findRelationsInStore } from '../../dist/chunk-KGZGBCYS.js';
+import { findRelationsInStore } from '../../dist/chunk-HITX3MO4.js';
 import '../../dist/chunk-FTONNX2R.js';
 import { __spreadProps, __spreadValues } from '../../dist/chunk-F2X4B4VY.js';
 import { parseJson, stringifyJson } from 'atom.io/json';

package/realtime-testing/dist/index.js

@@ -1,5 +1,5 @@
 import { myUsernameState } from '../../dist/chunk-O47EQUM6.js';
-import { editRelationsInStore } from '../../dist/chunk-KGZGBCYS.js';
+import { editRelationsInStore } from '../../dist/chunk-HITX3MO4.js';
 import '../../dist/chunk-FTONNX2R.js';
 import { recordToEntries } from '../../dist/chunk-3V3VWQ7X.js';
 import '../../dist/chunk-BWWVY5O5.js';

package/src/validators.ts

@@ -1,19 +1,13 @@
 import type {
-	MutableAtomFamily,
 	MutableAtomFamilyToken,
 	MutableAtomToken,
-	ReadableFamily,
 	ReadableFamilyToken,
 	ReadableToken,
-	ReadonlySelectorFamily,
 	ReadonlySelectorFamilyToken,
 	ReadonlySelectorToken,
-	RegularAtomFamily,
 	RegularAtomFamilyToken,
 	RegularAtomToken,
-	WritableFamily,
 	WritableFamilyToken,
-	WritableSelectorFamily,
 	WritableSelectorFamilyToken,
 	WritableSelectorToken,
 	WritableToken,