atom.io 0.30.1 → 0.30.2

package/data/dist/index.js

@@ -332,17 +332,18 @@ var Join = class _Join {
       store,
       {
         key: `${options.key}/singleRelatedEntry`,
-        get: (key) => ({ get }) => {
-          const relatedKeysState = this.retrieve(relatedKeysAtoms, key);
+        get: (x) => ({ get }) => {
+          const relatedKeysState = this.retrieve(relatedKeysAtoms, x);
           const relatedKeys = get(relatedKeysState);
-          for (const relatedKey of relatedKeys) {
-            const contentKey = relations.makeContentKey(
-              key,
-              relatedKey
-            );
+          for (const y of relatedKeys) {
+            let a = relations.isAType?.(x) ? x : void 0;
+            let b = a === void 0 ? x : void 0;
+            a ??= y;
+            b ??= y;
+            const contentKey = relations.makeContentKey(a, b);
             const contentState = this.retrieve(contentAtoms, contentKey);
             const content = get(contentState);
-            return [relatedKey, content];
+            return [y, content];
           }
           return null;
         }
@@ -353,18 +354,19 @@ var Join = class _Join {
       store,
       {
         key: `${options.key}/multipleRelatedEntries`,
-        get: (key) => ({ get }) => {
+        get: (x) => ({ get }) => {
           const jsonFamily = getJsonFamily(relatedKeysAtoms, store);
-          const jsonState = this.retrieve(jsonFamily, key);
+          const jsonState = this.retrieve(jsonFamily, x);
           const json = get(jsonState);
-          return json.members.map((relatedKey) => {
-            const contentKey = relations.makeContentKey(
-              key,
-              relatedKey
-            );
+          return json.members.map((y) => {
+            let a = relations.isAType?.(x) ? x : void 0;
+            let b = a === void 0 ? x : void 0;
+            a ??= y;
+            b ??= y;
+            const contentKey = relations.makeContentKey(a, b);
             const contentState = this.retrieve(contentAtoms, contentKey);
             const content = get(contentState);
-            return [relatedKey, content];
+            return [y, content];
           });
         }
       },

package/data/src/join.ts

@@ -556,18 +556,19 @@ export class Join<
 				{
 					key: `${options.key}/singleRelatedEntry`,
 					get:
-						(key) =>
+						(x) =>
 						({ get }) => {
-							const relatedKeysState = this.retrieve(relatedKeysAtoms, key)
+							const relatedKeysState = this.retrieve(relatedKeysAtoms, x)
 							const relatedKeys = get(relatedKeysState)
-							for (const relatedKey of relatedKeys) {
-								const contentKey = relations.makeContentKey(
-									key as any,
-									relatedKey as any,
-								) // sort XY to AB ❗
+							for (const y of relatedKeys) {
+								let a = relations.isAType?.(x) ? x : undefined
+								let b = a === undefined ? (x as BType) : undefined
+								a ??= y as AType
+								b ??= y as BType
+								const contentKey = relations.makeContentKey(a, b)
 								const contentState = this.retrieve(contentAtoms, contentKey)
 								const content = get(contentState)
-								return [relatedKey, content]
+								return [y, content]
 							}
 							return null
 						},
@@ -580,19 +581,20 @@ export class Join<
 				{
 					key: `${options.key}/multipleRelatedEntries`,
 					get:
-						(key) =>
+						(x) =>
 						({ get }) => {
 							const jsonFamily = getJsonFamily(relatedKeysAtoms, store)
-							const jsonState = this.retrieve(jsonFamily, key)
+							const jsonState = this.retrieve(jsonFamily, x)
 							const json = get(jsonState)
-							return json.members.map((relatedKey) => {
-								const contentKey = relations.makeContentKey(
-									key as any,
-									relatedKey as any,
-								) // sort XY to AB ❗
+							return json.members.map((y) => {
+								let a = relations.isAType?.(x) ? x : undefined
+								let b = a === undefined ? (x as BType) : undefined
+								a ??= y as AType
+								b ??= y as BType
+								const contentKey = relations.makeContentKey(a, b)
 								const contentState = this.retrieve(contentAtoms, contentKey)
 								const content = get(contentState)
-								return [relatedKey, content]
+								return [y, content]
 							})
 						},
 				},

package/dist/{chunk-SMKF3ZNG.js → chunk-LSCRHXLI.js}

@@ -121,6 +121,8 @@ var Junction = class {
   cardinality;
   relations = /* @__PURE__ */ new Map();
   contents = /* @__PURE__ */ new Map();
+  isAType;
+  isBType;
   isContent;
   makeContentKey = (a, b) => `${a}:${b}`;
   warn;
@@ -168,8 +170,12 @@ var Junction = class {
   }
   replaceRelationsSafely(x, ys) {
     const xRelationsPrev = this.relations.get(x);
+    let a = this.isAType?.(x) ? x : void 0;
+    let b = a === void 0 ? x : void 0;
     if (xRelationsPrev) {
       for (const y of xRelationsPrev) {
+        a ??= y;
+        b ??= y;
         const yRelations = this.relations.get(y);
         if (yRelations) {
           if (yRelations.size === 1) {
@@ -177,7 +183,7 @@ var Junction = class {
           } else {
             yRelations.delete(x);
           }
-          this.contents.delete(this.makeContentKey(x, y));
+          this.contents.delete(this.makeContentKey(a, b));
         }
       }
     }
@@ -211,6 +217,8 @@ var Junction = class {
       );
       this.contents = new Map(data.contents);
     }
+    this.isAType = config?.isAType ?? null;
+    this.isBType = config?.isBType ?? null;
     this.isContent = config?.isContent ?? null;
     if (config?.makeContentKey) {
       this.makeContentKey = config.makeContentKey;
@@ -245,7 +253,13 @@ var Junction = class {
         };
       }
       for (const [x, ys] of data.relations ?? []) {
-        for (const y of ys) this.addRelation(x, y);
+        let a = this.isAType?.(x) ? x : void 0;
+        let b = a === void 0 ? x : void 0;
+        for (const y of ys) {
+          a ??= y;
+          b ??= y;
+          this.addRelation(a, b);
+        }
       }
       for (const [contentKey, content] of data.contents ?? []) {
         this.setContent(contentKey, content);
@@ -326,9 +340,12 @@ var Junction = class {
           ].map((k) => `"${k}"`).join(`, `)}). Only one related key was expected.`
         );
       }
+      let singleRelation;
       for (const relation of relations) {
-        return relation;
+        singleRelation = relation;
+        break;
       }
+      return singleRelation;
     }
   }
   replaceRelations(x, relations, config) {
@@ -359,7 +376,7 @@ var Junction = class {
       const aRelations = this.getRelatedKeys(a);
       if (aRelations) {
         return [...aRelations].map((aRelation) => {
-          return [aRelation, this.getContent(a, aRelation) ?? null];
+          return [aRelation, this.getContent(a, aRelation)];
         });
       }
     }
@@ -367,7 +384,7 @@ var Junction = class {
       const bRelations = this.getRelatedKeys(b);
       if (bRelations) {
         return [...bRelations].map((bRelation) => {
-          return [bRelation, this.getContent(bRelation, b) ?? null];
+          return [bRelation, this.getContent(bRelation, b)];
         });
       }
     }

package/internal/dist/index.d.ts

@@ -66,6 +66,8 @@ declare class Junction<const ASide extends string, const AType extends string, c
     readonly cardinality: `1:1` | `1:n` | `n:n`;
     readonly relations: Map<AType | BType, Set<AType> | Set<BType>>;
     readonly contents: Map<string, Content>;
+    isAType?: Refinement<string, AType> | null;
+    isBType?: Refinement<string, BType> | null;
     isContent: Refinement<unknown, Content> | null;
     makeContentKey: (a: AType, b: BType) => string;
     warn?: (...args: any[]) => void;
@@ -81,7 +83,7 @@ declare class Junction<const ASide extends string, const AType extends string, c
     protected getContentInternal(contentKey: string): Content | undefined;
     protected setContent(contentKey: string, content: Content): void;
     protected deleteContent(contentKey: string): void;
-    constructor(data: JunctionSchema<ASide, BSide> & Partial<JunctionEntries<AType, BType, Content>>, config?: JunctionAdvancedConfiguration<AType, BType, Content>);
+    constructor(data: JunctionSchema<ASide, BSide> & Partial<JunctionEntries<NoInfer<AType>, NoInfer<BType>, Content>>, config?: JunctionAdvancedConfiguration<AType, BType, Content>);
     toJSON(): JunctionJSON<ASide, AType, BSide, BType, Content>;
     set(a: AType, ...rest: Content extends null ? [b: BType] : [b: BType, content: Content]): this;
     set(relation: {

package/internal/dist/index.js

@@ -1,3 +1,3 @@
-export { FAMILY_MEMBER_TOKEN_TYPES, FamilyTracker, Future, IMPLICIT, Junction, LazyMap, Molecule, NotFoundError, StatefulSubject, Store, Subject, TRANSACTION_PHASES, Tracker, abortTransaction, actUponStore, applyTransaction, arbitrary, assignTransactionToContinuity, become, buildTransaction, cacheValue, clearStore, closeOperation, counterfeit, createAtomFamily, createMoleculeFamily, createMutableAtom, createMutableAtomFamily, createReadonlySelector, createReadonlySelectorFamily, createRegularAtom, createRegularAtomFamily, createSelectorFamily, createStandaloneAtom, createStandaloneSelector, createTimeline, createTransaction, createWritableSelector, deposit, disposeAtom, disposeFromStore, disposeMolecule, disposeSelector, eldest, evictCachedValue, findInStore, getContinuityKey, getEnvironmentData, getEpochNumberOfAction, getEpochNumberOfContinuity, getFromStore, getJsonFamily, getJsonToken, getSelectorDependencyKeys, getUpdateFamily, getUpdateToken, growMoleculeInStore, ingestAtomUpdate, ingestCreationEvent, ingestDisposalEvent, ingestMoleculeCreationEvent, ingestMoleculeDisposalEvent, ingestSelectorUpdate, ingestTransactionUpdate, initFamilyMemberInStore, isAtomDefault, isAtomKey, isChildStore, isDone, isReadonlySelectorKey, isRootStore, isSelectorKey, isStateKey, isTransceiver, makeMoleculeInStore, markAtomAsDefault, markAtomAsNotDefault, markDone, newest, openOperation, prettyPrintTokenType, readCachedValue, readOrComputeValue, recallState, registerSelector, seekInStore, setAtomOrSelector, setEpochNumberOfAction, setEpochNumberOfContinuity, setIntoStore, subscribeInStore, subscribeToRootAtoms, subscribeToState, subscribeToTimeline, subscribeToTransaction, timeTravel, traceAllSelectorAtoms, traceSelectorAtoms, updateSelectorAtoms, withdraw } from '../../dist/chunk-SMKF3ZNG.js';
+export { FAMILY_MEMBER_TOKEN_TYPES, FamilyTracker, Future, IMPLICIT, Junction, LazyMap, Molecule, NotFoundError, StatefulSubject, Store, Subject, TRANSACTION_PHASES, Tracker, abortTransaction, actUponStore, applyTransaction, arbitrary, assignTransactionToContinuity, become, buildTransaction, cacheValue, clearStore, closeOperation, counterfeit, createAtomFamily, createMoleculeFamily, createMutableAtom, createMutableAtomFamily, createReadonlySelector, createReadonlySelectorFamily, createRegularAtom, createRegularAtomFamily, createSelectorFamily, createStandaloneAtom, createStandaloneSelector, createTimeline, createTransaction, createWritableSelector, deposit, disposeAtom, disposeFromStore, disposeMolecule, disposeSelector, eldest, evictCachedValue, findInStore, getContinuityKey, getEnvironmentData, getEpochNumberOfAction, getEpochNumberOfContinuity, getFromStore, getJsonFamily, getJsonToken, getSelectorDependencyKeys, getUpdateFamily, getUpdateToken, growMoleculeInStore, ingestAtomUpdate, ingestCreationEvent, ingestDisposalEvent, ingestMoleculeCreationEvent, ingestMoleculeDisposalEvent, ingestSelectorUpdate, ingestTransactionUpdate, initFamilyMemberInStore, isAtomDefault, isAtomKey, isChildStore, isDone, isReadonlySelectorKey, isRootStore, isSelectorKey, isStateKey, isTransceiver, makeMoleculeInStore, markAtomAsDefault, markAtomAsNotDefault, markDone, newest, openOperation, prettyPrintTokenType, readCachedValue, readOrComputeValue, recallState, registerSelector, seekInStore, setAtomOrSelector, setEpochNumberOfAction, setEpochNumberOfContinuity, setIntoStore, subscribeInStore, subscribeToRootAtoms, subscribeToState, subscribeToTimeline, subscribeToTransaction, timeTravel, traceAllSelectorAtoms, traceSelectorAtoms, updateSelectorAtoms, withdraw } from '../../dist/chunk-LSCRHXLI.js';
 import '../../dist/chunk-ADMEAXYU.js';
 import '../../dist/chunk-XWL6SNVU.js';

package/internal/src/junction.ts

@@ -1,6 +1,5 @@
 import type { Refinement } from "atom.io/introspection"
 import type { Json } from "atom.io/json"
-import { B } from "vitest/dist/chunks/benchmark.JVlTzojj.js"
 
 export type JunctionEntriesBase<
 	AType extends string,
@@ -86,6 +85,8 @@ export class Junction<
 	public readonly relations = new Map<AType | BType, Set<AType> | Set<BType>>()
 	public readonly contents = new Map<string, Content>()
 
+	public isAType?: Refinement<string, AType> | null
+	public isBType?: Refinement<string, BType> | null
 	public isContent: Refinement<unknown, Content> | null
 	public makeContentKey = (a: AType, b: BType): string => `${a}:${b}`
 
@@ -151,8 +152,12 @@ export class Junction<
 		YType extends XType extends AType ? BType : AType,
 	>(x: XType, ys: YType[]): void {
 		const xRelationsPrev = this.relations.get(x)
+		let a: AType | undefined = this.isAType?.(x) ? x : undefined
+		let b: BType | undefined = a === undefined ? (x as BType) : undefined
 		if (xRelationsPrev) {
 			for (const y of xRelationsPrev) {
+				a ??= y as AType
+				b ??= y as BType
 				const yRelations = this.relations.get(y) as Set<XType> | undefined
 				if (yRelations) {
 					if (yRelations.size === 1) {
@@ -160,7 +165,7 @@ export class Junction<
 					} else {
 						yRelations.delete(x)
 					}
-					this.contents.delete(this.makeContentKey(x as any, y as any)) // sort XY to AB ❗
+					this.contents.delete(this.makeContentKey(a, b))
 				}
 			}
 		}
@@ -188,7 +193,7 @@ export class Junction<
 
 	public constructor(
 		data: JunctionSchema<ASide, BSide> &
-			Partial<JunctionEntries<AType, BType, Content>>,
+			Partial<JunctionEntries<NoInfer<AType>, NoInfer<BType>, Content>>,
 		config?: JunctionAdvancedConfiguration<AType, BType, Content>,
 	) {
 		this.a = data.between[0]
@@ -201,6 +206,8 @@ export class Junction<
 			)
 			this.contents = new Map(data.contents)
 		}
+		this.isAType = config?.isAType ?? null
+		this.isBType = config?.isBType ?? null
 		this.isContent = config?.isContent ?? null
 		if (config?.makeContentKey) {
 			this.makeContentKey = config.makeContentKey
@@ -236,7 +243,13 @@ export class Junction<
 				}
 			}
 			for (const [x, ys] of data.relations ?? []) {
-				for (const y of ys) this.addRelation(x as AType, y as BType) // sort XY to AB ❗
+				let a = this.isAType?.(x) ? x : undefined
+				let b = a === undefined ? (x as BType) : undefined
+				for (const y of ys) {
+					a ??= y as AType
+					b ??= y as BType
+					this.addRelation(a, b)
+				}
 			}
 			for (const [contentKey, content] of data.contents ?? []) {
 				this.setContent(contentKey, content)
@@ -359,9 +372,12 @@ export class Junction<
 						.join(`, `)}). Only one related key was expected.`,
 				)
 			}
+			let singleRelation: AType | BType | undefined
 			for (const relation of relations) {
-				return relation
+				singleRelation = relation
+				break
 			}
+			return singleRelation
 		}
 	}
 
@@ -416,7 +432,7 @@ export class Junction<
 			const aRelations = this.getRelatedKeys(a)
 			if (aRelations) {
 				return [...aRelations].map((aRelation) => {
-					return [aRelation, this.getContent(a, aRelation) ?? (null as Content)]
+					return [aRelation, this.getContent(a, aRelation) as Content]
 				})
 			}
 		}
@@ -424,7 +440,7 @@ export class Junction<
 			const bRelations = this.getRelatedKeys(b)
 			if (bRelations) {
 				return [...bRelations].map((bRelation) => {
-					return [bRelation, this.getContent(bRelation, b) ?? (null as Content)]
+					return [bRelation, this.getContent(bRelation, b) as Content]
 				})
 			}
 		}

package/json/dist/index.js

@@ -1,4 +1,4 @@
-import { createWritableSelectorFamily } from '../../dist/chunk-SMKF3ZNG.js';
+import { createWritableSelectorFamily } from '../../dist/chunk-LSCRHXLI.js';
 import '../../dist/chunk-ADMEAXYU.js';
 import '../../dist/chunk-XWL6SNVU.js';
 import { createStandaloneSelector, IMPLICIT, growMoleculeInStore, initFamilyMemberInStore, withdraw, seekInStore } from 'atom.io/internal';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atom.io",
-  "version": "0.30.1",
+  "version": "0.30.2",
   "description": "Composable and testable reactive data library.",
   "homepage": "https://atom.io.fyi",
   "sideEffects": false,

package/realtime-server/dist/index.d.ts

@@ -122,8 +122,8 @@ type SocketSystemHierarchy = Hierarchy<[
     }
 ]>;
 declare const socketAtoms: AtomIO.RegularAtomFamilyToken<Socket | null, `socket::${string}`>;
-declare const socketIndex: AtomIO.MutableAtomToken<SetRTX<string>, SetRTXJson<string>>;
-declare const userIndex: AtomIO.MutableAtomToken<SetRTX<string>, SetRTXJson<string>>;
+declare const socketIndex: AtomIO.MutableAtomToken<SetRTX<`socket::${string}`>, SetRTXJson<`socket::${string}`>>;
+declare const userIndex: AtomIO.MutableAtomToken<SetRTX<`user::${string}`>, SetRTXJson<`user::${string}`>>;
 declare const usersOfSockets: atom_io_data.JoinToken<"user", `user::${string}`, "socket", `socket::${string}`, "1:1", null>;
 
 type StateProvider = ReturnType<typeof realtimeStateProvider>;

package/realtime-server/src/realtime-server-stores/server-user-store.ts

@@ -24,17 +24,17 @@ export const socketAtoms = atomFamily<Socket | null, SocketKey>({
 	default: null,
 })
 
-export const socketIndex = atom<SetRTX<string>, SetRTXJson<string>>({
+export const socketIndex = atom<SetRTX<SocketKey>, SetRTXJson<SocketKey>>({
 	key: `socketsIndex`,
 	mutable: true,
-	default: () => new SetRTX<string>(),
+	default: () => new SetRTX(),
 	toJson: (set) => set.toJSON(),
 	fromJson: (json) => SetRTX.fromJSON(json),
 })
-export const userIndex = atom<SetRTX<string>, SetRTXJson<string>>({
+export const userIndex = atom<SetRTX<UserKey>, SetRTXJson<UserKey>>({
 	key: `usersIndex`,
 	mutable: true,
-	default: () => new SetRTX<string>(),
+	default: () => new SetRTX(),
 	toJson: (set) => set.toJSON(),
 	fromJson: (json) => SetRTX.fromJSON(json),
 })

package/realtime-testing/dist/index.js

@@ -58,8 +58,12 @@ var setupRealtimeTestServer = (options) => {
         },
         silo.store
       );
-      setIntoStore(silo.store, RTS.userIndex, (index) => index.add(username));
-      setIntoStore(silo.store, RTS.socketIndex, (index) => index.add(socket.id));
+      setIntoStore(silo.store, RTS.userIndex, (index) => index.add(userClaim));
+      setIntoStore(
+        silo.store,
+        RTS.socketIndex,
+        (index) => index.add(socketClaim)
+      );
       console.log(`${username} connected on ${socket.id}`);
       next();
     } else {

package/realtime-testing/src/setup-realtime-test.tsx

@@ -127,8 +127,10 @@ export const setupRealtimeTestServer = (
 				},
 				silo.store,
 			)
-			setIntoStore(silo.store, RTS.userIndex, (index) => index.add(username))
-			setIntoStore(silo.store, RTS.socketIndex, (index) => index.add(socket.id))
+			setIntoStore(silo.store, RTS.userIndex, (index) => index.add(userClaim))
+			setIntoStore(silo.store, RTS.socketIndex, (index) =>
+				index.add(socketClaim),
+			)
 			console.log(`${username} connected on ${socket.id}`)
 			next()
 		} else {