From 0f33ba18d2d9e7bb75dd28eb269f62ddcf8203a5 Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Tue, 11 Jan 2022 14:04:06 +0200
Subject: [PATCH] Simplify function Co-authored-by: Mikko Aspiala
 <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 src/main/getDiForUnitTesting.ts | 38 ++++++++++++---------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index 84cd94b7a5..c19f016db2 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -20,44 +20,34 @@
  */
 
 import glob from "glob";
-import { memoize } from "lodash/fp";
-import { kebabCase } from "lodash/fp";
-
-import {
-  createContainer,
-  ConfigurableDependencyInjectionContainer,
-} from "@ogre-tools/injectable";
+import { memoize, kebabCase } from "lodash/fp";
+import { createContainer } from "@ogre-tools/injectable";
 
 import { setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import getElectronAppPathInjectable from "./app-paths/get-electron-app-path/get-electron-app-path.injectable";
 import setElectronAppPathInjectable from "./app-paths/set-electron-app-path/set-electron-app-path.injectable";
 import appNameInjectable from "./app-paths/app-name/app-name.injectable";
 import registerChannelInjectable from "./app-paths/register-channel/register-channel.injectable";
-import writeJsonFileInjectable
-  from "../common/fs/write-json-file/write-json-file.injectable";
-import readJsonFileInjectable
-  from "../common/fs/read-json-file/read-json-file.injectable";
+import writeJsonFileInjectable from "../common/fs/write-json-file/write-json-file.injectable";
+import readJsonFileInjectable from "../common/fs/read-json-file/read-json-file.injectable";
 
 export const getDiForUnitTesting = (
   { doGeneralOverrides } = { doGeneralOverrides: false },
 ) => {
-  const di: ConfigurableDependencyInjectionContainer = createContainer();
+  const di = createContainer();
 
   setLegacyGlobalDiForExtensionApi(di);
 
-  getInjectableFilePaths()
-    .map((key) => {
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const injectable = require(key).default;
+  for (const filePath of getInjectableFilePaths()) {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const injectableInstance = require(filePath).default;
 
-      return {
-        id: key,
-        ...injectable,
-        aliases: [injectable, ...(injectable.aliases || [])],
-      };
-    })
-
-    .forEach((injectable) => di.register(injectable));
+    di.register({
+      id: filePath,
+      ...injectableInstance,
+      aliases: [injectableInstance, ...(injectableInstance.aliases || [])],
+    });
+  }
 
   di.preventSideEffects();