reslop 0.1.9 → 0.2.1

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

@@ -1,6 +1,10 @@
 'use strict';
 
-const { oneLine, requireOk, runGit, runGitAsync } = require('./run.js');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+
+const { oneLine, requireOk, runGit, runGitAsync } = require('./git.js');
 
 const BRANCH_FORMAT = [
   '%(HEAD)',
@@ -20,12 +24,15 @@ const PUSH_REJECTED = [
   'updates were rejected',
 ];
 
-const lastMessage = (top) => {
-  const result = runGit(['log', '-1', '--format=%B'], top);
+const commitMessage = (top, sha) => {
+  const spec = `${sha ?? ''}`.trim() || 'HEAD';
+  const result = runGit(['log', '-1', '--format=%B', spec], top);
   if (result.status !== 0) return '';
   return (result.stdout ?? '').replace(/\s+$/, '');
 };
 
+const lastMessage = (top) => commitMessage(top, 'HEAD');
+
 const COMMIT_FORMAT = ['%H', '%h', '%an', '%ar', '%s'].join('%x1f');
 const COMMIT_LIMIT = 256;
 const UNIT = '\x1f';
@@ -120,6 +127,177 @@ const dropCommitAsync = async (top, sha) => {
   await dropOlderCommitAsync(top, target);
 };
 
+const FIXUP_MARK = 'fixup!';
+const AUTOSQUASH_ARGS = [
+  '-c',
+  'sequence.editor=:',
+  'rebase',
+  '--interactive',
+  '--autosquash',
+];
+
+const isFixupSubject = (subject) =>
+  `${subject ?? ''}`.trim().startsWith(FIXUP_MARK);
+
+const fixupRest = (subject) => {
+  let text = `${subject ?? ''}`.trim();
+  while (text.startsWith(FIXUP_MARK)) {
+    text = text.slice(FIXUP_MARK.length).trim();
+  }
+  return text;
+};
+
+const commitSubject = (top, sha) => {
+  const args = ['log', '-1', '--format=%s', sha];
+  const result = requireOk(runGit(args, top), 'log failed');
+  return (result.stdout ?? '').trim();
+};
+
+const ancestorWithSubject = (top, sha, want) => {
+  const args = ['log', `--format=${COMMIT_FORMAT}`, `${sha}^`];
+  const result = runGit(args, top);
+  if (result.status !== 0) return '';
+  for (const line of result.stdout.split('\n')) {
+    if (!line) continue;
+    const entry = parseCommitLine(line, 1);
+    if (entry && entry.subject === want) return entry.sha;
+  }
+  return '';
+};
+
+const applyAutosquash = (top, ontoArgs) => {
+  const result = runGit([...AUTOSQUASH_ARGS, ...ontoArgs], top);
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  runGit(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const applyAutosquashAsync = async (top, ontoArgs) => {
+  const result = await runGitAsync([...AUTOSQUASH_ARGS, ...ontoArgs], top);
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  await runGitAsync(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const applyFixupOnto = (top, original, applyRange) => {
+  const parent = runGit(['rev-parse', '--verify', `${original}^`], top);
+  if (parent.status !== 0) return applyRange(top, ['--root']);
+  return applyRange(top, [(parent.stdout ?? '').trim()]);
+};
+
+const applyFixup = (top, sha) => {
+  const spec = namedCommit(sha);
+  const commit = resolveCommit(top, spec);
+  const subject = commitSubject(top, commit);
+  if (!isFixupSubject(subject)) throw new Error('not a fixup commit');
+  const want = fixupRest(subject);
+  if (!want) throw new Error('no fixup target');
+  const original = ancestorWithSubject(top, commit, want);
+  if (!original) throw new Error('no fixup target');
+  applyFixupOnto(top, original, applyAutosquash);
+};
+
+const applyFixupAsync = async (top, sha) => {
+  const spec = namedCommit(sha);
+  const commit = resolveCommit(top, spec);
+  const subject = commitSubject(top, commit);
+  if (!isFixupSubject(subject)) throw new Error('not a fixup commit');
+  const want = fixupRest(subject);
+  if (!want) throw new Error('no fixup target');
+  const original = ancestorWithSubject(top, commit, want);
+  if (!original) throw new Error('no fixup target');
+  await applyFixupOnto(top, original, applyAutosquashAsync);
+};
+
+const messageBody = (message) => {
+  const text = `${message ?? ''}`;
+  return text.endsWith('\n') ? text : `${text}\n`;
+};
+
+const rewordHead = (top, message) => {
+  const args = ['commit', '--amend', '--only', '-F', '-'];
+  requireOk(runGit(args, top, messageBody(message)));
+};
+
+const REWORD_TODO = path.join(__dirname, 'git-reword-todo.js');
+
+const prepareRewordEditor = (message) => {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'reslop-reword-'));
+  const msgFile = path.join(dir, 'MSG');
+  fs.writeFileSync(msgFile, messageBody(message));
+  const node = JSON.stringify(process.execPath);
+  const script = JSON.stringify(REWORD_TODO);
+  return {
+    dir,
+    env: {
+      GIT_SEQUENCE_EDITOR: `${node} ${script}`,
+      RESLOP_REWORD_FILE: msgFile,
+    },
+  };
+};
+
+const rewordRange = (top, sha, env) => {
+  const parent = runGit(['rev-parse', '--verify', `${sha}^`], top);
+  const onto =
+    parent.status !== 0 ? ['--root'] : [(parent.stdout ?? '').trim()];
+  return runGit(['rebase', '--interactive', ...onto], top, undefined, { env });
+};
+
+const rewordRangeAsync = async (top, sha, env) => {
+  const parent = runGit(['rev-parse', '--verify', `${sha}^`], top);
+  const onto =
+    parent.status !== 0 ? ['--root'] : [(parent.stdout ?? '').trim()];
+  return runGitAsync(['rebase', '--interactive', ...onto], top, { env });
+};
+
+const finishRewordRebase = (top, result) => {
+  const failed = rebaseFailed(result);
+  if (!failed) return;
+  runGit(['rebase', '--abort'], top);
+  throw new Error(oneLine(failed));
+};
+
+const rewordOlder = (top, sha, message) => {
+  const prepared = prepareRewordEditor(message);
+  try {
+    const result = rewordRange(top, sha, prepared.env);
+    finishRewordRebase(top, result);
+  } finally {
+    fs.rmSync(prepared.dir, { recursive: true, force: true });
+  }
+};
+
+const rewordOlderAsync = async (top, sha, message) => {
+  const prepared = prepareRewordEditor(message);
+  try {
+    const result = await rewordRangeAsync(top, sha, prepared.env);
+    const failed = rebaseFailed(result);
+    if (!failed) return;
+    await runGitAsync(['rebase', '--abort'], top);
+    throw new Error(oneLine(failed));
+  } finally {
+    fs.rmSync(prepared.dir, { recursive: true, force: true });
+  }
+};
+
+const rewordCommit = (top, sha, message) => {
+  const spec = namedCommit(sha);
+  const commit = resolveCommit(top, spec);
+  const head = resolveCommit(top, 'HEAD');
+  if (commit === head) return void rewordHead(top, message);
+  rewordOlder(top, commit, message);
+};
+
+const rewordCommitAsync = async (top, sha, message) => {
+  const spec = namedCommit(sha);
+  const commit = resolveCommit(top, spec);
+  const head = resolveCommit(top, 'HEAD');
+  if (commit === head) return void rewordHead(top, message);
+  await rewordOlderAsync(top, commit, message);
+};
+
 const parseTrack = (text) => {
   const raw = `${text ?? ''}`.trim().replace(/^\[|\]$/g, '');
   if (!raw) return { ahead: 0, behind: 0, gone: false };
@@ -183,10 +361,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;
 };
@@ -337,10 +516,6 @@ const hasStaged = (top) => {
 };
 
 const commitPlan = (kind, message) => {
-  if (kind === 'fixup') {
-    const target = (message ?? '').trim() || 'HEAD';
-    return { args: ['commit', `--fixup=${target}`], body: undefined };
-  }
   const args = ['commit'];
   if (kind === 'amend') args.push('--amend');
   args.push('-F', '-');
@@ -361,6 +536,7 @@ const commitChangesAsync = async (top, kind, message) => {
 
 module.exports = {
   lastMessage,
+  commitMessage,
   listCommits,
   listBranches,
   checkoutBranch,
@@ -371,6 +547,10 @@ module.exports = {
   rebaseBranchAsync,
   dropCommit,
   dropCommitAsync,
+  applyFixup,
+  applyFixupAsync,
+  rewordCommit,
+  rewordCommitAsync,
   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,
 };

package/lib/git-reword-todo.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const fs = require('node:fs');
+
+const file = process.argv[process.argv.length - 1];
+const msg = process.env.RESLOP_REWORD_FILE;
+if (!file || !msg) process.exit(1);
+const text = fs.readFileSync(file, 'utf8');
+const rows = text.split('\n');
+const out = [];
+let seen = false;
+for (const row of rows) {
+  out.push(row);
+  if (seen) continue;
+  if (!/^(pick|p)\s+/.test(row)) continue;
+  const spec = JSON.stringify(msg);
+  out.push(`exec git commit --amend --only -F ${spec}`);
+  seen = true;
+}
+fs.writeFileSync(file, out.join('\n'));