git-flex 1.0.0 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-flex",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "type": "module",
   "description": "Show off your coding stats in style. Beautiful terminal cards, shareable SVGs, and fun highlights from your git history.",
   "main": "src/index.js",
@@ -41,6 +41,7 @@
   ],
   "dependencies": {
     "chalk": "5.6.2",
-    "commander": "12.1.0"
+    "commander": "12.1.0",
+    "string-width": "7.2.0"
   }
 }

package/src/git.js

@@ -86,17 +86,31 @@ export function getDiffStatsAndLangs({ author, since, until } = {}) {
 }
 
 export function getAllAuthors({ since, until } = {}) {
-  const args = ['git', 'log', '--no-merges', '--format=%an'];
+  // Get commits + lines in one pass using a marker to separate commits
+  const args = ['git', 'log', '--no-merges', '--numstat', '--format=COMMIT:%an'];
   if (since) args.push(`--since=${since}`);
   if (until) args.push(`--until=${until}`);
   const raw = runArgs(args);
   if (!raw) return [];
-  const counts = {};
-  for (const name of raw.split('\n').filter(Boolean)) {
-    counts[name] = (counts[name] || 0) + 1;
+
+  const authors = {};
+  let current = null;
+
+  for (const ln of raw.split('\n')) {
+    if (ln.startsWith('COMMIT:')) {
+      current = ln.slice(7);
+      if (!authors[current]) authors[current] = { commits: 0, added: 0, removed: 0 };
+      authors[current].commits++;
+    } else if (current && ln.includes('\t')) {
+      const [a, r] = ln.split('\t');
+      if (a === '-') continue;
+      authors[current].added += parseInt(a) || 0;
+      authors[current].removed += parseInt(r) || 0;
+    }
   }
-  return Object.entries(counts)
-    .map(([name, commits]) => ({ name, commits }))
+
+  return Object.entries(authors)
+    .map(([name, s]) => ({ name, commits: s.commits, added: s.added, removed: s.removed, net: s.added - s.removed }))
     .sort((a, b) => b.commits - a.commits);
 }
 

package/src/terminal.js

@@ -1,28 +1,37 @@
 import chalk from 'chalk';
+import stringWidth from 'string-width';
 import { formatHour, formatNumber } from './stats.js';
 import { getRank, getLevel } from './rank.js';
 import { getHighlights } from './highlights.js';
 
 const BOX = { tl: '\u256D', tr: '\u256E', bl: '\u2570', br: '\u256F', h: '\u2500', v: '\u2502' };
-const W = 56;
+const W = 58;
 
-function line(left, content, right) {
-  const stripped = content.replace(/\x1B\[[0-9;]*m/g, '');
-  const pad = W - 2 - stripped.length;
-  return `${left}${content}${' '.repeat(Math.max(0, pad))}${right}`;
+function line(content, width = W) {
+  const vis = stringWidth(content);
+  const pad = width - 2 - vis;
+  return `${chalk.cyan(BOX.v)}${content}${' '.repeat(Math.max(0, pad))}${chalk.cyan(BOX.v)}`;
 }
 
-function box(content) {
-  return `${BOX.v} ${content}`;
+function hr(width = W) {
+  return chalk.dim(`${BOX.v}${BOX.h.repeat(width - 2)}${BOX.v}`);
 }
 
-function hr() {
-  return chalk.dim(`${BOX.v}${BOX.h.repeat(W - 2)}${BOX.v}`);
+function top(width = W) {
+  return chalk.cyan(`${BOX.tl}${BOX.h.repeat(width - 2)}${BOX.tr}`);
 }
 
-function padRight(str, len) {
-  const stripped = str.replace(/\x1B\[[0-9;]*m/g, '');
-  return str + ' '.repeat(Math.max(0, len - stripped.length));
+function bot(width = W) {
+  return chalk.cyan(`${BOX.bl}${BOX.h.repeat(width - 2)}${BOX.br}`);
+}
+
+function sep(width = W) {
+  return chalk.cyan(`${BOX.v}${BOX.h.repeat(width - 2)}${BOX.v}`);
+}
+
+function pad(str, len) {
+  const vis = stringWidth(str);
+  return str + ' '.repeat(Math.max(0, len - vis));
 }
 
 function langBar(pct) {
@@ -35,24 +44,21 @@ export function renderCard(stats, streakData, repoName, periodLabel) {
   const level = getLevel(stats.commits);
   const o = [];
 
-  // Top border
-  o.push(chalk.cyan(`${BOX.tl}${BOX.h.repeat(W - 2)}${BOX.tr}`));
+  o.push(top());
 
   // Header
   const title = ` FLEX \u2022 ${repoName}`;
   const period = periodLabel;
-  const headerPad = W - 2 - title.length - period.length;
+  const headerPad = W - 2 - stringWidth(title) - stringWidth(period);
   o.push(chalk.cyan(BOX.v) + chalk.bold.white(title) + ' '.repeat(Math.max(1, headerPad)) + chalk.dim(period) + chalk.cyan(BOX.v));
 
-  o.push(chalk.cyan(`${BOX.v}${BOX.h.repeat(W - 2)}${BOX.v}`));
+  o.push(sep());
 
   // User + rank
-  const userLine = ` ${chalk.bold.yellow(stats.author)}  ${rank.icon}  ${chalk.italic.magenta(rank.title)}`;
-  o.push(line(chalk.cyan(BOX.v), userLine, chalk.cyan(BOX.v)));
+  o.push(line(` ${chalk.bold.yellow(stats.author)}  ${rank.icon}  ${chalk.italic.magenta(rank.title)}`));
 
   // Level bar
-  const lvlLine = ` ${chalk.dim('LVL')} ${chalk.white(level.level)} ${chalk.cyan(level.bar)} ${chalk.dim(level.name)}`;
-  o.push(line(chalk.cyan(BOX.v), lvlLine, chalk.cyan(BOX.v)));
+  o.push(line(` ${chalk.dim('LVL')} ${chalk.white(level.level)} ${chalk.cyan(level.bar)} ${chalk.dim(level.name)}`));
 
   o.push(hr());
 
@@ -71,21 +77,21 @@ export function renderCard(stats, streakData, repoName, periodLabel) {
   ];
 
   for (let i = 0; i < col1.length; i++) {
-    const left = ` ${padRight(col1[i][0], 10)} ${padRight(col1[i][1], 10)}`;
-    const right = `${padRight(col2[i][0], 11)} ${col2[i][1]}`;
+    const left = ` ${pad(col1[i][0], 10)} ${pad(col1[i][1], 10)}`;
+    const right = `${pad(col2[i][0], 11)} ${col2[i][1]}`;
     const full = left + '  ' + right;
-    o.push(line(chalk.cyan(BOX.v), full, chalk.cyan(BOX.v)));
+    o.push(line(full));
   }
 
   // Languages
   if (stats.languages.length) {
     o.push(hr());
-    o.push(line(chalk.cyan(BOX.v), ` ${chalk.bold.white('Languages')}`, chalk.cyan(BOX.v)));
+    o.push(line(` ${chalk.bold.white('Languages')}`));
     for (const lang of stats.languages.slice(0, 5)) {
-      const lbl = padRight(` ${chalk.white(lang.name)}`, 20);
+      const lbl = pad(` ${chalk.white(lang.name)}`, 20);
       const bar = langBar(lang.pct);
       const pctStr = chalk.dim(`${lang.pct}%`);
-      o.push(line(chalk.cyan(BOX.v), `${lbl} ${bar} ${pctStr}`, chalk.cyan(BOX.v)));
+      o.push(line(`${lbl} ${bar} ${pctStr}`));
     }
   }
 
@@ -94,13 +100,11 @@ export function renderCard(stats, streakData, repoName, periodLabel) {
   if (highlights.length) {
     o.push(hr());
     for (const h of highlights) {
-      o.push(line(chalk.cyan(BOX.v), ` ${chalk.yellow('>')} ${chalk.italic.white(h)}`, chalk.cyan(BOX.v)));
+      o.push(line(` ${chalk.yellow('>')} ${chalk.italic.white(h)}`));
     }
   }
 
-  // Bottom
-  o.push(chalk.cyan(`${BOX.bl}${BOX.h.repeat(W - 2)}${BOX.br}`));
-
+  o.push(bot());
   return o.join('\n');
 }
 
@@ -108,71 +112,73 @@ export function renderComparison(stats1, stats2, streak1, streak2, repoName) {
   const rank1 = getRank(stats1, streak1);
   const rank2 = getRank(stats2, streak2);
   const o = [];
-  const W2 = 64;
+  const CW = 64;
 
-  o.push(chalk.cyan(`${BOX.tl}${BOX.h.repeat(W2 - 2)}${BOX.tr}`));
-  o.push(line(chalk.cyan(BOX.v), chalk.bold.white(` FLEX VS \u2022 ${repoName}`), chalk.cyan(BOX.v)));
-  o.push(chalk.cyan(`${BOX.v}${BOX.h.repeat(W2 - 2)}${BOX.v}`));
+  o.push(top(CW));
+  o.push(line(chalk.bold.white(` FLEX VS \u2022 ${repoName}`), CW));
+  o.push(sep(CW));
 
   function vsLine(label, v1, v2) {
-    return line(chalk.cyan(BOX.v),
-      ` ${padRight(chalk.dim(label), 12)} ${padRight(v1, 14)} ${chalk.dim('vs')} ${padRight(v2, 14)}`,
-      chalk.cyan(BOX.v));
+    return line(` ${pad(chalk.dim(label), 12)} ${pad(v1, 14)} ${chalk.dim('vs')} ${pad(v2, 14)}`, CW);
   }
 
-  // Names
   o.push(vsLine('', chalk.bold.yellow(stats1.author), chalk.bold.blue(stats2.author)));
   o.push(vsLine('Rank', chalk.magenta(`${rank1.icon} ${rank1.title}`), chalk.magenta(`${rank2.icon} ${rank2.title}`)));
-  o.push(hr());
+  o.push(hr(CW));
   o.push(vsLine('Commits', chalk.white(formatNumber(stats1.commits)), chalk.white(formatNumber(stats2.commits))));
   o.push(vsLine('Added', chalk.green('+' + formatNumber(stats1.added)), chalk.green('+' + formatNumber(stats2.added))));
   o.push(vsLine('Removed', chalk.red('-' + formatNumber(stats1.removed)), chalk.red('-' + formatNumber(stats2.removed))));
   o.push(vsLine('Files', chalk.white(formatNumber(stats1.filesCount)), chalk.white(formatNumber(stats2.filesCount))));
   o.push(vsLine('Streak', chalk.yellow(`${streak1.current}d`), chalk.yellow(`${streak2.current}d`)));
 
-  o.push(chalk.cyan(`${BOX.bl}${BOX.h.repeat(W2 - 2)}${BOX.br}`));
+  o.push(bot(CW));
   return o.join('\n');
 }
 
 export function renderTeam(authors, repoName, periodLabel) {
   const o = [];
-  const W2 = 52;
+  const TW = 76;
+
+  o.push(top(TW));
+  o.push(line(chalk.bold.white(` FLEX TEAM \u2022 ${repoName} \u2022 ${periodLabel}`), TW));
+  o.push(sep(TW));
 
-  o.push(chalk.cyan(`${BOX.tl}${BOX.h.repeat(W2 - 2)}${BOX.tr}`));
-  o.push(line(chalk.cyan(BOX.v), chalk.bold.white(` FLEX TEAM \u2022 ${repoName} \u2022 ${periodLabel}`), chalk.cyan(BOX.v)));
-  o.push(chalk.cyan(`${BOX.v}${BOX.h.repeat(W2 - 2)}${BOX.v}`));
+  // Header row
+  o.push(line(` ${pad('', 4)} ${pad(chalk.dim('Name'), 18)} ${pad(chalk.dim('Commits'), 8)} ${pad(chalk.dim('Added'), 9)} ${pad(chalk.dim('Removed'), 9)} ${pad(chalk.dim('Net'), 9)}`, TW));
+  o.push(hr(TW));
 
   const medals = ['\u{1F947}', '\u{1F948}', '\u{1F949}'];
-  const maxCommits = authors[0]?.commits || 1;
 
   for (let i = 0; i < Math.min(authors.length, 15); i++) {
     const a = authors[i];
     const medal = medals[i] || chalk.dim(`${i + 1}.`);
-    const bar = chalk.green('\u2588'.repeat(Math.max(1, Math.round((a.commits / maxCommits) * 15))));
-    const name = padRight(chalk.white(a.name), 20);
-    o.push(line(chalk.cyan(BOX.v),
-      ` ${padRight(medal, 4)} ${name} ${bar} ${chalk.dim(a.commits)}`,
-      chalk.cyan(BOX.v)));
+    const name = pad(chalk.white(a.name), 18);
+    const commits = pad(chalk.bold.white(formatNumber(a.commits)), 8);
+    const added = pad(chalk.green('+' + formatNumber(a.added)), 9);
+    const removed = pad(chalk.red('-' + formatNumber(a.removed)), 9);
+    const net = a.net >= 0
+      ? chalk.green('+' + formatNumber(a.net))
+      : chalk.red(formatNumber(a.net));
+    o.push(line(` ${pad(medal, 4)} ${name} ${commits} ${added} ${removed} ${pad(net, 9)}`, TW));
   }
 
-  o.push(chalk.cyan(`${BOX.bl}${BOX.h.repeat(W2 - 2)}${BOX.br}`));
+  o.push(bot(TW));
   return o.join('\n');
 }
 
 export function renderStreak(streakData, stats, repoName) {
   const o = [];
-  o.push(chalk.cyan(`${BOX.tl}${BOX.h.repeat(W - 2)}${BOX.tr}`));
-  o.push(line(chalk.cyan(BOX.v), chalk.bold.white(` FLEX STREAK \u2022 ${repoName}`), chalk.cyan(BOX.v)));
-  o.push(chalk.cyan(`${BOX.v}${BOX.h.repeat(W - 2)}${BOX.v}`));
+  o.push(top());
+  o.push(line(chalk.bold.white(` FLEX STREAK \u2022 ${repoName}`)));
+  o.push(sep());
 
-  o.push(line(chalk.cyan(BOX.v), ` ${chalk.dim('Author')}    ${chalk.bold.yellow(stats.author)}`, chalk.cyan(BOX.v)));
-  o.push(line(chalk.cyan(BOX.v), ` ${chalk.dim('Current')}   ${chalk.bold.yellow(`${streakData.current} days`)} ${streakData.current >= 7 ? '\u{1F525}' : ''}`, chalk.cyan(BOX.v)));
-  o.push(line(chalk.cyan(BOX.v), ` ${chalk.dim('Longest')}   ${chalk.bold.white(`${streakData.longest} days`)} \u{1F3C6}`, chalk.cyan(BOX.v)));
+  o.push(line(` ${chalk.dim('Author')}    ${chalk.bold.yellow(stats.author)}`));
+  o.push(line(` ${chalk.dim('Current')}   ${chalk.bold.yellow(`${streakData.current} days`)} ${streakData.current >= 7 ? '\u{1F525}' : ''}`));
+  o.push(line(` ${chalk.dim('Longest')}   ${chalk.bold.white(`${streakData.longest} days`)} \u{1F3C6}`));
 
-  // Visual streak bar
   const days = Math.min(streakData.current, 30);
   const bar = chalk.yellow('\u2588'.repeat(days)) + chalk.dim('\u2591'.repeat(30 - days));
-  o.push(line(chalk.cyan(BOX.v), ` ${bar}`, chalk.cyan(BOX.v)));
+  o.push(line(` ${bar}`));
 
   let msg = '';
   if (streakData.current === 0) msg = 'Start a streak today!';
@@ -181,30 +187,31 @@ export function renderStreak(streakData, stats, repoName) {
   else if (streakData.current >= 7) msg = 'One week strong!';
   else if (streakData.current >= 3) msg = 'Building momentum...';
   else msg = 'Keep it going!';
-  o.push(line(chalk.cyan(BOX.v), ` ${chalk.italic.dim(msg)}`, chalk.cyan(BOX.v)));
+  o.push(line(` ${chalk.italic.dim(msg)}`));
 
-  o.push(chalk.cyan(`${BOX.bl}${BOX.h.repeat(W - 2)}${BOX.br}`));
+  o.push(bot());
   return o.join('\n');
 }
 
 export function renderLangs(stats, repoName, periodLabel) {
   const o = [];
-  o.push(chalk.cyan(`${BOX.tl}${BOX.h.repeat(W - 2)}${BOX.tr}`));
-  o.push(line(chalk.cyan(BOX.v), chalk.bold.white(` FLEX LANGS \u2022 ${repoName} \u2022 ${periodLabel}`), chalk.cyan(BOX.v)));
-  o.push(chalk.cyan(`${BOX.v}${BOX.h.repeat(W - 2)}${BOX.v}`));
+  const LW = 62;
+  o.push(top(LW));
+  o.push(line(chalk.bold.white(` FLEX LANGS \u2022 ${repoName} \u2022 ${periodLabel}`), LW));
+  o.push(sep(LW));
 
   if (!stats.languages.length) {
-    o.push(line(chalk.cyan(BOX.v), chalk.dim(' No language data found'), chalk.cyan(BOX.v)));
+    o.push(line(chalk.dim(' No language data found'), LW));
   } else {
     for (const lang of stats.languages) {
-      const lbl = padRight(` ${chalk.bold.white(lang.name)}`, 22);
+      const lbl = pad(` ${chalk.bold.white(lang.name)}`, 16);
       const bar = langBar(lang.pct);
-      const pct = padRight(chalk.yellow(`${lang.pct}%`), 6);
+      const pct = pad(chalk.yellow(`${lang.pct}%`), 5);
       const cnt = chalk.dim(`(${lang.count} files)`);
-      o.push(line(chalk.cyan(BOX.v), `${lbl} ${bar} ${pct} ${cnt}`, chalk.cyan(BOX.v)));
+      o.push(line(`${lbl} ${bar} ${pct} ${cnt}`, LW));
     }
   }
 
-  o.push(chalk.cyan(`${BOX.bl}${BOX.h.repeat(W - 2)}${BOX.br}`));
+  o.push(bot(LW));
   return o.join('\n');
 }