Update injectable library (#4842)

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api.ts

@@ -2,12 +2,10 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { Injectable } from "@ogre-tools/injectable";
+import type { Injectable, TentativeTuple } from "@ogre-tools/injectable";
 
 import { getLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api";
 
-type TentativeTuple<T> = T extends object ? [T] : [undefined?];
-
 type FactoryType = <
   TInjectable extends Injectable<unknown, TInstance, TInstantiationParameter>,
   TInstantiationParameter,

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

@@ -2,11 +2,9 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { Injectable } from "@ogre-tools/injectable";
+import type { Injectable, TentativeTuple } from "@ogre-tools/injectable";
 import { getLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api";
 
-type TentativeTuple<T> = T extends object ? [T] : [undefined?];
-
 type MapInjectables<T> = {
   [Key in keyof T]: T[Key] extends () => infer Res ? Res : never;
 };

src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api.ts

@@ -2,11 +2,9 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { Injectable } from "@ogre-tools/injectable";
+import type { Injectable, TentativeTuple } from "@ogre-tools/injectable";
 import { getLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api";
 
-type TentativeTuple<T> = T extends object ? [T] : [undefined?];
-
 export const asLegacyGlobalObjectForExtensionApi = <
   TInjectable extends Injectable<unknown, unknown, TInstantiationParameter>,
   TInstantiationParameter,

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

@@ -2,11 +2,11 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { DependencyInjectionContainer } from "@ogre-tools/injectable";
+import type { DiContainer } from "@ogre-tools/injectable";
 
-let legacyGlobalDi: DependencyInjectionContainer;
+let legacyGlobalDi: DiContainer;
 
-export const setLegacyGlobalDiForExtensionApi = (di: DependencyInjectionContainer) => {
+export const setLegacyGlobalDiForExtensionApi = (di: DiContainer) => {
   legacyGlobalDi = di;
 };
 

src/extensions/common-api/get-enabled-extensions/get-enabled-extensions.injectable.ts

@@ -2,14 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import extensionsStoreInjectable from "../../extensions-store/extensions-store.injectable";
 
 const getEnabledExtensionsInjectable = getInjectable({
+  id: "get-enabled-extensions",
+
   instantiate: (di) => () =>
     di.inject(extensionsStoreInjectable).enabledExtensions,
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default getEnabledExtensionsInjectable;

src/extensions/extension-discovery/extension-discovery.injectable.ts

@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { ExtensionDiscovery } from "./extension-discovery";
 import extensionLoaderInjectable from "../extension-loader/extension-loader.injectable";
 import isCompatibleExtensionInjectable from "./is-compatible-extension/is-compatible-extension.injectable";
@@ -14,6 +14,8 @@ import extensionPackageRootDirectoryInjectable from "../extension-installer/exte
 import installExtensionsInjectable from "../extension-installer/install-extensions/install-extensions.injectable";
 
 const extensionDiscoveryInjectable = getInjectable({
+  id: "extension-discovery",
+
   instantiate: (di) =>
     new ExtensionDiscovery({
       extensionLoader: di.inject(extensionLoaderInjectable),
@@ -36,8 +38,6 @@ const extensionDiscoveryInjectable = getInjectable({
         extensionPackageRootDirectoryInjectable,
       ),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default extensionDiscoveryInjectable;

src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts

@@ -2,13 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { appSemVer } from "../../../common/vars";
 import { isCompatibleBundledExtension } from "./is-compatible-bundled-extension";
 
 const isCompatibleBundledExtensionInjectable = getInjectable({
+  id: "is-compatible-bundled-extension",
   instantiate: () => isCompatibleBundledExtension({ appSemVer }),
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default isCompatibleBundledExtensionInjectable;

src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts

@@ -2,13 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { appSemVer } from "../../../common/vars";
 import { isCompatibleExtension } from "./is-compatible-extension";
 
 const isCompatibleExtensionInjectable = getInjectable({
+  id: "is-compatible-extension",
   instantiate: () => isCompatibleExtension({ appSemVer }),
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default isCompatibleExtensionInjectable;

src/extensions/extension-installation-state-store/extension-installation-state-store.injectable.ts

@@ -2,12 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { ExtensionInstallationStateStore } from "./extension-installation-state-store";
 
 const extensionInstallationStateStoreInjectable = getInjectable({
+  id: "extension-installation-state-store",
   instantiate: () => new ExtensionInstallationStateStore(),
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default extensionInstallationStateStoreInjectable;

src/extensions/extension-installer/extension-installer.injectable.ts

@@ -2,19 +2,19 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { ExtensionInstaller } from "./extension-installer";
 import extensionPackageRootDirectoryInjectable from "./extension-package-root-directory/extension-package-root-directory.injectable";
 
 const extensionInstallerInjectable = getInjectable({
+  id: "extension-installer",
+
   instantiate: (di) =>
     new ExtensionInstaller({
       extensionPackageRootDirectory: di.inject(
         extensionPackageRootDirectoryInjectable,
       ),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default extensionInstallerInjectable;

src/extensions/extension-installer/extension-package-root-directory/extension-package-root-directory.injectable.ts

@@ -2,14 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import directoryForUserDataInjectable
   from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 
 const extensionPackageRootDirectoryInjectable = getInjectable({
-  instantiate: (di) => di.inject(directoryForUserDataInjectable),
+  id: "extension-package-root-directory",
 
-  lifecycle: lifecycleEnum.singleton,
+  instantiate: (di) => di.inject(directoryForUserDataInjectable),
 });
 
 export default extensionPackageRootDirectoryInjectable;

src/extensions/extension-installer/install-extension/install-extension.injectable.ts

@@ -2,13 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import extensionInstallerInjectable from "../extension-installer.injectable";
 
 const installExtensionInjectable = getInjectable({
+  id: "install-extension",
   instantiate: (di) => di.inject(extensionInstallerInjectable).installPackage,
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default installExtensionInjectable;

src/extensions/extension-installer/install-extensions/install-extensions.injectable.ts

@@ -2,13 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import extensionInstallerInjectable from "../extension-installer.injectable";
 
 const installExtensionsInjectable = getInjectable({
+  id: "install-extensions",
   instantiate: (di) => di.inject(extensionInstallerInjectable).installPackages,
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default installExtensionsInjectable;

src/extensions/extension-loader/create-extension-instance/create-extension-instance.injectable.ts

@@ -2,16 +2,16 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { createExtensionInstance } from "./create-extension-instance";
 import fileSystemProvisionerStoreInjectable from "./file-system-provisioner-store/file-system-provisioner-store.injectable";
 
 const createExtensionInstanceInjectable = getInjectable({
+  id: "create-extension-instance",
+
   instantiate: (di) => createExtensionInstance({
     fileSystemProvisionerStore: di.inject(fileSystemProvisionerStoreInjectable),
   }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default createExtensionInstanceInjectable;

src/extensions/extension-loader/create-extension-instance/file-system-provisioner-store/directory-for-extension-data/directory-for-extension-data.injectable.ts

@@ -2,15 +2,15 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import path from "path";
 import directoryForUserDataInjectable from "../../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 
 const directoryForExtensionDataInjectable = getInjectable({
+  id: "directory-for-extension-data",
+
   instantiate: (di) =>
     path.join(di.inject(directoryForUserDataInjectable), "extension_data"),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default directoryForExtensionDataInjectable;

src/extensions/extension-loader/create-extension-instance/file-system-provisioner-store/file-system-provisioner-store.injectable.ts

@@ -2,19 +2,19 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { FileSystemProvisionerStore } from "./file-system-provisioner-store";
 import directoryForExtensionDataInjectable from "./directory-for-extension-data/directory-for-extension-data.injectable";
 
 const fileSystemProvisionerStoreInjectable = getInjectable({
+  id: "file-system-provisioner-store",
+
   instantiate: (di) =>
     FileSystemProvisionerStore.createInstance({
       directoryForExtensionData: di.inject(
         directoryForExtensionDataInjectable,
       ),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default fileSystemProvisionerStoreInjectable;

src/extensions/extension-loader/extension-loader.injectable.ts

@@ -2,20 +2,20 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { ExtensionLoader } from "./extension-loader";
 import updateExtensionsStateInjectable from "./update-extensions-state/update-extensions-state.injectable";
 import createExtensionInstanceInjectable
   from "./create-extension-instance/create-extension-instance.injectable";
 
 const extensionLoaderInjectable = getInjectable({
+  id: "extension-loader",
+
   instantiate: (di) =>
     new ExtensionLoader({
       updateExtensionsState: di.inject(updateExtensionsStateInjectable),
       createExtensionInstance: di.inject(createExtensionInstanceInjectable),
     }),
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default extensionLoaderInjectable;

src/extensions/extension-loader/update-extensions-state/update-extensions-state.injectable.ts

@@ -2,12 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import extensionsStoreInjectable from "../../extensions-store/extensions-store.injectable";
 
 const updateExtensionsStateInjectable = getInjectable({
+  id: "upadte-extensions-state",
   instantiate: (di) => di.inject(extensionsStoreInjectable).mergeState,
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default updateExtensionsStateInjectable;

src/extensions/extension-packages-root/extension-packages-root.injectable.ts

@@ -2,13 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import directoryForUserDataInjectable
   from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 
 const extensionPackagesRootInjectable = getInjectable({
+  id: "extension-packages-root",
   instantiate: (di) => di.inject(directoryForUserDataInjectable),
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default extensionPackagesRootInjectable;

src/extensions/extensions-store/extensions-store.injectable.ts

@@ -2,12 +2,12 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { ExtensionsStore } from "./extensions-store";
 
 const extensionsStoreInjectable = getInjectable({
+  id: "extensions-store",
   instantiate: () => ExtensionsStore.createInstance(),
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default extensionsStoreInjectable;

src/extensions/extensions.injectable.ts

@@ -2,18 +2,18 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
 import extensionLoaderInjectable from "./extension-loader/extension-loader.injectable";
 
 const extensionsInjectable = getInjectable({
+  id: "extensions",
+
   instantiate: (di) => {
     const extensionLoader = di.inject(extensionLoaderInjectable);
 
     return computed(() => extensionLoader.enabledExtensionInstances);
   },
-
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default extensionsInjectable;

src/extensions/main-extensions.injectable.ts

@@ -2,13 +2,13 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import type { IComputedValue } from "mobx";
 import extensionsInjectable from "./extensions.injectable";
 import type { LensMainExtension } from "./lens-main-extension";
 
 const mainExtensionsInjectable = getInjectable({
-  lifecycle: lifecycleEnum.singleton,
+  id: "main-extensions",
 
   instantiate: (di) =>
     di.inject(extensionsInjectable) as IComputedValue<LensMainExtension[]>,

src/extensions/renderer-extensions.injectable.ts

@@ -2,14 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
 import type { IComputedValue } from "mobx";
 import extensionsInjectable from "./extensions.injectable";
 import type { LensRendererExtension } from "./lens-renderer-extension";
 
 const rendererExtensionsInjectable = getInjectable({
+  id: "renderer-extensions",
   instantiate: (di) => di.inject(extensionsInjectable) as IComputedValue<LensRendererExtension[]>,
-  lifecycle: lifecycleEnum.singleton,
 });
 
 export default rendererExtensionsInjectable;