atom.io 0.25.6 → 0.27.0

package/realtime-client/dist/index.js

@@ -1,5 +1,5 @@
 import { lazyLocalStorageEffect } from '../../dist/chunk-H6EDLPKH.js';
-import '../../dist/chunk-S4N6XNPH.js';
+import '../../dist/chunk-XWL6SNVU.js';
 import * as Internal from 'atom.io/internal';
 import { setIntoStore, getJsonToken, getUpdateToken, getFromStore, assignTransactionToContinuity, subscribeToTransaction, disposeAtom, setEpochNumberOfContinuity, getEpochNumberOfContinuity, isRootStore, ingestTransactionUpdate, actUponStore } from 'atom.io/internal';
 import { parseJson } from 'atom.io/json';
@@ -25,13 +25,13 @@ function pullAtomFamilyMember(token, socket, store) {
   }
   const { key: familyKey, subKey: serializedSubKey } = token.family;
   const subKey = parseJson(serializedSubKey);
-  socket == null ? void 0 : socket.on(`serve:${token.key}`, (data) => {
+  socket?.on(`serve:${token.key}`, (data) => {
     setIntoStore(token, data, store);
   });
-  socket == null ? void 0 : socket.emit(`sub:${familyKey}`, subKey);
+  socket?.emit(`sub:${familyKey}`, subKey);
   return () => {
-    socket == null ? void 0 : socket.off(`serve:${token.key}`);
-    socket == null ? void 0 : socket.emit(`unsub:${token.key}`);
+    socket?.off(`serve:${token.key}`);
+    socket?.emit(`unsub:${token.key}`);
   };
 }
 function pullMutableAtom(token, socket, store) {
@@ -332,7 +332,7 @@ function syncContinuity(continuity, socket, store) {
         reconcileEpoch(zerothOptimisticUpdate, confirmed);
         for (const nextConfirmed of confirmedUpdates) {
           const nextOptimistic = optimisticUpdates[0];
-          if (nextConfirmed.epoch === (nextOptimistic == null ? void 0 : nextOptimistic.epoch)) {
+          if (nextConfirmed.epoch === nextOptimistic?.epoch) {
             reconcileEpoch(nextOptimistic, nextConfirmed);
           } else {
             break;

package/realtime-client/package.json

@@ -2,14 +2,11 @@
 	"name": "atom.io-realtime-client",
 	"type": "module",
 	"private": true,
-	"main": "dist/index.cjs",
-	"module": "dist/index.js",
+	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"exports": {
 		".": {
 			"import": "./dist/index.js",
-			"browser": "./dist/index.js",
-			"require": "./dist/index.cjs",
 			"types": "./dist/index.d.ts"
 		}
 	}

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Socket } from 'socket.io-client';
 import * as AtomIO from 'atom.io';
-import { Json } from 'atom.io/json';
+import { Json, Canonical } from 'atom.io/json';
 import { Transceiver, Func } from 'atom.io/internal';
 import { ContinuityToken } from 'atom.io/realtime';
 
@@ -20,15 +20,15 @@ declare const RealtimeProvider: React.FC<{
 
 declare function usePullAtom<J extends Json.Serializable>(token: AtomIO.RegularAtomToken<J>): J;
 
-declare function usePullAtomFamilyMember<J extends Json.Serializable, K extends Json.Serializable, Key extends K>(family: AtomIO.RegularAtomFamilyToken<J, K>, subKey: Key): J;
+declare function usePullAtomFamilyMember<J extends Json.Serializable, K extends Canonical, Key extends K>(family: AtomIO.RegularAtomFamilyToken<J, K>, subKey: Key): J;
 
 declare function usePullMutable<T extends Transceiver<any>, J extends Json.Serializable>(token: AtomIO.MutableAtomToken<T, J>): T;
 
-declare function usePullMutableAtomFamilyMember<T extends Transceiver<any>, J extends Json.Serializable, K extends Json.Serializable, Key extends K>(familyToken: AtomIO.MutableAtomFamilyToken<T, J, K>, key: Key): T;
+declare function usePullMutableAtomFamilyMember<T extends Transceiver<any>, J extends Json.Serializable, K extends Canonical, Key extends K>(familyToken: AtomIO.MutableAtomFamilyToken<T, J, K>, key: Key): T;
 
 declare function usePullSelector<J extends Json.Serializable>(token: AtomIO.SelectorToken<J>): J;
 
-declare function usePullSelectorFamilyMember<T, K extends Json.Serializable, Key extends K>(familyToken: AtomIO.SelectorFamilyToken<T, K>, key: Key): T;
+declare function usePullSelectorFamilyMember<T, K extends Canonical, Key extends K>(familyToken: AtomIO.SelectorFamilyToken<T, K>, key: Key): T;
 
 declare function usePush<J extends Json.Serializable>(token: AtomIO.WritableToken<J>): <New extends J>(next: New | ((old: J) => New)) => void;
 

package/realtime-react/dist/index.js

@@ -1,4 +1,4 @@
-import '../../dist/chunk-S4N6XNPH.js';
+import '../../dist/chunk-XWL6SNVU.js';
 import { useI, StoreContext, useO } from 'atom.io/react';
 import * as RTC from 'atom.io/realtime-client';
 import { syncContinuity } from 'atom.io/realtime-client';
@@ -14,11 +14,11 @@ var RealtimeProvider = ({ children, socket }) => {
   const services = React.useRef(/* @__PURE__ */ new Map()).current;
   const setMyId = useI(RTC.myIdState__INTERNAL);
   React.useEffect(() => {
-    setMyId(socket == null ? void 0 : socket.id);
-    socket == null ? void 0 : socket.on(`connect`, () => {
+    setMyId(socket?.id);
+    socket?.on(`connect`, () => {
       setMyId(socket.id);
     });
-    socket == null ? void 0 : socket.on(`disconnect`, () => {
+    socket?.on(`disconnect`, () => {
       setMyId(void 0);
     });
   }, [socket, setMyId]);
@@ -32,10 +32,9 @@ function useSingleEffect(effect, deps) {
   if (IN_DEV) {
     const cleanup = React.useRef(noop);
     React.useEffect(() => {
-      var _a;
       let dispose = cleanup.current;
       if (dispose === noop) {
-        dispose = (_a = effect()) != null ? _a : noop;
+        dispose = effect() ?? noop;
         cleanup.current = dispose;
       } else {
         return () => {
@@ -58,21 +57,20 @@ function onMount(effect) {
 function useRealtimeService(key, create) {
   const { socket, services } = React.useContext(RealtimeContext);
   onMount(() => {
-    let service = services == null ? void 0 : services.get(key);
+    let service = services?.get(key);
     if (service) {
       service[0]++;
     } else {
       const dispose = socket ? create(socket) : void 0;
       service = [1, dispose];
-      services == null ? void 0 : services.set(key, service);
+      services?.set(key, service);
     }
     return () => {
-      var _a;
       if (service) {
         service[0]--;
         if (service[0] === 0) {
-          (_a = service[1]) == null ? void 0 : _a.call(service);
-          services == null ? void 0 : services.delete(key);
+          service[1]?.();
+          services?.delete(key);
         }
       }
     };

package/realtime-react/package.json

@@ -2,14 +2,11 @@
 	"name": "atom.io-realtime-react",
 	"type": "module",
 	"private": true,
-	"main": "dist/index.cjs",
-	"module": "dist/index.js",
+	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"exports": {
 		".": {
 			"import": "./dist/index.js",
-			"browser": "./dist/index.js",
-			"require": "./dist/index.cjs",
 			"types": "./dist/index.d.ts"
 		}
 	}

package/realtime-react/src/use-pull-atom-family-member.ts

@@ -1,6 +1,6 @@
 import type * as AtomIO from "atom.io"
 import { findInStore } from "atom.io/internal"
-import type { Json } from "atom.io/json"
+import type { Canonical, Json } from "atom.io/json"
 import { StoreContext, useO } from "atom.io/react"
 import * as RTC from "atom.io/realtime-client"
 import * as React from "react"
@@ -9,7 +9,7 @@ import { useRealtimeService } from "./use-realtime-service"
 
 export function usePullAtomFamilyMember<
 	J extends Json.Serializable,
-	K extends Json.Serializable,
+	K extends Canonical,
 	Key extends K,
 >(family: AtomIO.RegularAtomFamilyToken<J, K>, subKey: Key): J {
 	const store = React.useContext(StoreContext)

package/realtime-react/src/use-pull-mutable-family-member.ts

@@ -1,7 +1,7 @@
 import type * as AtomIO from "atom.io"
 import type { Transceiver } from "atom.io/internal"
 import { findInStore } from "atom.io/internal"
-import type { Json } from "atom.io/json"
+import type { Canonical, Json } from "atom.io/json"
 import { StoreContext, useO } from "atom.io/react"
 import * as RTC from "atom.io/realtime-client"
 import * as React from "react"
@@ -11,7 +11,7 @@ import { useRealtimeService } from "./use-realtime-service"
 export function usePullMutableAtomFamilyMember<
 	T extends Transceiver<any>,
 	J extends Json.Serializable,
-	K extends Json.Serializable,
+	K extends Canonical,
 	Key extends K,
 >(familyToken: AtomIO.MutableAtomFamilyToken<T, J, K>, key: Key): T {
 	const store = React.useContext(StoreContext)

package/realtime-react/src/use-pull-selector-family-member.ts

@@ -1,6 +1,6 @@
 import type * as AtomIO from "atom.io"
 import { findInStore } from "atom.io/internal"
-import type { Json } from "atom.io/json"
+import type { Canonical } from "atom.io/json"
 import { StoreContext, useO } from "atom.io/react"
 import * as RTC from "atom.io/realtime-client"
 import * as React from "react"
@@ -9,7 +9,7 @@ import { useRealtimeService } from "./use-realtime-service"
 
 export function usePullSelectorFamilyMember<
 	T,
-	K extends Json.Serializable,
+	K extends Canonical,
 	Key extends K,
 >(familyToken: AtomIO.SelectorFamilyToken<T, K>, key: Key): T {
 	const store = React.useContext(StoreContext)

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

@@ -1,5 +1,5 @@
 import { Subject, Transceiver, Store } from 'atom.io/internal';
-import { Json, Stringified, JsonIO } from 'atom.io/json';
+import { Json, stringified, JsonIO, Canonical } from 'atom.io/json';
 import { ChildProcessWithoutNullStreams } from 'node:child_process';
 import * as AtomIO from 'atom.io';
 import { TransactionUpdateContent, TransactionUpdate, WritableToken } from 'atom.io';
@@ -9,7 +9,7 @@ import { Loadable } from 'atom.io/data';
 import { SetRTX, SetRTXJson } from 'atom.io/transceivers/set-rtx';
 
 type Events = Json.Object<string, Json.Serializable[]>;
-type StringifiedEvent<Key extends string, Params extends Json.Serializable[]> = Stringified<[Key, ...Params]>;
+type StringifiedEvent<Key extends string, Params extends Json.Serializable[]> = stringified<[Key, ...Params]>;
 interface EventBuffer<Key extends string, Params extends Json.Serializable[]> extends Buffer {
     toString(): StringifiedEvent<Key, Params>;
 }
@@ -88,10 +88,10 @@ type RealtimeContinuitySynchronizer = ReturnType<typeof realtimeContinuitySynchr
 declare function realtimeContinuitySynchronizer({ socket: initialSocket, store, }: ServerConfig): (continuity: ContinuityToken) => () => void;
 
 type FamilyProvider = ReturnType<typeof realtimeAtomFamilyProvider>;
-declare function realtimeAtomFamilyProvider({ socket, store, }: ServerConfig): <J extends Json.Serializable, K extends Json.Serializable>(family: AtomIO.RegularAtomFamilyToken<J, K>, index: AtomIO.ReadableToken<Iterable<K>>) => () => void;
+declare function realtimeAtomFamilyProvider({ socket, store, }: ServerConfig): <J extends Json.Serializable, K extends Canonical>(family: AtomIO.RegularAtomFamilyToken<J, K>, index: AtomIO.ReadableToken<Iterable<K>>) => () => void;
 
 type MutableFamilyProvider = ReturnType<typeof realtimeMutableFamilyProvider>;
-declare function realtimeMutableFamilyProvider({ socket, store, }: ServerConfig): <T extends Transceiver<any>, J extends Json.Serializable, K extends Json.Serializable>(family: AtomIO.MutableAtomFamilyToken<T, J, K>, index: AtomIO.ReadableToken<Iterable<K>>) => () => void;
+declare function realtimeMutableFamilyProvider({ socket, store, }: ServerConfig): <T extends Transceiver<any>, J extends Json.Serializable, K extends Canonical>(family: AtomIO.MutableAtomFamilyToken<T, J, K>, index: AtomIO.ReadableToken<Iterable<K>>) => () => void;
 
 type MutableProvider = ReturnType<typeof realtimeMutableProvider>;
 declare function realtimeMutableProvider({ socket, store, }: ServerConfig): <Core extends Transceiver<Json.Serializable>, SerializableCore extends Json.Serializable>(token: AtomIO.MutableAtomToken<Core, SerializableCore>) => () => void;
@@ -105,16 +105,16 @@ type LeaveRoomIO = AtomIO.TransactionIO<typeof leaveRoomTX>;
 declare const destroyRoomTX: AtomIO.TransactionToken<(roomId: string) => void>;
 
 type RoomArguments = [script: string, options: string[]] | [script: string];
-declare const roomArgumentsAtoms: AtomIO.RegularAtomFamilyTokenWithCall<RoomArguments, string>;
-declare const roomSelectors: AtomIO.ReadonlySelectorFamilyTokenWithCall<Loadable<ChildSocket<any, any>>, string>;
+declare const roomArgumentsAtoms: AtomIO.RegularAtomFamilyToken<RoomArguments, string>;
+declare const roomSelectors: AtomIO.ReadonlySelectorFamilyToken<Loadable<ChildSocket<any, any>>, string>;
 
 declare function redactTransactionUpdateContent(visibleStateKeys: string[], updates: TransactionUpdateContent[]): TransactionUpdateContent[];
-declare const actionOcclusionAtoms: AtomIO.RegularAtomFamilyTokenWithCall<{
+declare const actionOcclusionAtoms: AtomIO.RegularAtomFamilyToken<{
     occlude: (updates: TransactionUpdateContent[]) => TransactionUpdateContent[];
 }, string>;
-declare const userUnacknowledgedQueues: AtomIO.RegularAtomFamilyTokenWithCall<Pick<TransactionUpdate<any>, "key" | "id" | "epoch" | "updates" | "output">[], string>;
+declare const userUnacknowledgedQueues: AtomIO.RegularAtomFamilyToken<Pick<TransactionUpdate<any>, "key" | "id" | "epoch" | "updates" | "output">[], string>;
 
-declare const socketAtoms: AtomIO.RegularAtomFamilyTokenWithCall<Socket | null, string>;
+declare const socketAtoms: AtomIO.RegularAtomFamilyToken<Socket | null, string>;
 declare const socketIndex: AtomIO.MutableAtomToken<SetRTX<string>, SetRTXJson<string>>;
 declare const userIndex: AtomIO.MutableAtomToken<SetRTX<string>, SetRTXJson<string>>;
 declare const usersOfSockets: atom_io_data.JoinToken<"user", "socket", "1:1", null>;

package/realtime-server/dist/index.js

@@ -1,4 +1,4 @@
-import { __spreadProps, __spreadValues } from '../../dist/chunk-S4N6XNPH.js';
+import '../../dist/chunk-XWL6SNVU.js';
 import { parseJson, stringifyJson } from 'atom.io/json';
 import { Subject, IMPLICIT, getFromStore, subscribeToState, findInStore, getJsonToken, getUpdateToken, actUponStore, isRootStore, subscribeToTransaction, setIntoStore } from 'atom.io/internal';
 import { SetRTX } from 'atom.io/transceivers/set-rtx';
@@ -12,10 +12,11 @@ import { spawn } from 'child_process';
 var CustomSocket = class {
   constructor(emit) {
     this.emit = emit;
-    this.id = `no_id_retrieved`;
     this.listeners = /* @__PURE__ */ new Map();
     this.globalListeners = /* @__PURE__ */ new Set();
   }
+  listeners;
+  globalListeners;
   handleEvent(event, ...args) {
     for (const listener of this.globalListeners) {
       listener(event, ...args);
@@ -27,6 +28,7 @@ var CustomSocket = class {
       }
     }
   }
+  id = `no_id_retrieved`;
   on(event, listener) {
     const listeners = this.listeners.get(event);
     if (listeners) {
@@ -75,11 +77,6 @@ var ChildSocket = class extends CustomSocket {
     this.process = process2;
     this.key = key;
     this.logger = logger;
-    this.incompleteData = ``;
-    this.unprocessedEvents = [];
-    this.incompleteLog = ``;
-    this.unprocessedLogs = [];
-    this.id = `#####`;
     this.process = process2;
     this.process.stdout.on(
       `data`,
@@ -90,7 +87,7 @@ var ChildSocket = class extends CustomSocket {
         }
         this.unprocessedEvents.push(...chunk.split(``));
         const newInput = this.unprocessedEvents.shift();
-        this.incompleteData += newInput != null ? newInput : ``;
+        this.incompleteData += newInput ?? ``;
         try {
           if (this.incompleteData.startsWith(`error`)) {
             console.log(`\u2757`, this.incompleteData);
@@ -117,16 +114,15 @@ var ChildSocket = class extends CustomSocket {
       }
     );
     this.process.stderr.on(`data`, (buf) => {
-      var _a;
       const chunk = buf.toString();
       this.unprocessedLogs.push(...chunk.split(``));
       const newInput = this.unprocessedLogs.shift();
-      this.incompleteLog += newInput != null ? newInput : ``;
+      this.incompleteLog += newInput ?? ``;
       try {
         let parsedLog = parseJson(this.incompleteLog);
         this.handleLog(parsedLog);
         while (this.unprocessedLogs.length > 0) {
-          this.incompleteLog = (_a = this.unprocessedLogs.shift()) != null ? _a : ``;
+          this.incompleteLog = this.unprocessedLogs.shift() ?? ``;
           if (this.incompleteLog) {
             parsedLog = parseJson(this.incompleteLog);
             this.handleLog(parsedLog);
@@ -143,6 +139,11 @@ var ChildSocket = class extends CustomSocket {
       this.id = process2.pid.toString();
     }
   }
+  incompleteData = ``;
+  unprocessedEvents = [];
+  incompleteLog = ``;
+  unprocessedLogs = [];
+  id = `#####`;
   handleLog(arg) {
     if (Array.isArray(arg)) {
       const [level, ...rest] = arg;
@@ -161,13 +162,15 @@ var ChildSocket = class extends CustomSocket {
   }
 };
 var SubjectSocket = class extends CustomSocket {
+  in;
+  out;
+  id = `no_id_retrieved`;
+  disposalFunctions = [];
   constructor(id) {
     super((...args) => {
       this.out.next(args);
       return this;
     });
-    this.id = `no_id_retrieved`;
-    this.disposalFunctions = [];
     this.id = id;
     this.in = new Subject();
     this.out = new Subject();
@@ -182,27 +185,38 @@ var SubjectSocket = class extends CustomSocket {
   }
 };
 var ParentSocket = class extends CustomSocket {
+  incompleteData = ``;
+  unprocessedEvents = [];
+  relays;
+  relayServices;
+  process;
+  id = `#####`;
+  log(...args) {
+    this.process.stderr.write(
+      stringifyJson(
+        args.map(
+          (arg) => arg instanceof SetRTX ? `{ ${arg.toJSON().members.join(` | `)} }` : arg
+        )
+      ) + ``
+    );
+  }
+  logger = {
+    info: (...args) => {
+      this.log(`i`, ...args);
+    },
+    warn: (...args) => {
+      this.log(`w`, ...args);
+    },
+    error: (...args) => {
+      this.log(`e`, ...args);
+    }
+  };
   constructor() {
-    var _a;
     super((event, ...args) => {
       const stringifiedEvent = JSON.stringify([event, ...args]);
       this.process.stdout.write(stringifiedEvent + ``);
       return this;
     });
-    this.incompleteData = ``;
-    this.unprocessedEvents = [];
-    this.id = `#####`;
-    this.logger = {
-      info: (...args) => {
-        this.log(`i`, ...args);
-      },
-      warn: (...args) => {
-        this.log(`w`, ...args);
-      },
-      error: (...args) => {
-        this.log(`e`, ...args);
-      }
-    };
     this.process = process;
     this.process.stdin.resume();
     this.relays = /* @__PURE__ */ new Map();
@@ -213,7 +227,7 @@ var ParentSocket = class extends CustomSocket {
         const chunk = buffer.toString();
         this.unprocessedEvents.push(...chunk.split(``));
         const newInput = this.unprocessedEvents.shift();
-        this.incompleteData += newInput != null ? newInput : ``;
+        this.incompleteData += newInput ?? ``;
         try {
           const parsedData = parseJson(this.incompleteData);
           this.logger.info(`\u{1F3B0}`, `received`, parsedData);
@@ -256,7 +270,7 @@ var ParentSocket = class extends CustomSocket {
       process.exit(0);
     });
     if (process.pid) {
-      this.id = (_a = process.pid) == null ? void 0 : _a.toString();
+      this.id = process.pid?.toString();
     }
     this.on(`user-joins`, (username) => {
       this.logger.info(`\u{1F464}`, `user`, username, `joined`);
@@ -290,15 +304,6 @@ var ParentSocket = class extends CustomSocket {
     });
     process.stdout.write(`\u2728`);
   }
-  log(...args) {
-    this.process.stderr.write(
-      stringifyJson(
-        args.map(
-          (arg) => arg instanceof SetRTX ? `{ ${arg.toJSON().members.join(` | `)} }` : arg
-        )
-      ) + ``
-    );
-  }
   relay(attachServices) {
     this.logger.info(`\u{1F517}`, `running relay method`);
     this.relayServices.push(attachServices);
@@ -321,7 +326,7 @@ function realtimeActionReceiver({
         performanceKeyStart,
         performanceKeyEnd
       );
-      store == null ? void 0 : store.logger.info(`\u{1F680}`, `transaction`, tx.key, update.id, metric.duration);
+      store?.logger.info(`\u{1F680}`, `transaction`, tx.key, update.id, metric.duration);
     };
     socket.on(`tx-run:${tx.key}`, fillTransactionRequest);
     return () => {
@@ -415,7 +420,7 @@ function redactTransactionUpdateContent(visibleStateKeys, updates) {
           visibleStateKeys,
           update.updates
         );
-        return __spreadProps(__spreadValues({}, update), { updates: redacted });
+        return { ...update, updates: redacted };
       }
       default:
         return update;
@@ -556,10 +561,10 @@ function realtimeContinuitySynchronizer({
               { oldKeys, newKeys, revealed, concealed }
             );
             if (revealed.length > 0) {
-              socket == null ? void 0 : socket.emit(`reveal:${continuityKey}`, revealed);
+              socket?.emit(`reveal:${continuityKey}`, revealed);
             }
             if (concealed.length > 0) {
-              socket == null ? void 0 : socket.emit(`conceal:${continuityKey}`, concealed);
+              socket?.emit(`conceal:${continuityKey}`, concealed);
             }
           },
           `sync-continuity:${continuityKey}:${userKey}:perspective:${perspective.resourceAtoms.key}`,
@@ -573,7 +578,6 @@ function realtimeContinuitySynchronizer({
     };
     const unsubscribeFromPerspectives = revealPerspectives();
     const sendInitialPayload = () => {
-      var _a;
       const initialPayload = [];
       for (const atom2 of continuity.globals) {
         const resourceToken = atom2.type === `mutable_atom` ? getJsonToken(atom2, store) : atom2;
@@ -594,8 +598,8 @@ function realtimeContinuitySynchronizer({
           initialPayload.push(resourceToken, resource);
         }
       }
-      const epoch = isRootStore(store) ? (_a = store.transactionMeta.epoch.get(continuityKey)) != null ? _a : null : null;
-      socket == null ? void 0 : socket.emit(`continuity-init:${continuityKey}`, epoch, initialPayload);
+      const epoch = isRootStore(store) ? store.transactionMeta.epoch.get(continuityKey) ?? null : null;
+      socket?.emit(`continuity-init:${continuityKey}`, epoch, initialPayload);
       for (const transaction2 of continuity.actions) {
         const unsubscribeFromTransaction = subscribeToTransaction(
           transaction2,
@@ -623,10 +627,11 @@ function realtimeContinuitySynchronizer({
                 visibleKeys,
                 update.updates
               );
-              const redactedUpdate = __spreadProps(__spreadValues({}, update), {
+              const redactedUpdate = {
+                ...update,
                 updates: redactedUpdates
-              });
-              socket == null ? void 0 : socket.emit(
+              };
+              socket?.emit(
                 `tx-new:${continuityKey}`,
                 redactedUpdate
               );
@@ -681,7 +686,7 @@ function realtimeContinuitySynchronizer({
         performanceKeyStart,
         performanceKeyEnd
       );
-      store == null ? void 0 : store.logger.info(
+      store?.logger.info(
         `\u{1F680}`,
         `transaction`,
         transactionKey,
@@ -708,8 +713,8 @@ function realtimeContinuitySynchronizer({
     return () => {
       for (const unsubscribe of unsubscribeFunctions) unsubscribe();
       unsubscribeFromPerspectives();
-      socket == null ? void 0 : socket.off(`get:${continuityKey}`, sendInitialPayload);
-      socket == null ? void 0 : socket.off(`tx-run:${continuityKey}`, fillTransactionRequest);
+      socket?.off(`get:${continuityKey}`, sendInitialPayload);
+      socket?.off(`tx-run:${continuityKey}`, fillTransactionRequest);
     };
   };
 }
@@ -818,7 +823,7 @@ function realtimeMutableProvider({
     const trackerToken = getUpdateToken(token);
     const fillUnsubRequest = () => {
       socket.off(`unsub:${token.key}`, fillUnsubRequest);
-      unsubscribeFromStateUpdates == null ? void 0 : unsubscribeFromStateUpdates();
+      unsubscribeFromStateUpdates?.();
       unsubscribeFromStateUpdates = null;
     };
     const fillSubRequest = () => {
@@ -836,7 +841,7 @@ function realtimeMutableProvider({
     socket.on(`sub:${token.key}`, fillSubRequest);
     return () => {
       socket.off(`sub:${token.key}`, fillSubRequest);
-      unsubscribeFromStateUpdates == null ? void 0 : unsubscribeFromStateUpdates();
+      unsubscribeFromStateUpdates?.();
     };
   };
 }

package/realtime-server/package.json

@@ -2,14 +2,11 @@
 	"name": "atom.io-realtime-server",
 	"type": "module",
 	"private": true,
-	"main": "dist/index.cjs",
-	"module": "dist/index.js",
+	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"exports": {
 		".": {
 			"import": "./dist/index.js",
-			"browser": "./dist/index.js",
-			"require": "./dist/index.cjs",
 			"types": "./dist/index.d.ts"
 		}
 	}

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

@@ -1,4 +1,4 @@
-import type { Json, Stringified } from "atom.io/json"
+import type { Json, stringified } from "atom.io/json"
 
 import type { Socket } from ".."
 
@@ -7,7 +7,7 @@ export type Events = Json.Object<string, Json.Serializable[]>
 export type StringifiedEvent<
 	Key extends string,
 	Params extends Json.Serializable[],
-> = Stringified<[Key, ...Params]>
+> = stringified<[Key, ...Params]>
 
 export interface EventBuffer<
 	Key extends string,

package/realtime-server/src/realtime-family-provider.ts

@@ -5,7 +5,8 @@ import {
 	IMPLICIT,
 	subscribeToState,
 } from "atom.io/internal"
-import { type Json, stringifyJson } from "atom.io/json"
+import type { Canonical, Json } from "atom.io/json"
+import { stringifyJson } from "atom.io/json"
 
 import type { ServerConfig } from "."
 
@@ -16,7 +17,7 @@ export function realtimeAtomFamilyProvider({
 }: ServerConfig) {
 	return function familyProvider<
 		J extends Json.Serializable,
-		K extends Json.Serializable,
+		K extends Canonical,
 	>(
 		family: AtomIO.RegularAtomFamilyToken<J, K>,
 		index: AtomIO.ReadableToken<Iterable<K>>,

package/realtime-server/src/realtime-mutable-family-provider.ts

@@ -8,7 +8,7 @@ import {
 	IMPLICIT,
 	subscribeToState,
 } from "atom.io/internal"
-import type { Json } from "atom.io/json"
+import type { Canonical, Json } from "atom.io/json"
 import { stringifyJson } from "atom.io/json"
 
 import type { ServerConfig } from "."
@@ -23,7 +23,7 @@ export function realtimeMutableFamilyProvider({
 	return function mutableFamilyProvider<
 		T extends Transceiver<any>,
 		J extends Json.Serializable,
-		K extends Json.Serializable,
+		K extends Canonical,
 	>(
 		family: AtomIO.MutableAtomFamilyToken<T, J, K>,
 		index: AtomIO.ReadableToken<Iterable<K>>,

package/realtime-testing/dist/index.js

@@ -1,5 +1,5 @@
-import { recordToEntries } from '../../dist/chunk-MR5NETHW.js';
-import { __spreadProps, __spreadValues } from '../../dist/chunk-S4N6XNPH.js';
+import { recordToEntries } from '../../dist/chunk-IW6WYRS7.js';
+import '../../dist/chunk-XWL6SNVU.js';
 import * as http from 'http';
 import { render, prettyDOM } from '@testing-library/react';
 import * as AtomIO from 'atom.io';
@@ -126,7 +126,7 @@ var multiClient = (options) => {
   const clients = recordToEntries(options.clients).reduce(
     (clientRecord, [name, client]) => {
       clientRecord[name] = setupRealtimeTestClient(
-        __spreadProps(__spreadValues({}, options), { client }),
+        { ...options, client },
         name,
         server.port
       );

package/realtime-testing/package.json

@@ -2,14 +2,11 @@
 	"name": "atom.io-realtime-testing",
 	"type": "module",
 	"private": true,
-	"main": "dist/index.cjs",
-	"module": "dist/index.js",
+	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"exports": {
 		".": {
 			"import": "./dist/index.js",
-			"browser": "./dist/index.js",
-			"require": "./dist/index.cjs",
 			"types": "./dist/index.d.ts"
 		}
 	}