pan-stack-cli 0.2.1 → 0.2.2

package/lib/git/git-push.js

@@ -1,185 +0,0 @@
-#!/usr/bin/env node
-/*
- * Push local commits for PAN Stack project repositories.
- * Compact summary table: repo · branch · result · commits · MR/PR link.
- */
-
-const { parseCommonArgs, loadManifestRepos, printCommonOptions } = require("./helpers/cli");
-const { ensureRepoExists } = require("./helpers/git");
-const {
-  runGitSilent, parsePushOutput, printSummary, statusBadge, bulkColumns,
-  aheadBehind, aheadLineStats, getCurrentBranch,
-} = require("./helpers/bulk-report");
-const colors = require("./helpers/colors");
-const { t } = require("../i18n");
-
-function formatChanges(r) {
-  if (!r.filesChanged && !r.insertions && !r.deletions) return colors.dim("—");
-  const filesLabel = r.filesChanged === 1 ? t("BULK_FILES_ONE") : t("BULK_FILES_MANY");
-  const filesPart = r.filesChanged
-    ? `${r.filesChanged} ${filesLabel} `
-    : "";
-  return `${filesPart}${colors.green("+" + (r.insertions || 0))} ${colors.red("−" + (r.deletions || 0))}`;
-}
-
-function pushRepo({ name, destination, dryRun, setUpstream }) {
-  if (!ensureRepoExists({ name, destination })) {
-    return { name, skipped: true };
-  }
-  const branch = getCurrentBranch(destination) || t("GST_DETACHED");
-  // Đếm commit + line change chờ push TRƯỚC push (sau push @{u} đã bắt kịp HEAD).
-  const ab = aheadBehind(destination);
-  const commitsAhead = ab ? ab.ahead : 0;
-  const lines = commitsAhead > 0
-    ? aheadLineStats(destination)
-    : { insertions: 0, deletions: 0, filesChanged: 0 };
-
-  const gitArgs = ["push"];
-  if (setUpstream) gitArgs.push("-u", "origin", "HEAD");
-
-  if (dryRun) {
-    console.log(colors.dim(`[dry-run] (in ${destination}) git ${gitArgs.join(" ")}`));
-    return { name, branch, dryRun: true, commitsAhead, ...lines };
-  }
-
-  process.stdout.write(colors.dim(`  ↑ ${name} (${branch}) ... `));
-  const res = runGitSilent(gitArgs, destination);
-  const parsed = parsePushOutput(res.stdout, res.stderr);
-  const ok = res.status === 0 && !parsed.rejected;
-  const shortMsg = parsed.rejected ? t("BULK_STATUS_REJECTED")
-    : parsed.upToDate ? t("BULK_STATUS_UP_TO_DATE")
-    : parsed.pushed ? t("BULK_STATUS_PUSHED")
-    : ok ? t("BULK_STATUS_OK")
-    : t("BULK_STATUS_FAILED");
-  console.log((ok ? (parsed.upToDate ? colors.dim : colors.green) : colors.red)(shortMsg));
-
-  return {
-    name, branch, commitsAhead,
-    insertions: lines.insertions,
-    deletions: lines.deletions,
-    filesChanged: lines.filesChanged,
-    status: res.status,
-    pushed: parsed.pushed,
-    upToDate: parsed.upToDate,
-    rejected: parsed.rejected,
-    mrLink: parsed.mrLink,
-    refs: parsed.refs,
-    error: res.status !== 0 && !parsed.rejected ? (res.stderr.split("\n")[0] || "").slice(0, 80) : "",
-  };
-}
-
-function row(r) {
-  if (r.skipped) {
-    return {
-      repo: colors.dim(r.name), branch: "", result: colors.dim(t("BULK_STATUS_SKIPPED")),
-      commits: "", changes: "", link: "",
-    };
-  }
-  if (r.dryRun) {
-    return {
-      repo: r.name, branch: r.branch, result: colors.dim(t("BULK_STATUS_DRY_RUN")),
-      commits: String(r.commitsAhead || 0), changes: formatChanges(r), link: "",
-    };
-  }
-  const result =
-    r.rejected ? statusBadge("fail", t("BULK_STATUS_REJECTED"))
-    : r.upToDate ? statusBadge("skip", t("BULK_STATUS_UP_TO_DATE"))
-    : r.error ? statusBadge("fail", t("BULK_STATUS_FAILED"))
-    : r.pushed ? statusBadge("ok", t("BULK_STATUS_PUSHED"))
-    : statusBadge("ok", t("BULK_STATUS_OK"));
-  const commits = r.commitsAhead
-    ? colors.cyan(String(r.commitsAhead))
-    : colors.dim("—");
-  const link = r.mrLink ? colors.cyan(r.mrLink) : colors.dim("—");
-  return { repo: r.name, branch: r.branch, result, commits, changes: formatChanges(r), link };
-}
-
-function printHelp() {
-  console.log(`usage: git-push.js [--base-dir BASE_DIR] [--dry-run] [--set-upstream] [manifest]
-
-Push local commits for repositories listed in a PAN Stack clone manifest.
-Prints a compact summary table (repo · branch · result · commits · changes · MR/PR link).
-
-${printCommonOptions()}
-  --set-upstream       Use git push -u origin HEAD for new branches`);
-}
-
-function main() {
-  const args = parseCommonArgs(process.argv.slice(2), {
-    defaults: { setUpstream: false },
-    handlers: { "--set-upstream": (p) => { p.setUpstream = true; } },
-  });
-  if (args.help) { printHelp(); return; }
-
-  const { repos } = loadManifestRepos({ manifestPath: args.manifest, baseDir: args.baseDir });
-  const results = repos.map((r) => pushRepo({ name: r.name, destination: r.destination, dryRun: args.dryRun, setUpstream: args.setUpstream }));
-
-  const pushed = results.filter((r) => r.pushed);
-  const rejected = results.filter((r) => r.rejected);
-  const failed = results.filter((r) => r.error);
-  const upToDate = results.filter((r) => r.upToDate);
-  const withLink = results.filter((r) => r.mrLink);
-  // Chỉ đưa vào bảng: pushed / rejected / có MR link / lỗi / dry-run (bỏ up-to-date).
-  const shown = results.filter((r) => r.dryRun || r.pushed || r.rejected || r.error || r.mrLink);
-  const rows = shown.map(row);
-
-  const linesOf = (list) => list.reduce(
-    (acc, r) => ({
-      commits: acc.commits + (r.commitsAhead || 0),
-      insertions: acc.insertions + (r.insertions || 0),
-      deletions: acc.deletions + (r.deletions || 0),
-    }),
-    { commits: 0, insertions: 0, deletions: 0 }
-  );
-  const pushedLines = linesOf(pushed.length ? pushed : shown.filter((r) => r.dryRun && r.commitsAhead));
-
-  const footer = [];
-  footer.push(colors.dim(t("PUSH_FOOTER_COUNTS__TOTAL_PUSHED_UPTODATE_REJECTED_FAILED", {
-    total: results.length, pushed: pushed.length, upToDate: upToDate.length,
-    rejected: rejected.length, failed: failed.length,
-  })));
-  if (pushedLines.commits > 0 || pushedLines.insertions > 0 || pushedLines.deletions > 0) {
-    footer.push(colors.dim(t("PUSH_FOOTER_LINES__COMMITS_ADD_DEL", {
-      commits: pushedLines.commits,
-      add: pushedLines.insertions,
-      del: pushedLines.deletions,
-    })));
-  }
-  if (withLink.length) {
-    footer.push("");
-    footer.push(colors.bold(t("PUSH_LINKS_HEADER")));
-    for (const r of withLink) {
-      footer.push(`  ${colors.cyan(r.name)} (${r.branch}): ${r.mrLink}`);
-    }
-  }
-  if (rejected.length) {
-    footer.push("");
-    footer.push(colors.yellow(t("PUSH_REJECTED_HEADER")));
-    for (const r of rejected) footer.push(`  ${r.name}`);
-  }
-
-  if (rows.length === 0) {
-    console.log("");
-    console.log(colors.bold(`─── ${t("PUSH_TITLE")} ───`));
-    console.log(colors.green(t("PUSH_ALL_UP_TO_DATE__N", { n: results.length })));
-    for (const line of footer) console.log(line);
-  } else {
-    printSummary({
-      title: t("PUSH_TITLE"),
-      rows,
-      columns: bulkColumns([
-        { key: "repo", labelKey: "BULK_COL_REPO" },
-        { key: "branch", labelKey: "BULK_COL_BRANCH" },
-        { key: "result", labelKey: "BULK_COL_RESULT" },
-        { key: "commits", labelKey: "BULK_COL_COMMITS", align: "r" },
-        { key: "changes", labelKey: "BULK_COL_CHANGES" },
-        { key: "link", labelKey: "BULK_COL_LINK" },
-      ]),
-      footerLines: footer,
-    });
-  }
-
-  if (rejected.length || failed.length) process.exitCode = 1;
-}
-
-try { main(); } catch (error) { console.error(error.message); process.exit(1); }

package/lib/git/git-sync-main.js

@@ -1,334 +0,0 @@
-#!/usr/bin/env node
-/*
- * Sync origin/main (or --ref) into the current branch for selected PAN Stack repos.
- *
- * Fetches first, then merge (default) or rebase (--rebase). Interactive repo picker
- * when TTY; pass repo name or "all" as first positional argument.
- */
-
-const {
-  looksLikeManifest,
-  loadManifestRepos,
-  printCommonOptions,
-} = require("./helpers/cli");
-const colors = require("./helpers/colors");
-const { resolveTargets } = require("./helpers/repo-select");
-const { t } = require("../i18n");
-const {
-  ensureRepoExists,
-  runGit,
-  runGitCapture,
-  getCurrentBranch,
-  refExists,
-  listConflictedFiles,
-  isMergeOrRebaseInProgress,
-  countDirtyFiles,
-} = require("./helpers/git");
-
-const ICON = {
-  ok: "✅",
-  warn: "⚠️",
-  conflict: "⛔",
-  skip: "⏭️",
-  info: "ℹ️",
-};
-
-function printHelp() {
-  console.log(`usage: pan sync-main [repo|all] [options]   (alias: pan sm)
-
-Fetch remote main (or --ref) and merge into the current branch for workspace and/or child repos.
-
-positional:
-  repo|all           Repo name from .project.yaml, or "all". Interactive picker if omitted (TTY).
-
-${printCommonOptions()}
-  --ref REF            Remote-tracking ref to merge (default: origin/main)
-  --rebase             Use git rebase instead of merge
-  --no-workspace       Only manifest child repos (skip workspace stack root)`);
-}
-
-function parseSyncMainArgs(argv) {
-  const args = {
-    help: false,
-    manifest: "",
-    baseDir: ".",
-    dryRun: false,
-    ref: "origin/main",
-    rebase: false,
-    noWorkspace: false,
-    selection: "",
-  };
-
-  for (let index = 0; index < argv.length; index += 1) {
-    const arg = argv[index];
-    if (arg === "-h" || arg === "--help") {
-      args.help = true;
-    } else if (arg === "--base-dir") {
-      args.baseDir = argv[++index] || ".";
-    } else if (arg === "--dry-run") {
-      args.dryRun = true;
-    } else if (arg === "--ref") {
-      args.ref = argv[++index] || "origin/main";
-    } else if (arg === "--rebase") {
-      args.rebase = true;
-    } else if (arg === "--no-workspace") {
-      args.noWorkspace = true;
-    } else if (!arg.startsWith("-")) {
-      if (looksLikeManifest(arg) && !args.manifest) {
-        args.manifest = arg;
-      } else if (!args.selection) {
-        args.selection = arg;
-      } else {
-        throw new Error(`Unexpected argument: ${arg}`);
-      }
-    } else {
-      throw new Error(`Unexpected argument: ${arg}`);
-    }
-  }
-
-  return args;
-}
-
-function printEarlyConflict({ name, branch, ref, files, mode }) {
-  const headline = colors.bold(
-    colors.red(`${ICON.conflict} [conflict] ${name} (${branch})`)
-  );
-  const detail = colors.yellow(
-    t("SYNCMAIN_CONFLICT_SHORT__MODE_REF_N", { mode, ref, n: files.length })
-  );
-  console.log(`${headline} — ${detail}`);
-  for (const file of files.slice(0, 8)) {
-    console.log(colors.dim(`    • ${file}`));
-  }
-  if (files.length > 8) {
-    console.log(
-      colors.dim(`    ${t("SYNCMAIN_MORE_FILES__N", { n: files.length - 8 })}`)
-    );
-  }
-}
-
-function syncMainRepo({
-  name,
-  destination,
-  dryRun,
-  ref,
-  rebase,
-}) {
-  const result = {
-    name,
-    destination,
-    branch: "",
-    status: "skipped",
-    message: "",
-    conflictFiles: [],
-    mode: rebase ? "rebase" : "merge",
-  };
-
-  if (!ensureRepoExists({ name, destination })) {
-    result.message = t("SYNCMAIN_MSG_NOT_CLONED");
-    return result;
-  }
-
-  const branch = getCurrentBranch(destination);
-  result.branch = branch || t("SYNCMAIN_DETACHED_LABEL");
-  if (!branch) {
-    result.message = t("SYNCMAIN_MSG_DETACHED");
-    console.log(`${ICON.skip} [skip] ${name}: ${result.message}`);
-    return result;
-  }
-
-  const inProgress = isMergeOrRebaseInProgress(destination);
-  if (inProgress) {
-    const files = listConflictedFiles(destination);
-    result.status = "conflict";
-    result.conflictFiles = files;
-    result.message = t("SYNCMAIN_MSG_IN_PROGRESS__MODE", { mode: inProgress });
-    printEarlyConflict({ name, branch, ref, files, mode: inProgress });
-    return result;
-  }
-
-  const dirtyCount = countDirtyFiles(destination);
-  if (dirtyCount > 0) {
-    console.log(
-      `${ICON.warn} ${colors.yellow(t("SYNCMAIN_MSG_DIRTY__NAME_N", { name, n: dirtyCount }))}`
-    );
-  }
-
-  if (dryRun) {
-    console.log(
-      `[dry-run] (in ${destination}) git fetch origin && git ${rebase ? "rebase" : "merge"} ${ref}`
-    );
-    result.status = "dry-run";
-    result.message = "dry-run";
-    return result;
-  }
-
-  console.log(`[fetch] ${name}: ${destination}`);
-  const fetch = runGitCapture(["fetch", "origin"], { cwd: destination });
-  if (fetch.status !== 0) {
-    result.status = "error";
-    result.message = fetch.stderr || t("SYNCMAIN_MSG_FETCH_FAILED");
-    console.log(`${ICON.warn} ${colors.yellow(`[warn] ${name}: ${result.message}`)}`);
-    return result;
-  }
-
-  if (!refExists(destination, ref)) {
-    result.status = "error";
-    result.message = t("SYNCMAIN_MSG_REF_MISSING__REF", { ref });
-    console.log(`${ICON.warn} ${colors.yellow(`[warn] ${name}: ${result.message}`)}`);
-    return result;
-  }
-
-  const gitArgs = rebase ? ["rebase", ref] : ["merge", "--no-edit", ref];
-  console.log(`[${result.mode}] ${name} (${branch}) ← ${ref}`);
-  const action = runGit(gitArgs, {
-    cwd: destination,
-    dryRun: false,
-    action: result.mode,
-    name,
-  });
-
-  const conflictFiles = listConflictedFiles(destination);
-  if (conflictFiles.length > 0 || action !== 0) {
-    result.status = "conflict";
-    result.conflictFiles =
-      conflictFiles.length > 0 ? conflictFiles : [t("SYNCMAIN_MSG_SEE_STATUS")];
-    result.message = t("SYNCMAIN_MSG_CONFLICT__MODE", { mode: result.mode });
-    printEarlyConflict({
-      name,
-      branch,
-      ref,
-      files: result.conflictFiles,
-      mode: result.mode,
-    });
-    return result;
-  }
-
-  result.status = "ok";
-  result.message = t("SYNCMAIN_MSG_UPDATED");
-  console.log(
-    `${ICON.ok} ${colors.green(t("SYNCMAIN_MSG_SYNCED__NAME_BRANCH_REF", { name, branch, ref }))}`
-  );
-  return result;
-}
-
-function printSummary(results, { ref, rebase }) {
-  const ok = results.filter((item) => item.status === "ok");
-  const conflicts = results.filter((item) => item.status === "conflict");
-  const errors = results.filter((item) => item.status === "error");
-  const skipped = results.filter(
-    (item) => item.status === "skipped" || item.status === "dry-run"
-  );
-
-  console.log("");
-  console.log(colors.bold(t("SYNCMAIN_HEADER")));
-  console.log(
-    `${ICON.info} ${t("SYNCMAIN_INFO__REF_MODE_REPOS", {
-      ref, mode: rebase ? "rebase" : "merge", repos: results.length,
-    })}`
-  );
-  console.log(
-    t("SYNCMAIN_COUNTS__OK_CONFLICT_ERR_SKIP", {
-      ok: ok.length, conflict: conflicts.length, err: errors.length, skip: skipped.length,
-    })
-  );
-
-  if (conflicts.length > 0) {
-    console.log("");
-    console.log(
-      colors.bold(colors.red(`${ICON.conflict} ${t("SYNCMAIN_CONFLICT_HEADER")}`))
-    );
-    for (const item of conflicts) {
-      console.log(colors.yellow(`\n  ${item.name} (${item.branch})`));
-      console.log(colors.dim(`  ${item.destination}`));
-      for (const file of item.conflictFiles) {
-        console.log(`    • ${file}`);
-      }
-      const hint = item.mode === "rebase"
-        ? t("SYNCMAIN_HINT_REBASE")
-        : t("SYNCMAIN_HINT_MERGE");
-      console.log(colors.dim(`  → ${hint}`));
-    }
-  }
-
-  if (errors.length > 0) {
-    console.log("");
-    console.log(colors.bold(colors.yellow(`${ICON.warn} ${t("SYNCMAIN_ERRORS_HEADER")}`)));
-    for (const item of errors) {
-      console.log(`  • ${item.name}: ${item.message}`);
-    }
-  }
-
-  if (conflicts.length > 0) {
-    console.log("");
-    console.log(
-      colors.bold(colors.red(`${ICON.conflict} ${t("SYNCMAIN_END_CONFLICT")}`))
-    );
-  } else if (errors.length > 0) {
-    console.log("");
-    console.log(
-      colors.bold(colors.yellow(`${ICON.warn} ${t("SYNCMAIN_END_ERROR")}`))
-    );
-  } else if (ok.length > 0) {
-    console.log("");
-    console.log(
-      colors.green(`${ICON.ok} ${t("SYNCMAIN_END_ALL_SYNCED__REF", { ref })}`)
-    );
-  }
-}
-
-async function main() {
-  const argv = process.argv.slice(2);
-  const args = parseSyncMainArgs(argv);
-  if (args.help) {
-    printHelp();
-    return;
-  }
-
-  const { repos, workspaceRoot } = loadManifestRepos({
-    manifestPath: args.manifest,
-    baseDir: args.baseDir,
-  });
-
-  const targets = await resolveTargets({
-    repos,
-    workspaceRoot,
-    includeWorkspace: !args.noWorkspace,
-    selection: args.selection,
-  });
-
-  console.log(
-    `${ICON.info} ${t("SYNCMAIN_INTRO__COUNT_MODE_REF", {
-      count: targets.length,
-      mode: args.rebase ? "rebase" : "merge",
-      ref: args.ref,
-    })}`
-  );
-
-  const results = [];
-  for (const target of targets) {
-    results.push(
-      syncMainRepo({
-        name: target.name,
-        destination: target.destination,
-        dryRun: args.dryRun,
-        ref: args.ref,
-        rebase: args.rebase,
-      })
-    );
-    console.log("");
-  }
-
-  printSummary(results, { ref: args.ref, rebase: args.rebase });
-
-  const hasConflict = results.some((item) => item.status === "conflict");
-  const hasError = results.some((item) => item.status === "error");
-  if (hasConflict || hasError) {
-    process.exit(1);
-  }
-}
-
-main().catch((error) => {
-  console.error(error.message);
-  process.exit(1);
-});