npm - zen-gitsync - Versions diffs - 2.1.29 → 2.2.1 - Mend

zen-gitsync 2.1.29 → 2.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/README.md +148 -102
package/package.json +6 -1
package/src/config.js +64 -2
package/src/gitCommit.js +53 -0
package/src/ui/public/assets/index-BPoaF8NL.js +44 -0
package/src/ui/public/assets/index-C06RP6-q.css +1 -0
package/src/ui/public/assets/vendor-CKXtUB8u.js +45 -0
package/src/ui/public/index.html +3 -3
package/src/ui/server/index.js +111 -23
package/src/utils/index.js +87 -3
package/src/ui/public/assets/index-BKjt1yVw.js +0 -44
package/src/ui/public/assets/index-th8vfo_E.css +0 -1
package/src/ui/public/assets/vendor-Ym9LLftt.js +0 -45

package/src/ui/public/index.html CHANGED Viewed

@@ -5,10 +5,10 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Zen-GitSync - Git同步工具</title>
-    <script type="module" crossorigin src="/assets/index-BKjt1yVw.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/vendor-Ym9LLftt.js">
+    <script type="module" crossorigin src="/assets/index-BPoaF8NL.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/vendor-CKXtUB8u.js">
     <link rel="stylesheet" crossorigin href="/assets/vendor-BLnrYq3C.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-th8vfo_E.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-C06RP6-q.css">
   </head>
   <body>
     <div id="app"></div>

package/src/ui/server/index.js CHANGED Viewed

@@ -2,7 +2,7 @@ import express from 'express';
 import { createServer } from 'http';
 import { fileURLToPath } from 'url';
 import path from 'path';
-import { execGitCommand, getCommandHistory, clearCommandHistory, registerSocketIO } from '../../utils/index.js';
+import { execGitCommand, getCommandHistory, clearCommandHistory, registerSocketIO, execGitAddWithLockFilter } from '../../utils/index.js';
 import open from 'open';
 import config from '../../config.js';
 import chalk from 'chalk';
@@ -959,8 +959,8 @@ async function startUIServer(noOpen = false, savePort = false) {
   // 添加 add 接口
   app.post('/api/add', async (req, res) => {
     try {
-      // 执行 git add . 命令添加所有更改
-      await execGitCommand('git add .');
+      // 使用带锁定文件过滤的 git add
+      await execGitAddWithLockFilter();
       res.json({ success: true });
     } catch (error) {
       res.status(500).json({ success: false, error: error.message });
@@ -1757,35 +1757,66 @@ async function startUIServer(noOpen = false, savePort = false) {
   // 创建新的stash
   app.post('/api/stash-save', async (req, res) => {
     try {
-      const { message, includeUntracked } = req.body;
-      // 构建stash命令
+      const { message, includeUntracked, excludeLocked } = req.body;
+      if (excludeLocked) {
+        const lockedFiles = await configManager.getLockedFiles();
+        const { stdout: statusStdout } = await execGitCommand('git status --porcelain', { log: false });
+        const changedFiles = statusStdout
+          .split('\n')
+          .filter(line => line.trim())
+          .map(line => {
+            const match = line.match(/^..\s+(.+)$/);
+            if (match) {
+              let filename = match[1];
+              if (filename.startsWith('"') && filename.endsWith('"')) {
+                filename = filename.slice(1, -1).replace(/\\(.)/g, '$1');
+              }
+              return filename;
+            }
+            return null;
+          })
+          .filter(Boolean);
+        const path = (await import('path')).default;
+        const filesToStash = changedFiles.filter(file => {
+          const normalizedFile = path.normalize(file);
+          const isLocked = lockedFiles.some(locked => {
+            const normalizedLocked = path.normalize(locked);
+            return normalizedFile === normalizedLocked || normalizedFile.startsWith(normalizedLocked + path.sep);
+          });
+          return !isLocked;
+        });
+        if (filesToStash.length === 0) {
+          return res.json({ success: false, message: '所有更改都是锁定文件，无需储藏' });
+        }
+        let command = 'git stash push';
+        if (message) command += ` -m "${message}"`;
+        if (includeUntracked) command += ' --include-untracked';
+        const args = filesToStash.map(f => `"${f}"`).join(' ');
+        command += ` -- ${args}`;
+        const { stdout } = await execGitCommand(command);
+        if (stdout.includes('No local changes to save')) {
+          return res.json({ success: false, message: '没有本地更改需要保存' });
+        }
+        return res.json({ success: true, message: '成功保存未锁定的工作区更改', output: stdout });
+      }
       let command = 'git stash push';
-      // 添加可选参数
       if (message) {
         command += ` -m "${message}"`;
       }
       if (includeUntracked) {
         command += ' --include-untracked';
       }
       const { stdout } = await execGitCommand(command);
-      // 检查是否有任何更改被保存
       if (stdout.includes('No local changes to save')) {
-        return res.json({
-          success: false,
-          message: '没有本地更改需要保存'
-        });
+        return res.json({ success: false, message: '没有本地更改需要保存' });
       }
-      res.json({
-        success: true,
-        message: '成功保存工作区更改',
-        output: stdout
-      });
+      res.json({ success: true, message: '成功保存工作区更改', output: stdout });
     } catch (error) {
       console.error('保存stash失败:', error);
       res.status(500).json({ success: false, error: error.message });
@@ -2152,7 +2183,64 @@ async function startUIServer(noOpen = false, savePort = false) {
     console.error(`无法找到可用端口 (尝试范围: ${startPort}-${maxPort-1})`);
     process.exit(1);
   }
+  // ========== 文件锁定相关 API ==========
+  // 获取锁定文件列表
+  app.get('/api/locked-files', async (req, res) => {
+    try {
+      const lockedFiles = await configManager.getLockedFiles();
+      res.json({ success: true, lockedFiles });
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
+  // 锁定文件
+  app.post('/api/lock-file', async (req, res) => {
+    try {
+      const { filePath } = req.body;
+      if (!filePath) {
+        return res.status(400).json({ success: false, error: '缺少文件路径参数' });
+      }
+      const result = await configManager.lockFile(filePath);
+      res.json({ success: true, locked: result });
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
+  // 解锁文件
+  app.post('/api/unlock-file', async (req, res) => {
+    try {
+      const { filePath } = req.body;
+      if (!filePath) {
+        return res.status(400).json({ success: false, error: '缺少文件路径参数' });
+      }
+      const result = await configManager.unlockFile(filePath);
+      res.json({ success: true, unlocked: result });
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
+  // 检查文件是否锁定
+  app.post('/api/check-file-lock', async (req, res) => {
+    try {
+      const { filePath } = req.body;
+      if (!filePath) {
+        return res.status(400).json({ success: false, error: '缺少文件路径参数' });
+      }
+      const isLocked = await configManager.isFileLocked(filePath);
+      res.json({ success: true, isLocked });
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
   // 添加命令历史的清空API
   app.post('/api/clear-command-history', async (req, res) => {
     try {

package/src/utils/index.js CHANGED Viewed

@@ -24,6 +24,7 @@ import ora from "ora";
 import readline from 'readline'
 import path from 'path'
 import fs from 'fs/promises'
+import config from '../config.js'
 const printTableWithHeaderUnderline = (head, content, style) => {
@@ -377,6 +378,12 @@ Options:
   addResetScript             Add "g:reset": "git reset --hard origin/<current-branch>" to package.json scripts
   ui                         Launch graphical user interface (v2.0.0)
+File Locking:
+  --lock-file=<path>          Lock a file to exclude it from commits
+  --unlock-file=<path>        Unlock a previously locked file
+  --list-locked               List all currently locked files
+  --check-lock=<path>         Check if a file is locked
   --cmd="your-cmd"            Execute custom cmd command (immediately, at a time, or periodically)
   --cmd-interval=<seconds>    Execute custom cmd every N seconds
   --at="HH:MM"                Execute custom cmd at a specific time (today) or --at="YYYY-MM-DD HH:MM:SS"
@@ -395,6 +402,9 @@ Example:
   g log --n=5               Show the last 5 commits with --log
   g addScript              Add auto commit script to package.json
   g addResetScript         Add reset script to package.json
+  g --lock-file=config.json    Lock config.json file
+  g --unlock-file=config.json  Unlock config.json file
+  g --list-locked              List all locked files
 Add auto submit in package.json:
   "scripts": {
@@ -616,6 +626,78 @@ async function execDiff() {
   }
 }
+// 执行 git add 但排除锁定的文件
+async function execGitAddWithLockFilter() {
+  try {
+    // 获取锁定的文件列表
+    const lockedFiles = await config.getLockedFiles();
+    if (lockedFiles.length === 0) {
+      // 如果没有锁定文件，直接执行 git add .
+      await execGitCommand('git add .');
+      return;
+    }
+    // 获取所有修改的文件
+    const statusResult = await execGitCommand('git status --porcelain', {log: false});
+    const modifiedFiles = statusResult.stdout
+      .split('\n')
+      .filter(line => line.trim())
+      .map(line => {
+        // 解析 git status --porcelain 的输出格式
+        // 格式: XY filename 或 XY "filename with spaces"
+        const match = line.match(/^..\s+(.+)$/);
+        if (match) {
+          let filename = match[1];
+          // 如果文件名被引号包围，去掉引号
+          if (filename.startsWith('"') && filename.endsWith('"')) {
+            filename = filename.slice(1, -1);
+            // 处理转义字符
+            filename = filename.replace(/\\(.)/g, '$1');
+          }
+          return filename;
+        }
+        return null;
+      })
+      .filter(Boolean);
+    // 过滤掉锁定的文件
+    const filesToAdd = modifiedFiles.filter(file => {
+      const normalizedFile = path.normalize(file);
+      const isLocked = lockedFiles.some(lockedFile => {
+        const normalizedLocked = path.normalize(lockedFile);
+        return normalizedFile === normalizedLocked ||
+               normalizedFile.startsWith(normalizedLocked + path.sep);
+      });
+      if (isLocked) {
+        console.log(chalk.yellow(`🔒 跳过锁定文件: ${file}`));
+        return false;
+      }
+      return true;
+    });
+    if (filesToAdd.length === 0) {
+      console.log(chalk.blue('📝 所有修改的文件都被锁定，没有文件需要添加'));
+      return;
+    }
+    // 逐个添加未锁定的文件
+    for (const file of filesToAdd) {
+      await execGitCommand(`git add "${file}"`, {
+        head: `git add ${file}`,
+        log: false
+      });
+    }
+    console.log(chalk.green(`✅ 已添加 ${filesToAdd.length} 个文件到暂存区 (跳过 ${lockedFiles.length} 个锁定文件)`));
+  } catch (error) {
+    console.error(chalk.red('执行 git add 时出错:'), error.message);
+    throw error;
+  }
+}
 async function execAddAndCommit({statusOutput, commitMessage, exit}) {
   // 检查 -m 参数（提交信息）
   const commitMessageArg = process.argv.find(arg => arg.startsWith('-m'));
@@ -652,9 +734,10 @@ async function execAddAndCommit({statusOutput, commitMessage, exit}) {
     commitMessage = await question('请输入提交信息：') || commitMessage;
   }
-  statusOutput.includes('(use "git add') && await execGitCommand('git add .')
-  // 强制添加所有变更
-  // await execGitCommand('git add -A .');
+  // 使用带锁定文件过滤的 git add
+  if (statusOutput.includes('(use "git add')) {
+    await execGitAddWithLockFilter();
+  }
   // 提交前二次校验
   const checkStatus = await execGitCommand('git status --porcelain', {log: false});
@@ -757,5 +840,6 @@ export {
   getCwd, judgePlatform, showHelp, judgeLog, printGitLog,
   judgeHelp, exec_exit, judgeUnmerged, delay, formatDuration,
   exec_push, execPull, judgeRemote, execDiff, execAddAndCommit,
+  execGitAddWithLockFilter, // 导出新的 git add 函数
   addScriptToPackageJson, addResetScriptToPackageJson
 };