reslop 0.1.9 → 0.2.1

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.9",
+  "version": "0.2.1",
   "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.8"
+    "prettier": "^3.9.9"
   },
   "dependencies": {
     "metautil": "^5.5.2"

package/lib/deps/items.js

@@ -1,134 +0,0 @@
-'use strict';
-
-const { itemPath } = require('../files.js');
-
-const { depFileMeta, listFilePath } = 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 = listFilePath(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) {
-    const oldCount = summary.oldCount ?? 0;
-    const newCount = summary.newCount ?? 0;
-    if (oldCount === newCount) return [];
-    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 };

package/lib/deps/manifest.js

@@ -1,152 +0,0 @@
-'use strict';
-
-const path = require('node:path');
-
-const MANIFEST = 'package.json';
-const LOCKFILE = 'package-lock.json';
-const DEP_KIND = { [MANIFEST]: 'manifest', [LOCKFILE]: 'lockfile' };
-const SECTION_KEYS = [
-  'dependencies',
-  'devDependencies',
-  'optionalDependencies',
-  'peerDependencies',
-];
-
-const posixRel = (rel) => {
-  const raw = `${rel ?? ''}`;
-  return raw.replaceAll('\\', '/');
-};
-
-const depFileMeta = (rel) => {
-  const normalized = posixRel(rel);
-  if (!normalized) return null;
-  const base = path.posix.basename(normalized);
-  const kind = DEP_KIND[base];
-  if (!kind) return null;
-  const dir = path.posix.dirname(normalized);
-  return { kind, dir, base, rel: normalized };
-};
-
-const relOf = (dir, name) => (dir === '.' ? name : `${dir}/${name}`);
-
-const listFilePath = (rel) => {
-  const meta = depFileMeta(rel);
-  if (meta && meta.kind === 'lockfile') return relOf(meta.dir, MANIFEST);
-  return posixRel(rel);
-};
-
-const parseJson = (text) => {
-  if (!text || !`${text}`.trim()) return null;
-  try {
-    const data = JSON.parse(text);
-    if (!data || typeof data !== 'object' || Array.isArray(data)) return null;
-    return data;
-  } catch {
-    return null;
-  }
-};
-
-const emptySectionMaps = () => {
-  const maps = {};
-  for (const key of SECTION_KEYS) maps[key] = new Map();
-  return maps;
-};
-
-const readSectionMap = (pkg, key) => {
-  const map = new Map();
-  const raw = pkg ? pkg[key] : null;
-  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return map;
-  for (const name of Object.keys(raw)) {
-    const version = raw[name];
-    if (typeof version === 'string') map.set(name, version);
-  }
-  return map;
-};
-
-const readSections = (pkg) => {
-  const maps = emptySectionMaps();
-  if (!pkg) return maps;
-  for (const key of SECTION_KEYS) maps[key] = readSectionMap(pkg, key);
-  return maps;
-};
-
-const lockRootSections = (lock) => {
-  if (!lock) return emptySectionMaps();
-  const packages = lock.packages;
-  const root = packages && typeof packages === 'object' ? packages[''] : null;
-  const src = root && typeof root === 'object' ? root : lock;
-  return readSections(src);
-};
-
-const lockEntries = (lock) => {
-  const versions = new Map();
-  if (!lock) return versions;
-  const packages = lock.packages;
-  if (packages && typeof packages === 'object') {
-    for (const key of Object.keys(packages)) {
-      const entry = packages[key];
-      if (!key.startsWith('node_modules/')) continue;
-      if (key.includes('/node_modules/')) continue;
-      if (!entry || typeof entry.version !== 'string') continue;
-      const name = key.slice('node_modules/'.length);
-      versions.set(name, entry.version);
-    }
-  }
-  const deps = lock.dependencies;
-  if (!deps || typeof deps !== 'object') return versions;
-  for (const name of Object.keys(deps)) {
-    const entry = deps[name];
-    if (versions.has(name)) continue;
-    if (!entry || typeof entry.version !== 'string') continue;
-    versions.set(name, entry.version);
-  }
-  return versions;
-};
-
-const lockPackageCount = (lock) => {
-  if (!lock) return 0;
-  const packages = lock.packages;
-  if (packages && typeof packages === 'object') {
-    let count = 0;
-    for (const key of Object.keys(packages)) {
-      if (key !== '') count += 1;
-    }
-    return count;
-  }
-  const deps = lock.dependencies;
-  if (!deps || typeof deps !== 'object') return 0;
-  return Object.keys(deps).length;
-};
-
-const cloneJson = (value) => JSON.parse(JSON.stringify(value ?? null));
-
-const detectIndent = (text) => {
-  const match = /\n([ \t]+)"/.exec(text);
-  if (!match) return 2;
-  return match[1];
-};
-
-const stringifyJson = (value, original) => {
-  const indent = detectIndent(original || '');
-  const body = JSON.stringify(value, null, indent);
-  return `${body}\n`;
-};
-
-module.exports = {
-  MANIFEST,
-  LOCKFILE,
-  DEP_KIND,
-  SECTION_KEYS,
-  posixRel,
-  depFileMeta,
-  relOf,
-  listFilePath,
-  parseJson,
-  emptySectionMaps,
-  readSections,
-  lockRootSections,
-  lockEntries,
-  lockPackageCount,
-  cloneJson,
-  stringifyJson,
-};

package/lib/deps/merge.js

@@ -1,120 +0,0 @@
-'use strict';
-
-const manifest = require('./manifest.js');
-const { SECTION_KEYS, parseJson, cloneJson, stringifyJson } = manifest;
-
-const parseFieldValue = (text) => {
-  try {
-    return JSON.parse(text);
-  } catch {
-    return text;
-  }
-};
-
-const setSectionEntry = (pkg, section, name, version) => {
-  if (!version) {
-    const map = pkg[section];
-    if (!map || typeof map !== 'object') return;
-    delete map[name];
-    if (!Object.keys(map).length) delete pkg[section];
-    return;
-  }
-  const map = pkg[section];
-  if (!map || typeof map !== 'object') pkg[section] = {};
-  pkg[section][name] = version;
-};
-
-const dropsEntry = (change, side) => {
-  if (side === 'new') return change.action === 'removed';
-  return change.action === 'added';
-};
-
-const applyManifestChange = (pkg, change, side) => {
-  if (change.section === 'resolved') return pkg;
-  const value = side === 'new' ? change.to : change.from;
-  if (change.section === 'field') {
-    if (value === '') {
-      delete pkg[change.name];
-      return pkg;
-    }
-    pkg[change.name] = parseFieldValue(value);
-    return pkg;
-  }
-  const version = dropsEntry(change, side) ? '' : value;
-  setSectionEntry(pkg, change.section, change.name, version);
-  return pkg;
-};
-
-const ensureLockRoot = (lock) => {
-  if (!lock.packages || typeof lock.packages !== 'object') {
-    lock.packages = {};
-  }
-  const root = lock.packages[''];
-  if (!root || typeof root !== 'object') lock.packages[''] = {};
-  return lock.packages[''];
-};
-
-const lockNodeKey = (name) => `node_modules/${name}`;
-
-const applyLegacyLockDep = (lock, change, side, src) => {
-  const deps = lock.dependencies;
-  if (!deps || typeof deps !== 'object') return;
-  if (dropsEntry(change, side)) {
-    delete deps[change.name];
-    return;
-  }
-  const srcDeps = src && src.dependencies;
-  if (!srcDeps || typeof srcDeps !== 'object') return;
-  const entry = srcDeps[change.name];
-  if (entry) deps[change.name] = cloneJson(entry);
-};
-
-const applyLockChange = (lock, change, side, oldLock, newLock) => {
-  if (change.section === 'field') return lock;
-  const src = side === 'new' ? newLock : oldLock;
-  if (change.section !== 'resolved') {
-    const root = ensureLockRoot(lock);
-    applyManifestChange(root, change, side);
-    applyLegacyLockDep(lock, change, side, src);
-  }
-  const packages = lock.packages;
-  if (!packages || typeof packages !== 'object') return lock;
-  const key = lockNodeKey(change.name);
-  if (dropsEntry(change, side)) {
-    delete packages[key];
-    return lock;
-  }
-  const srcPkgs = src && src.packages;
-  if (!srcPkgs || typeof srcPkgs !== 'object') return lock;
-  const entry = srcPkgs[key];
-  if (entry) packages[key] = cloneJson(entry);
-  return lock;
-};
-
-const seedManifest = (oldObj, newObj) => {
-  const base = cloneJson(oldObj) || {};
-  if (!newObj) return base;
-  for (const key of Object.keys(newObj)) {
-    const value = newObj[key];
-    if (SECTION_KEYS.includes(key)) continue;
-    if (Object.hasOwn(base, key)) continue;
-    base[key] = cloneJson(value);
-  }
-  return base;
-};
-
-const mergeDepFile = (baseText, oldText, newText, change, side, kind) => {
-  const oldObj = parseJson(oldText);
-  const newObj = parseJson(newText);
-  const parsedBase = parseJson(baseText);
-  let base;
-  if (parsedBase) base = cloneJson(parsedBase);
-  else if (kind === 'manifest') base = seedManifest(oldObj, newObj);
-  else base = cloneJson(oldObj) || {};
-  if (kind === 'lockfile') applyLockChange(base, change, side, oldObj, newObj);
-  else applyManifestChange(base, change, side);
-  const original = baseText || newText || oldText || '';
-  return stringifyJson(base, original);
-};
-
-module.exports = { mergeDepFile };