9 files changed, 322 insertions, 242 deletions

diff --git a/packages/main/src/stores/Config.ts b/packages/main/src/stores/Config.ts
deleted file mode 100644
index e7fc360..0000000
--- a/packages/main/src/stores/Config.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C)  2021-2022 Kristóf Marussy <kristof@marussy.com>
- *
- * This file is part of Sophie.
- *
- * Sophie is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { config as originalConfig, ThemeSource } from '@sophie/shared';
-import { applySnapshot, Instance, SnapshotIn } from 'mobx-state-tree';
-
-import { addMissingProfileIds, PartialProfileSnapshotIn } from './Profile';
-import {
-  addMissingServiceIdsAndProfiles,
-  PartialServiceSnapshotIn,
-} from './Service';
-
-export const config = originalConfig.actions((self) => ({
-  loadFromConfigFile(snapshot: ConfigFileIn): void {
-    const profiles = addMissingProfileIds(snapshot.profiles);
-    const services = addMissingServiceIdsAndProfiles(
-      snapshot.services,
-      profiles,
-    );
-    applySnapshot(self, {
-      ...snapshot,
-      profiles,
-      services,
-    });
-  },
-  setThemeSource(mode: ThemeSource): void {
-    self.themeSource = mode;
-  },
-}));
-
-export interface Config extends Instance<typeof config> {}
-
-export interface ConfigSnapshotIn extends SnapshotIn<typeof config> {}
-
-export interface ConfigFileIn
-  extends Omit<ConfigSnapshotIn, 'profiles' | 'services'> {
-  profiles?: PartialProfileSnapshotIn[] | undefined;
-  services?: PartialServiceSnapshotIn[] | undefined;
-}
-
-export type { ConfigSnapshotOut } from '@sophie/shared';
diff --git a/packages/main/src/stores/GlobalSettings.ts b/packages/main/src/stores/GlobalSettings.ts
new file mode 100644
index 0000000..1eb13b3
--- /dev/null
+++ b/packages/main/src/stores/GlobalSettings.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C)  2022 Kristóf Marussy <kristof@marussy.com>
+ *
+ * This file is part of Sophie.
+ *
+ * Sophie is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import {
+  globalSettings as originalGlobalSettings,
+  ThemeSource,
+} from '@sophie/shared';
+import { Instance } from 'mobx-state-tree';
+
+export const globalSettings = originalGlobalSettings.actions((self) => ({
+  setThemeSource(mode: ThemeSource): void {
+    self.themeSource = mode;
+  },
+}));
+
+export interface GlobalSettings extends Instance<typeof globalSettings> {}
+
+export type {
+  GlobalSettingsSnapshotIn,
+  GlobalSettingsSnapshotOut,
+} from '@sophie/shared';
diff --git a/packages/main/src/stores/MainStore.ts b/packages/main/src/stores/MainStore.ts
index f0d6472..18f5bf9 100644
--- a/packages/main/src/stores/MainStore.ts
+++ b/packages/main/src/stores/MainStore.ts
@@ -18,21 +18,14 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { BrowserViewBounds, service } from '@sophie/shared';
-import {
-  applySnapshot,
-  Instance,
-  resolveIdentifier,
-  types,
-} from 'mobx-state-tree';
+import type { BrowserViewBounds } from '@sophie/shared';
+import { applySnapshot, Instance, types } from 'mobx-state-tree';
 
-import { getLogger } from '../utils/log';
-
-import type { Config } from './Config.js';
+import { GlobalSettings } from './GlobalSettings';
+import { Profile } from './Profile';
+import { Service } from './Service';
 import { sharedStore } from './SharedStore';
 
-const log = getLogger('mainStore');
-
 export const mainStore = types
   .model('MainStore', {
     browserViewBounds: types.optional(
@@ -47,26 +40,20 @@ export const mainStore = types
     shared: types.optional(sharedStore, {}),
   })
   .views((self) => ({
-    get config(): Config {
-      return self.shared.config;
+    get settings(): GlobalSettings {
+      return self.shared.settings;
+    },
+    get profiles(): Profile[] {
+      return self.shared.profiles;
+    },
+    get services(): Service[] {
+      return self.shared.services;
     },
   }))
   .actions((self) => ({
-    setSelectedServiceId(serviceId: string): void {
-      const serviceInstance = resolveIdentifier(service, self, serviceId);
-      if (serviceInstance === undefined) {
-        log.warn('Trying to select unknown service', serviceId);
-        return;
-      }
-      self.shared.selectedService = serviceInstance;
-      log.debug('Selected service', serviceId);
-    },
     setBrowserViewBounds(bounds: BrowserViewBounds): void {
       applySnapshot(self.browserViewBounds, bounds);
     },
-    setShouldUseDarkColors(shouldUseDarkColors: boolean): void {
-      self.shared.shouldUseDarkColors = shouldUseDarkColors;
-    },
   }));
 
 export interface MainStore extends Instance<typeof mainStore> {}
diff --git a/packages/main/src/stores/Profile.ts b/packages/main/src/stores/Profile.ts
index 4705862..eaf23c4 100644
--- a/packages/main/src/stores/Profile.ts
+++ b/packages/main/src/stores/Profile.ts
@@ -18,34 +18,39 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { ProfileSnapshotIn } from '@sophie/shared';
+import {
+  profile as originalProfile,
+  ProfileSettingsSnapshotIn,
+} from '@sophie/shared';
+import { getSnapshot, Instance } from 'mobx-state-tree';
 
+import SettingsWithId from '../utils/SettingsWithId';
 import generateId from '../utils/generateId';
 
-export interface PartialProfileSnapshotIn
-  extends Omit<ProfileSnapshotIn, 'id'> {
+export interface ProfileConfig extends ProfileSettingsSnapshotIn {
   id?: string | undefined;
 }
 
+export const profile = originalProfile.views((self) => ({
+  get config(): ProfileConfig {
+    const { id, settings } = self;
+    return { ...getSnapshot(settings), id };
+  },
+}));
+
+export interface Profile extends Instance<typeof profile> {}
+
+export type ProfileSettingsSnapshotWithId =
+  SettingsWithId<ProfileSettingsSnapshotIn>;
+
 export function addMissingProfileIds(
-  partialProfiles: PartialProfileSnapshotIn[] | undefined,
-): ProfileSnapshotIn[] {
-  return (partialProfiles ?? []).map((profile) => {
-    const { name } = profile;
-    let { id } = profile;
-    if (typeof id === 'undefined') {
-      id = generateId(name);
-    }
+  profileConfigs: ProfileConfig[] | undefined,
+): ProfileSettingsSnapshotWithId[] {
+  return (profileConfigs ?? []).map((profileConfig) => {
+    const { id, ...settings } = profileConfig;
     return {
-      ...profile,
-      id,
+      id: typeof id === 'undefined' ? generateId(settings.name) : id,
+      settings,
     };
   });
 }
-
-export type {
-  Profile,
-  ProfileSnapshotOut,
-  ProfileSnapshotIn,
-} from '@sophie/shared';
-export { profile } from '@sophie/shared';
diff --git a/packages/main/src/stores/RuntimeService.ts b/packages/main/src/stores/RuntimeService.ts
deleted file mode 100644
index ecb1942..0000000
--- a/packages/main/src/stores/RuntimeService.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C)  2022 Kristóf Marussy <kristof@marussy.com>
- *
- * This file is part of Sophie.
- *
- * Sophie is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { UnreadCount } from '@sophie/service-shared';
-import { runtimeService as originalRuntimeService } from '@sophie/shared';
-import { Instance } from 'mobx-state-tree';
-
-export const runtimeService = originalRuntimeService.actions((self) => ({
-  setLocation({
-    url,
-    canGoBack,
-    canGoForward,
-  }: {
-    url: string;
-    canGoBack: boolean;
-    canGoForward: boolean;
-  }): void {
-    self.url = url;
-    self.canGoBack = canGoBack;
-    self.canGoForward = canGoForward;
-  },
-  setTitle(title: string): void {
-    self.title = title;
-  },
-  hibernated(): void {
-    self.canGoBack = false;
-    self.canGoForward = false;
-    self.state = 'hibernated';
-  },
-  startedLoading(): void {
-    self.state = 'loading';
-  },
-  finishedLoading(): void {
-    if (self.state === 'loading') {
-      // Do not overwrite crashed state if the service haven't been reloaded yet.
-      self.state = 'loaded';
-    }
-  },
-  crashed(): void {
-    self.state = 'crashed';
-  },
-  setUnreadCount({ direct, indirect }: UnreadCount): void {
-    if (direct !== undefined) {
-      self.directMessageCount = direct;
-    }
-    if (indirect !== undefined) {
-      self.indirectMessageCount = indirect;
-    }
-  },
-}));
-
-export interface RuntimeService extends Instance<typeof runtimeService> {}
-
-export type {
-  RuntimeServiceSnapshotIn,
-  RuntimeServiceSnapshotOut,
-} from '@sophie/shared';
diff --git a/packages/main/src/stores/Service.ts b/packages/main/src/stores/Service.ts
index 9bc6a43..78c57cb 100644
--- a/packages/main/src/stores/Service.ts
+++ b/packages/main/src/stores/Service.ts
@@ -18,46 +18,95 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { ServiceSnapshotIn } from '@sophie/shared';
+import type { UnreadCount } from '@sophie/service-shared';
+import {
+  service as originalService,
+  ServiceSettingsSnapshotIn,
+} from '@sophie/shared';
+import { Instance, getSnapshot, ReferenceIdentifier } from 'mobx-state-tree';
 
+import SettingsWithId from '../utils/SettingsWithId';
 import generateId from '../utils/generateId';
+import overrideProps from '../utils/overrideProps';
 
-import type { ProfileSnapshotIn } from './Profile';
+import { ProfileSettingsSnapshotWithId } from './Profile';
+import { serviceSettings } from './ServiceSettings';
 
-export interface PartialServiceSnapshotIn
-  extends Omit<ServiceSnapshotIn, 'id' | 'profile'> {
+export interface ServiceConfig
+  extends Omit<ServiceSettingsSnapshotIn, 'profile'> {
   id?: string | undefined;
-  profile?: string | undefined;
+
+  profile?: ReferenceIdentifier | undefined;
 }
 
+export const service = overrideProps(originalService, {
+  settings: serviceSettings,
+})
+  .views((self) => ({
+    get config(): ServiceConfig {
+      const { id, settings } = self;
+      return { ...getSnapshot(settings), id };
+    },
+  }))
+  .actions((self) => ({
+    setLocation({
+      url,
+      canGoBack,
+      canGoForward,
+    }: {
+      url: string;
+      canGoBack: boolean;
+      canGoForward: boolean;
+    }): void {
+      self.currentUrl = url;
+      self.canGoBack = canGoBack;
+      self.canGoForward = canGoForward;
+    },
+    setTitle(title: string): void {
+      self.title = title;
+    },
+    startedLoading(): void {
+      self.state = 'loading';
+    },
+    finishedLoading(): void {
+      if (self.state === 'loading') {
+        // Do not overwrite crashed state if the service haven't been reloaded yet.
+        self.state = 'loaded';
+      }
+    },
+    crashed(): void {
+      self.state = 'crashed';
+    },
+    setUnreadCount({ direct, indirect }: UnreadCount): void {
+      if (direct !== undefined) {
+        self.directMessageCount = direct;
+      }
+      if (indirect !== undefined) {
+        self.indirectMessageCount = indirect;
+      }
+    },
+  }));
+
+export interface Service extends Instance<typeof service> {}
+
+export type ServiceSettingsSnapshotWithId =
+  SettingsWithId<ServiceSettingsSnapshotIn>;
+
 export function addMissingServiceIdsAndProfiles(
-  partialServices: PartialServiceSnapshotIn[] | undefined,
-  profiles: ProfileSnapshotIn[],
-): ServiceSnapshotIn[] {
-  return (partialServices ?? []).map((service) => {
-    const { name } = service;
-    let { id, profile } = service;
-    if (typeof id === 'undefined') {
-      id = generateId(name);
-    }
-    if (typeof profile === 'undefined') {
-      profile = generateId(name);
-      profiles.push({
-        id: profile,
-        name: service.name,
-      });
+  serviceConfigs: ServiceConfig[] | undefined,
+  profiles: ProfileSettingsSnapshotWithId[],
+): ServiceSettingsSnapshotWithId[] {
+  return (serviceConfigs ?? []).map((serviceConfig) => {
+    const { id, ...settings } = serviceConfig;
+    const { name } = settings;
+    let { profile: profileId } = settings;
+    if (profileId === undefined) {
+      profileId = generateId(name);
+      profiles.push({ id: profileId, settings: { name } });
     }
     return {
-      ...service,
-      id,
-      profile,
+      id: id === undefined ? generateId(name) : id,
+      settings: { ...settings, profile: profileId },
     };
   });
 }
-
-export type {
-  Service,
-  ServiceSnapshotOut,
-  ServiceSnapshotIn,
-} from '@sophie/shared';
-export { service } from '@sophie/shared';
diff --git a/packages/main/src/stores/ServiceSettings.ts b/packages/main/src/stores/ServiceSettings.ts
new file mode 100644
index 0000000..960de9b
--- /dev/null
+++ b/packages/main/src/stores/ServiceSettings.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C)  2022 Kristóf Marussy <kristof@marussy.com>
+ *
+ * This file is part of Sophie.
+ *
+ * Sophie is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { serviceSettings as originalServiceSettings } from '@sophie/shared';
+import { Instance, types } from 'mobx-state-tree';
+
+import overrideProps from '../utils/overrideProps';
+
+import { profile } from './Profile';
+
+export const serviceSettings = overrideProps(originalServiceSettings, {
+  profile: types.reference(profile),
+});
+
+export interface ServiceSettings extends Instance<typeof serviceSettings> {}
+
+export type {
+  ServiceSettingsSnapshotIn,
+  ServiceSettingsSnapshotOut,
+} from '@sophie/shared';
diff --git a/packages/main/src/stores/SharedStore.ts b/packages/main/src/stores/SharedStore.ts
index 76ce05c..861c8ce 100644
--- a/packages/main/src/stores/SharedStore.ts
+++ b/packages/main/src/stores/SharedStore.ts
@@ -19,19 +19,111 @@
  */
 
 import { sharedStore as originalSharedStore } from '@sophie/shared';
-import { Instance, types } from 'mobx-state-tree';
+import {
+  applySnapshot,
+  getSnapshot,
+  Instance,
+  resolveIdentifier,
+  types,
+} from 'mobx-state-tree';
 
-import { config } from './Config';
-import { runtimeService } from './RuntimeService';
+import SettingsWithId from '../utils/SettingsWithId';
+import { getLogger } from '../utils/log';
+import overrideProps from '../utils/overrideProps';
+
+import { globalSettings, GlobalSettingsSnapshotIn } from './GlobalSettings';
+import { addMissingProfileIds, profile, ProfileConfig } from './Profile';
+import {
+  addMissingServiceIdsAndProfiles,
+  service,
+  ServiceConfig,
+} from './Service';
+
+const log = getLogger('sharedStore');
+
+export interface Config extends GlobalSettingsSnapshotIn {
+  profiles?: ProfileConfig[] | undefined;
+
+  services?: ServiceConfig[] | undefined;
+}
+
+function getConfigs<T>(models: { config: T }[]): T[] | undefined {
+  return models.length === 0 ? undefined : models.map((model) => model.config);
+}
+
+function reconcileSettings<T>(
+  originalSnapshots: SettingsWithId<T>[],
+  settingsSnapshotsWithId: SettingsWithId<T>[],
+): SettingsWithId<T>[] {
+  const idToOriginalSnapshots = new Map(
+    originalSnapshots.map((originalSnapshot) => [
+      originalSnapshot.id,
+      originalSnapshot,
+    ]),
+  );
+  return settingsSnapshotsWithId.map(({ id, settings }) => ({
+    ...idToOriginalSnapshots.get(id),
+    id,
+    settings,
+  }));
+}
+
+export const sharedStore = overrideProps(originalSharedStore, {
+  settings: types.optional(globalSettings, {}),
+  profiles: types.array(profile),
+  services: types.array(service),
+  selectedService: types.safeReference(service),
+})
+  .views((self) => ({
+    get config(): Config {
+      const { settings, profiles, services } = self;
+      const globalSettingsConfig = getSnapshot(settings);
+      return {
+        ...globalSettingsConfig,
+        profiles: getConfigs(profiles),
+        services: getConfigs(services),
+      };
+    },
+  }))
+  .actions((self) => ({
+    loadConfig(config: Config): void {
+      const snapshot = getSnapshot(self);
+      const { profiles, services, ...settings } = config;
+      const profileSettingsSnapshots = addMissingProfileIds(profiles);
+      const serviceSettingsSnapshots = addMissingServiceIdsAndProfiles(
+        services,
+        profileSettingsSnapshots,
+      );
+      applySnapshot(self, {
+        ...snapshot,
+        settings,
+        profiles: reconcileSettings(
+          snapshot.profiles,
+          profileSettingsSnapshots,
+        ),
+        services: reconcileSettings(
+          snapshot.services,
+          serviceSettingsSnapshots,
+        ),
+      });
+    },
+    setShouldUseDarkColors(shouldUseDarkColors: boolean): void {
+      self.shouldUseDarkColors = shouldUseDarkColors;
+    },
+    setSelectedServiceId(serviceId: string): void {
+      const serviceInstance = resolveIdentifier(service, self, serviceId);
+      if (serviceInstance === undefined) {
+        log.warn('Trying to select unknown service', serviceId);
+        return;
+      }
+      self.selectedService = serviceInstance;
+      log.debug('Selected service', serviceId);
+    },
+  }));
+
+export interface SharedStore extends Instance<typeof sharedStore> {}
 
 export type {
   SharedStoreSnapshotIn,
   SharedStoreSnapshotOut,
 } from '@sophie/shared';
-
-export const sharedStore = originalSharedStore.props({
-  config: types.optional(config, {}),
-  runtimeServices: types.map(runtimeService),
-});
-
-export interface SharedStore extends Instance<typeof sharedStore> {}
diff --git a/packages/main/src/stores/__tests__/Config.spec.ts b/packages/main/src/stores/__tests__/SharedStore.spec.ts
index 22ccbc7..3ea187c 100644
--- a/packages/main/src/stores/__tests__/Config.spec.ts
+++ b/packages/main/src/stores/__tests__/SharedStore.spec.ts
@@ -18,28 +18,28 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { config, Config, ConfigFileIn } from '../Config';
-import type { PartialProfileSnapshotIn } from '../Profile';
-import type { PartialServiceSnapshotIn } from '../Service';
+import type { ProfileConfig } from '../Profile';
+import type { ServiceConfig } from '../Service';
+import { Config, sharedStore, SharedStore } from '../SharedStore';
 
-const profileProps: PartialProfileSnapshotIn = {
+const profileProps: ProfileConfig = {
   name: 'Test profile',
 };
 
-const serviceProps: PartialServiceSnapshotIn = {
+const serviceProps: ServiceConfig = {
   name: 'Test service',
   url: 'https://example.com',
 };
 
-let sut: Config;
+let sut: SharedStore;
 
 beforeEach(() => {
-  sut = config.create();
+  sut = sharedStore.create();
 });
 
-describe('preprocessConfigFile', () => {
+describe('loadConfig', () => {
   it('should load profiles with an ID', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       profiles: [
         {
           id: 'someId',
@@ -51,14 +51,14 @@ describe('preprocessConfigFile', () => {
   });
 
   it('should generate an ID for profiles without and ID', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       profiles: [profileProps],
     });
     expect(sut.profiles[0].id).toBeDefined();
   });
 
   it('should load services with an ID and a profile', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       profiles: [
         {
           id: 'someProfileId',
@@ -74,12 +74,12 @@ describe('preprocessConfigFile', () => {
       ],
     });
     expect(sut.services[0].id).toBe('someServiceId');
-    expect(sut.services[0].profile).toBe(sut.profiles[0]);
+    expect(sut.services[0].settings.profile).toBe(sut.profiles[0]);
   });
 
   it('should refuse to load a profile without a name', () => {
     expect(() => {
-      sut.loadFromConfigFile({
+      sut.loadConfig({
         profiles: [
           {
             id: 'someProfileId',
@@ -87,13 +87,13 @@ describe('preprocessConfigFile', () => {
             name: undefined,
           },
         ],
-      } as unknown as ConfigFileIn);
+      } as unknown as Config);
     }).toThrow();
     expect(sut.profiles).toHaveLength(0);
   });
 
   it('should load services without an ID but with a profile', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       profiles: [
         {
           id: 'someProfileId',
@@ -108,11 +108,11 @@ describe('preprocessConfigFile', () => {
       ],
     });
     expect(sut.services[0].id).toBeDefined();
-    expect(sut.services[0].profile).toBe(sut.profiles[0]);
+    expect(sut.services[0].settings.profile).toBe(sut.profiles[0]);
   });
 
   it('should create a profile for a service with an ID but no profile', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       services: [
         {
           id: 'someServiceId',
@@ -121,12 +121,14 @@ describe('preprocessConfigFile', () => {
       ],
     });
     expect(sut.services[0].id).toBe('someServiceId');
-    expect(sut.services[0].profile).toBeDefined();
-    expect(sut.services[0].profile.name).toBe(serviceProps.name);
+    expect(sut.services[0].settings.profile).toBeDefined();
+    expect(sut.services[0].settings.profile.settings.name).toBe(
+      serviceProps.name,
+    );
   });
 
   it('should create a profile for a service without an ID or profile', () => {
-    sut.loadFromConfigFile({
+    sut.loadConfig({
       services: [
         {
           ...serviceProps,
@@ -134,13 +136,15 @@ describe('preprocessConfigFile', () => {
       ],
     });
     expect(sut.services[0].id).toBeDefined();
-    expect(sut.services[0].profile).toBeDefined();
-    expect(sut.services[0].profile.name).toBe(serviceProps.name);
+    expect(sut.services[0].settings.profile).toBeDefined();
+    expect(sut.services[0].settings.profile.settings.name).toBe(
+      serviceProps.name,
+    );
   });
 
   it('should refuse to load a service without a name', () => {
     expect(() => {
-      sut.loadFromConfigFile({
+      sut.loadConfig({
         services: [
           {
             id: 'someServiceId',
@@ -148,7 +152,7 @@ describe('preprocessConfigFile', () => {
             name: undefined,
           },
         ],
-      } as unknown as ConfigFileIn);
+      } as unknown as Config);
     }).toThrow();
     expect(sut.profiles).toHaveLength(0);
     expect(sut.services).toHaveLength(0);