@waron97/prbot 2.4.0 → 2.5.0

package/README.md

@@ -118,7 +118,7 @@ Options:
 
 ### `prbot commit`
 
-Interactive commit builder. Prompts for operation type (`[IMP]`, `[FIX]`, etc.), what changed (workflow, module, wizard, symphony process), and a message. If nothing is staged, shows unstaged files and lets you select which to stage first. Previews the final commit message before confirming.
+Interactive commit builder. Prompts for operation type (`[IMP]`, `[FIX]`, etc.), and a message. The destinatin module will be automatically detected. If nothing is staged, shows unstaged files and lets you select which to stage first. Previews the final commit message before confirming.
 
 ```bash
 prbot commit

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@waron97/prbot",
-    "version": "2.4.0",
+    "version": "2.5.0",
     "description": "",
     "main": "index.js",
     "scripts": {

package/src/commands/commit.js

@@ -13,133 +13,182 @@ const commitOperations = [
     },
     { name: `📖 DOC ${chalk.gray('- Documentation changes')}`, value: '[DOC]' },
     { name: `🩹 FIX ${chalk.gray('- Bugfix or hotfix')}`, value: '[FIX]' },
-    { name: `🛠️ IMP ${chalk.gray('- Improvement of existing code')}`, value: '[IMP]' },
+    { name: `🛠️  IMP ${chalk.gray('- Improvement of existing code')}`, value: '[IMP]' },
     { name: `💬 I18N ${chalk.gray('- Translation changes')}`, value: '[I18N]' },
     { name: `📦 MIG ${chalk.gray('- Module migration')}`, value: '[MIG]' },
     { name: `🔄 REF ${chalk.gray('- Code refactoring')}`, value: '[REF]' },
     { name: `🎉 REL ${chalk.gray('- Release commit')}`, value: '[REL]' },
-    { name: `🗑️ REM ${chalk.gray('- Removing unnecessary files')}`, value: '[REM]' },
-    { name: `✏️ REN ${chalk.gray('- Renaming files/variables/models/etc.')}`, value: '[REN]' },
+    { name: `🗑️  REM ${chalk.gray('- Removing unnecessary files')}`, value: '[REM]' },
+    { name: `✏️  REN ${chalk.gray('- Renaming files/variables/models/etc.')}`, value: '[REN]' },
     { name: `🔙 REV ${chalk.gray('- Revert of an existing commit')}`, value: '[REV]' },
     { name: `🧳 SUB ${chalk.gray('- Submodule adding/updating')}`, value: '[SUB]' },
-    { name: `#️⃣ VER ${chalk.gray('- Versioning')}`, value: '[VER]' },
+    { name: `#️⃣  VER ${chalk.gray('- Versioning')}`, value: '[VER]' },
 ];
 
-const commitTypes = [
-    { name: '🔧 Workflow', value: 'workflow' },
-    { name: '📋 Module', value: 'module' },
-    { name: '👤 Wizard', value: 'wizard' },
-    { name: '⚙️  Symphony Process', value: 'symphony' },
-];
+function getModuleFromFile(file) {
+    const parts = file.split('/');
 
-async function commit() {
-    const ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
+    if (parts[0] === 'config') {
+        return parts[1];
+    }
 
-    const unstagedChanges = await execGit(['diff', '--name-only'], ADDONS_PATH);
-    const stagedChanges = await execGit(['diff', '--cached', '--name-only'], ADDONS_PATH);
+    if (parts[0] === '.cloudbuild') {
+        const allIndex = parts.indexOf('all');
 
-    let stageFilesAnswers = [];
+        if (allIndex !== -1) {
+            return parts.slice(0, allIndex + 1).join('/');
+        }
+    }
+
+    return parts[0];
+}
 
-    if (!stagedChanges.trim()) {
+function validateSameModule(files) {
+    const modules = files.map(getModuleFromFile);
+    const currentModule = `[${modules[0]}]`;
+
+    const allSameModule = modules.every((module) => `[${module}]` === currentModule);
+
+    if (!allSameModule) {
+        console.log(chalk.red('Selected files are not of the same module'));
+        return null;
+    }
+
+    return currentModule;
+}
+
+async function getFilesToCommit(stagedChanges, unstagedChanges) {
+    if (stagedChanges.trim()) {
+        console.log(chalk.green('Staged changes:'));
+        console.log(stagedChanges);
+
+        return {
+            filesToCheck: stagedChanges.trim().split('\n'),
+            filesToStage: [],
+        };
+    }
+
+    const unstagedFiles = unstagedChanges.trim().split('\n');
+
+    while (true) {
         console.log(chalk.yellow('No staged changes found.'));
         console.log(chalk.yellow('Unstaged changes:'));
         console.log(unstagedChanges);
 
-        stageFilesAnswers = await inquirer.prompt([
+        const answers = await inquirer.prompt([
             {
                 message: 'Select unstaged files to stage for commit:',
                 type: 'checkbox',
                 name: 'filesToStage',
-                choices: unstagedChanges
-                    .trim()
-                    .split('\n')
-                    .map((file) => file),
+                choices: unstagedFiles,
             },
         ]);
-    } else {
-        console.log(chalk.green('Staged changes:'));
-        console.log(stagedChanges);
+
+        const currentModule = validateSameModule(answers.filesToStage);
+
+        if (currentModule) {
+            return {
+                filesToCheck: answers.filesToStage,
+                filesToStage: answers.filesToStage,
+                currentModule,
+            };
+        }
     }
+}
 
-    const answers = await inquirer.prompt([
-        {
-            type: 'search-list',
-            message: 'Select an operation:',
-            name: 'commitOperation',
-            choices: commitOperations,
-        },
-        {
-            type: 'search-list',
-            message: 'Select what has been changed:',
-            name: 'commitType',
-            choices: commitTypes,
-            when(answers) {
-                return answers.commitOperation !== '[DOC]';
-            },
-        },
-        {
-            type: 'input',
-            message(answers) {
-                return `Please enter the name of the ${answers.commitType}:`;
+async function commit() {
+    const ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
+
+    while (true) {
+        const unstagedChanges = await execGit(['diff', '--name-only'], ADDONS_PATH);
+        const stagedChanges = await execGit(['diff', '--cached', '--name-only'], ADDONS_PATH);
+
+        if (!unstagedChanges.trim() && !stagedChanges.trim()) {
+            console.log(chalk.red('No changes found to commit.'));
+            return;
+        }
+
+        const {
+            filesToCheck,
+            filesToStage,
+            currentModule: selectedModule,
+        } = await getFilesToCommit(stagedChanges, unstagedChanges);
+
+        if (filesToCheck.length === 0) {
+            console.log(chalk.red('No files selected.'));
+            return;
+        }
+
+        let currentModule = selectedModule || validateSameModule(filesToCheck);
+
+        if (!currentModule) {
+            return;
+        }
+
+        const answers = await inquirer.prompt([
+            {
+                type: 'search-list',
+                message: 'Select an operation:',
+                name: 'commitOperation',
+                choices: commitOperations,
             },
-            name: 'commitModule',
-            default: 'config_wf_',
-            when(answers) {
-                return answers.commitType === 'workflow' || answers.commitType === 'module';
+            {
+                type: 'input',
+                message: 'Please enter your message:',
+                name: 'commitMessage',
+                filter: (input) => input.trim(),
+                when(answers) {
+                    return answers.commitOperation !== '[DOC]';
+                },
             },
-            filter(input) {
-                let value = input.trim();
+        ]);
 
-                if (!value.startsWith('[')) {
-                    value = `[${value}`;
-                }
+        if (answers.commitOperation === '[DOC]') {
+            currentModule = '[CHANGELOG]';
+            answers.commitMessage = 'Changelog';
+        }
 
-                if (!value.endsWith(']')) {
-                    value = `${value}]`;
-                }
+        const commitMessage = `${answers.commitOperation}${currentModule} ${answers.commitMessage}`;
 
-                return value;
-            },
-        },
-        {
-            type: 'input',
-            message: 'Please enter your message:',
-            name: 'commitMessage',
-            filter: (input) => input.trim(),
-            when(answers) {
-                return answers.commitOperation !== '[DOC]';
+        const finalPrompt = await inquirer.prompt([
+            {
+                type: 'confirm',
+                message: `${chalk.red(commitMessage)}\nDo you want to proceed with this commit message?`,
+                name: 'confirmCommit',
             },
-        },
-    ]);
+        ]);
 
-    if (answers.commitOperation === '[DOC]') {
-        answers.commitModule = '[CHANGELOG]';
-        answers.commitMessage = 'Changelog';
-    }
+        if (!finalPrompt.confirmCommit) {
+            return;
+        }
 
-    if (answers.commitType === 'wizard') {
-        answers.commitModule = '[.cloudbuild/pb/B2WA/processes/all]';
-    }
+        if (filesToStage.length > 0) {
+            await execGit(['add', ...filesToStage], ADDONS_PATH);
+        }
 
-    if (answers.commitType === 'symphony') {
-        answers.commitModule = '[.cloudbuild/symphony/B2WA/processes/all]';
-    }
+        await execGit(['commit', '-m', commitMessage], ADDONS_PATH);
+        console.log(chalk.green('Commit created successfully!'));
 
-    const commitMessage = `${answers.commitOperation}${answers.commitModule} ${answers.commitMessage}`;
+        const remainingUnstaged = await execGit(['diff', '--name-only'], ADDONS_PATH);
+        const remainingStaged = await execGit(['diff', '--cached', '--name-only'], ADDONS_PATH);
 
-    const finalPrompt = await inquirer.prompt([
-        {
-            type: 'confirm',
-            message: `${chalk.red(commitMessage)}\nDo you want to proceed with this commit message?`,
-            name: 'confirmCommit',
-        },
-    ]);
+        if (!remainingUnstaged.trim() && !remainingStaged.trim()) {
+            console.log(chalk.green('No more changes to commit.'));
+            break;
+        }
 
-    if (finalPrompt.confirmCommit) {
-        if (stageFilesAnswers.filesToStage && stageFilesAnswers.filesToStage.length > 0) {
-            await execGit(['add', ...stageFilesAnswers.filesToStage], ADDONS_PATH);
+        const { continueCommit } = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'continueCommit',
+                message: 'Do you want to create another commit?',
+                default: true,
+            },
+        ]);
+
+        if (!continueCommit) {
+            break;
         }
-        await execGit(['commit', '-m', commitMessage], ADDONS_PATH);
     }
 }