modpack-lock 0.6.0 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modpack-lock",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Creates a modpack lockfile for files hosted on Modrinth (mods, resource packs, shaders and datapacks)",
   "bugs": {
     "url": "https://github.com/nickesc/modpack-lock/issues"
@@ -39,13 +39,16 @@
     "src/**/*.js"
   ],
   "dependencies": {
-    "commander": "^14.0.2",
+    "commander": "^14.0.3",
     "prompts": "^2.4.2",
     "slugify": "^1.6.6"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^4.0.16",
-    "typedoc": "^0.28.16",
+    "@eslint/js": "^10.0.1",
+    "@vitest/coverage-v8": "^4.0.18",
+    "eslint": "^10.0.0",
+    "globals": "^17.3.0",
+    "typedoc": "^0.28.17",
     "typedoc-github-theme": "^0.3.1",
     "unzipper": "^0.12.3",
     "vitest": "^4.0.16"

package/src/cli.js

@@ -68,7 +68,9 @@ modpackLock
             } else {
                 // Warn if license option is passed but no modpack.json exists
                 if (options.licenseFile) {
-                    logm.warn(`License generation requires a ${config.MODPACK_JSON_NAME} file. Skipping license generation.`);
+                    logm.warn(
+                        `License generation requires a ${config.MODPACK_JSON_NAME} file. Skipping license generation.`,
+                    );
                 }
 
                 // Generate lockfile
@@ -98,7 +100,9 @@ modpackLock
 
 modpackLock
     .command("init")
-    .description(`Initialize a modpack with a ${config.MODPACK_JSON_NAME} file and a ${config.MODPACK_LOCKFILE_NAME} lockfile.`)
+    .description(
+        `Initialize a modpack with a ${config.MODPACK_JSON_NAME} file and a ${config.MODPACK_LOCKFILE_NAME} lockfile.`,
+    )
     .optionsGroup(config.headings.options)
     .option("-f, --folder <path>", "Path to the modpack directory")
     .option("-n, --noninteractive", "Non-interactive mode - must provide options for required fields")
@@ -169,16 +173,28 @@ modpackLock
         } else {
             logm.info(logm.label("modpack-lock"), styleText(["bold", "italic", "blueBright"], "init"));
             logm.newline();
-            logm.info(styleText(["dim"], "This utility will walk you through creating a"),
-                 config.MODPACK_JSON_NAME,
+            logm.info(
+                styleText(["dim"], "This utility will walk you through creating a"),
+                config.MODPACK_JSON_NAME,
                 styleText(["dim"], "file and a"),
                 config.MODPACK_LOCKFILE_NAME,
-                styleText(["dim"], "lockfile. It only covers the most common items, and tries to guess sensible defaults."),
+                styleText(
+                    ["dim"],
+                    "lockfile. It only covers the most common items, and tries to guess sensible defaults.",
+                ),
             );
             logm.newline();
-            logm.info(styleText(["dim"], "See"), styleText(["white", "bgGray", "italic"], "modpack-lock init --help"), styleText(["dim"], "for definitive documentation on these fields and exactly what they do."));
+            logm.info(
+                styleText(["dim"], "See"),
+                styleText(["white", "bgGray", "italic"], "modpack-lock init --help"),
+                styleText(["dim"], "for definitive documentation on these fields and exactly what they do."),
+            );
             logm.newline();
-            logm.info(styleText(["dim"], "Press"), styleText(["yellow"], "^C"), styleText(["dim"], "at any time to quit."));
+            logm.info(
+                styleText(["dim"], "Press"),
+                styleText(["yellow"], "^C"),
+                styleText(["dim"], "at any time to quit."),
+            );
             logm.newline();
             try {
                 const defaults = {
@@ -194,9 +210,13 @@ modpackLock
                     targetModloaderVersion: undefined,
                     targetMinecraftVersion: undefined,
                 };
+                const mergedDefaults = mergeModpackInfo(existingInfo, options, defaults);
 
                 // prompt user for modpack information
-                const modpackInfo = await promptUserForInfo(mergeModpackInfo(existingInfo, options, defaults));
+                const userAnswers = await promptUserForInfo(mergedDefaults);
+
+                // Preserve extra fields (e.g. scripts) from existing modpack.json
+                const modpackInfo = {...mergedDefaults, ...userAnswers};
 
                 // prompt user if they want to add the license text
                 const optionalFiles = await promptUserAboutOptionalFiles(modpackInfo, options);

package/src/directory_scanning.js

@@ -92,7 +92,7 @@ async function getJsonFile(directoryPath, filename) {
         return JSON.parse(fileContent);
     } catch (error) {
         if (error.code !== "ENOENT") {
-            throw new Error(`Error: Could not read file ${jsonPath}: ${error.message}`);
+            throw new Error(`Error: Could not read file ${jsonPath}: ${error.message}`, {cause: error});
         } else {
             return null;
         }

package/src/generate_gitignore.js

@@ -1,7 +1,7 @@
 import fs from "fs/promises";
 import path from "path";
 import * as config from "./config/index.js";
-import {logm, styleText} from "./logger.js";
+import {logm} from "./logger.js";
 
 /**
  * @typedef {import('./config/types.js').Options} Options
@@ -28,7 +28,7 @@ export async function generateGitignoreRules(lockfile, workingDir, options = {})
     rules.push(`*/**/*.disabled`);
 
     // Find files not hosted on Modrinth
-    for (const [category, entries] of Object.entries(lockfile.dependencies)) {
+    for (const [, entries] of Object.entries(lockfile.dependencies)) {
         for (const entry of entries) {
             if (entry.version === null) {
                 exceptions.push(`!${entry.path}`);
@@ -61,7 +61,7 @@ export async function generateGitignoreRules(lockfile, workingDir, options = {})
     const startMarkerIndex = existingContent.indexOf(config.GITIGNORE_START_MARKER);
     const endMarkerIndex = existingContent.indexOf(config.GITIGNORE_END_MARKER);
 
-    let newContent = "";
+    let newContent;
 
     if (startMarkerIndex !== -1 && endMarkerIndex !== -1 && endMarkerIndex > startMarkerIndex) {
         // Both markers exist, replace content between them

package/src/generate_license.js

@@ -47,7 +47,7 @@ export default async function generateLicense(modpackInfo, workingDir, options =
             await writeLicense(licenseText, workingDir);
         }
         return licenseText;
-    } catch (error) {
+    } catch {
         logm.warn(`Unable to generate license for: ${modpackInfo.license}`);
         return null;
     }

package/src/generate_readme.js

@@ -35,11 +35,11 @@ function generateCategoryReadme(category, entries, projectsMap, usersMap) {
 
     for (const entry of entries) {
         const version = entry.version;
-        let nameCell = "";
-        let authorCell = "";
-        let versionCell = "";
-        let dependenciesCell = "";
-        let dependantsCell = "";
+        let nameCell;
+        let authorCell;
+        let versionCell;
+        let dependenciesCell;
+        let dependantsCell;
 
         if (version && version.project_id) {
             const project = projectsMap[version.project_id];
@@ -162,7 +162,7 @@ export async function generateReadmeFiles(lockfile, workingDir, options = {}) {
     const projectIds = new Set();
     const authorIds = new Set();
 
-    for (const [category, entries] of Object.entries(lockfile.dependencies)) {
+    for (const [, entries] of Object.entries(lockfile.dependencies)) {
         for (const entry of entries) {
             if (entry.version && entry.version.project_id) {
                 projectIds.add(entry.version.project_id);

package/src/github_interactions.js

@@ -35,7 +35,7 @@ export async function getLicenseList(featured = false) {
         }
 
         return licenseSpdxIds;
-    } catch (error) {
+    } catch {
         logm.warn(`Could not fetch license list. Using fallbacks.`);
         const licenses = config.FALLBACK_LICENSES.push(config.ALL_RIGHTS_RESERVED_LICENSE);
         licenses.push(config.OTHER_OPTION);
@@ -71,8 +71,7 @@ export async function getLicenseText(spdxId) {
         } else {
             throw new Error();
         }
-        return null;
-    } catch (error) {
+    } catch {
         logm.warn(`Could not find license text for: ${spdxId}`);
         return null;
     }

package/src/modrinth_interactions.js

@@ -147,9 +147,8 @@ export async function getMinecraftVersions() {
         } else {
             throw new Error();
         }
-        return null;
-    } catch (error) {
-        logm.warn(`Could not fetch Minecraft versions. Using fallbacks.`, error);
+    } catch {
+        logm.warn(`Could not fetch Minecraft versions. Using fallbacks.`);
         return config.FALLBACK_TARGET_MINECRAFT_VERSIONS;
     }
 }
@@ -177,9 +176,8 @@ export async function getModloaders() {
         } else {
             throw new Error();
         }
-        return null;
-    } catch (error) {
-        logm.warn(`Could not fetch Modloaders. Using fallbacks.`, error);
+    } catch {
+        logm.warn(`Could not fetch Modloaders. Using fallbacks.`);
         return config.FALLBACK_MODLOADERS;
     }
 }