atom.io 0.38.2 → 0.39.1

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

@@ -37,7 +37,7 @@ export function createTransaction<F extends Fn>(
 				const target = newest(store)
 				const { toolkit } = childStore.transactionMeta
 				const output = options.do(toolkit, ...params)
-				applyTransaction(output, target)
+				applyTransaction<F>(target, output)
 				return output
 			} catch (thrown) {
 				abortTransaction(target)

package/src/internal/transaction/is-root-store.ts

@@ -1,4 +1,4 @@
-import type { LazyMap } from "../lazy-map"
+import type { MapOverlay } from "../overlays/map-overlay"
 import type { Store } from "../store"
 import type { Fn } from "../utility-types"
 import type { TransactionEpoch, TransactionProgress } from "."
@@ -12,7 +12,7 @@ export interface ChildStore extends Store {
 	transactionMeta: TransactionProgress<Fn>
 	parent: ChildStore | RootStore
 	child: ChildStore | null
-	valueMap: LazyMap<string, any>
+	valueMap: MapOverlay<string, any>
 }
 
 export function isRootStore(store: Store): store is RootStore {

package/src/main/events.ts

@@ -7,11 +7,12 @@ import type {
 	ReadableToken,
 	SelectorToken,
 	TransactionToken,
+	WritableToken,
 } from "./tokens"
 import type { TokenType } from "./validators"
 
 export type StateUpdate<T> = {
-	readonly oldValue: ViewOf<T>
+	readonly oldValue?: ViewOf<T>
 	readonly newValue: ViewOf<T>
 }
 
@@ -32,15 +33,25 @@ export type TimelineSelectorUpdateEvent<A extends TimelineManageable> = {
 export type StateLifecycleEvent<R extends ReadableToken<any>> =
 	| StateCreationEvent<R>
 	| StateDisposalEvent<R>
-export type StateCreationEvent<R extends ReadableToken<any>> = {
+export type StateCreationEvent<R extends ReadableToken<any>> =
+	| ReadableStateCreationEvent<R>
+	| (R extends WritableToken<any> ? WritableStateCreationEvent<R> : never)
+export type ReadableStateCreationEvent<R extends ReadableToken<any>> = {
 	type: `state_creation`
+	subType: `readable`
 	token: R
 	timestamp: number
 }
+export type WritableStateCreationEvent<W extends WritableToken<any>> = {
+	type: `state_creation`
+	subType: `writable`
+	token: W
+	timestamp: number
+	value?: TokenType<W>
+}
 export type StateDisposalEvent<R extends ReadableToken<any>> =
 	| AtomDisposalEvent<R>
 	| SelectorDisposalEvent<R>
-
 export type AtomDisposalEvent<R extends ReadableToken<any>> = {
 	type: `state_disposal`
 	subType: `atom`

package/src/main/logger.ts

@@ -1,4 +1,36 @@
 const LOGGER_ICON_DICTIONARY = {
+	// Lifecycle
+	"🔨": `Create state`,
+	"🛠️": `Install state into store`,
+	// Families
+	"👪": `Family member added`,
+	"🔥": `Family member deleted`,
+	// Cache
+	"📃": `Copy mutable`,
+	"📖": `Read from cache`,
+	"📝": `Write to cache`,
+	"❔": `Cache miss`,
+	"✨": `Value derived`,
+	"⭐": `Value set`,
+	// Operations
+	"⭕": `Operation start`,
+	"🔴": `Operation complete`,
+	"🚫": `Operation blocked`,
+	"🟢": `Operation unblocked`,
+	// Selectors
+	"🗑": `Evict cached value`,
+	"🧹": `Prepare to evict`,
+	"🧮": `Computing selector`,
+	"🔌": `Register direct dependency`,
+	"🔍": `Discover root`,
+	// Transactions
+	"📁": `Stow update`,
+	"🛫": `Begin transaction`,
+	"🛄": `Apply transaction`,
+	"🛬": `Complete transaction`,
+	"💥": `Transaction caught error`,
+	"🪂": `Abort transaction`,
+	// Timelines
 	"⌛": `Timeline event fully captured`,
 	"⏩": `Timeline redo`,
 	"⏪": `Timeline undo`,
@@ -6,51 +38,30 @@ const LOGGER_ICON_DICTIONARY = {
 	"⏮️": `Transaction undo`,
 	"⏳": `Timeline event partially captured`,
 	"⏹️": `Time-travel complete`,
-	"✅": `Realtime transaction success`,
-	"✨": `Computation complete`,
-	"💣": `Dangerous action likely to cause bad errors`,
+	// Problems
+	"💣": `Dangerous action likely to cause bad errors down the line`,
 	"❗": `Dangerous action unless in development mode`,
 	"❌": `Conflict prevents attempted action`,
-	"⭕": `Operation start`,
-	"🔴": `Operation complete`,
-	"🚫": `Operation blocked`,
-	"🟢": `Operation unblocked`,
 	"🐞": `Possible bug in AtomIO`,
+	"💁": `Advice and guidance to the developer`,
+	// Subscriptions
 	"👀": `Subscription added`,
-	"👋": `Greeting`,
-	"👍": `Realtime acknowledgment`,
-	"👪": `Family member added`,
-	"💁": `Notice`,
-	"💥": `Caught`,
-	"📁": `Stow update`,
-	"📃": `Copy mutable`,
-	"📖": `Read state`,
-	"📝": `Write state`,
+	"🙈": `Subscription canceled`,
 	"📢": `Notify subscribers`,
-	"🔄": `Realtime transaction synchronized`,
-	"🔌": `Register dependency`,
-	"🔍": `Discover root`,
-	"🔥": `Delete state`,
-	"🔧": `Create mutable atom`,
-	"🔨": `Create immutable atom`,
 
-	"🗑": `Evict cached value`,
-	"🙈": `Subscription canceled`,
+	// Realtime
 	"🚀": `Performance measure`,
-	"🛄": `Apply transaction`,
-	"🛠️": `Install atom into store`,
-	"🛫": `Begin transaction`,
-	"🛬": `Complete transaction`,
-	"🧮": `Computing selector`,
-	"🧹": `Prepare to evict`,
-	"🪂": `Abort transaction`,
+	"✅": `Realtime transaction success`,
+	"🔄": `Realtime transaction synchronized`,
 	"🤞": `Realtime optimistic update enqueued`,
 	"👈": `Realtime confirmed update enqueued`,
 	"🧑‍⚖️": `Realtime update beginning reconciliation`,
 	"🛎️": `Realtime transaction received`,
+	"👁": `Determining perspective`,
 	"🔭": `Determining realtime perspective`,
 	"🖌": `Redacting realtime update`,
-	"👁": `Determining perspective`,
+	"👋": `Realtime greeting`,
+	"👍": `Realtime acknowledgment`,
 } as const
 export type LoggerIcon = keyof typeof LOGGER_ICON_DICTIONARY
 export type TokenDenomination =

package/src/react-devtools/json-editor/editors-by-type/array-editor.tsx

@@ -3,9 +3,9 @@ import { findInStore } from "atom.io/internal"
 import type { Json, JsonTypes } from "atom.io/json"
 import { JSON_DEFAULTS } from "atom.io/json"
 import { useI, useO } from "atom.io/react"
-import { DevtoolsContext } from "atom.io/react-devtools/store"
 import { type ReactElement, useContext } from "react"
 
+import { DevtoolsContext } from "../../store"
 import type { JsonEditorComponents, SetterOrUpdater } from ".."
 import type { JsonEditorProps_INTERNAL } from "../json-editor-internal"
 import { JsonEditor_INTERNAL } from "../json-editor-internal"

package/src/react-devtools/json-editor/editors-by-type/object-editor.tsx

@@ -1,13 +1,12 @@
 import type { RegularAtomToken } from "atom.io"
 import { findInStore } from "atom.io/internal"
 import type { Json, JsonTypes } from "atom.io/json"
-import { useI } from "atom.io/react/use-i"
-import { useO } from "atom.io/react/use-o"
-import { DevtoolsContext } from "atom.io/react-devtools/store"
+import { useI, useO } from "atom.io/react"
 import type { FC, ReactElement } from "react"
 import { useContext, useRef } from "react"
 
 import { ElasticInput } from "../../elastic-input"
+import { DevtoolsContext } from "../../store"
 import type { SetterOrUpdater } from ".."
 import type { JsonEditorComponents } from "../default-components"
 import type { JsonEditorProps_INTERNAL } from "../json-editor-internal"

package/src/react-devtools/json-editor/editors-by-type/utilities/array-elements.ts

@@ -10,7 +10,7 @@ export const makeElementSetters = <T extends Json.Tree.Array>(
 	data.map((value, index) => (newValue) => {
 		set((): T => {
 			const newData = [...data]
-			newData[index] = become(newValue)(value)
+			newData[index] = become(newValue, value)
 			return newData as unknown as T
 		})
 	})

package/src/react-devtools/json-editor/editors-by-type/utilities/object-properties.ts

@@ -14,7 +14,7 @@ export const makePropertySetters = <T extends Json.Tree.Object>(
 		toEntries(data).map(([key, value]) => [
 			key,
 			(newValue: unknown) => {
-				set({ ...data, [key]: become(newValue)(value) })
+				set({ ...data, [key]: become(newValue, value) })
 			},
 		]),
 	)

package/src/realtime-client/continuity/register-and-attempt-confirmed-update.ts

@@ -3,7 +3,7 @@ import type { Fn, Store } from "atom.io/internal"
 import {
 	actUponStore,
 	getEpochNumberOfContinuity,
-	ingestTransactionUpdate,
+	ingestTransactionOutcomeEvent,
 	isRootStore,
 	setEpochNumberOfContinuity,
 	setIntoStore,
@@ -79,7 +79,7 @@ export const useRegisterAndAttemptConfirmedUpdate =
 			)
 			const reversedOptimisticUpdates = optimisticUpdates.toReversed()
 			for (const subsequentOptimistic of reversedOptimisticUpdates) {
-				ingestTransactionUpdate(`oldValue`, subsequentOptimistic, store)
+				ingestTransactionOutcomeEvent(store, subsequentOptimistic, `oldValue`)
 			}
 			store.logger.info(
 				`⏪`,
@@ -88,7 +88,7 @@ export const useRegisterAndAttemptConfirmedUpdate =
 				`undid optimistic updates:`,
 				reversedOptimisticUpdates,
 			)
-			ingestTransactionUpdate(`oldValue`, optimisticUpdate, store)
+			ingestTransactionOutcomeEvent(store, optimisticUpdate, `oldValue`)
 			store.logger.info(
 				`⏪`,
 				`continuity`,
@@ -96,7 +96,7 @@ export const useRegisterAndAttemptConfirmedUpdate =
 				`undid zeroth optimistic update`,
 				optimisticUpdate,
 			)
-			ingestTransactionUpdate(`newValue`, confirmedUpdate, store)
+			ingestTransactionOutcomeEvent(store, confirmedUpdate, `newValue`)
 			store.logger.info(
 				`⏩`,
 				`continuity`,
@@ -200,7 +200,7 @@ export const useRegisterAndAttemptConfirmedUpdate =
 					continuityKey,
 					`integrating update #${confirmed.epoch} (${confirmed.token.key} ${confirmed.id})`,
 				)
-				ingestTransactionUpdate(`newValue`, confirmed, store)
+				ingestTransactionOutcomeEvent(store, confirmed, `newValue`)
 				socket.emit(`ack:${continuityKey}`, confirmed.epoch)
 				setEpochNumberOfContinuity(store, continuityKey, confirmed.epoch)
 			} else if (isRoot && continuityEpoch !== undefined) {

package/src/realtime-server/continuity/subscribe-to-continuity-perpectives.ts

@@ -26,13 +26,13 @@ export function subscribeToContinuityPerspectives(
 			userViewState,
 			`sync-continuity:${continuityKey}:${userKey}:perspective:${perspective.resourceAtoms.key}`,
 			({ oldValue, newValue }) => {
-				const oldKeys = oldValue.map((token) => token.key)
+				const oldKeys = oldValue?.map((token) => token.key)
 				const newKeys = newValue.map((token) => token.key)
-				const concealed = oldValue.filter(
+				const concealed = oldValue?.filter(
 					(token) => !newKeys.includes(token.key),
 				)
 				const revealed = newValue
-					.filter((token) => !oldKeys.includes(token.key))
+					.filter((token) => !oldKeys?.includes(token.key))
 					.flatMap((token) => {
 						const resourceToken =
 							token.type === `mutable_atom` ? getJsonToken(store, token) : token
@@ -49,7 +49,7 @@ export function subscribeToContinuityPerspectives(
 				if (revealed.length > 0) {
 					socket?.emit(`reveal:${continuityKey}`, revealed)
 				}
-				if (concealed.length > 0) {
+				if (concealed && concealed.length > 0) {
 					socket?.emit(`conceal:${continuityKey}`, concealed)
 				}
 			},

package/dist/use-o-DXPncKmZ.js

@@ -1,47 +0,0 @@
-import { IMPLICIT, findInStore, getFromStore, setIntoStore, subscribeToState } from "atom.io/internal";
-import * as React$1 from "react";
-import { jsx } from "react/jsx-runtime";
-
-//#region src/react/store-context.tsx
-const StoreContext = React$1.createContext(IMPLICIT.STORE);
-const StoreProvider = ({ children, store = IMPLICIT.STORE }) => /* @__PURE__ */ jsx(StoreContext.Provider, {
-	value: store,
-	children
-});
-
-//#endregion
-//#region src/react/parse-state-overloads.ts
-function parseStateOverloads(store, ...rest) {
-	let token;
-	if (rest.length === 2) {
-		const family = rest[0];
-		const key = rest[1];
-		token = findInStore(store, family, key);
-	} else token = rest[0];
-	return token;
-}
-
-//#endregion
-//#region src/react/use-i.ts
-function useI(...params) {
-	const store = React$1.useContext(StoreContext);
-	const token = parseStateOverloads(store, ...params);
-	const setter = React$1.useRef(null);
-	setter.current ??= (next) => {
-		setIntoStore(store, token, next);
-	};
-	return setter.current;
-}
-
-//#endregion
-//#region src/react/use-o.ts
-function useO(...params) {
-	const store = React$1.useContext(StoreContext);
-	const token = parseStateOverloads(store, ...params);
-	const id = React$1.useId();
-	return React$1.useSyncExternalStore((dispatch) => subscribeToState(store, token, `use-o:${id}`, dispatch), () => getFromStore(store, token), () => getFromStore(store, token));
-}
-
-//#endregion
-export { StoreContext, StoreProvider, useI, useO };
-//# sourceMappingURL=use-o-DXPncKmZ.js.map

package/dist/use-o-DXPncKmZ.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-o-DXPncKmZ.js","names":["StoreContext: React.Context<Store>","React","StoreProvider: React.FC<{\n\tchildren: React.ReactNode\n\tstore?: Store\n}>","token: ReadableToken<any>","React","setter: React.RefObject<\n\t\t(<New extends T>(next: New | ((old: T) => New)) => void) | null\n\t>","React"],"sources":["../src/react/store-context.tsx","../src/react/parse-state-overloads.ts","../src/react/use-i.ts","../src/react/use-o.ts"],"sourcesContent":["import type { Store } from \"atom.io/internal\"\nimport { IMPLICIT } from \"atom.io/internal\"\nimport * as React from \"react\"\n\nexport const StoreContext: React.Context<Store> = React.createContext(\n\tIMPLICIT.STORE,\n)\n\nexport const StoreProvider: React.FC<{\n\tchildren: React.ReactNode\n\tstore?: Store\n}> = ({ children, store = IMPLICIT.STORE }) => (\n\t<StoreContext.Provider value={store}>{children}</StoreContext.Provider>\n)\n","import type {\n\tReadableFamilyToken,\n\tReadableToken,\n\tWritableFamilyToken,\n\tWritableToken,\n} from \"atom.io\"\nimport type { Store } from \"atom.io/internal\"\nimport { findInStore } from \"atom.io/internal\"\nimport type { Canonical } from \"atom.io/json\"\n\nexport function parseStateOverloads<T, K extends Canonical>(\n\tstore: Store,\n\t...rest: [WritableFamilyToken<T, K>, K] | [WritableToken<T>]\n): WritableToken<T>\n\nexport function parseStateOverloads<T, K extends Canonical>(\n\tstore: Store,\n\t...rest: [ReadableFamilyToken<T, K>, K] | [ReadableToken<T>]\n): ReadableToken<T>\n\nexport function parseStateOverloads<T, K extends Canonical>(\n\tstore: Store,\n\t...rest: [ReadableFamilyToken<T, K>, K] | [ReadableToken<T>]\n): ReadableToken<T> {\n\tlet token: ReadableToken<any>\n\tif (rest.length === 2) {\n\t\tconst family = rest[0]\n\t\tconst key = rest[1]\n\n\t\ttoken = findInStore(store, family, key)\n\t} else {\n\t\ttoken = rest[0]\n\t}\n\treturn token\n}\n","import type { WritableFamilyToken, WritableToken } from \"atom.io\"\nimport { setIntoStore } from \"atom.io/internal\"\nimport type { Canonical } from \"atom.io/json\"\nimport * as React from \"react\"\n\nimport { parseStateOverloads } from \"./parse-state-overloads\"\nimport { StoreContext } from \"./store-context\"\n\nexport function useI<T>(\n\ttoken: WritableToken<T>,\n): <New extends T>(next: New | ((old: T) => New)) => void\n\nexport function useI<T, K extends Canonical>(\n\ttoken: WritableFamilyToken<T, K>,\n\tkey: K,\n): <New extends T>(next: New | ((old: T) => New)) => void\n\nexport function useI<T, K extends Canonical>(\n\t...params: [WritableFamilyToken<T, K>, K] | [WritableToken<T>]\n): <New extends T>(next: New | ((old: T) => New)) => void {\n\tconst store = React.useContext(StoreContext)\n\tconst token = parseStateOverloads(store, ...params)\n\tconst setter: React.RefObject<\n\t\t(<New extends T>(next: New | ((old: T) => New)) => void) | null\n\t> = React.useRef(null)\n\tsetter.current ??= (next) => {\n\t\tsetIntoStore(store, token, next)\n\t}\n\treturn setter.current\n}\n","import type { ReadableFamilyToken, ReadableToken } from \"atom.io\"\nimport { getFromStore, subscribeToState } from \"atom.io/internal\"\nimport type { Canonical } from \"atom.io/json\"\nimport * as React from \"react\"\n\nimport { parseStateOverloads } from \"./parse-state-overloads\"\nimport { StoreContext } from \"./store-context\"\n\nexport function useO<T>(token: ReadableToken<T>): T\n\nexport function useO<T, K extends Canonical>(\n\ttoken: ReadableFamilyToken<T, K>,\n\tkey: K,\n): T\n\nexport function useO<T, K extends Canonical>(\n\t...params: [ReadableFamilyToken<T, K>, K] | [ReadableToken<T>]\n): T {\n\tconst store = React.useContext(StoreContext)\n\tconst token = parseStateOverloads(store, ...params)\n\tconst id = React.useId()\n\treturn React.useSyncExternalStore<T>(\n\t\t(dispatch) => subscribeToState(store, token, `use-o:${id}`, dispatch),\n\t\t() => getFromStore(store, token),\n\t\t() => getFromStore(store, token),\n\t)\n}\n"],"mappings":";;;;;AAIA,MAAaA,eAAqCC,QAAM,cACvD,SAAS;AAGV,MAAaC,iBAGP,EAAE,UAAU,QAAQ,SAAS,OAAO,KACzC,oBAAC,aAAa;CAAS,OAAO;CAAQ;;;;;ACQvC,SAAgB,oBACf,OACA,GAAG,MACgB;CACnB,IAAIC;AACJ,KAAI,KAAK,WAAW,GAAG;EACtB,MAAM,SAAS,KAAK;EACpB,MAAM,MAAM,KAAK;AAEjB,UAAQ,YAAY,OAAO,QAAQ;CACnC,MACA,SAAQ,KAAK;AAEd,QAAO;AACP;;;;ACjBD,SAAgB,KACf,GAAG,QACsD;CACzD,MAAM,QAAQC,QAAM,WAAW;CAC/B,MAAM,QAAQ,oBAAoB,OAAO,GAAG;CAC5C,MAAMC,SAEFD,QAAM,OAAO;AACjB,QAAO,aAAa,SAAS;AAC5B,eAAa,OAAO,OAAO;CAC3B;AACD,QAAO,OAAO;AACd;;;;ACdD,SAAgB,KACf,GAAG,QACC;CACJ,MAAM,QAAQE,QAAM,WAAW;CAC/B,MAAM,QAAQ,oBAAoB,OAAO,GAAG;CAC5C,MAAM,KAAKA,QAAM;AACjB,QAAOA,QAAM,sBACX,aAAa,iBAAiB,OAAO,OAAO,SAAS,MAAM,iBACtD,aAAa,OAAO,cACpB,aAAa,OAAO;AAE3B"}

package/src/internal/families/init-family-member.ts

@@ -1,33 +0,0 @@
-import type {
-	ReadableFamilyToken,
-	ReadableToken,
-	WritableFamilyToken,
-	WritableToken,
-} from "atom.io"
-import type { Canonical } from "atom.io/json"
-
-import type { Store } from "../store"
-import { withdraw } from "../store"
-
-export function initFamilyMemberInStore<T, K extends Canonical, Key extends K>(
-	store: Store,
-	token: WritableFamilyToken<T, K>,
-	key: Key,
-): WritableToken<T, K>
-
-export function initFamilyMemberInStore<T, K extends Canonical, Key extends K>(
-	store: Store,
-	token: ReadableFamilyToken<T, K>,
-	key: Key,
-): ReadableToken<T, K>
-
-export function initFamilyMemberInStore(
-	store: Store,
-	token: ReadableFamilyToken<any, any>,
-	key: Canonical,
-): ReadableToken<any> {
-	const family = withdraw(store, token)
-	const state = family(key)
-
-	return state
-}

package/src/internal/ingest-updates/ingest-transaction-update.ts

@@ -1,47 +0,0 @@
-import type { TransactionOutcomeEvent } from "atom.io"
-
-import type { Store } from "../store"
-import { ingestAtomUpdate } from "./ingest-atom-update"
-import {
-	ingestCreationEvent,
-	ingestDisposalEvent,
-	ingestMoleculeCreationEvent,
-	ingestMoleculeDisposalEvent,
-	ingestMoleculeTransferEvent,
-} from "./ingest-creation-disposal"
-
-export function ingestTransactionUpdate(
-	applying: `newValue` | `oldValue`,
-	transactionUpdate: TransactionOutcomeEvent<any>,
-	store: Store,
-): void {
-	const updates =
-		applying === `newValue`
-			? transactionUpdate.subEvents
-			: [...transactionUpdate.subEvents].reverse()
-	for (const updateFromTransaction of updates) {
-		switch (updateFromTransaction.type) {
-			case `atom_update`:
-				ingestAtomUpdate(applying, updateFromTransaction, store)
-				break
-			case `state_creation`:
-				ingestCreationEvent(updateFromTransaction, applying, store)
-				break
-			case `state_disposal`:
-				ingestDisposalEvent(updateFromTransaction, applying, store)
-				break
-			case `molecule_creation`:
-				ingestMoleculeCreationEvent(updateFromTransaction, applying, store)
-				break
-			case `molecule_disposal`:
-				ingestMoleculeDisposalEvent(updateFromTransaction, applying, store)
-				break
-			case `molecule_transfer`:
-				ingestMoleculeTransferEvent(updateFromTransaction, applying, store)
-				break
-			case `transaction_outcome`:
-				ingestTransactionUpdate(applying, updateFromTransaction, store)
-				break
-		}
-	}
-}