git-push-time 1.1.2 → 1.1.4

package/lib/commands/edit-time.js

@@ -1,141 +1,141 @@
-import chalk from 'chalk';
-import {
-  checkGitInstalled,
-  isGitRepo,
-  getCurrentBranch,
-  getRecentCommits,
-  rewriteCommitDate,
-  resolveTargetDir
-} from '../git.js';
-import { parseCustomDate } from '../utils.js';
-import { selectWithBack, inputWithBack, BACK } from '../prompt-helpers.js';
-import {
-  printSection,
-  printTargetDir,
-  printGitMissing,
-  printErrorBox
-} from '../ui.js';
-
-export async function runEditCommitTimeCommand(options = {}) {
-  const fromMenu = options.fromMenu === true;
-
-  let targetDir = process.cwd();
-  if (options.dir) {
-    const r = resolveTargetDir(options.dir, process.cwd());
-    if (!r.ok) {
-      printErrorBox('THƯ MỤC KHÔNG HỢP LỆ', [r.error]);
-      if (fromMenu) return;
-      process.exit(1);
-    }
-    targetDir = r.fullPath;
-  }
-
-  if (!checkGitInstalled()) {
-    printGitMissing();
-    if (fromMenu) return;
-    process.exit(1);
-  }
-  if (!isGitRepo(targetDir)) {
-    printErrorBox('CHƯA PHẢI GIT REPOSITORY', [`Thư mục '${targetDir}' chưa phải là Git repository.`]);
-    if (fromMenu) return;
-    process.exit(1);
-  }
-
-  printSection('SỬA THỜI GIAN COMMIT (BACKDATE)');
-  printTargetDir(targetDir);
-
-  try {
-    const commits = getRecentCommits(100, targetDir);
-    if (commits.length === 0) {
-      printErrorBox('CHƯA CÓ COMMIT', ['Repository chưa có commit nào.']);
-      if (fromMenu) return;
-      process.exit(1);
-    }
-
-    // Dùng loop thay vì đệ quy để tránh stack tăng khi Back nhiều lần
-    let commit = null;
-    let dateInput = null;
-    while (true) {
-      // Bước 1: Chọn commit
-      if (!commit) {
-        if (commits.length === 1) {
-          commit = commits[0];
-          console.log(chalk.hex('#94A3B8')(`  » Chỉ có 1 commit nên tự chọn: ${commit.shortHash} — ${commit.subject}\n`));
-        } else {
-          const picked = await selectWithBack({
-            message: `Chọn commit cần đổi thời gian (${commits.length} commit gần nhất):`,
-            pageSize: 12,
-            choices: commits.map((item) => ({
-              name: `${item.date}  ${item.shortHash}  ${item.subject}`,
-              value: item,
-              description: 'Sửa commit này sẽ viết lại nó và các commit phía sau'
-            }))
-          });
-          if (picked === BACK) return;
-          commit = picked;
-        }
-      }
-
-      // Bước 2: Chọn kiểu thời gian
-      const dateOption = await selectWithBack({
-        message: 'Chọn thời gian mới:',
-        choices: [
-          { name: 'Ngay bây giờ', value: 'now', description: 'Dùng thời gian hiện tại' },
-          { name: 'Nhập thời gian tương đối', value: 'relative', description: 'VD: -2d, -5h, -30m, -3M' },
-          { name: 'Nhập ngày giờ cụ thể', value: 'custom', description: 'VD: 2024-01-15 14:30:00' }
-        ]
-      });
-      if (dateOption === BACK) {
-        commit = null; // quay về chọn commit lại
-        continue;
-      }
-
-      dateInput = dateOption;
-      if (dateOption === 'relative') {
-        const val = await inputWithBack({
-          message: 'Nhập thời gian (ví dụ: -2d, -5h, -30m, -3M):',
-          default: '-1d',
-          validate: (value) => {
-            const parsed = parseCustomDate(value);
-            return parsed.valid || parsed.error;
-          }
-        });
-        if (val === BACK) continue; // về chọn kiểu thời gian
-        dateInput = val;
-      } else if (dateOption === 'custom') {
-        const val = await inputWithBack({
-          message: 'Nhập ngày giờ (YYYY-MM-DD HH:mm:ss):',
-          validate: (value) => {
-            const parsed = parseCustomDate(value);
-            return parsed.valid || parsed.error;
-          }
-        });
-        if (val === BACK) continue; // về chọn kiểu thời gian
-        dateInput = val;
-      }
-      break;
-    }
-
-    const parsed = parseCustomDate(dateInput);
-    if (!parsed.valid) {
-      printErrorBox('THỜI GIAN KHÔNG HỢP LỆ', [parsed.error], 'VD: now, -2d, -5h, 2024-01-15 14:30:00');
-      if (fromMenu) return;
-      process.exit(1);
-    }
-
-    const currentBranch = getCurrentBranch(targetDir);
-    const result = rewriteCommitDate(commit.hash, parsed.formatted, targetDir);
-
-    printSection('ĐÃ ĐỔI THỜI GIAN COMMIT THÀNH CÔNG');
-    console.log(`  Nhánh: ${chalk.hex('#38BDF8').bold(currentBranch)}`);
-    console.log(`  Commit: ${chalk.hex('#FBBF24').bold(commit.shortHash)} — ${commit.subject}`);
-    console.log(`  Thời gian mới: ${chalk.hex('#C084FC').bold(parsed.display)}`);
-    console.log(`  Đã viết lại ${result.rewrittenCount} commit trên branch hiện tại.`);
-    console.log(`  Nhánh backup an toàn: ${chalk.hex('#6EE7B7')(result.backupBranch)}`);
-    console.log(chalk.hex('#FBBF24')('  [!] Nếu commit đã từng push, bạn cần dùng force push (--force) để cập nhật remote.\n'));
-  } catch (error) {
-    printErrorBox('KHÔNG THỂ ĐỔI THỜI GIAN', [error.message], 'Working tree phải sạch và commit phải nằm trên branch hiện tại.');
-    if (fromMenu) return;
-    process.exit(1);
-  }
-}
+import chalk from 'chalk';
+import {
+  checkGitInstalled,
+  isGitRepo,
+  getCurrentBranch,
+  getRecentCommits,
+  rewriteCommitDate,
+  resolveTargetDir
+} from '../git.js';
+import { parseCustomDate } from '../utils.js';
+import { selectWithBack, inputWithBack, BACK } from '../prompt-helpers.js';
+import {
+  printSection,
+  printTargetDir,
+  printGitMissing,
+  printErrorBox
+} from '../ui.js';
+
+export async function runEditCommitTimeCommand(options = {}) {
+  const fromMenu = options.fromMenu === true;
+
+  let targetDir = process.cwd();
+  if (options.dir) {
+    const r = resolveTargetDir(options.dir, process.cwd());
+    if (!r.ok) {
+      printErrorBox('INVALID DIRECTORY', [r.error]);
+      if (fromMenu) return;
+      process.exit(1);
+    }
+    targetDir = r.fullPath;
+  }
+
+  if (!checkGitInstalled()) {
+    printGitMissing();
+    if (fromMenu) return;
+    process.exit(1);
+  }
+  if (!isGitRepo(targetDir)) {
+    printErrorBox('NOT A GIT REPOSITORY', [`'${targetDir}' is not a Git repository.`]);
+    if (fromMenu) return;
+    process.exit(1);
+  }
+
+  printSection('EDIT COMMIT TIMESTAMP');
+  printTargetDir(targetDir);
+
+  try {
+    const commits = getRecentCommits(100, targetDir);
+    if (commits.length === 0) {
+      printErrorBox('NO COMMITS FOUND', ['This repository does not contain any commits.']);
+      if (fromMenu) return;
+      process.exit(1);
+    }
+
+    // Use a loop instead of recursion to avoid growing the stack after repeated Back actions.
+    let commit = null;
+    let dateInput = null;
+    while (true) {
+      // Step 1: Choose a commit.
+      if (!commit) {
+        if (commits.length === 1) {
+          commit = commits[0];
+          console.log(chalk.hex('#94A3B8')(`  » Only one commit found; selected it: ${commit.shortHash} — ${commit.subject}\n`));
+        } else {
+          const picked = await selectWithBack({
+            message: `Choose a commit to edit (${commits.length} most recent):`,
+            pageSize: 12,
+            choices: commits.map((item) => ({
+              name: `${item.date}  ${item.shortHash}  ${item.subject}`,
+              value: item,
+              description: 'Editing this commit will rewrite it and all following commits'
+            }))
+          });
+          if (picked === BACK) return;
+          commit = picked;
+        }
+      }
+
+      // Step 2: Choose a timestamp type.
+      const dateOption = await selectWithBack({
+        message: 'Choose a new timestamp:',
+        choices: [
+          { name: 'Now', value: 'now', description: 'Use the current time' },
+          { name: 'Enter a relative time', value: 'relative', description: 'e.g. -2d, -5h, -30m, -3M' },
+          { name: 'Enter a specific date and time', value: 'custom', description: 'e.g. 2024-01-15 14:30:00' }
+        ]
+      });
+      if (dateOption === BACK) {
+        commit = null; // Return to commit selection.
+        continue;
+      }
+
+      dateInput = dateOption;
+      if (dateOption === 'relative') {
+        const val = await inputWithBack({
+          message: 'Enter a relative time (e.g. -2d, -5h, -30m, -3M):',
+          default: '-1d',
+          validate: (value) => {
+            const parsed = parseCustomDate(value);
+            return parsed.valid || parsed.error;
+          }
+        });
+        if (val === BACK) continue; // Return to timestamp type selection.
+        dateInput = val;
+      } else if (dateOption === 'custom') {
+        const val = await inputWithBack({
+          message: 'Enter a date and time (YYYY-MM-DD HH:mm:ss):',
+          validate: (value) => {
+            const parsed = parseCustomDate(value);
+            return parsed.valid || parsed.error;
+          }
+        });
+        if (val === BACK) continue; // Return to timestamp type selection.
+        dateInput = val;
+      }
+      break;
+    }
+
+    const parsed = parseCustomDate(dateInput);
+    if (!parsed.valid) {
+      printErrorBox('INVALID DATE OR TIME', [parsed.error], 'Examples: now, -2d, -5h, 2024-01-15 14:30:00');
+      if (fromMenu) return;
+      process.exit(1);
+    }
+
+    const currentBranch = getCurrentBranch(targetDir);
+    const result = rewriteCommitDate(commit.hash, parsed.formatted, targetDir);
+
+    printSection('COMMIT TIMESTAMP UPDATED');
+    console.log(`  Branch: ${chalk.hex('#38BDF8').bold(currentBranch)}`);
+    console.log(`  Commit: ${chalk.hex('#FBBF24').bold(commit.shortHash)} — ${commit.subject}`);
+    console.log(`  New timestamp: ${chalk.hex('#C084FC').bold(parsed.display)}`);
+    console.log(`  Rewrote ${result.rewrittenCount} commit(s) on the current branch.`);
+    console.log(`  Backup branch: ${chalk.hex('#6EE7B7')(result.backupBranch)}`);
+    console.log(chalk.hex('#FBBF24')('  [!] If these commits were already pushed, force-push (--force) to update the remote.\n'));
+  } catch (error) {
+    printErrorBox('COULD NOT EDIT TIMESTAMP', [error.message], 'The working tree must be clean, and the commit must be on the current branch.');
+    if (fromMenu) return;
+    process.exit(1);
+  }
+}

package/lib/commands/fix.js

@@ -1,113 +1,113 @@
-import chalk from 'chalk';
-import ora from 'ora';
-import {
-  checkGitInstalled,
-  isGitRepo,
-  getCurrentBranchStrict,
-  findRiskyStagedFiles,
-  resolveTargetDir
-} from '../git.js';
-import { scanStagedContentForSecrets } from '../secrets.js';
-import {
-  autoFixStagedSecrets,
-  findRiskyWorkingTreeFiles,
-  getUnpushedCommits,
-  squashUnpushedCommits
-} from '../fix.js';
-import { selectWithBack, BACK } from '../prompt-helpers.js';
-import {
-  printSection,
-  printTargetDir,
-  printGitMissing,
-  printErrorBox,
-  printPrePushSecretWarning,
-  printFixResult
-} from '../ui.js';
-
-export async function runFixCommand(options = {}) {
-  const fromMenu = options.fromMenu === true;
-
-  if (!checkGitInstalled()) {
-    printGitMissing();
-    if (fromMenu) return;
-    process.exit(1);
-  }
-
-  let targetDir = process.cwd();
-  if (options.dir) {
-    const r = resolveTargetDir(options.dir, process.cwd());
-    if (!r.ok) {
-      printErrorBox('THƯ MỤC KHÔNG HỢP LỆ', [r.error]);
-      if (fromMenu) return;
-      process.exit(1);
-    }
-    targetDir = r.fullPath;
-  }
-
-  printSection('QUÉT & GỠ SECRET BẢO VỆ REPO');
-  printTargetDir(targetDir);
-
-  if (!isGitRepo(targetDir)) {
-    printErrorBox('CHƯA PHẢI GIT REPOSITORY', [`Thư mục '${targetDir}' chưa phải là Git repository.`]);
-    if (fromMenu) return;
-    process.exit(1);
-  }
-
-  const spinner = ora({ text: 'Đang kiểm tra staged files và thư mục làm việc…', color: 'cyan' }).start();
-  const risky = findRiskyStagedFiles(targetDir);
-  const findings = scanStagedContentForSecrets(targetDir);
-  const riskyWorking = findRiskyWorkingTreeFiles(targetDir);
-  spinner.stop();
-
-  const allDetected = [...new Set([...risky, ...findings.map((f) => f.file), ...riskyWorking])];
-  const hadSecrets = allDetected.length > 0;
-
-  if (allDetected.length === 0) {
-    console.log(chalk.hex('#34D399')('  [OK] Không phát hiện file secret mới ở stage hay thư mục làm việc!\n'));
-  } else {
-    printPrePushSecretWarning({ riskyFiles: allDetected, findings });
-    spinner.start('Đang tự động fix (gỡ khỏi stage + thêm .gitignore)...');
-    const res = autoFixStagedSecrets(allDetected, targetDir);
-    spinner.succeed(chalk.hex('#34D399')(`[OK] Đã xử lý xong ${res.fixed.length} file!`));
-    printFixResult(res);
-  }
-
-  // Kiểm tra unpushed commits — chỉ gợi ý squash khi có dấu hiệu secret,
-  // tránh viết lại lịch sử sạch không cần thiết.
-  const currentBranch = getCurrentBranchStrict(targetDir) || 'main';
-  const unpushed = getUnpushedCommits(currentBranch, targetDir);
-  if (unpushed.length > 0 && hadSecrets) {
-    printSection(`${unpushed.length} COMMIT CHƯA PUSH TRÊN LOCAL`);
-    unpushed.slice(0, 5).forEach((c) => console.log(chalk.hex('#94A3B8')(`     - ${c}`)));
-    if (unpushed.length > 5) {
-      console.log(chalk.hex('#64748B')(`     ...và ${unpushed.length - 5} commit khác`));
-    }
-
-    let sqChoice = 'no';
-    if (options.yes) {
-      sqChoice = 'no';
-    } else {
-      sqChoice = await selectWithBack({
-        message: `Gộp (squash) ${unpushed.length} commit thành 1 commit sạch để xóa vết secret cũ trong lịch sử?`,
-        choices: [
-          { name: 'Có, gộp thành 1 commit sạch', value: 'yes', description: 'Làm sạch hoàn toàn lịch sử commit' },
-          { name: 'Không, giữ nguyên', value: 'no', description: 'Bỏ qua' }
-        ]
-      });
-    }
-
-    if (sqChoice !== BACK && sqChoice === 'yes') {
-      spinner.start('Đang làm sạch lịch sử commit chưa push...');
-      const sq = squashUnpushedCommits(currentBranch, 'Clean commit without secrets', null, targetDir);
-      if (sq.ok) {
-        spinner.succeed(chalk.hex('#34D399')('[OK] Đã làm sạch commit chưa push! Sẵn sàng push lên remote an toàn.'));
-      } else {
-        spinner.fail(chalk.red(`Không thể squash: ${sq.error}`));
-      }
-    }
-  } else if (unpushed.length > 0) {
-    console.log(chalk.hex('#64748B')(`  » Có ${unpushed.length} commit chưa push (lịch sử sạch, không cần squash).\n`));
-  }
-
-  console.log(chalk.hex('#34D399')(`\n  [OK] Quét hoàn tất trên branch ${currentBranch} — repo an toàn.\n`));
-}
+import chalk from 'chalk';
+import ora from 'ora';
+import {
+  checkGitInstalled,
+  isGitRepo,
+  getCurrentBranchStrict,
+  findRiskyStagedFiles,
+  resolveTargetDir
+} from '../git.js';
+import { scanStagedContentForSecrets } from '../secrets.js';
+import {
+  autoFixStagedSecrets,
+  findRiskyWorkingTreeFiles,
+  getUnpushedCommits,
+  squashUnpushedCommits
+} from '../fix.js';
+import { selectWithBack, BACK } from '../prompt-helpers.js';
+import {
+  printSection,
+  printTargetDir,
+  printGitMissing,
+  printErrorBox,
+  printPrePushSecretWarning,
+  printFixResult
+} from '../ui.js';
+
+export async function runFixCommand(options = {}) {
+  const fromMenu = options.fromMenu === true;
+
+  if (!checkGitInstalled()) {
+    printGitMissing();
+    if (fromMenu) return;
+    process.exit(1);
+  }
+
+  let targetDir = process.cwd();
+  if (options.dir) {
+    const r = resolveTargetDir(options.dir, process.cwd());
+    if (!r.ok) {
+      printErrorBox('INVALID DIRECTORY', [r.error]);
+      if (fromMenu) return;
+      process.exit(1);
+    }
+    targetDir = r.fullPath;
+  }
+
+  printSection('SCAN FOR SECRETS');
+  printTargetDir(targetDir);
+
+  if (!isGitRepo(targetDir)) {
+    printErrorBox('NOT A GIT REPOSITORY', [`'${targetDir}' is not a Git repository.`]);
+    if (fromMenu) return;
+    process.exit(1);
+  }
+
+  const spinner = ora({ text: 'Checking staged files and the working tree…', color: 'cyan' }).start();
+  const risky = findRiskyStagedFiles(targetDir);
+  const findings = scanStagedContentForSecrets(targetDir);
+  const riskyWorking = findRiskyWorkingTreeFiles(targetDir);
+  spinner.stop();
+
+  const allDetected = [...new Set([...risky, ...findings.map((f) => f.file), ...riskyWorking])];
+  const hadSecrets = allDetected.length > 0;
+
+  if (allDetected.length === 0) {
+    console.log(chalk.hex('#34D399')('  [OK] No secrets found in staged files or the working tree.\n'));
+  } else {
+    printPrePushSecretWarning({ riskyFiles: allDetected, findings });
+    spinner.start('Applying fixes (unstaging files and updating .gitignore)...');
+    const res = autoFixStagedSecrets(allDetected, targetDir);
+    spinner.succeed(chalk.hex('#34D399')(`[OK] Processed ${res.fixed.length} file(s).`));
+    printFixResult(res);
+  }
+
+  // Suggest squashing unpushed commits only when secrets were detected,
+  // avoiding unnecessary rewrites of clean history.
+  const currentBranch = getCurrentBranchStrict(targetDir) || 'main';
+  const unpushed = getUnpushedCommits(currentBranch, targetDir);
+  if (unpushed.length > 0 && hadSecrets) {
+    printSection(`${unpushed.length} UNPUSHED LOCAL COMMITS`);
+    unpushed.slice(0, 5).forEach((c) => console.log(chalk.hex('#94A3B8')(`     - ${c}`)));
+    if (unpushed.length > 5) {
+      console.log(chalk.hex('#64748B')(`     ...and ${unpushed.length - 5} more commit(s)`));
+    }
+
+    let sqChoice = 'no';
+    if (options.yes) {
+      sqChoice = 'no';
+    } else {
+      sqChoice = await selectWithBack({
+        message: `Squash ${unpushed.length} commit(s) into one clean commit to remove old secrets from the history?`,
+        choices: [
+          { name: 'Yes, create one clean commit', value: 'yes', description: 'Clean the commit history' },
+          { name: 'No, keep as is', value: 'no', description: 'Skip' }
+        ]
+      });
+    }
+
+    if (sqChoice !== BACK && sqChoice === 'yes') {
+      spinner.start('Cleaning unpushed commit history...');
+      const sq = squashUnpushedCommits(currentBranch, 'Clean commit without secrets', null, targetDir);
+      if (sq.ok) {
+        spinner.succeed(chalk.hex('#34D399')('[OK] Unpushed commits cleaned. Ready to push safely.'));
+      } else {
+        spinner.fail(chalk.red(`Could not squash commits: ${sq.error}`));
+      }
+    }
+  } else if (unpushed.length > 0) {
+    console.log(chalk.hex('#64748B')(`  » ${unpushed.length} unpushed commit(s) found; history is clean, so no squash is needed.\n`));
+  }
+
+  console.log(chalk.hex('#34D399')(`\n  [OK] Scan complete on branch ${currentBranch}. Repository is safe.\n`));
+}