modpack-lock 0.3.0 → 0.3.1

package/package.json

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

@@ -112,10 +112,11 @@ modpackLock.command('init')
                 process.exitCode = 1;
                 return;
             } else {
+                const name = options.name || path.basename(currDir);
                 const modpackInfo = {
-                    name: options.name || path.basename(currDir),
+                    name: name,
                     version: options.version || '1.0.0',
-                    id: slugify(options.id || options.name || path.basename(currDir), config.SLUGIFY_OPTIONS),
+                    id: slugify(options.id || name, config.SLUGIFY_OPTIONS),
                     description: options.description || '',
                     author: options.author,
                     projectUrl: options.projectUrl || '',

package/src/modpack_info.js

@@ -24,16 +24,16 @@ 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');
         },
+    });
+    let answers = await prompts([
         {
             type: 'text',
             name: 'version',
@@ -48,7 +48,7 @@ export default async function promptUserForInfo(defaults = {}) {
             type: 'text',
             name: 'id',
             message: 'Modpack slug/ID',
-            initial: slugify(defaults.id || defaults.name, config.SLUGIFY_OPTIONS),
+            initial: slugify(defaults.id || name.name, config.SLUGIFY_OPTIONS),
             validate: (value) => {
                 return validateNotEmpty(value, 'ID');
             },
@@ -126,9 +126,11 @@ export default async function promptUserForInfo(defaults = {}) {
             },
         }
     ]);
-    if (Object.keys(answers).length < 11) {
+
+    let modpackInfo = {...name, ...answers};
+    if (Object.keys(modpackInfo).length < 11) {
         console.warn('Modpack initialization was interrupted');
         process.exit(1);
     }
-    return answers;
+    return modpackInfo;
 }