Drop PackageInstallerV2 class

Based on code review feedback, implement the uninstallation methods as
optional methods, rather than have a separate version of the abstract
class with more abstract methods.

Replace the approach with abstract classes and methods with a plain
TypeScript interface because having optional methods in abstract
classes seems poorly supported in TypeScript.

Author: anttimaki

src/installers/BepInExInstaller.ts

@@ -6,7 +6,7 @@ import { PackageLoader } from "../model/installing/PackageLoader";
 
 const basePackageFiles = ["manifest.json", "readme.md", "icon.png"];
 
-export class BepInExInstaller extends PackageInstaller {
+export class BepInExInstaller implements PackageInstaller {
     /**
      * Handles installation of BepInEx
      */

src/installers/GodotMLInstaller.ts

@@ -2,7 +2,7 @@ import { InstallArgs, PackageInstaller } from "./PackageInstaller";
 import path from "path";
 import FsProvider from "../providers/generic/file/FsProvider";
 
-export class GodotMLInstaller extends PackageInstaller {
+export class GodotMLInstaller implements PackageInstaller {
     /**
      * Handles installation of GodotML
      */

src/installers/InstallRuleInstaller.ts

@@ -215,11 +215,10 @@ async function installState(args: InstallRuleArgs) {
     await addToStateFile(mod, fileRelocations, profile);
 }
 
-export class InstallRuleInstaller extends PackageInstaller {
+export class InstallRuleInstaller implements PackageInstaller {
     public readonly rule: CoreRuleType;
 
     constructor(rules: CoreRuleType) {
-        super();
         this.rule = rules;
     }
 

src/installers/LovelyInstaller.ts

@@ -6,7 +6,7 @@ import FileTree from "../model/file/FileTree";
 import R2Error from "../model/errors/R2Error";
 import path from "path";
 
-export class LovelyInstaller extends PackageInstaller {
+export class LovelyInstaller implements PackageInstaller {
     async install(args: InstallArgs) {
         const {
             mod,
@@ -45,7 +45,7 @@ export class LovelyInstaller extends PackageInstaller {
     }
 }
 
-export class LovelyPluginInstaller extends PackageInstaller {
+export class LovelyPluginInstaller implements PackageInstaller {
     async install(args: InstallArgs) {
         const {
             mod,

src/installers/MelonLoaderInstaller.ts

@@ -4,7 +4,7 @@ import path from "path";
 
 const basePackageFiles = ["manifest.json", "readme.md", "icon.png"];
 
-export class MelonLoaderInstaller extends PackageInstaller {
+export class MelonLoaderInstaller implements PackageInstaller {
     /**
      * Handles installation of MelonLoader
      */

src/installers/NorthstarInstaller.ts

@@ -6,7 +6,7 @@ import { PackageLoader } from '../model/installing/PackageLoader';
 
 const basePackageFiles = ["manifest.json", "readme.md", "icon.png"];
 
-export class NorthstarInstaller extends PackageInstaller {
+export class NorthstarInstaller implements PackageInstaller {
     /**
      * Handles installation of Northstar
      */

src/installers/PackageInstaller.ts

@@ -1,20 +1,13 @@
 import Profile from "../model/Profile";
 import ManifestV2 from "../model/ManifestV2";
 
-
 export type InstallArgs = {
     mod: ManifestV2;
     profile: Profile;
     packagePath: string;
 };
 
-
-export abstract class PackageInstaller {
-    abstract install(args: InstallArgs): Promise<void>;
-    // abstract disable(args: InstallArgs): Promise<void>; // TODO: Implement
-}
-
-
-export abstract class PackageInstallerV2 extends PackageInstaller {
-    abstract uninstall(args: InstallArgs): Promise<void>;
+export interface PackageInstaller {
+    install(args: InstallArgs): Promise<void>;
+    uninstall?(args: InstallArgs): Promise<void>;
 }

src/installers/ReturnOfModdingInstaller.ts

@@ -1,7 +1,7 @@
 import path from "path";
 
 import { InstallRuleInstaller } from "./InstallRuleInstaller";
-import { InstallArgs, PackageInstallerV2 } from "./PackageInstaller";
+import { InstallArgs, PackageInstaller } from "./PackageInstaller";
 import FileWriteError from "../model/errors/FileWriteError";
 import { PackageLoader } from "../model/installing/PackageLoader";
 import FsProvider from "../providers/generic/file/FsProvider";
@@ -13,7 +13,7 @@ const basePackageFiles = ["manifest.json", "readme.md", "icon.png"];
 /**
  * Handles (un)installation of ReturnOfModding mod loader
  */
-export class ReturnOfModdingInstaller extends PackageInstallerV2 {
+export class ReturnOfModdingInstaller implements PackageInstaller {
     async install(args: InstallArgs) {
         const {mod, packagePath, profile} = args;
 
@@ -64,7 +64,7 @@ export class ReturnOfModdingInstaller extends PackageInstallerV2 {
 /**
  * Handles (un)installation of mods that use ReturnOfModding mod loader
  */
-export class ReturnOfModdingPluginInstaller extends PackageInstallerV2 {
+export class ReturnOfModdingPluginInstaller implements PackageInstaller {
     _ROOT = "ReturnOfModding";
     _PLUGINS = "plugins";
     _DATA = "plugins_data";

src/installers/ShimloaderInstaller.ts

@@ -6,7 +6,7 @@ import FileUtils from "../utils/FileUtils";
 import R2Error from "../model/errors/R2Error";
 import { InstallRuleInstaller } from "./InstallRuleInstaller";
 
-export class ShimloaderInstaller extends PackageInstaller {
+export class ShimloaderInstaller implements PackageInstaller {
     /**
      * Handle installation of unreal-shimloader
      */
@@ -55,7 +55,7 @@ export class ShimloaderInstaller extends PackageInstaller {
     }
 }
 
-export class ShimloaderPluginInstaller extends PackageInstaller {
+export class ShimloaderPluginInstaller implements PackageInstaller {
     readonly installer = new InstallRuleInstaller({
         gameName: "none" as any,  // This isn't acutally used for actual installation but needs some value
         rules: [

src/r2mm/installing/profile_installers/GenericProfileInstaller.ts

@@ -18,7 +18,7 @@ import FileWriteError from '../../../model/errors/FileWriteError';
 import FileUtils from '../../../utils/FileUtils';
 import { GetInstallerIdForLoader, GetInstallerIdForPlugin } from '../../../model/installing/PackageLoader';
 import { PackageInstallerId, PackageInstallers } from "../../../installers/registry";
-import { InstallArgs, PackageInstallerV2 } from "../../../installers/PackageInstaller";
+import { InstallArgs } from "../../../installers/PackageInstaller";
 import { InstallRuleInstaller } from "../../../installers/InstallRuleInstaller";
 import { ShimloaderPluginInstaller } from "../../../installers/ShimloaderInstaller";
 import { ReturnOfModdingPluginInstaller } from "../../../installers/ReturnOfModdingInstaller";
@@ -289,7 +289,8 @@ export default class GenericProfileInstaller extends ProfileInstallerProvider {
     }
 
     async uninstallMod(mod: ManifestV2, profile: Profile): Promise<R2Error | null> {
-        // Implementations of PackageInstallerV2 define their own uninstallation logic.
+        // Support for installer specific uninstall methods are rolled out
+        // gradually and therefore might not be defined yet.
         try {
             if (
                 await this.uninstallModLoaderWithInstaller(mod, profile) ||
@@ -319,7 +320,8 @@ export default class GenericProfileInstaller extends ProfileInstallerProvider {
     }
 
     /**
-     * Uninstall mod if it's a registered mod loader with PackageInstallerV2 implementation
+     * Uninstall mod if it's a registered mod loader and the installer class
+     * implements a custom uninstallation method.
      * @return true if mod loader was uninstalled
      */
     async uninstallModLoaderWithInstaller(mod: ManifestV2, profile: Profile): Promise<boolean> {
@@ -329,7 +331,8 @@ export default class GenericProfileInstaller extends ProfileInstallerProvider {
     }
 
     /**
-     * Uninstall mod if its registered installer implements PackageInstallerV2
+     * Uninstall mod if its registered installer implements a custom
+     * uninstallation method.
      * @return true if mod was uninstalled
      */
     async uninstallModWithInstaller(mod: ManifestV2, profile: Profile): Promise<boolean> {
@@ -344,7 +347,7 @@ export default class GenericProfileInstaller extends ProfileInstallerProvider {
     ): Promise<boolean> {
         const installer = installerId ? PackageInstallers[installerId] : undefined;
 
-        if (installer && installer instanceof PackageInstallerV2) {
+        if (installer && installer.uninstall) {
             const args = this.getInstallArgs(mod, profile);
             await installer.uninstall(args);
             return true;