Extract BaseStore deps into constructor argument

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

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

@@ -8,6 +8,10 @@ import directoryForExtensionDataInjectable from "./directory-for-extension-data.
 import ensureDirectoryInjectable from "../../../common/fs/ensure-dir.injectable";
 import joinPathsInjectable from "../../../common/path/join-paths.injectable";
 import randomBytesInjectable from "../../../common/utils/random-bytes.injectable";
+import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
+import loggerInjectable from "../../../common/logger.injectable";
+import storeMigrationVersionInjectable from "../../../common/vars/store-migration-version.injectable";
 
 const fileSystemProvisionerStoreInjectable = getInjectable({
   id: "file-system-provisioner-store",
@@ -17,6 +21,10 @@ const fileSystemProvisionerStoreInjectable = getInjectable({
     ensureDirectory: di.inject(ensureDirectoryInjectable),
     joinPaths: di.inject(joinPathsInjectable),
     randomBytes: di.inject(randomBytesInjectable),
+    directoryForUserData: di.inject(directoryForUserDataInjectable),
+    getConfigurationFileModel: di.inject(getConfigurationFileModelInjectable),
+    logger: di.inject(loggerInjectable),
+    storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
   }),
 });
 

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

@@ -5,6 +5,7 @@
 
 import { SHA256 } from "crypto-js";
 import { action, makeObservable, observable } from "mobx";
+import type { BaseStoreDependencies } from "../../../common/base-store";
 import { BaseStore } from "../../../common/base-store";
 import type { LensExtensionId } from "../../lens-extension";
 import { getOrInsertWithAsync, toJS } from "../../../common/utils";
@@ -16,7 +17,7 @@ interface FSProvisionModel {
   extensions: Record<string, string>; // extension names to paths
 }
 
-interface Dependencies {
+interface Dependencies extends BaseStoreDependencies {
   readonly directoryForExtensionData: string;
   ensureDirectory: EnsureDirectory;
   joinPaths: JoinPaths;
@@ -27,8 +28,8 @@ export class FileSystemProvisionerStore extends BaseStore<FSProvisionModel> {
   readonly displayName = "FilesystemProvisionerStore";
   readonly registeredExtensions = observable.map<LensExtensionId, string>();
 
-  constructor(private readonly dependencies: Dependencies) {
-    super({
+  constructor(protected readonly dependencies: Dependencies) {
+    super(dependencies, {
       configName: "lens-filesystem-provisioner-store",
       accessPropertiesByDotNotation: false, // To make dots safe in cluster context names
     });

src/extensions/extension-store.ts

@@ -3,12 +3,18 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
+import type { BaseStoreParams } from "../common/base-store";
 import { BaseStore } from "../common/base-store";
 import * as path from "path";
 import type { LensExtension } from "./lens-extension";
 import assert from "assert";
 import type { StaticThis } from "../common/utils";
 import { getOrInsertWith } from "../common/utils";
+import { getLegacyGlobalDiForExtensionApi } from "./as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
+import directoryForUserDataInjectable from "../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import getConfigurationFileModelInjectable from "../common/get-configuration-file-model/get-configuration-file-model.injectable";
+import loggerInjectable from "../common/logger.injectable";
+import storeMigrationVersionInjectable from "../common/vars/store-migration-version.injectable";
 
 export abstract class ExtensionStore<T extends object> extends BaseStore<T> {
   private static readonly instances = new WeakMap<object, ExtensionStore<object>>();
@@ -33,6 +39,17 @@ export abstract class ExtensionStore<T extends object> extends BaseStore<T> {
     return ExtensionStore.instances.get(this) as (T | undefined);
   }
 
+  constructor(params: BaseStoreParams<T>) {
+    const di = getLegacyGlobalDiForExtensionApi();
+
+    super({
+      directoryForUserData: di.inject(directoryForUserDataInjectable),
+      getConfigurationFileModel: di.inject(getConfigurationFileModelInjectable),
+      logger: di.inject(loggerInjectable),
+      storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
+    }, params);
+  }
+
   /**
    * @deprecated This is a form of global shared state. Just call `new Store(...)`
    */

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

@@ -3,11 +3,20 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import getConfigurationFileModelInjectable from "../../common/get-configuration-file-model/get-configuration-file-model.injectable";
+import loggerInjectable from "../../common/logger.injectable";
+import storeMigrationVersionInjectable from "../../common/vars/store-migration-version.injectable";
 import { ExtensionsStore } from "./extensions-store";
 
 const extensionsStoreInjectable = getInjectable({
   id: "extensions-store",
-  instantiate: () => new ExtensionsStore(),
+  instantiate: (di) => new ExtensionsStore({
+    directoryForUserData: di.inject(directoryForUserDataInjectable),
+    getConfigurationFileModel: di.inject(getConfigurationFileModelInjectable),
+    logger: di.inject(loggerInjectable),
+    storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
+  }),
 });
 
 export default extensionsStoreInjectable;

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

@@ -6,6 +6,7 @@
 import type { LensExtensionId } from "../lens-extension";
 import { action, computed, makeObservable, observable } from "mobx";
 import { toJS } from "../../common/utils";
+import type { BaseStoreDependencies } from "../../common/base-store";
 import { BaseStore } from "../../common/base-store";
 
 export interface LensExtensionsStoreModel {
@@ -24,8 +25,8 @@ export interface IsEnabledExtensionDescriptor {
 
 export class ExtensionsStore extends BaseStore<LensExtensionsStoreModel> {
   readonly displayName = "ExtensionsStore";
-  constructor() {
-    super({
+  constructor(deps: BaseStoreDependencies) {
+    super(deps, {
       configName: "lens-extensions",
     });
     makeObservable(this);