reslop 0.1.8 → 0.2.0

package/lib/{git/proc.js → utilities.js}

@@ -1,15 +1,75 @@
 'use strict';
 
 const { spawn, spawnSync } = require('node:child_process');
+const { split } = require('metautil');
 
-const { spawnBase } = require('../sys.js');
-
+const IS_WIN = process.platform === 'win32';
 const DEFAULT_ENCODING = 'utf8';
 const DEFAULT_MAX_BUFFER = 32 * 1024 * 1024;
 
-const oneLine = (text, fallback = 'failed') => {
-  const line = `${text ?? ''}`.trim().split('\n')[0];
-  return line || fallback;
+const UNIX_CLIP = [
+  { cmd: 'wl-copy', args: [] },
+  { cmd: 'xclip', args: ['-selection', 'clipboard'] },
+  { cmd: 'xsel', args: ['--clipboard', '--input'] },
+];
+
+const parseVersion = (text) => {
+  const match = /^(\d+)\.(\d+)\.(\d+)/.exec(`${text ?? ''}`);
+  if (!match) return null;
+  const [, major, minor, patch] = match.map(Number);
+  return { major, minor, patch };
+};
+
+const cmpVersion = (left, right) =>
+  left.major - right.major ||
+  left.minor - right.minor ||
+  left.patch - right.patch;
+
+const oneLine = (text, fallback = '') =>
+  split(`${text ?? ''}`.trim(), '\n')[0] || fallback;
+
+const npmBin = (platform = process.platform) =>
+  platform === 'win32' ? 'npm.cmd' : 'npm';
+
+const spawnBase = (extra = {}) => ({ windowsHide: true, ...extra });
+
+const npmOpts = (extra = {}, platform = process.platform) =>
+  spawnBase({ shell: platform === 'win32', ...extra });
+
+const clipTools = (platform = process.platform) => {
+  if (platform === 'win32') return [{ cmd: 'clip', args: [] }];
+  if (platform === 'darwin') return [{ cmd: 'pbcopy', args: [] }];
+  return UNIX_CLIP;
+};
+
+const listen = (emitter, event, handler) => {
+  if (!emitter || typeof emitter.on !== 'function') return () => {};
+  emitter.on(event, handler);
+  return () => {
+    if (typeof emitter.removeListener === 'function') {
+      return void emitter.removeListener(event, handler);
+    }
+    if (typeof emitter.off === 'function') emitter.off(event, handler);
+  };
+};
+
+const watchResize = (stdout, proc, onResize, signal) => {
+  const stopStdout = listen(stdout, 'resize', onResize);
+  let stopProc = () => {};
+  try {
+    stopProc = listen(proc, 'SIGWINCH', onResize);
+  } catch {
+    // SIGWINCH is not available on Windows
+  }
+  const stop = () => {
+    stopStdout();
+    stopProc();
+  };
+  if (signal) {
+    if (signal.aborted) stop();
+    else signal.addEventListener('abort', stop, { once: true });
+  }
+  return stop;
 };
 
 const abortError = () => {
@@ -51,12 +111,7 @@ const spawnOptions = (options = {}) => {
 
 const runProcSync = (cmd, args, options = {}) => {
   const result = spawnSync(cmd, args, spawnOptions(options));
-  return procResult({
-    status: result.status,
-    stdout: result.stdout,
-    stderr: result.stderr,
-    error: result.error,
-  });
+  return procResult(result);
 };
 
 const attachOutput = (stream, encoding, onChunk) => {
@@ -151,9 +206,18 @@ const runProc = (cmd, args, options = {}) =>
   });
 
 module.exports = {
+  IS_WIN,
   DEFAULT_ENCODING,
   DEFAULT_MAX_BUFFER,
+  parseVersion,
+  cmpVersion,
   oneLine,
+  npmBin,
+  spawnBase,
+  npmOpts,
+  clipTools,
+  listen,
+  watchResize,
   abortError,
   isAbort,
   procResult,

package/lib/wrap.js

@@ -2,8 +2,6 @@
 
 const { graphemes, graphemeWidth, visibleWidth } = require('./ansi.js');
 
-const isWrapBreak = (ch) => ch === ' ' || ch === '\t';
-
 const wrapPlain = (text, width) => {
   if (width <= 0) return [''];
   if (visibleWidth(text) <= width) return [text];
@@ -36,7 +34,7 @@ const wrapPlain = (text, width) => {
       continue;
     }
     col += w;
-    if (isWrapBreak(ch)) lastBreak = i;
+    if (ch === ' ' || ch === '\t') lastBreak = i;
     i += 1;
   }
   rows.push(slice(start, parts.length));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reslop",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "description": "Interactive code review and repair planning for AI-assisted changes",
   "keywords": [
     "code-review",
@@ -59,7 +59,7 @@
     "eslint": "^9.39.4",
     "eslint-config-metarhia": "^9.1.9",
     "metaskills": "^1.0.5",
-    "prettier": "^3.9.7"
+    "prettier": "^3.9.8"
   },
   "dependencies": {
     "metautil": "^5.5.2"

package/lib/deps/changes.js

@@ -1,331 +0,0 @@
-'use strict';
-
-const { itemPath } = require('../files.js');
-
-const manifest = require('./manifest.js');
-const { MANIFEST, LOCKFILE, SECTION_KEYS, depFileMeta, relOf } = manifest;
-const { parseJson, readSections, emptySectionMaps } = manifest;
-const { lockRootSections, lockEntries, lockPackageCount } = manifest;
-
-const SECTION_ORDER = [...SECTION_KEYS, 'resolved', 'field'];
-const ACTION_ORDER = ['added', 'removed', 'changed', 'vulnerable'];
-const SECTION_NAMES = SECTION_KEYS.join('|');
-const SECTION_OPEN = new RegExp(`^\\s*"(${SECTION_NAMES})"\\s*:\\s*\\{\\s*$`);
-const SECTION_END = /^\s*\},?\s*$/;
-const DEP_ENTRY = /^\s*"([^"]+)"\s*:\s*"([^"]*)"\s*,?\s*$/;
-
-const diffMaps = (oldMap, newMap, section) => {
-  const keys = [...oldMap.keys(), ...newMap.keys()];
-  const names = [...new Set(keys)];
-  names.sort();
-  const changes = [];
-  for (const name of names) {
-    const from = oldMap.has(name) ? oldMap.get(name) : '';
-    const to = newMap.has(name) ? newMap.get(name) : '';
-    if (from === to) continue;
-    let action = 'changed';
-    if (!oldMap.has(name)) action = 'added';
-    else if (!newMap.has(name)) action = 'removed';
-    changes.push({ name, section, action, from, to });
-  }
-  return changes;
-};
-
-const diffSections = (oldMaps, newMaps) => {
-  const changes = [];
-  for (const key of SECTION_KEYS) {
-    const found = diffMaps(oldMaps[key], newMaps[key], key);
-    for (const change of found) changes.push(change);
-  }
-  return changes;
-};
-
-const fieldText = (value) => {
-  if (value === undefined) return '';
-  if (typeof value === 'string') return value;
-  return JSON.stringify(value);
-};
-
-const sameJson = (left, right) =>
-  JSON.stringify(left) === JSON.stringify(right);
-
-const diffOtherFields = (oldPkg, newPkg) => {
-  if (!oldPkg && !newPkg) return [];
-  const oldObj = oldPkg ?? {};
-  const newObj = newPkg ?? {};
-  const keys = [...Object.keys(oldObj), ...Object.keys(newObj)];
-  const names = [...new Set(keys)];
-  names.sort();
-  const changes = [];
-  for (const name of names) {
-    if (SECTION_KEYS.includes(name)) continue;
-    const prev = oldObj[name];
-    const next = newObj[name];
-    if (sameJson(prev, next)) continue;
-    let action = 'changed';
-    if (!Object.hasOwn(oldObj, name)) action = 'added';
-    else if (!Object.hasOwn(newObj, name)) action = 'removed';
-    const from = fieldText(prev);
-    const to = fieldText(next);
-    const section = 'field';
-    changes.push({ name, section, action, from, to });
-  }
-  return changes;
-};
-
-const onlyDepEdits = (items) => {
-  if (!items.length) return false;
-  for (const item of items) {
-    if (!item.hunk) return false;
-    const blockId = item.blockId;
-    const scoped = typeof blockId === 'number';
-    let section = '';
-    for (const line of item.hunk.lines) {
-      const open = SECTION_OPEN.exec(line.text);
-      let nextSection = section;
-      if (open) nextSection = open[1];
-      else if (section && SECTION_END.test(line.text)) nextSection = '';
-      const inBlock = !scoped || line.blockId === blockId;
-      if (inBlock && line.type !== 'ctx') {
-        const inDep = !!(open || section);
-        if (!inDep) return false;
-        const isEntry = DEP_ENTRY.test(line.text);
-        const isClose = SECTION_END.test(line.text);
-        if (!open && !isEntry && !isClose) return false;
-      }
-      section = nextSection;
-    }
-  }
-  return true;
-};
-
-const mapsFromHunks = (items) => {
-  const oldMaps = emptySectionMaps();
-  const newMaps = emptySectionMaps();
-  let section = '';
-  for (const item of items) {
-    if (!item.hunk) continue;
-    for (const line of item.hunk.lines) {
-      const open = SECTION_OPEN.exec(line.text);
-      if (open) {
-        section = open[1];
-        continue;
-      }
-      if (section && SECTION_END.test(line.text)) {
-        section = '';
-        continue;
-      }
-      if (!section) continue;
-      const entry = DEP_ENTRY.exec(line.text);
-      if (!entry) continue;
-      const name = entry[1];
-      const version = entry[2];
-      if (line.type === 'del' || line.type === 'ctx') {
-        oldMaps[section].set(name, version);
-      }
-      if (line.type === 'add' || line.type === 'ctx') {
-        newMaps[section].set(name, version);
-      }
-    }
-  }
-  return { oldMaps, newMaps };
-};
-
-const directNames = (oldMaps, newMaps) => {
-  const names = new Set();
-  for (const key of SECTION_KEYS) {
-    for (const name of oldMaps[key].keys()) names.add(name);
-    for (const name of newMaps[key].keys()) names.add(name);
-  }
-  return names;
-};
-
-const mergeResolved = (changes, oldResolved, newResolved, oldMaps, newMaps) => {
-  const seen = new Set();
-  const merged = [];
-  for (const change of changes) {
-    seen.add(change.name);
-    const resolvedFrom = oldResolved.get(change.name) ?? '';
-    const resolvedTo = newResolved.get(change.name) ?? '';
-    merged.push({ ...change, resolvedFrom, resolvedTo });
-  }
-  const names = [...directNames(oldMaps, newMaps)];
-  names.sort();
-  for (const name of names) {
-    if (seen.has(name)) continue;
-    const from = oldResolved.get(name) ?? '';
-    const to = newResolved.get(name) ?? '';
-    if (from === to) continue;
-    if (!from && !to) continue;
-    let action = 'changed';
-    if (!from) action = 'added';
-    else if (!to) action = 'removed';
-    const section = 'resolved';
-    const resolvedFrom = from;
-    const resolvedTo = to;
-    merged.push({ name, section, action, from, to, resolvedFrom, resolvedTo });
-  }
-  return merged;
-};
-
-const compareChangeOrder = (left, right) => {
-  const section = SECTION_ORDER.indexOf(left.section);
-  const other = SECTION_ORDER.indexOf(right.section);
-  if (section !== other) return section - other;
-  const leftAction = ACTION_ORDER.indexOf(left.action);
-  const rightAction = ACTION_ORDER.indexOf(right.action);
-  if (leftAction !== rightAction) return leftAction - rightAction;
-  return left.name.localeCompare(right.name);
-};
-
-const orderedChanges = (changes) => [...changes].sort(compareChangeOrder);
-
-const kindItems = (items, kind) => {
-  const matched = [];
-  for (const item of items) {
-    const rel = itemPath(item);
-    const meta = depFileMeta(rel);
-    if (meta && meta.kind === kind) matched.push(item);
-  }
-  return matched;
-};
-
-const readGroupSnapshot = (group, readSides) => {
-  const origin = group.origin;
-  const dir = group.dir;
-  const groupItems = group.items;
-  const manifestItems = kindItems(groupItems, 'manifest');
-  const lockItems = kindItems(groupItems, 'lockfile');
-  const manifestRel = relOf(dir, MANIFEST);
-  const lockRel = relOf(dir, LOCKFILE);
-  const manifestSides = readSides(origin, manifestRel);
-  const lockSides = readSides(origin, lockRel);
-  const oldPkg = parseJson(manifestSides.oldText);
-  const newPkg = parseJson(manifestSides.newText);
-  const oldLock = parseJson(lockSides.oldText);
-  const newLock = parseJson(lockSides.newText);
-  const parsedManifest = !!(oldPkg || newPkg);
-  return {
-    origin,
-    dir,
-    groupItems,
-    manifestItems,
-    lockItems,
-    oldPkg,
-    newPkg,
-    oldLock,
-    newLock,
-    parsedManifest,
-  };
-};
-
-const sectionMapsOf = (snapshot) => {
-  if (snapshot.parsedManifest) {
-    const oldMaps = readSections(snapshot.oldPkg);
-    const newMaps = readSections(snapshot.newPkg);
-    return { oldMaps, newMaps };
-  }
-  if (snapshot.manifestItems.length) {
-    return mapsFromHunks(snapshot.manifestItems);
-  }
-  const oldMaps = lockRootSections(snapshot.oldLock);
-  const newMaps = lockRootSections(snapshot.newLock);
-  return { oldMaps, newMaps };
-};
-
-const comparedChanges = (snapshot) => {
-  const maps = sectionMapsOf(snapshot);
-  const oldMaps = maps.oldMaps;
-  const newMaps = maps.newMaps;
-  const manifestChanges = diffSections(oldMaps, newMaps);
-  const parsed = snapshot.parsedManifest;
-  let otherChanges = [];
-  if (parsed) {
-    otherChanges = diffOtherFields(snapshot.oldPkg, snapshot.newPkg);
-  }
-  const oldResolved = lockEntries(snapshot.oldLock);
-  const newResolved = lockEntries(snapshot.newLock);
-  const changes = mergeResolved(
-    manifestChanges,
-    oldResolved,
-    newResolved,
-    oldMaps,
-    newMaps,
-  );
-  const oldCount = lockPackageCount(snapshot.oldLock);
-  const newCount = lockPackageCount(snapshot.newLock);
-  return { changes, otherChanges, oldCount, newCount };
-};
-
-const foldingPolicy = (snapshot, compared) => {
-  const foldLock = snapshot.lockItems.length > 0;
-  const hasDepChanges = compared.changes.length > 0;
-  if (!snapshot.manifestItems.length) {
-    const foldManifest = false;
-    const takeAllManifest = false;
-    return { foldLock, foldManifest, takeAllManifest };
-  }
-  if (snapshot.parsedManifest) {
-    const foldManifest = hasDepChanges;
-    const takeAllManifest = hasDepChanges && compared.otherChanges.length === 0;
-    return { foldLock, foldManifest, takeAllManifest };
-  }
-  const foldManifest = hasDepChanges && onlyDepEdits(snapshot.manifestItems);
-  const takeAllManifest = foldManifest;
-  return { foldLock, foldManifest, takeAllManifest };
-};
-
-const summarizeGroup = (group, readSides) => {
-  const snapshot = readGroupSnapshot(group, readSides);
-  const compared = comparedChanges(snapshot);
-  const policy = foldingPolicy(snapshot, compared);
-  return {
-    changes: compared.changes,
-    oldCount: compared.oldCount,
-    newCount: compared.newCount,
-    foldLock: policy.foldLock,
-    foldManifest: policy.foldManifest,
-    takeAllManifest: policy.takeAllManifest,
-    manifestItems: snapshot.manifestItems,
-    lockItems: snapshot.lockItems,
-    pkg: snapshot.newPkg || snapshot.oldPkg,
-  };
-};
-
-const collectGroups = (items) => {
-  const groups = new Map();
-  for (const item of items) {
-    const rel = itemPath(item);
-    const meta = depFileMeta(rel);
-    if (!meta) continue;
-    const key = `${item.origin}\0${meta.dir}`;
-    let group = groups.get(key);
-    if (!group) {
-      const dir = meta.dir;
-      const origin = item.origin;
-      group = { dir, origin, items: [] };
-      groups.set(key, group);
-    }
-    group.items.push(item);
-  }
-  return groups;
-};
-
-const takeManifestItems = (summary) => {
-  if (!summary.foldManifest) return [];
-  if (summary.takeAllManifest) return [...summary.manifestItems];
-  const taken = [];
-  for (const item of summary.manifestItems) {
-    if (onlyDepEdits([item])) taken.push(item);
-  }
-  return taken;
-};
-
-module.exports = {
-  diffSections,
-  mergeResolved,
-  orderedChanges,
-  summarizeGroup,
-  collectGroups,
-  takeManifestItems,
-};

package/lib/deps/items.js

@@ -1,131 +0,0 @@
-'use strict';
-
-const { itemPath } = require('../files.js');
-
-const { depFileMeta } = require('./manifest.js');
-const { orderedChanges } = require('./changes.js');
-const { buildRows, makeHunk } = require('./rows.js');
-
-const uniquePaths = (items) => {
-  const files = [];
-  const seen = new Set();
-  for (const item of items) {
-    const rel = itemPath(item);
-    if (!rel || seen.has(rel)) continue;
-    seen.add(rel);
-    files.push(rel);
-  }
-  return files;
-};
-
-const filesForChange = (change, files) => {
-  const manifest = [];
-  const lockfile = [];
-  for (const rel of files) {
-    const meta = depFileMeta(rel);
-    if (!meta) continue;
-    if (meta.kind === 'manifest') manifest.push(rel);
-    else lockfile.push(rel);
-  }
-  if (change.section === 'field') {
-    if (manifest.length) return manifest;
-    return files;
-  }
-  if (change.section === 'resolved') {
-    if (lockfile.length) return lockfile;
-    return files;
-  }
-  if (change.propose) {
-    if (manifest.length) return manifest;
-    return files;
-  }
-  const both = [...manifest, ...lockfile];
-  if (both.length) return both;
-  return files;
-};
-
-const pickPrimary = (items) => {
-  for (const item of items) {
-    const rel = itemPath(item);
-    const meta = depFileMeta(rel);
-    if (meta && meta.kind === 'manifest') return item;
-  }
-  return items[0];
-};
-
-const makeDepItem = (origin, fileItems, hidden, change, extra, blockId) => {
-  const allFiles = uniquePaths(fileItems);
-  const files = change ? filesForChange(change, allFiles) : allFiles;
-  const primary = pickPrimary(fileItems);
-  const oldPath = itemPath(primary);
-  const newPath = oldPath;
-  const isNew = fileItems.some((item) => item.file && item.file.isNew);
-  const isDeleted = fileItems.every((item) => item.file && item.file.isDeleted);
-  let oldCount = 0;
-  let newCount = 0;
-  if (!change) {
-    oldCount = extra.oldCount ?? 0;
-    newCount = extra.newCount ?? 0;
-  }
-  const rows = buildRows(change, oldCount, newCount);
-  const hunk = makeHunk(rows, blockId);
-  const isBinary = false;
-  const preamble = [];
-  const hunks = [hunk];
-  const file = {
-    oldPath,
-    newPath,
-    isNew,
-    isDeleted,
-    isBinary,
-    preamble,
-    hunks,
-  };
-  const patchAdd = '';
-  const patchRevert = '';
-  const items = hidden;
-  const dep = { files, items, change };
-  const reload = !!(change && change.propose);
-  return { origin, file, hunk, blockId, patchAdd, patchRevert, dep, reload };
-};
-
-const makeDepItems = (origin, fileItems, hidden, summary) => {
-  const ordered = orderedChanges(summary.changes);
-  if (!ordered.length) {
-    return [makeDepItem(origin, fileItems, hidden, null, summary, 0)];
-  }
-  const items = [];
-  let blockId = 0;
-  for (const change of ordered) {
-    const made = makeDepItem(
-      origin,
-      fileItems,
-      hidden,
-      change,
-      summary,
-      blockId,
-    );
-    items.push(made);
-    blockId += 1;
-  }
-  return items;
-};
-
-const stubFileItem = (rel, origin) => {
-  const file = {
-    oldPath: rel,
-    newPath: rel,
-    isNew: false,
-    isDeleted: false,
-    isBinary: false,
-    preamble: [],
-    hunks: [],
-  };
-  const hunk = null;
-  const blockId = 0;
-  const patchAdd = '';
-  const patchRevert = '';
-  return { origin, file, hunk, blockId, patchAdd, patchRevert };
-};
-
-module.exports = { makeDepItems, stubFileItem };