refactor: Coding conventions

Make sure that files have a default import with the same name as the
file whenever possible to reduce surprise.

Also shuffles around some file names for better legibility.

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

1 files changed, 11 insertions, 5 deletions

diff --git a/packages/main/src/stores/Service.ts b/packages/main/src/stores/Service.ts
index 331805b..e70caa6 100644
--- a/packages/main/src/stores/Service.ts
+++ b/packages/main/src/stores/Service.ts
@@ -19,14 +19,14 @@
  */
 
 import type { UnreadCount } from '@sophie/service-shared';
-import { service as originalService } from '@sophie/shared';
+import { Service as ServiceBase } from '@sophie/shared';
 import { Instance, getSnapshot, ReferenceIdentifier } from 'mobx-state-tree';
 
 import generateId from '../utils/generateId';
 import overrideProps from '../utils/overrideProps';
 
 import { ProfileSettingsSnapshotWithId } from './Profile';
-import { serviceSettings, ServiceSettingsSnapshotIn } from './ServiceSettings';
+import ServiceSettings, { ServiceSettingsSnapshotIn } from './ServiceSettings';
 
 export interface ServiceConfig
   extends Omit<ServiceSettingsSnapshotIn, 'profile'> {
@@ -35,8 +35,8 @@ export interface ServiceConfig
   profile?: ReferenceIdentifier | undefined;
 }
 
-export const service = overrideProps(originalService, {
-  settings: serviceSettings,
+const Service = overrideProps(ServiceBase, {
+  settings: ServiceSettings,
 })
   .views((self) => ({
     get config(): ServiceConfig {
@@ -83,7 +83,13 @@ export const service = overrideProps(originalService, {
     },
   }));
 
-export interface Service extends Instance<typeof service> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface Service extends Instance<typeof Service> {}
+
+export default Service;
 
 export type ServiceSettingsSnapshotWithId = [string, ServiceSettingsSnapshotIn];