reslop 0.2.5 → 0.2.7

package/lib/git-deps.js

@@ -4,162 +4,121 @@ const fs = require('node:fs');
 const path = require('node:path');
 
 const deps = require('./deps.js');
-const { foldDepItems, mergeDepFile, depFileMeta } = deps;
+const { foldDepItems, mergeProposedItems } = deps;
 const { parseAuditReport, parseOutdatedReport } = deps;
-const { mergeProposedItems, MANIFEST, LOCKFILE } = deps;
 const { collectUsedNames, collectExportMeta } = deps;
+const manifest = require('./manifest.js');
+const { MANIFEST, LOCKFILE, depFileMeta, mergeDepFile, relOf } = manifest;
 const files = require('./files.js');
 const { itemPath, isPathInScope } = files;
-const proc = require('./utilities.js');
-const { abortError, npmBin, npmOpts, runProc, runProcSync } = proc;
-const git = require('./git-worktree.js');
-const { oneLine, requireOk, runGit } = git;
-const { gitText, worktreeText, readDepSides, revertOnePath } = git;
-const { writeFile, writeIndex } = git;
+const utilities = require('./utilities.js');
+const { IS_WIN, abortError, npmBin, oneLine, runProc, runProcSync } = utilities;
+const worktree = require('./git-worktree.js');
+const { requireOk, runGit, gitText, worktreeText, readDepSides } = worktree;
+const { revertOnePath, groupByPath, writeFile, writeIndex } = worktree;
 
 const AUDIT_MS = 15000;
 const INSTALL_MS = 120000;
 
-const npmProcOptions = (cwd, extra = {}) => ({
+const NPM_REPORT = {
+  audit: {
+    file: LOCKFILE,
+    args: ['audit', '--json', '--package-lock-only'],
+    parse: parseAuditReport,
+  },
+  outdated: {
+    file: MANIFEST,
+    args: ['outdated', '--json', '--long'],
+    parse: parseOutdatedReport,
+  },
+};
+
+const npmOptions = (cwd, timeout, signal) => ({
   cwd,
-  encoding: proc.DEFAULT_ENCODING,
-  maxBuffer: proc.DEFAULT_MAX_BUFFER,
-  timeout: extra.timeout,
-  signal: extra.signal,
-  shell: npmOpts().shell,
+  timeout,
+  signal,
+  shell: IS_WIN,
 });
 
 const runNpm = (cwd, args) =>
-  runProcSync(npmBin(), args, npmProcOptions(cwd, { timeout: INSTALL_MS }));
+  runProcSync(npmBin(), args, npmOptions(cwd, INSTALL_MS));
 
-const runNpmAsync = (cwd, args, extra = {}) => {
-  const bin = npmBin();
-  const signal = extra.signal;
-  const options = npmProcOptions(cwd, { timeout: INSTALL_MS, signal });
-  return runProc(bin, args, options);
-};
+const runNpmAsync = (cwd, args) =>
+  runProc(npmBin(), args, npmOptions(cwd, INSTALL_MS));
 
-const runNpmJson = (top, args, timeout) => {
-  const result = runProcSync(npmBin(), args, npmProcOptions(top, { timeout }));
-  if (result.error) return '';
-  return result.stdout || '';
+const npmOutput = (result) => (result.error ? '' : result.stdout);
+
+const collectReport = (top, kind) => {
+  const report = NPM_REPORT[kind];
+  if (!fs.existsSync(path.join(top, report.file))) return null;
+  const options = npmOptions(top, AUDIT_MS);
+  return report.parse(npmOutput(runProcSync(npmBin(), report.args, options)));
 };
 
-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 collectReportAsync = async (top, kind, signal) => {
+  const report = NPM_REPORT[kind];
+  if (!fs.existsSync(path.join(top, report.file))) return null;
+  const options = npmOptions(top, AUDIT_MS, signal);
+  const result = await runProc(npmBin(), report.args, options);
+  return report.parse(npmOutput(result));
 };
 
 const depPaths = (item) => item.dep?.files ?? [];
 
-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 hasProposed = (item) => !!depChange(item)?.propose;
+
+const isStagedOrCommit = (item) =>
+  item.origin === 'staged' || item.origin === 'commit';
+
+const firstDepRel = (rels, kind) =>
+  rels.find((rel) => depFileMeta(rel)?.kind === kind) ?? '';
 
 const proposedNpmPlan = (top, item) => {
   const change = depChange(item);
   if (!change) return null;
-  const files = depPaths(item);
+  const rels = 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);
+  const manifestRel = firstDepRel(rels, 'manifest');
+  const lockRel = firstDepRel(rels, 'lockfile');
+  const meta = depFileMeta((lockOnly ? lockRel : manifestRel) || rels[0]);
   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,
+    cwd: meta.dir === '.' ? top : path.join(top, meta.dir),
     npmArgs,
-    fail,
+    fail: removing ? 'npm uninstall failed' : 'npm i failed',
     lockOnly,
-    lockPath,
-    manifest,
-    prepareManifest,
+    lockPath: lockRel || relOf(meta.dir, LOCKFILE),
+    manifest: manifestRel,
+    prepareManifest: !lockOnly && !removing && !!manifestRel,
     runner: item.dep.install,
   };
 };
 
-const hasProposed = (item) => {
-  const change = depChange(item);
-  return !!(change && change.propose);
-};
-
 const itemsForPath = (rel, items) => {
   const group = [];
   for (const item of items) {
-    if (item.dep) {
-      for (const orig of origDepItems(item)) {
-        if (itemPath(orig) === rel) group.push(orig);
-      }
-      continue;
+    const listed = item.dep ? item.dep.items : [item];
+    for (const entry of listed ?? []) {
+      if (itemPath(entry) === rel) group.push(entry);
     }
-    if (itemPath(item) === rel) group.push(item);
   }
   return group;
 };
 
-const hasDepFile = (items) => {
-  for (const item of items) {
-    if (depFileMeta(itemPath(item))) return true;
-  }
-  return false;
-};
-
-const NPM_REPORT = {
-  audit: {
-    file: LOCKFILE,
-    args: ['audit', '--json', '--package-lock-only'],
-    parse: parseAuditReport,
-  },
-  outdated: {
-    file: MANIFEST,
-    args: ['outdated', '--json', '--long'],
-    parse: parseOutdatedReport,
-  },
-};
-
-const collectReport = (top, kind) => {
-  const { file, args, parse } = NPM_REPORT[kind];
-  if (!fs.existsSync(path.join(top, file))) return null;
-  return parse(runNpmJson(top, args, AUDIT_MS));
-};
-
-const collectReportAsync = async (top, kind, signal) => {
-  const { file, args, parse } = NPM_REPORT[kind];
-  if (!fs.existsSync(path.join(top, file))) return null;
-  return parse(await runNpmJsonAsync(top, args, AUDIT_MS, signal));
-};
-
 const extrasNeeds = (items, rev, extra) => {
   const live = extra.audit === true && !rev;
-  const hasDepDiff = hasDepFile(items);
+  const hasDepDiff = items.some((item) => depFileMeta(itemPath(item)));
   const audit = live || (Boolean(extra.audit) && hasDepDiff);
   return { live, scan: live || hasDepDiff, audit };
 };
 
-const foldLoaded = (items, top, rev, extra = {}) => {
+const foldLoaded = (items, top, rev, extra) => {
   const readSides = (origin, rel) => readDepSides(top, rev, origin, rel);
   const needs = extrasNeeds(items, rev, extra);
   const collect = extra.collect !== false;
@@ -181,25 +140,18 @@ const foldLoaded = (items, top, rev, extra = {}) => {
     root: top,
     exportEntries,
   });
-  if (!needs.live) return folded;
-  if (!isPathInScope(MANIFEST, extra.paths ?? [])) return folded;
+  if (!needs.live || !isPathInScope(MANIFEST, extra.paths)) return folded;
   const pkgText = worktreeText(top, MANIFEST);
   const lockText = worktreeText(top, LOCKFILE);
   const options = { lockText, usedNames, root: top, exportEntries };
   return mergeProposedItems(folded, pkgText, outdated, audit, options);
 };
 
-const needsExtras = (parsed, rev, extra) =>
-  extrasNeeds(parsed, rev, extra).audit;
-
 const finishLoad = (snapshot, extra) => {
-  const options = { ...extra, paths: extra.paths ?? [] };
-  if (extra.deferExtras) options.collect = false;
-  const parsed = snapshot.parsed;
-  const top = snapshot.top;
-  const rev = snapshot.rev;
+  const { top, rev, parsed } = snapshot;
+  const options = { ...extra, collect: !extra.deferExtras };
   const items = foldLoaded(parsed, top, rev, options);
-  const pending = extra.deferExtras && needsExtras(parsed, rev, extra);
+  const pending = extra.deferExtras && extrasNeeds(parsed, rev, extra).audit;
   return { ...snapshot, items, pending };
 };
 
@@ -228,123 +180,56 @@ const loadExtras = async (snapshot, extra = {}) => {
       : known,
   ]);
   if (signal && signal.aborted) throw abortError();
-  const folded = foldLoaded(parsed, top, rev, {
+  const found = { usedNames, auditMap: audit, outdatedMap: outdated };
+  const items = foldLoaded(parsed, top, rev, {
     ...extra,
+    ...found,
     paths: extra.paths ?? [],
-    usedNames,
-    auditMap: audit,
-    outdatedMap: outdated,
     exportEntries,
     collect: false,
   });
-  return {
-    ...snapshot,
-    items: folded,
-    pending: false,
-    usedNames,
-    auditMap: audit,
-    outdatedMap: outdated,
-    exportEntries,
-  };
+  return { ...snapshot, items, pending: false, ...found, exportEntries };
 };
 
 const captureFile = (top, rel) => {
-  const abs = path.join(top, rel);
   try {
-    const text = fs.readFileSync(abs, 'utf8');
+    const text = fs.readFileSync(path.join(top, rel), 'utf8');
     return { rel, existed: true, text };
   } catch (error) {
-    if (error.code === 'ENOENT') {
-      return { rel, existed: false, text: '' };
-    }
-    throw error;
+    if (error.code !== 'ENOENT') throw error;
+    return { rel, existed: false, text: '' };
   }
 };
 
 const restoreFile = (top, saved) => {
   const abs = path.join(top, saved.rel);
-  if (saved.existed) return void fs.writeFileSync(abs, saved.text);
-  try {
-    fs.unlinkSync(abs);
-  } catch {
-    // missing
-  }
+  if (saved.existed) fs.writeFileSync(abs, saved.text);
+  else fs.rmSync(abs, { force: true });
 };
 
-const captureFiles = (top, rels) => {
-  const { length } = rels;
-  const owned = new Array(length);
-  for (let i = 0; i < length; i++) owned[i] = captureFile(top, rels[i]);
-  return owned;
-};
-
-const restoreFiles = (top, owned) => {
-  for (const saved of owned) restoreFile(top, saved);
-};
-
-const mergeDepLive = (top, rel, change, origin, base, side, kind) => {
-  const sides = readDepSides(top, null, origin, rel);
+const mergeLive = (top, rel, item, base, side) => {
+  const sides = readDepSides(top, null, item.origin, rel);
+  const { kind } = depFileMeta(rel);
+  const change = depChange(item);
   return mergeDepFile(base, sides.oldText, sides.newText, change, side, kind);
 };
 
-const applyDepIndex = (top, rel, change, origin, side) => {
-  const meta = depFileMeta(rel);
-  if (!meta) return;
+const applyDepIndex = (top, rel, item, side) => {
+  if (!depFileMeta(rel)) return;
   const indexed = gitText(top, `:${rel}`) || gitText(top, `HEAD:${rel}`);
-  const text = mergeDepLive(top, rel, change, origin, indexed, side, meta.kind);
-  writeIndex(top, rel, text);
+  writeIndex(top, rel, mergeLive(top, rel, item, indexed, side));
 };
 
-const applyDepWorktree = (top, rel, change, origin) => {
-  const meta = depFileMeta(rel);
-  if (!meta) return;
-  const worktree = worktreeText(top, rel);
-  const text = mergeDepLive(
-    top,
-    rel,
-    change,
-    origin,
-    worktree,
-    'old',
-    meta.kind,
-  );
+const applyDepWorktree = (top, rel, item, side) => {
+  if (!depFileMeta(rel)) return;
+  const text = mergeLive(top, rel, item, worktreeText(top, rel), side);
   writeFile(top, rel, text);
 };
 
-const ownedRelsOf = (plan) => {
-  const rels = [];
-  if (plan.manifest) rels.push(plan.manifest);
-  if (plan.lockPath && plan.lockPath !== plan.manifest) {
-    rels.push(plan.lockPath);
-  }
-  return rels;
-};
-
-const errorFromResult = (result, fail) => {
-  if (!result) return new Error(fail);
-  if (result.error) {
-    const msg = result.error.message || fail;
-    return new Error(oneLine(msg, fail));
-  }
-  const msg = result.stderr || result.stdout || fail;
-  return new Error(oneLine(msg, fail));
-};
-
-const applyPreparation = (top, item, plan) => {
-  if (!plan.prepareManifest || !plan.manifest) return;
-  const change = depChange(item);
-  const origin = item.origin;
-  const worktree = worktreeText(top, plan.manifest);
-  const text = mergeDepLive(
-    top,
-    plan.manifest,
-    change,
-    origin,
-    worktree,
-    'new',
-    'manifest',
-  );
-  writeFile(top, plan.manifest, text);
+const npmError = (result, fail) => {
+  const { error } = result;
+  const msg = error ? error.message : result.stderr || result.stdout;
+  return new Error(oneLine(msg || fail, fail));
 };
 
 const stagePlan = (top, plan) => {
@@ -355,131 +240,122 @@ const stagePlan = (top, plan) => {
   requireOk(runGit(['add', '--', ...toAdd], top));
 };
 
-const finishPlan = (top, plan, result, stage) => {
-  if (result && (result.error || result.status !== 0)) {
-    throw errorFromResult(result, plan.fail);
-  }
-  const stageFn = stage ?? stagePlan;
-  stageFn(top, plan);
+const startPlan = (top, item) => {
+  const plan = proposedNpmPlan(top, item);
+  if (!plan) return null;
+  const rels = [...new Set([plan.manifest, plan.lockPath].filter(Boolean))];
+  const owned = rels.map((rel) => captureFile(top, rel));
+  return { plan, owned };
+};
+
+const finishPlan = (top, plan, result, stage = stagePlan) => {
+  const failed = result && (result.error || result.status !== 0);
+  if (failed) throw npmError(result, plan.fail);
+  stage(top, plan);
+};
+
+const restoreOwned = (top, owned) => {
+  for (const saved of owned) restoreFile(top, saved);
 };
 
 const applyProposedUpdate = (top, item, extra = {}) => {
-  const plan = proposedNpmPlan(top, item);
-  if (!plan) return;
-  const owned = captureFiles(top, ownedRelsOf(plan));
+  const started = startPlan(top, item);
+  if (!started) return;
+  const { plan, owned } = started;
   try {
-    applyPreparation(top, item, plan);
+    if (plan.prepareManifest) applyDepWorktree(top, plan.manifest, item, 'new');
     const install = extra.run ?? plan.runner ?? runNpm;
-    const result = install(plan.cwd, plan.npmArgs);
-    finishPlan(top, plan, result, extra.stage);
+    finishPlan(top, plan, install(plan.cwd, plan.npmArgs), extra.stage);
   } catch (error) {
-    restoreFiles(top, owned);
+    restoreOwned(top, owned);
     throw error;
   }
 };
 
-const applyProposedUpdateAsync = async (top, item, extra = {}) => {
-  const plan = proposedNpmPlan(top, item);
-  if (!plan) return;
-  const owned = captureFiles(top, ownedRelsOf(plan));
+const applyProposedUpdateAsync = async (top, item) => {
+  const started = startPlan(top, item);
+  if (!started) return;
+  const { plan, owned } = started;
   try {
-    applyPreparation(top, item, plan);
-    const run = extra.run ?? plan.runner ?? runNpmAsync;
-    const result = await run(plan.cwd, plan.npmArgs);
-    finishPlan(top, plan, result, extra.stage);
+    if (plan.prepareManifest) applyDepWorktree(top, plan.manifest, item, 'new');
+    const install = plan.runner ?? runNpmAsync;
+    finishPlan(top, plan, await install(plan.cwd, plan.npmArgs));
   } catch (error) {
-    restoreFiles(top, owned);
+    restoreOwned(top, owned);
     throw error;
   }
 };
 
 const applyDepChange = (top, item, mode) => {
   const change = depChange(item);
-  if (change && change.propose) {
+  if (change.propose) {
     if (mode === 'add') return void applyProposedUpdate(top, item);
     if (!change.unused) return;
   }
-  const origin = item.origin;
-  const files = depPaths(item);
-  for (const rel of files) {
-    if (mode === 'add') {
-      applyDepIndex(top, rel, change, origin, 'new');
+  for (const rel of depPaths(item)) {
+    if (mode !== 'revert') {
+      applyDepIndex(top, rel, item, mode === 'add' ? 'new' : 'old');
       continue;
     }
-    if (mode === 'unstage') {
-      applyDepIndex(top, rel, change, origin, 'old');
-      continue;
-    }
-    if (origin === 'staged') applyDepIndex(top, rel, change, origin, 'old');
-    applyDepWorktree(top, rel, change, origin);
+    if (item.origin === 'staged') applyDepIndex(top, rel, item, 'old');
+    applyDepWorktree(top, rel, item, 'old');
   }
 };
 
 const addItem = (top, item) => {
-  if (item.origin === 'staged' || item.origin === 'commit') return;
+  if (!item.dep) return void worktree.addItem(top, item);
+  if (isStagedOrCommit(item)) return;
   if (depChange(item)) return void applyDepChange(top, item, 'add');
-  const files = depPaths(item);
-  if (files.length) {
-    requireOk(runGit(['add', '--', ...files], top));
-  }
+  const rels = depPaths(item);
+  if (rels.length) requireOk(runGit(['add', '--', ...rels], top));
 };
 
 const addItemAsync = async (top, item) => {
-  if (item.origin === 'staged' || item.origin === 'commit') return;
-  if (hasProposed(item)) {
-    await applyProposedUpdateAsync(top, item);
-    return;
+  if (isStagedOrCommit(item) || !hasProposed(item)) {
+    return void addItem(top, item);
   }
-  addItem(top, item);
+  await applyProposedUpdateAsync(top, item);
 };
 
 const unstageItem = (top, item) => {
+  if (!item.dep) return void worktree.unstageItem(top, item);
   if (item.origin !== 'staged') return;
   if (depChange(item)) return void applyDepChange(top, item, 'unstage');
-  const files = depPaths(item);
-  if (files.length) {
-    requireOk(runGit(['restore', '--staged', '--', ...files], top));
-  }
+  const rels = depPaths(item);
+  if (!rels.length) return;
+  requireOk(runGit(['restore', '--staged', '--', ...rels], top));
 };
 
-const revertDepItem = (top, item) => {
+const revertItem = (top, item) => {
+  if (item.origin === 'commit') return;
+  if (!item.dep) return void worktree.revertItem(top, item);
   if (depChange(item)) return void applyDepChange(top, item, 'revert');
-  const byPath = new Map();
-  for (const orig of origDepItems(item)) {
-    const rel = itemPath(orig);
-    const list = byPath.get(rel);
-    if (list) list.push(orig);
-    else byPath.set(rel, [orig]);
-  }
-  for (const rel of byPath.keys()) {
-    revertOnePath(top, rel, byPath.get(rel));
-  }
+  const byPath = groupByPath(item.dep.items ?? []);
+  for (const rel of byPath.keys()) revertOnePath(top, rel, byPath.get(rel));
 };
 
 const revertFile = (top, rel, items) => {
-  const paths = new Set([rel]);
+  const rels = new Set([rel]);
   for (const item of items) {
-    for (const file of depPaths(item)) paths.add(file);
+    for (const file of depPaths(item)) rels.add(file);
   }
-  for (const file of paths) {
+  for (const file of rels) {
     const group = itemsForPath(file, items);
-    const targets = group.length ? group : items;
-    revertOnePath(top, file, targets);
+    revertOnePath(top, file, group.length ? group : items);
   }
 };
 
 module.exports = {
-  itemsForPath,
+  collectReportAsync,
   finishLoad,
   loadExtras,
   captureFile,
   restoreFile,
+  proposedNpmPlan,
   applyProposedUpdate,
   addItem,
   addItemAsync,
   unstageItem,
-  revertDepItem,
+  revertItem,
   revertFile,
-  INSTALL_MS,
-  proposedNpmPlan,
 };

package/lib/git-reword-todo.js

@@ -5,16 +5,8 @@ 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'));
+const rows = fs.readFileSync(file, 'utf8').split('\n');
+const at = rows.findIndex((row) => /^(pick|p)\s+/.test(row));
+const amend = `exec git commit --amend --only -F ${JSON.stringify(msg)}`;
+if (at >= 0) rows.splice(at + 1, 0, amend);
+fs.writeFileSync(file, rows.join('\n'));