atom.io 0.29.0 → 0.29.2

package/realtime-server/src/ipc-sockets/parent-socket.ts

@@ -37,6 +37,9 @@ export class SubjectSocket<
 
 export class ParentSocket<
 	I extends Events & {
+		[id in string as `relay:${id}`]: [string, ...Json.Serializable[]]
+	},
+	O extends Events & {
 		[id in string as `user:${id}`]: [string, ...Json.Serializable[]]
 	} & {
 		/* eslint-disable quotes */
@@ -44,9 +47,6 @@ export class ParentSocket<
 		"user-leaves": [string]
 		/* eslint-enable quotes */
 	},
-	O extends Events & {
-		[id in string as `relay:${id}`]: [string, ...Json.Serializable[]]
-	},
 > extends CustomSocket<I, O> {
 	protected incompleteData = ``
 	protected unprocessedEvents: string[] = []
@@ -167,7 +167,7 @@ export class ParentSocket<
 				relay.in.next(data)
 			})
 			relay.out.subscribe(`socket`, (data) => {
-				this.emit(...(data as [string, ...O[keyof O]]))
+				this.emit(...(data as [string, ...I[keyof I]]))
 			})
 		})
 

package/realtime-server/src/realtime-continuity-synchronizer.ts

@@ -174,7 +174,7 @@ export function realtimeContinuitySynchronizer({
 			}
 
 			const epoch = isRootStore(store)
-				? store.transactionMeta.epoch.get(continuityKey) ?? null
+				? (store.transactionMeta.epoch.get(continuityKey) ?? null)
 				: null
 
 			socket?.emit(`continuity-init:${continuityKey}`, epoch, initialPayload)

package/src/index.ts

@@ -1,5 +1,5 @@
 import type { Transceiver } from "atom.io/internal"
-import type { Canonical, Json } from "atom.io/json"
+import type { Canonical, Json, stringified } from "atom.io/json"
 
 import type { AtomFamilyToken } from "./atom"
 import type {
@@ -20,44 +20,49 @@ export * from "./timeline"
 export * from "./transaction"
 export * from "./validators"
 
-export type RegularAtomToken<T> = {
+export type RegularAtomToken<T, K extends Canonical = any> = {
 	key: string
 	type: `atom`
-	family?: FamilyMetadata
+	family?: FamilyMetadata<K>
 	__T?: T
 }
 export type MutableAtomToken<
 	T extends Transceiver<any>,
 	J extends Json.Serializable,
+	K extends Canonical = any,
 > = {
 	key: string
 	type: `mutable_atom`
-	family?: FamilyMetadata
+	family?: FamilyMetadata<K>
 	__J?: J
 	__U?: T extends Transceiver<infer Update> ? Update : never
 }
-export type AtomToken<T> =
-	| MutableAtomToken<T extends Transceiver<any> ? T : never, any>
-	| RegularAtomToken<T>
+export type AtomToken<T, K extends Canonical = any> =
+	| MutableAtomToken<T extends Transceiver<any> ? T : never, any, K>
+	| RegularAtomToken<T, K>
 
-export type WritableSelectorToken<T> = {
+export type WritableSelectorToken<T, K extends Canonical = any> = {
 	key: string
 	type: `selector`
-	family?: FamilyMetadata
+	family?: FamilyMetadata<K>
 	__T?: T
 }
-export type ReadonlySelectorToken<T> = {
+export type ReadonlySelectorToken<T, K extends Canonical = any> = {
 	key: string
 	type: `readonly_selector`
-	family?: FamilyMetadata
+	family?: FamilyMetadata<K>
 	__T?: T
 }
-export type SelectorToken<T> =
-	| ReadonlySelectorToken<T>
-	| WritableSelectorToken<T>
+export type SelectorToken<T, K extends Canonical = any> =
+	| ReadonlySelectorToken<T, K>
+	| WritableSelectorToken<T, K>
 
-export type WritableToken<T> = AtomToken<T> | WritableSelectorToken<T>
-export type ReadableToken<T> = AtomToken<T> | SelectorToken<T>
+export type WritableToken<T, K extends Canonical = any> =
+	| AtomToken<T, K>
+	| WritableSelectorToken<T, K>
+export type ReadableToken<T, K extends Canonical = any> =
+	| AtomToken<T, K>
+	| SelectorToken<T, K>
 
 export type WritableFamilyToken<T, K extends Canonical> =
 	| AtomFamilyToken<T, K>
@@ -66,4 +71,7 @@ export type ReadableFamilyToken<T, K extends Canonical> =
 	| AtomFamilyToken<T, K>
 	| SelectorFamilyToken<T, K>
 
-export type FamilyMetadata = { key: string; subKey: string }
+export type FamilyMetadata<K extends Canonical = any> = {
+	key: string
+	subKey: stringified<K>
+}

package/transceivers/set-rtx/dist/index.js

@@ -1,6 +1,6 @@
 import '../../../dist/chunk-XWL6SNVU.js';
 import { Subject } from 'atom.io/internal';
-import { stringifyJson, parseJson } from 'atom.io/json';
+import { stringifyJson } from 'atom.io/json';
 
 var SetRTX = class _SetRTX extends Set {
   mode = `record`;
@@ -111,13 +111,13 @@ var SetRTX = class _SetRTX extends Set {
     const value = update.substring(typeValueBreak + 1);
     switch (type) {
       case `add`:
-        this.add(parseJson(value));
+        this.add(JSON.parse(value));
         break;
       case `clear`:
         this.clear();
         break;
       case `del`:
-        this.delete(parseJson(value));
+        this.delete(JSON.parse(value));
         break;
       case `tx`:
         for (const subUpdate of value.split(`;`)) {
@@ -177,10 +177,10 @@ var SetRTX = class _SetRTX extends Set {
     const value = update.substring(breakpoint + 1);
     switch (type) {
       case `add`:
-        this.delete(parseJson(value));
+        this.delete(JSON.parse(value));
         break;
       case `del`:
-        this.add(parseJson(value));
+        this.add(JSON.parse(value));
         break;
       case `clear`: {
         const values = JSON.parse(value);

package/transceivers/set-rtx/src/set-rtx.ts

@@ -1,7 +1,7 @@
 import type { Lineage, Transceiver, TransceiverMode } from "atom.io/internal"
 import { Subject } from "atom.io/internal"
-import type { Json, primitive, stringified } from "atom.io/json"
-import { parseJson, stringifyJson } from "atom.io/json"
+import type { Json, primitive } from "atom.io/json"
+import { stringifyJson } from "atom.io/json"
 
 export type SetUpdate =
 	| `add:${string}`
@@ -146,13 +146,13 @@ export class SetRTX<P extends primitive>
 		const value = update.substring(typeValueBreak + 1)
 		switch (type) {
 			case `add`:
-				this.add(parseJson(value as stringified<P>))
+				this.add(JSON.parse(value))
 				break
 			case `clear`:
 				this.clear()
 				break
 			case `del`:
-				this.delete(parseJson(value as stringified<P>))
+				this.delete(JSON.parse(value))
 				break
 			case `tx`:
 				for (const subUpdate of value.split(`;`)) {
@@ -215,10 +215,10 @@ export class SetRTX<P extends primitive>
 		const value = update.substring(breakpoint + 1)
 		switch (type) {
 			case `add`:
-				this.delete(parseJson(value as stringified<P>))
+				this.delete(JSON.parse(value))
 				break
 			case `del`:
-				this.add(parseJson(value as stringified<P>))
+				this.add(JSON.parse(value))
 				break
 			case `clear`: {
 				const values = JSON.parse(value) as P[]