wukong-gitlog-cli 1.0.16 → 1.0.18

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.0.18](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.17...v1.0.18) (2025-12-05)
+
+
+### Features
+
+* 🎸 buildAuthorLatestDataset ([e607836](https://github.com/tomatobybike/wukong-gitlog-cli/commit/e6078360d29e18d9a9f6f6346547821ef13c1e7d))
+* 🎸 css ([f2c4a71](https://github.com/tomatobybike/wukong-gitlog-cli/commit/f2c4a715b594f37e3ff2fd34f641c57aac33c50a))
+* 🎸 risk ([1f6a55e](https://github.com/tomatobybike/wukong-gitlog-cli/commit/1f6a55e68ad28cc9523019294eaa69bde0036d86))
+
+### [1.0.17](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.16...v1.0.17) (2025-12-05)
+
+
+### Features
+
+* 🎸 change line total ([bf01655](https://github.com/tomatobybike/wukong-gitlog-cli/commit/bf01655f3721b87d4bb36e74a7ce6dadf5e7ee94))
+* 🎸 develop Changes totals ([fb64986](https://github.com/tomatobybike/wukong-gitlog-cli/commit/fb64986cfde215fc58ce7b1b66cbc8bdbf280627))
+
 ### [1.0.16](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.15...v1.0.16) (2025-12-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wukong-gitlog-cli",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "Advanced Git commit log exporter with Excel/JSON/TXT output, grouping, stats and CLI.",
   "keywords": [
     "git",
@@ -90,20 +90,19 @@
     ]
   },
   "dependencies": {
+    "boxen": "8.0.1",
+    "chalk": "5.6.2",
     "commander": "12.1.0",
-    "dayjs": "1.11.19",
     "date-holidays": "2.1.1",
-    "string-width": "5.1.2",
+    "dayjs": "1.11.19",
     "exceljs": "4.4.0",
-    "zx": "7.2.4",
     "is-online": "12.0.2",
-    "boxen": "8.0.1",
-    "chalk": "5.6.2"
+    "ora": "9.0.0",
+    "string-width": "5.1.2",
+    "zx": "7.2.4"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "5.2.2",
-    "husky": "^9.1.7",
-    "lint-staged": "^16.2.7",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "10.1.8",
@@ -111,6 +110,8 @@
     "eslint-plugin-import": "2.32.0",
     "eslint-plugin-prettier": "5.5.4",
     "eslint-plugin-simple-import-sort": "12.1.1",
+    "husky": "^9.1.7",
+    "lint-staged": "^16.2.7",
     "prettier": "3.6.2",
     "prettier-plugin-packagejson": "2.5.19",
     "sort-package-json": "3.4.0",

package/src/cli.mjs

@@ -3,12 +3,18 @@ import { Command } from 'commander'
 import dayjs from 'dayjs'
 import isoWeek from 'dayjs/plugin/isoWeek.js'
 import fs from 'fs'
+import ora from 'ora'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
 import { CLI_NAME } from './constants/index.mjs'
-import { exportExcel, exportExcelPerPeriodSheets } from './excel.mjs'
+import {
+  exportExcel,
+  exportExcelAuthorChangeStats,
+  exportExcelPerPeriodSheets
+} from './excel.mjs'
 import { getGitLogs } from './git.mjs'
+import { renderAuthorChangesJson } from './json.mjs'
 import {
   analyzeOvertime,
   renderOvertimeCsv,
@@ -16,7 +22,7 @@ import {
   renderOvertimeText
 } from './overtime.mjs'
 import { startServer } from './server.mjs'
-import { renderText } from './text.mjs'
+import { renderChangedLinesText, renderText } from './text.mjs'
 import { checkUpdateWithPatch } from './utils/checkUpdate.mjs'
 import {
   groupRecords,
@@ -194,6 +200,8 @@ const main = async () => {
     return
   }
 
+  const spinner = ora('Loading...').start()
+
   let records = await getGitLogs(opts)
 
   // compute output directory root if user provided one or wants parent
@@ -342,6 +350,13 @@ const main = async () => {
         const dataCommitsFile = outputFilePath('data/commits.mjs', outDir)
         const commitsModule = `export default ${JSON.stringify(records, null, 2)};\n`
         writeTextFile(dataCommitsFile, commitsModule)
+
+        const dataCommitsChangedFile = outputFilePath('data/author-changes.mjs', outDir)
+        const jsonText = renderAuthorChangesJson(records)
+
+        const commitsChangedModule = `export default ${JSON.stringify(jsonText, null, 2)};\n`
+        writeTextFile(dataCommitsChangedFile, commitsChangedModule)
+
         const dataStatsFile = outputFilePath('data/overtime-stats.mjs', outDir)
         const statsModule = `export default ${JSON.stringify(stats, null, 2)};\n`
         writeTextFile(dataStatsFile, statsModule)
@@ -770,7 +785,10 @@ const main = async () => {
     const file = opts.out || 'commits.json'
     const filepath = outputFilePath(file, outDir)
     writeJSON(filepath, groups || records)
+    const jsonText = renderAuthorChangesJson(records)
+    writeJSON(outputFilePath('author-changes.json', outDir), jsonText)
     console.log(chalk.green(`JSON 已导出: ${filepath}`))
+    spinner.succeed('Done')
     return
   }
 
@@ -779,8 +797,13 @@ const main = async () => {
     const filepath = outputFilePath(file, outDir)
     const text = renderText(records, groups, { showGerrit: !!opts.gerrit })
     writeTextFile(filepath, text)
+    writeTextFile(
+      outputFilePath('author-changes.text', outDir),
+      renderChangedLinesText(records)
+    )
     console.log(text)
     console.log(chalk.green(`文本已导出: ${filepath}`))
+    spinner.succeed('Done')
     return
   }
 
@@ -794,11 +817,17 @@ const main = async () => {
       stats: opts.stats,
       gerrit: opts.gerrit
     })
+    await exportExcelAuthorChangeStats(
+      records,
+      outputFilePath('author_stats.xlsx', outDir)
+    )
     const text = renderText(records, groups)
     writeTextFile(txtPath, text)
     console.log(chalk.green(`Excel 已导出: ${excelPath}`))
     console.log(chalk.green(`文本已自动导出: ${txtPath}`))
+    spinner.succeed('Done')
   }
+
   await autoCheckUpdate()
 }
 

package/src/excel.mjs

@@ -1,97 +1,167 @@
-import ExcelJS from 'exceljs';
-import dayjs from 'dayjs';
+import dayjs from 'dayjs'
+import ExcelJS from 'exceljs'
+import { buildAuthorChangeStats } from './stats.mjs'
+
 
 export async function exportExcel(records, groups, options = {}) {
-  const { file, stats, gerrit } = options;
+  const { file, stats, gerrit } = options
 
-  const wb = new ExcelJS.Workbook();
-  const ws = wb.addWorksheet('Commits');
+  const wb = new ExcelJS.Workbook()
+  const ws = wb.addWorksheet('Commits')
 
   const cols = [
     { header: 'Hash', key: 'hash', width: 12 },
     { header: 'Author', key: 'author', width: 20 },
     { header: 'Email', key: 'email', width: 30 },
     { header: 'Date', key: 'date', width: 20 },
-    { header: 'Message', key: 'message', width: 80 }
-  ];
+    { header: 'Message', key: 'message', width: 80 },
+    { header: 'Changed', key: 'changed', width: 12 } // ★ 新增 changed 列
+  ]
 
   if (gerrit) {
-    cols.push({ header: 'Gerrit', key: 'gerrit', width: 50 });
+    cols.push({ header: 'Gerrit', key: 'gerrit', width: 50 })
   }
 
-  ws.columns = cols;
+  ws.columns = cols
 
-  (groups ? Object.values(groups).flat() : records).forEach(r =>
+  ;(groups ? Object.values(groups).flat() : records).forEach((r) =>
     ws.addRow(r)
-  );
+  )
 
-  ws.autoFilter = { from: { row: 1, column: 1 }, to: { row: 1, column: cols.length } };
+  ws.autoFilter = {
+    from: { row: 1, column: 1 },
+    to: { row: 1, column: cols.length }
+  }
 
   // --- stats sheet ---
   if (stats) {
-    const statWs = wb.addWorksheet('Stats');
+    const statWs = wb.addWorksheet('Stats')
 
-    const map = {};
+    const map = {}
 
-    records.forEach(r => {
-      const d = dayjs(r.date).format('YYYY-MM-DD');
-      map[d] = (map[d] || 0) + 1;
-    });
+    records.forEach((r) => {
+      const d = dayjs(r.date).format('YYYY-MM-DD')
+      map[d] = (map[d] || 0) + 1
+    })
 
     statWs.columns = [
       { header: 'Date', key: 'date', width: 15 },
       { header: 'Commits', key: 'count', width: 15 }
-    ];
+    ]
 
     Object.entries(map).forEach(([d, cnt]) =>
       statWs.addRow({ date: d, count: cnt })
-    );
+    )
   }
 
-  await wb.xlsx.writeFile(file);
+  await wb.xlsx.writeFile(file)
 }
 
 export async function exportExcelPerPeriodSheets(groups, file, options = {}) {
-  // groups: { periodKey: [records] }
-  const { stats, gerrit } = options;
+  const { stats, gerrit } = options
 
-  const wb = new ExcelJS.Workbook();
+  const wb = new ExcelJS.Workbook()
 
   const cols = [
     { header: 'Hash', key: 'hash', width: 12 },
     { header: 'Author', key: 'author', width: 20 },
     { header: 'Email', key: 'email', width: 30 },
     { header: 'Date', key: 'date', width: 20 },
-    { header: 'Message', key: 'message', width: 80 }
-  ];
-  if (gerrit) cols.push({ header: 'Gerrit', key: 'gerrit', width: 50 });
+    { header: 'Message', key: 'message', width: 80 },
+    { header: 'Changed', key: 'changed', width: 12 } // ★ 新增 changed 列
+  ]
+
+  if (gerrit) cols.push({ header: 'Gerrit', key: 'gerrit', width: 50 })
+
+  const keys = Object.keys(groups).sort()
 
-  const keys = Object.keys(groups).sort();
   keys.forEach((k) => {
-    const ws = wb.addWorksheet(String(k).slice(0, 31)); // Excel sheet name limit 31
-    ws.columns = cols;
-    groups[k].forEach(r => ws.addRow(r));
-    ws.autoFilter = { from: { row: 1, column: 1 }, to: { row: 1, column: cols.length } };
-  });
-
-  // summary sheet with counts per period
-  const summary = wb.addWorksheet('Summary');
+    const ws = wb.addWorksheet(String(k).slice(0, 31))
+    ws.columns = cols
+    groups[k].forEach((r) => ws.addRow(r))
+
+    ws.autoFilter = {
+      from: { row: 1, column: 1 },
+      to: { row: 1, column: cols.length }
+    }
+  })
+
+  // summary sheet
+  const summary = wb.addWorksheet('Summary')
   summary.columns = [
     { header: 'Period', key: 'period', width: 20 },
     { header: 'Commits', key: 'count', width: 12 }
-  ];
-  keys.forEach(k => summary.addRow({ period: k, count: groups[k].length }));
+  ]
+  keys.forEach((k) => summary.addRow({ period: k, count: groups[k].length }))
 
-  await wb.xlsx.writeFile(file);
+  await wb.xlsx.writeFile(file)
 }
 
-export async function exportExcelPerPeriodFiles(groups, dir, filePrefix, options = {}) {
-  // groups: { periodKey: [records] }
-  // dir: output directory path, filePrefix: base name without extension
-  // For each key, call exportExcel with that key's records
-  const keys = Object.keys(groups).sort();
+export async function exportExcelPerPeriodFiles(
+  groups,
+  dir,
+  filePrefix,
+  options = {}
+) {
+  const keys = Object.keys(groups).sort()
   for (const k of keys) {
-    const perFile = `${dir}/overtime_${filePrefix}_${k}.xlsx`;
-    await exportExcel(groups[k], null, { file: perFile, stats: options.stats, gerrit: options.gerrit });
+    const perFile = `${dir}/overtime_${filePrefix}_${k}.xlsx`
+    await exportExcel(groups[k], null, {
+      file: perFile,
+      stats: options.stats,
+      gerrit: options.gerrit
+    })
   }
 }
+
+/**
+ * 导出作者的日/周/月 changed 统计
+ * @param {*} records 原始 commits（包含 author/date/changed）
+ * @param {*} file 输出文件
+ */
+export async function exportExcelAuthorChangeStats(records, file) {
+  const stats = buildAuthorChangeStats(records)
+
+  const wb = new ExcelJS.Workbook()
+
+  //-------------------------------------------
+  // 工具方法：创建一个统计 sheet
+  //-------------------------------------------
+  function addStatSheet(title, dataMap) {
+    const ws = wb.addWorksheet(title)
+
+    ws.columns = [
+      { header: 'Author', key: 'author', width: 20 },
+      { header: 'Period', key: 'period', width: 20 },
+      { header: 'Changed', key: 'changed', width: 12 }
+    ]
+
+    for (const [author, periodMap] of Object.entries(dataMap)) {
+      const periods = Object.keys(periodMap).sort()
+      for (const p of periods) {
+        ws.addRow({
+          author,
+          period: p,
+          changed: periodMap[p]
+        })
+      }
+    }
+
+    ws.autoFilter = {
+      from: { row: 1, column: 1 },
+      to: { row: 1, column: 3 }
+    }
+  }
+
+  //-------------------------------------------
+  // 创建 3 个 Sheet
+  //-------------------------------------------
+  addStatSheet('Author Daily', stats.daily)
+  addStatSheet('Author Weekly', stats.weekly)
+  addStatSheet('Author Monthly', stats.monthly)
+
+  //-------------------------------------------
+  // 保存文件
+  //-------------------------------------------
+  await wb.xlsx.writeFile(file)
+}

package/src/git.mjs

@@ -1,12 +1,9 @@
 import { $ } from 'zx'
 
-
 export async function getGitLogs(opts) {
   const { author, email, since, until, limit, merges } = opts
 
-  // include subject and full body so we can extract Change-Id from commit message
   const pretty = '%H%x1f%an%x1f%ae%x1f%ad%x1f%s%x1f%B%x1e'
-
   const args = ['log', `--pretty=format:${pretty}`, '--date=iso']
 
   if (author) args.push(`--author=${author}`)
@@ -16,15 +13,13 @@ export async function getGitLogs(opts) {
   if (merges === false) args.push(`--no-merges`)
   if (limit) args.push(`-n`, `${limit}`)
 
-  // 使用 spread 形式传参，ZX 才会正确处理
   const { stdout } = await $`git ${args}`.quiet()
 
-  return stdout
+  const commits = stdout
     .split('\x1e')
     .filter(Boolean)
     .map((r) => {
       const f = r.split('\x1f').map((s) => (s || '').trim())
-
       const hash = f[0]
       const authorName = f[1]
       const emailAddr = f[2]
@@ -32,7 +27,6 @@ export async function getGitLogs(opts) {
       const subject = f[4]
       const body = f[5] || ''
 
-      // extract Change-Id from commit body (line like "Change-Id: Iabc123...")
       const [, changeId] = body.match(/Change-Id:\s*(I[0-9a-fA-F]+)/) || []
 
       return {
@@ -45,4 +39,36 @@ export async function getGitLogs(opts) {
         changeId
       }
     })
+
+  // === 新增：为每个 commit 计算代码增量 ===
+  for (const c of commits) {
+    try {
+      const { stdout: diffOut } = await $`git show --numstat --format= ${c.hash}`.quiet()
+      // numstat 格式:  "12 5 path/file.js"
+      const lines = diffOut
+        .split('\n')
+        .map((l) => l.trim())
+        .filter((l) => l && /^\d+\s+\d+/.test(l))
+
+      let added = 0
+      let deleted = 0
+
+      for (const line of lines) {
+        const [a, d] = line.split(/\s+/)
+        added += parseInt(a, 10) || 0
+        deleted += parseInt(d, 10) || 0
+      }
+
+      c.added = added
+      c.deleted = deleted
+      c.changed = added + deleted
+    } catch (err) {
+      // 避免阻塞，异常时改动量设置为0
+      c.added = 0
+      c.deleted = 0
+      c.changed = 0
+    }
+  }
+
+  return commits
 }

package/src/json.mjs

@@ -0,0 +1,5 @@
+import { buildAuthorChangeStats } from './stats.mjs'
+
+export function renderAuthorChangesJson(records) {
+  return buildAuthorChangeStats(records)
+}

package/src/stats-text.mjs

@@ -0,0 +1,51 @@
+export function renderAuthorChangeStatsText(stats, opts = {}) {
+  const {
+    section = 'all', // 'daily' | 'weekly' | 'monthly' | 'all'
+  } = opts;
+
+  const pad = (s, n) =>
+    s.length >= n ? `${s.slice(0, n - 1)}…` : s + ' '.repeat(n - s.length);
+
+  const buildSection = (title, obj, unitLabel) => {
+    if (!obj || !Object.keys(obj).length) return '';
+
+    const lines = [];
+
+    const header =
+      `${pad('Author', 18)} | ${pad(unitLabel, 12)} | ${pad('Changed', 10)}`;
+    const line = '-'.repeat(header.length);
+
+    lines.push(`\n=== ${title} ===`);
+    lines.push(header);
+    lines.push(line);
+
+    for (const [author, periodMap] of Object.entries(obj)) {
+      const keys = Object.keys(periodMap).sort();
+      for (const key of keys) {
+        lines.push(
+          [
+            pad(author, 18),
+            pad(key, 12),
+            pad(String(periodMap[key]), 10),
+          ].join(' | ')
+        );
+      }
+    }
+
+    return lines.join('\n');
+  };
+
+  let output = '';
+
+  if (section === 'all' || section === 'daily') {
+    output += buildSection('Daily Changed', stats.daily, 'Date');
+  }
+  if (section === 'all' || section === 'weekly') {
+    output += buildSection('Weekly Changed', stats.weekly, 'Week');
+  }
+  if (section === 'all' || section === 'monthly') {
+    output += buildSection('Monthly Changed', stats.monthly, 'Month');
+  }
+
+  return `${output.trim()  }\n`;
+}

package/src/stats.mjs

@@ -0,0 +1,44 @@
+import dayjs from 'dayjs'
+import isoWeek from 'dayjs/plugin/isoWeek.js'
+
+dayjs.extend(isoWeek)
+
+/**
+ * 自动统计每个作者的日/周/月 changed
+ *
+ * records: [{
+ *   author: 'Tom',
+ *   date: '2025-01-01T12:00:00Z',
+ *   changed: 123
+ * }]
+ */
+export function buildAuthorChangeStats(records) {
+  const result = {
+    daily: {}, // { author: { 'YYYY-MM-DD': x } }
+    weekly: {}, // { author: { 'YYYY-WW': x } }
+    monthly: {} // { author: { 'YYYY-MM': x } }
+  }
+
+  for (const r of records) {
+    const author = r.author || 'Unknown'
+    const changed = Number(r.changed || 0)
+
+    const d = dayjs(r.date)
+
+    const dayKey = d.format('YYYY-MM-DD')
+    const weekKey = `${d.format('GGGG')}-W${d.isoWeek().toString().padStart(2, '0')}`
+    const monthKey = d.format('YYYY-MM')
+
+    if (!result.daily[author]) result.daily[author] = {}
+    if (!result.weekly[author]) result.weekly[author] = {}
+    if (!result.monthly[author]) result.monthly[author] = {}
+
+    result.daily[author][dayKey] = (result.daily[author][dayKey] || 0) + changed
+    result.weekly[author][weekKey] =
+      (result.weekly[author][weekKey] || 0) + changed
+    result.monthly[author][monthKey] =
+      (result.monthly[author][monthKey] || 0) + changed
+  }
+
+  return result
+}

package/src/text.mjs

@@ -1,56 +1,51 @@
+import { renderAuthorChangeStatsText } from './stats-text.mjs'
+import { buildAuthorChangeStats } from './stats.mjs'
+
 export function renderText(records, groups = null, opts = {}) {
-  const { showGerrit = false } = opts;
+  const { showGerrit = false } = opts
   const pad = (s, n) =>
-    s.length >= n ? `${s.slice(0, n - 1)  }…` : s + ' '.repeat(n - s.length);
+    s.length >= n ? `${s.slice(0, n - 1)}…` : s + ' '.repeat(n - s.length)
+
+  const baseHeader = `${pad('Hash', 10)} | ${pad('Author', 18)} | ${pad(
+    'Date',
+    20
+  )} | ${pad('Message', 40)} | ${pad('Changed', 8)}` // ★ 新增 changed 列
 
-  const baseHeader =
-    `${pad('Hash', 10) 
-    } | ${ 
-    pad('Author', 18) 
-    } | ${ 
-    pad('Date', 20) 
-    } | ${ 
-    pad('Message', 60)}`;
+  const gerritHeader = showGerrit ? ` | ${pad('Gerrit', 50)}` : ''
+  const header = baseHeader + gerritHeader
 
-  const gerritHeader = showGerrit ? ` | ${  pad('Gerrit', 50)}` : '';
-  const header = baseHeader + gerritHeader;
+  const line = '-'.repeat(header.length)
 
-  const line = '-'.repeat(header.length);
+  const rows = []
 
-  const rows = [];
+  const buildRow = (r) => {
+    return (
+      [
+        pad(r.hash.slice(0, 8), 10),
+        pad(r.author, 18),
+        pad(r.date.replace(/ .+/, ''), 20),
+        pad(r.message, 40),
+        pad(String(r.changed ?? 0), 8) // ★ 输出 changed 数量
+      ].join(' | ') + (showGerrit ? ` | ${pad(r.gerrit || '', 50)}` : '')
+    )
+  }
 
   if (groups) {
     for (const [g, list] of Object.entries(groups)) {
-      rows.push(`\n=== ${g} ===\n`);
-      list.forEach(r => {
-        rows.push(
-          (
-            [
-              pad(r.hash.slice(0, 8), 10),
-              pad(r.author, 18),
-              pad(r.date.replace(/ .+/, ''), 20),
-              pad(r.message, 60)
-            ].join(' | ') +
-            (showGerrit ? ` | ${  pad(r.gerrit || '', 50)}` : '')
-          )
-        );
-      });
+      rows.push(`\n=== ${g} ===\n`)
+      list.forEach((r) => rows.push(buildRow(r)))
     }
   } else {
-    records.forEach(r => {
-      rows.push(
-        (
-          [
-            pad(r.hash.slice(0, 8), 10),
-            pad(r.author, 18),
-            pad(r.date.replace(/ .+/, ''), 20),
-            pad(r.message, 60)
-          ].join(' | ') +
-          (showGerrit ? ` | ${  pad(r.gerrit || '', 50)}` : '')
-        )
-      );
-    });
+    records.forEach((r) => rows.push(buildRow(r)))
   }
 
-  return [header, line, ...rows].join('\n');
+  return [header, line, ...rows].join('\n')
+}
+
+export function renderChangedLinesText(records, opts = {}) {
+  const stats = buildAuthorChangeStats(records)
+
+  const result = renderAuthorChangeStatsText(stats, opts)
+
+  return result
 }