refactor: Rename main services to infrastructure

Makes it clear that we are talking about wrappers for nodejs and
electron functionality, and not the services being displayed by the
application.

Signed-off-by: Kristóf Marussy <kristof@marussy.com>

6 files changed, 16 insertions, 18 deletions

diff --git a/docs/architecture.md b/docs/architecture.md
index 0122809..791b57b 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -82,11 +82,11 @@ Instead, they purely rely on IPC messages to invoke actions in the main process
 
 In the main process, _controllers_ react to `MainStore` changes by invoking Electron APIs and subscribe to Electron events in order to invoke `MainStore` actions.
 
-For easier testability, controllers may rely on _services_ abstracting away the underlying Electron APIs.
-The service has to come with a TypeScript interface and an implementation.
-In the tests, the default implementation of the interface is replaced by a mock.
+For better testability, controllers may rely on _infrastructure services_ (wrappers) abstracting away the underlying Electron APIs.
+Each infrastructure of the service has to come with a TypeScript interface and at least one implementation.
+In the tests, the default implementations of the interfaces are replaced by mocks.
 
-The services and controllers are instatiated and connected to the `MainStore` in the [composition root](https://gitlab.com/say-hi-to-sophie/sophie/-/blob/main/packages/main/src/compositionRoot.ts).
+The infrastructure services and controllers are instantiated and connected to the `MainStore` in the [composition root](https://gitlab.com/say-hi-to-sophie/sophie/-/blob/main/packages/main/src/init.ts).
 
 **TODO:**
 While a service is a common term in MVC application architecture, we should come up with a different name to avoid clashing witch services, i.e., web sites loaded by Sophie.
diff --git a/packages/main/src/controllers/__tests__/initConfig.spec.ts b/packages/main/src/controllers/__tests__/initConfig.spec.ts
index 241ab2d..dc00b9d 100644
--- a/packages/main/src/controllers/__tests__/initConfig.spec.ts
+++ b/packages/main/src/controllers/__tests__/initConfig.spec.ts
@@ -23,14 +23,14 @@ import { mocked } from 'jest-mock';
 import { getSnapshot } from 'mobx-state-tree';
 import ms from 'ms';
 
-import type ConfigPersistenceService from '../../services/ConfigPersistenceService';
+import type ConfigPersistence from '../../infrastructure/ConfigPersistence';
 import { Config, config as configModel } from '../../stores/Config';
 import type Disposer from '../../utils/Disposer';
 import { silenceLogger } from '../../utils/log';
 import initConfig from '../initConfig';
 
 let config: Config;
-const persistenceService: ConfigPersistenceService = {
+const persistenceService: ConfigPersistence = {
   readConfig: jest.fn(),
   writeConfig: jest.fn(),
   watchConfig: jest.fn(),
diff --git a/packages/main/src/controllers/initConfig.ts b/packages/main/src/controllers/initConfig.ts
index 2dcabaf..c8cd335 100644
--- a/packages/main/src/controllers/initConfig.ts
+++ b/packages/main/src/controllers/initConfig.ts
@@ -23,7 +23,7 @@ import { debounce } from 'lodash-es';
 import { getSnapshot, onSnapshot } from 'mobx-state-tree';
 import ms from 'ms';
 
-import type ConfigPersistenceService from '../services/ConfigPersistenceService';
+import type ConfigPersistence from '../infrastructure/ConfigPersistence';
 import { Config, ConfigFileIn, ConfigSnapshotOut } from '../stores/Config';
 import type Disposer from '../utils/Disposer';
 import { getLogger } from '../utils/log';
@@ -34,7 +34,7 @@ const log = getLogger('config');
 
 export default async function initConfig(
   config: Config,
-  persistenceService: ConfigPersistenceService,
+  persistenceService: ConfigPersistence,
   debounceTime: number = DEFAULT_CONFIG_DEBOUNCE_TIME,
 ): Promise<Disposer> {
   log.trace('Initializing config controller');
diff --git a/packages/main/src/services/ConfigPersistenceService.ts b/packages/main/src/infrastructure/ConfigPersistence.ts
index ee5696d..4b96f01 100644
--- a/packages/main/src/services/ConfigPersistenceService.ts
+++ b/packages/main/src/infrastructure/ConfigPersistence.ts
@@ -25,7 +25,7 @@ export type ReadConfigResult =
   | { found: true; data: unknown }
   | { found: false };
 
-export default interface ConfigPersistenceService {
+export default interface ConfigPersistence {
   readConfig(): Promise<ReadConfigResult>;
 
   writeConfig(configSnapshot: ConfigSnapshotOut): Promise<void>;
diff --git a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts b/packages/main/src/infrastructure/impl/FileBasedConfigPersistence.ts
index a11a9da..06e3fab 100644
--- a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts
+++ b/packages/main/src/infrastructure/impl/FileBasedConfigPersistence.ts
@@ -27,14 +27,12 @@ import throttle from 'lodash-es/throttle';
 import type { ConfigSnapshotOut } from '../../stores/Config';
 import type Disposer from '../../utils/Disposer';
 import { getLogger } from '../../utils/log';
-import type ConfigPersistenceService from '../ConfigPersistenceService';
-import type { ReadConfigResult } from '../ConfigPersistenceService';
+import type ConfigPersistence from '../ConfigPersistence';
+import type { ReadConfigResult } from '../ConfigPersistence';
 
-const log = getLogger('configPersistence');
+const log = getLogger('fileBasedConfigPersistence');
 
-export default class ConfigPersistenceServiceImpl
-  implements ConfigPersistenceService
-{
+export default class FileBasedConfigPersistence implements ConfigPersistence {
   private readonly configFilePath: string;
 
   private writingConfig = false;
@@ -50,7 +48,7 @@ export default class ConfigPersistenceServiceImpl
   }
 
   async readConfig(): Promise<ReadConfigResult> {
-    let configStr;
+    let configStr: string;
     try {
       configStr = await readFile(this.configFilePath, 'utf8');
     } catch (error) {
diff --git a/packages/main/src/init.ts b/packages/main/src/init.ts
index f3794bb..236a075 100644
--- a/packages/main/src/init.ts
+++ b/packages/main/src/init.ts
@@ -22,12 +22,12 @@ import { app } from 'electron';
 
 import initConfig from './controllers/initConfig';
 import initNativeTheme from './controllers/initNativeTheme';
-import ConfigPersistenceServiceImpl from './services/impl/ConfigPersistenceServiceImpl';
+import FileBasedConfigPersistence from './infrastructure/impl/FileBasedConfigPersistence';
 import { MainStore } from './stores/MainStore';
 import type Disposer from './utils/Disposer';
 
 export default async function init(store: MainStore): Promise<Disposer> {
-  const configPersistenceService = new ConfigPersistenceServiceImpl(
+  const configPersistenceService = new FileBasedConfigPersistence(
     app.getPath('userData'),
   );
   const disposeConfigController = await initConfig(