chore: type responses to avoid bugs with any (#47)

Author: iTrooz

mclib/src/finder/LocalSolutionFinder.test.ts

@@ -279,7 +279,7 @@ describe('SolutionFinder', () => {
                 loader: ModLoader.FABRIC
             });
             expect(result.mods).toHaveLength(1);
-            expect(result.mods[0].modMetadata.id).toBe('ice-and-fire-dragons');
+            expect(result.mods[0].modMetadata!.id).toBe('ice-and-fire-dragons');
             expect(result.mods[0].modVersion).toBe('2.0.0');
         });
 

mclib/src/repos/CurseForgeRepository.ts

@@ -21,11 +21,19 @@ export class CurseForgeRepository implements IRepository {
     }
 
     async getModReleases(modId: string): Promise<ModReleases> {
+        type Data = {
+            data: {
+                displayName: string;
+                gameVersions: string[];
+                downloadUrl: string;
+            }[];
+        };
+
         const filesResp = await this.fetchClient(`${CurseForgeRepository.BASE_URL}/mods/${modId}/files`);
         if (!filesResp.ok) throw new Error("Could not fetch files from CurseForge");
-        const filesData = (await filesResp.json()).data;
+        const jsonResp: Data = await filesResp.json();
 
-        const releases: ModRepoRelease[] = filesData.map((file: any) => {
+        const releases: ModRepoRelease[] = jsonResp.data.map(file => {
             const mcVersions: Set<MCVersion> = new Set();
             const loaders: Set<ModLoader> = new Set();
             for (let gameVersion of file.gameVersions || []) {
@@ -50,6 +58,20 @@ export class CurseForgeRepository implements IRepository {
     }
 
     async searchMods(query: string, maxResults: number): Promise<ModRepoMetadata[]> {
+        type Data = {
+            data: {
+                id: number;
+                name: string;
+                links: {
+                    websiteUrl: string;
+                };
+                logo: {
+                    url: string;
+                };
+                downloadCount: number;
+            }[];
+        };
+
         const resp = await this.fetchClient(`${CurseForgeRepository.BASE_URL}/mods/search?` + new URLSearchParams({
             // params from PrismLancher
             gameId: "432", // Minecraft game ID
@@ -61,8 +83,9 @@ export class CurseForgeRepository implements IRepository {
             searchFilter: query
         }));
         if (!resp.ok) throw new Error("Failed to fetch search results from CurseForge");
-        const data = (await resp.json()).data;
-        return data.map((mod: any) => ({
+        const jsonResp: Data = (await resp.json());
+
+        return jsonResp.data.map(mod => ({
             id: mod.id.toString(),
             repository: ModRepositoryName.CURSEFORGE,
             name: mod.name,

mclib/src/repos/ModrinthRepository.ts

@@ -18,27 +18,49 @@ export class ModrinthRepository implements IRepository {
     }
 
     async getModReleases(modId: string): Promise<ModReleases> {
+        type Data = Array<{
+            game_versions: string[];
+            version_number: string;
+            loaders: string[];
+            files: {
+                url: string;
+            }[];
+        }>;
+
         const versionsResp = await this.fetchClient(`https://api.modrinth.com/v2/project/${modId}/version`);
         if (!versionsResp.ok) throw new Error("Could not fetch versions from Modrinth");
-        const versionsData = await versionsResp.json();
+        const jsonResp: Data = await versionsResp.json();
 
-        const releases: ModRepoRelease[] = versionsData.map((v: any) => ({
-            mcVersions: new Set(v.game_versions),
-            modVersion: v.version_number,
-            repository: ModRepositoryName.MODRINTH,
-            loaders: new Set(v.loaders.map(ModLoaderUtil.from)),
-            downloadUrl: v.files?.[0]?.url || '',
-        }));
+        const releases: ModRepoRelease[] = jsonResp.map(file => {
+            const mcVersions = new Set(file.game_versions);
+            const loaders = new Set(file.loaders.map(ModLoaderUtil.from));
+            return {
+                mcVersions,
+                modVersion: file.version_number,
+                repository: ModRepositoryName.MODRINTH,
+                loaders,
+                downloadUrl: file.files?.[0]?.url || '',
+            };
+        });
 
         return releases;
     }
 
     async searchMods(query: string, maxResults: number): Promise<ModRepoMetadata[]> {
-        const resp = await this.fetchClient(`https://api.modrinth.com/v2/search?facets=[["project_type:mod"]]&query=${encodeURIComponent(query)}&limit=${maxResults}`);
+        type Data = {
+            hits: Array<{
+                slug: string;
+                title: string;
+                icon_url?: string;
+                downloads?: number;
+            }>;
+        };
+
+        const resp = await this.fetchClient(`https://api.modrinth.com/v2/search?facets=[[\"project_type:mod\"]]&query=${encodeURIComponent(query)}&limit=${maxResults}`);
         if (!resp.ok) throw new Error("Failed to fetch search results from Modrinth");
-        const data = await resp.json();
+        const jsonResp: Data = await resp.json();
 
-        return data.hits.map((hit: any) => ({
+        return jsonResp.hits.map(hit => ({
             id: hit.slug,
             repository: ModRepositoryName.MODRINTH,
             name: hit.title,

mclib/src/types.ts

@@ -55,7 +55,7 @@ export type ModRepoRelease = {
     /** Download URL for the mod release */
     downloadUrl: string;
 
-    modMetadata: ModRepoMetadata;
+    modMetadata?: ModRepoMetadata;
 };
 
 export type ModMetadata = ModRepoMetadata[];