reslop 0.2.3 → 0.2.5

package/lib/git-deps.js

@@ -8,12 +8,14 @@ const { foldDepItems, mergeDepFile, depFileMeta } = deps;
 const { parseAuditReport, parseOutdatedReport } = deps;
 const { mergeProposedItems, MANIFEST, LOCKFILE } = deps;
 const { collectUsedNames, collectExportMeta } = deps;
-const { itemPath, isPathInScope } = require('./files.js');
+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.js');
+const git = require('./git-worktree.js');
 const { oneLine, requireOk, runGit } = git;
 const { gitText, worktreeText, readDepSides, revertOnePath } = git;
+const { writeFile, writeIndex } = git;
 
 const AUDIT_MS = 15000;
 const INSTALL_MS = 120000;
@@ -30,12 +32,12 @@ const npmProcOptions = (cwd, extra = {}) => ({
 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 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 runNpmJson = (top, args, timeout) => {
   const result = runProcSync(npmBin(), args, npmProcOptions(top, { timeout }));
@@ -104,18 +106,6 @@ const hasProposed = (item) => {
   return !!(change && change.propose);
 };
 
-const relatedFiles = (items) => {
-  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) {
-    const paths = depPaths(item);
-    for (let j = 0; j < paths.length; j++) files[i++] = paths[j];
-  }
-  return files;
-};
-
 const itemsForPath = (rel, items) => {
   const group = [];
   for (const item of items) {
@@ -137,73 +127,61 @@ const hasDepFile = (items) => {
   return false;
 };
 
-const collectAudit = (top) => {
-  const lock = path.join(top, LOCKFILE);
-  if (!fs.existsSync(lock)) return null;
-  const args = ['audit', '--json', '--package-lock-only'];
-  const text = runNpmJson(top, args, AUDIT_MS);
-  return parseAuditReport(text);
-};
-
-const collectOutdated = (top) => {
-  const manifest = path.join(top, MANIFEST);
-  if (!fs.existsSync(manifest)) return null;
-  const args = ['outdated', '--json', '--long'];
-  const text = runNpmJson(top, args, AUDIT_MS);
-  return parseOutdatedReport(text);
+const NPM_REPORT = {
+  audit: {
+    file: LOCKFILE,
+    args: ['audit', '--json', '--package-lock-only'],
+    parse: parseAuditReport,
+  },
+  outdated: {
+    file: MANIFEST,
+    args: ['outdated', '--json', '--long'],
+    parse: parseOutdatedReport,
+  },
 };
 
-const collectAuditAsync = async (top, extra, signal) => {
-  if (extra.auditMap !== undefined) return extra.auditMap;
-  const lock = path.join(top, LOCKFILE);
-  if (!fs.existsSync(lock)) return null;
-  const args = ['audit', '--json', '--package-lock-only'];
-  const text = await runNpmJsonAsync(top, args, AUDIT_MS, signal);
-  return parseAuditReport(text);
+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 collectOutdatedAsync = async (top, extra, signal) => {
-  if (extra.outdatedMap !== undefined) return extra.outdatedMap;
-  const manifest = path.join(top, MANIFEST);
-  if (!fs.existsSync(manifest)) return null;
-  const args = ['outdated', '--json', '--long'];
-  const text = await runNpmJsonAsync(top, args, AUDIT_MS, signal);
-  return parseOutdatedReport(text);
+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 pickNpmMap = (override, collect, top) => {
-  if (override !== undefined) return override;
-  return collect(top);
+const extrasNeeds = (items, rev, extra) => {
+  const live = extra.audit === true && !rev;
+  const hasDepDiff = hasDepFile(items);
+  const audit = live || (Boolean(extra.audit) && hasDepDiff);
+  return { live, scan: live || hasDepDiff, audit };
 };
 
 const foldLoaded = (items, top, rev, extra = {}) => {
   const readSides = (origin, rel) => readDepSides(top, rev, origin, rel);
-  const live = extra.audit === true && !rev;
-  const hasDepDiff = hasDepFile(items);
+  const needs = extrasNeeds(items, rev, extra);
   const collect = extra.collect !== false;
-  let usedNames = extra.usedNames ?? null;
-  let audit = extra.auditMap;
-  let outdated = extra.outdatedMap;
-  let exportEntries = extra.exportEntries;
-  if (collect && usedNames === null && (hasDepDiff || live)) {
-    usedNames = collectUsedNames(top);
-  }
-  if (collect && exportEntries === undefined && (hasDepDiff || live)) {
+  const scan = collect && needs.scan;
+  const usedNames = extra.usedNames ?? (scan ? collectUsedNames(top) : null);
+  let { exportEntries, auditMap: audit, outdatedMap: outdated } = extra;
+  if (scan && exportEntries === undefined) {
     exportEntries = collectExportMeta(top);
   }
-  if (collect && live) {
-    audit = pickNpmMap(extra.auditMap, collectAudit, top);
-    outdated = pickNpmMap(extra.outdatedMap, collectOutdated, top);
-  } else if (collect && extra.audit && hasDepDiff) {
-    audit = pickNpmMap(extra.auditMap, collectAudit, top);
+  if (collect && needs.audit && audit === undefined) {
+    audit = collectReport(top, 'audit');
+  }
+  if (collect && needs.live && outdated === undefined) {
+    outdated = collectReport(top, 'outdated');
   }
-  if (audit === undefined) audit = null;
-  if (outdated === undefined) outdated = null;
+  audit ??= null;
+  outdated ??= null;
   const folded = foldDepItems(items, readSides, usedNames, audit, outdated, {
     root: top,
     exportEntries,
   });
-  if (!live) return folded;
+  if (!needs.live) return folded;
   if (!isPathInScope(MANIFEST, extra.paths ?? [])) return folded;
   const pkgText = worktreeText(top, MANIFEST);
   const lockText = worktreeText(top, LOCKFILE);
@@ -211,12 +189,8 @@ const foldLoaded = (items, top, rev, extra = {}) => {
   return mergeProposedItems(folded, pkgText, outdated, audit, options);
 };
 
-const needsExtras = (parsed, rev, extra) => {
-  const live = extra.audit === true && !rev;
-  if (live) return true;
-  if (!extra.audit) return false;
-  return hasDepFile(parsed);
-};
+const needsExtras = (parsed, rev, extra) =>
+  extrasNeeds(parsed, rev, extra).audit;
 
 const finishLoad = (snapshot, extra) => {
   const options = { ...extra, paths: extra.paths ?? [] };
@@ -229,42 +203,29 @@ const finishLoad = (snapshot, extra) => {
   return { ...snapshot, items, pending };
 };
 
-const extrasMetaOf = (parsed, rev, extra, top, signal) => {
-  const live = extra.audit === true && !rev;
-  const hasDepDiff = hasDepFile(parsed);
-  const needScan = live || hasDepDiff;
-  let usedNames = Promise.resolve(null);
-  if (needScan) {
-    usedNames = Promise.resolve().then(() => collectUsedNames(top));
-  }
-  let exportEntries = Promise.resolve(undefined);
-  if (extra.exportEntries !== undefined) {
-    exportEntries = Promise.resolve(extra.exportEntries);
-  } else if (needScan) {
-    exportEntries = Promise.resolve().then(() => collectExportMeta(top));
-  }
-  let audit = Promise.resolve(null);
-  if (live || (extra.audit && hasDepDiff)) {
-    audit = collectAuditAsync(top, extra, signal);
-  }
-  let outdated = Promise.resolve(null);
-  if (live) {
-    outdated = collectOutdatedAsync(top, extra, signal);
-  }
-  return { usedNames, audit, outdated, exportEntries };
+const later = (fn) => Promise.resolve().then(fn);
+
+const reportTask = (wanted, known, collect) => {
+  if (!wanted) return null;
+  return known === undefined ? collect() : known;
 };
 
 const loadExtras = async (snapshot, extra = {}) => {
-  const top = snapshot.top;
-  const rev = snapshot.rev;
-  const parsed = snapshot.parsed;
-  const signal = extra.signal;
-  const tasks = extrasMetaOf(parsed, rev, extra, top, signal);
+  const { top, rev, parsed } = snapshot;
+  const { signal } = extra;
+  const needs = extrasNeeds(parsed, rev, extra);
+  const known = extra.exportEntries;
   const [usedNames, audit, outdated, exportEntries] = await Promise.all([
-    tasks.usedNames,
-    tasks.audit,
-    tasks.outdated,
-    tasks.exportEntries,
+    needs.scan ? later(() => collectUsedNames(top)) : null,
+    reportTask(needs.audit, extra.auditMap, () =>
+      collectReportAsync(top, 'audit', signal),
+    ),
+    reportTask(needs.live, extra.outdatedMap, () =>
+      collectReportAsync(top, 'outdated', signal),
+    ),
+    known === undefined && needs.scan
+      ? later(() => collectExportMeta(top))
+      : known,
   ]);
   if (signal && signal.aborted) throw abortError();
   const folded = foldLoaded(parsed, top, rev, {
@@ -287,12 +248,6 @@ const loadExtras = async (snapshot, extra = {}) => {
   };
 };
 
-const writeWorktreeFile = (top, rel, text) => {
-  const abs = path.join(top, rel);
-  fs.mkdirSync(path.dirname(abs), { recursive: true });
-  fs.writeFileSync(abs, text);
-};
-
 const captureFile = (top, rel) => {
   const abs = path.join(top, rel);
   try {
@@ -327,16 +282,6 @@ const restoreFiles = (top, owned) => {
   for (const saved of owned) restoreFile(top, saved);
 };
 
-const writeIndexFile = (top, rel, text) => {
-  const saved = captureFile(top, rel);
-  writeWorktreeFile(top, rel, text);
-  try {
-    requireOk(runGit(['add', '--', rel], top));
-  } finally {
-    restoreFile(top, saved);
-  }
-};
-
 const mergeDepLive = (top, rel, change, origin, base, side, kind) => {
   const sides = readDepSides(top, null, origin, rel);
   return mergeDepFile(base, sides.oldText, sides.newText, change, side, kind);
@@ -347,7 +292,7 @@ const applyDepIndex = (top, rel, change, origin, side) => {
   if (!meta) return;
   const indexed = gitText(top, `:${rel}`) || gitText(top, `HEAD:${rel}`);
   const text = mergeDepLive(top, rel, change, origin, indexed, side, meta.kind);
-  writeIndexFile(top, rel, text);
+  writeIndex(top, rel, text);
 };
 
 const applyDepWorktree = (top, rel, change, origin) => {
@@ -363,7 +308,7 @@ const applyDepWorktree = (top, rel, change, origin) => {
     'old',
     meta.kind,
   );
-  writeWorktreeFile(top, rel, text);
+  writeFile(top, rel, text);
 };
 
 const ownedRelsOf = (plan) => {
@@ -399,7 +344,7 @@ const applyPreparation = (top, item, plan) => {
     'new',
     'manifest',
   );
-  writeWorktreeFile(top, plan.manifest, text);
+  writeFile(top, plan.manifest, text);
 };
 
 const stagePlan = (top, plan) => {
@@ -418,26 +363,14 @@ const finishPlan = (top, plan, result, stage) => {
   stageFn(top, plan);
 };
 
-const syncInstaller = (plan, extra) => {
-  if (extra.run) return extra.run;
-  if (plan.runner) return plan.runner;
-  return (dir) => runNpm(dir, plan.npmArgs);
-};
-
-const asyncInstaller = (plan, extra) => {
-  if (extra.run) return extra.run;
-  if (plan.runner) return (dir) => Promise.resolve(plan.runner(dir));
-  return (dir) => runNpmAsync(dir, plan.npmArgs);
-};
-
 const applyProposedUpdate = (top, item, extra = {}) => {
   const plan = proposedNpmPlan(top, item);
   if (!plan) return;
   const owned = captureFiles(top, ownedRelsOf(plan));
   try {
     applyPreparation(top, item, plan);
-    const install = syncInstaller(plan, extra);
-    const result = install(plan.cwd);
+    const install = extra.run ?? plan.runner ?? runNpm;
+    const result = install(plan.cwd, plan.npmArgs);
     finishPlan(top, plan, result, extra.stage);
   } catch (error) {
     restoreFiles(top, owned);
@@ -451,8 +384,8 @@ const applyProposedUpdateAsync = async (top, item, extra = {}) => {
   const owned = captureFiles(top, ownedRelsOf(plan));
   try {
     applyPreparation(top, item, plan);
-    const run = asyncInstaller(plan, extra);
-    const result = await run(plan.cwd);
+    const run = extra.run ?? plan.runner ?? runNpmAsync;
+    const result = await run(plan.cwd, plan.npmArgs);
     finishPlan(top, plan, result, extra.stage);
   } catch (error) {
     restoreFiles(top, owned);
@@ -525,7 +458,9 @@ const revertDepItem = (top, item) => {
 
 const revertFile = (top, rel, items) => {
   const paths = new Set([rel]);
-  for (const file of relatedFiles(items)) paths.add(file);
+  for (const item of items) {
+    for (const file of depPaths(item)) paths.add(file);
+  }
   for (const file of paths) {
     const group = itemsForPath(file, items);
     const targets = group.length ? group : items;
@@ -533,30 +468,18 @@ const revertFile = (top, rel, items) => {
   }
 };
 
-const handles = (item) => !!(item && item.dep);
-
 module.exports = {
-  hasProposed,
-  handles,
-  relatedFiles,
   itemsForPath,
   finishLoad,
   loadExtras,
   captureFile,
   restoreFile,
   applyProposedUpdate,
-  applyProposedUpdateAsync,
-  applyDepChange,
   addItem,
   addItemAsync,
   unstageItem,
   revertDepItem,
   revertFile,
-  AUDIT_MS,
   INSTALL_MS,
-  runNpm,
-  runNpmAsync,
-  runNpmJson,
-  runNpmJsonAsync,
   proposedNpmPlan,
 };