reslop 0.1.9 → 0.2.0

package/lib/diff.js

@@ -1,33 +0,0 @@
-'use strict';
-
-const { diffChars } = require('./diff/inline.js');
-const { isCtxType, pairIndices, attachInline } = require('./diff/align.js');
-const { parseDiff } = require('./diff/parse.js');
-const patch = require('./diff/patch.js');
-const { splitHunk, flattenBlock, countSides, formatPatch } = patch;
-const display = require('./diff/display.js');
-const { DISPLAY_CONTEXT, displayLines, blockAddText } = display;
-const edit = require('./diff/edit.js');
-const { addBlockRange, replaceBlockAdds } = edit;
-const items = require('./diff/items.js');
-const { synthesizeNewFile, itemsFromFiles, refreshIndexPatches } = items;
-
-module.exports = {
-  DISPLAY_CONTEXT,
-  isCtxType,
-  diffChars,
-  pairIndices,
-  attachInline,
-  parseDiff,
-  splitHunk,
-  flattenBlock,
-  countSides,
-  formatPatch,
-  displayLines,
-  blockAddText,
-  addBlockRange,
-  replaceBlockAdds,
-  synthesizeNewFile,
-  itemsFromFiles,
-  refreshIndexPatches,
-};

package/lib/git/changes.js

@@ -1,164 +0,0 @@
-'use strict';
-
-const fs = require('node:fs');
-const path = require('node:path');
-
-const { itemPath } = require('../files.js');
-const { replaceBlockAdds } = require('../diff/edit.js');
-const { requireOk, runGit } = require('./run.js');
-
-const applyPatch = (cwd, patch, flags) => {
-  const args = ['apply', ...flags, '--whitespace=nowarn', '-'];
-  const result = runGit(args, cwd, patch);
-  requireOk(result, 'apply failed');
-};
-
-const addItem = (top, item) => {
-  if (item.origin === 'staged' || item.origin === 'commit') return;
-  if (item.origin === 'untracked' || item.file.isBinary) {
-    requireOk(runGit(['add', '--', item.file.newPath], top));
-    return;
-  }
-  applyPatch(top, item.patchAdd, ['--cached']);
-};
-
-const unstageItem = (top, item) => {
-  if (item.origin !== 'staged') return;
-  const rel = itemPath(item);
-  if (item.file.isBinary) {
-    requireOk(runGit(['restore', '--staged', '--', rel], top));
-    return;
-  }
-  applyPatch(top, item.patchAdd, ['--reverse', '--cached']);
-};
-
-const revertOnePath = (top, rel, items) => {
-  const origins = new Set();
-  let isNew = false;
-  for (const item of items) {
-    origins.add(item.origin);
-    if (item.file && item.file.isNew) isNew = true;
-  }
-  if (isNew) {
-    if (origins.has('staged')) {
-      requireOk(runGit(['rm', '-f', '--', rel], top));
-      return;
-    }
-    fs.unlinkSync(path.join(top, rel));
-    return;
-  }
-  if (origins.has('untracked') && origins.size === 1) {
-    fs.unlinkSync(path.join(top, rel));
-    return;
-  }
-  const args = ['restore', '-s', 'HEAD', '--worktree', '--staged', '--', rel];
-  requireOk(runGit(args, top));
-};
-
-const revertItem = (top, item) => {
-  if (item.origin === 'commit') return;
-  const rel = itemPath(item);
-  if (item.origin === 'untracked') {
-    fs.unlinkSync(path.join(top, rel));
-    return;
-  }
-  if (item.file.isBinary) {
-    const args = ['restore', '-s', 'HEAD', '--worktree'];
-    if (item.origin === 'staged') args.push('--staged');
-    args.push('--', rel);
-    requireOk(runGit(args, top));
-    return;
-  }
-  if (item.origin === 'unstaged') {
-    applyPatch(top, item.patchRevert, ['--reverse']);
-    return;
-  }
-  applyPatch(top, item.patchRevert, ['--reverse', '--cached']);
-  try {
-    applyPatch(top, item.patchRevert, ['--reverse']);
-  } catch (error) {
-    if (!error.message.includes('does not apply')) throw error;
-  }
-};
-
-const revertFile = (top, rel, items) => {
-  const group = [];
-  for (const item of items) {
-    if (itemPath(item) === rel) group.push(item);
-  }
-  const targets = group.length ? group : items;
-  revertOnePath(top, rel, targets);
-};
-
-const indexText = (top, rel) => {
-  const result = runGit(['show', `:${rel}`], top);
-  requireOk(result, 'show failed');
-  return result.stdout ?? '';
-};
-
-const indexMode = (top, rel) => {
-  const result = runGit(['ls-files', '--stage', '--', rel], top);
-  if (result.status !== 0) return '100644';
-  const line = (result.stdout ?? '').trim();
-  if (!line) return '100644';
-  const mode = line.split(' ')[0];
-  return mode || '100644';
-};
-
-const writeIndex = (top, rel, text) => {
-  const hashed = runGit(['hash-object', '-w', '--stdin'], top, text);
-  requireOk(hashed, 'hash-object failed');
-  const sha = (hashed.stdout ?? '').trim();
-  const mode = indexMode(top, rel);
-  const args = ['update-index', '--cacheinfo', mode, sha, rel];
-  requireOk(runGit(args, top), 'update-index failed');
-};
-
-const writeWorktree = (abs, text) => {
-  fs.writeFileSync(abs, text);
-};
-
-const editStaged = (top, rel, abs, hunk, blockId, text) => {
-  const source = indexText(top, rel);
-  const next = replaceBlockAdds(source, hunk, blockId, text);
-  writeIndex(top, rel, next);
-  let work = null;
-  try {
-    work = fs.readFileSync(abs, 'utf8');
-  } catch (error) {
-    if (error.code !== 'ENOENT') throw error;
-  }
-  if (work === null) {
-    writeWorktree(abs, next);
-    return;
-  }
-  if (work === source) writeWorktree(abs, next);
-};
-
-const editWorktree = (abs, hunk, blockId, text) => {
-  const source = fs.readFileSync(abs, 'utf8');
-  const next = replaceBlockAdds(source, hunk, blockId, text);
-  if (next === source) return;
-  writeWorktree(abs, next);
-};
-
-const editItem = (top, item, text) => {
-  if (item.origin === 'commit' || item.origin === 'pr') return;
-  const rel = itemPath(item);
-  if (!rel || !item.hunk) return;
-  const abs = path.join(top, rel);
-  if (item.origin === 'staged') {
-    editStaged(top, rel, abs, item.hunk, item.blockId, text);
-    return;
-  }
-  editWorktree(abs, item.hunk, item.blockId, text);
-};
-
-module.exports = {
-  addItem,
-  unstageItem,
-  revertOnePath,
-  revertItem,
-  revertFile,
-  editItem,
-};

package/lib/git/read.js

@@ -1,253 +0,0 @@
-'use strict';
-
-const fs = require('node:fs');
-const path = require('node:path');
-
-const diff = require('../diff.js');
-const { parseDiff, synthesizeNewFile, itemsFromFiles } = diff;
-const { itemPath, REVIEW_DIR } = require('../files.js');
-const git = require('./run.js');
-const { requireOk, runGit, runGitAsync } = git;
-const { pathArgsOf, cachedDiffArgs, worktreeDiffArgs, commitDiffArgs } = git;
-
-const BINARY_SIZE = 1000000;
-
-const isReviewFile = (rel) => {
-  if (!rel) return false;
-  const first = rel.split(/[/\\]/)[0];
-  return first === REVIEW_DIR;
-};
-
-const dropReviewItems = (items) => {
-  const kept = [];
-  for (const item of items) {
-    if (isReviewFile(itemPath(item))) continue;
-    kept.push(item);
-  }
-  return kept;
-};
-
-const isBinaryBuffer = (buf) => {
-  if (buf.length > BINARY_SIZE) return true;
-  return buf.includes(0);
-};
-
-const namesFromLs = (stdout) => {
-  if (!stdout) return [];
-  return stdout.split('\0').filter(Boolean);
-};
-
-const untrackedLsArgs = (paths) => {
-  const args = ['ls-files', '-o', '--exclude-standard', '-z'];
-  if (paths.length) args.push('--', ...paths);
-  return args;
-};
-
-const listUntracked = (top, paths) => {
-  const result = requireOk(runGit(untrackedLsArgs(paths), top));
-  return namesFromLs(result.stdout);
-};
-
-const binaryNewFile = (rel) => ({
-  oldPath: rel,
-  newPath: rel,
-  isNew: true,
-  isDeleted: false,
-  isBinary: true,
-  preamble: [`diff --git a/${rel} b/${rel}`, 'new file mode 100644'],
-  hunks: [],
-});
-
-const untrackedItemsFrom = (top, names) => {
-  const files = [];
-  for (const rel of names) {
-    if (isReviewFile(rel)) continue;
-    const full = path.join(top, rel);
-    let buf;
-    try {
-      buf = fs.readFileSync(full);
-    } catch (error) {
-      if (error.code === 'ENOENT') continue;
-      throw error;
-    }
-    if (isBinaryBuffer(buf)) {
-      files.push(binaryNewFile(rel));
-      continue;
-    }
-    files.push(synthesizeNewFile(rel, buf.toString('utf8')));
-  }
-  return itemsFromFiles(files, 'untracked');
-};
-
-const mergeItems = (groups) => {
-  const byPath = new Map();
-  for (const group of groups) {
-    for (const item of group) {
-      const rel = itemPath(item);
-      const list = byPath.get(rel);
-      if (list) {
-        list.push(item);
-        continue;
-      }
-      byPath.set(rel, [item]);
-    }
-  }
-  const items = [];
-  for (const list of byPath.values()) {
-    for (const item of list) items.push(item);
-  }
-  return items;
-};
-
-const gitText = (top, spec) => {
-  const result = runGit(['show', spec], top);
-  if (result.status !== 0) return '';
-  return result.stdout ?? '';
-};
-
-const worktreeText = (top, rel) => {
-  try {
-    return fs.readFileSync(path.join(top, rel), 'utf8');
-  } catch {
-    return '';
-  }
-};
-
-const readDepSides = (top, rev, origin, rel) => {
-  if (origin === 'untracked') {
-    const newText = worktreeText(top, rel);
-    return { oldText: '', newText };
-  }
-  if (origin === 'staged') {
-    const oldText = gitText(top, `HEAD:${rel}`);
-    const newText = gitText(top, `:${rel}`);
-    return { oldText, newText };
-  }
-  if (origin === 'unstaged') {
-    const indexed = gitText(top, `:${rel}`);
-    const oldText = indexed || gitText(top, `HEAD:${rel}`);
-    const newText = worktreeText(top, rel);
-    return { oldText, newText };
-  }
-  if (origin === 'commit' && rev) {
-    const oldText = gitText(top, `${rev}^:${rel}`);
-    const newText = gitText(top, `${rev}:${rel}`);
-    return { oldText, newText };
-  }
-  return { oldText: '', newText: '' };
-};
-
-const toplevel = (cwd) => {
-  const result = runGit(['rev-parse', '--show-toplevel'], cwd);
-  if (result.status !== 0) throw new Error('not a git repository');
-  return result.stdout.trim();
-};
-
-const resolveRev = (cwd, spec) => {
-  if (!spec) return null;
-  const top = toplevel(cwd);
-  const args = ['rev-parse', '--verify', `${spec}^{commit}`];
-  const result = runGit(args, top);
-  if (result.status !== 0) return null;
-  return result.stdout.trim();
-};
-
-const shortRev = (top, commit) => {
-  const result = runGit(['rev-parse', '--short', commit], top);
-  if (result.status !== 0) return commit.slice(0, 7);
-  return result.stdout.trim();
-};
-
-const currentBranch = (top) => {
-  const args = ['rev-parse', '--abbrev-ref', 'HEAD'];
-  const result = runGit(args, top);
-  if (result.status !== 0) return '';
-  const name = result.stdout.trim();
-  if (!name || name === 'HEAD') return '';
-  return name;
-};
-
-const snapshotWorktree = (top, stagedOut, unstagedOut, names) => {
-  const stagedDiff = parseDiff(stagedOut);
-  const unstagedDiff = parseDiff(unstagedOut);
-  const staged = itemsFromFiles(stagedDiff, 'staged');
-  const unstaged = itemsFromFiles(unstagedDiff, 'unstaged');
-  const untracked = untrackedItemsFrom(top, names);
-  const combined = mergeItems([staged, unstaged, untracked]);
-  const parsed = dropReviewItems(combined);
-  const branch = currentBranch(top);
-  return { top, parsed, branch };
-};
-
-const snapshotCommit = (top, commit, files) => {
-  const commitItems = itemsFromFiles(files, 'commit');
-  const parsed = dropReviewItems(commitItems);
-  const revShort = shortRev(top, commit);
-  const branch = currentBranch(top);
-  return { top, parsed, rev: commit, revShort, branch };
-};
-
-const loadCommit = (top, commit, extra) => {
-  const parent = runGit(['rev-parse', '--verify', `${commit}^`], top);
-  const args = commitDiffArgs(commit, parent, extra);
-  const result = requireOk(runGit(args, top));
-  return parseDiff(result.stdout);
-};
-
-const loadCommitAsync = async (top, commit, extra, signal) => {
-  const parent = await runGitAsync(
-    ['rev-parse', '--verify', `${commit}^`],
-    top,
-    { signal },
-  );
-  const args = commitDiffArgs(commit, parent, extra);
-  const result = requireOk(await runGitAsync(args, top, { signal }));
-  return parseDiff(result.stdout);
-};
-
-const readSnapshot = (cwd, paths, options) => {
-  const top = toplevel(cwd);
-  const extra = pathArgsOf(paths);
-  const rev = options.commit;
-  if (rev) return snapshotCommit(top, rev, loadCommit(top, rev, extra));
-  const stagedRes = requireOk(runGit(cachedDiffArgs(extra), top));
-  const unstagedRes = requireOk(runGit(worktreeDiffArgs(extra), top));
-  const names = listUntracked(top, paths);
-  return snapshotWorktree(top, stagedRes.stdout, unstagedRes.stdout, names);
-};
-
-const readSnapshotAsync = async (cwd, paths, options) => {
-  const top = toplevel(cwd);
-  const extra = pathArgsOf(paths);
-  const rev = options.commit;
-  const signal = options.signal;
-  if (rev) {
-    const files = await loadCommitAsync(top, rev, extra, signal);
-    return snapshotCommit(top, rev, files);
-  }
-  const stagedArgs = cachedDiffArgs(extra);
-  const unstagedArgs = worktreeDiffArgs(extra);
-  const lsArgs = untrackedLsArgs(paths);
-  const stagedP = runGitAsync(stagedArgs, top, { signal });
-  const unstagedP = runGitAsync(unstagedArgs, top, { signal });
-  const lsP = runGitAsync(lsArgs, top, { signal });
-  const extras = await Promise.all([stagedP, unstagedP, lsP]);
-  const stagedRes = extras[0];
-  const unstagedRes = extras[1];
-  const lsRes = extras[2];
-  requireOk(stagedRes);
-  requireOk(unstagedRes);
-  const names = namesFromLs(requireOk(lsRes).stdout);
-  return snapshotWorktree(top, stagedRes.stdout, unstagedRes.stdout, names);
-};
-
-module.exports = {
-  toplevel,
-  resolveRev,
-  currentBranch,
-  gitText,
-  worktreeText,
-  readDepSides,
-  readSnapshot,
-  readSnapshotAsync,
-};

package/lib/git/run.js

@@ -1,100 +0,0 @@
-'use strict';
-
-const proc = require('./proc.js');
-const { runProc, runProcSync, isAbort } = proc;
-
-const oneLine = (text, fallback = 'git failed') => proc.oneLine(text, fallback);
-
-const GIT_CONFIG = [
-  '-c',
-  'core.quotepath=false',
-  '-c',
-  'i18n.logOutputEncoding=utf-8',
-];
-const DIFF_OPTS = ['--no-color', '--no-ext-diff', '--no-renames', '-U3'];
-const GIT_ENCODING = proc.DEFAULT_ENCODING;
-const GIT_MAX_BUFFER = proc.DEFAULT_MAX_BUFFER;
-
-const gitEnv = () => ({ ...process.env, GIT_OPTIONAL_LOCKS: '0' });
-
-const gitProcOptions = (cwd, extra = {}) => ({
-  cwd,
-  env: gitEnv(),
-  encoding: GIT_ENCODING,
-  maxBuffer: GIT_MAX_BUFFER,
-  input: extra.input,
-  signal: extra.signal,
-});
-
-const gitResult = (result) => {
-  if (!result.error) return result;
-  if (isAbort(result.error)) throw result.error;
-  if (result.error.code === 'ENOENT') throw new Error('git not found');
-  throw result.error;
-};
-
-const requireOk = (result, fallback = 'git failed') => {
-  if (result.status === 0) return result;
-  const msg = result.stderr || result.stdout || fallback;
-  throw new Error(oneLine(msg, fallback));
-};
-
-const runGit = (args, cwd, input) => {
-  const options = gitProcOptions(cwd, { input });
-  return gitResult(runProcSync('git', args, options));
-};
-
-const runGitAsync = (args, cwd, extra = {}) => {
-  const options = gitProcOptions(cwd, extra);
-  return runProc('git', args, options).then(gitResult);
-};
-
-const pathArgsOf = (paths) => (paths.length ? ['--', ...paths] : []);
-
-const cachedDiffArgs = (pathArgs) => [
-  ...GIT_CONFIG,
-  'diff',
-  '--cached',
-  ...DIFF_OPTS,
-  ...pathArgs,
-];
-
-const worktreeDiffArgs = (pathArgs) => [
-  ...GIT_CONFIG,
-  'diff',
-  ...DIFF_OPTS,
-  ...pathArgs,
-];
-
-const commitDiffArgs = (commit, parent, pathArgs) => {
-  if (parent.status === 0) {
-    const from = parent.stdout.trim();
-    return [...GIT_CONFIG, 'diff', ...DIFF_OPTS, from, commit, ...pathArgs];
-  }
-  return [
-    ...GIT_CONFIG,
-    'diff-tree',
-    '--no-commit-id',
-    '--root',
-    '-p',
-    ...DIFF_OPTS,
-    commit,
-    ...pathArgs,
-  ];
-};
-
-module.exports = {
-  GIT_CONFIG,
-  DIFF_OPTS,
-  GIT_ENCODING,
-  GIT_MAX_BUFFER,
-  oneLine,
-  gitResult,
-  requireOk,
-  runGit,
-  runGitAsync,
-  pathArgsOf,
-  cachedDiffArgs,
-  worktreeDiffArgs,
-  commitDiffArgs,
-};

package/lib/npm/commands.js

@@ -1,100 +0,0 @@
-'use strict';
-
-const path = require('node:path');
-
-const { npmBin, npmOpts } = require('../sys.js');
-const { depFileMeta, LOCKFILE } = require('../deps.js');
-const proc = require('../git/proc.js');
-const { runProc, runProcSync } = proc;
-
-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 depChange = (item) => item.dep?.change ?? null;
-
-const depPaths = (item) => item.dep?.files ?? [];
-
-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,
-  };
-};
-
-module.exports = {
-  AUDIT_MS,
-  INSTALL_MS,
-  runNpm,
-  runNpmAsync,
-  runNpmJson,
-  runNpmJsonAsync,
-  proposedNpmPlan,
-};

package/lib/remote/changes.js

@@ -1,37 +0,0 @@
-'use strict';
-
-const { itemPath, isPathInScope } = require('../files.js');
-
-const changePath = (file) => file.newPath || file.oldPath || '';
-
-const filterChangeFiles = (files, paths) => {
-  if (!paths.length) return files;
-  const kept = [];
-  for (const file of files) {
-    if (isPathInScope(changePath(file), paths)) kept.push(file);
-  }
-  return kept;
-};
-
-const pushChangeFile = (files, seen, rel) => {
-  if (!rel || seen.has(rel)) return;
-  seen.add(rel);
-  files.push(rel);
-};
-
-const changeFiles = (items) => {
-  const files = [];
-  const seen = new Set();
-  for (const item of items) {
-    if (item.dep) {
-      const depFiles = item.dep.files ?? [];
-      for (const rel of depFiles) pushChangeFile(files, seen, rel);
-      continue;
-    }
-    const rel = itemPath(item);
-    pushChangeFile(files, seen, rel);
-  }
-  return files;
-};
-
-module.exports = { changePath, filterChangeFiles, changeFiles };