atom.io 0.21.1 → 0.22.0

package/internal/src/selector/register-selector.ts

@@ -1,11 +1,13 @@
-import type { findState, Transactors } from "atom.io"
+import type { Transactors } from "atom.io"
+import type { findState } from "atom.io/ephemeral"
+import type { seekState } from "atom.io/immortal"
 
-import { findInStore } from "../families"
+import { findInStore, seekInStore } from "../families"
 import { readOrComputeValue } from "../get-state/read-or-compute-value"
 import { newest } from "../lineage"
 import { setAtomOrSelector } from "../set-state"
 import type { Store } from "../store"
-import { withdrawOrCreate } from "../store"
+import { withdraw } from "../store"
 import { updateSelectorAtoms } from "./update-selector-atoms"
 
 export const registerSelector = (
@@ -15,7 +17,7 @@ export const registerSelector = (
 	get: (dependency) => {
 		const target = newest(store)
 
-		const dependencyState = withdrawOrCreate(dependency, store)
+		const dependencyState = withdraw(dependency, store)
 		const dependencyValue = readOrComputeValue(dependencyState, store)
 
 		store.logger.info(
@@ -40,8 +42,9 @@ export const registerSelector = (
 		return dependencyValue
 	},
 	set: (WritableToken, newValue) => {
-		const state = withdrawOrCreate(WritableToken, store)
+		const state = withdraw(WritableToken, store)
 		setAtomOrSelector(state, newValue, store)
 	},
 	find: ((token, key) => findInStore(token, key, store)) as typeof findState,
+	seek: ((token, key) => seekInStore(token, key, store)) as typeof seekState,
 })

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

@@ -2,7 +2,7 @@ import type { WritableToken } from "atom.io"
 
 import { closeOperation, openOperation } from "../operation"
 import type { Store } from "../store"
-import { withdrawOrCreate } from "../store"
+import { withdraw } from "../store"
 import { setAtomOrSelector } from "./set-atom-or-selector"
 
 export function setIntoStore<T, New extends T>(
@@ -27,7 +27,7 @@ export function setIntoStore<T, New extends T>(
 		)
 		return
 	}
-	const state = withdrawOrCreate(token, store)
+	const state = withdraw(token, store)
 	setAtomOrSelector(state, value, store)
 	closeOperation(store)
 }

package/internal/src/store/index.ts

@@ -1,4 +1,3 @@
 export * from "./deposit"
 export * from "./store"
 export * from "./withdraw"
-export * from "./withdraw-new-family-member"

package/internal/src/store/store.ts

@@ -12,6 +12,7 @@ import type {
 	WritableSelectorToken,
 } from "atom.io"
 import { AtomIOLogger } from "atom.io"
+import type { Molecule } from "atom.io/immortal"
 
 import { Junction } from "~/packages/rel8/junction/src"
 
@@ -80,6 +81,9 @@ export class Store implements Lineage {
 		},
 	)
 
+	public molecules = new Map<string, Molecule<any>>()
+	public miscResources = new Map<string, Disposable>()
+
 	public on = {
 		atomCreation: new Subject<AtomToken<unknown>>(),
 		atomDisposal: new Subject<AtomToken<unknown>>(),
@@ -107,8 +111,10 @@ export class Store implements Lineage {
 
 	public config: {
 		name: string
+		lifespan: `ephemeral` | `immortal`
 	} = {
 		name: `IMPLICIT_STORE`,
+		lifespan: `ephemeral`,
 	}
 
 	public loggers: AtomIOLogger[] = [
@@ -126,7 +132,7 @@ export class Store implements Lineage {
 		},
 	}
 
-	public constructor(name: string, store: Store | null = null) {
+	public constructor(config: Store[`config`], store: Store | null = null) {
 		if (store !== null) {
 			this.valueMap = new Map(store?.valueMap)
 			this.operation = { ...store?.operation }
@@ -141,7 +147,7 @@ export class Store implements Lineage {
 
 			this.config = {
 				...store?.config,
-				name,
+				...config,
 			}
 			for (const [, family] of store.families) {
 				family.install(this)
@@ -153,7 +159,7 @@ export class Store implements Lineage {
 				}
 				atom.install(this)
 				if (atom.type === `mutable_atom`) {
-					const originalJsonToken = getJsonToken(atom)
+					const originalJsonToken = getJsonToken(atom, store)
 					const originalUpdateToken = getUpdateToken(atom)
 					mutableHelpers.add(originalJsonToken.key)
 					mutableHelpers.add(originalUpdateToken.key)
@@ -182,13 +188,20 @@ export const IMPLICIT = {
 	STORE_INTERNAL: undefined as Store | undefined,
 	get STORE(): Store {
 		return (
-			this.STORE_INTERNAL ?? (this.STORE_INTERNAL = new Store(`IMPLICIT_STORE`))
+			this.STORE_INTERNAL ??
+			(this.STORE_INTERNAL = new Store({
+				name: `IMPLICIT_STORE`,
+				lifespan: `ephemeral`,
+			}))
 		)
 	},
 }
 
 export const clearStore = (store: Store): void => {
 	const { config } = store
-	Object.assign(store, new Store(config.name))
+	for (const disposable of store.miscResources.values()) {
+		disposable[Symbol.dispose]()
+	}
+	Object.assign(store, new Store(config))
 	store.config = config
 }

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

@@ -1,7 +1,7 @@
 import type { ReadableToken, StateUpdate, UpdateHandler } from "atom.io"
 
 import type { Store } from "../store"
-import { withdrawOrCreate } from "../store"
+import { withdraw } from "../store"
 import { subscribeToRootAtoms } from "./subscribe-to-root-atoms"
 
 export function subscribeToState<T>(
@@ -23,7 +23,7 @@ export function subscribeToState<T>(
 			handleUpdate(update)
 		}
 	}
-	const state = withdrawOrCreate(token, store)
+	const state = withdraw(token, store)
 	store.logger.info(`👀`, state.type, state.key, `Adding subscription "${key}"`)
 	const isSelector =
 		state.type === `selector` || state.type === `readonly_selector`

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

@@ -1,9 +1,11 @@
-import type { findState, Func } from "atom.io"
+import type { Func } from "atom.io"
+import type { findState } from "atom.io/ephemeral"
+import type { seekState } from "atom.io/immortal"
 
 import { Junction } from "~/packages/rel8/junction/src"
 
 import { arbitrary } from "../arbitrary"
-import { findInStore } from "../families"
+import { findInStore, seekInStore } from "../families"
 import { getEnvironmentData } from "../get-environment-data"
 import { getFromStore } from "../get-state"
 import { LazyMap } from "../lazy-map"
@@ -43,6 +45,8 @@ export const buildTransaction = (
 		}),
 		selectors: new LazyMap(parent.selectors),
 		valueMap: new LazyMap(parent.valueMap),
+		molecules: new LazyMap(parent.molecules),
+		miscResources: new LazyMap(parent.miscResources),
 	}
 	const epoch = getEpochNumberOfAction(key, store)
 	const transactionMeta: TransactionProgress<Func> = {
@@ -63,6 +67,7 @@ export const buildTransaction = (
 			run: (token, identifier = arbitrary()) =>
 				actUponStore(token, identifier, child),
 			find: ((token, k) => findInStore(token, k, child)) as typeof findState,
+			seek: ((token, k) => seekInStore(token, k, child)) as typeof seekState,
 			env: () => getEnvironmentData(child),
 		},
 	}

package/introspection/dist/index.cjs

@@ -66,55 +66,45 @@ var attachAtomIndex = (store = Internal2.IMPLICIT.STORE) => {
       },
       effects: [
         ({ setSelf }) => {
-          const unsubscribeFromAtomCreation = store.on.atomCreation.subscribe(
-            `introspection`,
-            (atomToken) => {
-              if (atomToken.key.includes(`\u{1F441}\u200D\u{1F5E8}`)) {
-                return;
-              }
-              setSelf((self) => {
-                if (atomToken.family) {
-                  const { key: familyKey, subKey } = atomToken.family;
-                  let familyNode = self.get(familyKey);
-                  if (familyNode === void 0 || !(`familyMembers` in familyNode)) {
-                    familyNode = {
-                      key: familyKey,
-                      familyMembers: /* @__PURE__ */ new Map()
-                    };
-                    self.set(familyKey, familyNode);
-                  }
-                  familyNode.familyMembers.set(subKey, atomToken);
-                } else {
-                  self.set(atomToken.key, atomToken);
-                }
-                return self;
-              });
+          store.on.atomCreation.subscribe(`introspection`, (atomToken) => {
+            if (atomToken.key.includes(`\u{1F441}\u200D\u{1F5E8}`)) {
+              return;
             }
-          );
-          const unsubscribeFromAtomDisposal = store.on.atomDisposal.subscribe(
-            `introspection`,
-            (atomToken) => {
-              setSelf((self) => {
-                if (atomToken.family) {
-                  const { key: familyKey, subKey } = atomToken.family;
-                  const familyNode = self.get(familyKey);
-                  if (familyNode && `familyMembers` in familyNode) {
-                    familyNode.familyMembers.delete(subKey);
-                    if (familyNode.familyMembers.size === 0) {
-                      self.delete(familyKey);
-                    }
+            setSelf((self) => {
+              if (atomToken.family) {
+                const { key: familyKey, subKey } = atomToken.family;
+                let familyNode = self.get(familyKey);
+                if (familyNode === void 0 || !(`familyMembers` in familyNode)) {
+                  familyNode = {
+                    key: familyKey,
+                    familyMembers: /* @__PURE__ */ new Map()
+                  };
+                  self.set(familyKey, familyNode);
+                }
+                familyNode.familyMembers.set(subKey, atomToken);
+              } else {
+                self.set(atomToken.key, atomToken);
+              }
+              return self;
+            });
+          });
+          store.on.atomDisposal.subscribe(`introspection`, (atomToken) => {
+            setSelf((self) => {
+              if (atomToken.family) {
+                const { key: familyKey, subKey } = atomToken.family;
+                const familyNode = self.get(familyKey);
+                if (familyNode && `familyMembers` in familyNode) {
+                  familyNode.familyMembers.delete(subKey);
+                  if (familyNode.familyMembers.size === 0) {
+                    self.delete(familyKey);
                   }
-                } else {
-                  self.delete(atomToken.key);
                 }
-                return self;
-              });
-            }
-          );
-          return () => {
-            unsubscribeFromAtomCreation();
-            unsubscribeFromAtomDisposal();
-          };
+              } else {
+                self.delete(atomToken.key);
+              }
+              return self;
+            });
+          });
         }
       ]
     },
@@ -159,7 +149,7 @@ var attachSelectorIndex = (store = Internal2.IMPLICIT.STORE) => {
       },
       effects: [
         ({ setSelf }) => {
-          const unsubscribeFromSelectorCreation = store.on.selectorCreation.subscribe(
+          store.on.selectorCreation.subscribe(
             `introspection`,
             (selectorToken) => {
               if (selectorToken.key.includes(`\u{1F441}\u200D\u{1F5E8}`)) {
@@ -184,7 +174,7 @@ var attachSelectorIndex = (store = Internal2.IMPLICIT.STORE) => {
               });
             }
           );
-          const unsubscribeFromSelectorDisposal = store.on.selectorDisposal.subscribe(
+          store.on.selectorDisposal.subscribe(
             `introspection`,
             (selectorToken) => {
               setSelf((self) => {
@@ -204,10 +194,6 @@ var attachSelectorIndex = (store = Internal2.IMPLICIT.STORE) => {
               });
             }
           );
-          return () => {
-            unsubscribeFromSelectorCreation();
-            unsubscribeFromSelectorDisposal();
-          };
         }
       ]
     },

package/introspection/dist/index.js

@@ -31,55 +31,45 @@ var attachAtomIndex = (store = IMPLICIT.STORE) => {
       },
       effects: [
         ({ setSelf }) => {
-          const unsubscribeFromAtomCreation = store.on.atomCreation.subscribe(
-            `introspection`,
-            (atomToken) => {
-              if (atomToken.key.includes(`\u{1F441}\u200D\u{1F5E8}`)) {
-                return;
-              }
-              setSelf((self) => {
-                if (atomToken.family) {
-                  const { key: familyKey, subKey } = atomToken.family;
-                  let familyNode = self.get(familyKey);
-                  if (familyNode === void 0 || !(`familyMembers` in familyNode)) {
-                    familyNode = {
-                      key: familyKey,
-                      familyMembers: /* @__PURE__ */ new Map()
-                    };
-                    self.set(familyKey, familyNode);
-                  }
-                  familyNode.familyMembers.set(subKey, atomToken);
-                } else {
-                  self.set(atomToken.key, atomToken);
-                }
-                return self;
-              });
+          store.on.atomCreation.subscribe(`introspection`, (atomToken) => {
+            if (atomToken.key.includes(`\u{1F441}\u200D\u{1F5E8}`)) {
+              return;
             }
-          );
-          const unsubscribeFromAtomDisposal = store.on.atomDisposal.subscribe(
-            `introspection`,
-            (atomToken) => {
-              setSelf((self) => {
-                if (atomToken.family) {
-                  const { key: familyKey, subKey } = atomToken.family;
-                  const familyNode = self.get(familyKey);
-                  if (familyNode && `familyMembers` in familyNode) {
-                    familyNode.familyMembers.delete(subKey);
-                    if (familyNode.familyMembers.size === 0) {
-                      self.delete(familyKey);
-                    }
+            setSelf((self) => {
+              if (atomToken.family) {
+                const { key: familyKey, subKey } = atomToken.family;
+                let familyNode = self.get(familyKey);
+                if (familyNode === void 0 || !(`familyMembers` in familyNode)) {
+                  familyNode = {
+                    key: familyKey,
+                    familyMembers: /* @__PURE__ */ new Map()
+                  };
+                  self.set(familyKey, familyNode);
+                }
+                familyNode.familyMembers.set(subKey, atomToken);
+              } else {
+                self.set(atomToken.key, atomToken);
+              }
+              return self;
+            });
+          });
+          store.on.atomDisposal.subscribe(`introspection`, (atomToken) => {
+            setSelf((self) => {
+              if (atomToken.family) {
+                const { key: familyKey, subKey } = atomToken.family;
+                const familyNode = self.get(familyKey);
+                if (familyNode && `familyMembers` in familyNode) {
+                  familyNode.familyMembers.delete(subKey);
+                  if (familyNode.familyMembers.size === 0) {
+                    self.delete(familyKey);
                   }
-                } else {
-                  self.delete(atomToken.key);
                 }
-                return self;
-              });
-            }
-          );
-          return () => {
-            unsubscribeFromAtomCreation();
-            unsubscribeFromAtomDisposal();
-          };
+              } else {
+                self.delete(atomToken.key);
+              }
+              return self;
+            });
+          });
         }
       ]
     },
@@ -124,7 +114,7 @@ var attachSelectorIndex = (store = IMPLICIT.STORE) => {
       },
       effects: [
         ({ setSelf }) => {
-          const unsubscribeFromSelectorCreation = store.on.selectorCreation.subscribe(
+          store.on.selectorCreation.subscribe(
             `introspection`,
             (selectorToken) => {
               if (selectorToken.key.includes(`\u{1F441}\u200D\u{1F5E8}`)) {
@@ -149,7 +139,7 @@ var attachSelectorIndex = (store = IMPLICIT.STORE) => {
               });
             }
           );
-          const unsubscribeFromSelectorDisposal = store.on.selectorDisposal.subscribe(
+          store.on.selectorDisposal.subscribe(
             `introspection`,
             (selectorToken) => {
               setSelf((self) => {
@@ -169,10 +159,6 @@ var attachSelectorIndex = (store = IMPLICIT.STORE) => {
               });
             }
           );
-          return () => {
-            unsubscribeFromSelectorCreation();
-            unsubscribeFromSelectorDisposal();
-          };
         }
       ]
     },

package/introspection/src/attach-atom-index.ts

@@ -41,59 +41,49 @@ export const attachAtomIndex = (
 			},
 			effects: [
 				({ setSelf }) => {
-					const unsubscribeFromAtomCreation = store.on.atomCreation.subscribe(
-						`introspection`,
-						(atomToken) => {
-							if (atomToken.key.includes(`👁‍🗨`)) {
-								return
-							}
+					store.on.atomCreation.subscribe(`introspection`, (atomToken) => {
+						if (atomToken.key.includes(`👁‍🗨`)) {
+							return
+						}
 
-							setSelf((self) => {
-								if (atomToken.family) {
-									const { key: familyKey, subKey } = atomToken.family
-									let familyNode = self.get(familyKey)
-									if (
-										familyNode === undefined ||
-										!(`familyMembers` in familyNode)
-									) {
-										familyNode = {
-											key: familyKey,
-											familyMembers: new Map(),
-										}
-										self.set(familyKey, familyNode)
+						setSelf((self) => {
+							if (atomToken.family) {
+								const { key: familyKey, subKey } = atomToken.family
+								let familyNode = self.get(familyKey)
+								if (
+									familyNode === undefined ||
+									!(`familyMembers` in familyNode)
+								) {
+									familyNode = {
+										key: familyKey,
+										familyMembers: new Map(),
 									}
-									familyNode.familyMembers.set(subKey, atomToken)
-								} else {
-									self.set(atomToken.key, atomToken)
+									self.set(familyKey, familyNode)
 								}
-								return self
-							})
-						},
-					)
-					const unsubscribeFromAtomDisposal = store.on.atomDisposal.subscribe(
-						`introspection`,
-						(atomToken) => {
-							setSelf((self) => {
-								if (atomToken.family) {
-									const { key: familyKey, subKey } = atomToken.family
-									const familyNode = self.get(familyKey)
-									if (familyNode && `familyMembers` in familyNode) {
-										familyNode.familyMembers.delete(subKey)
-										if (familyNode.familyMembers.size === 0) {
-											self.delete(familyKey)
-										}
+								familyNode.familyMembers.set(subKey, atomToken)
+							} else {
+								self.set(atomToken.key, atomToken)
+							}
+							return self
+						})
+					})
+					store.on.atomDisposal.subscribe(`introspection`, (atomToken) => {
+						setSelf((self) => {
+							if (atomToken.family) {
+								const { key: familyKey, subKey } = atomToken.family
+								const familyNode = self.get(familyKey)
+								if (familyNode && `familyMembers` in familyNode) {
+									familyNode.familyMembers.delete(subKey)
+									if (familyNode.familyMembers.size === 0) {
+										self.delete(familyKey)
 									}
-								} else {
-									self.delete(atomToken.key)
 								}
-								return self
-							})
-						},
-					)
-					return () => {
-						unsubscribeFromAtomCreation()
-						unsubscribeFromAtomDisposal()
-					}
+							} else {
+								self.delete(atomToken.key)
+							}
+							return self
+						})
+					})
 				},
 			],
 		},

package/introspection/src/attach-selector-index.ts

@@ -44,61 +44,56 @@ export const attachSelectorIndex = (
 				},
 				effects: [
 					({ setSelf }) => {
-						const unsubscribeFromSelectorCreation =
-							store.on.selectorCreation.subscribe(
-								`introspection`,
-								(selectorToken) => {
-									if (selectorToken.key.includes(`👁‍🗨`)) {
-										return
-									}
+						store.on.selectorCreation.subscribe(
+							`introspection`,
+							(selectorToken) => {
+								if (selectorToken.key.includes(`👁‍🗨`)) {
+									return
+								}
 
-									setSelf((self) => {
-										if (selectorToken.family) {
-											const { key: familyKey, subKey } = selectorToken.family
-											let familyNode = self.get(familyKey)
-											if (
-												familyNode === undefined ||
-												!(`familyMembers` in familyNode)
-											) {
-												familyNode = {
-													key: familyKey,
-													familyMembers: new Map(),
-												}
-												self.set(familyKey, familyNode)
+								setSelf((self) => {
+									if (selectorToken.family) {
+										const { key: familyKey, subKey } = selectorToken.family
+										let familyNode = self.get(familyKey)
+										if (
+											familyNode === undefined ||
+											!(`familyMembers` in familyNode)
+										) {
+											familyNode = {
+												key: familyKey,
+												familyMembers: new Map(),
 											}
-											familyNode.familyMembers.set(subKey, selectorToken)
-										} else {
-											self.set(selectorToken.key, selectorToken)
+											self.set(familyKey, familyNode)
 										}
-										return self
-									})
-								},
-							)
-						const unsubscribeFromSelectorDisposal =
-							store.on.selectorDisposal.subscribe(
-								`introspection`,
-								(selectorToken) => {
-									setSelf((self) => {
-										if (selectorToken.family) {
-											const { key: familyKey, subKey } = selectorToken.family
-											const familyNode = self.get(familyKey)
-											if (familyNode && `familyMembers` in familyNode) {
-												familyNode.familyMembers.delete(subKey)
-												if (familyNode.familyMembers.size === 0) {
-													self.delete(familyKey)
-												}
+										familyNode.familyMembers.set(subKey, selectorToken)
+									} else {
+										self.set(selectorToken.key, selectorToken)
+									}
+									return self
+								})
+							},
+						)
+
+						store.on.selectorDisposal.subscribe(
+							`introspection`,
+							(selectorToken) => {
+								setSelf((self) => {
+									if (selectorToken.family) {
+										const { key: familyKey, subKey } = selectorToken.family
+										const familyNode = self.get(familyKey)
+										if (familyNode && `familyMembers` in familyNode) {
+											familyNode.familyMembers.delete(subKey)
+											if (familyNode.familyMembers.size === 0) {
+												self.delete(familyKey)
 											}
-										} else {
-											self.delete(selectorToken.key)
 										}
-										return self
-									})
-								},
-							)
-						return () => {
-							unsubscribeFromSelectorCreation()
-							unsubscribeFromSelectorDisposal()
-						}
+									} else {
+										self.delete(selectorToken.key)
+									}
+									return self
+								})
+							},
+						)
 					},
 				],
 			},