pan-stack-cli 0.1.5 → 0.2.1

package/lib/git/helpers/bulk-report.js

@@ -0,0 +1,202 @@
+"use strict";
+
+const { spawnSync } = require("child_process");
+const { spawnOptions } = require("../../platform");
+const colors = require("./colors");
+const { runGitCapture, getCurrentBranch, listConflictedFiles } = require("./git");
+const { t } = require("../../i18n");
+
+const ICON = { ok: "✅", fail: "❌", warn: "⚠️", skip: "⏭️", info: "ℹ️", up: "↑", down: "↓" };
+
+// ───────── shared helpers ─────────
+
+/** Chạy git im lặng, capture stdout/stderr; trả { status, stdout, stderr }. */
+function runGitSilent(gitArgs, cwd) {
+  const result = spawnSync("git", gitArgs, spawnOptions({ cwd, encoding: "utf8" }));
+  return {
+    status: result.status ?? 1,
+    stdout: (result.stdout || "").trim(),
+    stderr: (result.stderr || "").trim(),
+  };
+}
+
+/** ahead/behind so với upstream. Trả null nếu không có upstream. */
+function aheadBehind(cwd) {
+  const upstream = runGitCapture(["rev-parse", "--abbrev-ref", "@{u}"], { cwd });
+  if (upstream.status !== 0 || !upstream.stdout) return null;
+  const rl = runGitCapture(["rev-list", "--left-right", "--count", "HEAD...@{u}"], { cwd });
+  if (rl.status !== 0) return null;
+  const [ahead, behind] = rl.stdout.split(/\s+/).map((n) => parseInt(n, 10) || 0);
+  return { ahead, behind, upstream: upstream.stdout };
+}
+
+/**
+ * Tổng line change của các commit sắp push (@{u}..HEAD).
+ * Cộng theo từng commit (`git log --numstat`), không dùng net-diff.
+ * Trả { insertions, deletions, filesChanged } — filesChanged = số path unique.
+ */
+function aheadLineStats(cwd, { range } = {}) {
+  const empty = { insertions: 0, deletions: 0, filesChanged: 0 };
+  let revRange = range;
+  if (!revRange) {
+    const ab = aheadBehind(cwd);
+    if (!ab || ab.ahead === 0) return empty;
+    revRange = "@{u}..HEAD";
+  }
+  const res = runGitCapture(
+    ["log", "--numstat", "--pretty=tformat:", "--no-merges", revRange],
+    { cwd }
+  );
+  if (res.status !== 0) return empty;
+  let insertions = 0;
+  let deletions = 0;
+  const files = new Set();
+  for (const line of (res.stdout || "").split(/\r?\n/)) {
+    if (!line) continue;
+    // numstat: "<add>\t<del>\t<path>" — binary: "-\t-\t<path>"
+    const parts = line.split("\t");
+    if (parts.length < 3) continue;
+    const add = parts[0] === "-" ? 0 : parseInt(parts[0], 10) || 0;
+    const del = parts[1] === "-" ? 0 : parseInt(parts[1], 10) || 0;
+    insertions += add;
+    deletions += del;
+    files.add(parts.slice(2).join("\t"));
+  }
+  return { insertions, deletions, filesChanged: files.size };
+}
+
+// ───────── output parsers ─────────
+
+/** Parse `git pull` output. */
+function parsePullOutput(stdout, stderr) {
+  const text = `${stdout}\n${stderr}`;
+  const out = { mode: "unknown", filesChanged: 0, insertions: 0, deletions: 0, conflict: false, upToDate: false };
+  if (/Already up to date|Already up-to-date/i.test(text)) out.upToDate = true;
+  if (/Fast-forward/i.test(text)) out.mode = "fast-forward";
+  else if (/Merge made by/i.test(text)) out.mode = "merge";
+  else if (/Successfully rebased/i.test(text)) out.mode = "rebase";
+  else if (/CONFLICT/i.test(text)) { out.mode = "conflict"; out.conflict = true; }
+  // shortstat line: " 12 files changed, 234 insertions(+), 56 deletions(-)"
+  const stat = text.match(/(\d+)\s+files?\s+changed(?:,\s*(\d+)\s+insertions?\(\+\))?(?:,\s*(\d+)\s+deletions?\(-\))?/);
+  if (stat) {
+    out.filesChanged = parseInt(stat[1], 10);
+    out.insertions = parseInt(stat[2] || "0", 10);
+    out.deletions = parseInt(stat[3] || "0", 10);
+  }
+  return out;
+}
+
+/** Parse `git push` output. GitLab/GitHub in gợi ý URL MR/PR ở stderr. */
+function parsePushOutput(stdout, stderr) {
+  const text = `${stdout}\n${stderr}`;
+  const out = { pushed: false, upToDate: false, rejected: false, mrLink: "", refs: [] };
+  if (/Everything up-to-date|up to date/i.test(text)) out.upToDate = true;
+  if (/\[rejected\]|! \[remote rejected\]|failed to push some refs/i.test(text)) out.rejected = true;
+  // URL merge_requests hoặc pull/new
+  const url =
+    text.match(/https?:\/\/\S*merge_requests\/new\S*/) ||
+    text.match(/https?:\/\/\S*\/merge_requests\/\d+/) ||
+    text.match(/https?:\/\/\S*\/-\/merge_requests\S*/) ||
+    text.match(/https?:\/\/\S*\/pull\/new\/\S+/) ||
+    text.match(/https?:\/\/\S*\/pull\/\d+/);
+  if (url) out.mrLink = url[0].replace(/[.,)]+$/, "");
+  // refs pushed: "abcdef..123456  main -> main"
+  const refRe = /([0-9a-f]{7,}\.\.[0-9a-f]{7,})\s+(\S+)\s+->\s+(\S+)/g;
+  let m;
+  while ((m = refRe.exec(text)) !== null) {
+    out.refs.push({ range: m[1], local: m[2], remote: m[3] });
+    out.pushed = true;
+  }
+  // "* [new branch]"
+  if (/\*\s+\[new branch\]/.test(text)) out.pushed = true;
+  return out;
+}
+
+/** Parse `git fetch --all` output — số dòng update ref. */
+function parseFetchOutput(stdout, stderr) {
+  const text = `${stdout}\n${stderr}`;
+  const out = { newBranches: 0, updatedBranches: 0, newTags: 0, prunedRefs: 0 };
+  out.newBranches = (text.match(/\*\s+\[new branch\]/g) || []).length;
+  out.updatedBranches = (text.match(/^\s*[0-9a-f]{6,}\.\.[0-9a-f]{6,}\s+/gm) || []).length;
+  out.newTags = (text.match(/\*\s+\[new tag\]/g) || []).length;
+  out.prunedRefs = (text.match(/\[deleted\]/g) || []).length;
+  return out;
+}
+
+// ───────── table renderer ─────────
+
+/**
+ * @param {Array<{key:string,label:string,align?:'l'|'r'}>} columns
+ * @param {Array<Object>} rows
+ */
+function renderTable(columns, rows) {
+  // strip ANSI để đo width thật
+  const strip = (s) => String(s ?? "").replace(/\x1b\[[0-9;]*m/g, "");
+  const visLen = (s) => strip(s).length;
+  const widths = columns.map((c) => Math.max(c.label.length, ...rows.map((r) => visLen(r[c.key]))));
+
+  const pad = (s, w, align) => {
+    const len = visLen(s);
+    const spaces = " ".repeat(Math.max(0, w - len));
+    return align === "r" ? spaces + s : s + spaces;
+  };
+
+  const header = columns.map((c, i) => colors.bold(pad(c.label, widths[i], c.align))).join("  ");
+  const sep = columns.map((_, i) => colors.dim("─".repeat(widths[i]))).join("  ");
+  const body = rows.map((r) =>
+    columns.map((c, i) => pad(String(r[c.key] ?? ""), widths[i], c.align)).join("  ")
+  );
+  return [header, sep, ...body].join("\n");
+}
+
+function statusBadge(kind, text) {
+  if (kind === "ok") return colors.green(`${ICON.ok} ${text}`);
+  if (kind === "warn") return colors.yellow(`${ICON.warn} ${text}`);
+  if (kind === "fail") return colors.red(`${ICON.fail} ${text}`);
+  if (kind === "skip") return colors.dim(`${ICON.skip} ${text}`);
+  return text;
+}
+
+function printSummary({ title, rows, columns, footerLines = [] }) {
+  console.log("");
+  console.log(colors.bold(`─── ${title} ───`));
+  if (rows.length === 0) {
+    console.log(colors.dim("(no data)"));
+    return;
+  }
+  console.log(renderTable(columns, rows));
+  for (const line of footerLines) console.log(line);
+}
+
+/** Helper: cột bảng có label theo i18n. */
+function bulkColumns(specs) {
+  return specs.map((s) => ({ key: s.key, label: t(s.labelKey), align: s.align }));
+}
+
+/** Dịch mode pull (fast-forward/merge/rebase/conflict) qua i18n. */
+function pullModeLabel(mode) {
+  switch (mode) {
+    case "fast-forward": return t("BULK_MODE_FAST_FORWARD");
+    case "merge": return t("BULK_MODE_MERGE");
+    case "rebase": return t("BULK_MODE_REBASE");
+    case "conflict": return t("BULK_STATUS_CONFLICT");
+    default: return mode;
+  }
+}
+
+module.exports = {
+  ICON,
+  runGitSilent,
+  aheadBehind,
+  aheadLineStats,
+  parsePullOutput,
+  parsePushOutput,
+  parseFetchOutput,
+  renderTable,
+  statusBadge,
+  printSummary,
+  bulkColumns,
+  pullModeLabel,
+  listConflictedFiles,
+  getCurrentBranch,
+};

package/lib/git/helpers/cli.js

@@ -1,7 +1,8 @@
 const path = require("path");
 const fs = require("fs");
-const { findNearestProjectManifest } = require("../../discover");
-const { parseManifest, manifestRepos, validateRepo } = require("./manifest");
+const { findNearestProjectManifest, discoverGitRepos } = require("../../discover");
+const { parseManifestWithLocal, manifestRepos, validateRepo } = require("./manifest");
+const { t } = require("../../i18n");
 
 function parseCommonArgs(argv, extraFlags = {}) {
   const args = {
@@ -96,12 +97,46 @@ function resolveProjectWorkspace({
   };
 }
 
-function loadManifestRepos({ manifestPath, baseDir, startDir = process.cwd() }) {
-  const workspace = resolveProjectWorkspace({ manifestPath, baseDir, startDir });
+/**
+ * Fallback khi không có `.project.yaml`: coi `startDir` (nơi gõ lệnh) là gốc dự
+ * án, quét git repo con bên trong (giống `pan stats`) — dùng cho các lệnh git
+ * thuần (pull/push/fetch/checkout/sync-main/mr/grv/gst), KHÔNG áp dụng cho
+ * `clone` (cần url khai báo trong manifest, không tự suy ra được).
+ */
+function fallbackReposFromScan(startDir) {
+  const found = discoverGitRepos(startDir);
+  if (!found.length) {
+    throw new Error(
+      t("MANIFEST_NOT_FOUND_NO_GIT_FALLBACK__DIR", { dir: startDir })
+    );
+  }
+  console.log(t("MANIFEST_NOT_FOUND_FALLBACK_SCAN__DIR", { dir: startDir }));
+  return found.map((repo) => ({
+    name: repo.name,
+    url: null,
+    repoPath: path.relative(startDir, repo.dir) || ".",
+    destination: repo.dir,
+  }));
+}
+
+function loadManifestRepos({ manifestPath, baseDir, startDir = process.cwd(), allowFallback = true }) {
+  let workspace;
+  try {
+    workspace = resolveProjectWorkspace({ manifestPath, baseDir, startDir });
+  } catch (error) {
+    if (!allowFallback) throw error;
+    return {
+      repos: fallbackReposFromScan(startDir),
+      manifestPath: "",
+      baseDir: startDir,
+      workspaceRoot: startDir,
+    };
+  }
+
   const { manifestPath: resolvedManifest, baseDir: resolvedBaseDir, workspaceRoot } =
     workspace;
 
-  const data = parseManifest(resolvedManifest);
+  const data = parseManifestWithLocal(resolvedManifest);
   const repos = manifestRepos(data);
   if (repos.length === 0) {
     throw new Error("No repositories found in manifest.");

package/lib/git/helpers/manifest.js

@@ -1,6 +1,8 @@
 const fs = require("fs");
+const path = require("path");
 
 const PLACEHOLDER_VALUES = new Set(["", "repo_url_to_be_filled", "pan_stack_repo_url"]);
+const LOCAL_MANIFEST_FILE = ".project.local.yaml";
 
 function cleanValue(value) {
   let result = String(value || "").trim();
@@ -79,6 +81,92 @@ function parseManifest(manifestPath) {
   return data;
 }
 
+/**
+ * Parse `.project.yaml` rồi GỘP THÊM `repositories:` từ `.project.local.yaml` cùng thư mục
+ * (nếu có) — file cá nhân (gitignore), chỉ cần field `repositories:`. Mọi lệnh git built-in
+ * (clone/pull/push/fetch/grv/gst/sync-main/mr/checkout) đi qua `loadManifestRepos` (./cli.js) nên
+ * tự động thấy repo local — xem lib/manifest.js#parseManifestWithLocal (bản dùng cho .pan.yaml
+ * project commands) để biết thêm; 2 nơi khác parser (helpers riêng cho git built-in) nên duplicate
+ * logic merge ở đây, KHÔNG duplicate parser.
+ */
+function parseManifestWithLocal(manifestPath) {
+  const data = parseManifest(manifestPath);
+  const localPath = path.join(path.dirname(manifestPath), LOCAL_MANIFEST_FILE);
+  if (fs.existsSync(localPath)) {
+    const localData = parseManifest(localPath);
+    const localRepos = Array.isArray(localData.repositories) ? localData.repositories : [];
+    if (localRepos.length) {
+      data.repositories = [...(data.repositories || []), ...localRepos];
+      console.error(`ℹ️  +${localRepos.length} repo từ ${LOCAL_MANIFEST_FILE}`);
+    }
+  }
+  return data;
+}
+
+// Nhận diện 1 tham số CÓ PHẢI git URL hay không (để `pan clone <url>` phân biệt với
+// `pan clone` (không tham số = clone all) / `pan clone custom.project.yaml` (chỉ định manifest)).
+function looksLikeGitUrl(arg) {
+  if (!arg) return false;
+  if (/^(https?|ssh|git):\/\//i.test(arg)) return true;
+  if (/^[\w.-]+@[\w.-]+:.+/.test(arg)) return true; // scp-like: git@host:group/repo.git
+  if (/\.git$/i.test(arg)) return true;
+  return false;
+}
+
+// Tách tên dự án từ git URL — bỏ đuôi ".git", lấy phần cuối sau "/" (hoặc ":" kiểu scp-like).
+//   https://host/group/my-repo.git      -> my-repo
+//   git@github.com:user/my-repo.git     -> my-repo
+//   https://github.com/user/my-repo     -> my-repo
+function repoNameFromUrl(url) {
+  let s = String(url || "").trim().replace(/\/+$/, "").replace(/\.git$/i, "");
+  const idx = Math.max(s.lastIndexOf("/"), s.lastIndexOf(":"));
+  return idx >= 0 ? s.slice(idx + 1) : s;
+}
+
+/**
+ * Thêm 1 entry mới vào cuối danh sách `repositories:` trong `.project.yaml` (ghi trực tiếp vào
+ * FILE, không phải `.project.local.yaml`) — dùng bởi `pan clone <url>`. Chèn ngay TRƯỚC section
+ * top-level kế tiếp (nếu `repositories:` không phải section cuối file), hoặc cuối file nếu là
+ * section cuối; nếu file chưa có `repositories:` thì thêm mới section này ở cuối.
+ * @param {string} manifestPath
+ * @param {{name:string, url:string, path:string, description?:string}} repo
+ */
+function appendRepository(manifestPath, repo) {
+  const content = fs.readFileSync(manifestPath, "utf8");
+  const lines = content.split(/\r?\n/);
+  // Bỏ các dòng trống Ở CUỐI (do file gốc kết bằng newline) — tránh chèn nhầm sau dòng trống đó
+  // (sinh ra 1 dòng trống thừa) và đảm bảo luôn ghi lại với ĐÚNG 1 newline cuối file.
+  while (lines.length && lines[lines.length - 1].trim() === "") {
+    lines.pop();
+  }
+  const entryLines = [
+    `  - name: ${repo.name}`,
+    ...(repo.description ? [`    description: ${repo.description}`] : []),
+    `    url: ${repo.url}`,
+    `    path: ${repo.path}`,
+  ];
+
+  const repoLineIdx = lines.findIndex((l) => /^repositories:\s*$/.test(l));
+  if (repoLineIdx === -1) {
+    const trimmed = content.replace(/\s+$/, "");
+    fs.writeFileSync(manifestPath, `${trimmed}\n\nrepositories:\n${entryLines.join("\n")}\n`, "utf8");
+    return;
+  }
+
+  let endIdx = lines.length;
+  for (let i = repoLineIdx + 1; i < lines.length; i += 1) {
+    const line = lines[i];
+    if (line.trim() === "") continue;
+    const indent = line.length - line.trimStart().length;
+    if (indent === 0) {
+      endIdx = i;
+      break;
+    }
+  }
+  const newLines = [...lines.slice(0, endIdx), ...entryLines, ...lines.slice(endIdx)];
+  fs.writeFileSync(manifestPath, `${newLines.join("\n")}\n`, "utf8");
+}
+
 function uniqueRepos(repos) {
   const seen = new Set();
   const result = [];
@@ -121,9 +209,14 @@ function validateRepo(repo) {
 
 module.exports = {
   PLACEHOLDER_VALUES,
+  LOCAL_MANIFEST_FILE,
   cleanValue,
   splitKeyValue,
   parseManifest,
+  parseManifestWithLocal,
+  looksLikeGitUrl,
+  repoNameFromUrl,
+  appendRepository,
   uniqueRepos,
   manifestRepos,
   validateRepo,