refactor: Simplify IpcRendererService and its spec

4 files changed, 18 insertions, 15 deletions

diff --git a/packages/preload/src/contextBridge/SophieRendererImpl.ts b/packages/preload/src/contextBridge/SophieRendererImpl.ts
index 61b01e9..bbb4f65 100644
--- a/packages/preload/src/contextBridge/SophieRendererImpl.ts
+++ b/packages/preload/src/contextBridge/SophieRendererImpl.ts
@@ -27,16 +27,17 @@ import {
   SophieRenderer,
 } from '@sophie/shared';
 
-import { RendererToMainIpcService } from '../services/RendererToMainIpcService';
+import { IpcRendererService } from '../services/IpcRendererService';
 
 class SophieRendererImpl implements SophieRenderer {
-  readonly #ipcService = new RendererToMainIpcService();
+  readonly #ipcService;
 
   #onSharedStoreChangeCalled: boolean = false;
 
   #listener: SharedStoreListener | null = null;
 
-  constructor() {
+  constructor(ipcService: IpcRendererService) {
+    this.#ipcService = ipcService;
     this.#ipcService.onSharedStorePatch((patch) => {
       try {
         // `mobx-state-tree` will validate the patch, so we can safely cast here.
@@ -87,8 +88,10 @@ class SophieRendererImpl implements SophieRenderer {
   }
 }
 
-export function createSophieRenderer(): SophieRenderer {
-  const impl = new SophieRendererImpl();
+export function createSophieRenderer(
+  ipcService: IpcRendererService,
+): SophieRenderer {
+  const impl = new SophieRendererImpl(ipcService);
   return {
     onSharedStoreChange: impl.onSharedStoreChange.bind(impl),
     dispatchAction: impl.dispatchAction.bind(impl),
diff --git a/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts b/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts
index c0e5ec2..bd2b1d5 100644
--- a/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts
+++ b/packages/preload/src/contextBridge/__tests__/SophieRendererImpl.spec.ts
@@ -22,10 +22,10 @@ import { mocked } from 'jest-mock';
 import type { IJsonPatch } from 'mobx-state-tree';
 import type { Action, SharedStoreSnapshotIn, SophieRenderer } from '@sophie/shared';
 
-import { RendererToMainIpcService } from '../../services/RendererToMainIpcService';
+import { IpcRendererService } from '../../services/IpcRendererService';
 import { createSophieRenderer } from '../SophieRendererImpl';
 
-jest.mock('../../services/RendererToMainIpcService');
+jest.mock('../../services/IpcRendererService');
 
 const snapshot: SharedStoreSnapshotIn = {
   shouldUseDarkColors: true,
@@ -52,16 +52,15 @@ const invalidAction = {
 
 describe('constructor', () => {
   it('registers a shared store patch listener', () => {
-    createSophieRenderer();
-    expect(RendererToMainIpcService).toHaveBeenCalledTimes(1);
-    const service = mocked(RendererToMainIpcService).mock.instances[0];
+    const service = new IpcRendererService();
+    createSophieRenderer(service);
     expect(service.onSharedStorePatch).toHaveBeenCalledTimes(1);
   });
 });
 
 describe('instance', () => {
   let sut: SophieRenderer;
-  let service: RendererToMainIpcService;
+  let service: IpcRendererService;
   let onSharedStorePatch: (patch: unknown) => void;
   let listener = {
     onSnapshot: jest.fn((_snapshot: SharedStoreSnapshotIn) => {}),
@@ -69,8 +68,8 @@ describe('instance', () => {
   };
 
   beforeEach(() => {
-    sut = createSophieRenderer();
-    service = mocked(RendererToMainIpcService).mock.instances[0];
+    service = new IpcRendererService();
+    sut = createSophieRenderer(service);
     onSharedStorePatch = mocked(service.onSharedStorePatch).mock.calls[0][0];
   });
 
diff --git a/packages/preload/src/index.ts b/packages/preload/src/index.ts
index ef466b4..2703d40 100644
--- a/packages/preload/src/index.ts
+++ b/packages/preload/src/index.ts
@@ -21,7 +21,8 @@
 import { contextBridge } from 'electron';
 
 import { createSophieRenderer } from './contextBridge/SophieRendererImpl';
+import { IpcRendererService } from './services/IpcRendererService';
 
-const sophieRenderer = createSophieRenderer();
+const sophieRenderer = createSophieRenderer(new IpcRendererService());
 
 contextBridge.exposeInMainWorld('sophieRenderer', sophieRenderer);
diff --git a/packages/preload/src/services/RendererToMainIpcService.ts b/packages/preload/src/services/IpcRendererService.ts
index 40f1339..7f51351 100644
--- a/packages/preload/src/services/RendererToMainIpcService.ts
+++ b/packages/preload/src/services/IpcRendererService.ts
@@ -25,7 +25,7 @@ import {
   RendererToMainIpcMessage,
 } from '@sophie/shared';
 
-export class RendererToMainIpcService {
+export class IpcRendererService {
   getSharedStoreSnapshot(): Promise<unknown> {
     return ipcRenderer.invoke(RendererToMainIpcMessage.GetSharedStoreSnapshot);
   }