Cascade different refactorings to eliminate global shared state from app paths

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

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

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

@@ -20,9 +20,16 @@
  */
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import { ExtensionInstaller } from "./extension-installer";
+import extensionPackageRootDirectoryInjectable from "./extension-package-root-directory/extension-package-root-directory.injectable";
 
 const extensionInstallerInjectable = getInjectable({
-  instantiate: () => new ExtensionInstaller(),
+  instantiate: (di) =>
+    new ExtensionInstaller({
+      extensionPackageRootDirectory: di.inject(
+        extensionPackageRootDirectoryInjectable,
+      ),
+    }),
+
   lifecycle: lifecycleEnum.singleton,
 });
 

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

@@ -24,20 +24,21 @@ import child_process from "child_process";
 import fs from "fs-extra";
 import path from "path";
 import logger from "../../main/logger";
-import { extensionPackagesRoot } from "../extension-loader";
 import type { PackageJson } from "type-fest";
 
 const logModule = "[EXTENSION-INSTALLER]";
 
+interface Dependencies {
+  extensionPackageRootDirectory: string
+}
+
 /**
  * Installs dependencies for extensions
  */
 export class ExtensionInstaller {
   private installLock = new AwaitLock();
 
-  get extensionPackagesRoot() {
-    return extensionPackagesRoot();
-  }
+  constructor(private dependencies: Dependencies) {}
 
   get npmPath() {
     return __non_webpack_require__.resolve("npm/bin/npm-cli");
@@ -46,7 +47,7 @@ export class ExtensionInstaller {
   /**
    * Write package.json to the file system and execute npm install for it.
    */
-  async installPackages(packageJsonPath: string, packagesJson: PackageJson): Promise<void> {
+  installPackages = async (packageJsonPath: string, packagesJson: PackageJson): Promise<void> => {
     // Mutual exclusion to install packages in sequence
     await this.installLock.acquireAsync();
 
@@ -56,34 +57,34 @@ export class ExtensionInstaller {
         mode: 0o600,
       });
 
-      logger.info(`${logModule} installing dependencies at ${extensionPackagesRoot()}`);
+      logger.info(`${logModule} installing dependencies at ${this.dependencies.extensionPackageRootDirectory}`);
       await this.npm(["install", "--no-audit", "--only=prod", "--prefer-offline", "--no-package-lock"]);
-      logger.info(`${logModule} dependencies installed at ${extensionPackagesRoot()}`);
+      logger.info(`${logModule} dependencies installed at ${this.dependencies.extensionPackageRootDirectory}`);
     } finally {
       this.installLock.release();
     }
-  }
+  };
 
   /**
    * Install single package using npm
    */
-  async installPackage(name: string): Promise<void> {
+  installPackage = async (name: string): Promise<void> => {
     // Mutual exclusion to install packages in sequence
     await this.installLock.acquireAsync();
 
     try {
-      logger.info(`${logModule} installing package from ${name} to ${extensionPackagesRoot()}`);
+      logger.info(`${logModule} installing package from ${name} to ${this.dependencies.extensionPackageRootDirectory}`);
       await this.npm(["install", "--no-audit", "--only=prod", "--prefer-offline", "--no-package-lock", "--no-save", name]);
-      logger.info(`${logModule} package ${name} installed to ${extensionPackagesRoot()}`);
+      logger.info(`${logModule} package ${name} installed to ${this.dependencies.extensionPackageRootDirectory}`);
     } finally {
       this.installLock.release();
     }
-  }
+  };
 
   private npm(args: string[]): Promise<void> {
     return new Promise((resolve, reject) => {
       const child = child_process.fork(this.npmPath, args, {
-        cwd: extensionPackagesRoot(),
+        cwd: this.dependencies.extensionPackageRootDirectory,
         silent: true,
         env: {},
       });

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

@@ -19,12 +19,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
-import extensionInstallerInjectable from "../extension-installer.injectable";
+import directoryForUserDataInjectable
+  from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 
 const extensionPackageRootDirectoryInjectable = getInjectable({
-  instantiate: (di) =>
-    di.inject(extensionInstallerInjectable).extensionPackagesRoot,
-  
+  instantiate: (di) => di.inject(directoryForUserDataInjectable),
+
   lifecycle: lifecycleEnum.singleton,
 });
 

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

@@ -23,7 +23,7 @@ import extensionInstallerInjectable from "../extension-installer.injectable";
 
 const installExtensionsInjectable = getInjectable({
   instantiate: (di) => di.inject(extensionInstallerInjectable).installPackages,
-  
+
   lifecycle: lifecycleEnum.singleton,
 });