Cleanup getDi and registering injectables (#7251)

* Cleanup getDi and registering injectables

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Create more explicit application

- Make testing use more production code

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix uses of getEnvironmentSpecificLegacyGlobalDiForExtensionApi

Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix unit tests

Signed-off-by: Sebastian Malton <sebastian@malton.name>

---------

Signed-off-by: Sebastian Malton <sebastian@malton.name>

packages/core/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.test.ts

@@ -9,7 +9,7 @@ import {
   createContainer,
   getInjectable,
 } from "@ogre-tools/injectable";
-import { Environments, setLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api";
+import { setLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api";
 import { asLegacyGlobalObjectForExtensionApiWithModifications } from "./as-legacy-global-object-for-extension-api-with-modifications";
 
 describe("asLegacyGlobalObjectForExtensionApiWithModifications", () => {
@@ -25,7 +25,7 @@ describe("asLegacyGlobalObjectForExtensionApiWithModifications", () => {
 
       jest.spyOn(di, "inject");
 
-      setLegacyGlobalDiForExtensionApi(di, Environments.renderer);
+      setLegacyGlobalDiForExtensionApi(di, "renderer");
 
       someInjectable = getInjectable({
         id: "some-injectable",

packages/core/src/extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api.ts

@@ -4,17 +4,11 @@
  */
 import type { DiContainer } from "@ogre-tools/injectable";
 
+export type Environments = "main" | "renderer";
+
 const legacyGlobalDis = new Map<Environments, DiContainer>();
 
-export enum Environments {
-  renderer,
-  main,
-}
-
-export const setLegacyGlobalDiForExtensionApi = (
-  di: DiContainer,
-  environment: Environments,
-) => {
+export const setLegacyGlobalDiForExtensionApi = (di: DiContainer, environment: Environments) => {
   legacyGlobalDis.set(environment, di);
 };
 

packages/core/src/extensions/main-api/navigation.ts

@@ -3,16 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import {
-  Environments,
-  getEnvironmentSpecificLegacyGlobalDiForExtensionApi,
-} from "../as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
-
+import { getEnvironmentSpecificLegacyGlobalDiForExtensionApi } from "../as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import navigateInjectable from "../../main/start-main-application/lens-window/navigate.injectable";
 
 export function navigate(url: string) {
-  const di = getEnvironmentSpecificLegacyGlobalDiForExtensionApi(Environments.main);
-
+  const di = getEnvironmentSpecificLegacyGlobalDiForExtensionApi("main");
   const navigate = di.inject(navigateInjectable);
 
   return navigate(url);