reslop 0.1.9 → 0.2.0

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,
 };