Support installer declarations

ThunderstoreCLI/API/ApiHelper.cs

@@ -108,7 +108,7 @@
 
     private static string SerializeFileData(string filePath)
     {
-        return new FileData()
+        return new FileData
         {
             Filename = Path.GetFileName(filePath),
             Filesize = new FileInfo(filePath).Length

ThunderstoreCLI/Commands/BuildCommand.cs

@@ -294,14 +294,19 @@
     public static string SerializeManifest(Config config)
     {
         var dependencies = config.PackageConfig.Dependencies ?? new Dictionary<string, string>();
-        var manifest = new PackageManifestV1()
+        IEnumerable<InstallerDeclaration>? installerDeclarations = config.InstallConfig.InstallerDeclarations;
+        installerDeclarations ??= Array.Empty<InstallerDeclaration>();
+        var manifest = new PackageManifestV1
         {
             Namespace = config.PackageConfig.Namespace,
             Name = config.PackageConfig.Name,
             Description = config.PackageConfig.Description,
             VersionNumber = config.PackageConfig.VersionNumber,
             WebsiteUrl = config.PackageConfig.WebsiteUrl,
-            Dependencies = dependencies.Select(x => $"{x.Key}-{x.Value}").ToArray()
+            Dependencies = dependencies.Select(x => $"{x.Key}-{x.Value}").ToArray(),
+            Installers = installerDeclarations
+                .Select(x => new PackageManifestV1.InstallerDeclaration { Identifier = x.Identifier })
+                .ToArray()
         };
 
         return manifest.Serialize(BaseJson.IndentedSettings);

ThunderstoreCLI/Commands/InitCommand.cs

@@ -38,7 +38,7 @@
             {
                 Write.Line($"Project configuration already exists, overwriting");
             }
-            File.WriteAllText(path, new ThunderstoreProject(true).Serialize());
+            File.WriteAllText(path, new ThunderstoreProject(Config.DefaultConfig).Serialize());
 
             var iconPath = config.GetPackageIconPath();
             if (File.Exists(iconPath))

ThunderstoreCLI/Commands/InstallCommand.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.IO.Compression;
-using System.Net.Http.Headers;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using ThunderstoreCLI.Configuration;

ThunderstoreCLI/Commands/PublishCommand.cs

@@ -253,7 +253,7 @@
                 throw new PublishCommandException();
             }
 
-            return new CompletedUpload.CompletedPartData()
+            return new CompletedUpload.CompletedPartData
             {
                 ETag = response.Headers.ETag.Tag,
                 PartNumber = part.PartNumber

ThunderstoreCLI/Commands/RunCommand.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using System.Text;
 using ThunderstoreCLI.Configuration;
 using ThunderstoreCLI.Game;
 using ThunderstoreCLI.Utils;

ThunderstoreCLI/Configuration/CLIParameterConfig.cs

@@ -11,7 +11,7 @@
 
     public override GeneralConfig GetGeneralConfig()
     {
-        return new GeneralConfig()
+        return new GeneralConfig
         {
             TcliConfig = options.TcliDirectory,
             Repository = options.Repository
@@ -29,7 +29,7 @@
     {
         if (options == null)
             return null;
-        return new PackageConfig()
+        return new PackageConfig
         {
             ProjectConfigPath = options.ConfigPath,
             Namespace = options.Namespace,
@@ -45,7 +45,7 @@
 
     public override InitConfig GetInitConfig()
     {
-        return new InitConfig()
+        return new InitConfig
         {
             Overwrite = options.Overwrite
         };
@@ -63,15 +63,15 @@
 
     public override PublishConfig GetPublishConfig()
     {
-        return new PublishConfig()
+        return new PublishConfig
         {
             File = options.File
         };
     }
 
     public override AuthConfig GetAuthConfig()
     {
-        return new AuthConfig()
+        return new AuthConfig
         {
             AuthToken = options.Token
         };
@@ -82,9 +82,9 @@
 {
     public ModManagementCommandConfig(ModManagementOptions options) : base(options) { }
 
-    public override ModManagementConfig? GetModManagementConfig()
+    public override ModManagementConfig GetModManagementConfig()
     {
-        return new ModManagementConfig()
+        return new ModManagementConfig
         {
             GameIdentifer = options.GameName,
             ProfileName = options.Profile,
@@ -97,9 +97,9 @@
 {
     public GameImportCommandConfig(GameImportOptions options) : base(options) { }
 
-    public override GameImportConfig? GetGameImportConfig()
+    public override GameImportConfig GetGameImportConfig()
     {
-        return new GameImportConfig()
+        return new GameImportConfig
         {
             ExePath = options.ExePath,
             GameId = options.GameId,
@@ -111,9 +111,9 @@
 {
     public RunGameCommandConfig(RunGameOptions options) : base(options) { }
 
-    public override RunGameConfig? GetRunGameConfig()
+    public override RunGameConfig GetRunGameConfig()
     {
-        return new RunGameConfig()
+        return new RunGameConfig
         {
             GameName = options.GameName,
             ProfileName = options.Profile,

ThunderstoreCLI/Configuration/Config.cs

@@ -13,6 +13,7 @@
     public required InitConfig InitConfig { get; init; }
     public required BuildConfig BuildConfig { get; init; }
     public required PublishConfig PublishConfig { get; init; }
+    public required InstallConfig InstallConfig { get; init; }
     public required AuthConfig AuthConfig { get; init; }
     public required ModManagementConfig ModManagementConfig { get; init; }
     public required GameImportConfig GameImportConfig { get; init; }
@@ -30,6 +31,23 @@
         api = new Lazy<ApiHelper>(() => new ApiHelper(this));
         cache = new Lazy<DownloadCache>(() => new DownloadCache(Path.Combine(GeneralConfig!.TcliConfig, "ModCache")));
     }
+
+    private static Config BlankConfig => new()
+    {
+        GeneralConfig = new GeneralConfig(),
+        PackageConfig = new PackageConfig(),
+        InitConfig = new InitConfig(),
+        BuildConfig = new BuildConfig(),
+        PublishConfig = new PublishConfig(),
+        InstallConfig = new InstallConfig(),
+        AuthConfig = new AuthConfig(),
+        ModManagementConfig = new ModManagementConfig(),
+        GameImportConfig = new GameImportConfig(),
+        RunGameConfig = new RunGameConfig(),
+    };
+
+    public static Config DefaultConfig => MergeConfigFromProvider(BlankConfig, new DefaultConfig(), true);
+
     public static Config FromCLI(IConfigProvider cliConfig)
     {
         List<IConfigProvider> providers = new();
@@ -99,7 +117,7 @@
 
     public PackageUploadMetadata GetUploadMetadata(string fileUuid)
     {
-        return new PackageUploadMetadata()
+        return new PackageUploadMetadata
         {
             AuthorName = PackageConfig.Namespace,
             Categories = PublishConfig.Categories!.GetOrDefault("") ?? Array.Empty<string>(),
@@ -114,34 +132,30 @@
 
     public static Config Parse(IConfigProvider[] configProviders)
     {
-        Config result = new()
-        {
-            GeneralConfig = new GeneralConfig(),
-            PackageConfig = new PackageConfig(),
-            InitConfig = new InitConfig(),
-            BuildConfig = new BuildConfig(),
-            PublishConfig = new PublishConfig(),
-            AuthConfig = new AuthConfig(),
-            ModManagementConfig = new ModManagementConfig(),
-            GameImportConfig = new GameImportConfig(),
-            RunGameConfig = new RunGameConfig(),
-        };
+        var result = BlankConfig;
         foreach (var provider in configProviders)
         {
-            provider.Parse(result);
-            Merge(result.GeneralConfig, provider.GetGeneralConfig(), false);
-            Merge(result.PackageConfig, provider.GetPackageMeta(), false);
-            Merge(result.InitConfig, provider.GetInitConfig(), false);
-            Merge(result.BuildConfig, provider.GetBuildConfig(), false);
-            Merge(result.PublishConfig, provider.GetPublishConfig(), false);
-            Merge(result.AuthConfig, provider.GetAuthConfig(), false);
-            Merge(result.ModManagementConfig, provider.GetModManagementConfig(), false);
-            Merge(result.GameImportConfig, provider.GetGameImportConfig(), false);
-            Merge(result.RunGameConfig, provider.GetRunGameConfig(), false);
+            MergeConfigFromProvider(result, provider, false);
         }
         return result;
     }
 
+    public static Config MergeConfigFromProvider(Config target, IConfigProvider provider, bool overwrite)
+    {
+        provider.Parse(target);
+        Merge(target.GeneralConfig, provider.GetGeneralConfig(), overwrite);
+        Merge(target.PackageConfig, provider.GetPackageMeta(), overwrite);
+        Merge(target.InitConfig, provider.GetInitConfig(), overwrite);
+        Merge(target.BuildConfig, provider.GetBuildConfig(), overwrite);
+        Merge(target.PublishConfig, provider.GetPublishConfig(), overwrite);
+        Merge(target.InstallConfig, provider.GetInstallConfig(), overwrite);
+        Merge(target.AuthConfig, provider.GetAuthConfig(), overwrite);
+        Merge(target.ModManagementConfig, provider.GetModManagementConfig(), overwrite);
+        Merge(target.GameImportConfig, provider.GetGameImportConfig(), overwrite);
+        Merge(target.RunGameConfig, provider.GetRunGameConfig(), overwrite);
+        return target;
+    }
+
     public static void Merge<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T>(T target, T source, bool overwrite)
     {
         if (source == null)
@@ -218,6 +232,21 @@
     public Dictionary<string, string[]>? Categories { get; set; }
 }
 
+public struct InstallerDeclaration
+{
+    public readonly string Identifier;
+
+    public InstallerDeclaration(string identifier)
+    {
+        Identifier = identifier;
+    }
+}
+
+public class InstallConfig
+{
+    public List<InstallerDeclaration>? InstallerDeclarations { get; set; }
+}
+
 public class AuthConfig
 {
     public string? AuthToken { get; set; }

ThunderstoreCLI/Configuration/DefaultConfig.cs

@@ -2,59 +2,68 @@
 
 class DefaultConfig : EmptyConfig
 {
-    public override GeneralConfig? GetGeneralConfig()
+    public override GeneralConfig GetGeneralConfig()
     {
-        return new GeneralConfig()
+        return new GeneralConfig
         {
             Repository = Defaults.REPOSITORY_URL
         };
     }
 
     public override PackageConfig GetPackageMeta()
     {
-        return new PackageConfig()
+        return new PackageConfig
         {
             ProjectConfigPath = Defaults.PROJECT_CONFIG_PATH,
             Namespace = "AuthorName",
             Name = "PackageName",
             VersionNumber = "0.0.1",
             Description = "Example mod description",
-            WebsiteUrl = "",
+            WebsiteUrl = "https://thunderstore.io",
             ContainsNsfwContent = false,
             Dependencies = new()
             {
-                { "Example-Dependency", "1.0.0" }
+                { "AuthorName-PackageName", "0.0.1" }
             }
         };
     }
 
     public override InitConfig GetInitConfig()
     {
-        return new InitConfig()
+        return new InitConfig
         {
             Overwrite = false
         };
     }
 
     public override BuildConfig GetBuildConfig()
     {
-        return new BuildConfig()
+        return new BuildConfig
         {
             IconPath = "./icon.png",
             ReadmePath = "./README.md",
             OutDir = "./build",
-            CopyPaths = new()
-            {
-                { new("./dist", "") }
-            }
+            CopyPaths = [new("./dist", "")]
         };
     }
 
     public override PublishConfig GetPublishConfig()
     {
-        return new PublishConfig()
+        return new PublishConfig
+        {
+            File = null,
+            Communities = ["riskofrain2"],
+            Categories = new Dictionary<string, string[]> {
+                { "riskofrain2", ["items", "skills", ] },
+            }
+        };
+    }
+
+    public override InstallConfig GetInstallConfig()
+    {
+        return new InstallConfig
         {
-            File = null
+            InstallerDeclarations = [new InstallerDeclaration("foo-installer")]
         };
     }
 }