reslop 0.1.9 → 0.2.1

package/lib/deps/usage.js

@@ -1,68 +0,0 @@
-'use strict';
-
-const SOURCE_EXT = ['.js', '.mjs', '.cjs', '.ts', '.mts', '.cts'];
-const REQUIRE_SPEC = /require\(\s*['"]([^'"]+)['"]\s*\)/g;
-const FROM_SPEC = /\bfrom\s+['"]([^'"]+)['"]/g;
-const IMPORT_FILE = /import\s+['"]([^'"]+)['"]/g;
-const IMPORT_CALL = /import\(\s*['"]([^'"]+)['"]\s*\)/g;
-
-const toPackageName = (spec) => {
-  if (!spec || spec.startsWith('.') || spec.startsWith('/')) return '';
-  if (spec.startsWith('node:')) return '';
-  if (spec.startsWith('@')) {
-    const parts = spec.split('/');
-    if (parts.length < 2) return '';
-    return `${parts[0]}/${parts[1]}`;
-  }
-  return spec.split('/')[0];
-};
-
-const addSpec = (used, spec) => {
-  const name = toPackageName(spec);
-  if (name) used.add(name);
-};
-
-const addMatches = (used, text, pattern) => {
-  const matches = text.matchAll(pattern);
-  for (const match of matches) addSpec(used, match[1]);
-};
-
-const collectUsedFromText = (used, text) => {
-  addMatches(used, text, REQUIRE_SPEC);
-  addMatches(used, text, FROM_SPEC);
-  addMatches(used, text, IMPORT_FILE);
-  addMatches(used, text, IMPORT_CALL);
-};
-
-const collectUsedFromScripts = (used, scripts) => {
-  if (!scripts || typeof scripts !== 'object') return;
-  for (const script of Object.values(scripts)) {
-    const tokens = `${script}`.split(/[\s;&|]+/);
-    for (const token of tokens) {
-      if (!token || token.startsWith('-')) continue;
-      if (token === 'npx' || token === 'npm' || token === 'node') continue;
-      addSpec(used, token);
-    }
-  }
-};
-
-const pkgHasExportEntry = (pkg) => {
-  if (!pkg || typeof pkg !== 'object') return false;
-  const main = pkg.main;
-  if (typeof main === 'string' && main) return true;
-  const esm = pkg.module;
-  if (typeof esm === 'string' && esm) return true;
-  const exported = pkg.exports;
-  if (typeof exported === 'string' && exported) return true;
-  if (!exported || typeof exported !== 'object') return false;
-  if (Array.isArray(exported)) return exported.length > 0;
-  return Object.keys(exported).length > 0;
-};
-
-module.exports = {
-  SOURCE_EXT,
-  toPackageName,
-  collectUsedFromText,
-  collectUsedFromScripts,
-  pkgHasExportEntry,
-};

package/lib/deps/versions.js

@@ -1,119 +0,0 @@
-'use strict';
-
-const { SECTION_KEYS } = require('./manifest.js');
-
-const applyWantedRange = (declared, wanted) => {
-  if (!wanted) return declared ?? '';
-  if (!declared) return wanted;
-  if (/^(file:|git[+@:]|workspace:|https?:|npm:)/.test(declared)) {
-    return declared;
-  }
-  if (declared.includes(' ') || declared.includes('|')) return declared;
-  if (declared.includes('<') || declared.includes('>')) return declared;
-  const prefix = declared.startsWith('^') || declared.startsWith('~');
-  const mark = prefix ? declared[0] : '';
-  return `${mark}${wanted}`;
-};
-
-const findDeclared = (pkg, name, type) => {
-  if (type && SECTION_KEYS.includes(type)) {
-    const map = pkg[type];
-    if (map && typeof map[name] === 'string') {
-      return { section: type, version: map[name] };
-    }
-  }
-  for (const section of SECTION_KEYS) {
-    const map = pkg[section];
-    if (map && typeof map[name] === 'string') {
-      return { section, version: map[name] };
-    }
-  }
-  return null;
-};
-
-const VER_CORE = /^(\d+)\.(\d+)\.(\d+)/;
-
-const parseVer = (text) => {
-  const match = `${text}`.match(VER_CORE);
-  if (!match) return null;
-  const major = Number(match[1]);
-  const minor = Number(match[2]);
-  const patch = Number(match[3]);
-  return [major, minor, patch];
-};
-
-const fmtVer = (parts) => `${parts[0]}.${parts[1]}.${parts[2]}`;
-
-const cmpVer = (left, right) => {
-  if (left[0] !== right[0]) return left[0] - right[0];
-  if (left[1] !== right[1]) return left[1] - right[1];
-  return left[2] - right[2];
-};
-
-const bumpPatch = (parts) => {
-  const major = parts[0];
-  const minor = parts[1];
-  const patch = parts[2] + 1;
-  return [major, minor, patch];
-};
-
-const clauseUpper = (clause) => {
-  const pattern = /(<=?)\s*(\d+\.\d+\.\d+)/g;
-  const matches = clause.matchAll(pattern);
-  let best = null;
-  for (const match of matches) {
-    const op = match[1];
-    const parsed = parseVer(match[2]);
-    if (!parsed) continue;
-    if (best && cmpVer(parsed, best.ver) >= 0) continue;
-    best = { op, ver: parsed };
-  }
-  return best;
-};
-
-const patchedFromRange = (current, range) => {
-  if (!current || !range) return '';
-  const now = parseVer(current);
-  if (!now) return '';
-  const clauses = `${range}`.split('||');
-  for (const clause of clauses) {
-    const upper = clauseUpper(clause);
-    if (!upper) continue;
-    if (now[0] !== upper.ver[0]) continue;
-    if (cmpVer(now, upper.ver) > 0) continue;
-    if (upper.op === '<') return fmtVer(upper.ver);
-    return fmtVer(bumpPatch(upper.ver));
-  }
-  return '';
-};
-
-const sameMajor = (from, to) => {
-  const left = parseVer(from);
-  const right = parseVer(to);
-  if (!left || !right) return false;
-  return left[0] === right[0];
-};
-
-const proposedLockVersion = (current, vul) => {
-  if (!current) return '';
-  if (!vul) return current;
-  const fix = vul.fix;
-  if (fix && sameMajor(current, fix) && fix !== current) return fix;
-  const patched = patchedFromRange(current, vul.range);
-  if (patched && patched !== current) return patched;
-  return current;
-};
-
-const proposedWanted = (out, vul) => {
-  if (out && out.wanted && out.wanted !== out.current) return out.wanted;
-  if (vul && vul.fix) return vul.fix;
-  return '';
-};
-
-module.exports = {
-  applyWantedRange,
-  findDeclared,
-  patchedFromRange,
-  proposedLockVersion,
-  proposedWanted,
-};

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