Merge pull request #18 from djrasmusp/feature/command-files-list

Feature/command files list

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "Committy",
+  "name": "committy",
   "version": "1.0.0",
   "main": "src/index.js",
   "type": "module",
@@ -17,6 +17,7 @@
     "@inquirer/prompts": "^7.2.4",
     "commander": "^13.1.0",
     "consola": "^3.4.0",
+    "inquirer-select-pro": "^1.0.0-alpha.9",
     "simple-git": "^3.27.0"
   }
 }

src/commands/createBranch.js

@@ -1,8 +1,7 @@
 import {input, select} from '@inquirer/prompts';
 import {COMMIT_TYPES} from '../utils/constants.js'
 import {newBranch} from "../utils/gitUtils.js";
-import {kebabCase} from "../utils/utils.js";
-import {consola} from "consola";
+import {errorHandling, kebabCase} from "../utils/utils.js";
 
 export async function createBranch() {
     try {
@@ -31,11 +30,6 @@ export async function createBranch() {
 
         await newBranch(name)
     } catch (error) {
-        if (error instanceof Error && error.name === 'ExitPromptError') {
-            console.log('👋 until next time!');
-            return
-        }
-
-        consola.error(error);
+        errorHandling(error)
     }
 }

src/commands/createCommit.js

@@ -1,13 +1,24 @@
 import {editor, input, select} from '@inquirer/prompts';
 import {COMMIT_TYPES, ENVIROMENTS} from '../utils/constants.js'
-import {appendFiles, commitMessage, getDefaults} from "../utils/gitUtils.js";
-import {consola} from "consola";
+import {select as multiselect} from 'inquirer-select-pro';
+import {appendFiles, commitMessage, getDefaults, listOfFiles} from "../utils/gitUtils.js";
+import {errorHandling} from "../utils/utils.js";
 
-export async function createCommit() {
+export async function createCommit(allFilesSelected) {
     try {
         const {scope, id} = await getDefaults()
+        let selectedFiles = ['.']
 
-        appendFiles()
+        if (!allFilesSelected) {
+            const files = await listOfFiles()
+
+            selectedFiles = await multiselect({
+                multiple: true,
+                message: 'Select files',
+                options: files,
+                validate: (options) => options.length > 0
+            })
+        }
 
         const answers = {
             scope: await select({
@@ -50,6 +61,8 @@ export async function createCommit() {
             })
         }
 
+        await appendFiles(selectedFiles)
+
         let message = `${answers.scope}(${answers.id}): ${answers.title}`
 
         if (answers.message) {
@@ -67,11 +80,6 @@ ENV: ${answers.environment}`
         await commitMessage(message)
 
     } catch (error) {
-        if (error instanceof Error && error.name === 'ExitPromptError') {
-            console.log('👋 until next time!');
-            return
-        }
-
-        consola.error(error);
+        errorHandling(error)
     }
 }

src/commands/restoreFiles.js

@@ -0,0 +1,27 @@
+import {gitRestoreFiles, listOfFiles} from "../utils/gitUtils.js";
+import {select as multiselect} from 'inquirer-select-pro';
+import {errorHandling} from "../utils/utils.js";
+
+
+export async function restoreFiles(allFilesSelected) {
+    try {
+
+        let selectedFiles = ['.']
+
+        if (!allFilesSelected) {
+            const files = await listOfFiles()
+
+            selectedFiles = await multiselect({
+                multiple: true,
+                message: 'Select files',
+                options: files,
+                validate: (options) => options.length > 0
+            })
+        }
+
+
+        await gitRestoreFiles(selectedFiles)
+    } catch (error) {
+        errorHandling(error)
+    }
+}