atom.io 0.21.1 → 0.23.0

package/dist/{chunk-HITX3MO4.js → chunk-7DT3PVS3.js}

@@ -1,40 +1,44 @@
 import { Junction } from './chunk-FTONNX2R.js';
 import { disposeState } from 'atom.io';
-import { getFromStore, setIntoStore, findInStore, createMutableAtomFamily, createRegularAtomFamily, IMPLICIT, newest, isChildStore, createSelectorFamily, getJsonFamily } from 'atom.io/internal';
+import { createMoleculeFamily, Molecule, makeMoleculeInStore } from 'atom.io/immortal';
+import { getFromStore, setIntoStore, findInStore, seekInStore, getJsonToken, initFamilyMember, createMutableAtomFamily, createRegularAtomFamily, newest, IMPLICIT, isChildStore, createSelectorFamily, getJsonFamily } from 'atom.io/internal';
+import { stringifyJson } from 'atom.io/json';
 import { SetRTX } from 'atom.io/transceivers/set-rtx';
 
 function capitalize(string) {
   return string[0].toUpperCase() + string.slice(1);
 }
 var Join = class _Join {
-  transact(transactors, run) {
-    const originalTransactors = this.transactors;
-    this.transactors = transactors;
-    run(this);
-    this.transactors = originalTransactors;
-  }
-  in(store) {
-    const key = store.config.name;
-    const alternate = this.alternates.get(key);
-    if (alternate) {
-      return alternate;
-    }
-    const join2 = new _Join(this.options, this.defaultContent, store);
-    this.alternates.set(key, join2);
-    join2.alternates = this.alternates;
-    return join2;
-  }
   constructor(options, defaultContent, store = IMPLICIT.STORE) {
+    this.molecules = /* @__PURE__ */ new Map();
+    this.store = store;
     this.options = options;
     this.defaultContent = defaultContent;
     this.alternates = /* @__PURE__ */ new Map();
     this.alternates.set(store.config.name, this);
+    this.store.miscResources.set(`join:${options.key}`, this);
     this.transactors = {
       get: (token) => getFromStore(token, store),
       set: (token, value) => {
         setIntoStore(token, value, store);
       },
-      find: (token, key) => findInStore(token, key, store)
+      find: (token, key) => findInStore(token, key, store),
+      seek: (token, key) => seekInStore(token, key, store),
+      json: (token) => getJsonToken(token, store)
+    };
+    this.retrieve = (token, key) => {
+      const maybeToken = this.transactors.seek(token, key);
+      if (maybeToken) {
+        return maybeToken;
+      }
+      const molecule = this.molecules.get(stringifyJson(key));
+      if (!molecule) {
+        if (store.config.lifespan === `immortal`) {
+          throw new Error(`No molecule found for key "${stringifyJson(key)}"`);
+        }
+        return initFamilyMember(token, key, store);
+      }
+      return molecule.bond(token);
     };
     const aSide = options.between[0];
     const bSide = options.between[1];
@@ -49,31 +53,57 @@ var Join = class _Join {
       store
     );
     this.core = { findRelatedKeysState: relatedKeysAtoms };
-    const getRelatedKeys = ({ find, get }, key) => get(find(relatedKeysAtoms, key));
+    const getRelatedKeys = ({ get }, key) => get(this.retrieve(relatedKeysAtoms, key));
     const addRelation = (transactors, a, b) => {
-      const { set, find } = transactors;
-      const aKeysState = find(relatedKeysAtoms, a);
-      const bKeysState = find(relatedKeysAtoms, b);
+      const { set } = transactors;
+      const aKeysState = this.retrieve(relatedKeysAtoms, a);
+      const bKeysState = this.retrieve(relatedKeysAtoms, b);
       set(aKeysState, (aKeys) => aKeys.add(b));
       set(bKeysState, (bKeys) => bKeys.add(a));
     };
     const deleteRelation = (transactors, a, b) => {
-      const { find, set } = transactors;
-      const aKeysState = find(relatedKeysAtoms, a);
-      const bKeysState = find(relatedKeysAtoms, b);
-      set(aKeysState, (aKeys) => (aKeys.delete(b), aKeys));
-      set(bKeysState, (bKeys) => (bKeys.delete(a), bKeys));
+      var _a, _b;
+      const { set } = transactors;
+      const aKeysState = this.retrieve(relatedKeysAtoms, a);
+      const bKeysState = this.retrieve(relatedKeysAtoms, b);
+      let stringA;
+      let stringB;
+      set(aKeysState, (aKeys) => {
+        aKeys.delete(b);
+        if (aKeys.size === 0) {
+          stringA = `"${a}"`;
+        }
+        return aKeys;
+      });
+      set(bKeysState, (bKeys) => {
+        bKeys.delete(a);
+        if (bKeys.size === 0) {
+          stringB = `"${b}"`;
+        }
+        return bKeys;
+      });
+      if (stringA && this.molecules.has(stringA)) {
+        (_a = this.molecules.get(stringA)) == null ? void 0 : _a.clear();
+        this.molecules.delete(stringA);
+      }
+      if (stringB && this.molecules.has(stringB)) {
+        (_b = this.molecules.get(stringB)) == null ? void 0 : _b.clear();
+        this.molecules.delete(stringB);
+      }
     };
     const replaceRelationsSafely = (transactors, a, newRelationsOfA) => {
-      const { find, get, set } = transactors;
-      const relationsOfAState = find(relatedKeysAtoms, a);
+      const { get, set } = transactors;
+      const relationsOfAState = this.retrieve(relatedKeysAtoms, a);
       const currentRelationsOfA = get(relationsOfAState);
       for (const currentRelationB of currentRelationsOfA) {
         const remainsRelated = newRelationsOfA.includes(currentRelationB);
         if (remainsRelated) {
           continue;
         }
-        const relationsOfBState = find(relatedKeysAtoms, currentRelationB);
+        const relationsOfBState = this.retrieve(
+          relatedKeysAtoms,
+          currentRelationB
+        );
         set(relationsOfBState, (relationsOfB) => {
           relationsOfB.delete(a);
           return relationsOfB;
@@ -86,6 +116,7 @@ var Join = class _Join {
             const relationsOfB = getRelatedKeys(transactors, newRelationB);
             const newRelationBIsAlreadyRelated = relationsOfB.has(a);
             if (this.relations.cardinality === `1:n`) {
+              const previousOwnersToDispose = [];
               for (const previousOwner of relationsOfB) {
                 if (previousOwner === a) {
                   continue;
@@ -95,10 +126,21 @@ var Join = class _Join {
                   previousOwner
                 );
                 previousOwnerRelations.delete(newRelationB);
+                if (previousOwnerRelations.size === 0) {
+                  previousOwnersToDispose.push(previousOwner);
+                }
               }
               if (!newRelationBIsAlreadyRelated && relationsOfB.size > 0) {
                 relationsOfB.clear();
               }
+              for (const previousOwner of previousOwnersToDispose) {
+                const molecule = this.molecules.get(previousOwner);
+                molecule == null ? void 0 : molecule.clear();
+                this.molecules.delete(previousOwner);
+                const sorted = [newRelationB, previousOwner].sort();
+                const compositeKey = `"${sorted[0]}:${sorted[1]}"`;
+                this.molecules.delete(compositeKey);
+              }
             }
             if (!newRelationBIsAlreadyRelated) {
               relationsOfB.add(a);
@@ -111,8 +153,8 @@ var Join = class _Join {
       });
     };
     const replaceRelationsUnsafely = (transactors, a, newRelationsOfA) => {
-      const { find, set } = transactors;
-      const relationsOfAState = find(relatedKeysAtoms, a);
+      const { set } = transactors;
+      const relationsOfAState = this.retrieve(relatedKeysAtoms, a);
       set(relationsOfAState, (relationsOfA) => {
         relationsOfA.transaction((nextRelationsOfA) => {
           for (const newRelationB of newRelationsOfA) {
@@ -123,7 +165,7 @@ var Join = class _Join {
         return relationsOfA;
       });
       for (const newRelationB of newRelationsOfA) {
-        const newRelationsBState = find(relatedKeysAtoms, newRelationB);
+        const newRelationsBState = this.retrieve(relatedKeysAtoms, newRelationB);
         set(newRelationsBState, (newRelationsB) => {
           newRelationsB.add(a);
           return newRelationsB;
@@ -153,6 +195,7 @@ var Join = class _Join {
     };
     let externalStore;
     let contentAtoms;
+    let contentMolecules;
     if (defaultContent) {
       contentAtoms = createRegularAtomFamily(
         {
@@ -161,12 +204,24 @@ var Join = class _Join {
         },
         store
       );
-      const getContent = ({ find, get }, key) => get(find(contentAtoms, key));
-      const setContent = ({ find, set }, key, content) => {
-        set(find(contentAtoms, key), content);
+      contentMolecules = createMoleculeFamily(
+        {
+          key: `${options.key}/content-molecules`,
+          new: (s) => class ContentMolecule extends Molecule {
+            constructor(context, token) {
+              super(s, context, token);
+            }
+          }
+        },
+        store
+      );
+      const getContent = ({ get }, key) => get(this.retrieve(contentAtoms, key));
+      const setContent = ({ set }, key, content) => {
+        set(this.retrieve(contentAtoms, key), content);
       };
-      const deleteContent = ({ find }, key) => {
-        disposeState(find(contentAtoms, key));
+      const deleteContent = (_, compositeKey) => {
+        disposeState(this.retrieve(contentAtoms, compositeKey));
+        this.molecules.delete(`"${compositeKey}"`);
       };
       const externalStoreWithContentConfiguration = {
         getContent: (contentKey) => {
@@ -189,13 +244,26 @@ var Join = class _Join {
     }
     const relations = new Junction(options, {
       externalStore,
-      makeContentKey: (...args) => args.sort().join(`:`)
+      makeContentKey: (...args) => {
+        const sorted = args.sort();
+        const compositeKey = `${sorted[0]}:${sorted[1]}`;
+        const [m0, m1] = sorted.map(
+          (key) => this.molecules.get(stringifyJson(key))
+        );
+        if (store.config.lifespan === `immortal` && m0 && m1) {
+          const composite = m0.with(m1)(compositeKey);
+          this.molecules.set(`"${compositeKey}"`, composite);
+          const target = newest(store);
+          makeMoleculeInStore(target, [m0, m1], contentMolecules, compositeKey);
+        }
+        return compositeKey;
+      }
     });
     const createSingleKeyStateFamily = () => createSelectorFamily(
       {
         key: `${options.key}/singleRelatedKey`,
-        get: (key) => ({ find, get }) => {
-          const relatedKeysState = find(relatedKeysAtoms, key);
+        get: (key) => ({ get }) => {
+          const relatedKeysState = this.retrieve(relatedKeysAtoms, key);
           const relatedKeys = get(relatedKeysState);
           for (const relatedKey of relatedKeys) {
             return relatedKey;
@@ -209,9 +277,9 @@ var Join = class _Join {
       return createSelectorFamily(
         {
           key: `${options.key}/multipleRelatedKeys`,
-          get: (key) => ({ find, get }) => {
+          get: (key) => ({ get }) => {
             const jsonFamily = getJsonFamily(relatedKeysAtoms, store);
-            const jsonState = find(jsonFamily, key);
+            const jsonState = this.retrieve(jsonFamily, key);
             const json = get(jsonState);
             return json.members;
           }
@@ -222,12 +290,12 @@ var Join = class _Join {
     const createSingleEntryStateFamily = () => createSelectorFamily(
       {
         key: `${options.key}/singleRelatedEntry`,
-        get: (key) => ({ find, get }) => {
-          const relatedKeysState = find(relatedKeysAtoms, key);
+        get: (key) => ({ get }) => {
+          const relatedKeysState = this.retrieve(relatedKeysAtoms, key);
           const relatedKeys = get(relatedKeysState);
           for (const relatedKey of relatedKeys) {
             const contentKey = relations.makeContentKey(key, relatedKey);
-            const contentState = find(contentAtoms, contentKey);
+            const contentState = this.retrieve(contentAtoms, contentKey);
             const content = get(contentState);
             return [relatedKey, content];
           }
@@ -239,12 +307,13 @@ var Join = class _Join {
     const getMultipleEntryStateFamily = () => createSelectorFamily(
       {
         key: `${options.key}/multipleRelatedEntries`,
-        get: (key) => ({ find, get }) => {
+        get: (key) => ({ get }) => {
           const jsonFamily = getJsonFamily(relatedKeysAtoms, store);
-          const json = get(jsonFamily(key));
+          const jsonState = this.retrieve(jsonFamily, key);
+          const json = get(jsonState);
           return json.members.map((relatedKey) => {
             const contentKey = relations.makeContentKey(key, relatedKey);
-            const contentState = find(contentAtoms, contentKey);
+            const contentState = this.retrieve(contentAtoms, contentKey);
             const content = get(contentState);
             return [relatedKey, content];
           });
@@ -337,6 +406,26 @@ var Join = class _Join {
       }
     }
   }
+  transact(transactors, run) {
+    const originalTransactors = this.transactors;
+    this.transactors = transactors;
+    run(this);
+    this.transactors = originalTransactors;
+  }
+  [Symbol.dispose]() {
+    this.alternates.delete(this.store.config.name);
+  }
+  in(store) {
+    const key = store.config.name;
+    const alternate = this.alternates.get(key);
+    if (alternate) {
+      return alternate;
+    }
+    const join2 = new _Join(this.options, this.defaultContent, store);
+    this.alternates.set(key, join2);
+    join2.alternates = this.alternates;
+    return join2;
+  }
 };
 function join(options, defaultContent, store = IMPLICIT.STORE) {
   const joins = getJoinMap(store);
@@ -384,12 +473,12 @@ function findRelationsInStore(token, key, store) {
       relations = {
         get [keyAB]() {
           const familyAB = myJoin.states[keyAB];
-          const state = findInStore(familyAB, key, store);
+          const state = myJoin.retrieve(familyAB, key);
           return state;
         },
         get [keyBA]() {
           const familyBA = myJoin.states[keyBA];
-          const state = findInStore(familyBA, key, store);
+          const state = myJoin.retrieve(familyBA, key);
           return state;
         }
       };
@@ -399,12 +488,12 @@ function findRelationsInStore(token, key, store) {
         Object.assign(relations, {
           get [entryAB]() {
             const familyAB = myJoin.states[entryAB];
-            const state = findInStore(familyAB, key, store);
+            const state = myJoin.retrieve(familyAB, key);
             return state;
           },
           get [entryBA]() {
             const familyBA = myJoin.states[entryBA];
-            const state = findInStore(familyBA, key, store);
+            const state = myJoin.retrieve(familyBA, key);
             return state;
           }
         });
@@ -417,12 +506,12 @@ function findRelationsInStore(token, key, store) {
       relations = {
         get [keyAB]() {
           const familyAB = myJoin.states[keyAB];
-          const state = findInStore(familyAB, key, store);
+          const state = myJoin.retrieve(familyAB, key);
           return state;
         },
         get [keysBA]() {
           const familyBA = myJoin.states[keysBA];
-          const state = findInStore(familyBA, key, store);
+          const state = myJoin.retrieve(familyBA, key);
           return state;
         }
       };
@@ -432,12 +521,12 @@ function findRelationsInStore(token, key, store) {
         Object.assign(relations, {
           get [entryAB]() {
             const familyAB = myJoin.states[entryAB];
-            const state = findInStore(familyAB, key, store);
+            const state = myJoin.retrieve(familyAB, key);
             return state;
           },
           get [entriesBA]() {
             const familyBA = myJoin.states[entriesBA];
-            const state = findInStore(familyBA, key, store);
+            const state = myJoin.retrieve(familyBA, key);
             return state;
           }
         });
@@ -450,12 +539,12 @@ function findRelationsInStore(token, key, store) {
       relations = {
         get [keysAB]() {
           const familyAB = myJoin.states[keysAB];
-          const state = findInStore(familyAB, key, store);
+          const state = myJoin.retrieve(familyAB, key);
           return state;
         },
         get [keysBA]() {
           const familyBA = myJoin.states[keysBA];
-          const state = findInStore(familyBA, key, store);
+          const state = myJoin.retrieve(familyBA, key);
           return state;
         }
       };
@@ -465,12 +554,12 @@ function findRelationsInStore(token, key, store) {
         Object.assign(relations, {
           get [entriesAB]() {
             const familyAB = myJoin.states[entriesAB];
-            const state = findInStore(familyAB, key, store);
+            const state = myJoin.retrieve(familyAB, key);
             return state;
           },
           get [entriesBA]() {
             const familyBA = myJoin.states[entriesBA];
-            const state = findInStore(familyBA, key, store);
+            const state = myJoin.retrieve(familyBA, key);
             return state;
           }
         });

package/dist/{chunk-RT43TVKP.js → chunk-GVHKIJ3G.js}

@@ -17,7 +17,7 @@ function syncContinuity(continuity, socket, store) {
       } else {
         v = x;
         if (`type` in k && k.type === `mutable_atom`) {
-          k = getJsonToken(k);
+          k = getJsonToken(k, store);
         }
         setIntoStore(k, v, store);
       }

package/dist/chunk-OAYGID5B.js

@@ -0,0 +1,27 @@
+// ../anvl/src/json/json-interface.ts
+var stringSetJsonInterface = {
+  toJson: (stringSet) => Array.from(stringSet),
+  fromJson: (json) => new Set(json)
+};
+
+// ../anvl/src/json/index.ts
+var parseJson = (str) => JSON.parse(str);
+var stringifyJson = (json) => JSON.stringify(json);
+var JSON_TYPE_NAMES = [
+  `array`,
+  `boolean`,
+  `null`,
+  `number`,
+  `object`,
+  `string`
+];
+var JSON_DEFAULTS = {
+  array: [],
+  boolean: false,
+  null: null,
+  number: 0,
+  object: {},
+  string: ``
+};
+
+export { JSON_DEFAULTS, JSON_TYPE_NAMES, parseJson, stringSetJsonInterface, stringifyJson };

package/dist/index.cjs

@@ -29,21 +29,8 @@ function atom(options) {
 function atomFamily(options) {
   return Internal.createAtomFamily(options, Internal.IMPLICIT.STORE);
 }
-function disposeState(token, store = Internal__namespace.IMPLICIT.STORE) {
-  switch (token.type) {
-    case `atom`:
-    case `mutable_atom`:
-      Internal__namespace.disposeAtom(token, store);
-      break;
-    case `selector`:
-    case `readonly_selector`:
-      Internal__namespace.disposeSelector(token, store);
-      break;
-  }
-}
-function findState(token, key) {
-  const state = Internal.findInStore(token, key, Internal.IMPLICIT.STORE);
-  return state;
+function disposeState(token) {
+  Internal__namespace.disposeFromStore(token, Internal__namespace.IMPLICIT.STORE);
 }
 function getState(token) {
   return Internal__namespace.getFromStore(token, Internal__namespace.IMPLICIT.STORE);
@@ -97,8 +84,8 @@ function setState(token, value) {
   Internal__namespace.setIntoStore(token, value, Internal__namespace.IMPLICIT.STORE);
 }
 var Silo = class {
-  constructor(name, fromStore = null) {
-    const s = new Internal.Store(name, fromStore);
+  constructor(config, fromStore = null) {
+    const s = new Internal.Store(config, fromStore);
     function _atom(options) {
       return Internal.createStandaloneAtom(options, s);
     }
@@ -171,7 +158,6 @@ exports.atom = atom;
 exports.atomFamily = atomFamily;
 exports.belongsTo = belongsTo;
 exports.disposeState = disposeState;
-exports.findState = findState;
 exports.getState = getState;
 exports.isToken = isToken;
 exports.redo = redo;