atom.io 0.20.1 → 0.20.3

package/dist/index.d.ts

@@ -174,9 +174,11 @@ declare const LoggerIconDictionary: {
     readonly "\u23F9\uFE0F": "Time-travel complete";
     readonly "\u2705": "Realtime transaction success";
     readonly "\u2728": "Computation complete";
-    readonly "\u2757": "Must wait to proceed with attempted action";
     readonly "\u274C": "Conflict prevents attempted action";
     readonly "\u2B55": "Operation start";
+    readonly "\uD83D\uDD34": "Operation complete";
+    readonly "\u2757": "Operation blocked";
+    readonly "\uD83D\uDFE2": "Operation unblocked";
     readonly "\uD83D\uDC1E": "Possible bug in AtomIO";
     readonly "\uD83D\uDC40": "Subscription added";
     readonly "\uD83D\uDC4B": "Greeting";
@@ -195,7 +197,6 @@ declare const LoggerIconDictionary: {
     readonly "\uD83D\uDD25": "Delete state";
     readonly "\uD83D\uDD27": "Create mutable atom";
     readonly "\uD83D\uDD28": "Create immutable atom";
-    readonly "\uD83D\uDD34": "Operation complete";
     readonly "\uD83D\uDDD1": "Evict cached value";
     readonly "\uD83D\uDE48": "Subscription canceled";
     readonly "\uD83D\uDE80": "Performance measure";

package/internal/dist/index.cjs

@@ -774,13 +774,14 @@ var become = (nextVersionOfThing) => (originalThing) => nextVersionOfThing insta
 // internal/src/operation.ts
 var openOperation = (token, store) => {
   if (store.operation.open) {
-    store.logger.warn(
+    const rejectionTime = performance.now();
+    store.logger.info(
       `\u2757`,
       token.type,
       token.key,
-      `tried to setState, but must wait until setState for "${store.operation.token.key}" completes`
+      `deferring setState at T-${rejectionTime} until setState for "${store.operation.token.key}" is done`
     );
-    return `rejection`;
+    return rejectionTime;
   }
   store.operation = {
     open: true,
@@ -989,12 +990,18 @@ var setAtomOrSelector = (state, value, store) => {
 
 // internal/src/set-state/set-into-store.ts
 function setIntoStore(token, value, store) {
-  const rejection = openOperation(token, store);
-  if (rejection) {
+  const rejectionTime = openOperation(token, store);
+  if (rejectionTime) {
     const unsubscribe = store.on.operationClose.subscribe(
-      `waiting to set "${token.key}"`,
+      `waiting to set "${token.key}" at T-${rejectionTime}`,
       () => {
         unsubscribe();
+        store.logger.info(
+          `\u{1F7E2}`,
+          token.type,
+          token.key,
+          `resuming deferred setState from T-${rejectionTime}`
+        );
         setIntoStore(token, value, store);
       }
     );
@@ -1298,32 +1305,33 @@ var subscribeToRootAtoms = (selector, store) => {
 // internal/src/subscribe/subscribe-to-state.ts
 function subscribeToState(token, handleUpdate, key, store) {
   const state = withdrawOrCreate(token, store);
-  if (state === void 0) {
-    throw new Error(
-      `State "${token.key}" not found in this store. Did you forget to initialize with the "atom" or "selector" function?`
-    );
-  }
-  const unsubFunction = state.subject.subscribe(key, handleUpdate);
   store.logger.info(`\u{1F440}`, state.type, state.key, `Adding subscription "${key}"`);
-  const dependencyUnsubFunctions = state.type !== `atom` && state.type !== `mutable_atom` ? subscribeToRootAtoms(state, store) : null;
-  const unsubscribe = dependencyUnsubFunctions === null ? () => {
-    store.logger.info(
-      `\u{1F648}`,
-      state.type,
-      state.key,
-      `Removing subscription "${key}"`
-    );
-    unsubFunction();
-  } : () => {
+  const isSelector = state.type === `selector` || state.type === `readonly_selector`;
+  let dependencyUnsubFunctions = null;
+  let updateHandler = handleUpdate;
+  if (isSelector) {
+    dependencyUnsubFunctions = subscribeToRootAtoms(state, store);
+    updateHandler = (update) => {
+      if (dependencyUnsubFunctions) {
+        dependencyUnsubFunctions.length = 0;
+        dependencyUnsubFunctions.push(...subscribeToRootAtoms(state, store));
+      }
+      handleUpdate(update);
+    };
+  }
+  const mainUnsubFunction = state.subject.subscribe(key, updateHandler);
+  const unsubscribe = () => {
     store.logger.info(
       `\u{1F648}`,
       state.type,
       state.key,
       `Removing subscription "${key}"`
     );
-    unsubFunction();
-    for (const unsubFromDependency of dependencyUnsubFunctions) {
-      unsubFromDependency();
+    mainUnsubFunction();
+    if (dependencyUnsubFunctions) {
+      for (const unsubFromDependency of dependencyUnsubFunctions) {
+        unsubFromDependency();
+      }
     }
   };
   return unsubscribe;

package/internal/dist/index.d.ts

@@ -162,7 +162,7 @@ type OperationProgress = {
     time: number;
     token: WritableToken<any>;
 };
-declare const openOperation: (token: WritableToken<any>, store: Store) => `rejection` | undefined;
+declare const openOperation: (token: WritableToken<any>, store: Store) => number | undefined;
 declare const closeOperation: (store: Store) => void;
 declare const isDone: (key: string, store: Store) => boolean;
 declare const markDone: (key: string, store: Store) => void;
@@ -447,7 +447,7 @@ declare const setAtomOrSelector: <T>(state: WritableState<T>, value: T | ((oldVa
 
 declare function setIntoStore<T, New extends T>(token: WritableToken<T>, value: New | ((oldValue: T) => New), store: Store): void;
 
-declare const subscribeToRootAtoms: <T>(selector: Selector<T>, store: Store) => (() => void)[] | null;
+declare const subscribeToRootAtoms: <T>(selector: Selector<T>, store: Store) => (() => void)[];
 
 declare function subscribeToState<T>(token: ReadableToken<T>, handleUpdate: UpdateHandler<T>, key: string, store: Store): () => void;
 

package/internal/dist/index.js

@@ -496,13 +496,14 @@ var become = (nextVersionOfThing) => (originalThing) => nextVersionOfThing insta
 // internal/src/operation.ts
 var openOperation = (token, store) => {
   if (store.operation.open) {
-    store.logger.warn(
+    const rejectionTime = performance.now();
+    store.logger.info(
       `\u2757`,
       token.type,
       token.key,
-      `tried to setState, but must wait until setState for "${store.operation.token.key}" completes`
+      `deferring setState at T-${rejectionTime} until setState for "${store.operation.token.key}" is done`
     );
-    return `rejection`;
+    return rejectionTime;
   }
   store.operation = {
     open: true,
@@ -711,12 +712,18 @@ var setAtomOrSelector = (state, value, store) => {
 
 // internal/src/set-state/set-into-store.ts
 function setIntoStore(token, value, store) {
-  const rejection = openOperation(token, store);
-  if (rejection) {
+  const rejectionTime = openOperation(token, store);
+  if (rejectionTime) {
     const unsubscribe = store.on.operationClose.subscribe(
-      `waiting to set "${token.key}"`,
+      `waiting to set "${token.key}" at T-${rejectionTime}`,
       () => {
         unsubscribe();
+        store.logger.info(
+          `\u{1F7E2}`,
+          token.type,
+          token.key,
+          `resuming deferred setState from T-${rejectionTime}`
+        );
         setIntoStore(token, value, store);
       }
     );
@@ -1020,32 +1027,33 @@ var subscribeToRootAtoms = (selector, store) => {
 // internal/src/subscribe/subscribe-to-state.ts
 function subscribeToState(token, handleUpdate, key, store) {
   const state = withdrawOrCreate(token, store);
-  if (state === void 0) {
-    throw new Error(
-      `State "${token.key}" not found in this store. Did you forget to initialize with the "atom" or "selector" function?`
-    );
-  }
-  const unsubFunction = state.subject.subscribe(key, handleUpdate);
   store.logger.info(`\u{1F440}`, state.type, state.key, `Adding subscription "${key}"`);
-  const dependencyUnsubFunctions = state.type !== `atom` && state.type !== `mutable_atom` ? subscribeToRootAtoms(state, store) : null;
-  const unsubscribe = dependencyUnsubFunctions === null ? () => {
-    store.logger.info(
-      `\u{1F648}`,
-      state.type,
-      state.key,
-      `Removing subscription "${key}"`
-    );
-    unsubFunction();
-  } : () => {
+  const isSelector = state.type === `selector` || state.type === `readonly_selector`;
+  let dependencyUnsubFunctions = null;
+  let updateHandler = handleUpdate;
+  if (isSelector) {
+    dependencyUnsubFunctions = subscribeToRootAtoms(state, store);
+    updateHandler = (update) => {
+      if (dependencyUnsubFunctions) {
+        dependencyUnsubFunctions.length = 0;
+        dependencyUnsubFunctions.push(...subscribeToRootAtoms(state, store));
+      }
+      handleUpdate(update);
+    };
+  }
+  const mainUnsubFunction = state.subject.subscribe(key, updateHandler);
+  const unsubscribe = () => {
     store.logger.info(
       `\u{1F648}`,
       state.type,
       state.key,
       `Removing subscription "${key}"`
     );
-    unsubFunction();
-    for (const unsubFromDependency of dependencyUnsubFunctions) {
-      unsubFromDependency();
+    mainUnsubFunction();
+    if (dependencyUnsubFunctions) {
+      for (const unsubFromDependency of dependencyUnsubFunctions) {
+        unsubFromDependency();
+      }
     }
   };
   return unsubscribe;

package/internal/src/operation.ts

@@ -19,15 +19,16 @@ export type OperationProgress =
 export const openOperation = (
 	token: WritableToken<any>,
 	store: Store,
-): `rejection` | undefined => {
+): number | undefined => {
 	if (store.operation.open) {
-		store.logger.warn(
+		const rejectionTime = performance.now()
+		store.logger.info(
 			`❗`,
 			token.type,
 			token.key,
-			`tried to setState, but must wait until setState for "${store.operation.token.key}" completes`,
+			`deferring setState at T-${rejectionTime} until setState for "${store.operation.token.key}" is done`,
 		)
-		return `rejection`
+		return rejectionTime
 	}
 	store.operation = {
 		open: true,

package/internal/src/set-state/set-into-store.ts

@@ -10,12 +10,18 @@ export function setIntoStore<T, New extends T>(
 	value: New | ((oldValue: T) => New),
 	store: Store,
 ): void {
-	const rejection = openOperation(token, store)
-	if (rejection) {
+	const rejectionTime = openOperation(token, store)
+	if (rejectionTime) {
 		const unsubscribe = store.on.operationClose.subscribe(
-			`waiting to set "${token.key}"`,
+			`waiting to set "${token.key}" at T-${rejectionTime}`,
 			() => {
 				unsubscribe()
+				store.logger.info(
+					`🟢`,
+					token.type,
+					token.key,
+					`resuming deferred setState from T-${rejectionTime}`,
+				)
 				setIntoStore(token, value, store)
 			},
 		)

package/internal/src/subscribe/subscribe-to-root-atoms.ts

@@ -8,7 +8,7 @@ import { recallState } from "./recall-state"
 export const subscribeToRootAtoms = <T>(
 	selector: Selector<T>,
 	store: Store,
-): (() => void)[] | null => {
+): (() => void)[] => {
 	const target = newest(store)
 	const dependencySubscriptions = traceAllSelectorAtoms(selector, store).map(
 		(atomKey) => {

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

@@ -11,41 +11,36 @@ export function subscribeToState<T>(
 	store: Store,
 ): () => void {
 	const state = withdrawOrCreate(token, store)
-	if (state === undefined) {
-		throw new Error(
-			`State "${token.key}" not found in this store. Did you forget to initialize with the "atom" or "selector" function?`,
+	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
+	if (isSelector) {
+		dependencyUnsubFunctions = subscribeToRootAtoms(state, store)
+		updateHandler = (update) => {
+			if (dependencyUnsubFunctions) {
+				dependencyUnsubFunctions.length = 0
+				dependencyUnsubFunctions.push(...subscribeToRootAtoms(state, store))
+			}
+			handleUpdate(update)
+		}
+	}
+	const mainUnsubFunction = state.subject.subscribe(key, updateHandler)
+	const unsubscribe = () => {
+		store.logger.info(
+			`🙈`,
+			state.type,
+			state.key,
+			`Removing subscription "${key}"`,
 		)
+		mainUnsubFunction()
+		if (dependencyUnsubFunctions) {
+			for (const unsubFromDependency of dependencyUnsubFunctions) {
+				unsubFromDependency()
+			}
+		}
 	}
-	const unsubFunction = state.subject.subscribe(key, handleUpdate)
-	store.logger.info(`👀`, state.type, state.key, `Adding subscription "${key}"`)
-	const dependencyUnsubFunctions =
-		state.type !== `atom` && state.type !== `mutable_atom`
-			? subscribeToRootAtoms(state, store)
-			: null
-
-	const unsubscribe =
-		dependencyUnsubFunctions === null
-			? () => {
-					store.logger.info(
-						`🙈`,
-						state.type,
-						state.key,
-						`Removing subscription "${key}"`,
-					)
-					unsubFunction()
-				}
-			: () => {
-					store.logger.info(
-						`🙈`,
-						state.type,
-						state.key,
-						`Removing subscription "${key}"`,
-					)
-					unsubFunction()
-					for (const unsubFromDependency of dependencyUnsubFunctions) {
-						unsubFromDependency()
-					}
-				}
 
 	return unsubscribe
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.20.1",
+  "version": "0.20.3",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,
@@ -48,16 +48,16 @@
     }
   },
   "devDependencies": {
-    "@testing-library/react": "15.0.4",
+    "@testing-library/react": "15.0.5",
     "@types/eslint": "npm:@types/eslint@8.56.10",
     "@types/eslint-v9": "npm:@types/eslint@8.56.10",
     "@types/estree": "1.0.5",
     "@types/http-proxy": "1.17.14",
     "@types/npmlog": "7.0.0",
-    "@types/react": "18.2.79",
+    "@types/react": "18.3.1",
     "@types/tmp": "0.2.6",
-    "@typescript-eslint/parser": "7.7.1",
-    "@typescript-eslint/rule-tester": "7.7.1",
+    "@typescript-eslint/parser": "7.8.0",
+    "@typescript-eslint/rule-tester": "7.8.0",
     "@vitest/coverage-v8": "1.5.2",
     "@vitest/ui": "1.5.2",
     "concurrently": "8.2.2",
@@ -71,8 +71,8 @@
     "npmlog": "7.0.1",
     "postgres": "3.4.4",
     "preact": "10.20.2",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-router-dom": "6.23.0",
     "socket.io": "4.7.5",
     "socket.io-client": "4.7.5",

package/src/logger.ts

@@ -8,9 +8,11 @@ const LoggerIconDictionary = {
 	"⏹️": `Time-travel complete`,
 	"✅": `Realtime transaction success`,
 	"✨": `Computation complete`,
-	"❗": `Must wait to proceed with attempted action`,
 	"❌": `Conflict prevents attempted action`,
 	"⭕": `Operation start`,
+	"🔴": `Operation complete`,
+	"❗": `Operation blocked`,
+	"🟢": `Operation unblocked`,
 	"🐞": `Possible bug in AtomIO`,
 	"👀": `Subscription added`,
 	"👋": `Greeting`,
@@ -29,7 +31,7 @@ const LoggerIconDictionary = {
 	"🔥": `Delete state`,
 	"🔧": `Create mutable atom`,
 	"🔨": `Create immutable atom`,
-	"🔴": `Operation complete`,
+
 	"🗑": `Evict cached value`,
 	"🙈": `Subscription canceled`,
 	"🚀": `Performance measure`,