atom.io 0.20.0 → 0.20.2

package/dist/index.d.ts

@@ -174,6 +174,7 @@ 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\uDC1E": "Possible bug in AtomIO";

package/internal/dist/index.cjs

@@ -774,11 +774,11 @@ var become = (nextVersionOfThing) => (originalThing) => nextVersionOfThing insta
 // internal/src/operation.ts
 var openOperation = (token, store) => {
   if (store.operation.open) {
-    store.logger.error(
-      `\u274C`,
+    store.logger.warn(
+      `\u2757`,
       token.type,
       token.key,
-      `failed to setState during a setState for "${store.operation.token.key}"`
+      `tried to setState, but must wait until setState for "${store.operation.token.key}" completes`
     );
     return `rejection`;
   }
@@ -991,6 +991,13 @@ var setAtomOrSelector = (state, value, store) => {
 function setIntoStore(token, value, store) {
   const rejection = openOperation(token, store);
   if (rejection) {
+    const unsubscribe = store.on.operationClose.subscribe(
+      `waiting to set "${token.key}"`,
+      () => {
+        unsubscribe();
+        setIntoStore(token, value, store);
+      }
+    );
     return;
   }
   const state = withdrawOrCreate(token, store);
@@ -1291,32 +1298,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 = 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.js

@@ -496,11 +496,11 @@ var become = (nextVersionOfThing) => (originalThing) => nextVersionOfThing insta
 // internal/src/operation.ts
 var openOperation = (token, store) => {
   if (store.operation.open) {
-    store.logger.error(
-      `\u274C`,
+    store.logger.warn(
+      `\u2757`,
       token.type,
       token.key,
-      `failed to setState during a setState for "${store.operation.token.key}"`
+      `tried to setState, but must wait until setState for "${store.operation.token.key}" completes`
     );
     return `rejection`;
   }
@@ -713,6 +713,13 @@ var setAtomOrSelector = (state, value, store) => {
 function setIntoStore(token, value, store) {
   const rejection = openOperation(token, store);
   if (rejection) {
+    const unsubscribe = store.on.operationClose.subscribe(
+      `waiting to set "${token.key}"`,
+      () => {
+        unsubscribe();
+        setIntoStore(token, value, store);
+      }
+    );
     return;
   }
   const state = withdrawOrCreate(token, store);
@@ -1013,32 +1020,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 = 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

@@ -21,11 +21,11 @@ export const openOperation = (
 	store: Store,
 ): `rejection` | undefined => {
 	if (store.operation.open) {
-		store.logger.error(
-			`❌`,
+		store.logger.warn(
+			`❗`,
 			token.type,
 			token.key,
-			`failed to setState during a setState for "${store.operation.token.key}"`,
+			`tried to setState, but must wait until setState for "${store.operation.token.key}" completes`,
 		)
 		return `rejection`
 	}

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

@@ -1,6 +1,5 @@
 import type { WritableToken } from "atom.io"
 
-import { NotFoundError } from "../not-found-error"
 import { closeOperation, openOperation } from "../operation"
 import type { Store } from "../store"
 import { withdrawOrCreate } from "../store"
@@ -13,6 +12,13 @@ export function setIntoStore<T, New extends T>(
 ): void {
 	const rejection = openOperation(token, store)
 	if (rejection) {
+		const unsubscribe = store.on.operationClose.subscribe(
+			`waiting to set "${token.key}"`,
+			() => {
+				unsubscribe()
+				setIntoStore(token, value, store)
+			},
+		)
 		return
 	}
 	const state = withdrawOrCreate(token, store)

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 = 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.0",
+  "version": "0.20.2",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,
@@ -48,18 +48,18 @@
     }
   },
   "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.0",
     "@types/tmp": "0.2.6",
     "@typescript-eslint/parser": "7.7.1",
     "@typescript-eslint/rule-tester": "7.7.1",
-    "@vitest/coverage-v8": "1.5.1",
-    "@vitest/ui": "1.5.1",
+    "@vitest/coverage-v8": "1.5.2",
+    "@vitest/ui": "1.5.2",
     "concurrently": "8.2.2",
     "drizzle-kit": "0.20.17",
     "drizzle-orm": "0.30.9",
@@ -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.0",
+    "react-dom": "18.3.0",
     "react-router-dom": "6.23.0",
     "socket.io": "4.7.5",
     "socket.io-client": "4.7.5",
@@ -81,7 +81,7 @@
     "typescript": "5.4.5",
     "vite": "5.2.10",
     "vite-tsconfig-paths": "4.3.2",
-    "vitest": "1.5.1"
+    "vitest": "1.5.2"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/logger.ts

@@ -8,6 +8,7 @@ const LoggerIconDictionary = {
 	"⏹️": `Time-travel complete`,
 	"✅": `Realtime transaction success`,
 	"✨": `Computation complete`,
+	"❗": `Must wait to proceed with attempted action`,
 	"❌": `Conflict prevents attempted action`,
 	"⭕": `Operation start`,
 	"🐞": `Possible bug in AtomIO`,