spectrum-cli 1.1.0 → 1.2.0

package/src/changelog.js

@@ -3,9 +3,42 @@ const fs = require('fs');
 const path = require('path');
 const readline = require('readline');
 const { logSuccess, logError, execCommand, execSilent, getVersion, getCurrentBranch, colors } = require('./utils');
+const { runCommand } = require('./command-executor');
+const { requireGitRepo, requireFileExists, requirePrettierAvailable, requireChangelogFormatted } = require('./preflight');
+
+function getPrettierRunner() {
+    const npxVersion = execSilent('npx --yes prettier --version');
+    if (npxVersion) return 'npx --yes prettier';
+    const directVersion = execSilent('prettier --version');
+    if (directVersion) return 'prettier';
+    return null;
+}
+
+function ensurePrettierAvailable() {
+    const runner = getPrettierRunner();
+    if (!runner) {
+        logError('❌', 'Prettier недоступен. Установите его или используйте npx.');
+        return null;
+    }
+    return runner;
+}
+
+function checkChangelogWithPrettier() {
+    const runner = ensurePrettierAvailable();
+    if (!runner) return false;
+    const ok = execCommand(`${runner} --check CHANGELOG.md`);
+    if (!ok) {
+        logError('❌', 'Файл CHANGELOG.md не прошел проверку Prettier. Исправьте форматирование перед продолжением.');
+        return false;
+    }
+    return true;
+}
 
 function changelogChangeHeader() {
     try {
+        if (!checkChangelogWithPrettier()) {
+            return false;
+        }
         const currentVersion = getVersion();
         if (!currentVersion) {
             return false;
@@ -18,7 +51,7 @@ function changelogChangeHeader() {
         );
 
         fs.writeFileSync('CHANGELOG.md', updatedChangelog);
-        logSuccess('🔄', `Update header ${colors.green}🚀 [${currentVersion}]${colors.reset}.`);
+        logSuccess('🔄', 'Заголовок обновлен до 🚀 [%s].', currentVersion);
         return true;
     } catch (error) {
         return false;
@@ -27,11 +60,14 @@ function changelogChangeHeader() {
 
 function changelogRemoveEmptyChapters() {
     try {
+        if (!checkChangelogWithPrettier()) {
+            return false;
+        }
         const data = fs.readFileSync('CHANGELOG.md', 'utf8');
         const updatedData = data.replaceAll(/###.*\n\n_.*_\n\n/gm, '');
         fs.writeFileSync('CHANGELOG.md', updatedData);
 
-        logSuccess('🧹', 'Remove empty chapters.');
+        logSuccess('🧹', 'Пустые разделы удалены.');
         return true;
     } catch (error) {
         return false;
@@ -40,6 +76,9 @@ function changelogRemoveEmptyChapters() {
 
 function changelogAddUnreleasedBlock() {
     try {
+        if (!checkChangelogWithPrettier()) {
+            return false;
+        }
         const currentVersion = getVersion();
         if (!currentVersion) {
             return false;
@@ -54,7 +93,7 @@ function changelogAddUnreleasedBlock() {
         );
 
         fs.writeFileSync('CHANGELOG.md', updatedChangelog);
-        logSuccess('📋', 'Add unreleased block.');
+        logSuccess('📋', 'Блок unreleased добавлен.');
         return true;
     } catch (error) {
         return false;
@@ -62,11 +101,11 @@ function changelogAddUnreleasedBlock() {
 }
 
 function changelogCommit() {
-    const addSuccess = execCommand('git add CHANGELOG.md', null, null);
-    const commitSuccess = execCommand('git commit --message "📝 Update changelog." --no-verify', null, null);
+    const addSuccess = execCommand('git add CHANGELOG.md');
+    const commitSuccess = execCommand('git commit --message "📝 Обновить changelog." --no-verify');
 
     if (addSuccess && commitSuccess) {
-        logSuccess('📝', 'Commit updated changelog.');
+        logSuccess('📝', 'Коммит с обновленным changelog создан.');
         return true;
     }
     return false;
@@ -92,16 +131,16 @@ function askQuestion(question) {
 async function extractTaskFromBranch() {
     const currentBranch = getCurrentBranch();
     if (!currentBranch) {
-        logError('❌', 'Cannot get current branch name.');
+        logError('❌', 'Не удалось получить имя текущей ветки.');
         return null;
     }
     
     const taskMatch = currentBranch.match(/([a-zA-Z]+-[0-9]+)/);
     if (!taskMatch) {
-        console.log(`⚠️  ${colors.yellow}Branch name "${currentBranch}" does not contain task number in format [a-zA-Z]+-[0-9]+.${colors.reset}`);
-        const task = await askQuestion('📝 Please enter task number (e.g. SPEC-123): ');
+        console.log(`⚠️  ${colors.yellow}Имя ветки "${currentBranch}" не содержит номер задачи в формате [a-zA-Z]+-[0-9]+.${colors.reset}`);
+        const task = await askQuestion('📝 Введите номер задачи (например, SPEC-123): ');
         if (!task || !task.match(/^[a-zA-Z]+-[0-9]+$/)) {
-            logError('❌', 'Invalid task format. Expected format: [a-zA-Z]+-[0-9]+');
+            logError('❌', 'Неверный формат задачи. Ожидается формат: [a-zA-Z]+-[0-9]+');
             return null;
         }
         return task;
@@ -115,24 +154,24 @@ async function getGitUser() {
     let email = execSilent('git config user.email');
     
     if (!name || !email) {
-        console.log(`⚠️  ${colors.yellow}Git user name and email are not configured.${colors.reset}`);
-        console.log(`💡 You can configure them using:`);
-        console.log(`   git config user.name "Your Name"`);
+        console.log(`⚠️  ${colors.yellow}Имя и email пользователя git не настроены.${colors.reset}`);
+        console.log(`💡 Их можно настроить так:`);
+        console.log(`   git config user.name "Ваше Имя"`);
         console.log(`   git config user.email "your.email@domain.com"`);
         console.log('');
         
         if (!name) {
-            name = await askQuestion('👤 Please enter your name: ');
+            name = await askQuestion('👤 Введите ваше имя: ');
             if (!name) {
-                logError('❌', 'Name is required.');
+                logError('❌', 'Имя обязательно.');
                 return null;
             }
         }
         
         if (!email) {
-            email = await askQuestion('📧 Please enter your email: ');
+            email = await askQuestion('📧 Введите ваш email: ');
             if (!email || !email.includes('@')) {
-                logError('❌', 'Valid email is required.');
+                logError('❌', 'Требуется корректный email.');
                 return null;
             }
         }
@@ -187,16 +226,16 @@ async function selectSection(availableSections) {
         return availableSections[0];
     }
     
-    console.log(`\n📋 Please select a section:`);
+    console.log(`\n📋 Выберите раздел:`);
     availableSections.forEach((section, index) => {
         console.log(`   ${index + 1}. ${section}`);
     });
     
-    const choice = await askQuestion('\n🔢 Enter section number: ');
+    const choice = await askQuestion('\n🔢 Введите номер раздела: ');
     const choiceNum = parseInt(choice);
     
     if (isNaN(choiceNum) || choiceNum < 1 || choiceNum > availableSections.length) {
-        logError('❌', 'Invalid choice.');
+        logError('❌', 'Неверный выбор.');
         return null;
     }
     
@@ -204,7 +243,7 @@ async function selectSection(availableSections) {
 }
 
 function displayContext(lines, insertIndex, entry) {
-    console.log('\n📝 Changelog updated:');
+    console.log('\n📝 Changelog обновлен:');
     
     if (insertIndex > 0) {
         console.log(`   ${colors.reset}${lines[insertIndex - 1]}${colors.reset}`);
@@ -219,23 +258,44 @@ function displayContext(lines, insertIndex, entry) {
 }
 
 async function changelogAppend(message) {
+    return runCommand({
+        name: 'changelog append',
+        checks: [
+            { name: 'git-repo', run: requireGitRepo },
+            { name: 'changelog-exists', run: () => requireFileExists('CHANGELOG.md') },
+            { name: 'prettier-available', run: requirePrettierAvailable },
+            { name: 'changelog-prettier-check', run: requireChangelogFormatted },
+            {
+                name: 'prepare-entry',
+                run: async () => prepareChangelogEntry(message)
+            }
+        ],
+        steps: [
+            {
+                name: 'append-entry',
+                run: (ctx) => appendPreparedChangelogEntry(ctx)
+            }
+        ]
+    });
+}
+
+async function prepareChangelogEntry(message) {
     try {
         const task = await extractTaskFromBranch();
-        if (!task) return false;
-        
+        if (!task) return { ok: false, reason: 'Не удалось определить ID задачи.' };
+
         const user = await getGitUser();
-        if (!user) return false;
-        
+        if (!user) return { ok: false, reason: 'Не удалось определить пользователя git.' };
+
         const formattedMessage = formatMessage(message);
         const entry = `- ${task} ${formattedMessage} ${user}`;
-        
         const availableSections = detectSectionFromBranch();
         const selectedSection = await selectSection(availableSections);
-        if (!selectedSection) return false;
-        
+        if (!selectedSection) return { ok: false, reason: 'Не удалось выбрать раздел.' };
+
         const changelog = fs.readFileSync('CHANGELOG.md', 'utf8');
         const lines = changelog.split('\n');
-        
+
         let sectionIndex = -1;
         for (let i = 0; i < lines.length; i++) {
             if (lines[i] === selectedSection) {
@@ -243,27 +303,47 @@ async function changelogAppend(message) {
                 break;
             }
         }
-        
+
         if (sectionIndex === -1) {
-            logError('❌', `Cannot find "${selectedSection}" section in CHANGELOG.md.`);
+            return { ok: false, reason: `Не удалось найти раздел "${selectedSection}" в CHANGELOG.md.` };
+        }
+
+        return {
+            ok: true,
+            data: {
+                appendState: {
+                    entry,
+                    selectedSection,
+                    lines,
+                    sectionIndex
+                }
+            }
+        };
+    } catch (error) {
+        return { ok: false, reason: `Ошибка при подготовке записи changelog: ${error.message}` };
+    }
+}
+
+function appendPreparedChangelogEntry(context) {
+    try {
+        const appendState = context.appendState;
+        if (!appendState) {
             return false;
         }
-        
-        let insertIndex = sectionIndex + 2;
+
+        const lines = [...appendState.lines];
+        const selectedSection = appendState.selectedSection;
+        const entry = appendState.entry;
+        let insertIndex = appendState.sectionIndex + 2;
         let defaultTextLines = 0;
-        
-        // Count and remember default text lines to remove them
-        while (insertIndex + defaultTextLines < lines.length && 
-               lines[insertIndex + defaultTextLines].startsWith('_')) {
+
+        while (insertIndex + defaultTextLines < lines.length && lines[insertIndex + defaultTextLines].startsWith('_')) {
             defaultTextLines++;
         }
-        
-        // Insert the new entry
+
         lines.splice(insertIndex, 0, entry);
-        
-        // Remove default text lines if this is the first real entry in the section
+
         if (defaultTextLines > 0) {
-            // Check if there are any non-default entries after our insertion
             let hasOtherEntries = false;
             for (let i = insertIndex + 1; i < insertIndex + 1 + defaultTextLines; i++) {
                 if (lines[i] && lines[i].startsWith('- ')) {
@@ -271,21 +351,18 @@ async function changelogAppend(message) {
                     break;
                 }
             }
-            
-            // If no other entries, remove default text
+
             if (!hasOtherEntries) {
                 lines.splice(insertIndex + 1, defaultTextLines);
             }
         }
-        
-        const updatedChangelog = lines.join('\n');
-        fs.writeFileSync('CHANGELOG.md', updatedChangelog);
-        
+
+        fs.writeFileSync('CHANGELOG.md', lines.join('\n'));
         displayContext(lines, insertIndex, entry);
-        logSuccess('✅', `Entry added to ${selectedSection}`);
+        logSuccess('✅', 'Запись добавлена в %s', selectedSection);
         return true;
     } catch (error) {
-        logError('❌', `Error adding changelog entry: ${error.message}`);
+        logError('❌', 'Ошибка при добавлении записи changelog: %s', error.message);
         return false;
     }
 }
@@ -301,5 +378,7 @@ module.exports = {
     getGitUser,
     formatMessage,
     detectSectionFromBranch,
-    selectSection
+    selectSection,
+    prepareChangelogEntry,
+    appendPreparedChangelogEntry
 };