wukong-gitlog-cli 1.0.35 → 1.0.37

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.37](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.36...v1.0.37) (2025-12-12)
+
+
+### Features
+
+* 🎸 add logDev ([a85905b](https://github.com/tomatobybike/wukong-gitlog-cli/commit/a85905b038014fb62c7fd21713f63e2405e3cfa7))
+* 🎸 createOvertimeStats ([abb0051](https://github.com/tomatobybike/wukong-gitlog-cli/commit/abb0051efc91cceb9845a1c5c9a00f9d6747baf4))
+* 🎸 logDev ([e122042](https://github.com/tomatobybike/wukong-gitlog-cli/commit/e12204203a077630784caa16b01c566fdd72b84a))
+* 🎸 logger debug ([32a55fe](https://github.com/tomatobybike/wukong-gitlog-cli/commit/32a55fe8d191969ca887cb46789d14b65b446f6d))
+
+### [1.0.36](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.35...v1.0.36) (2025-12-12)
+
+
+### Bug Fixes
+
+* 🐛 createAuthorNormalizer ([12f70ba](https://github.com/tomatobybike/wukong-gitlog-cli/commit/12f70ba10013cbba988d3ae1d7fed6f0949c6cbc))
+
 ### [1.0.35](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.34...v1.0.35) (2025-12-12)
 
 

package/bin/wukong-gitlog-cli

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-import('../src/cli.mjs')
+import('../src/index.mjs')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wukong-gitlog-cli",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "Advanced Git commit log exporter with Excel/JSON/TXT output, grouping, stats and CLI.",
   "keywords": [
     "git",
@@ -96,6 +96,8 @@
     "commander": "12.1.0",
     "date-holidays": "2.1.1",
     "dayjs": "1.11.19",
+    "date-fns": "4.1.0",
+    "dotenv": "17.2.2",
     "exceljs": "4.4.0",
     "is-online": "12.0.2",
     "ora": "9.0.0",

package/src/cli/parseOptions.mjs

@@ -0,0 +1,9 @@
+export function parseOptions(opts) {
+  return {
+    startHour: opts.workStart ?? 9,
+    endHour: opts.workEnd ?? 18,
+    lunchStart: opts.lunchStart ?? 12,
+    lunchEnd: opts.lunchEnd ?? 14,
+    country: opts.country ?? 'CN'
+  };
+}

package/src/git.mjs

@@ -76,21 +76,20 @@ export async function getGitLogsSlow(opts) {
     }
   }
 
-  return commits
+  return { commits, authorMap: {} }
 }
 
 export async function getGitLogsQuick(opts) {
   const { author, email, since, until, limit, merges } = opts
 
-  const pretty =
-    `${[
-      '%H', // hash
-      '%an', // author name
-      '%ae', // email
-      '%ad', // date
-      '%s', // subject
-      '%B' // body
-    ].join('%x1f')  }%x1e`
+  const pretty = `${[
+    '%H', // hash
+    '%an', // author name
+    '%ae', // email
+    '%ad', // date
+    '%s', // subject
+    '%B' // body
+  ].join('%x1f')}%x1e`
 
   const args = [
     'log',
@@ -166,7 +165,10 @@ export async function getGitLogsQuick(opts) {
   }
 }
 
-export async function getGitLogsFast(opts) {
+/**
+ * 高性能 git log + numstat 获取 commit
+ */
+export async function getGitLogsFast(opts = {}) {
   const { author, email, since, until, limit, merges } = opts
 
   const pretty = `${[
@@ -193,19 +195,18 @@ export async function getGitLogsFast(opts) {
   if (limit) args.push('-n', `${limit}`)
 
   const { stdout } = await $`git ${args}`.quiet()
+  const raw = stdout.replace(/\r/g, '')
 
   const commits = []
-  const raw = stdout.replace(/\r/g, '')
 
-  // 正则匹配每个 commit header + numstat
+  // 匹配每个 commit header + numstat
   const commitRegex =
     // eslint-disable-next-line no-control-regex
     /([0-9a-f]+)\x1f([^\x1f]*)\x1f([^\x1f]*)\x1f([^\x1f]*)\x1f([^\x1f]*)\x1f([\s\S]*?)(?=(?:[0-9a-f]{7,40}\x1f)|\x1e$)/g
   let match
-  // eslint-disable-next-line no-cond-assign
-  while ((match = commitRegex.exec(raw)) !== null) {
-    const [_, hash, authorName, emailAddr, date, subject, bodyAndNumstat] =
-      match
+
+  for (const ns of raw.matchAll(commitRegex)) {
+    const [_, hash, authorName, emailAddr, date, subject, bodyAndNumstat] = ns
     const [, changeId] =
       bodyAndNumstat.match(/Change-Id:\s*(I[0-9a-fA-F]+)/) || []
 
@@ -224,13 +225,12 @@ export async function getGitLogsFast(opts) {
       files: []
     }
 
-    // 匹配 numstat 行
+    // 匹配 numstat
     const numstatRegex = /^(\d+)\s+(\d+)\s+(.+)$/gm
-
-    for (const nsMatch of bodyAndNumstat.matchAll(numstatRegex)) {
-      const added = parseInt(nsMatch[1], 10) || 0
-      const deleted = parseInt(nsMatch[2], 10) || 0
-      const file = nsMatch[3]
+    for (const m of bodyAndNumstat.matchAll(numstatRegex)) {
+      const added = parseInt(m[1], 10) || 0
+      const deleted = parseInt(m[2], 10) || 0
+      const file = m[3]
       c.added += added
       c.deleted += deleted
       c.changed += added + deleted
@@ -240,8 +240,17 @@ export async function getGitLogsFast(opts) {
     commits.push(c)
   }
 
+  // 最终统一覆盖 author，保证所有 commit 都使用中文名（如存在）
+  const finalMap = normalizer.getMap()
+  for (const c of commits) {
+    if (c.email && finalMap[c.email]) {
+      c.author = finalMap[c.email]
+    }
+  }
+
   return {
     commits,
-    authorMap: normalizer.getMap()
+    authorMap: finalMap,
+    originalMap: normalizer.getOriginalMap()
   }
 }

package/src/handlers/handleServe.mjs

@@ -0,0 +1,203 @@
+import dayjs from 'dayjs'
+
+// eslint-disable-next-line no-unused-vars
+import { renderAuthorChangesJson } from '../json.mjs'
+import { startServer } from '../server.mjs'
+import { getWeekRange } from '../utils/getWeekRange.mjs'
+import { groupRecords, outputFilePath, writeTextFile } from '../utils/index.mjs'
+import { logDev } from '../utils/logDev.mjs'
+
+export const handleServe = async ({
+  opts,
+  outDir,
+  records,
+  getOvertimeStats
+}) => {
+  try {
+    const stats = getOvertimeStats(records)
+
+    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)
+
+    // 新增：每周趋势数据（用于前端图表）
+    const weekGroups = groupRecords(records, 'week')
+    const weekKeys = Object.keys(weekGroups).sort()
+    const weeklySeries = weekKeys.map((k) => {
+      const s = getOvertimeStats(weekGroups[k])
+      return {
+        period: k,
+        range: getWeekRange(k),
+        total: s.total,
+        outsideWorkCount: s.outsideWorkCount,
+        outsideWorkRate: s.outsideWorkRate,
+        nonWorkdayCount: s.nonWorkdayCount,
+        nonWorkdayRate: s.nonWorkdayRate
+      }
+    })
+    const dataWeeklyFile = outputFilePath('data/overtime-weekly.mjs', outDir)
+    const weeklyModule = `export default ${JSON.stringify(weeklySeries, null, 2)};\n`
+    writeTextFile(dataWeeklyFile, weeklyModule)
+    logDev(`Weekly series 已导出: ${dataWeeklyFile}`)
+
+    // 新增：每月趋势数据（用于前端图表）
+    const monthGroups2 = groupRecords(records, 'month')
+    const monthKeys2 = Object.keys(monthGroups2).sort()
+    const monthlySeries = monthKeys2.map((k) => {
+      const s = getOvertimeStats(monthGroups2[k])
+      return {
+        period: k,
+        total: s.total,
+        outsideWorkCount: s.outsideWorkCount,
+        outsideWorkRate: s.outsideWorkRate,
+        nonWorkdayCount: s.nonWorkdayCount,
+        nonWorkdayRate: s.nonWorkdayRate
+      }
+    })
+    const dataMonthlyFile = outputFilePath('data/overtime-monthly.mjs', outDir)
+    const monthlyModule = `export default ${JSON.stringify(monthlySeries, null, 2)};\n`
+    writeTextFile(dataMonthlyFile, monthlyModule)
+    logDev(`Monthly series 已导出: ${dataMonthlyFile}`)
+
+    // 新增：每日最晚提交小时（用于显著展示加班严重程度）
+    const dayGroups2 = groupRecords(records, 'day')
+    const dayKeys2 = Object.keys(dayGroups2).sort()
+
+    // 次日凌晨归并窗口（默认 6 点前仍算前一天的加班）
+    const overnightCutoff = Number.isFinite(opts.overnightCutoff)
+      ? opts.overnightCutoff
+      : 6
+    // 次日上班时间（默认按 workStart，若未指定则 9 点）
+    const workStartHour =
+      opts.workStart || opts.workStart === 0 ? opts.workStart : 9
+    const workEndHour = opts.workEnd || opts.workEnd === 0 ? opts.workEnd : 18
+
+    // 有些日期「本身没有 commit」，但第二天凌晨有提交要归并到这一天，
+    // 需要补出这些“虚拟日期”，否则 latestByDay 会漏掉这天。
+    const virtualPrevDays = new Set()
+    records.forEach((r) => {
+      const d = new Date(r.date)
+      if (Number.isNaN(d.valueOf())) return
+      const h = d.getHours()
+      if (h < 0 || h >= overnightCutoff || h >= workStartHour) return
+      const curDay = dayjs(d).format('YYYY-MM-DD')
+      const prevDay = dayjs(curDay).subtract(1, 'day').format('YYYY-MM-DD')
+      if (!dayGroups2[prevDay]) {
+        virtualPrevDays.add(prevDay)
+      }
+    })
+
+    const allDayKeys = Array.from(
+      new Set([...dayKeys2, ...virtualPrevDays])
+    ).sort()
+
+    const latestByDay = allDayKeys.map((k) => {
+      const list = dayGroups2[k] || []
+
+      // 1) 当天「下班后」的提交：只统计 >= workEndHour 的小时
+      const sameDayHours = list
+        .map((r) => new Date(r.date))
+        .filter((d) => !Number.isNaN(d.valueOf()))
+        .map((d) => d.getHours())
+        .filter((h) => h >= workEndHour && h < 24)
+
+      // 2) 次日凌晨、但仍算前一日加班的提交
+      const nextKey = dayjs(k).add(1, 'day').format('YYYY-MM-DD')
+      const early = dayGroups2[nextKey] || []
+      const earlyHours = early
+        .map((r) => new Date(r.date))
+        .filter((d) => !Number.isNaN(d.valueOf()))
+        .map((d) => d.getHours())
+        // 只看 [0, overnightCutoff) 之间的小时，
+        // 并且默认认为 < workStartHour 属于「次日上班前」
+        .filter(
+          (h) =>
+            h >= 0 &&
+            h < overnightCutoff &&
+            // 保护性判断：若有人把 overnightCutoff 设得大于上班时间，
+            // 我们仍然只统计到上班时间为止
+            h < workStartHour
+        )
+
+      // 3) 计算「逻辑上的最晚加班时间」
+      //    - 当天晚上的用原始小时（如 22 点）
+      //    - 次日凌晨的用 24 + 小时（如 1 点 → 25）
+      const overtimeValues = [
+        ...sameDayHours.map((h) => h),
+        ...earlyHours.map((h) => 24 + h)
+      ]
+
+      if (overtimeValues.length === 0) {
+        // 这一天没有任何「下班后到次日上班前」的提交
+        return {
+          date: k,
+          latestHour: null,
+          latestHourNormalized: null
+        }
+      }
+
+      const latestHourNormalized = Math.max(...overtimeValues)
+
+      // latestHour 保留「当天自然日内」的最晚提交通常小时数，供前端需要时参考
+      const sameDayMax =
+        sameDayHours.length > 0 ? Math.max(...sameDayHours) : null
+
+      return {
+        date: k,
+        latestHour: sameDayMax,
+        latestHourNormalized
+      }
+    })
+    const dataLatestByDayFile = outputFilePath(
+      'data/overtime-latest-by-day.mjs',
+      outDir
+    )
+    const latestByDayModule = `export default ${JSON.stringify(latestByDay, null, 2)};\n`
+    writeTextFile(dataLatestByDayFile, latestByDayModule)
+    logDev(`Latest-by-day series 已导出: ${dataLatestByDayFile}`)
+
+    // 导出配置（供前端显示）
+    try {
+      const configFile = outputFilePath('data/config.mjs', outDir)
+      const cfg = {
+        startHour: opts.workStart || 9,
+        endHour: opts.workEnd || 18,
+        lunchStart: opts.lunchStart || 12,
+        lunchEnd: opts.lunchEnd || 14,
+        overnightCutoff
+      }
+      writeTextFile(
+        configFile,
+        `export default ${JSON.stringify(cfg, null, 2)};\n`
+      )
+      logDev(`Config 已导出: ${configFile}`)
+    } catch (e) {
+      console.warn('Export config failed:', e && e.message ? e.message : e)
+    }
+
+    startServer(opts.port || 3000, outDir).catch((err) => {
+      console.warn(
+        'Start server failed.',
+        err && err.message ? err.message : err
+      )
+    })
+  } catch (err) {
+    console.warn(
+      'Export data modules failed:',
+      err && err.message ? err.message : err
+    )
+  }
+}