wukong-gitlog-cli 1.0.13 → 1.0.15

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 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.15](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.14...v1.0.15) (2025-12-03)
+
+
+### Features
+
+* 🎸 dayDetailSidebar ([21b99fd](https://github.com/tomatobybike/wukong-gitlog-cli/commit/21b99fd859af45641987dfd5f50a8c5604a380c5))
+* 🎸 each day ([ffa3d5e](https://github.com/tomatobybike/wukong-gitlog-cli/commit/ffa3d5e6192a69a727c747ffa325b56ae5bf78d4))
+* 🎸 hourlyOvertimeChart ([93f62b7](https://github.com/tomatobybike/wukong-gitlog-cli/commit/93f62b7b9906154a16bdcf38bd7b0979d44bebfe))
+* 🎸 latestOvertimeDay ([40cb157](https://github.com/tomatobybike/wukong-gitlog-cli/commit/40cb15788411441306e0c838108817fa36268624))
+* 🎸 next day cutof ([efe6a5f](https://github.com/tomatobybike/wukong-gitlog-cli/commit/efe6a5f41e54ca0fdadb3c0071f1fcf7a286e6c2))
+* 🎸 onDayClick ([9132b54](https://github.com/tomatobybike/wukong-gitlog-cli/commit/9132b5423449ceb8a964d813dfd4931834993913))
+* 🎸 renderKpi ([e26cc0d](https://github.com/tomatobybike/wukong-gitlog-cli/commit/e26cc0deac83a7e9bccaae81ba572da0e39e82b3))
+* 🎸 week range ([cd565da](https://github.com/tomatobybike/wukong-gitlog-cli/commit/cd565dac98b6c38442eeacdd6dd423b93d657ab0))
+
+### [1.0.14](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.13...v1.0.14) (2025-12-02)
+
+
+### Features
+
+* 🎸 charts show better ([bfceb54](https://github.com/tomatobybike/wukong-gitlog-cli/commit/bfceb54b2bd67cc6bd67d93550799592119daff2))
+
 ### [1.0.13](https://github.com/tomatobybike/wukong-gitlog-cli/compare/v1.0.12...v1.0.13) (2025-12-01)
 
 

package/README.md

@@ -53,6 +53,10 @@ wukong-gitlog-cli --help
 
 ## Usage
 
+```bash
+wukong-gitlog-cli --overtime  --serve --port 5555
+```
+
 ```bash
 wukong-gitlog-cli [options]
 ```

package/README.zh-CN.md

@@ -55,6 +55,10 @@ wukong-gitlog-cli --help
 
 ## 🚀 使用方法
 
+```bash
+wukong-gitlog-cli --overtime  --serve --port 5555
+```
+
 ```bash
 wukong-gitlog-cli [options]
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wukong-gitlog-cli",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Advanced Git commit log exporter with Excel/JSON/TXT output, grouping, stats and CLI.",
   "keywords": [
     "git",

package/src/cli.mjs

@@ -1,6 +1,7 @@
 import chalk from 'chalk'
 import { Command } from 'commander'
 import dayjs from 'dayjs'
+import isoWeek from 'dayjs/plugin/isoWeek.js'
 import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
@@ -31,6 +32,8 @@ const pkg = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf8')
 )
 
+dayjs.extend(isoWeek)
+
 const PKG_NAME = pkg.name
 const VERSION = pkg.version
 
@@ -51,6 +54,21 @@ const version = async () => {
   process.exit(0)
 }
 
+/** 将 "2025-W48" → { start: '2025-11-24', end: '2025-11-30' } */
+export function getWeekRange(periodStr) {
+  // periodStr = "2025-W48"
+  const [year, w] = periodStr.split('-W')
+  const week = parseInt(w, 10)
+
+  const start = dayjs().year(year).isoWeek(week).startOf('week') // Monday
+  const end = dayjs().year(year).isoWeek(week).endOf('week') // Sunday
+
+  return {
+    start: start.format('YYYY-MM-DD'),
+    end: end.format('YYYY-MM-DD')
+  }
+}
+
 const main = async () => {
   const program = new Command()
 
@@ -343,6 +361,7 @@ const main = async () => {
           })
           return {
             period: k,
+            range: getWeekRange(k),
             total: s.total,
             outsideWorkCount: s.outsideWorkCount,
             outsideWorkRate: s.outsideWorkRate,
@@ -380,7 +399,10 @@ const main = async () => {
             nonWorkdayRate: s.nonWorkdayRate
           }
         })
-        const dataMonthlyFile = outputFilePath('data/overtime-monthly.mjs', outDir)
+        const dataMonthlyFile = outputFilePath(
+          'data/overtime-monthly.mjs',
+          outDir
+        )
         const monthlyModule = `export default ${JSON.stringify(monthlySeries, null, 2)};\n`
         writeTextFile(dataMonthlyFile, monthlyModule)
         console.log(chalk.green(`Monthly series 已导出: ${dataMonthlyFile}`))
@@ -388,29 +410,92 @@ const main = async () => {
         // 新增：每日最晚提交小时（用于显著展示加班严重程度）
         const dayGroups2 = groupRecords(records, 'day')
         const dayKeys2 = Object.keys(dayGroups2).sort()
-        const overnightCutoff = Number.isFinite(opts.overnightCutoff) ? opts.overnightCutoff : 6
-        const latestByDay = dayKeys2.map((k) => {
-          const list = dayGroups2[k]
-          const vals = list
-            .map((r) => ({ r, _dt: new Date(r.date) }))
-            .filter((x) => x._dt && !Number.isNaN(x._dt.valueOf()))
-            .sort((a, b) => a._dt.valueOf() - b._dt.valueOf())
-          const last = vals.length > 0 ? vals[vals.length - 1] : null
-          const hour = last ? new Date(last.r.date).getHours() : null
+
+        // 次日凌晨归并窗口（默认 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())
-            .filter((h) => h >= 0 && h < overnightCutoff)
-          const earlyMax = earlyHours.length > 0 ? Math.max(...earlyHours) : null
-          const normalized = typeof earlyMax === 'number' ? 24 + earlyMax : null
-          const latestHourNormalized = Math.max(
-            typeof hour === 'number' ? hour : -1,
-            typeof normalized === 'number' ? normalized : -1
-          )
-          return { date: k, latestHour: hour, latestHourNormalized: latestHourNormalized >= 0 ? latestHourNormalized : null }
+            // 只看 [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',
@@ -432,7 +517,10 @@ const main = async () => {
             lunchEnd: opts.lunchEnd || 14,
             overnightCutoff
           }
-          writeTextFile(configFile, `export default ${JSON.stringify(cfg, null, 2)};\n`)
+          writeTextFile(
+            configFile,
+            `export default ${JSON.stringify(cfg, null, 2)};\n`
+          )
           console.log(chalk.green(`Config 已导出: ${configFile}`))
         } catch (e) {
           console.warn('Export config failed:', e && e.message ? e.message : e)