atom.io 0.27.1 → 0.27.3

package/data/dist/index.d.ts

@@ -1,11 +1,11 @@
 import * as AtomIO from 'atom.io';
-import { ReadonlySelectorFamily, MutableAtomFamily, SetterToolkit, disposeState, ReadonlySelectorToken, MutableAtomFamilyToken } from 'atom.io';
+import { ReadonlySelectorFamilyToken, MutableAtomFamilyToken, SetterToolkit, disposeState, ReadonlySelectorToken } from 'atom.io';
 import { Store, Molecule } from 'atom.io/internal';
 import { Canonical, stringified, Json } from 'atom.io/json';
 import { findState } from 'atom.io/ephemeral';
 import { SetRTX, SetRTXJson } from 'atom.io/transceivers/set-rtx';
 
-declare function dict<State, Key extends Canonical>(findState: AtomIO.ReadonlySelectorFamilyToken<State, Key> | AtomIO.RegularAtomFamilyToken<State, Key> | AtomIO.WritableSelectorFamily<State, Key>, index: AtomIO.ReadonlySelectorToken<Key[]> | AtomIO.RegularAtomToken<Key[]> | AtomIO.WritableSelectorToken<Key[]>, store?: Store): AtomIO.ReadonlySelectorToken<{
+declare function dict<State, Key extends Canonical>(family: AtomIO.ReadonlySelectorFamilyToken<State, Key> | AtomIO.RegularAtomFamilyToken<State, Key> | AtomIO.WritableSelectorFamilyToken<State, Key>, index: AtomIO.ReadonlySelectorToken<Key[]> | AtomIO.RegularAtomToken<Key[]> | AtomIO.WritableSelectorToken<Key[]>, store?: Store): AtomIO.ReadonlySelectorToken<{
     [K in stringified<Key>]: State;
 }>;
 
@@ -88,33 +88,33 @@ interface JoinOptions<ASide extends string, BSide extends string, Cardinality ex
     readonly cardinality: Cardinality;
 }
 type JoinStateFamilies<ASide extends string, BSide extends string, Cardinality extends Cardinality, Content extends Json.Object | null> = Cardinality extends `1:1` ? (Content extends Json.Object ? {
-    readonly [AB in ASide | BSide as AB extends ASide ? `${AB}EntryOf${Capitalize<BSide>}` : `${AB}EntryOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<[
+    readonly [AB in ASide | BSide as AB extends ASide ? `${AB}EntryOf${Capitalize<BSide>}` : `${AB}EntryOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<[
         string,
         Content
     ] | null, string>;
 } : {}) & {
-    readonly [AB in ASide | BSide as AB extends ASide ? `${AB}KeyOf${Capitalize<BSide>}` : `${AB}KeyOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<string | null, string>;
+    readonly [AB in ASide | BSide as AB extends ASide ? `${AB}KeyOf${Capitalize<BSide>}` : `${AB}KeyOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<string | null, string>;
 } : Cardinality extends `1:n` ? (Content extends Json.Object ? {
-    readonly [A in ASide as `${A}EntryOf${Capitalize<BSide>}`]: ReadonlySelectorFamily<[
+    readonly [A in ASide as `${A}EntryOf${Capitalize<BSide>}`]: ReadonlySelectorFamilyToken<[
         string,
         Content
     ] | null, string>;
 } & {
-    readonly [B in BSide as `${B}EntriesOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<[
+    readonly [B in BSide as `${B}EntriesOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<[
         string,
         Content
     ][], string>;
 } : {}) & {
-    readonly [A in ASide as `${A}KeyOf${Capitalize<BSide>}`]: ReadonlySelectorFamily<string | null, string>;
+    readonly [A in ASide as `${A}KeyOf${Capitalize<BSide>}`]: ReadonlySelectorFamilyToken<string | null, string>;
 } & {
-    readonly [B in BSide as `${B}KeysOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<string[], string>;
+    readonly [B in BSide as `${B}KeysOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<string[], string>;
 } : Cardinality extends `n:n` ? (Content extends Json.Object ? {
-    readonly [AB in ASide | BSide as AB extends ASide ? `${AB}EntriesOf${Capitalize<BSide>}` : `${AB}EntriesOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<[
+    readonly [AB in ASide | BSide as AB extends ASide ? `${AB}EntriesOf${Capitalize<BSide>}` : `${AB}EntriesOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<[
         string,
         Content
     ][], string>;
 } : {}) & {
-    readonly [AB in ASide | BSide as AB extends ASide ? `${AB}KeysOf${Capitalize<BSide>}` : `${AB}KeysOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<string[], string>;
+    readonly [AB in ASide | BSide as AB extends ASide ? `${AB}KeysOf${Capitalize<BSide>}` : `${AB}KeysOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<string[], string>;
 } : never;
 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;
@@ -125,7 +125,7 @@ declare class Join<const ASide extends string, const BSide extends string, const
     relations: Junction<ASide, BSide, Content>;
     states: JoinStateFamilies<ASide, BSide, Cardinality, Content>;
     core: {
-        findRelatedKeysState: MutableAtomFamily<SetRTX<string>, SetRTXJson<string>, string>;
+        findRelatedKeysState: MutableAtomFamilyToken<SetRTX<string>, SetRTXJson<string>, string>;
     };
     transact(toolkit: SetterToolkit & {
         dispose: typeof disposeState;
@@ -203,7 +203,7 @@ declare function structFamily<Struct extends object, Key extends string>(options
     default: Struct;
 }): [
     {
-        [K in keyof Struct as `find${Capitalize<Key & string>}${Capitalize<K & string>}State`]: AtomIO.RegularAtomFamily<Struct[K], string>;
+        [K in keyof Struct as `find${Capitalize<Key & string>}${Capitalize<K & string>}State`]: AtomIO.RegularAtomFamilyToken<Struct[K], string>;
     },
     AtomIO.ReadonlySelectorFamilyToken<Struct, string>
 ];

package/data/dist/index.js

@@ -1,17 +1,17 @@
 import { Junction } from '../../dist/chunk-IBTHB2PI.js';
 import '../../dist/chunk-XWL6SNVU.js';
-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 { createStandaloneSelector, findInStore, IMPLICIT, getFromStore, setIntoStore, seekInStore, getJsonToken, disposeFromStore, withdraw, growMoleculeInStore, NotFoundError, initFamilyMemberInStore, createMutableAtomFamily, createRegularAtomFamily, createMoleculeFamily, newest, makeMoleculeInStore, isChildStore, createRegularAtom, createSelectorFamily, createReadonlySelectorFamily, getJsonFamily } from 'atom.io/internal';
 import { stringifyJson } from 'atom.io/json';
 import { SetRTX } from 'atom.io/transceivers/set-rtx';
 
-function dict(findState, index, store = IMPLICIT.STORE) {
+function dict(family, index, store = IMPLICIT.STORE) {
   return createStandaloneSelector(
     {
-      key: `${findState.key}Dict`,
+      key: `${family.key}Dict`,
       get: ({ get }) => {
         const keys = get(index);
         return keys.reduce((acc, key) => {
-          acc[key] = get(findInStore(findState, key, store));
+          acc[key] = get(findInStore(family, key, store));
           return acc;
         }, {});
       }
@@ -97,7 +97,8 @@ var Join = class _Join {
         fromJson: (json) => SetRTX.fromJSON(json),
         toJson: (set) => set.toJSON()
       },
-      store
+      store,
+      [`join`, `relations`]
     );
     this.core = { findRelatedKeysState: relatedKeysAtoms };
     const getRelatedKeys = ({ get }, key) => get(this.retrieve(relatedKeysAtoms, key));
@@ -231,7 +232,8 @@ var Join = class _Join {
           key: `${options.key}/content`,
           default: defaultContent
         },
-        store
+        store,
+        [`join`, `content`]
       );
       const joinToken = {
         key: options.key,
@@ -306,7 +308,7 @@ var Join = class _Join {
         return compositeKey;
       }
     });
-    const createSingleKeyStateFamily = () => createSelectorFamily(
+    const createSingleKeyStateFamily = () => createReadonlySelectorFamily(
       {
         key: `${options.key}/singleRelatedKey`,
         get: (key) => ({ get }) => {
@@ -318,10 +320,11 @@ var Join = class _Join {
           return null;
         }
       },
-      store
+      store,
+      [`join`, `keys`]
     );
     const getMultipleKeyStateFamily = () => {
-      return createSelectorFamily(
+      return createReadonlySelectorFamily(
         {
           key: `${options.key}/multipleRelatedKeys`,
           get: (key) => ({ get }) => {
@@ -331,10 +334,11 @@ var Join = class _Join {
             return json.members;
           }
         },
-        store
+        store,
+        [`join`, `keys`]
       );
     };
-    const createSingleEntryStateFamily = () => createSelectorFamily(
+    const createSingleEntryStateFamily = () => createReadonlySelectorFamily(
       {
         key: `${options.key}/singleRelatedEntry`,
         get: (key) => ({ get }) => {
@@ -349,9 +353,10 @@ var Join = class _Join {
           return null;
         }
       },
-      store
+      store,
+      [`join`, `entries`]
     );
-    const getMultipleEntryStateFamily = () => createSelectorFamily(
+    const getMultipleEntryStateFamily = () => createReadonlySelectorFamily(
       {
         key: `${options.key}/multipleRelatedEntries`,
         get: (key) => ({ get }) => {
@@ -366,7 +371,8 @@ var Join = class _Join {
           });
         }
       },
-      store
+      store,
+      [`join`, `entries`]
     );
     switch (options.cardinality) {
       case `1:1`: {

package/data/src/dict.ts

@@ -8,10 +8,10 @@ import {
 import type { Canonical, stringified } from "atom.io/json"
 
 export function dict<State, Key extends Canonical>(
-	findState:
+	family:
 		| AtomIO.ReadonlySelectorFamilyToken<State, Key>
 		| AtomIO.RegularAtomFamilyToken<State, Key>
-		| AtomIO.WritableSelectorFamily<State, Key>,
+		| AtomIO.WritableSelectorFamilyToken<State, Key>,
 	index:
 		| AtomIO.ReadonlySelectorToken<Key[]>
 		| AtomIO.RegularAtomToken<Key[]>
@@ -20,11 +20,11 @@ export function dict<State, Key extends Canonical>(
 ): AtomIO.ReadonlySelectorToken<{ [K in stringified<Key>]: State }> {
 	return createStandaloneSelector(
 		{
-			key: `${findState.key}Dict`,
+			key: `${family.key}Dict`,
 			get: ({ get }) => {
 				const keys = get(index)
 				return keys.reduce((acc, key) => {
-					acc[key] = get(findInStore(findState, key, store))
+					acc[key] = get(findInStore(family, key, store))
 					return acc
 				}, {} as any)
 			},

package/data/src/join.ts

@@ -3,14 +3,13 @@ import type {
 	disposeState,
 	getState,
 	MoleculeFamilyToken,
-	MutableAtomFamily,
 	MutableAtomFamilyToken,
 	Read,
 	ReadableFamilyToken,
 	ReadableToken,
-	ReadonlySelectorFamily,
+	ReadonlySelectorFamilyToken,
 	ReadonlySelectorToken,
-	RegularAtomFamily,
+	RegularAtomFamilyToken,
 	setState,
 	SetterToolkit,
 	Write,
@@ -21,8 +20,8 @@ import type { Molecule, Store } from "atom.io/internal"
 import {
 	createMoleculeFamily,
 	createMutableAtomFamily,
+	createReadonlySelectorFamily,
 	createRegularAtomFamily,
-	createSelectorFamily,
 	disposeFromStore,
 	findInStore,
 	getFromStore,
@@ -78,7 +77,7 @@ export type JoinStateFamilies<
 			? {
 					readonly [AB in ASide | BSide as AB extends ASide
 						? `${AB}EntryOf${Capitalize<BSide>}`
-						: `${AB}EntryOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<
+						: `${AB}EntryOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<
 						[string, Content] | null,
 						string
 					>
@@ -86,7 +85,7 @@ export type JoinStateFamilies<
 			: {}) & {
 			readonly [AB in ASide | BSide as AB extends ASide
 				? `${AB}KeyOf${Capitalize<BSide>}`
-				: `${AB}KeyOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<
+				: `${AB}KeyOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<
 				string | null,
 				string
 			>
@@ -94,23 +93,23 @@ export type JoinStateFamilies<
 	: Cardinality extends `1:n`
 		? (Content extends Json.Object
 				? {
-						readonly [A in ASide as `${A}EntryOf${Capitalize<BSide>}`]: ReadonlySelectorFamily<
+						readonly [A in ASide as `${A}EntryOf${Capitalize<BSide>}`]: ReadonlySelectorFamilyToken<
 							[string, Content] | null,
 							string
 						>
 					} & {
-						readonly [B in BSide as `${B}EntriesOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<
+						readonly [B in BSide as `${B}EntriesOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<
 							[string, Content][],
 							string
 						>
 					}
 				: {}) & {
-				readonly [A in ASide as `${A}KeyOf${Capitalize<BSide>}`]: ReadonlySelectorFamily<
+				readonly [A in ASide as `${A}KeyOf${Capitalize<BSide>}`]: ReadonlySelectorFamilyToken<
 					string | null,
 					string
 				>
 			} & {
-				readonly [B in BSide as `${B}KeysOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<
+				readonly [B in BSide as `${B}KeysOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<
 					string[],
 					string
 				>
@@ -120,7 +119,7 @@ export type JoinStateFamilies<
 					? {
 							readonly [AB in ASide | BSide as AB extends ASide
 								? `${AB}EntriesOf${Capitalize<BSide>}`
-								: `${AB}EntriesOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<
+								: `${AB}EntriesOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<
 								[string, Content][],
 								string
 							>
@@ -128,7 +127,7 @@ export type JoinStateFamilies<
 					: {}) & {
 					readonly [AB in ASide | BSide as AB extends ASide
 						? `${AB}KeysOf${Capitalize<BSide>}`
-						: `${AB}KeysOf${Capitalize<ASide>}`]: ReadonlySelectorFamily<
+						: `${AB}KeysOf${Capitalize<ASide>}`]: ReadonlySelectorFamilyToken<
 						string[],
 						string
 					>
@@ -149,7 +148,7 @@ export class Join<
 	public relations: Junction<ASide, BSide, Content>
 	public states: JoinStateFamilies<ASide, BSide, Cardinality, Content>
 	public core: {
-		findRelatedKeysState: MutableAtomFamily<
+		findRelatedKeysState: MutableAtomFamilyToken<
 			SetRTX<string>,
 			SetRTXJson<string>,
 			string
@@ -242,6 +241,7 @@ export class Join<
 				toJson: (set) => set.toJSON(),
 			},
 			store,
+			[`join`, `relations`],
 		)
 		this.core = { findRelatedKeysState: relatedKeysAtoms }
 		const getRelatedKeys: Read<(key: string) => SetRTX<string>> = (
@@ -388,7 +388,7 @@ export class Join<
 			has: (a, b) => has(this.toolkit, a, b),
 		}
 		let externalStore: ExternalStoreConfiguration<Content>
-		let contentAtoms: RegularAtomFamily<Content, string>
+		let contentAtoms: RegularAtomFamilyToken<Content, string>
 		let contentMolecules: MoleculeFamilyToken<
 			new (
 				..._: any[]
@@ -401,6 +401,7 @@ export class Join<
 					default: defaultContent,
 				},
 				store,
+				[`join`, `content`],
 			)
 			const joinToken = {
 				key: options.key,
@@ -488,7 +489,7 @@ export class Join<
 		})
 
 		const createSingleKeyStateFamily = () =>
-			createSelectorFamily<string | null, string>(
+			createReadonlySelectorFamily<string | null, string>(
 				{
 					key: `${options.key}/singleRelatedKey`,
 					get:
@@ -503,9 +504,10 @@ export class Join<
 						},
 				},
 				store,
+				[`join`, `keys`],
 			)
 		const getMultipleKeyStateFamily = () => {
-			return createSelectorFamily<string[], string>(
+			return createReadonlySelectorFamily<string[], string>(
 				{
 					key: `${options.key}/multipleRelatedKeys`,
 					get:
@@ -518,10 +520,11 @@ export class Join<
 						},
 				},
 				store,
+				[`join`, `keys`],
 			)
 		}
 		const createSingleEntryStateFamily = () =>
-			createSelectorFamily<[string, Content] | null, string>(
+			createReadonlySelectorFamily<[string, Content] | null, string>(
 				{
 					key: `${options.key}/singleRelatedEntry`,
 					get:
@@ -539,9 +542,10 @@ export class Join<
 						},
 				},
 				store,
+				[`join`, `entries`],
 			)
 		const getMultipleEntryStateFamily = () =>
-			createSelectorFamily<[string, Content][], string>(
+			createReadonlySelectorFamily<[string, Content][], string>(
 				{
 					key: `${options.key}/multipleRelatedEntries`,
 					get:
@@ -559,6 +563,7 @@ export class Join<
 						},
 				},
 				store,
+				[`join`, `entries`],
 			)
 
 		switch (options.cardinality) {

package/data/src/struct-family.ts

@@ -19,14 +19,14 @@ export function structFamily<
 	{
 		[K in keyof Struct as `find${Capitalize<Key & string>}${Capitalize<
 			K & string
-		>}State`]: AtomIO.RegularAtomFamily<Struct[K], string>
+		>}State`]: AtomIO.RegularAtomFamilyToken<Struct[K], string>
 	},
 	AtomIO.ReadonlySelectorFamilyToken<Struct, string>,
 ] {
 	const atoms: {
 		[K in keyof Struct as `find${Capitalize<Key & string>}${Capitalize<
 			K & string
-		>}State`]: AtomIO.RegularAtomFamily<Struct[K], string>
+		>}State`]: AtomIO.RegularAtomFamilyToken<Struct[K], string>
 	} = Object.keys(options.default).reduce((acc, subKey) => {
 		const atomFamilyName = nameFamily(options.key, subKey)
 		acc[atomFamilyName] = createRegularAtomFamily(