modpack-lock 0.5.1 → 0.6.1

package/src/modpack_info.js

@@ -1,16 +1,16 @@
-import prompts from 'prompts';
-import slugify from 'slugify';
-import * as config from './config/index.js';
-import { getLicenseList, getLicenseText } from './github_interactions.js';
-import { getMinecraftVersions, getModloaders } from './modrinth_interactions.js';
+import prompts from "prompts";
+import slugify from "slugify";
+import * as config from "./config/index.js";
+import {getLicenseList, getLicenseText} from "./github_interactions.js";
+import {getMinecraftVersions, getModloaders} from "./modrinth_interactions.js";
 
 /**
  * @typedef {import('./config/types.js').ModpackInfo} ModpackInfo
  */
 
 /**
-* Capitalizes a string
-*/
+ * Capitalizes a string
+ */
 function capitalize(string) {
     return `${string.charAt(0).toUpperCase()}${string.slice(1)}`;
 }
@@ -26,30 +26,30 @@ function validateNotEmpty(value, field) {
 }
 
 /**
-* Returns a required text prompt
-*/
+ * Returns a required text prompt
+ */
 function requiredText(name, message, initial) {
     return {
-        type: 'text',
+        type: "text",
         name: name,
         message: `${capitalize(message)}`,
         initial: initial,
         validate: (value) => {
             return validateNotEmpty(value, name);
-        }
-    }
+        },
+    };
 }
 
 /**
-* Returns an optional text prompt
-*/
+ * Returns an optional text prompt
+ */
 function optionalText(name, message, initial) {
     return {
-        type: 'text',
+        type: "text",
         name: name,
         message: `${capitalize(message)}`,
         initial: initial,
-    }
+    };
 }
 
 /**
@@ -59,29 +59,22 @@ async function getOtherAnswer(value, message, initial) {
     if (value && value !== config.OTHER_OPTION.value) {
         return value;
     }
-    const question = await prompts(
-        requiredText(
-            'other',
-            message,
-            initial
-        ),
-        config.PROMPTS_OPTIONS
-    );
+    const question = await prompts(requiredText("other", message, initial), config.PROMPTS_OPTIONS);
 
     return question.other || config.OTHER_OPTION.value;
 }
 
 /**
-* Returns a required autocomplete prompt with a fallback to the other option
-*/
+ * Returns a required autocomplete prompt with a fallback to the other option
+ */
 function requiredAutocomplete(name, message, initial, choices, defaultValue) {
     initial = initial || defaultValue || config.OTHER_OPTION.value;
-    if (initial && !choices.some(choice => choice.value === initial)) {
-        choices.push({ title: initial, value: initial });
+    if (initial && !choices.some((choice) => choice.value === initial)) {
+        choices.push({title: initial, value: initial});
     }
 
     return {
-        type: 'autocomplete',
+        type: "autocomplete",
         name: name,
         message: `${capitalize(message)}`,
         initial: initial,
@@ -89,20 +82,20 @@ function requiredAutocomplete(name, message, initial, choices, defaultValue) {
         fallback: config.OTHER_OPTION.value,
         format: async (value) => {
             return await getOtherAnswer(value, ` └─𜰙 Other ${message}`, initial);
-        }
-    }
+        },
+    };
 }
 
 /**
-* Returns an confirmation prompt to generate an optional file
-*/
+ * Returns an confirmation prompt to generate an optional file
+ */
 function fileGenerationConfirm(name, message, showPrompt) {
     return {
-        type: showPrompt ? 'confirm' : null,
+        type: showPrompt ? "confirm" : null,
         name: name,
         message: `${capitalize(message)}`,
         initial: true,
-    }
+    };
 }
 
 /**
@@ -114,69 +107,58 @@ export async function promptUserForInfo(defaults = {}) {
     const licenseList = await getLicenseList();
     const minecraftVersions = await getMinecraftVersions();
     const modloaders = await getModloaders();
-    let answers = await prompts([
-        requiredText(
-            'name',
-            config.infoFields.name.prompt,
-            defaults.name
-        ),
-        requiredText(
-            'version',
-            config.infoFields.version.prompt,
-            defaults.version || config.DEFAULT_MODPACK_VERSION
-        ),
-        requiredText(
-            'id',
-            config.infoFields.id.prompt,
-            (prev, values) => slugify(defaults.id || values.name, config.SLUGIFY_OPTIONS)
-        ),
-        optionalText(
-            'description',
-            config.infoFields.description.prompt,
-            defaults.description
-        ),
-        requiredText(
-            'author',
-            config.infoFields.author.prompt,
-            defaults.author
-        ),
-        optionalText(
-            'projectUrl',
-            config.infoFields.projectUrl.prompt,
-            (prev, values) => defaults.projectUrl || config.DEFAULT_PROJECT_URL(values.id)
-        ),
-        optionalText(
-            'sourceUrl',
-            config.infoFields.sourceUrl.prompt,
-            (prev, values) => defaults.sourceUrl || config.DEFAULT_SOURCE_URL(values.id, values.author)
-        ),
-        requiredAutocomplete(
-            'license',
-            config.infoFields.license.prompt,
-            defaults.license,
-            licenseList,
-            config.DEFAULT_MODPACK_LICENSE
-        ),
-        requiredAutocomplete(
-            'modloader',
-            config.infoFields.modloader.prompt,
-            defaults.modloader,
-            modloaders,
-            config.FALLBACK_MODLOADERS[0].value
-        ),
-        optionalText(
-            'targetModloaderVersion',
-            config.infoFields.targetModloaderVersion.prompt,
-            defaults.targetModloaderVersion
-        ),
-        requiredAutocomplete(
-            'targetMinecraftVersion',
-            config.infoFields.targetMinecraftVersion.prompt,
-            defaults.targetMinecraftVersion,
-            minecraftVersions,
-            minecraftVersions[0].value
-        )
-    ], config.PROMPTS_OPTIONS);
+    let answers = await prompts(
+        [
+            requiredText("name", config.infoFields.name.prompt, defaults.name),
+            requiredText(
+                "version",
+                config.infoFields.version.prompt,
+                defaults.version || config.DEFAULT_MODPACK_VERSION,
+            ),
+            requiredText("id", config.infoFields.id.prompt, (prev, values) =>
+                slugify(defaults.id || values.name, config.SLUGIFY_OPTIONS),
+            ),
+            optionalText("description", config.infoFields.description.prompt, defaults.description),
+            requiredText("author", config.infoFields.author.prompt, defaults.author),
+            optionalText(
+                "projectUrl",
+                config.infoFields.projectUrl.prompt,
+                (prev, values) => defaults.projectUrl || config.DEFAULT_PROJECT_URL(values.id),
+            ),
+            optionalText(
+                "sourceUrl",
+                config.infoFields.sourceUrl.prompt,
+                (prev, values) => defaults.sourceUrl || config.DEFAULT_SOURCE_URL(values.id, values.author),
+            ),
+            requiredAutocomplete(
+                "license",
+                config.infoFields.license.prompt,
+                defaults.license,
+                licenseList,
+                config.DEFAULT_MODPACK_LICENSE,
+            ),
+            requiredAutocomplete(
+                "modloader",
+                config.infoFields.modloader.prompt,
+                defaults.modloader,
+                modloaders,
+                config.FALLBACK_MODLOADERS[0].value,
+            ),
+            optionalText(
+                "targetModloaderVersion",
+                config.infoFields.targetModloaderVersion.prompt,
+                defaults.targetModloaderVersion,
+            ),
+            requiredAutocomplete(
+                "targetMinecraftVersion",
+                config.infoFields.targetMinecraftVersion.prompt,
+                defaults.targetMinecraftVersion,
+                minecraftVersions,
+                minecraftVersions[0].value,
+            ),
+        ],
+        config.PROMPTS_OPTIONS,
+    );
 
     return answers;
 }
@@ -187,27 +169,30 @@ export async function promptUserForInfo(defaults = {}) {
  * @returns {Promise<Object>} The answers from the user
  */
 export async function promptUserAboutOptionalFiles(modpackInfo, defaults = {}) {
-
     const licenseText = await getLicenseText(modpackInfo.license);
-    const answers = await (prompts([
-        fileGenerationConfirm(
-            'addLicense',
-            `${config.fileFields.addLicense.prompt}?`,
-            licenseText && defaults.addLicense === undefined
-        ),
-        fileGenerationConfirm(
-            'addReadme',
-            `${config.fileFields.addReadme.prompt}?`,
-            defaults.addReadme === undefined
-        ),
-        fileGenerationConfirm(
-            'addGitignore',
-            `${config.fileFields.addGitignore.prompt}?`,
-            defaults.addGitignore === undefined
-        ),
-    ], config.PROMPTS_OPTIONS));
+    const answers = await prompts(
+        [
+            fileGenerationConfirm(
+                "addLicense",
+                `${config.fileFields.addLicense.prompt}?`,
+                licenseText && defaults.addLicense === undefined,
+            ),
+            fileGenerationConfirm(
+                "addReadme",
+                `${config.fileFields.addReadme.prompt}?`,
+                defaults.addReadme === undefined,
+            ),
+            fileGenerationConfirm(
+                "addGitignore",
+                `${config.fileFields.addGitignore.prompt}?`,
+                defaults.addGitignore === undefined,
+            ),
+        ],
+        config.PROMPTS_OPTIONS,
+    );
 
-    answers.addLicense = answers.addLicense === undefined ? (licenseText ? defaults.addLicense : false) : answers.addLicense;
+    answers.addLicense =
+        answers.addLicense === undefined ? (licenseText ? defaults.addLicense : false) : answers.addLicense;
     answers.addReadme = answers.addReadme === undefined ? defaults.addReadme : answers.addReadme;
     answers.addGitignore = answers.addGitignore === undefined ? defaults.addGitignore : answers.addGitignore;
 

package/src/modrinth_interactions.js

@@ -1,4 +1,5 @@
-import * as config from './config/index.js';
+import * as config from "./config/index.js";
+import {logm} from "./logger.js";
 
 /**
  * Split an array into chunks of specified size
@@ -21,14 +22,14 @@ export async function getVersionsFromHashes(hashes) {
 
     try {
         const response = await fetch(config.MODRINTH_VERSION_FILES_ENDPOINT, {
-            method: 'POST',
+            method: "POST",
             headers: {
-                'Content-Type': 'application/json',
-                'User-Agent': config.PACKAGE_USER_AGENT,
+                "Content-Type": "application/json",
+                "User-Agent": config.PACKAGE_USER_AGENT,
             },
             body: JSON.stringify({
                 hashes: hashes,
-                algorithm: 'sha1',
+                algorithm: "sha1",
             }),
         });
 
@@ -39,7 +40,7 @@ export async function getVersionsFromHashes(hashes) {
 
         return await response.json();
     } catch (error) {
-        console.error(`Error fetching version information from hashes: ${error.message}`);
+        logm.error(`Error fetching version information from hashes: ${error.message}`);
         throw error;
     }
 }
@@ -60,7 +61,7 @@ export async function getProjects(projectIds) {
             const url = `${config.MODRINTH_PROJECTS_ENDPOINT}?ids=${encodeURIComponent(JSON.stringify(chunk))}`;
             const response = await fetch(url, {
                 headers: {
-                    'User-Agent': config.PACKAGE_USER_AGENT,
+                    "User-Agent": config.PACKAGE_USER_AGENT,
                 },
             });
 
@@ -72,7 +73,7 @@ export async function getProjects(projectIds) {
             const data = await response.json();
             results.push(...data);
         } catch (error) {
-            console.error(`Error fetching projects: ${error.message}`);
+            logm.error(`Error fetching projects: ${error.message}`);
             throw error;
         }
     }
@@ -96,7 +97,7 @@ export async function getUsers(userIds) {
             const url = `${config.MODRINTH_USERS_ENDPOINT}?ids=${encodeURIComponent(JSON.stringify(chunk))}`;
             const response = await fetch(url, {
                 headers: {
-                    'User-Agent': config.PACKAGE_USER_AGENT,
+                    "User-Agent": config.PACKAGE_USER_AGENT,
                 },
             });
 
@@ -108,7 +109,7 @@ export async function getUsers(userIds) {
             const data = await response.json();
             results.push(...data);
         } catch (error) {
-            console.error(`Error fetching users: ${error.message}`);
+            logm.error(`Error fetching users: ${error.message}`);
             throw error;
         }
     }
@@ -125,7 +126,7 @@ export async function getMinecraftVersions() {
         const url = config.MODRINTH_MINECRAFT_VERSIONS_ENDPOINT;
         const response = await fetch(url, {
             headers: {
-                'User-Agent': config.PACKAGE_USER_AGENT,
+                "User-Agent": config.PACKAGE_USER_AGENT,
             },
         });
         if (!response.ok) {
@@ -137,15 +138,18 @@ export async function getMinecraftVersions() {
         if (json) {
             //sort by version type (in the order of the MINECRAFT_VERSION_TYPES array)
             json.sort((a, b) => {
-                return config.MINECRAFT_VERSION_TYPES.indexOf(a.version_type) - config.MINECRAFT_VERSION_TYPES.indexOf(b.version_type);
+                return (
+                    config.MINECRAFT_VERSION_TYPES.indexOf(a.version_type) -
+                    config.MINECRAFT_VERSION_TYPES.indexOf(b.version_type)
+                );
             });
-            return json.map(version => ({ title: version.version, value: version.version }));
+            return json.map((version) => ({title: version.version, value: version.version}));
         } else {
             throw new Error();
         }
         return null;
     } catch (error) {
-        console.warn(`Warning: could not fetch Minecraft versions. Using fallbacks.`, error);
+        logm.warn(`Could not fetch Minecraft versions. Using fallbacks.`, error);
         return config.FALLBACK_TARGET_MINECRAFT_VERSIONS;
     }
 }
@@ -159,7 +163,7 @@ export async function getModloaders() {
         const url = config.MODRINTH_MODLOADERS_ENDPOINT;
         const response = await fetch(url, {
             headers: {
-                'User-Agent': config.PACKAGE_USER_AGENT,
+                "User-Agent": config.PACKAGE_USER_AGENT,
             },
         });
         if (!response.ok) {
@@ -169,13 +173,13 @@ export async function getModloaders() {
 
         const json = await response.json();
         if (json) {
-            return json.map(loader => ({ title: loader.name, value: loader.name }));
+            return json.map((loader) => ({title: loader.name, value: loader.name}));
         } else {
             throw new Error();
         }
         return null;
     } catch (error) {
-        console.warn(`Warning: could not fetch Modloaders. Using fallbacks.`, error);
+        logm.warn(`Could not fetch Modloaders. Using fallbacks.`, error);
         return config.FALLBACK_MODLOADERS;
     }
 }