@harryisfish/gitt 1.5.0 → 1.6.2

package/dist/utils/config.js

@@ -39,7 +39,50 @@ exports.writeConfigFile = writeConfigFile;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const simple_git_1 = require("simple-git");
+const minimatch_1 = require("minimatch");
 const CONFIG_FILE_NAME = '.gitt';
+/**
+ * Validate configuration values.
+ */
+function validateConfig(config) {
+    const validated = {};
+    // Validate mainBranch
+    if (config.mainBranch !== undefined) {
+        if (typeof config.mainBranch !== 'string' || config.mainBranch.trim() === '') {
+            throw new Error('Invalid config: mainBranch must be a non-empty string');
+        }
+        validated.mainBranch = config.mainBranch.trim();
+    }
+    // Validate ignoreBranches
+    if (config.ignoreBranches !== undefined) {
+        if (!Array.isArray(config.ignoreBranches)) {
+            throw new Error('Invalid config: ignoreBranches must be an array');
+        }
+        const validPatterns = [];
+        for (const pattern of config.ignoreBranches) {
+            if (typeof pattern !== 'string' || pattern.trim() === '') {
+                throw new Error('Invalid config: ignoreBranches must contain non-empty strings');
+            }
+            // Test if it's a valid glob pattern by trying to use it
+            try {
+                (0, minimatch_1.minimatch)('test', pattern);
+                validPatterns.push(pattern);
+            }
+            catch (e) {
+                throw new Error(`Invalid config: "${pattern}" is not a valid glob pattern`);
+            }
+        }
+        validated.ignoreBranches = validPatterns;
+    }
+    // Validate staleDays
+    if (config.staleDays !== undefined) {
+        if (typeof config.staleDays !== 'number' || config.staleDays < 1 || config.staleDays > 365 || !Number.isInteger(config.staleDays)) {
+            throw new Error('Invalid config: staleDays must be an integer between 1 and 365');
+        }
+        validated.staleDays = config.staleDays;
+    }
+    return validated;
+}
 /**
  * Get the project root directory (where .git is located).
  */
@@ -64,9 +107,15 @@ async function readConfigFile() {
             return {};
         }
         const content = fs.readFileSync(configPath, 'utf-8');
-        return JSON.parse(content);
+        const parsedConfig = JSON.parse(content);
+        return validateConfig(parsedConfig);
     }
     catch (error) {
+        // If validation fails, throw the error instead of returning empty config
+        if (error instanceof Error && error.message.startsWith('Invalid config:')) {
+            throw error;
+        }
+        // For other errors (file read, JSON parse), return empty config
         return {};
     }
 }
@@ -74,10 +123,12 @@ async function readConfigFile() {
  * Write to the .gitt configuration file.
  */
 async function writeConfigFile(config) {
+    // Validate new config before writing
+    const validatedConfig = validateConfig(config);
     const root = await getProjectRoot();
     const configPath = path.join(root, CONFIG_FILE_NAME);
     // Read existing config to merge
     const currentConfig = await readConfigFile();
-    const newConfig = { ...currentConfig, ...config };
+    const newConfig = { ...currentConfig, ...validatedConfig };
     fs.writeFileSync(configPath, JSON.stringify(newConfig, null, 2));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harryisfish/gitt",
-  "version": "1.5.0",
+  "version": "1.6.2",
   "description": "A command-line tool to help you manage Git repositories and remote repositories, such as keeping in sync, pushing, pulling, etc.",
   "main": "dist/index.js",
   "bin": {
@@ -10,6 +10,9 @@
     "build": "tsc",
     "start": "tsx src/index.ts",
     "dev": "tsx watch src/index.ts",
+    "test": "vitest",
+    "test:ui": "vitest --ui",
+    "test:coverage": "vitest --coverage",
     "prepare": "pnpm run build",
     "dev:link": "pnpm build && pnpm link --global",
     "dev:unlink": "pnpm unlink --global"
@@ -32,14 +35,18 @@
   "homepage": "https://github.com/harryisfish/gitt#readme",
   "devDependencies": {
     "@types/node": "^20.11.24",
+    "@vitest/ui": "^4.0.14",
     "ts-node": "^10.9.2",
     "tsx": "^4.7.1",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "vitest": "^4.0.14"
   },
   "dependencies": {
     "@inquirer/prompts": "^3.3.0",
     "@types/minimatch": "^6.0.0",
     "@types/update-notifier": "^6.0.8",
+    "chalk": "4",
+    "commander": "^14.0.2",
     "listr2": "^8.0.0",
     "minimatch": "^10.1.1",
     "simple-git": "^3.22.0",

package/dist/commands/rebase.js

@@ -1,137 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.interactiveRebase = interactiveRebase;
-const prompts_1 = require("@inquirer/prompts");
-const simple_git_1 = require("simple-git");
-const errors_1 = require("../errors");
-const git = (0, simple_git_1.simpleGit)();
-async function interactiveRebase() {
-    try {
-        // 获取当前分支最近的提交记录
-        const commits = await getRecentCommits();
-        // 选择要变基的提交范围
-        const targetCommit = await selectCommitRange(commits);
-        if (!targetCommit)
-            return;
-        // 选择变基操作类型
-        const action = await selectRebaseAction();
-        // 根据不同的操作类型执行相应的变基操作
-        switch (action) {
-            case 'squash':
-                await handleSquashRebase(targetCommit);
-                break;
-            case 'reword':
-                await handleRewordRebase(targetCommit);
-                break;
-            case 'drop':
-                await handleDropRebase(targetCommit);
-                break;
-            case 'reorder':
-                await handleReorderRebase(targetCommit);
-                break;
-        }
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            throw new errors_1.GitError(`变基操作失败: ${error.message}`);
-        }
-        throw error;
-    }
-}
-// 获取最近的提交记录
-async function getRecentCommits(count = 10) {
-    const log = await git.log(['--max-count=' + count]);
-    return log.all.map(commit => ({
-        hash: commit.hash,
-        message: commit.message,
-        date: commit.date,
-        author: commit.author_name
-    }));
-}
-// 选择要变基的提交范围
-async function selectCommitRange(commits) {
-    const choices = commits.map(commit => ({
-        name: `${commit.hash.substring(0, 7)} - ${commit.date.split('T')[0]} - ${commit.message}`,
-        value: commit.hash
-    }));
-    const targetCommit = await (0, prompts_1.select)({
-        message: '请选择要变基到的提交（此提交之后的所有提交都将被包含在变基操作中）：',
-        choices: [
-            ...choices,
-            { name: '取消', value: null }
-        ]
-    });
-    return targetCommit;
-}
-// 选择变基操作类型
-async function selectRebaseAction() {
-    return await (0, prompts_1.select)({
-        message: '请选择要执行的变基操作：',
-        choices: [
-            {
-                name: '合并多个提交 (squash)',
-                value: 'squash',
-                description: '将多个提交合并为一个提交'
-            },
-            {
-                name: '修改提交信息 (reword)',
-                value: 'reword',
-                description: '修改某个提交的提交信息'
-            },
-            {
-                name: '删除提交 (drop)',
-                value: 'drop',
-                description: '删除某个提交'
-            },
-            {
-                name: '调整提交顺序 (reorder)',
-                value: 'reorder',
-                description: '改变提交的顺序'
-            }
-        ]
-    });
-}
-// 处理压缩提交的变基操作
-async function handleSquashRebase(targetCommit) {
-    const confirmed = await (0, prompts_1.confirm)({
-        message: '此操作将打开编辑器进行交互式变基，是否继续？',
-        default: true
-    });
-    if (!confirmed)
-        return;
-    // 执行交互式变基
-    await git.raw(['rebase', '-i', `${targetCommit}~1`]);
-    (0, errors_1.printSuccess)('变基操作已完成，请检查提交历史');
-}
-// 处理修改提交信息的变基操作
-async function handleRewordRebase(targetCommit) {
-    const newMessage = await (0, prompts_1.input)({
-        message: '请输入新的提交信息：'
-    });
-    if (!newMessage)
-        return;
-    await git.raw(['rebase', '-i', `${targetCommit}~1`]);
-    (0, errors_1.printSuccess)('提交信息已更新，请检查提交历史');
-}
-// 处理删除提交的变基操作
-async function handleDropRebase(targetCommit) {
-    const confirmed = await (0, prompts_1.confirm)({
-        message: '⚠️ 删除提交是一个危险操作，确定要继续吗？',
-        default: false
-    });
-    if (!confirmed)
-        return;
-    await git.raw(['rebase', '-i', `${targetCommit}~1`]);
-    (0, errors_1.printSuccess)('提交已删除，请检查提交历史');
-}
-// 处理调整提交顺序的变基操作
-async function handleReorderRebase(targetCommit) {
-    const confirmed = await (0, prompts_1.confirm)({
-        message: '此操作将打开编辑器让您调整提交顺序，是否继续？',
-        default: true
-    });
-    if (!confirmed)
-        return;
-    await git.raw(['rebase', '-i', `${targetCommit}~1`]);
-    (0, errors_1.printSuccess)('提交顺序已调整，请检查提交历史');
-}

package/dist/commands/stash.js

@@ -1,217 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.advancedStash = advancedStash;
-const prompts_1 = require("@inquirer/prompts");
-const simple_git_1 = require("simple-git");
-const errors_1 = require("../errors");
-const git = (0, simple_git_1.simpleGit)();
-/**
- * Advanced stash management functionality
- * @description Provides interactive interface for managing git stashes
- * @throws {GitError} When stash operation fails
- */
-async function advancedStash() {
-    try {
-        const action = await (0, prompts_1.select)({
-            message: '请选择储藏操作：',
-            choices: [
-                {
-                    name: '创建新储藏',
-                    value: 'create',
-                    description: '储藏当前的修改'
-                },
-                {
-                    name: '储藏部分文件',
-                    value: 'partial',
-                    description: '选择性储藏部分文件的修改'
-                },
-                {
-                    name: '管理储藏列表',
-                    value: 'manage',
-                    description: '查看、应用或删除已有的储藏'
-                },
-                {
-                    name: '返回主菜单',
-                    value: 'back'
-                }
-            ]
-        });
-        switch (action) {
-            case 'create':
-                await createStash();
-                break;
-            case 'partial':
-                await createPartialStash();
-                break;
-            case 'manage':
-                await manageStashes();
-                break;
-            case 'back':
-                return;
-        }
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            throw new errors_1.GitError(`储藏操作失败: ${error.message}`);
-        }
-        throw error;
-    }
-}
-/**
- * Create a new stash with optional message and untracked files
- */
-async function createStash() {
-    // 检查是否有可储藏的修改
-    const status = await git.status();
-    if (status.files.length === 0) {
-        console.log('没有可储藏的修改。');
-        return;
-    }
-    // 询问是否包含未跟踪的文件
-    const includeUntracked = await (0, prompts_1.confirm)({
-        message: '是否包含未跟踪的文件？',
-        default: false
-    });
-    // 获取储藏信息
-    const message = await (0, prompts_1.input)({
-        message: '请输入储藏说明（可选）：'
-    });
-    // 执行储藏操作
-    const args = ['push'];
-    if (includeUntracked)
-        args.push('-u');
-    if (message)
-        args.push('-m', message);
-    await git.stash(args);
-    (0, errors_1.printSuccess)('修改已成功储藏');
-}
-/**
- * Create a partial stash by selecting specific files
- */
-async function createPartialStash() {
-    // 获取当前状态
-    const status = await git.status();
-    if (status.files.length === 0) {
-        console.log('没有可储藏的修改。');
-        return;
-    }
-    // 列出所有修改的文件供选择
-    const fileChoices = status.files.map(file => ({
-        name: `${file.path} (${file.index}${file.working_dir})`,
-        value: file.path
-    }));
-    const selectedFiles = await (0, prompts_1.checkbox)({
-        message: '请选择要储藏的文件（空格选择，回车确认）：',
-        choices: fileChoices
-    });
-    if (selectedFiles.length === 0) {
-        console.log('未选择任何文件，操作已取消。');
-        return;
-    }
-    // 获取储藏信息
-    const message = await (0, prompts_1.input)({
-        message: '请输入储藏说明（可选）：'
-    });
-    // 执行部分储藏
-    await git.raw(['stash', 'push', '-p', ...(message ? ['-m', message] : []), ...selectedFiles]);
-    (0, errors_1.printSuccess)('选中的文件已成功储藏');
-}
-/**
- * Manage existing stashes (list, apply, drop)
- */
-async function manageStashes() {
-    // 获取所有储藏
-    const stashList = await getStashList();
-    if (stashList.length === 0) {
-        console.log('没有找到任何储藏。');
-        return;
-    }
-    // 显示储藏列表
-    const choices = stashList.map(stash => ({
-        name: `stash@{${stash.index}}: ${stash.message} (${stash.date})`,
-        value: stash.index
-    }));
-    const selectedStash = await (0, prompts_1.select)({
-        message: '请选择要操作的储藏：',
-        choices: [
-            ...choices,
-            { name: '返回', value: -1 }
-        ]
-    });
-    if (selectedStash === -1)
-        return;
-    // 选择操作
-    const operation = await (0, prompts_1.select)({
-        message: '请选择操作：',
-        choices: [
-            {
-                name: '应用储藏',
-                value: 'apply',
-                description: '应用选中的储藏（保留储藏记录）'
-            },
-            {
-                name: '弹出储藏',
-                value: 'pop',
-                description: '应用并删除选中的储藏'
-            },
-            {
-                name: '删除储藏',
-                value: 'drop',
-                description: '删除选中的储藏'
-            },
-            {
-                name: '查看储藏内容',
-                value: 'show',
-                description: '显示储藏的详细内容'
-            }
-        ]
-    });
-    // 执行选中的操作
-    switch (operation) {
-        case 'apply':
-            await git.stash(['apply', `stash@{${selectedStash}}`]);
-            (0, errors_1.printSuccess)('储藏已应用');
-            break;
-        case 'pop':
-            await git.stash(['pop', `stash@{${selectedStash}}`]);
-            (0, errors_1.printSuccess)('储藏已弹出');
-            break;
-        case 'drop':
-            const confirmed = await (0, prompts_1.confirm)({
-                message: '确定要删除这个储藏吗？此操作不可撤销。',
-                default: false
-            });
-            if (confirmed) {
-                await git.stash(['drop', `stash@{${selectedStash}}`]);
-                (0, errors_1.printSuccess)('储藏已删除');
-            }
-            break;
-        case 'show':
-            const diff = await git.stash(['show', '-p', `stash@{${selectedStash}}`]);
-            console.log('\n储藏内容：\n', diff);
-            break;
-    }
-}
-/**
- * Get list of all stashes
- */
-async function getStashList() {
-    const result = await git.stash(['list']);
-    if (!result)
-        return [];
-    return result
-        .split('\n')
-        .filter(line => line.trim())
-        .map(line => {
-        const match = line.match(/^stash@{(\d+)}: (.*)/);
-        if (!match)
-            return null;
-        return {
-            index: parseInt(match[1]),
-            hash: '', // 可以通过额外命令获取完整 hash
-            message: match[2],
-            date: '' // 可以通过额外命令获取详细时间
-        };
-    })
-        .filter((entry) => entry !== null);
-}

package/dist/display.js

@@ -1,159 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.display = void 0;
-const readline_1 = require("readline");
-// ANSI 转义序列
-const CLEAR_SCREEN = '\x1b[2J';
-const CLEAR_SCREEN_AND_SCROLLBACK = '\x1b[2J\x1b[3J';
-const MOVE_TO_TOP = '\x1b[H';
-const SAVE_CURSOR = '\x1b[s';
-const RESTORE_CURSOR = '\x1b[u';
-const HIDE_CURSOR = '\x1b[?25l';
-const SHOW_CURSOR = '\x1b[?25h';
-const ALTERNATE_SCREEN_BUFFER = '\x1b[?1049h';
-const NORMAL_SCREEN_BUFFER = '\x1b[?1049l';
-// 颜色和样式常量
-const RESET = '\x1b[0m';
-const BOLD = '\x1b[1m';
-const DIM = '\x1b[2m';
-const CYAN = '\x1b[36m';
-const GREEN = '\x1b[32m';
-const YELLOW = '\x1b[33m';
-const BLUE = '\x1b[34m';
-const MAGENTA = '\x1b[35m';
-const RED = '\x1b[31m';
-const BG_BLACK = '\x1b[40m';
-// 状态栏样式
-const STATUS_STYLES = {
-    branch: `${BOLD}${GREEN}`,
-    changes: `${YELLOW}`,
-    ahead: `${CYAN}`,
-    behind: `${MAGENTA}`,
-    separator: `${DIM}│${RESET}`,
-    label: `${DIM}`,
-};
-class DisplayManager {
-    constructor() {
-        this.statusSection = [];
-        this.menuSection = [];
-        this.dividerLine = '';
-        this.isLoading = true;
-        this.isDetailedView = false;
-        // 获取终端大小
-        this.terminalSize = { rows: process.stdout.rows, columns: process.stdout.columns };
-        // 创建分隔线
-        this.updateDividerLine();
-        // 计算上下区域的大小 - 状态区域只占一行
-        this.statusHeight = 1;
-        this.menuHeight = this.terminalSize.rows - this.statusHeight - 1;
-        // 监听终端大小变化
-        process.stdout.on('resize', () => {
-            this.terminalSize = { rows: process.stdout.rows, columns: process.stdout.columns };
-            this.updateDividerLine();
-            this.menuHeight = this.terminalSize.rows - this.statusHeight - 1;
-            if (!this.isDetailedView) {
-                this.redrawScreen();
-            }
-        });
-    }
-    updateDividerLine() {
-        this.dividerLine = '─'.repeat(this.terminalSize.columns);
-    }
-    // 清屏并初始化显示区域
-    initDisplay() {
-        // 切换到备用屏幕缓冲区，实现全屏模式
-        process.stdout.write(ALTERNATE_SCREEN_BUFFER);
-        process.stdout.write(CLEAR_SCREEN_AND_SCROLLBACK + MOVE_TO_TOP);
-        process.stdout.write(HIDE_CURSOR);
-        this.drawDivider();
-        this.showLoadingStatus();
-        // 确保程序退出时恢复终端状态
-        process.on('exit', () => {
-            process.stdout.write(SHOW_CURSOR);
-            process.stdout.write(NORMAL_SCREEN_BUFFER);
-        });
-    }
-    // 绘制分隔线
-    drawDivider() {
-        process.stdout.write(SAVE_CURSOR);
-        process.stdout.write(`\x1b[${this.statusHeight + 1}H${this.dividerLine}`);
-        process.stdout.write(RESTORE_CURSOR);
-    }
-    // 显示加载状态
-    showLoadingStatus() {
-        if (this.isLoading) {
-            process.stdout.write(MOVE_TO_TOP);
-            process.stdout.write('正在获取仓库信息...\n');
-        }
-    }
-    // 更新状态区域内容
-    updateStatus(lines) {
-        this.isLoading = false;
-        this.statusSection = lines;
-        this.refreshStatus();
-    }
-    // 更新简洁状态栏
-    updateCompactStatus(branchName, uncommittedChanges, ahead, behind) {
-        this.isLoading = false;
-        const statusLine = `🌿 ${branchName} | 📝 ${uncommittedChanges} | ⬆️ ${ahead} | ⬇️ ${behind}`;
-        this.statusSection = [statusLine];
-        this.refreshStatus();
-    }
-    // 显示详细状态信息
-    showDetailedStatus(lines) {
-        this.isDetailedView = true;
-        process.stdout.write(CLEAR_SCREEN + MOVE_TO_TOP);
-        lines.forEach(line => {
-            process.stdout.write(line + '\n');
-        });
-        process.stdout.write('\n按任意键返回主菜单...');
-        // 监听一次按键事件
-        process.stdin.setRawMode(true);
-        process.stdin.once('data', () => {
-            process.stdin.setRawMode(false);
-            this.isDetailedView = false;
-            this.redrawScreen();
-        });
-    }
-    // 刷新状态区域显示
-    refreshStatus() {
-        process.stdout.write(SAVE_CURSOR);
-        process.stdout.write(MOVE_TO_TOP);
-        // 清空状态区域
-        for (let i = 0; i < this.statusHeight; i++) {
-            (0, readline_1.clearLine)(process.stdout, 0);
-            process.stdout.write('\n');
-        }
-        // 重新显示状态信息
-        process.stdout.write(MOVE_TO_TOP);
-        this.statusSection.forEach(line => {
-            process.stdout.write(line + '\n');
-        });
-        process.stdout.write(RESTORE_CURSOR);
-    }
-    // 重绘整个屏幕
-    redrawScreen() {
-        process.stdout.write(CLEAR_SCREEN + MOVE_TO_TOP);
-        this.drawDivider();
-        this.refreshStatus();
-        this.prepareForMenu();
-    }
-    // 准备菜单区域
-    prepareForMenu() {
-        // 将光标移动到分隔线下方
-        process.stdout.write(`\x1b[${this.statusHeight + 2}H`);
-        // 清除菜单区域
-        for (let i = this.statusHeight + 2; i < this.terminalSize.rows; i++) {
-            process.stdout.write(`\x1b[${i}H`);
-            (0, readline_1.clearLine)(process.stdout, 0);
-        }
-        // 重新定位到菜单开始位置
-        process.stdout.write(`\x1b[${this.statusHeight + 2}H`);
-    }
-    // 显示错误信息
-    showError(message) {
-        const currentPos = process.stdout.rows;
-        process.stdout.write(`\x1b[${currentPos}H\x1b[31m${message}\x1b[0m\n`);
-    }
-}
-exports.display = new DisplayManager();

package/dist/prompts.js

@@ -1,56 +0,0 @@
-import { select, confirm } from '@inquirer/prompts';
-import { theme } from './theme';
-// 菜单选项
-const menuChoices = [
-    {
-        name: '清理远程已删除的分支',
-        value: 'clean',
-        description: '清理那些在远程仓库已经被删除的本地分支'
-    },
-    {
-        name: '退出',
-        value: 'exit',
-        description: '退出程序'
-    }
-];
-// 显示主菜单
-export async function showMainMenu() {
-    try {
-        const options = {
-            message: '请选择要执行的操作：',
-            choices: menuChoices,
-            pageSize: 10, // 一次显示的选项数量
-            loop: true, // 循环滚动
-            theme, // 使用自定义主题
-        };
-        return await select(options);
-    }
-    catch (error) {
-        return 'exit';
-    }
-}
-// 确认提示
-export async function confirmAction(message) {
-    try {
-        const options = {
-            message,
-            default: true,
-            theme, // 使用自定义主题
-        };
-        return await confirm(options);
-    }
-    catch (error) {
-        return false;
-    }
-}
-// 初始化 Git 仓库确认
-export async function confirmInitRepo() {
-    return await confirmAction('当前目录不是 Git 仓库，是否要创建？');
-}
-// 删除分支确认
-export async function confirmDeleteBranches(branches) {
-    if (branches.length === 0)
-        return false;
-    const branchList = branches.join('\n  - ');
-    return await confirmAction(`是否删除以下分支？\n  - ${branchList}`);
-}