atom.io 0.24.8 → 0.25.1

package/data/dist/index.cjs

@@ -289,20 +289,20 @@ var Join = class _Join {
     this.alternates = /* @__PURE__ */ new Map();
     this.alternates.set(store.config.name, this);
     this.store.miscResources.set(`join:${options.key}`, this);
-    this.transactors = {
-      get: (token) => internal.getFromStore(token, store),
-      set: (token, value) => {
-        internal.setIntoStore(token, value, store);
+    this.toolkit = {
+      get: (...ps) => internal.getFromStore(...ps, store),
+      set: (...ps) => {
+        internal.setIntoStore(...ps, store);
       },
       find: (token, key) => internal.findInStore(token, key, store),
       seek: (token, key) => internal.seekInStore(token, key, store),
       json: (token) => internal.getJsonToken(token, store),
-      dispose: (token) => {
-        internal.disposeFromStore(token, store);
+      dispose: (...ps) => {
+        internal.disposeFromStore(...ps, store);
       }
     };
     this.retrieve = (token, key) => {
-      const maybeToken = this.transactors.seek(token, key);
+      const maybeToken = this.toolkit.seek(token, key);
       if (maybeToken) {
         return maybeToken;
       }
@@ -312,7 +312,7 @@ var Join = class _Join {
         return internal.growMoleculeInStore(molecule, family, store);
       }
       if (store.config.lifespan === `immortal`) {
-        throw new Error(`No molecule found for key "${json.stringifyJson(key)}"`);
+        throw new internal.NotFoundError(token, key, store);
       }
       return internal.initFamilyMemberInStore(token, key, store);
     };
@@ -330,48 +330,30 @@ var Join = class _Join {
     );
     this.core = { findRelatedKeysState: relatedKeysAtoms };
     const getRelatedKeys = ({ get }, key) => get(this.retrieve(relatedKeysAtoms, key));
-    const addRelation = (transactors, a, b) => {
-      const { set } = transactors;
+    const addRelation = (toolkit, a, b) => {
+      const { set } = toolkit;
       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 { set } = transactors;
+    const deleteRelation = (toolkit, a, b) => {
+      const { set } = toolkit;
       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}"`;
-        }
+        if (aKeys.size === 0) ;
         return aKeys;
       });
       set(bKeysState, (bKeys) => {
         bKeys.delete(a);
-        if (bKeys.size === 0) {
-          stringB = `"${b}"`;
-        }
+        if (bKeys.size === 0) ;
         return bKeys;
       });
-      if (stringA) {
-        const molecule = this.molecules.get(stringA);
-        if (molecule) {
-          this.transactors.dispose(molecule);
-        }
-      }
-      if (stringB) {
-        const molecule = this.molecules.get(stringB);
-        if (molecule) {
-          this.transactors.dispose(molecule);
-        }
-      }
     };
-    const replaceRelationsSafely = (transactors, a, newRelationsOfA) => {
-      const { get, set } = transactors;
+    const replaceRelationsSafely = (toolkit, a, newRelationsOfA) => {
+      const { get, set } = toolkit;
       const relationsOfAState = this.retrieve(relatedKeysAtoms, a);
       const currentRelationsOfA = get(relationsOfAState);
       for (const currentRelationB of currentRelationsOfA) {
@@ -392,7 +374,7 @@ var Join = class _Join {
         relationsOfA.transaction((nextRelationsOfA) => {
           nextRelationsOfA.clear();
           for (const newRelationB of newRelationsOfA) {
-            const relationsOfB = getRelatedKeys(transactors, newRelationB);
+            const relationsOfB = getRelatedKeys(toolkit, newRelationB);
             const newRelationBIsAlreadyRelated = relationsOfB.has(a);
             if (this.relations.cardinality === `1:n`) {
               const previousOwnersToDispose = [];
@@ -401,7 +383,7 @@ var Join = class _Join {
                   continue;
                 }
                 const previousOwnerRelations = getRelatedKeys(
-                  transactors,
+                  toolkit,
                   previousOwner
                 );
                 previousOwnerRelations.delete(newRelationB);
@@ -413,10 +395,6 @@ var Join = class _Join {
                 relationsOfB.clear();
               }
               for (const previousOwner of previousOwnersToDispose) {
-                const molecule = this.molecules.get(previousOwner);
-                if (molecule) {
-                  this.transactors.dispose(molecule);
-                }
                 const sorted = [newRelationB, previousOwner].sort();
                 const compositeKey = `"${sorted[0]}:${sorted[1]}"`;
                 this.molecules.delete(compositeKey);
@@ -432,8 +410,8 @@ var Join = class _Join {
         return relationsOfA;
       });
     };
-    const replaceRelationsUnsafely = (transactors, a, newRelationsOfA) => {
-      const { set } = transactors;
+    const replaceRelationsUnsafely = (toolkit, a, newRelationsOfA) => {
+      const { set } = toolkit;
       const relationsOfAState = this.retrieve(relatedKeysAtoms, a);
       set(relationsOfAState, (relationsOfA) => {
         relationsOfA.transaction((nextRelationsOfA) => {
@@ -453,25 +431,25 @@ var Join = class _Join {
       }
       return true;
     };
-    const has = (transactors, a, b) => {
-      const aKeys = getRelatedKeys(transactors, a);
+    const has = (toolkit, a, b) => {
+      const aKeys = getRelatedKeys(toolkit, a);
       return b ? aKeys.has(b) : aKeys.size > 0;
     };
     const baseExternalStoreConfiguration = {
-      getRelatedKeys: (key) => getRelatedKeys(this.transactors, key),
+      getRelatedKeys: (key) => getRelatedKeys(this.toolkit, key),
       addRelation: (a, b) => {
-        addRelation(this.transactors, a, b);
+        addRelation(this.toolkit, a, b);
       },
       deleteRelation: (a, b) => {
-        deleteRelation(this.transactors, a, b);
+        deleteRelation(this.toolkit, a, b);
       },
       replaceRelationsSafely: (a, bs) => {
-        replaceRelationsSafely(this.transactors, a, bs);
+        replaceRelationsSafely(this.toolkit, a, bs);
       },
       replaceRelationsUnsafely: (a, bs) => {
-        replaceRelationsUnsafely(this.transactors, a, bs);
+        replaceRelationsUnsafely(this.toolkit, a, bs);
       },
-      has: (a, b) => has(this.transactors, a, b)
+      has: (a, b) => has(this.toolkit, a, b)
     };
     let externalStore;
     let contentAtoms;
@@ -495,9 +473,9 @@ var Join = class _Join {
         {
           key: `${options.key}/content-molecules`,
           new: class ContentMolecule {
-            constructor(transactors, key) {
+            constructor(toolkit, key) {
               this.key = key;
-              transactors.join(joinToken);
+              toolkit.bond(joinToken, { as: null });
             }
           }
         },
@@ -510,20 +488,20 @@ var Join = class _Join {
       const deleteContent = (_, compositeKey) => {
         const contentMolecule = store.molecules.get(`"${compositeKey}"`);
         if (contentMolecule) {
-          this.transactors.dispose(contentMolecule);
+          this.toolkit.dispose(contentMolecule);
           this.molecules.delete(`"${compositeKey}"`);
         }
       };
       const externalStoreWithContentConfiguration = {
         getContent: (contentKey) => {
-          const content = getContent(this.transactors, contentKey);
+          const content = getContent(this.toolkit, contentKey);
           return content;
         },
         setContent: (contentKey, content) => {
-          setContent(this.transactors, contentKey, content);
+          setContent(this.toolkit, contentKey, content);
         },
         deleteContent: (contentKey) => {
-          deleteContent(this.transactors, contentKey);
+          deleteContent(this.toolkit, contentKey);
         }
       };
       externalStore = Object.assign(
@@ -704,11 +682,11 @@ var Join = class _Join {
       }
     }
   }
-  transact(transactors, run) {
-    const originalTransactors = this.transactors;
-    this.transactors = transactors;
+  transact(toolkit, run) {
+    const originalToolkit = this.toolkit;
+    this.toolkit = toolkit;
     run(this);
-    this.transactors = originalTransactors;
+    this.toolkit = originalToolkit;
   }
   [Symbol.dispose]() {
     this.alternates.delete(this.store.config.name);
@@ -873,8 +851,8 @@ function editRelationsInStore(token, change, store) {
   const myJoin = getJoin(token, store);
   const target = internal.newest(store);
   if (internal.isChildStore(target)) {
-    const { transactors } = target.transactionMeta;
-    myJoin.transact(transactors, ({ relations }) => {
+    const { toolkit } = target.transactionMeta;
+    myJoin.transact(toolkit, ({ relations }) => {
       change(relations);
     });
   } else {

package/data/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as AtomIO from 'atom.io';
-import { ReadonlySelectorFamily, MutableAtomFamily, Transactors, disposeState, ReadonlySelectorToken, MutableAtomFamilyToken } from 'atom.io';
+import { ReadonlySelectorFamily, MutableAtomFamily, SetterToolkit, disposeState, ReadonlySelectorToken, MutableAtomFamilyToken } from 'atom.io';
 import { Store, Molecule } from 'atom.io/internal';
 import { Json, Stringified } from 'atom.io/json';
 import { findState } from 'atom.io/ephemeral';
@@ -119,7 +119,7 @@ type JoinStateFamilies<ASide extends string, BSide extends string, Cardinality e
 declare class Join<const ASide extends string, const BSide extends string, const Cardinality extends `1:1` | `1:n` | `n:n`, const Content extends Json.Object | null = null> {
     private options;
     private defaultContent;
-    private transactors;
+    private toolkit;
     retrieve: typeof findState;
     molecules: Map<string, Molecule<any>>;
     relations: Junction<ASide, BSide, Content>;
@@ -127,7 +127,7 @@ declare class Join<const ASide extends string, const BSide extends string, const
     core: {
         findRelatedKeysState: MutableAtomFamily<SetRTX<string>, SetRTXJson<string>, string>;
     };
-    transact(transactors: Transactors & {
+    transact(toolkit: SetterToolkit & {
         dispose: typeof disposeState;
     }, run: (join: Join<ASide, BSide, Cardinality, Content>) => void): void;
     store: Store;

package/data/dist/index.js

@@ -1,6 +1,6 @@
 import { Junction } from '../../dist/chunk-HYXKCFVY.js';
 import '../../dist/chunk-S4N6XNPH.js';
-import { createStandaloneSelector, findInStore, IMPLICIT, getFromStore, setIntoStore, seekInStore, getJsonToken, disposeFromStore, withdraw, growMoleculeInStore, initFamilyMemberInStore, createMutableAtomFamily, createRegularAtomFamily, createMoleculeFamily, newest, makeMoleculeInStore, isChildStore, createRegularAtom, createSelectorFamily, getJsonFamily } from 'atom.io/internal';
+import { createStandaloneSelector, findInStore, IMPLICIT, getFromStore, setIntoStore, seekInStore, getJsonToken, disposeFromStore, withdraw, growMoleculeInStore, NotFoundError, initFamilyMemberInStore, createMutableAtomFamily, createRegularAtomFamily, createMoleculeFamily, newest, makeMoleculeInStore, isChildStore, createRegularAtom, createSelectorFamily, getJsonFamily } from 'atom.io/internal';
 import { stringifyJson } from 'atom.io/json';
 import { SetRTX } from 'atom.io/transceivers/set-rtx';
 
@@ -31,20 +31,20 @@ var Join = class _Join {
     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);
+    this.toolkit = {
+      get: (...ps) => getFromStore(...ps, store),
+      set: (...ps) => {
+        setIntoStore(...ps, store);
       },
       find: (token, key) => findInStore(token, key, store),
       seek: (token, key) => seekInStore(token, key, store),
       json: (token) => getJsonToken(token, store),
-      dispose: (token) => {
-        disposeFromStore(token, store);
+      dispose: (...ps) => {
+        disposeFromStore(...ps, store);
       }
     };
     this.retrieve = (token, key) => {
-      const maybeToken = this.transactors.seek(token, key);
+      const maybeToken = this.toolkit.seek(token, key);
       if (maybeToken) {
         return maybeToken;
       }
@@ -54,7 +54,7 @@ var Join = class _Join {
         return growMoleculeInStore(molecule, family, store);
       }
       if (store.config.lifespan === `immortal`) {
-        throw new Error(`No molecule found for key "${stringifyJson(key)}"`);
+        throw new NotFoundError(token, key, store);
       }
       return initFamilyMemberInStore(token, key, store);
     };
@@ -72,48 +72,30 @@ var Join = class _Join {
     );
     this.core = { findRelatedKeysState: relatedKeysAtoms };
     const getRelatedKeys = ({ get }, key) => get(this.retrieve(relatedKeysAtoms, key));
-    const addRelation = (transactors, a, b) => {
-      const { set } = transactors;
+    const addRelation = (toolkit, a, b) => {
+      const { set } = toolkit;
       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 { set } = transactors;
+    const deleteRelation = (toolkit, a, b) => {
+      const { set } = toolkit;
       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}"`;
-        }
+        if (aKeys.size === 0) ;
         return aKeys;
       });
       set(bKeysState, (bKeys) => {
         bKeys.delete(a);
-        if (bKeys.size === 0) {
-          stringB = `"${b}"`;
-        }
+        if (bKeys.size === 0) ;
         return bKeys;
       });
-      if (stringA) {
-        const molecule = this.molecules.get(stringA);
-        if (molecule) {
-          this.transactors.dispose(molecule);
-        }
-      }
-      if (stringB) {
-        const molecule = this.molecules.get(stringB);
-        if (molecule) {
-          this.transactors.dispose(molecule);
-        }
-      }
     };
-    const replaceRelationsSafely = (transactors, a, newRelationsOfA) => {
-      const { get, set } = transactors;
+    const replaceRelationsSafely = (toolkit, a, newRelationsOfA) => {
+      const { get, set } = toolkit;
       const relationsOfAState = this.retrieve(relatedKeysAtoms, a);
       const currentRelationsOfA = get(relationsOfAState);
       for (const currentRelationB of currentRelationsOfA) {
@@ -134,7 +116,7 @@ var Join = class _Join {
         relationsOfA.transaction((nextRelationsOfA) => {
           nextRelationsOfA.clear();
           for (const newRelationB of newRelationsOfA) {
-            const relationsOfB = getRelatedKeys(transactors, newRelationB);
+            const relationsOfB = getRelatedKeys(toolkit, newRelationB);
             const newRelationBIsAlreadyRelated = relationsOfB.has(a);
             if (this.relations.cardinality === `1:n`) {
               const previousOwnersToDispose = [];
@@ -143,7 +125,7 @@ var Join = class _Join {
                   continue;
                 }
                 const previousOwnerRelations = getRelatedKeys(
-                  transactors,
+                  toolkit,
                   previousOwner
                 );
                 previousOwnerRelations.delete(newRelationB);
@@ -155,10 +137,6 @@ var Join = class _Join {
                 relationsOfB.clear();
               }
               for (const previousOwner of previousOwnersToDispose) {
-                const molecule = this.molecules.get(previousOwner);
-                if (molecule) {
-                  this.transactors.dispose(molecule);
-                }
                 const sorted = [newRelationB, previousOwner].sort();
                 const compositeKey = `"${sorted[0]}:${sorted[1]}"`;
                 this.molecules.delete(compositeKey);
@@ -174,8 +152,8 @@ var Join = class _Join {
         return relationsOfA;
       });
     };
-    const replaceRelationsUnsafely = (transactors, a, newRelationsOfA) => {
-      const { set } = transactors;
+    const replaceRelationsUnsafely = (toolkit, a, newRelationsOfA) => {
+      const { set } = toolkit;
       const relationsOfAState = this.retrieve(relatedKeysAtoms, a);
       set(relationsOfAState, (relationsOfA) => {
         relationsOfA.transaction((nextRelationsOfA) => {
@@ -195,25 +173,25 @@ var Join = class _Join {
       }
       return true;
     };
-    const has = (transactors, a, b) => {
-      const aKeys = getRelatedKeys(transactors, a);
+    const has = (toolkit, a, b) => {
+      const aKeys = getRelatedKeys(toolkit, a);
       return b ? aKeys.has(b) : aKeys.size > 0;
     };
     const baseExternalStoreConfiguration = {
-      getRelatedKeys: (key) => getRelatedKeys(this.transactors, key),
+      getRelatedKeys: (key) => getRelatedKeys(this.toolkit, key),
       addRelation: (a, b) => {
-        addRelation(this.transactors, a, b);
+        addRelation(this.toolkit, a, b);
       },
       deleteRelation: (a, b) => {
-        deleteRelation(this.transactors, a, b);
+        deleteRelation(this.toolkit, a, b);
       },
       replaceRelationsSafely: (a, bs) => {
-        replaceRelationsSafely(this.transactors, a, bs);
+        replaceRelationsSafely(this.toolkit, a, bs);
       },
       replaceRelationsUnsafely: (a, bs) => {
-        replaceRelationsUnsafely(this.transactors, a, bs);
+        replaceRelationsUnsafely(this.toolkit, a, bs);
       },
-      has: (a, b) => has(this.transactors, a, b)
+      has: (a, b) => has(this.toolkit, a, b)
     };
     let externalStore;
     let contentAtoms;
@@ -237,9 +215,9 @@ var Join = class _Join {
         {
           key: `${options.key}/content-molecules`,
           new: class ContentMolecule {
-            constructor(transactors, key) {
+            constructor(toolkit, key) {
               this.key = key;
-              transactors.join(joinToken);
+              toolkit.bond(joinToken, { as: null });
             }
           }
         },
@@ -252,20 +230,20 @@ var Join = class _Join {
       const deleteContent = (_, compositeKey) => {
         const contentMolecule = store.molecules.get(`"${compositeKey}"`);
         if (contentMolecule) {
-          this.transactors.dispose(contentMolecule);
+          this.toolkit.dispose(contentMolecule);
           this.molecules.delete(`"${compositeKey}"`);
         }
       };
       const externalStoreWithContentConfiguration = {
         getContent: (contentKey) => {
-          const content = getContent(this.transactors, contentKey);
+          const content = getContent(this.toolkit, contentKey);
           return content;
         },
         setContent: (contentKey, content) => {
-          setContent(this.transactors, contentKey, content);
+          setContent(this.toolkit, contentKey, content);
         },
         deleteContent: (contentKey) => {
-          deleteContent(this.transactors, contentKey);
+          deleteContent(this.toolkit, contentKey);
         }
       };
       externalStore = Object.assign(
@@ -446,11 +424,11 @@ var Join = class _Join {
       }
     }
   }
-  transact(transactors, run) {
-    const originalTransactors = this.transactors;
-    this.transactors = transactors;
+  transact(toolkit, run) {
+    const originalToolkit = this.toolkit;
+    this.toolkit = toolkit;
     run(this);
-    this.transactors = originalTransactors;
+    this.toolkit = originalToolkit;
   }
   [Symbol.dispose]() {
     this.alternates.delete(this.store.config.name);
@@ -615,8 +593,8 @@ function editRelationsInStore(token, change, store) {
   const myJoin = getJoin(token, store);
   const target = newest(store);
   if (isChildStore(target)) {
-    const { transactors } = target.transactionMeta;
-    myJoin.transact(transactors, ({ relations }) => {
+    const { toolkit } = target.transactionMeta;
+    myJoin.transact(toolkit, ({ relations }) => {
       change(relations);
     });
   } else {