@kaynooo/cli-code 0.14.3 → 0.15.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cli.js CHANGED
@@ -2,7 +2,7 @@
2
2
  // @bun
3
3
 
4
4
  // src/cli.ts
5
- import process18 from "process";
5
+ import process19 from "process";
6
6
  // ../kit/src/args.ts
7
7
  import process9 from "process";
8
8
  import { parseArgs } from "util";
@@ -422,6 +422,23 @@ function fileLink(text, path, stream, from = process6.cwd(), env = process6.env)
422
422
  }
423
423
 
424
424
  // ../kit/src/format.ts
425
+ var UNITS = [["d", 86400], ["h", 3600], ["m", 60], ["s", 1]];
426
+ function formatSeconds(total) {
427
+ let rest = Math.max(0, Math.round(total));
428
+ const amounts = UNITS.map(([unit, size]) => {
429
+ const amount = Math.floor(rest / size);
430
+ rest -= amount * size;
431
+ return `${amount}${unit}`;
432
+ });
433
+ const first = amounts.findIndex((amount) => !amount.startsWith("0"));
434
+ if (first === -1)
435
+ return "0s";
436
+ const next = amounts[first + 1];
437
+ return next === undefined || next.startsWith("0") ? amounts[first] ?? "0s" : `${amounts[first]} ${next}`;
438
+ }
439
+ function formatDuration(ms) {
440
+ return ms < 60000 ? `${(Math.max(0, ms) / 1000).toFixed(1)}s` : formatSeconds(ms / 1000);
441
+ }
425
442
  function upTo(text, separator) {
426
443
  const end = text.indexOf(separator);
427
444
  return end === -1 ? text : text.slice(0, end);
@@ -482,7 +499,7 @@ function printJson(value) {
482
499
 
483
500
  // ../kit/src/help.ts
484
501
  import process8 from "process";
485
- var OPTIONAL = /\[[^\]]+\]/g;
502
+ var OPTIONAL = /(?<!\x1B)\[[^\]]+\]/g;
486
503
  var USAGE_PREFIX = /^usage:\s*/i;
487
504
  var FULL_STOP = /\.$/;
488
505
  function usageLine(usage, colors = paint(process8.stdout)) {
@@ -521,29 +538,40 @@ function exampleRows(examples, colors = paint(process8.stdout)) {
521
538
  return [];
522
539
  return ["", colors.bold("Examples:"), ...examples.map((example) => typeof example === "string" ? ` ${example}` : ` ${example[0]} ${colors.dim(`# ${example[1]}`)}`)];
523
540
  }
541
+ var MAX_INLINE_CHOICES = 24;
524
542
  function optionRows(options, colors = paint(process8.stdout)) {
525
543
  const rows = Object.entries(options).map(([name, option]) => {
526
544
  const short = option.short === undefined ? " " : `${colors.cyan(`-${option.short}`)}, `;
527
- const named = option.choices === undefined ? "<value>" : `<${option.choices.join("|")}>`;
545
+ const choices = option.choices?.join("|");
546
+ const inline = choices !== undefined && choices.length <= MAX_INLINE_CHOICES;
547
+ const named = inline ? `<${choices}>` : "<value>";
528
548
  const placeholder = option.optional === undefined ? named : `[${named}]`;
529
549
  const value = option.type === "string" ? ` ${colors.dim(placeholder)}` : "";
530
- return { flag: `${short}${colors.cyan(`--${name}`)}${value}`, width: `-x, --${name}`.length + (option.type === "string" ? placeholder.length + 1 : 0), description: option.description ?? "" };
550
+ const described = choices === undefined || inline ? option.description ?? "" : [option.description, `one of ${option.choices.join(", ")}`].filter(Boolean).join("; ");
551
+ return { flag: `${short}${colors.cyan(`--${name}`)}${value}`, width: `-x, --${name}`.length + (option.type === "string" ? placeholder.length + 1 : 0), description: described };
531
552
  });
532
553
  const width = Math.max(0, ...rows.map((row) => row.width));
533
554
  return rows.map((row) => row.description === "" ? ` ${row.flag}` : ` ${row.flag}${" ".repeat(width - row.width)} ${colors.dim(row.description)}`);
534
555
  }
535
556
 
536
557
  // ../kit/src/text.ts
537
- var ANSI = new RegExp(`${String.fromCharCode(27)}\\[[\\d;?]*[a-z]`, "gi");
538
558
  function distance(a, b) {
539
- let previous = Array.from({ length: b.length + 1 }, (_, index) => index);
540
- for (const [i, left] of [...a].entries()) {
559
+ const left = [...a];
560
+ const right = [...b];
561
+ let before = [];
562
+ let previous = Array.from({ length: right.length + 1 }, (_, index) => index);
563
+ for (const [i, x] of left.entries()) {
541
564
  const current = [i + 1];
542
- for (const [j, right] of [...b].entries())
543
- current.push(Math.min((previous[j + 1] ?? 0) + 1, (current[j] ?? 0) + 1, (previous[j] ?? 0) + (left === right ? 0 : 1)));
565
+ for (const [j, y] of right.entries()) {
566
+ let cost = Math.min((previous[j + 1] ?? 0) + 1, (current[j] ?? 0) + 1, (previous[j] ?? 0) + (x === y ? 0 : 1));
567
+ if (i > 0 && j > 0 && x === right[j - 1] && left[i - 1] === y)
568
+ cost = Math.min(cost, (before[j - 1] ?? 0) + 1);
569
+ current.push(cost);
570
+ }
571
+ before = previous;
544
572
  previous = current;
545
573
  }
546
- return previous[b.length] ?? 0;
574
+ return previous[right.length] ?? 0;
547
575
  }
548
576
  function closest(name, names) {
549
577
  const started = names.find((known) => known.startsWith(name));
@@ -624,7 +652,7 @@ class Completing {
624
652
  }
625
653
  var completion = { active: false };
626
654
  var OUTPUT_OPTIONS = {
627
- color: { type: "string", description: "auto (on a terminal alone), always or never" },
655
+ color: { type: "string", choices: ["auto", "always", "never"], description: "auto (the default) colours on a terminal alone" },
628
656
  plain: { type: "boolean", description: "plain text, no colour or spinner: --color never" }
629
657
  };
630
658
  function applyOutput(color, plain, env = process9.env) {
@@ -918,13 +946,91 @@ var CLOSE_LINK = `${ESC}]8;;${ESC}\\`;
918
946
  // ../kit/src/cli.ts
919
947
  import { readFileSync as readFileSync4, realpathSync as realpathSync2 } from "fs";
920
948
  import { dirname as dirname3, join as join5 } from "path";
921
- import process13 from "process";
949
+ import process14 from "process";
950
+
951
+ // ../kit/src/completions.ts
952
+ var COMPLETION_SHELLS = ["fish", "bash", "zsh"];
953
+ var FISH_FUNCTION = `functions -q __kaynooo_cli_complete; or function __kaynooo_cli_complete --argument-names bin --description 'what a @kaynooo/cli-kit bin offers for the word being typed'
954
+ set -l tokens (commandline -xpc 2>/dev/null; or commandline -opc)
955
+ set -l current (commandline -ct)
956
+ for line in ($bin __complete $tokens[2..-1] $current 2>/dev/null)
957
+ if test "$line" = __files__
958
+ __fish_complete_path $current
959
+ else
960
+ echo $line
961
+ end
962
+ end
963
+ end`;
964
+ var BASH_FUNCTION = `__kaynooo_cli_complete() {
965
+ local IFS=$'\\n' cur=\${COMP_WORDS[COMP_CWORD]} line words=
966
+ local -a lines
967
+ COMPREPLY=()
968
+ lines=($("\${COMP_WORDS[0]}" __complete "\${COMP_WORDS[@]:1:COMP_CWORD}" 2>/dev/null))
969
+ for line in "\${lines[@]}"; do
970
+ if [[ $line == __files__ ]]; then
971
+ COMPREPLY+=($(compgen -f -- "$cur"))
972
+ else
973
+ words+="\${line%%$'\\t'*}"$'\\n'
974
+ fi
975
+ done
976
+ COMPREPLY+=($(compgen -W "$words" -- "$cur"))
977
+ }`;
978
+ var ZSH_FUNCTION = `__kaynooo_cli_complete() {
979
+ local line
980
+ local -a described plain
981
+ for line in \${(f)"$("\${words[1]}" __complete "\${(@)words[2,CURRENT]}" 2>/dev/null)"}; do
982
+ if [[ $line == __files__ ]]; then
983
+ _files
984
+ elif [[ $line == *$'\\t'* ]]; then
985
+ described+=("\${\${line%%$'\\t'*}//:/\\\\:}:\${line#*$'\\t'}")
986
+ else
987
+ plain+=("$line")
988
+ fi
989
+ done
990
+ (( \${#described} )) && _describe -V value described
991
+ (( \${#plain} )) && compadd -- "\${plain[@]}"
992
+ return 0
993
+ }`;
994
+ function completionScript(shell, bins, header = `# Generated by \`${bins[0]} --completions ${shell}\``) {
995
+ if (shell === "fish")
996
+ return `${header}
997
+ ${FISH_FUNCTION}
998
+ ${bins.map((bin) => `complete -c ${bin} -f -a '(__kaynooo_cli_complete ${bin})'
999
+ `).join("")}`;
1000
+ if (shell === "bash")
1001
+ return `${header}
1002
+ ${BASH_FUNCTION}
1003
+ complete -F __kaynooo_cli_complete ${bins.join(" ")}
1004
+ `;
1005
+ return `${header}
1006
+ ${ZSH_FUNCTION}
1007
+ compdef __kaynooo_cli_complete ${bins.join(" ")}
1008
+ `;
1009
+ }
1010
+
1011
+ // ../kit/src/notify.ts
1012
+ import process12 from "process";
1013
+ var NOTIFY_AFTER_MS = 1e4;
1014
+ var CANCELLED = 130;
1015
+ function base64(text) {
1016
+ return Buffer.from(text).toString("base64");
1017
+ }
1018
+ function notification(title, body, env = process12.env) {
1019
+ const id = `kit${process12.pid}`;
1020
+ const codes = [`\x1B]99;i=${id}:d=0:o=unfocused:e=1;${base64(title)}\x1B\\`, `\x1B]99;i=${id}:p=body:e=1;${base64(body)}\x1B\\`];
1021
+ return codes.map((code) => env.TMUX === undefined || env.TMUX === "" ? code : `\x1BPtmux;${code.replaceAll("\x1B", "\x1B\x1B")}\x1B\\`).join("");
1022
+ }
1023
+ function notifyEnd(command, code, ms, { stream = process12.stderr, env = process12.env } = {}) {
1024
+ if (ms < NOTIFY_AFTER_MS || code === CANCELLED || outputMode(stream, env) !== "terminal")
1025
+ return;
1026
+ stream.write(notification(command, code === 0 ? `done in ${formatDuration(ms)}` : `failed with exit ${code} after ${formatDuration(ms)}`, env));
1027
+ }
922
1028
 
923
1029
  // ../kit/src/usage.ts
924
1030
  import { appendFileSync, mkdirSync } from "fs";
925
1031
  import { homedir as homedir3 } from "os";
926
1032
  import { dirname as dirname2, isAbsolute, join as join4 } from "path";
927
- import process12 from "process";
1033
+ import process13 from "process";
928
1034
 
929
1035
  // ../kit/src/logs.ts
930
1036
  var DAY_MS = 24 * 60 * 60 * 1000;
@@ -938,14 +1044,14 @@ var usageError;
938
1044
  function noteUsageError(message) {
939
1045
  usageError = message;
940
1046
  }
941
- function stateHome(env = process12.env) {
1047
+ function stateHome(env = process13.env) {
942
1048
  const dir = env.XDG_STATE_HOME;
943
1049
  return dir !== undefined && isAbsolute(dir) ? dir : join4(homedir3(), ".local", "state");
944
1050
  }
945
- function usagePath(env = process12.env) {
1051
+ function usagePath(env = process13.env) {
946
1052
  return join4(stateHome(env), CLI_FOLDER, "usage.jsonl");
947
1053
  }
948
- function usageRecorded(env = process12.env) {
1054
+ function usageRecorded(env = process13.env) {
949
1055
  const off = env.KAYNOOO_CLI_NO_USAGE;
950
1056
  return env.NODE_ENV !== "test" && (off === undefined || off === "" || off === "0");
951
1057
  }
@@ -959,7 +1065,7 @@ function usageEntry(bin, command, argv, code, now = new Date) {
959
1065
  usageError = undefined;
960
1066
  return { at: now.toISOString(), bin, ...command === undefined ? {} : { command }, flags: flagNames(argv), code, ...unknown === undefined ? {} : { unknown } };
961
1067
  }
962
- function recordUsage(entry, env = process12.env) {
1068
+ function recordUsage(entry, env = process13.env) {
963
1069
  if (!usageRecorded(env))
964
1070
  return;
965
1071
  try {
@@ -975,7 +1081,11 @@ var LEVEL_OPTIONS = {
975
1081
  ...OUTPUT_OPTIONS,
976
1082
  help: { type: "boolean", short: "h", description: "show this help" }
977
1083
  };
978
- var TOP_OPTIONS = { ...LEVEL_OPTIONS, version: { type: "boolean", short: "v", description: "print the version" } };
1084
+ var TOP_OPTIONS = {
1085
+ ...LEVEL_OPTIONS,
1086
+ version: { type: "boolean", short: "v", description: "print the version" },
1087
+ completions: { type: "string", choices: COMPLETION_SHELLS, description: "print the shell completion script" }
1088
+ };
979
1089
  async function commandRows(all, colors) {
980
1090
  const commands = shown(all);
981
1091
  const width = Math.max(0, ...Object.keys(commands).map((name) => name.length));
@@ -1049,8 +1159,8 @@ async function help2({ path, header, summary: lazySummary, commands, defaultComm
1049
1159
  `);
1050
1160
  }
1051
1161
  function printError(prefix, message, hint, cause) {
1052
- const colors = paint(process13.stderr);
1053
- const styled = takesControlCodes(process13.stderr);
1162
+ const colors = paint(process14.stderr);
1163
+ const styled = takesControlCodes(process14.stderr);
1054
1164
  const head = styled ? `${colors.red.bold("error")} ${colors.dim(`${prefix}:`)}` : `error: ${prefix}:`;
1055
1165
  const under = (label, text, tint) => text === undefined ? "" : `
1056
1166
  ${styled ? tint(label) : `${label}:`} ${text}`;
@@ -1093,11 +1203,11 @@ async function dispatch(level, typed, { version, redact }) {
1093
1203
  }
1094
1204
  }
1095
1205
  if (name === undefined && level.path.length > 1) {
1096
- console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]), process13.stderr));
1206
+ console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]), process14.stderr));
1097
1207
  return 2;
1098
1208
  }
1099
1209
  if (name === undefined || name === "help" || name === "--help" || name === "-h") {
1100
- console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]), process13.stdout));
1210
+ console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]), process14.stdout));
1101
1211
  return 0;
1102
1212
  }
1103
1213
  if (level.path.length === 1 && (name === "--version" || name === "-v")) {
@@ -1208,6 +1318,19 @@ async function candidates(scope, defaultCommand, words, before = []) {
1208
1318
  }
1209
1319
  return "commands" in command ? candidates(scopeOf(command.commands, command.extraCommands, command.aliases), undefined, rest, [...before, word]) : leafCandidates(command.run, rest);
1210
1320
  }
1321
+ var COMPLETIONS = "--completions";
1322
+ function flagValue([flag = "", ...rest]) {
1323
+ return flag.includes("=") ? [flag.slice(flag.indexOf("=") + 1), ...rest] : rest;
1324
+ }
1325
+ function printCompletionScript(name, args) {
1326
+ const shell = COMPLETION_SHELLS.find((each) => each === args[0]);
1327
+ if (shell === undefined || args.length !== 1) {
1328
+ printError(name, `${COMPLETIONS} takes one of ${COMPLETION_SHELLS.join(", ")}`, `${name} ${COMPLETIONS} fish`);
1329
+ return 2;
1330
+ }
1331
+ console.log(completionScript(shell, [name]).trimEnd());
1332
+ return 0;
1333
+ }
1211
1334
  async function printCandidates(found) {
1212
1335
  for (const line of await found)
1213
1336
  console.log(line);
@@ -1232,10 +1355,15 @@ async function runCli(cli, argv = scriptArgs()) {
1232
1355
  const version = cli.version ?? packageVersion();
1233
1356
  if (argv[0] === COMPLETE)
1234
1357
  return printCandidates(candidates(scopeOf(cli.commands, cli.extraCommands, cli.aliases), cli.defaultCommand, argv.slice(1)));
1358
+ if (argv[0] === COMPLETIONS || argv[0]?.startsWith(`${COMPLETIONS}=`) === true)
1359
+ return printCompletionScript(cli.name, flagValue(argv));
1360
+ const started = performance.now();
1235
1361
  const code = await dispatch({ path: [cli.name], header: (colors, about) => `${colors.bold(cli.name)} ${colors.dim(version)} ${about}`, summary: cli.about, ...scopeOf(cli.commands, cli.extraCommands, cli.aliases), defaultCommand: cli.defaultCommand, runBare: cli.runBare === true, examples: cli.examples, replaces: cli.replaces }, argv, { version, redact: cli.redact });
1362
+ const command = commandPath(scopeOf(cli.commands, cli.extraCommands, cli.aliases), argv);
1363
+ notifyEnd(command === undefined ? cli.name : `${cli.name} ${command}`, code, performance.now() - started);
1236
1364
  if (cli.usage !== false) {
1237
1365
  try {
1238
- recordUsage(usageEntry(cli.name, commandPath(scopeOf(cli.commands, cli.extraCommands, cli.aliases), argv), argv, code));
1366
+ recordUsage(usageEntry(cli.name, command, argv, code));
1239
1367
  } catch {}
1240
1368
  }
1241
1369
  return code;
@@ -1258,16 +1386,20 @@ function commandPath(scope, argv) {
1258
1386
  async function runMain({ name, version, run, redact, usage }, argv = scriptArgs()) {
1259
1387
  if (argv[0] === COMPLETE)
1260
1388
  return printCandidates(leafCandidates(run, argv.slice(1)));
1389
+ if (argv[0] === COMPLETIONS || argv[0]?.startsWith(`${COMPLETIONS}=`) === true)
1390
+ return printCompletionScript(name, flagValue(argv));
1261
1391
  if (argv.length === 1 && (argv[0] === "--version" || argv[0] === "-v")) {
1262
1392
  console.log(version ?? packageVersion());
1263
1393
  return 0;
1264
1394
  }
1265
1395
  let code;
1396
+ const started = performance.now();
1266
1397
  try {
1267
1398
  code = await run(argv);
1268
1399
  } catch (error) {
1269
1400
  code = reportThrown(name, error, redact, wantsJson(argv));
1270
1401
  }
1402
+ notifyEnd(name, code, performance.now() - started);
1271
1403
  if (usage !== false) {
1272
1404
  try {
1273
1405
  recordUsage(usageEntry(name, undefined, argv, code));
@@ -1311,7 +1443,7 @@ var SESSION_FILES = new Glob("*.json");
1311
1443
  var ACCOUNT_DIRS = new Glob("*/sessions");
1312
1444
  // src/hotspots.ts
1313
1445
  import { basename, join as join7 } from "path";
1314
- import process15 from "process";
1446
+ import process16 from "process";
1315
1447
 
1316
1448
  // src/churn.ts
1317
1449
  var SOURCE = /\.(?:[cm]?[jt]sx?|vue|svelte|astro|kay|py|go|rs|rb|php|java|kt|swift|cs|c|cc|cpp|h|hpp|scala|dart|lua|sh|zsh|fish)$/;
@@ -1319,9 +1451,8 @@ var TESTS = /(?:^|\/)(?:tests?|__tests__|spec|e2e|__mocks__|fixtures)\/|\.(?:tes
1319
1451
  var GENERATED = /(?:^|\/)(?:dist|build|out|generated|\.nuxt|\.output|\.next)\/|\.min\.[cm]?js$|\.d\.ts$|\.(?:generated|gen)\.[^/]+$|\.pb\.go$|\.snap$/;
1320
1452
  var LEADING_NEWLINE = /^\n/;
1321
1453
  var GENERATED_HEADER = /@generated|generated by|do not edit/i;
1322
- var DECISION = /\b(?:if|elif|elsif|for|foreach|while|until|case|when|catch|except|rescue|match|guard|and|or)\b|&&|\|\||\?\?|\?(?=[^.?:])/g;
1323
- var COMMENT = /\/\*[\s\S]*?\*\/|\/\/[^\n]*|^[ \t]*#[^\n]*/gm;
1324
- var STRING = /'(?:\\.|[^'\\\n])*'|"(?:\\.|[^"\\\n])*"|`(?:\\.|[^`\\])*`/g;
1454
+ var DECISION = /\b(?:if|elif|elsif|for|foreach|while|until|case|when|catch|except|rescue|match|guard|and|or)\b|&&|\|\||\?\?|\s\?(?![,):.?])/g;
1455
+ var COMMENT_OR_STRING = /(\/\*[\s\S]*?\*\/|\/\/[^\n]*|^[ \t]*#[^\n]*)|'(?:\\.|[^'\\\n])*'|"(?:\\.|[^"\\\n])*"|`(?:\\.|[^`\\])*`/gm;
1325
1456
  function isCandidate(path) {
1326
1457
  return SOURCE.test(path) && !TESTS.test(path) && !GENERATED.test(path);
1327
1458
  }
@@ -1329,25 +1460,35 @@ function isGenerated(text) {
1329
1460
  return GENERATED_HEADER.test(text.slice(0, 400));
1330
1461
  }
1331
1462
  function complexityOf(text) {
1332
- return 1 + (text.replace(COMMENT, "").replace(STRING, '""').match(DECISION)?.length ?? 0);
1463
+ return 1 + (text.replace(COMMENT_OR_STRING, (_, comment) => comment === undefined ? '""' : "").match(DECISION)?.length ?? 0);
1333
1464
  }
1334
1465
  async function churnSince(cwd, since, { bulk, halfLifeMs, now = Date.now() }) {
1335
- const log = await runCommand(["git", "log", `--since=${since}`, "--no-renames", "--relative", "--name-only", "--format=%x01%ct", "-z"], { cwd });
1336
- if (log.code !== 0)
1466
+ const [log, top] = await Promise.all([runCommand(["git", "log", `--since=${since}`, "--no-renames", "--numstat", "--format=%x01%ct%x02%ae", "-z"], { cwd }), runCommand(["git", "rev-parse", "--show-prefix"], { cwd })]);
1467
+ if (log.code !== 0 || top.code !== 0)
1337
1468
  return;
1469
+ const prefix = top.text.trim();
1338
1470
  const churn = new Map;
1471
+ const authors = new Map;
1339
1472
  for (const commit of log.text.split("\x01").slice(1)) {
1340
- const [stamp = "", ...names] = commit.split("\x00");
1341
- const paths = names.map((name) => name.replace(LEADING_NEWLINE, "")).filter((name) => name !== "");
1342
- if (paths.length > bulk)
1473
+ const [head = "", ...entries] = commit.split("\x00");
1474
+ const [stamp = "", author = ""] = head.split("\x02");
1475
+ const all = entries.map((entry) => entry.replace(LEADING_NEWLINE, "")).filter((entry) => entry !== "").map((entry) => {
1476
+ const [added = "", deleted = "", ...path] = entry.split("\t");
1477
+ return { path: path.join("\t"), lines: (Number(added) || 0) + (Number(deleted) || 0) };
1478
+ });
1479
+ if (all.length > bulk)
1343
1480
  continue;
1481
+ const paths = all.filter(({ path }) => path.startsWith(prefix)).map(({ path, lines }) => ({ path: path.slice(prefix.length), lines }));
1344
1482
  const age = Math.max(0, now - Number(stamp) * 1000);
1345
1483
  const weight = halfLifeMs === 0 ? 1 : 0.5 ** (age / halfLifeMs);
1346
- for (const path of paths) {
1347
- const seen = churn.get(path) ?? { commits: 0, weight: 0 };
1348
- churn.set(path, { commits: seen.commits + 1, weight: seen.weight + weight });
1484
+ for (const { path, lines } of paths) {
1485
+ const seen = churn.get(path) ?? { commits: 0, weight: 0, lines: 0, linesWeight: 0, authors: 0 };
1486
+ churn.set(path, { commits: seen.commits + 1, weight: seen.weight + weight, lines: seen.lines + lines, linesWeight: seen.linesWeight + lines * weight, authors: 0 });
1487
+ authors.set(path, (authors.get(path) ?? new Set).add(author));
1349
1488
  }
1350
1489
  }
1490
+ for (const [path, seen] of churn)
1491
+ seen.authors = authors.get(path)?.size ?? 0;
1351
1492
  return churn;
1352
1493
  }
1353
1494
 
@@ -1450,7 +1591,7 @@ var DEFAULT_HALF_LIFE = "90d";
1450
1591
  var DEFAULT_COUNT = configuredNumber("hotspots", "limit", 20);
1451
1592
  var USAGE = `hotspots [options] [dir]: ranks the source files under dir (here by default) by complexity times churn, the ones both hard to read and often edited first, honouring .gitignore
1452
1593
 
1453
- Complexity is the count of decision points in the file (branches, loops, cases, catches, boolean operators, ternaries) plus one, churn the commits touching it since --since (${DEFAULT_SINCE}), score their product. A commit counts for less the older it is (half as much every --half-life, 0 for all alike) and a commit touching more than --bulk files, a format or rename sweep, is left out. Each file also shows its most complex declaration, found by indentation. Test files and generated or built files are left out unless --all.
1594
+ Complexity is the count of decision points in the file (branches, loops, cases, catches, boolean operators, ternaries) plus one, churn the commits touching it since --since (${DEFAULT_SINCE}), score their product. A commit counts for less the older it is (half as much every --half-life, 0 for all alike) and a commit touching more than --bulk files, a format or rename sweep, is left out. --by-lines scores the lines changed instead of the commits. Each file also shows how many lines changed, its author count ("solo" when one author wrote every change) and its most complex declaration, found by indentation. Test files and generated or built files are left out unless --all.
1454
1595
 
1455
1596
  Lists at most ${DEFAULT_COUNT} files, the count of the rest after them (--limit <n>, --full for all); --json is never cut unless --limit is given.`;
1456
1597
  var EXITS = [[0, "it ranked the files"], [1, "no file has commits in the window"], [2, "a usage error or outside a git repository"]];
@@ -1460,7 +1601,8 @@ var OPTIONS = {
1460
1601
  bulk: { type: "string", description: `leave out the commits touching more files than this (${DEFAULT_BULK})` },
1461
1602
  ...limitOptions(DEFAULT_COUNT),
1462
1603
  all: { type: "boolean", short: "a", description: "keep test files and generated files" },
1463
- json: jsonOption("[{rank, path, score, churn, recent, complexity, worst, lines}], never cut unless --limit is given")
1604
+ "by-lines": { type: "boolean", description: "score complexity times the lines changed (decayed like the commits) instead of the commits" },
1605
+ json: jsonOption("[{rank, path, score, churn, recent, changed, authors, solo, complexity, worst, lines}], never cut unless --limit is given; changed counts the lines added and deleted, solo being true for a file one author edited")
1464
1606
  };
1465
1607
  var HOT = 0.66;
1466
1608
  var WARM = 0.33;
@@ -1469,7 +1611,7 @@ async function hotspots(args) {
1469
1611
  if (positionals.length > 1)
1470
1612
  badUsage("give one folder");
1471
1613
  const count = limitOf(values, DEFAULT_COUNT);
1472
- const cwd = process15.cwd();
1614
+ const cwd = process16.cwd();
1473
1615
  const bulk = Number(values.bulk ?? DEFAULT_BULK);
1474
1616
  if (!Number.isInteger(bulk) || bulk < 1)
1475
1617
  badUsage(`--bulk takes a number of files, not ${values.bulk}`);
@@ -1487,7 +1629,7 @@ async function hotspots(args) {
1487
1629
  continue;
1488
1630
  const complexity = complexityOf(text);
1489
1631
  const worst = worstUnit(text, path);
1490
- ranked.push({ path, score: Math.round(complexity * touched.weight), churn: touched.commits, recent: Math.round(touched.weight * 10) / 10, complexity, worst: worst === undefined ? undefined : { name: worst.name, line: worst.line, complexity: worst.complexity }, lines: text.split(`
1632
+ ranked.push({ path, score: Math.round(complexity * (values["by-lines"] === true ? touched.linesWeight : touched.weight)), churn: touched.commits, recent: Math.round(touched.weight * 10) / 10, changed: touched.lines, authors: touched.authors, solo: touched.authors === 1, complexity, worst: worst === undefined ? undefined : { name: worst.name, line: worst.line, complexity: worst.complexity }, lines: text.split(`
1491
1633
  `).length - (text.endsWith(`
1492
1634
  `) ? 1 : 0) });
1493
1635
  }
@@ -1500,8 +1642,8 @@ async function hotspots(args) {
1500
1642
  printJson(shown);
1501
1643
  return 0;
1502
1644
  }
1503
- const colors = paint(process15.stdout);
1504
- const path = role("path", process15.stdout);
1645
+ const colors = paint(process16.stdout);
1646
+ const path = role("path", process16.stdout);
1505
1647
  const top = shown.reduce((highest, row) => Math.max(highest, row.score), 0);
1506
1648
  const heat = (score, text) => {
1507
1649
  if (top > 0 && score >= top * HOT)
@@ -1509,7 +1651,7 @@ async function hotspots(args) {
1509
1651
  return top > 0 && score >= top * WARM ? colors.yellow(text) : text;
1510
1652
  };
1511
1653
  printHeader("hotspots", `${basename(cwd)} \xB7 since ${values.since ?? DEFAULT_SINCE}`);
1512
- console.log(table([["rank", "score", "churn", "recent", "complexity", "lines", "file", "most complex declaration"], ...shown.map((row) => [colors.dim(String(row.rank)), heat(row.score, String(row.score)), ...[row.churn, row.recent, row.complexity, row.lines].map(String), fileLink(path(row.path), row.path, process15.stdout, cwd), row.worst === undefined ? "" : `${row.worst.name} (${row.worst.complexity}, line ${row.worst.line})`])], { header: true, align: ["right", "right", "right", "right", "right", "right", "left", "left"] }));
1654
+ console.log(table([["rank", "score", "churn", "recent", "changed", "authors", "complexity", "lines", "file", "most complex declaration"], ...shown.map((row) => [colors.dim(String(row.rank)), heat(row.score, String(row.score)), ...[row.churn, row.recent, row.changed].map(String), row.solo ? colors.dim("1 solo") : String(row.authors), ...[row.complexity, row.lines].map(String), fileLink(path(row.path), row.path, process16.stdout, cwd), row.worst === undefined ? "" : `${row.worst.name} (${row.worst.complexity}, line ${row.worst.line})`])], { header: true, align: ["right", "right", "right", "right", "right", "right", "right", "right", "left", "left"] }));
1513
1655
  if (footer !== undefined)
1514
1656
  console.log(footer);
1515
1657
  return 0;
@@ -1518,13 +1660,15 @@ async function hotspots(args) {
1518
1660
  // src/peek.ts
1519
1661
  import { realpathSync as realpathSync3 } from "fs";
1520
1662
  import { isAbsolute as isAbsolute2, join as join8, relative as relative2, resolve as resolve5, sep } from "path";
1521
- import process16 from "process";
1663
+ import process17 from "process";
1522
1664
 
1523
1665
  // src/source.ts
1524
1666
  var LOCATION = /^(?:\.\/)?([^\s:()]+)(?::(\d+)(?::\d+)?|\((\d+),\d+\))(?=[:\s)]|$)/;
1525
- var DECLARATION = /^(?:export\s+)?(?:default\s+)?(?:declare\s+)?(?:abstract\s+)?(?:async\s+)?(?:function\*?|class|interface|type|enum|const|let|var|namespace|module|def|func|fn|struct|trait|impl)\s/;
1526
- var MODIFIERS = /^(?:(?:public|private|protected|static|async|override|readonly|abstract|get|set|pub|fn|def|func)\s+)*/;
1527
- var MEMBER = /^(?:(?:public|private|protected|static|async|override|readonly|abstract|get|set|pub|fn|def|func)\s+)*[#\w$]+\s*(?:<[^>]*>\s*)?\(/;
1667
+ var DECLARATION = /^(?:(?:export|default|declare|abstract|async|pub(?:\([^)]*\))?|public|private|protected|internal|final|open|sealed|static|suspend)\s+)*(?:function\*?|class|interface|type|enum|const|let|var|namespace|module|def|func|fun|fn|struct|trait|impl)\s/;
1668
+ var MODIFIER_WORDS = String.raw`(?:public|private|protected|internal|final|open|sealed|static|async|suspend|override|readonly|abstract|get|set|pub(?:\([^)]*\))?|function|fn|def|func|fun)\s+`;
1669
+ var RETURN_TYPE = String.raw`(?:[\w$.]+(?:<[^>]*>)?(?:\[\])*\??\s+(?=[#\w$]+\s*(?:<[^>]*>\s*)?\())?`;
1670
+ var MODIFIERS = new RegExp(String.raw`^(?:(?:${MODIFIER_WORDS})+${RETURN_TYPE})?`);
1671
+ var MEMBER = new RegExp(String.raw`^(?:(?:${MODIFIER_WORDS})+${RETURN_TYPE})?[#\w$]+\s*(?:<[^>]*>\s*)?\(`);
1528
1672
  var RECEIVER = /^(?:\([^)]*\)\s*)?/;
1529
1673
  var STAR = /^\*?\s*/;
1530
1674
  var HOLDS_MEMBERS = /\b(?:class|interface|trait|impl|struct)\s/;
@@ -1654,7 +1798,7 @@ function outline(text, path) {
1654
1798
  if (indent === 0 && DECLARATION.test(text) && !LOCAL_BINDING.test(text)) {
1655
1799
  entries.push({ line: i + 1, depth: 0, text: signature(line) });
1656
1800
  memberIndent = HOLDS_MEMBERS.test(text) ? -1 : undefined;
1657
- } else if (indent === 0 && text !== "" && !text.startsWith("}") && !LEADING.test(text)) {
1801
+ } else if (indent === 0 && text !== "" && !text.startsWith("{") && !text.startsWith("}") && !LEADING.test(text)) {
1658
1802
  memberIndent = undefined;
1659
1803
  } else if (memberIndent !== undefined && indent > 0 && (memberIndent === -1 || indent === memberIndent) && MEMBER.test(text) && !CALL_KEYWORDS.test(text)) {
1660
1804
  memberIndent = indent;
@@ -1725,13 +1869,13 @@ function cut(text) {
1725
1869
  return text.length > LONGEST_LINE ? `${text.slice(0, LONGEST_LINE - 1)}\u2026` : text;
1726
1870
  }
1727
1871
  async function readableRoot() {
1728
- const ran = await runCommand(["git", "rev-parse", "--show-toplevel"], { cwd: process16.cwd() });
1729
- return realpathSync3(ran.code === 0 ? ran.text.trim() : process16.cwd());
1872
+ const ran = await runCommand(["git", "rev-parse", "--show-toplevel"], { cwd: process17.cwd() });
1873
+ return realpathSync3(ran.code === 0 ? ran.text.trim() : process17.cwd());
1730
1874
  }
1731
1875
  async function isOutside(path) {
1732
1876
  let real;
1733
1877
  try {
1734
- real = realpathSync3(resolve5(process16.cwd(), path));
1878
+ real = realpathSync3(resolve5(process17.cwd(), path));
1735
1879
  } catch {
1736
1880
  return false;
1737
1881
  }
@@ -1745,7 +1889,7 @@ async function checkInside(path) {
1745
1889
  async function pipedSpans(text, context) {
1746
1890
  const spans = [];
1747
1891
  for (const [path, numbers] of locations(text)) {
1748
- const source = await isOutside(path) ? undefined : await readText(resolve5(process16.cwd(), path));
1892
+ const source = await isOutside(path) ? undefined : await readText(resolve5(process17.cwd(), path));
1749
1893
  if (source !== undefined)
1750
1894
  spans.push(...spansAround(path, source.replace(TRAILING_NEWLINE2, "").split(`
1751
1895
  `).length, numbers, context));
@@ -1754,7 +1898,7 @@ async function pipedSpans(text, context) {
1754
1898
  }
1755
1899
  async function textOf(path) {
1756
1900
  await checkInside(path);
1757
- const text = await readText(resolve5(process16.cwd(), path));
1901
+ const text = await readText(resolve5(process17.cwd(), path));
1758
1902
  if (text === undefined)
1759
1903
  fail(`cannot read ${path} (missing, binary or too large)`, 1);
1760
1904
  return text;
@@ -1812,8 +1956,8 @@ async function spanOf(target) {
1812
1956
  async function* sources(paths) {
1813
1957
  for (const path of paths)
1814
1958
  await checkInside(path);
1815
- for (const path of await listFiles(paths, process16.cwd())) {
1816
- const text = await readText(join8(process16.cwd(), path));
1959
+ for (const path of await listFiles(paths, process17.cwd())) {
1960
+ const text = await readText(join8(process17.cwd(), path));
1817
1961
  if (text !== undefined)
1818
1962
  yield { path, text };
1819
1963
  }
@@ -1914,14 +2058,14 @@ async function peek(args) {
1914
2058
 
1915
2059
  // src/todo-scan.ts
1916
2060
  import { join as join9 } from "path";
1917
- import process17 from "process";
2061
+ import process18 from "process";
1918
2062
 
1919
2063
  // src/todo.ts
1920
- var COMMENT2 = /(?<![:\w/])\/\/|\/\*|<!--|(?:^|\s)(?:#|--)(?=\s)|^\s*\*(?=\s|$)/;
2064
+ var COMMENT = /(?<![:\w/])\/\/|\/\*|<!--|(?:^|\s)(?:#|--)(?=\s)|^\s*\*(?=\s|$)/;
1921
2065
  var MARKUP = /\.(?:md|mdx|markdown|html?|xml)$/i;
1922
2066
  var MARKUP_COMMENT = /<!--/;
1923
2067
  var CLOSERS = /\s*(?:\*\/|-->)\s*$/;
1924
- var MARKER = /^(?:@|\[)?(TODO|FIXME)\b/;
2068
+ var MARKER = /^(?:@|\[)?(TODO|FIXME|HACK|XXX)\b/;
1925
2069
  var QUOTES = ["'", '"', "`"];
1926
2070
  var ESCAPE2 = /\\./g;
1927
2071
  var AFTER_FIRST_LINE = /\n[\s\S]*/;
@@ -1930,9 +2074,43 @@ function isQuoted(line, index) {
1930
2074
  const before = line.slice(0, index).replaceAll(ESCAPE2, "");
1931
2075
  return QUOTES.some((quote) => before.split(quote).length % 2 === 0);
1932
2076
  }
2077
+ var BLAME_HEADER = /^[0-9a-f]{40} \d+ (\d+)/;
2078
+ var DAY_S = 86400;
2079
+ async function commitTimes(path, cwd) {
2080
+ const blamed = await runCommand(["git", "blame", "--porcelain", "--", path], { cwd });
2081
+ const times = new Map;
2082
+ if (blamed.code !== 0)
2083
+ return times;
2084
+ const bySha = new Map;
2085
+ let sha = "";
2086
+ let line = 0;
2087
+ for (const row of stdoutOf(blamed.chunks).split(`
2088
+ `)) {
2089
+ const header = BLAME_HEADER.exec(row);
2090
+ if (header !== null) {
2091
+ sha = row.slice(0, 40);
2092
+ line = Number(header[1]);
2093
+ } else if (row.startsWith("committer-time ")) {
2094
+ bySha.set(sha, Number(row.slice("committer-time ".length)));
2095
+ } else if (row.startsWith("\t")) {
2096
+ times.set(line, bySha.get(sha) ?? 0);
2097
+ }
2098
+ }
2099
+ return times;
2100
+ }
2101
+ async function addAges(marks, cwd, now = Date.now() / 1000) {
2102
+ await Promise.all([...Map.groupBy(marks, (mark) => mark.path)].map(async ([path, ofFile]) => {
2103
+ const times = await commitTimes(path, cwd);
2104
+ for (const mark of ofFile) {
2105
+ const time = times.get(mark.line);
2106
+ if (time !== undefined)
2107
+ mark.age = Math.max(0, Math.floor((now - time) / DAY_S));
2108
+ }
2109
+ }));
2110
+ }
1933
2111
  function marksIn(text, path) {
1934
2112
  const marks = [];
1935
- const comment = MARKUP.test(path) ? MARKUP_COMMENT : COMMENT2;
2113
+ const comment = MARKUP.test(path) ? MARKUP_COMMENT : COMMENT;
1936
2114
  for (const [i, line] of text.split(`
1937
2115
  `).entries()) {
1938
2116
  const opener = comment.exec(line);
@@ -1985,17 +2163,21 @@ async function lookUp(refs, cwd) {
1985
2163
  }
1986
2164
 
1987
2165
  // src/todo-scan.ts
1988
- var USAGE3 = `todo-scan [options] [path...]: lists the TODO, FIXME and owner/repo#N comments under the paths (here by default), each as <file>:<line>: <comment>, honouring .gitignore
2166
+ var USAGE3 = `todo-scan [options] [path...]: lists the TODO, FIXME, HACK, XXX and owner/repo#N comments under the paths (here by default), each as <file>:<line>: <comment>, honouring .gitignore
2167
+
2168
+ --older <duration> keeps only the comments whose line last changed longer ago than that (30d, 12w, 6m: git blame dates each one, a file git cannot blame is left out) and shows each one's age.
1989
2169
 
1990
2170
  --stale keeps only the comments naming a closed issue, each issue's state looked up with ft, or gh for a GitHub repository, and exits 1 when it finds one.
1991
2171
 
1992
2172
  Lists at most 100 comments, the count of the rest after them (--limit <n>, --full for all); --json is never cut unless --limit is given.`;
1993
2173
  var EXITS3 = [[0, "it listed the comments or found no stale one"], [1, "--stale finds one"], [2, "a usage error or when --stale could not look a repository up (ft and gh both failed)"]];
1994
2174
  var LIST_LIMIT = 100;
2175
+ var DAY_MS3 = 86400000;
1995
2176
  var OPTIONS3 = {
1996
2177
  stale: { type: "boolean", description: "only the comments naming a closed issue, looked up with ft or gh" },
2178
+ older: { type: "string", description: "only the comments whose line last changed longer ago than this duration, from git blame" },
1997
2179
  ...limitOptions(LIST_LIMIT),
1998
- json: jsonOption("[{path, line, kind, text, refs: [{repo, number, state?}]}]")
2180
+ json: jsonOption("[{path, line, kind, text, refs: [{repo, number, state?}], age?}], age being the days since the line last changed, given with --older or --json when git can date it")
1999
2181
  };
2000
2182
  function printLines(lines, footer) {
2001
2183
  const all = [...lines, ...footer === undefined ? [] : [footer]];
@@ -2005,20 +2187,27 @@ function printLines(lines, footer) {
2005
2187
  }
2006
2188
  async function todoScan(args) {
2007
2189
  const { values, positionals } = parse(args, USAGE3, OPTIONS3, { exits: EXITS3, positionals: ["[path...]"], replaces: "grep -rn TODO, then opening each issue it names", examples: ["todo-scan src", ["todo-scan --stale", "only the comments naming a closed issue"]] });
2008
- const cwd = process17.cwd();
2190
+ const cwd = process18.cwd();
2009
2191
  const limit = limitOf(values, LIST_LIMIT);
2010
- const marks = [];
2192
+ const found = [];
2011
2193
  for (const path of await listFiles(positionals, cwd)) {
2012
2194
  const text = await readText(join9(cwd, path));
2013
2195
  if (text !== undefined)
2014
- marks.push(...marksIn(text, path));
2015
- }
2196
+ found.push(...marksIn(text, path));
2197
+ }
2198
+ const older = values.older === undefined ? undefined : duration(values.older, "older", 0, "m") / DAY_MS3;
2199
+ let marks = found;
2200
+ if (older !== undefined || values.json === true)
2201
+ await addAges(found, cwd);
2202
+ const ageNote = (mark) => older === undefined || mark.age === undefined ? "" : ` [${mark.age}d]`;
2203
+ if (older !== undefined)
2204
+ marks = found.filter((mark) => mark.age !== undefined && mark.age >= older);
2016
2205
  if (values.stale !== true) {
2017
2206
  const { shown, footer } = capped(marks, limit);
2018
2207
  if (values.json === true)
2019
2208
  printJson(shown);
2020
2209
  else
2021
- printLines(shown.map((mark) => `${mark.path}:${mark.line}: ${mark.text}`), footer);
2210
+ printLines(shown.map((mark) => `${mark.path}:${mark.line}: ${mark.text}${ageNote(mark)}`), footer);
2022
2211
  return 0;
2023
2212
  }
2024
2213
  const { states, failed } = await lookUp(marks.flatMap((mark) => mark.refs), cwd);
@@ -2029,14 +2218,14 @@ async function todoScan(args) {
2029
2218
  if (values.json === true)
2030
2219
  printJson(shown.map((mark) => ({ ...mark, refs: mark.refs.map((ref) => ({ ...ref, state: states.get(refKey(ref)) })) })));
2031
2220
  else
2032
- printLines(shown.map((mark) => `${mark.path}:${mark.line}: ${mark.refs.filter((ref) => states.get(refKey(ref)) === "closed").map(refKey).join(", ")} closed: ${mark.text}`), footer);
2221
+ printLines(shown.map((mark) => `${mark.path}:${mark.line}: ${mark.refs.filter((ref) => states.get(refKey(ref)) === "closed").map(refKey).join(", ")} closed: ${mark.text}${ageNote(mark)}`), footer);
2033
2222
  if (stale.length > 0)
2034
2223
  return 1;
2035
2224
  return failed.size > 0 ? 2 : 0;
2036
2225
  }
2037
2226
 
2038
2227
  // src/cli.ts
2039
- process18.exitCode = await runCli({
2228
+ process19.exitCode = await runCli({
2040
2229
  name: "src",
2041
2230
  about: "reads and ranks the source of a folder: line spans, TODO comments and the files worth splitting",
2042
2231
  replaces: "sed -n N,Mp, grep -n chains and grep -rn TODO",