@anxin233/gitviz 1.0.4 → 1.1.0

package/dist/cli.cjs

@@ -11470,12 +11470,46 @@ var GitParser = class {
       return false;
     }
   }
-  async parseCommits(limit = 1e3) {
-    const log = await this.git.log({
+  async getBranches() {
+    try {
+      const branchSummary = await this.git.branch(["-a"]);
+      const branches = [];
+      const seenBranches = /* @__PURE__ */ new Set();
+      for (const branchName of branchSummary.all) {
+        if (branchName.includes("remotes/origin/HEAD"))
+          continue;
+        const cleanName = branchName.replace("remotes/origin/", "").replace(/^\*\s*/, "");
+        if (seenBranches.has(cleanName))
+          continue;
+        seenBranches.add(cleanName);
+        try {
+          const log = await this.git.log({ maxCount: 1, [branchName]: null });
+          if (log.latest) {
+            const commitCount = await this.git.raw(["rev-list", "--count", branchName]);
+            branches.push({
+              name: cleanName,
+              commits: parseInt(commitCount.trim()),
+              lastCommit: new Date(log.latest.date)
+            });
+          }
+        } catch {
+        }
+      }
+      return branches;
+    } catch {
+      return [];
+    }
+  }
+  async parseCommits(limit = 1e3, branch) {
+    const logOptions = {
       maxCount: limit,
       "--numstat": null,
       "--pretty": "format:%H|%an|%ae|%ai|%s"
-    });
+    };
+    if (branch) {
+      logOptions[branch] = null;
+    }
+    const log = await this.git.log(logOptions);
     const commits = [];
     for (const commit of log.all) {
       let diffSummary;
@@ -11501,7 +11535,8 @@ var GitParser = class {
         message: commit.message,
         files: diffSummary.files.map((f) => f.file),
         insertions: diffSummary.insertions,
-        deletions: diffSummary.deletions
+        deletions: diffSummary.deletions,
+        branch
       });
     }
     return commits;
@@ -11575,7 +11610,8 @@ var Analyzer = class {
     return {
       timeline: this.generateTimelineData(analysis.commits),
       contributors: this.generateContributorData(analysis.contributors),
-      heatmap: this.generateHeatmapData(analysis.files)
+      heatmap: this.generateHeatmapData(analysis.files),
+      branches: this.generateBranchData(analysis.branches || [])
     };
   }
   generateTimelineData(commits) {
@@ -11611,6 +11647,13 @@ var Analyzer = class {
       heat: f.changes / maxChanges
     })).sort((a, b) => b.changes - a.changes).slice(0, 50);
   }
+  generateBranchData(branches) {
+    return branches.map((b) => ({
+      name: b.name,
+      commits: b.commits,
+      lastCommit: b.lastCommit.toISOString().split("T")[0]
+    })).sort((a, b) => b.commits - a.commits);
+  }
 };
 
 // src/visualizers/html-generator.ts
@@ -11638,6 +11681,12 @@ function generateHTML(data, repoName) {
       padding: 3rem;
       box-shadow: 0 20px 60px rgba(0,0,0,0.3);
     }
+    .header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 2rem;
+    }
     h1 {
       font-size: 3rem;
       margin-bottom: 0.5rem;
@@ -11649,7 +11698,33 @@ function generateHTML(data, repoName) {
     .subtitle {
       color: #666;
       font-size: 1.2rem;
-      margin-bottom: 3rem;
+      margin-bottom: 1rem;
+    }
+    .controls {
+      display: flex;
+      gap: 1rem;
+      align-items: center;
+    }
+    .lang-switch {
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      color: white;
+      border: none;
+      padding: 0.5rem 1.5rem;
+      border-radius: 8px;
+      cursor: pointer;
+      font-size: 1rem;
+      transition: transform 0.2s;
+    }
+    .lang-switch:hover {
+      transform: translateY(-2px);
+    }
+    .branch-selector {
+      padding: 0.5rem 1rem;
+      border: 2px solid #667eea;
+      border-radius: 8px;
+      font-size: 1rem;
+      cursor: pointer;
+      background: white;
     }
     .section {
       margin-bottom: 4rem;
@@ -11678,6 +11753,7 @@ function generateHTML(data, repoName) {
       pointer-events: none;
       opacity: 0;
       transition: opacity 0.3s;
+      z-index: 1000;
     }
     .stats {
       display: grid;
@@ -11701,40 +11777,106 @@ function generateHTML(data, repoName) {
       font-size: 1rem;
       opacity: 0.9;
     }
+    .branch-comparison {
+      display: grid;
+      grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+      gap: 1rem;
+      margin-bottom: 2rem;
+    }
+    .branch-card {
+      background: white;
+      border: 2px solid #667eea;
+      border-radius: 12px;
+      padding: 1.5rem;
+      cursor: pointer;
+      transition: all 0.3s;
+    }
+    .branch-card:hover {
+      transform: translateY(-4px);
+      box-shadow: 0 8px 20px rgba(102, 126, 234, 0.3);
+    }
+    .branch-card.active {
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      color: white;
+    }
+    .branch-name {
+      font-size: 1.2rem;
+      font-weight: bold;
+      margin-bottom: 0.5rem;
+    }
+    .branch-info {
+      font-size: 0.9rem;
+      opacity: 0.8;
+    }
+    .hidden {
+      display: none;
+    }
   </style>
 </head>
 <body>
   <div class="container">
-    <h1>\u{1F4CA} GitViz</h1>
-    <p class="subtitle">Repository: ${repoName}</p>
+    <div class="header">
+      <div>
+        <h1>\u{1F4CA} GitViz</h1>
+        <p class="subtitle" data-i18n="subtitle">Repository: ${repoName}</p>
+      </div>
+      <div class="controls">
+        <button class="lang-switch" onclick="toggleLanguage()">
+          <span id="lang-text">\u4E2D\u6587</span>
+        </button>
+      </div>
+    </div>
 
     <div class="stats">
       <div class="stat-card">
         <div class="stat-value">${data.timeline.reduce((sum, d) => sum + d.commits, 0)}</div>
-        <div class="stat-label">Total Commits</div>
+        <div class="stat-label" data-i18n="totalCommits">Total Commits</div>
       </div>
       <div class="stat-card">
         <div class="stat-value">${data.contributors.length}</div>
-        <div class="stat-label">Contributors</div>
+        <div class="stat-label" data-i18n="contributors">Contributors</div>
       </div>
       <div class="stat-card">
         <div class="stat-value">${data.heatmap.length}</div>
-        <div class="stat-label">Files Changed</div>
+        <div class="stat-label" data-i18n="filesChanged">Files Changed</div>
       </div>
+      ${data.branches && data.branches.length > 0 ? `
+      <div class="stat-card">
+        <div class="stat-value">${data.branches.length}</div>
+        <div class="stat-label" data-i18n="branches">Branches</div>
+      </div>
+      ` : ""}
     </div>
 
+    ${data.branches && data.branches.length > 1 ? `
     <div class="section">
-      <h2>\u{1F4C8} Commit Timeline</h2>
+      <h2 data-i18n="branchComparison">\u{1F33F} Branch Comparison</h2>
+      <div class="branch-comparison" id="branchComparison">
+        ${data.branches.map((branch, idx) => `
+          <div class="branch-card ${idx === 0 ? "active" : ""}" onclick="selectBranch('${branch.name}', this)">
+            <div class="branch-name">${branch.name}</div>
+            <div class="branch-info">
+              <div><span data-i18n="commits">Commits</span>: ${branch.commits}</div>
+              <div><span data-i18n="lastCommit">Last Commit</span>: ${branch.lastCommit}</div>
+            </div>
+          </div>
+        `).join("")}
+      </div>
+    </div>
+    ` : ""}
+
+    <div class="section">
+      <h2 data-i18n="commitTimeline">\u{1F4C8} Commit Timeline</h2>
       <div class="chart" id="timeline"></div>
     </div>
 
     <div class="section">
-      <h2>\u{1F465} Top Contributors</h2>
+      <h2 data-i18n="topContributors">\u{1F465} Top Contributors</h2>
       <div class="chart" id="contributors"></div>
     </div>
 
     <div class="section">
-      <h2>\u{1F525} File Change Heatmap</h2>
+      <h2 data-i18n="fileHeatmap">\u{1F525} File Change Heatmap</h2>
       <div class="chart" id="heatmap"></div>
     </div>
   </div>
@@ -11743,6 +11885,74 @@ function generateHTML(data, repoName) {
 
   <script>
     const data = ${JSON.stringify(data)};
+    let currentLang = 'en';
+    let selectedBranch = null;
+
+    // \u56FD\u9645\u5316\u6587\u672C
+    const i18n = {
+      en: {
+        subtitle: 'Repository: ${repoName}',
+        totalCommits: 'Total Commits',
+        contributors: 'Contributors',
+        filesChanged: 'Files Changed',
+        branches: 'Branches',
+        branchComparison: '\u{1F33F} Branch Comparison',
+        commits: 'Commits',
+        lastCommit: 'Last Commit',
+        commitTimeline: '\u{1F4C8} Commit Timeline',
+        topContributors: '\u{1F465} Top Contributors',
+        fileHeatmap: '\u{1F525} File Change Heatmap',
+        date: 'Date',
+        changes: 'Changes',
+        insertions: 'Insertions',
+        deletions: 'Deletions',
+        lines: 'Lines'
+      },
+      zh: {
+        subtitle: '\u4ED3\u5E93: ${repoName}',
+        totalCommits: '\u603B\u63D0\u4EA4\u6570',
+        contributors: '\u8D21\u732E\u8005',
+        filesChanged: '\u6587\u4EF6\u53D8\u66F4',
+        branches: '\u5206\u652F\u6570',
+        branchComparison: '\u{1F33F} \u5206\u652F\u5BF9\u6BD4',
+        commits: '\u63D0\u4EA4\u6570',
+        lastCommit: '\u6700\u540E\u63D0\u4EA4',
+        commitTimeline: '\u{1F4C8} \u63D0\u4EA4\u65F6\u95F4\u7EBF',
+        topContributors: '\u{1F465} \u9876\u7EA7\u8D21\u732E\u8005',
+        fileHeatmap: '\u{1F525} \u6587\u4EF6\u53D8\u66F4\u70ED\u529B\u56FE',
+        date: '\u65E5\u671F',
+        changes: '\u53D8\u66F4',
+        insertions: '\u65B0\u589E',
+        deletions: '\u5220\u9664',
+        lines: '\u4EE3\u7801\u884C'
+      }
+    };
+
+    function toggleLanguage() {
+      currentLang = currentLang === 'en' ? 'zh' : 'en';
+      document.getElementById('lang-text').textContent = currentLang === 'en' ? '\u4E2D\u6587' : 'English';
+
+      // \u66F4\u65B0\u6240\u6709\u5E26 data-i18n \u5C5E\u6027\u7684\u5143\u7D20
+      document.querySelectorAll('[data-i18n]').forEach(el => {
+        const key = el.getAttribute('data-i18n');
+        if (i18n[currentLang][key]) {
+          el.textContent = i18n[currentLang][key];
+        }
+      });
+    }
+
+    function selectBranch(branchName, element) {
+      selectedBranch = branchName;
+
+      // \u66F4\u65B0\u9009\u4E2D\u72B6\u6001
+      document.querySelectorAll('.branch-card').forEach(card => {
+        card.classList.remove('active');
+      });
+      element.classList.add('active');
+
+      // \u8FD9\u91CC\u53EF\u4EE5\u6DFB\u52A0\u6839\u636E\u5206\u652F\u8FC7\u6EE4\u6570\u636E\u7684\u903B\u8F91
+      console.log('Selected branch:', branchName);
+    }
 
     // Timeline Chart
     {
@@ -11785,9 +11995,11 @@ function generateHTML(data, repoName) {
         .attr("width", x.bandwidth())
         .attr("height", d => height - y(d.commits))
         .on("mouseover", function(event, d) {
-          d3.select("#tooltip")
+          const tooltip = d3.select("#tooltip");
+          const lang = currentLang;
+          tooltip
             .style("opacity", 1)
-            .html(\`<strong>\${d.date}</strong><br/>Commits: \${d.commits}<br/>+\${d.insertions} -\${d.deletions}\`)
+            .html(\`<strong>\${d.date}</strong><br/>\${i18n[lang].commits}: \${d.commits}<br/>+\${d.insertions} -\${d.deletions}\`)
             .style("left", (event.pageX + 10) + "px")
             .style("top", (event.pageY - 10) + "px");
         })
@@ -11840,9 +12052,11 @@ function generateHTML(data, repoName) {
         .attr("width", x.bandwidth())
         .attr("height", d => height - y(d.commits))
         .on("mouseover", function(event, d) {
-          d3.select("#tooltip")
+          const tooltip = d3.select("#tooltip");
+          const lang = currentLang;
+          tooltip
             .style("opacity", 1)
-            .html(\`<strong>\${d.name}</strong><br/>Commits: \${d.commits}<br/>Lines: \${d.lines}\`)
+            .html(\`<strong>\${d.name}</strong><br/>\${i18n[lang].commits}: \${d.commits}<br/>\${i18n[lang].lines}: \${d.lines}\`)
             .style("left", (event.pageX + 10) + "px")
             .style("top", (event.pageY - 10) + "px");
         })
@@ -11881,9 +12095,11 @@ function generateHTML(data, repoName) {
         .attr("height", y.bandwidth())
         .attr("fill", d => colorScale(d.heat))
         .on("mouseover", function(event, d) {
-          d3.select("#tooltip")
+          const tooltip = d3.select("#tooltip");
+          const lang = currentLang;
+          tooltip
             .style("opacity", 1)
-            .html(\`<strong>\${d.file}</strong><br/>Changes: \${d.changes}\`)
+            .html(\`<strong>\${d.file}</strong><br/>\${i18n[lang].changes}: \${d.changes}\`)
             .style("left", (event.pageX + 10) + "px")
             .style("top", (event.pageY - 10) + "px");
         })
@@ -11932,9 +12148,12 @@ program2.command("analyze").description("Analyze a Git repository and generate v
       spinner.fail(source_default.red("Error: No commits found"));
       process.exit(1);
     }
+    spinner.text = "Getting branch information...";
+    const branches = await parser4.getBranches();
     spinner.text = `Analyzing ${commits.length} commits...`;
     const analyzer = new Analyzer();
     const analysis = analyzer.analyze(commits);
+    analysis.branches = branches;
     spinner.text = "Generating visualization data...";
     const vizData = analyzer.generateVisualizationData(analysis);
     spinner.text = "Creating HTML report...";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anxin233/gitviz",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "🎨 Beautiful, interactive Git repository visualizations - Transform your Git history into stunning visual stories",
   "type": "module",
   "bin": {