6 files changed, 74 insertions, 38 deletions

diff --git a/packages/shared/src/stores/GlobalSettings.ts b/packages/shared/src/stores/GlobalSettings.ts
index bd0155a..3a813b8 100644
--- a/packages/shared/src/stores/GlobalSettings.ts
+++ b/packages/shared/src/stores/GlobalSettings.ts
@@ -20,16 +20,22 @@
 
 import { Instance, types, SnapshotIn, SnapshotOut } from 'mobx-state-tree';
 
-import { themeSource } from '../schemas';
+import { ThemeSource } from '../schemas';
 
-export const globalSettings = types.model('GlobalSettings', {
-  themeSource: types.optional(types.enumeration(themeSource.options), 'system'),
+const GlobalSettings = types.model('GlobalSettings', {
+  themeSource: types.optional(types.enumeration(ThemeSource.options), 'system'),
 });
 
-export interface GlobalSettings extends Instance<typeof globalSettings> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface GlobalSettings extends Instance<typeof GlobalSettings> {}
+
+export default GlobalSettings;
 
 export interface GlobalSettingsSnapshotIn
-  extends SnapshotIn<typeof globalSettings> {}
+  extends SnapshotIn<typeof GlobalSettings> {}
 
 export interface GlobalSettingsSnapshotOut
-  extends SnapshotOut<typeof globalSettings> {}
+  extends SnapshotOut<typeof GlobalSettings> {}
diff --git a/packages/shared/src/stores/Profile.ts b/packages/shared/src/stores/Profile.ts
index bb058f6..256c33e 100644
--- a/packages/shared/src/stores/Profile.ts
+++ b/packages/shared/src/stores/Profile.ts
@@ -20,11 +20,17 @@
 
 import { Instance, types } from 'mobx-state-tree';
 
-import { profileSettings } from './ProfileSettings';
+import ProfileSettings from './ProfileSettings';
 
-export const profile = types.model('Profile', {
+const Profile = types.model('Profile', {
   id: types.identifier,
-  settings: profileSettings,
+  settings: ProfileSettings,
 });
 
-export interface Profile extends Instance<typeof profile> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface Profile extends Instance<typeof Profile> {}
+
+export default Profile;
diff --git a/packages/shared/src/stores/ProfileSettings.ts b/packages/shared/src/stores/ProfileSettings.ts
index ec8da5f..9f2b27c 100644
--- a/packages/shared/src/stores/ProfileSettings.ts
+++ b/packages/shared/src/stores/ProfileSettings.ts
@@ -20,14 +20,20 @@
 
 import { Instance, types, SnapshotIn, SnapshotOut } from 'mobx-state-tree';
 
-export const profileSettings = types.model('ProfileSettings', {
+const ProfileSettings = types.model('ProfileSettings', {
   name: types.string,
 });
 
-export interface ProfileSettings extends Instance<typeof profileSettings> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface ProfileSettings extends Instance<typeof ProfileSettings> {}
+
+export default ProfileSettings;
 
 export interface ProfileSettingsSnapshotIn
-  extends SnapshotIn<typeof profileSettings> {}
+  extends SnapshotIn<typeof ProfileSettings> {}
 
 export interface ProfileSettingsSnapshotOut
-  extends SnapshotOut<typeof profileSettings> {}
+  extends SnapshotOut<typeof ProfileSettings> {}
diff --git a/packages/shared/src/stores/Service.ts b/packages/shared/src/stores/Service.ts
index 36acd3d..4a7334d 100644
--- a/packages/shared/src/stores/Service.ts
+++ b/packages/shared/src/stores/Service.ts
@@ -20,11 +20,11 @@
 
 import { Instance, types } from 'mobx-state-tree';
 
-import { serviceSettings } from './ServiceSettings';
+import ServiceSettings from './ServiceSettings';
 
-export const service = types.model('Service', {
+const Service = types.model('Service', {
   id: types.identifier,
-  settings: serviceSettings,
+  settings: ServiceSettings,
   currentUrl: types.maybe(types.string),
   canGoBack: false,
   canGoForward: false,
@@ -37,4 +37,10 @@ export const service = types.model('Service', {
   indirectMessageCount: 0,
 });
 
-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;
diff --git a/packages/shared/src/stores/ServiceSettings.ts b/packages/shared/src/stores/ServiceSettings.ts
index 54cd7eb..6ba1dfa 100644
--- a/packages/shared/src/stores/ServiceSettings.ts
+++ b/packages/shared/src/stores/ServiceSettings.ts
@@ -20,19 +20,25 @@
 
 import { Instance, types, SnapshotIn, SnapshotOut } from 'mobx-state-tree';
 
-import { profile } from './Profile';
+import Profile from './Profile';
 
-export const serviceSettings = types.model('ServiceSettings', {
+const ServiceSettings = types.model('ServiceSettings', {
   name: types.string,
-  profile: types.reference(profile),
+  profile: types.reference(Profile),
   // TODO: Remove this once recipes are added.
   url: types.string,
 });
 
-export interface ServiceSettings extends Instance<typeof serviceSettings> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface ServiceSettings extends Instance<typeof ServiceSettings> {}
+
+export default ServiceSettings;
 
 export interface ServiceSettingsSnapshotIn
-  extends SnapshotIn<typeof serviceSettings> {}
+  extends SnapshotIn<typeof ServiceSettings> {}
 
 export interface ServiceSettingsSnapshotOut
-  extends SnapshotOut<typeof serviceSettings> {}
+  extends SnapshotOut<typeof ServiceSettings> {}
diff --git a/packages/shared/src/stores/SharedStore.ts b/packages/shared/src/stores/SharedStore.ts
index f301b9d..0cac3a5 100644
--- a/packages/shared/src/stores/SharedStore.ts
+++ b/packages/shared/src/stores/SharedStore.ts
@@ -26,26 +26,32 @@ import {
   SnapshotOut,
 } from 'mobx-state-tree';
 
-import { globalSettings } from './GlobalSettings';
-import { profile } from './Profile';
-import { service } from './Service';
-
-export const sharedStore = types.model('SharedStore', {
-  settings: types.optional(globalSettings, {}),
-  profilesById: types.map(profile),
-  profiles: types.array(types.reference(profile)),
-  servicesById: types.map(service),
-  services: types.array(types.reference(service)),
-  selectedService: types.safeReference(service),
+import GlobalSettings from './GlobalSettings';
+import Profile from './Profile';
+import Service from './Service';
+
+const SharedStore = types.model('SharedStore', {
+  settings: types.optional(GlobalSettings, {}),
+  profilesById: types.map(Profile),
+  profiles: types.array(types.reference(Profile)),
+  servicesById: types.map(Service),
+  services: types.array(types.reference(Service)),
+  selectedService: types.safeReference(Service),
   shouldUseDarkColors: false,
 });
 
-export interface SharedStore extends Instance<typeof sharedStore> {}
+/*
+  eslint-disable-next-line @typescript-eslint/no-redeclare --
+  Intentionally naming the type the same as the store definition.
+*/
+interface SharedStore extends Instance<typeof SharedStore> {}
+
+export default SharedStore;
 
-export interface SharedStoreSnapshotIn extends SnapshotIn<typeof sharedStore> {}
+export interface SharedStoreSnapshotIn extends SnapshotIn<typeof SharedStore> {}
 
 export interface SharedStoreSnapshotOut
-  extends SnapshotOut<typeof sharedStore> {}
+  extends SnapshotOut<typeof SharedStore> {}
 
 export interface SharedStoreListener {
   onSnapshot(snapshot: SharedStoreSnapshotIn): void;