[sync] Bus as object

tinyplex · Apr 11, 2024 · 4b492e9 · 4b492e9
1 parent 7f1e949
commit 4b492e9
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 45 deletions.
diff --git a/src/persisters/persister-sync.ts b/src/persisters/persister-sync.ts
@@ -42,7 +42,6 @@ export const createSyncPersister = ((
 ): SyncPersister => {
   let persisterListener: PersisterListener | undefined;
 
-  const [join] = bus;
   const [getHlc] = getHlcFunctions(store.getId());
   const pendingRequests: IdMap<
     [
@@ -86,7 +85,7 @@ export const createSyncPersister = ((
     }
   };
 
-  const [send] = join(store.getId(), receive);
+  const [send] = bus.join(store.getId(), receive);
 
   const request = async <Response>(
     toStoreId: IdOrNull,
@@ -206,37 +205,39 @@ export const createLocalBus = (() => {
   let sends = 0;
   let receives = 0;
   const stores: IdMap<Receive> = mapNew();
-  return [
-    (storeId: Id, receive: Receive): [Send, () => void] => {
-      mapSet(stores, storeId, receive);
-      const send = (
-        requestId: IdOrNull,
-        toStoreId: IdOrNull,
-        messageType: MessageType,
-        messageBody: any,
-      ): void => {
-        if (DEBUG) {
-          sends++;
-          receives += isUndefined(toStoreId) ? collSize(stores) - 1 : 1;
-        }
-        isUndefined(toStoreId)
-          ? collForEach(stores, (receive, otherStoreId) =>
-              otherStoreId != storeId
-                ? receive(requestId, storeId, messageType, messageBody)
-                : 0,
-            )
-          : mapGet(stores, toStoreId)?.(
-              requestId,
-              storeId,
-              messageType,
-              messageBody,
-            );
-      };
-      const leave = (): void => {
-        collDel(stores, storeId);
-      };
-      return [send, leave];
-    },
-    (): BusStats => (DEBUG ? {sends, receives} : {}),
-  ];
+
+  const join = (storeId: Id, receive: Receive): [Send, () => void] => {
+    mapSet(stores, storeId, receive);
+    const send = (
+      requestId: IdOrNull,
+      toStoreId: IdOrNull,
+      messageType: MessageType,
+      messageBody: any,
+    ): void => {
+      if (DEBUG) {
+        sends++;
+        receives += isUndefined(toStoreId) ? collSize(stores) - 1 : 1;
+      }
+      isUndefined(toStoreId)
+        ? collForEach(stores, (receive, otherStoreId) =>
+            otherStoreId != storeId
+              ? receive(requestId, storeId, messageType, messageBody)
+              : 0,
+          )
+        : mapGet(stores, toStoreId)?.(
+            requestId,
+            storeId,
+            messageType,
+            messageBody,
+          );
+    };
+    const leave = (): void => {
+      collDel(stores, storeId);
+    };
+    return [send, leave];
+  };
+
+  const getStats = (): BusStats => (DEBUG ? {sends, receives} : {});
+
+  return {join, getStats} as Bus;
 }) as typeof createLocalBusDecl;
diff --git a/src/types/persisters/persister-sync.d.ts b/src/types/persisters/persister-sync.d.ts
@@ -27,10 +27,10 @@ export type Send = (
 export type BusStats = {sends?: number; receives?: number};
 
 /// Bus
-export type Bus = [
-  join: (storeId: Id, receive: Receive) => [send: Send, leave: () => void],
-  getStats: () => BusStats,
-];
+export type Bus = {
+  join: (storeId: Id, receive: Receive) => [send: Send, leave: () => void];
+  getStats: () => BusStats;
+};
 
 /// SyncPersister
 export interface SyncPersister extends Persister<true> {

diff --git a/src/types/with-schemas/persisters/persister-sync.d.ts b/src/types/with-schemas/persisters/persister-sync.d.ts
@@ -28,10 +28,10 @@ export type Send = (
 export type BusStats = {sends?: number; receives?: number};
 
 /// Bus
-export type Bus = [
-  join: (storeId: Id, receive: Receive) => [send: Send, leave: () => void],
-  getStats: () => BusStats,
-];
+export type Bus = {
+  join: (storeId: Id, receive: Receive) => [send: Send, leave: () => void];
+  getStats: () => BusStats;
+};
 
 /// SyncPersister
 export interface SyncPersister<Schemas extends OptionalSchemas>

diff --git a/test/unit/persisters/persister-sync.test.ts b/test/unit/persisters/persister-sync.test.ts
@@ -32,7 +32,7 @@ const expectEachToHaveContent = async (
   } else {
     expect(store2.getMergeableContent()).toEqual(store1.getMergeableContent());
   }
-  expect(bus[1]()).toMatchSnapshot();
+  expect(bus.getStats()).toMatchSnapshot();
 };
 
 beforeEach(() => {
@@ -380,7 +380,7 @@ describe('Multidirectional', () => {
         expect(store.getMergeableContent()).toEqual(mergeableContent);
       }
     });
-    expect(bus[1]()).toMatchSnapshot();
+    expect(bus.getStats()).toMatchSnapshot();
   };
 
   beforeEach(async () => {