modpack-lock 0.3.0 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modpack-lock",
-  "version": "0.3.0",
+  "version": "0.3.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"

package/src/cli.js

@@ -4,7 +4,6 @@ import { Command } from 'commander';
 import path from 'path';
 import slugify from 'slugify';
 import {generateLockfile} from './generate_lockfile.js';
-import generateJson from './generate_json.js';
 import { generateModpackFiles } from './modpack-lock.js';
 import promptUserForInfo from './modpack_info.js';
 import { getModpackInfo } from './directory_scanning.js';
@@ -43,6 +42,17 @@ function restoreConsole() {
     console.error = originalLogs.error;
 }
 
+/**
+ * Merge modpack info with priority: options > existingInfo > defaults
+ */
+function mergeModpackInfo(existingInfo, options, defaults) {
+    const result = {};
+    for (const [key, defaultValue] of Object.entries(defaults)) {
+        result[key] = options[key] || existingInfo?.[key] || defaultValue;
+    }
+    return result;
+}
+
 modpackLock
     .name(pkg.name)
     .description(pkg.description)
@@ -105,6 +115,8 @@ modpackLock.command('init')
     .action(async (options) => {
         const currDir = options.folder || process.cwd();
 
+        let existingInfo = await getModpackInfo(currDir);
+
         if (options.noninteractive) {
             quietConsole();
             if (!options.author || !options.modloader || !options.targetMinecraftVersion) {
@@ -112,19 +124,23 @@ modpackLock.command('init')
                 process.exitCode = 1;
                 return;
             } else {
-                const modpackInfo = {
-                    name: options.name || path.basename(currDir),
-                    version: options.version || '1.0.0',
-                    id: slugify(options.id || options.name || path.basename(currDir), config.SLUGIFY_OPTIONS),
-                    description: options.description || '',
-                    author: options.author,
-                    projectUrl: options.projectUrl || '',
-                    sourceUrl: options.sourceUrl || '',
-                    license: options.license || '',
-                    modloader: options.modloader,
-                    targetModloaderVersion: options.targetModloaderVersion || '',
-                    targetMinecraftVersion: options.targetMinecraftVersion,
+                const defaultName = path.basename(currDir);
+                const defaults = {
+                    name: defaultName,
+                    version: config.DEFAULT_MODPACK_VERSION,
+                    id: defaultName,
+                    description: '',
+                    author: options.author, // Required, no default
+                    projectUrl: '',
+                    sourceUrl: '',
+                    license: '',
+                    modloader: options.modloader, // Required, no default
+                    targetModloaderVersion: '',
+                    targetMinecraftVersion: options.targetMinecraftVersion, // Required, no default
                 };
+
+                const modpackInfo = mergeModpackInfo(existingInfo, options, defaults);
+                modpackInfo.id = slugify(modpackInfo.id, config.SLUGIFY_OPTIONS);
                 try {
                     await generateModpackFiles(modpackInfo, currDir, { dryRun: false });
                 } catch (error) {
@@ -137,19 +153,23 @@ modpackLock.command('init')
             console.log("\nSee `modpack-lock init --help` for definitive documentation on these fields and exactly what they do.\n");
             console.log("Press ^C at any time to quit.\n");
             try {
-                const modpackInfo = await promptUserForInfo({
-                    name: options.name || path.basename(currDir),
-                    version: options.version,
-                    id: options.id,
-                    description: options.description,
-                    author: options.author,
-                    projectUrl: options.projectUrl,
-                    sourceUrl: options.sourceUrl,
-                    license: options.license,
-                    modloader: options.modloader,
-                    targetModloaderVersion: options.targetModloaderVersion,
-                    targetMinecraftVersion: options.targetMinecraftVersion,
-                });
+                const defaults = {
+                    name: path.basename(currDir),
+                    version: config.DEFAULT_MODPACK_VERSION,
+                    id: undefined,
+                    description: undefined,
+                    author: undefined,
+                    projectUrl: undefined,
+                    sourceUrl: undefined,
+                    license: config.DEFAULT_MODPACK_LICENSE,
+                    modloader: undefined,
+                    targetModloaderVersion: undefined,
+                    targetMinecraftVersion: undefined,
+                };
+
+                const modpackInfo = await promptUserForInfo(
+                    mergeModpackInfo(existingInfo, options, defaults)
+                );
 
                 await generateModpackFiles(modpackInfo, currDir, { dryRun: false });
             } catch (error) {

package/src/config/defaults.js

@@ -0,0 +1,8 @@
+export const DEFAULT_MODPACK_VERSION = '1.0.0';
+export const DEFAULT_MODPACK_LICENSE = 'MIT';
+export const DEFAULT_PROJECT_URL = (id) => {
+    return `https://modrinth.com/modpack/${id}`;
+};
+export const DEFAULT_SOURCE_URL = (id, author) => {
+    return `https://github.com/${author}/${id}`;
+};

package/src/config/index.js

@@ -2,3 +2,4 @@ export * from './constants.js';
 export * from './api.js';
 export * from './files.js';
 export * from './options.js';
+export * from './defaults.js';

package/src/modpack_info.js

@@ -24,73 +24,72 @@ function validateNotEmpty(value, field) {
  * @returns {Promise<ModpackInfo>} The modpack information from the user
  */
 export default async function promptUserForInfo(defaults = {}) {
-    let answers = await prompts([
-        {
-            type: 'text',
-            name: 'name',
-            message: 'Modpack name',
-            initial: defaults.name,
-            validate: (value) => {
-                return validateNotEmpty(value, 'Name');
-            },
+    let name = await prompts({
+        type: 'text',
+        name: 'name',
+        message: 'Modpack name',
+        initial: defaults.name,
+        validate: (value) => {
+            return validateNotEmpty(value, 'Name');
         },
-        {
-            type: 'text',
-            name: 'version',
-            message: 'Modpack version',
-            initial: defaults.version || '1.0.0',
-            validate: (value) => {
-                return validateNotEmpty(value, 'Version');
-            },
+    });
+    let version = await prompts({
+        type: 'text',
+        name: 'version',
+        message: 'Modpack version',
+        initial: defaults.version || config.DEFAULT_MODPACK_VERSION,
+        validate: (value) => {
+            return validateNotEmpty(value, 'Version');
         },
-
-        {
-            type: 'text',
-            name: 'id',
-            message: 'Modpack slug/ID',
-            initial: slugify(defaults.id || defaults.name, config.SLUGIFY_OPTIONS),
-            validate: (value) => {
-                return validateNotEmpty(value, 'ID');
-            },
+    });
+    let id = await prompts({
+        type: 'text',
+        name: 'id',
+        message: 'Modpack slug/ID',
+        initial: slugify(defaults.id || name.name, config.SLUGIFY_OPTIONS),
+        validate: (value) => {
+            return validateNotEmpty(value, 'ID');
         },
-        {
-            type: 'text',
-            name: 'description',
-            message: 'Modpack description',
-            initial: defaults.description || undefined,
-        },
-        {
-            type: 'text',
-            name: 'author',
-            message: 'Modpack author',
-            initial: defaults.author || undefined,
-            validate: (value) => {
-                return validateNotEmpty(value, 'Author');
-            },
+    });
+    let description = await prompts({
+        type: 'text',
+        name: 'description',
+        message: 'Modpack description',
+        initial: defaults.description,
+    });
+    let author = await prompts({
+        type: 'text',
+        name: 'author',
+        message: 'Modpack author',
+        initial: defaults.author,
+        validate: (value) => {
+            return validateNotEmpty(value, 'Author');
         },
+    });
+    let answers = await prompts([
         {
             type: 'text',
             name: 'projectUrl',
             message: 'Modpack URL',
-            initial: defaults.projectUrl || undefined,
+            initial: defaults.projectUrl || config.DEFAULT_PROJECT_URL(id.id),
         },
         {
             type: 'text',
             name: 'sourceUrl',
             message: 'Modpack source code URL',
-            initial: defaults.sourceUrl || undefined,
+            initial: defaults.sourceUrl || config.DEFAULT_SOURCE_URL(id.id, author.author),
         },
         {
             type: 'text',
             name: 'license',
             message: 'Modpack license',
-            initial: defaults.license || undefined,
+            initial: defaults.license || config.DEFAULT_MODPACK_LICENSE,
         },
         {
             type: 'autocomplete',
             name: 'modloader',
             message: 'Modpack modloader',
-            initial: defaults.modloader || undefined,
+            initial: defaults.modloader,
             choices: [
                 { title: 'fabric' },
                 { title: 'forge' },
@@ -114,21 +113,23 @@ export default async function promptUserForInfo(defaults = {}) {
             type: 'text',
             name: 'targetModloaderVersion',
             message: 'Target modloader version',
-            initial: defaults.targetModloaderVersion || undefined,
+            initial: defaults.targetModloaderVersion,
         },
         {
             type: 'text',
             name: 'targetMinecraftVersion',
             message: 'Target Minecraft version',
-            initial: defaults.targetMinecraftVersion || undefined,
+            initial: defaults.targetMinecraftVersion,
             validate: (value) => {
                 return validateNotEmpty(value, 'Minecraft Version');
             },
         }
     ]);
-    if (Object.keys(answers).length < 11) {
+
+    let modpackInfo = {...name, ...version, ...id, ...description, ...author, ...answers};
+    if (Object.keys(modpackInfo).length < 11) {
         console.warn('Modpack initialization was interrupted');
         process.exit(1);
     }
-    return answers;
+    return modpackInfo;
 }