atom.io 0.16.0 → 0.16.2

package/internal/src/mutable/tracker.ts

@@ -53,6 +53,9 @@ export class Tracker<Mutable extends Transceiver<any>> {
 		latestUpdateState: RegularAtomToken<typeof this.Update | null>,
 		store: Store,
 	): void {
+		const subscriptionKey = `tracker:${store.config.name}:${
+			store.transactionMeta === null ? `main` : store.transactionMeta.update.key
+		}:${mutableState.key}`
 		const originalInnerValue = getState(mutableState, store)
 		const target = newest(store)
 		this.unsubscribeFromInnerValue = originalInnerValue.subscribe(
@@ -64,7 +67,7 @@ export class Tracker<Mutable extends Transceiver<any>> {
 			(update) => {
 				if (target.operation.open) {
 					const unsubscribe = target.on.operationClose.subscribe(
-						mutableState.key,
+						subscriptionKey,
 						() => {
 							unsubscribe()
 							setState(latestUpdateState, update, target)
@@ -83,15 +86,11 @@ export class Tracker<Mutable extends Transceiver<any>> {
 					this.unsubscribeFromInnerValue()
 					const target = newest(store)
 					this.unsubscribeFromInnerValue = update.newValue.subscribe(
-						`tracker:${store.config.name}:${
-							target.transactionMeta === null
-								? `main`
-								: target.transactionMeta.update.key
-						}`,
+						subscriptionKey,
 						(update) => {
 							if (target.operation.open) {
 								const unsubscribe = target.on.operationClose.subscribe(
-									mutableState.key,
+									subscriptionKey,
 									() => {
 										unsubscribe()
 										setState(latestUpdateState, update, target)
@@ -105,7 +104,7 @@ export class Tracker<Mutable extends Transceiver<any>> {
 					)
 				}
 			},
-			`${store.config.name}: tracker observing inner value`,
+			subscriptionKey,
 			store,
 		)
 	}
@@ -115,6 +114,9 @@ export class Tracker<Mutable extends Transceiver<any>> {
 		latestUpdateState: RegularAtomToken<typeof this.Update | null>,
 		store: Store,
 	): void {
+		const subscriptionKey = `tracker:${store.config.name}:${
+			store.transactionMeta === null ? `main` : store.transactionMeta.update.key
+		}:${mutableState.key}`
 		subscribeToState(
 			latestUpdateState,
 			({ newValue, oldValue }) => {
@@ -141,7 +143,7 @@ export class Tracker<Mutable extends Transceiver<any>> {
 									store,
 								)
 							},
-							`${mutableState.key}: tracker observing timeline`,
+							subscriptionKey,
 							store,
 						)
 						return
@@ -149,7 +151,7 @@ export class Tracker<Mutable extends Transceiver<any>> {
 				}
 
 				const unsubscribe = store.on.operationClose.subscribe(
-					latestUpdateState.key,
+					subscriptionKey,
 					() => {
 						unsubscribe()
 						const mutable = getState(mutableState, store)
@@ -168,7 +170,7 @@ export class Tracker<Mutable extends Transceiver<any>> {
 					},
 				)
 			},
-			`${store.config.name}: tracker observing latest update`,
+			subscriptionKey,
 			store,
 		)
 	}

package/internal/src/selector/create-readonly-selector.ts

@@ -19,10 +19,10 @@ export const createReadonlySelector = <T>(
 	const target = newest(store)
 	const subject = new Subject<{ newValue: T; oldValue: T }>()
 
-	const { get, find } = registerSelector(options.key, store)
+	const { get, find } = registerSelector(options.key, target)
 	const getSelf = () => {
 		const value = options.get({ get, find })
-		cacheValue(options.key, value, subject, store)
+		cacheValue(options.key, value, subject, newest(store))
 		return value
 	}
 

package/internal/src/selector/create-writable-selector.ts

@@ -20,7 +20,7 @@ export const createWritableSelector = <T>(
 ): WritableSelectorToken<T> => {
 	const target = newest(store)
 	const subject = new Subject<{ newValue: T; oldValue: T }>()
-	const transactors = registerSelector(options.key, store)
+	const transactors = registerSelector(options.key, target)
 	const { find, get } = transactors
 	const readonlyTransactors = { find, get }
 

package/internal/src/set-state/copy-mutable-if-needed.ts

@@ -1,5 +1,3 @@
-import type { JsonInterface } from "atom.io/json"
-
 import type { MutableAtom, Transceiver } from ".."
 import { Tracker } from "../mutable"
 import type { Store } from "../store"

package/internal/src/set-state/set-atom.ts

@@ -29,11 +29,14 @@ export const setAtom = <T>(
 	const update = { oldValue, newValue }
 	if (target.transactionMeta === null) {
 		emitUpdate(atom, update, target)
-	} else if (target.on.transactionApplying && target.parent) {
-		stowUpdate(atom, update, target)
-		if (atom.key.startsWith(`*`)) {
+	} else if (target.parent) {
+		if (target.on.transactionApplying.state === null) {
+			stowUpdate(atom, update, target)
+		} else if (atom.key.startsWith(`*`)) {
 			const mutableKey = atom.key.slice(1)
-			const mutable: Transceiver<any> = target.valueMap.get(mutableKey)
+			const mutableAtom = target.atoms.get(mutableKey) as Atom<any>
+			let mutable: Transceiver<any> = target.valueMap.get(mutableKey)
+			mutable = copyMutableIfWithinTransaction(mutable, mutableAtom, target)
 			mutable.do(update.newValue)
 		}
 	}

package/internal/src/store/store.ts

@@ -6,7 +6,6 @@ import type {
 	ReadonlySelectorFamily,
 	ReadonlySelectorToken,
 	RegularAtomFamily,
-	RegularAtomToken,
 	TimelineToken,
 	TransactionToken,
 	WritableSelectorFamily,

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

@@ -52,7 +52,7 @@ export const buildTransaction = (
 		transactors: {
 			get: (token) => getState(token, child),
 			set: (token, value) => setState(token, value, child),
-			run: (token) => runTransaction(token, child),
+			run: (token, id) => runTransaction(token, id, child),
 			find: ((token, key) => findInStore(token, key, child)) as typeof findState,
 			env: () => getEnvironmentData(child),
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.16.0",
+  "version": "0.16.2",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,
@@ -53,29 +53,29 @@
     "@types/npmlog": "7.0.0",
     "@types/react": "18.2.47",
     "@types/tmp": "0.2.6",
-    "@vitest/coverage-v8": "1.1.3",
-    "@vitest/ui": "1.1.3",
+    "@vitest/coverage-v8": "1.2.0",
+    "@vitest/ui": "1.2.0",
     "concurrently": "8.2.2",
-    "drizzle-kit": "0.20.10",
+    "drizzle-kit": "0.20.12",
     "drizzle-orm": "0.29.3",
     "eslint": "8.56.0",
-    "framer-motion": "10.17.12",
-    "happy-dom": "12.10.3",
+    "framer-motion": "10.18.0",
+    "happy-dom": "13.1.4",
     "http-proxy": "1.18.1",
     "npmlog": "7.0.1",
     "postgres": "3.4.3",
     "preact": "10.19.3",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-router-dom": "6.21.1",
-    "socket.io": "4.7.3",
-    "socket.io-client": "4.7.3",
+    "react-router-dom": "6.21.2",
+    "socket.io": "4.7.4",
+    "socket.io-client": "4.7.4",
     "tmp": "0.2.1",
     "tsup": "8.0.1",
     "typescript": "5.3.3",
     "vite": "5.0.11",
     "vite-tsconfig-paths": "4.2.3",
-    "vitest": "1.1.3"
+    "vitest": "1.2.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -220,7 +220,7 @@
     "build:realtime-server": "cd realtime-server && tsup",
     "build:realtime-testing": "cd realtime-testing && tsup",
     "build:transceivers:set-rtx": "cd transceivers/set-rtx && tsup",
-    "lint:biome": "biome check .",
+    "lint:biome": "biome check --diagnostic-level=warn -- .",
     "lint:eslint": "eslint .",
     "lint": "npm run lint:biome && npm run lint:eslint",
     "test": "vitest",

package/react-devtools/dist/index.cjs

@@ -2302,7 +2302,6 @@ var Id = ({ id }) => {
     /* @__PURE__ */ jsxRuntime.jsx(
       "span",
       __spreadProps(__spreadValues({
-        role: "content",
         ref: refs.setReference
       }, getReferenceProps()), {
         style: {
@@ -2319,7 +2318,6 @@ var Id = ({ id }) => {
     isOpen && /* @__PURE__ */ jsxRuntime.jsx(react$1.FloatingPortal, { children: /* @__PURE__ */ jsxRuntime.jsx(
       "span",
       __spreadProps(__spreadValues({
-        role: "popup",
         ref: refs.setFloating
       }, getFloatingProps()), {
         style: __spreadProps(__spreadValues({}, floatingStyles), {