reslop 0.1.8 → 0.2.0

package/lib/files.js

@@ -1,18 +1,17 @@
 'use strict';
 
+const { listFilePath } = require('./manifest.js');
+
 const REVIEW_DIR = '.review';
 const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit', 'pr'];
 const TODO_FILE = 'TODOs';
 const REPO_TODOS_LABEL = 'Repository TODOs and Issues';
 const TOTAL_LABEL = 'total';
 
-const normalizePathSpec = (spec) =>
-  `${spec ?? ''}`.replaceAll('\\', '/').replace(/\/+$/, '');
-
 const isPathInScope = (rel, paths) => {
   if (!paths.length) return true;
   for (const spec of paths) {
-    const norm = normalizePathSpec(spec);
+    const norm = `${spec ?? ''}`.replaceAll('\\', '/').replace(/\/+$/, '');
     if (!norm || norm === '.') return true;
     if (rel === norm || rel.startsWith(`${norm}/`)) return true;
   }
@@ -24,14 +23,16 @@ const itemPath = (item) => {
   return item.file.newPath || item.file.oldPath || '';
 };
 
+const listPath = (item) => listFilePath(itemPath(item));
+
 const isTodoItem = (item) => !!(item && item.origin === 'todo');
 
+const isReadOnlyOrigin = (origin) => origin === 'commit' || origin === 'pr';
+
 const isTodosEntry = (entry) => !!(entry && entry.kind === 'todos');
 
 const isTotalEntry = (entry) => !!(entry && entry.kind === 'total');
 
-const repoTodosLabel = () => REPO_TODOS_LABEL;
-
 const makeTodoItem = () => ({
   origin: 'todo',
   file: {
@@ -72,6 +73,25 @@ const lineDelta = ({ hunk, blockId }) => {
   return delta;
 };
 
+const countAgo = (n, unit) => {
+  const label = n === 1 ? unit : `${unit}s`;
+  return `${n} ${label} ago`;
+};
+
+const relativeAge = (thenMs, nowMs = Date.now()) => {
+  const diff = Math.max(0, Math.round((nowMs - thenMs) / 1000));
+  if (diff < 90) return countAgo(diff, 'second');
+  const minutes = Math.round(diff / 60);
+  if (minutes < 90) return countAgo(minutes, 'minute');
+  const hours = Math.round(minutes / 60);
+  if (hours < 36) return countAgo(hours, 'hour');
+  const days = Math.round(hours / 24);
+  if (days < 14) return countAgo(days, 'day');
+  if (days < 70) return countAgo(Math.round(days / 7), 'week');
+  if (days < 365) return countAgo(Math.round(days / 30), 'month');
+  return countAgo(Math.round(days / 365), 'year');
+};
+
 const addLineDelta = (group, origin, delta) => {
   group.added += delta.added;
   group.removed += delta.removed;
@@ -116,7 +136,8 @@ const fileEntries = (items) => {
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
     if (isTodoItem(item)) continue;
-    const rel = itemPath(item);
+    const rel = listPath(item);
+    if (!rel) continue;
     if (!groups.has(rel)) {
       groups.set(rel, {
         path: rel,
@@ -132,10 +153,12 @@ const fileEntries = (items) => {
         unstagedRemoved: 0,
         staged: 0,
         unstaged: 0,
+        date: '',
       });
     }
     const group = groups.get(rel);
     const { origin } = item;
+    if (item.date && !group.date) group.date = item.date;
     group.origins.push(origin);
     group.remaining += 1;
     addLineDelta(group, origin, lineDelta(item));
@@ -149,6 +172,7 @@ const fileEntries = (items) => {
   for (const group of entries) {
     group.status = fileStatus(group.origins);
   }
+  entries.sort((left, right) => left.path.localeCompare(right.path, 'en'));
   return entries;
 };
 
@@ -197,12 +221,14 @@ module.exports = {
   TOTAL_LABEL,
   isPathInScope,
   itemPath,
+  listPath,
   isTodoItem,
+  isReadOnlyOrigin,
   isTodosEntry,
   isTotalEntry,
-  repoTodosLabel,
   makeTodoItem,
   fileStatus,
   fileEntries,
   fileTotals,
+  relativeAge,
 };

package/lib/{git/branches.js → git-branches.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const { oneLine, requireOk, runGit, runGitAsync } = require('./run.js');
+const { oneLine, requireOk, runGit, runGitAsync } = require('./git.js');
 
 const BRANCH_FORMAT = [
   '%(HEAD)',
@@ -26,6 +26,100 @@ const lastMessage = (top) => {
   return (result.stdout ?? '').replace(/\s+$/, '');
 };
 
+const COMMIT_FORMAT = ['%H', '%h', '%an', '%ar', '%s'].join('%x1f');
+const COMMIT_LIMIT = 256;
+const UNIT = '\x1f';
+
+const parseCommitLine = (line, index) => {
+  const parts = line.split(UNIT);
+  if (parts.length < 5) return null;
+  const sha = (parts[0] ?? '').trim();
+  if (!sha) return null;
+  return {
+    sha,
+    shortSha: (parts[1] ?? '').trim() || sha.slice(0, 7),
+    author: (parts[2] ?? '').trim(),
+    date: (parts[3] ?? '').trim(),
+    subject: parts.slice(4).join(UNIT).trim(),
+    head: index === 0,
+  };
+};
+
+const listCommits = (top) => {
+  const args = [
+    'log',
+    `--format=${COMMIT_FORMAT}`,
+    `--max-count=${COMMIT_LIMIT}`,
+  ];
+  const result = requireOk(runGit(args, top), 'log failed');
+  const commits = [];
+  for (const line of result.stdout.split('\n')) {
+    if (!line) continue;
+    const entry = parseCommitLine(line, commits.length);
+    if (entry) commits.push(entry);
+  }
+  return commits;
+};
+
+const namedCommit = (sha) => {
+  const commit = `${sha ?? ''}`.trim();
+  if (!commit) throw new Error('empty commit');
+  return commit;
+};
+
+const resolveCommit = (top, sha) => {
+  const result = requireOk(runGit(['rev-parse', sha], top), 'rev-parse failed');
+  return (result.stdout ?? '').trim();
+};
+
+const dropHeadCommit = (top) => {
+  requireOk(runGit(['reset', '--soft', 'HEAD~1'], top), 'drop failed');
+};
+
+const rebaseFailed = (result) => {
+  if (result.status === 0) return '';
+  return result.stderr || result.stdout || 'rebase failed';
+};
+
+const dropOlderCommit = (top, sha) => {
+  const onto = `${sha}^`;
+  const result = runGit(['rebase', '--onto', onto, sha], top);
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  runGit(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const dropOlderCommitAsync = async (top, sha) => {
+  const onto = `${sha}^`;
+  const result = await runGitAsync(['rebase', '--onto', onto, sha], top);
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  await runGitAsync(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const dropCommit = (top, sha) => {
+  const spec = namedCommit(sha);
+  const target = resolveCommit(top, spec);
+  const parent = runGit(['rev-parse', '--verify', `${target}^`], top);
+  if (parent.status !== 0) throw new Error('cannot drop root commit');
+  const head = resolveCommit(top, 'HEAD');
+  if (target === head) return void dropHeadCommit(top);
+  dropOlderCommit(top, target);
+};
+
+const dropCommitAsync = async (top, sha) => {
+  const spec = namedCommit(sha);
+  const target = resolveCommit(top, spec);
+  const parentArgs = ['rev-parse', '--verify', `${target}^`];
+  const parent = await runGitAsync(parentArgs, top);
+  if (parent.status !== 0) throw new Error('cannot drop root commit');
+  const head = resolveCommit(top, 'HEAD');
+  if (target === head) return void dropHeadCommit(top);
+  await dropOlderCommitAsync(top, target);
+};
+
 const parseTrack = (text) => {
   const raw = `${text ?? ''}`.trim().replace(/^\[|\]$/g, '');
   if (!raw) return { ahead: 0, behind: 0, gone: false };
@@ -89,10 +183,11 @@ const listBranches = (top) => {
   const names = new Set();
   for (const entry of branches) names.add(entry.name);
   const primary = defaultBranch(top, names);
-  const listed = [];
-  for (const entry of branches) {
-    const isDefault = entry.name === primary;
-    listed.push({ ...entry, isDefault });
+  const { length } = branches;
+  const listed = new Array(length);
+  for (let i = 0; i < length; i++) {
+    const entry = branches[i];
+    listed[i] = { ...entry, isDefault: entry.name === primary };
   }
   return listed;
 };
@@ -125,11 +220,6 @@ const createBranchAsync = async (top, name) => {
   requireOk(await runGitAsync(args, top), 'checkout failed');
 };
 
-const rebaseFailed = (result) => {
-  if (result.status === 0) return '';
-  return result.stderr || result.stdout || 'rebase failed';
-};
-
 const rebaseBranch = (top, onto) => {
   const branch = namedBranch(onto);
   const result = runGit(['rebase', branch], top);
@@ -272,6 +362,7 @@ const commitChangesAsync = async (top, kind, message) => {
 
 module.exports = {
   lastMessage,
+  listCommits,
   listBranches,
   checkoutBranch,
   checkoutBranchAsync,
@@ -279,6 +370,8 @@ module.exports = {
   createBranchAsync,
   rebaseBranch,
   rebaseBranchAsync,
+  dropCommit,
+  dropCommitAsync,
   dropBranch,
   dropBranchAsync,
   pullChanges,

package/lib/{git/dependencies.js → git-deps.js}

@@ -3,21 +3,55 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-const deps = require('../deps.js');
+const deps = require('./deps.js');
 const { foldDepItems, mergeDepFile, depFileMeta } = deps;
 const { parseAuditReport, parseOutdatedReport } = deps;
 const { mergeProposedItems, MANIFEST, LOCKFILE } = deps;
-const scan = require('../deps/scan.js');
-const { collectUsedNames, collectExportMeta } = scan;
-const { itemPath, isPathInScope } = require('../files.js');
-const { abortError } = require('./proc.js');
-const { oneLine, requireOk, runGit } = require('./run.js');
-const read = require('./read.js');
-const { gitText, worktreeText, readDepSides } = read;
-const changes = require('./changes.js');
-const npm = require('../npm/commands.js');
-const { proposedNpmPlan, runNpm, runNpmAsync } = npm;
-const { runNpmJson, runNpmJsonAsync, AUDIT_MS } = npm;
+const { collectUsedNames, collectExportMeta } = deps;
+const { itemPath, isPathInScope } = require('./files.js');
+const proc = require('./utilities.js');
+const { abortError, npmBin, npmOpts, runProc, runProcSync } = proc;
+const git = require('./git.js');
+const { oneLine, requireOk, runGit } = git;
+const { gitText, worktreeText, readDepSides, revertOnePath } = git;
+
+const AUDIT_MS = 15000;
+const INSTALL_MS = 120000;
+
+const npmProcOptions = (cwd, extra = {}) => ({
+  cwd,
+  encoding: proc.DEFAULT_ENCODING,
+  maxBuffer: proc.DEFAULT_MAX_BUFFER,
+  timeout: extra.timeout,
+  signal: extra.signal,
+  shell: npmOpts().shell,
+});
+
+const runNpm = (cwd, args) =>
+  runProcSync(npmBin(), args, npmProcOptions(cwd, { timeout: INSTALL_MS }));
+
+const runNpmAsync = (cwd, args, extra = {}) =>
+  runProc(
+    npmBin(),
+    args,
+    npmProcOptions(cwd, { timeout: INSTALL_MS, signal: extra.signal }),
+  );
+
+const runNpmJson = (top, args, timeout) => {
+  const result = runProcSync(npmBin(), args, npmProcOptions(top, { timeout }));
+  if (result.error) return '';
+  return result.stdout || '';
+};
+
+const runNpmJsonAsync = async (top, args, timeout, signal) => {
+  const result = await runProc(
+    npmBin(),
+    args,
+    npmProcOptions(top, { timeout, signal }),
+  );
+  if (result.error) return '';
+  return result.stdout || '';
+};
 
 const depPaths = (item) => item.dep?.files ?? [];
 
@@ -25,15 +59,59 @@ const origDepItems = (item) => item.dep?.items ?? [];
 
 const depChange = (item) => item.dep?.change ?? null;
 
+const firstDepRel = (files, kind) => {
+  for (const rel of files) {
+    const meta = depFileMeta(rel);
+    if (meta && meta.kind === kind) return rel;
+  }
+  return '';
+};
+
+const proposedNpmPlan = (top, item) => {
+  const change = depChange(item);
+  if (!change) return null;
+  const files = depPaths(item);
+  const lockOnly = change.section === 'resolved';
+  const removing = !!change.unused;
+  const manifest = firstDepRel(files, 'manifest');
+  const lockRel = firstDepRel(files, 'lockfile');
+  const picked = lockOnly ? lockRel : manifest;
+  const target = picked || files[0] || '';
+  const meta = depFileMeta(target);
+  if (!meta) return null;
+  const cwd = meta.dir === '.' ? top : path.join(top, meta.dir);
+  let npmArgs = ['i'];
+  if (removing) npmArgs = ['uninstall', change.name];
+  else if (lockOnly) npmArgs = ['audit', 'fix'];
+  const fail = removing ? 'npm uninstall failed' : 'npm i failed';
+  const dirLock = meta.dir === '.' ? LOCKFILE : `${meta.dir}/${LOCKFILE}`;
+  const lockPath = lockRel || dirLock;
+  const prepareManifest = !lockOnly && !removing && !!manifest;
+  return {
+    cwd,
+    npmArgs,
+    fail,
+    lockOnly,
+    lockPath,
+    manifest,
+    prepareManifest,
+    runner: item.dep.install,
+  };
+};
+
 const hasProposed = (item) => {
   const change = depChange(item);
   return !!(change && change.propose);
 };
 
 const relatedFiles = (items) => {
-  const files = [];
+  let size = 0;
+  for (const item of items) size += depPaths(item).length;
+  const files = new Array(size);
+  let i = 0;
   for (const item of items) {
-    for (const file of depPaths(item)) files.push(file);
+    const paths = depPaths(item);
+    for (let j = 0; j < paths.length; j++) files[i++] = paths[j];
   }
   return files;
 };
@@ -230,10 +308,7 @@ const captureFile = (top, rel) => {
 
 const restoreFile = (top, saved) => {
   const abs = path.join(top, saved.rel);
-  if (saved.existed) {
-    fs.writeFileSync(abs, saved.text);
-    return;
-  }
+  if (saved.existed) return void fs.writeFileSync(abs, saved.text);
   try {
     fs.unlinkSync(abs);
   } catch {
@@ -242,8 +317,9 @@ const restoreFile = (top, saved) => {
 };
 
 const captureFiles = (top, rels) => {
-  const owned = [];
-  for (const rel of rels) owned.push(captureFile(top, rel));
+  const { length } = rels;
+  const owned = new Array(length);
+  for (let i = 0; i < length; i++) owned[i] = captureFile(top, rels[i]);
   return owned;
 };
 
@@ -299,9 +375,6 @@ const ownedRelsOf = (plan) => {
   return rels;
 };
 
-const resultFailed = (result) =>
-  !!(result && (result.error || result.status !== 0));
-
 const errorFromResult = (result, fail) => {
   if (!result) return new Error(fail);
   if (result.error) {
@@ -338,7 +411,9 @@ const stagePlan = (top, plan) => {
 };
 
 const finishPlan = (top, plan, result, stage) => {
-  if (resultFailed(result)) throw errorFromResult(result, plan.fail);
+  if (result && (result.error || result.status !== 0)) {
+    throw errorFromResult(result, plan.fail);
+  }
   const stageFn = stage ?? stagePlan;
   stageFn(top, plan);
 };
@@ -409,10 +484,7 @@ const applyDepChange = (top, item, mode) => {
 
 const addItem = (top, item) => {
   if (item.origin === 'staged' || item.origin === 'commit') return;
-  if (depChange(item)) {
-    applyDepChange(top, item, 'add');
-    return;
-  }
+  if (depChange(item)) return void applyDepChange(top, item, 'add');
   const files = depPaths(item);
   if (files.length) {
     requireOk(runGit(['add', '--', ...files], top));
@@ -430,10 +502,7 @@ const addItemAsync = async (top, item) => {
 
 const unstageItem = (top, item) => {
   if (item.origin !== 'staged') return;
-  if (depChange(item)) {
-    applyDepChange(top, item, 'unstage');
-    return;
-  }
+  if (depChange(item)) return void applyDepChange(top, item, 'unstage');
   const files = depPaths(item);
   if (files.length) {
     requireOk(runGit(['restore', '--staged', '--', ...files], top));
@@ -441,10 +510,7 @@ const unstageItem = (top, item) => {
 };
 
 const revertDepItem = (top, item) => {
-  if (depChange(item)) {
-    applyDepChange(top, item, 'revert');
-    return;
-  }
+  if (depChange(item)) return void applyDepChange(top, item, 'revert');
   const byPath = new Map();
   for (const orig of origDepItems(item)) {
     const rel = itemPath(orig);
@@ -453,7 +519,7 @@ const revertDepItem = (top, item) => {
     else byPath.set(rel, [orig]);
   }
   for (const rel of byPath.keys()) {
-    changes.revertOnePath(top, rel, byPath.get(rel));
+    revertOnePath(top, rel, byPath.get(rel));
   }
 };
 
@@ -463,7 +529,7 @@ const revertFile = (top, rel, items) => {
   for (const file of paths) {
     const group = itemsForPath(file, items);
     const targets = group.length ? group : items;
-    changes.revertOnePath(top, file, targets);
+    revertOnePath(top, file, targets);
   }
 };
 
@@ -486,4 +552,11 @@ module.exports = {
   unstageItem,
   revertDepItem,
   revertFile,
+  AUDIT_MS,
+  INSTALL_MS,
+  runNpm,
+  runNpmAsync,
+  runNpmJson,
+  runNpmJsonAsync,
+  proposedNpmPlan,
 };