@kaynooo/cli-code 0.14.3 → 0.15.0

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.
@@ -2,7 +2,7 @@
2
2
  // @bun
3
3
 
4
4
  // src/hotspots-cli.ts
5
- import process16 from "process";
5
+ import process17 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));
@@ -918,13 +946,31 @@ 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/notify.ts
952
+ import process12 from "process";
953
+ var NOTIFY_AFTER_MS = 1e4;
954
+ var CANCELLED = 130;
955
+ function base64(text) {
956
+ return Buffer.from(text).toString("base64");
957
+ }
958
+ function notification(title, body, env = process12.env) {
959
+ const id = `kit${process12.pid}`;
960
+ 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\\`];
961
+ return codes.map((code) => env.TMUX === undefined || env.TMUX === "" ? code : `\x1BPtmux;${code.replaceAll("\x1B", "\x1B\x1B")}\x1B\\`).join("");
962
+ }
963
+ function notifyEnd(command, code, ms, { stream = process12.stderr, env = process12.env } = {}) {
964
+ if (ms < NOTIFY_AFTER_MS || code === CANCELLED || outputMode(stream, env) !== "terminal")
965
+ return;
966
+ stream.write(notification(command, code === 0 ? `done in ${formatDuration(ms)}` : `failed with exit ${code} after ${formatDuration(ms)}`, env));
967
+ }
922
968
 
923
969
  // ../kit/src/usage.ts
924
970
  import { appendFileSync, mkdirSync } from "fs";
925
971
  import { homedir as homedir3 } from "os";
926
972
  import { dirname as dirname2, isAbsolute, join as join4 } from "path";
927
- import process12 from "process";
973
+ import process13 from "process";
928
974
 
929
975
  // ../kit/src/logs.ts
930
976
  var DAY_MS = 24 * 60 * 60 * 1000;
@@ -938,14 +984,14 @@ var usageError;
938
984
  function noteUsageError(message) {
939
985
  usageError = message;
940
986
  }
941
- function stateHome(env = process12.env) {
987
+ function stateHome(env = process13.env) {
942
988
  const dir = env.XDG_STATE_HOME;
943
989
  return dir !== undefined && isAbsolute(dir) ? dir : join4(homedir3(), ".local", "state");
944
990
  }
945
- function usagePath(env = process12.env) {
991
+ function usagePath(env = process13.env) {
946
992
  return join4(stateHome(env), CLI_FOLDER, "usage.jsonl");
947
993
  }
948
- function usageRecorded(env = process12.env) {
994
+ function usageRecorded(env = process13.env) {
949
995
  const off = env.KAYNOOO_CLI_NO_USAGE;
950
996
  return env.NODE_ENV !== "test" && (off === undefined || off === "" || off === "0");
951
997
  }
@@ -959,7 +1005,7 @@ function usageEntry(bin, command, argv, code, now = new Date) {
959
1005
  usageError = undefined;
960
1006
  return { at: now.toISOString(), bin, ...command === undefined ? {} : { command }, flags: flagNames(argv), code, ...unknown === undefined ? {} : { unknown } };
961
1007
  }
962
- function recordUsage(entry, env = process12.env) {
1008
+ function recordUsage(entry, env = process13.env) {
963
1009
  if (!usageRecorded(env))
964
1010
  return;
965
1011
  try {
@@ -1049,8 +1095,8 @@ async function help2({ path, header, summary: lazySummary, commands, defaultComm
1049
1095
  `);
1050
1096
  }
1051
1097
  function printError(prefix, message, hint, cause) {
1052
- const colors = paint(process13.stderr);
1053
- const styled = takesControlCodes(process13.stderr);
1098
+ const colors = paint(process14.stderr);
1099
+ const styled = takesControlCodes(process14.stderr);
1054
1100
  const head = styled ? `${colors.red.bold("error")} ${colors.dim(`${prefix}:`)}` : `error: ${prefix}:`;
1055
1101
  const under = (label, text, tint) => text === undefined ? "" : `
1056
1102
  ${styled ? tint(label) : `${label}:`} ${text}`;
@@ -1093,11 +1139,11 @@ async function dispatch(level, typed, { version, redact }) {
1093
1139
  }
1094
1140
  }
1095
1141
  if (name === undefined && level.path.length > 1) {
1096
- console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]), process13.stderr));
1142
+ console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]), process14.stderr));
1097
1143
  return 2;
1098
1144
  }
1099
1145
  if (name === undefined || name === "help" || name === "--help" || name === "-h") {
1100
- console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]), process13.stdout));
1146
+ console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]), process14.stdout));
1101
1147
  return 0;
1102
1148
  }
1103
1149
  if (level.path.length === 1 && (name === "--version" || name === "-v")) {
@@ -1232,10 +1278,13 @@ async function runCli(cli, argv = scriptArgs()) {
1232
1278
  const version = cli.version ?? packageVersion();
1233
1279
  if (argv[0] === COMPLETE)
1234
1280
  return printCandidates(candidates(scopeOf(cli.commands, cli.extraCommands, cli.aliases), cli.defaultCommand, argv.slice(1)));
1281
+ const started = performance.now();
1235
1282
  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 });
1283
+ const command = commandPath(scopeOf(cli.commands, cli.extraCommands, cli.aliases), argv);
1284
+ notifyEnd(command === undefined ? cli.name : `${cli.name} ${command}`, code, performance.now() - started);
1236
1285
  if (cli.usage !== false) {
1237
1286
  try {
1238
- recordUsage(usageEntry(cli.name, commandPath(scopeOf(cli.commands, cli.extraCommands, cli.aliases), argv), argv, code));
1287
+ recordUsage(usageEntry(cli.name, command, argv, code));
1239
1288
  } catch {}
1240
1289
  }
1241
1290
  return code;
@@ -1263,11 +1312,13 @@ async function runMain({ name, version, run, redact, usage }, argv = scriptArgs(
1263
1312
  return 0;
1264
1313
  }
1265
1314
  let code;
1315
+ const started = performance.now();
1266
1316
  try {
1267
1317
  code = await run(argv);
1268
1318
  } catch (error) {
1269
1319
  code = reportThrown(name, error, redact, wantsJson(argv));
1270
1320
  }
1321
+ notifyEnd(name, code, performance.now() - started);
1271
1322
  if (usage !== false) {
1272
1323
  try {
1273
1324
  recordUsage(usageEntry(name, undefined, argv, code));
@@ -1311,7 +1362,7 @@ var SESSION_FILES = new Glob("*.json");
1311
1362
  var ACCOUNT_DIRS = new Glob("*/sessions");
1312
1363
  // src/hotspots.ts
1313
1364
  import { basename, join as join7 } from "path";
1314
- import process15 from "process";
1365
+ import process16 from "process";
1315
1366
 
1316
1367
  // src/churn.ts
1317
1368
  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 +1370,8 @@ var TESTS = /(?:^|\/)(?:tests?|__tests__|spec|e2e|__mocks__|fixtures)\/|\.(?:tes
1319
1370
  var GENERATED = /(?:^|\/)(?:dist|build|out|generated|\.nuxt|\.output|\.next)\/|\.min\.[cm]?js$|\.d\.ts$|\.(?:generated|gen)\.[^/]+$|\.pb\.go$|\.snap$/;
1320
1371
  var LEADING_NEWLINE = /^\n/;
1321
1372
  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;
1373
+ var DECISION = /\b(?:if|elif|elsif|for|foreach|while|until|case|when|catch|except|rescue|match|guard|and|or)\b|&&|\|\||\?\?|\s\?(?![,):.?])/g;
1374
+ var COMMENT_OR_STRING = /(\/\*[\s\S]*?\*\/|\/\/[^\n]*|^[ \t]*#[^\n]*)|'(?:\\.|[^'\\\n])*'|"(?:\\.|[^"\\\n])*"|`(?:\\.|[^`\\])*`/gm;
1325
1375
  function isCandidate(path) {
1326
1376
  return SOURCE.test(path) && !TESTS.test(path) && !GENERATED.test(path);
1327
1377
  }
@@ -1329,25 +1379,35 @@ function isGenerated(text) {
1329
1379
  return GENERATED_HEADER.test(text.slice(0, 400));
1330
1380
  }
1331
1381
  function complexityOf(text) {
1332
- return 1 + (text.replace(COMMENT, "").replace(STRING, '""').match(DECISION)?.length ?? 0);
1382
+ return 1 + (text.replace(COMMENT_OR_STRING, (_, comment) => comment === undefined ? '""' : "").match(DECISION)?.length ?? 0);
1333
1383
  }
1334
1384
  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)
1385
+ 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 })]);
1386
+ if (log.code !== 0 || top.code !== 0)
1337
1387
  return;
1388
+ const prefix = top.text.trim();
1338
1389
  const churn = new Map;
1390
+ const authors = new Map;
1339
1391
  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)
1392
+ const [head = "", ...entries] = commit.split("\x00");
1393
+ const [stamp = "", author = ""] = head.split("\x02");
1394
+ const all = entries.map((entry) => entry.replace(LEADING_NEWLINE, "")).filter((entry) => entry !== "").map((entry) => {
1395
+ const [added = "", deleted = "", ...path] = entry.split("\t");
1396
+ return { path: path.join("\t"), lines: (Number(added) || 0) + (Number(deleted) || 0) };
1397
+ });
1398
+ if (all.length > bulk)
1343
1399
  continue;
1400
+ const paths = all.filter(({ path }) => path.startsWith(prefix)).map(({ path, lines }) => ({ path: path.slice(prefix.length), lines }));
1344
1401
  const age = Math.max(0, now - Number(stamp) * 1000);
1345
1402
  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 });
1403
+ for (const { path, lines } of paths) {
1404
+ const seen = churn.get(path) ?? { commits: 0, weight: 0, lines: 0, linesWeight: 0, authors: 0 };
1405
+ churn.set(path, { commits: seen.commits + 1, weight: seen.weight + weight, lines: seen.lines + lines, linesWeight: seen.linesWeight + lines * weight, authors: 0 });
1406
+ authors.set(path, (authors.get(path) ?? new Set).add(author));
1349
1407
  }
1350
1408
  }
1409
+ for (const [path, seen] of churn)
1410
+ seen.authors = authors.get(path)?.size ?? 0;
1351
1411
  return churn;
1352
1412
  }
1353
1413
 
@@ -1450,7 +1510,7 @@ var DEFAULT_HALF_LIFE = "90d";
1450
1510
  var DEFAULT_COUNT = configuredNumber("hotspots", "limit", 20);
1451
1511
  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
1512
 
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.
1513
+ 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
1514
 
1455
1515
  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
1516
  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 +1520,8 @@ var OPTIONS = {
1460
1520
  bulk: { type: "string", description: `leave out the commits touching more files than this (${DEFAULT_BULK})` },
1461
1521
  ...limitOptions(DEFAULT_COUNT),
1462
1522
  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")
1523
+ "by-lines": { type: "boolean", description: "score complexity times the lines changed (decayed like the commits) instead of the commits" },
1524
+ 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
1525
  };
1465
1526
  var HOT = 0.66;
1466
1527
  var WARM = 0.33;
@@ -1469,7 +1530,7 @@ async function hotspots(args) {
1469
1530
  if (positionals.length > 1)
1470
1531
  badUsage("give one folder");
1471
1532
  const count = limitOf(values, DEFAULT_COUNT);
1472
- const cwd = process15.cwd();
1533
+ const cwd = process16.cwd();
1473
1534
  const bulk = Number(values.bulk ?? DEFAULT_BULK);
1474
1535
  if (!Number.isInteger(bulk) || bulk < 1)
1475
1536
  badUsage(`--bulk takes a number of files, not ${values.bulk}`);
@@ -1487,7 +1548,7 @@ async function hotspots(args) {
1487
1548
  continue;
1488
1549
  const complexity = complexityOf(text);
1489
1550
  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(`
1551
+ 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
1552
  `).length - (text.endsWith(`
1492
1553
  `) ? 1 : 0) });
1493
1554
  }
@@ -1500,8 +1561,8 @@ async function hotspots(args) {
1500
1561
  printJson(shown);
1501
1562
  return 0;
1502
1563
  }
1503
- const colors = paint(process15.stdout);
1504
- const path = role("path", process15.stdout);
1564
+ const colors = paint(process16.stdout);
1565
+ const path = role("path", process16.stdout);
1505
1566
  const top = shown.reduce((highest, row) => Math.max(highest, row.score), 0);
1506
1567
  const heat = (score, text) => {
1507
1568
  if (top > 0 && score >= top * HOT)
@@ -1509,11 +1570,11 @@ async function hotspots(args) {
1509
1570
  return top > 0 && score >= top * WARM ? colors.yellow(text) : text;
1510
1571
  };
1511
1572
  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"] }));
1573
+ 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
1574
  if (footer !== undefined)
1514
1575
  console.log(footer);
1515
1576
  return 0;
1516
1577
  }
1517
1578
 
1518
1579
  // src/hotspots-cli.ts
1519
- process16.exitCode = await runMain({ name: "hotspots", run: hotspots });
1580
+ process17.exitCode = await runMain({ name: "hotspots", run: hotspots });
package/dist/peek-cli.js CHANGED
@@ -2,7 +2,7 @@
2
2
  // @bun
3
3
 
4
4
  // src/peek-cli.ts
5
- import process16 from "process";
5
+ import process17 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));
@@ -918,13 +946,31 @@ 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/notify.ts
952
+ import process12 from "process";
953
+ var NOTIFY_AFTER_MS = 1e4;
954
+ var CANCELLED = 130;
955
+ function base64(text) {
956
+ return Buffer.from(text).toString("base64");
957
+ }
958
+ function notification(title, body, env = process12.env) {
959
+ const id = `kit${process12.pid}`;
960
+ 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\\`];
961
+ return codes.map((code) => env.TMUX === undefined || env.TMUX === "" ? code : `\x1BPtmux;${code.replaceAll("\x1B", "\x1B\x1B")}\x1B\\`).join("");
962
+ }
963
+ function notifyEnd(command, code, ms, { stream = process12.stderr, env = process12.env } = {}) {
964
+ if (ms < NOTIFY_AFTER_MS || code === CANCELLED || outputMode(stream, env) !== "terminal")
965
+ return;
966
+ stream.write(notification(command, code === 0 ? `done in ${formatDuration(ms)}` : `failed with exit ${code} after ${formatDuration(ms)}`, env));
967
+ }
922
968
 
923
969
  // ../kit/src/usage.ts
924
970
  import { appendFileSync, mkdirSync } from "fs";
925
971
  import { homedir as homedir3 } from "os";
926
972
  import { dirname as dirname2, isAbsolute, join as join4 } from "path";
927
- import process12 from "process";
973
+ import process13 from "process";
928
974
 
929
975
  // ../kit/src/logs.ts
930
976
  var DAY_MS = 24 * 60 * 60 * 1000;
@@ -938,14 +984,14 @@ var usageError;
938
984
  function noteUsageError(message) {
939
985
  usageError = message;
940
986
  }
941
- function stateHome(env = process12.env) {
987
+ function stateHome(env = process13.env) {
942
988
  const dir = env.XDG_STATE_HOME;
943
989
  return dir !== undefined && isAbsolute(dir) ? dir : join4(homedir3(), ".local", "state");
944
990
  }
945
- function usagePath(env = process12.env) {
991
+ function usagePath(env = process13.env) {
946
992
  return join4(stateHome(env), CLI_FOLDER, "usage.jsonl");
947
993
  }
948
- function usageRecorded(env = process12.env) {
994
+ function usageRecorded(env = process13.env) {
949
995
  const off = env.KAYNOOO_CLI_NO_USAGE;
950
996
  return env.NODE_ENV !== "test" && (off === undefined || off === "" || off === "0");
951
997
  }
@@ -959,7 +1005,7 @@ function usageEntry(bin, command, argv, code, now = new Date) {
959
1005
  usageError = undefined;
960
1006
  return { at: now.toISOString(), bin, ...command === undefined ? {} : { command }, flags: flagNames(argv), code, ...unknown === undefined ? {} : { unknown } };
961
1007
  }
962
- function recordUsage(entry, env = process12.env) {
1008
+ function recordUsage(entry, env = process13.env) {
963
1009
  if (!usageRecorded(env))
964
1010
  return;
965
1011
  try {
@@ -1049,8 +1095,8 @@ async function help2({ path, header, summary: lazySummary, commands, defaultComm
1049
1095
  `);
1050
1096
  }
1051
1097
  function printError(prefix, message, hint, cause) {
1052
- const colors = paint(process13.stderr);
1053
- const styled = takesControlCodes(process13.stderr);
1098
+ const colors = paint(process14.stderr);
1099
+ const styled = takesControlCodes(process14.stderr);
1054
1100
  const head = styled ? `${colors.red.bold("error")} ${colors.dim(`${prefix}:`)}` : `error: ${prefix}:`;
1055
1101
  const under = (label, text, tint) => text === undefined ? "" : `
1056
1102
  ${styled ? tint(label) : `${label}:`} ${text}`;
@@ -1093,11 +1139,11 @@ async function dispatch(level, typed, { version, redact }) {
1093
1139
  }
1094
1140
  }
1095
1141
  if (name === undefined && level.path.length > 1) {
1096
- console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]), process13.stderr));
1142
+ console.error(await help2(await expand(level, [...level.path.slice(1), ...argv]), process14.stderr));
1097
1143
  return 2;
1098
1144
  }
1099
1145
  if (name === undefined || name === "help" || name === "--help" || name === "-h") {
1100
- console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]), process13.stdout));
1146
+ console.log(await help2(await expand(level, [...level.path.slice(1), ...argv]), process14.stdout));
1101
1147
  return 0;
1102
1148
  }
1103
1149
  if (level.path.length === 1 && (name === "--version" || name === "-v")) {
@@ -1232,10 +1278,13 @@ async function runCli(cli, argv = scriptArgs()) {
1232
1278
  const version = cli.version ?? packageVersion();
1233
1279
  if (argv[0] === COMPLETE)
1234
1280
  return printCandidates(candidates(scopeOf(cli.commands, cli.extraCommands, cli.aliases), cli.defaultCommand, argv.slice(1)));
1281
+ const started = performance.now();
1235
1282
  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 });
1283
+ const command = commandPath(scopeOf(cli.commands, cli.extraCommands, cli.aliases), argv);
1284
+ notifyEnd(command === undefined ? cli.name : `${cli.name} ${command}`, code, performance.now() - started);
1236
1285
  if (cli.usage !== false) {
1237
1286
  try {
1238
- recordUsage(usageEntry(cli.name, commandPath(scopeOf(cli.commands, cli.extraCommands, cli.aliases), argv), argv, code));
1287
+ recordUsage(usageEntry(cli.name, command, argv, code));
1239
1288
  } catch {}
1240
1289
  }
1241
1290
  return code;
@@ -1263,11 +1312,13 @@ async function runMain({ name, version, run, redact, usage }, argv = scriptArgs(
1263
1312
  return 0;
1264
1313
  }
1265
1314
  let code;
1315
+ const started = performance.now();
1266
1316
  try {
1267
1317
  code = await run(argv);
1268
1318
  } catch (error) {
1269
1319
  code = reportThrown(name, error, redact, wantsJson(argv));
1270
1320
  }
1321
+ notifyEnd(name, code, performance.now() - started);
1271
1322
  if (usage !== false) {
1272
1323
  try {
1273
1324
  recordUsage(usageEntry(name, undefined, argv, code));
@@ -1312,7 +1363,7 @@ var ACCOUNT_DIRS = new Glob("*/sessions");
1312
1363
  // src/peek.ts
1313
1364
  import { realpathSync as realpathSync3 } from "fs";
1314
1365
  import { isAbsolute as isAbsolute2, join as join7, relative as relative2, resolve as resolve5, sep } from "path";
1315
- import process15 from "process";
1366
+ import process16 from "process";
1316
1367
 
1317
1368
  // src/files.ts
1318
1369
  import { existsSync as existsSync4, readdirSync, statSync as statSync2 } from "fs";
@@ -1357,9 +1408,11 @@ async function readText(path) {
1357
1408
 
1358
1409
  // src/source.ts
1359
1410
  var LOCATION = /^(?:\.\/)?([^\s:()]+)(?::(\d+)(?::\d+)?|\((\d+),\d+\))(?=[:\s)]|$)/;
1360
- 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/;
1361
- var MODIFIERS = /^(?:(?:public|private|protected|static|async|override|readonly|abstract|get|set|pub|fn|def|func)\s+)*/;
1362
- var MEMBER = /^(?:(?:public|private|protected|static|async|override|readonly|abstract|get|set|pub|fn|def|func)\s+)*[#\w$]+\s*(?:<[^>]*>\s*)?\(/;
1411
+ 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/;
1412
+ 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+`;
1413
+ var RETURN_TYPE = String.raw`(?:[\w$.]+(?:<[^>]*>)?(?:\[\])*\??\s+(?=[#\w$]+\s*(?:<[^>]*>\s*)?\())?`;
1414
+ var MODIFIERS = new RegExp(String.raw`^(?:(?:${MODIFIER_WORDS})+${RETURN_TYPE})?`);
1415
+ var MEMBER = new RegExp(String.raw`^(?:(?:${MODIFIER_WORDS})+${RETURN_TYPE})?[#\w$]+\s*(?:<[^>]*>\s*)?\(`);
1363
1416
  var RECEIVER = /^(?:\([^)]*\)\s*)?/;
1364
1417
  var STAR = /^\*?\s*/;
1365
1418
  var HOLDS_MEMBERS = /\b(?:class|interface|trait|impl|struct)\s/;
@@ -1489,7 +1542,7 @@ function outline(text, path) {
1489
1542
  if (indent === 0 && DECLARATION.test(text) && !LOCAL_BINDING.test(text)) {
1490
1543
  entries.push({ line: i + 1, depth: 0, text: signature(line) });
1491
1544
  memberIndent = HOLDS_MEMBERS.test(text) ? -1 : undefined;
1492
- } else if (indent === 0 && text !== "" && !text.startsWith("}") && !LEADING.test(text)) {
1545
+ } else if (indent === 0 && text !== "" && !text.startsWith("{") && !text.startsWith("}") && !LEADING.test(text)) {
1493
1546
  memberIndent = undefined;
1494
1547
  } else if (memberIndent !== undefined && indent > 0 && (memberIndent === -1 || indent === memberIndent) && MEMBER.test(text) && !CALL_KEYWORDS.test(text)) {
1495
1548
  memberIndent = indent;
@@ -1560,13 +1613,13 @@ function cut(text) {
1560
1613
  return text.length > LONGEST_LINE ? `${text.slice(0, LONGEST_LINE - 1)}\u2026` : text;
1561
1614
  }
1562
1615
  async function readableRoot() {
1563
- const ran = await runCommand(["git", "rev-parse", "--show-toplevel"], { cwd: process15.cwd() });
1564
- return realpathSync3(ran.code === 0 ? ran.text.trim() : process15.cwd());
1616
+ const ran = await runCommand(["git", "rev-parse", "--show-toplevel"], { cwd: process16.cwd() });
1617
+ return realpathSync3(ran.code === 0 ? ran.text.trim() : process16.cwd());
1565
1618
  }
1566
1619
  async function isOutside(path) {
1567
1620
  let real;
1568
1621
  try {
1569
- real = realpathSync3(resolve5(process15.cwd(), path));
1622
+ real = realpathSync3(resolve5(process16.cwd(), path));
1570
1623
  } catch {
1571
1624
  return false;
1572
1625
  }
@@ -1580,7 +1633,7 @@ async function checkInside(path) {
1580
1633
  async function pipedSpans(text, context) {
1581
1634
  const spans = [];
1582
1635
  for (const [path, numbers] of locations(text)) {
1583
- const source = await isOutside(path) ? undefined : await readText(resolve5(process15.cwd(), path));
1636
+ const source = await isOutside(path) ? undefined : await readText(resolve5(process16.cwd(), path));
1584
1637
  if (source !== undefined)
1585
1638
  spans.push(...spansAround(path, source.replace(TRAILING_NEWLINE2, "").split(`
1586
1639
  `).length, numbers, context));
@@ -1589,7 +1642,7 @@ async function pipedSpans(text, context) {
1589
1642
  }
1590
1643
  async function textOf(path) {
1591
1644
  await checkInside(path);
1592
- const text = await readText(resolve5(process15.cwd(), path));
1645
+ const text = await readText(resolve5(process16.cwd(), path));
1593
1646
  if (text === undefined)
1594
1647
  fail(`cannot read ${path} (missing, binary or too large)`, 1);
1595
1648
  return text;
@@ -1647,8 +1700,8 @@ async function spanOf(target) {
1647
1700
  async function* sources(paths) {
1648
1701
  for (const path of paths)
1649
1702
  await checkInside(path);
1650
- for (const path of await listFiles(paths, process15.cwd())) {
1651
- const text = await readText(join7(process15.cwd(), path));
1703
+ for (const path of await listFiles(paths, process16.cwd())) {
1704
+ const text = await readText(join7(process16.cwd(), path));
1652
1705
  if (text !== undefined)
1653
1706
  yield { path, text };
1654
1707
  }
@@ -1748,4 +1801,4 @@ async function peek(args) {
1748
1801
  }
1749
1802
 
1750
1803
  // src/peek-cli.ts
1751
- process16.exitCode = await runMain({ name: "peek", run: peek });
1804
+ process17.exitCode = await runMain({ name: "peek", run: peek });