reslop 0.2.5 → 0.2.6

package/lib/utilities.js

@@ -9,16 +9,12 @@ const IS_WIN = process.platform === 'win32';
 const DEFAULT_ENCODING = 'utf8';
 const DEFAULT_MAX_BUFFER = 32 * 1024 * 1024;
 
-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);
+  const major = Number(match[1]);
+  const minor = Number(match[2]);
+  const patch = Number(match[3]);
   return { major, minor, patch };
 };
 
@@ -47,20 +43,13 @@ const dateStamp = (date) => {
   return `${date.getFullYear()}-${month}-${pad2(date.getDate())}`;
 };
 
-const npmBin = (platform = process.platform) =>
-  platform === 'win32' ? 'npm.cmd' : 'npm';
+const npmBin = () => (IS_WIN ? '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);
@@ -91,69 +80,36 @@ const watchResize = (stdout, proc, onResize, signal) => {
   return stop;
 };
 
-const abortError = () => {
-  const error = new Error('aborted');
-  error.code = 'ABORT';
-  return error;
-};
+const codeError = (message, code) =>
+  Object.assign(new Error(message), { code });
 
-const isAbort = (error) => !!(error && error.code === 'ABORT');
+const abortError = () => codeError('aborted', 'ABORT');
 
-const asOutput = (value) => {
-  if (value === undefined || value === null) return '';
-  if (typeof value === 'string') return value;
-  return `${value}`;
-};
+const isAbort = (error) => !!(error && error.code === 'ABORT');
 
-const procResult = (values = {}) => {
-  const status = values.status ?? null;
-  const stdout = asOutput(values.stdout);
-  const stderr = asOutput(values.stderr);
-  const error = values.error ?? null;
-  return { status, stdout, stderr, error };
-};
+const procResult = (values = {}) => ({
+  status: values.status ?? null,
+  stdout: `${values.stdout ?? ''}`,
+  stderr: `${values.stderr ?? ''}`,
+  error: values.error ?? null,
+});
 
-const spawnOptions = (options = {}) => {
-  const encoding = options.encoding ?? DEFAULT_ENCODING;
-  const maxBuffer = options.maxBuffer ?? DEFAULT_MAX_BUFFER;
+const runProcSync = (cmd, args, options = {}) => {
   const opts = spawnBase({
     cwd: options.cwd,
     env: options.env,
-    encoding,
+    encoding: options.encoding ?? DEFAULT_ENCODING,
     input: options.input,
-    maxBuffer,
+    maxBuffer: options.maxBuffer ?? DEFAULT_MAX_BUFFER,
     timeout: options.timeout,
   });
   if (options.shell) opts.shell = true;
-  return opts;
-};
-
-const runProcSync = (cmd, args, options = {}) => {
-  const result = spawnSync(cmd, args, spawnOptions(options));
-  return procResult(result);
-};
-
-const attachOutput = (stream, encoding, onChunk) => {
-  if (!stream) return;
-  stream.setEncoding(encoding);
-  stream.on('data', onChunk);
-};
-
-const writeInput = (child, input) => {
-  if (!child.stdin) return;
-  try {
-    if (input) child.stdin.end(input);
-    else child.stdin.end();
-  } catch {
-    // closed
-  }
+  return procResult(spawnSync(cmd, args, opts));
 };
 
 const listenChild = (child, options, resolve) => {
   const encoding = options.encoding ?? DEFAULT_ENCODING;
   const maxBuffer = options.maxBuffer ?? DEFAULT_MAX_BUFFER;
-  const timeout = options.timeout;
-  const input = options.input;
   const signal = options.signal;
   let stdout = '';
   let stderr = '';
@@ -163,46 +119,49 @@ const listenChild = (child, options, resolve) => {
   const finish = (result) => {
     if (settled) return;
     settled = true;
-    if (timer) clearTimeout(timer);
-    timer = null;
-    if (signal && onAbort) {
-      signal.removeEventListener('abort', onAbort);
-    }
-    onAbort = null;
+    clearTimeout(timer);
+    if (signal) signal.removeEventListener('abort', onAbort);
     resolve(result);
   };
-  onAbort = () => {
+  const fail = (error) => {
     child.kill();
-    finish(procResult({ stdout, stderr, error: abortError() }));
+    finish(procResult({ stdout, stderr, error }));
   };
-  const append = (kind, chunk) => {
-    if (kind === 'out') stdout += chunk;
+  onAbort = () => fail(abortError());
+  const append = (chunk, isOut) => {
+    if (isOut) stdout += chunk;
     else stderr += chunk;
-    if (stdout.length + stderr.length <= maxBuffer) return;
-    child.kill();
-    const error = new Error('maxBuffer exceeded');
-    error.code = 'ENOBUFS';
-    finish(procResult({ stdout, stderr, error }));
+    if (stdout.length + stderr.length > maxBuffer) {
+      fail(codeError('maxBuffer exceeded', 'ENOBUFS'));
+    }
   };
   if (signal) signal.addEventListener('abort', onAbort);
-  if (timeout) {
-    timer = setTimeout(() => {
-      child.kill();
-      const error = new Error('timed out');
-      error.code = 'ETIMEDOUT';
-      finish(procResult({ stdout, stderr, error }));
-    }, timeout);
+  if (options.timeout) {
+    const onTimeout = () => fail(codeError('timed out', 'ETIMEDOUT'));
+    timer = setTimeout(onTimeout, options.timeout);
   }
   if (signal && signal.aborted) onAbort();
-  attachOutput(child.stdout, encoding, (chunk) => append('out', chunk));
-  attachOutput(child.stderr, encoding, (chunk) => append('err', chunk));
+  if (child.stdout) {
+    child.stdout.setEncoding(encoding);
+    child.stdout.on('data', (chunk) => append(chunk, true));
+  }
+  if (child.stderr) {
+    child.stderr.setEncoding(encoding);
+    child.stderr.on('data', (chunk) => append(chunk, false));
+  }
   child.on('error', (error) => {
     finish(procResult({ stdout, stderr, error }));
   });
   child.on('close', (status) => {
     finish(procResult({ status, stdout, stderr }));
   });
-  writeInput(child, input);
+  if (!child.stdin) return;
+  try {
+    if (options.input) child.stdin.end(options.input);
+    else child.stdin.end();
+  } catch {
+    // closed
+  }
 };
 
 const runProc = (cmd, args, options = {}) =>
@@ -238,7 +197,6 @@ module.exports = {
   npmBin,
   spawnBase,
   npmOpts,
-  clipTools,
   listen,
   watchResize,
   abortError,

package/lib/wrap.js

@@ -12,53 +12,37 @@ const wrapPlain = (text, width) => {
   let col = 0;
   let lastBreak = -1;
   let i = 0;
-  const slice = (from, to) => {
-    let out = '';
-    for (let k = from; k < to; k++) out += parts[k];
-    return out;
-  };
-  const flush = (end) => {
-    rows.push(slice(start, end));
-    start = end;
-    col = 0;
-    lastBreak = -1;
-  };
   while (i < parts.length) {
     const ch = parts[i];
     const w = graphemeWidth(ch, col);
     if (col + w > width && col > 0) {
-      if (lastBreak >= start) {
-        flush(lastBreak + 1);
-        i = start;
-        continue;
-      }
-      flush(i);
+      const end = lastBreak >= start ? lastBreak + 1 : i;
+      rows.push(parts.slice(start, end).join(''));
+      start = end;
+      i = end;
+      col = 0;
+      lastBreak = -1;
       continue;
     }
     col += w;
     if (ch === ' ' || ch === '\t') lastBreak = i;
     i += 1;
   }
-  rows.push(slice(start, parts.length));
+  rows.push(parts.slice(start).join(''));
   return rows;
 };
 
 const wrapDoc = (text, width) => {
   const rows = [];
-  const parts = text.split('\n');
   let offset = 0;
-  for (let p = 0; p < parts.length; p++) {
-    const part = parts[p];
-    const wrapped = wrapPlain(part, width);
-    let used = 0;
-    for (const row of wrapped) {
-      rows.push({ start: offset + used, text: row });
-      used += row.length;
+  for (const part of text.split('\n')) {
+    let start = offset;
+    for (const row of wrapPlain(part, width)) {
+      rows.push({ start, text: row });
+      start += row.length;
     }
-    offset += part.length;
-    if (p < parts.length - 1) offset += 1;
+    offset += part.length + 1;
   }
-  if (!rows.length) rows.push({ start: 0, text: '' });
   return rows;
 };
 
@@ -69,9 +53,8 @@ const cursorInWrap = (text, cursor, width) => {
   const rows = wrapDoc(text, width);
   const clamped = Math.max(0, Math.min(cursor, text.length));
   let row = rows.length - 1;
-  for (let i = 0; i < rows.length; i++) {
-    const next = i + 1 < rows.length ? rows[i + 1].start : text.length + 1;
-    if (clamped < next) {
+  for (let i = 0; i < rows.length - 1; i++) {
+    if (clamped < rows[i + 1].start) {
       row = i;
       break;
     }
@@ -81,30 +64,25 @@ const cursorInWrap = (text, cursor, width) => {
   return { row, col: visibleWidth(line.text.slice(0, take)) };
 };
 
-const indexAtRow = (start, text, col) => {
-  const raw = `${text ?? ''}`;
-  if (col <= 0) return start;
+const colIndex = (text, col) => {
   let used = 0;
-  let idx = 0;
-  for (const ch of graphemes(raw)) {
+  let index = 0;
+  for (const ch of graphemes(text)) {
     const w = graphemeWidth(ch, used);
     if (used + w > col) break;
     used += w;
-    idx += ch.length;
+    index += ch.length;
   }
-  return start + idx;
+  return index;
+};
+
+const indexAtRow = (start, text, col) => {
+  if (col <= 0) return start;
+  return start + colIndex(`${text ?? ''}`, col);
 };
 
 const indexAtWrapCol = (row, col, limit) => {
-  let used = 0;
-  let idx = 0;
-  for (const ch of graphemes(row.text)) {
-    const w = graphemeWidth(ch, used);
-    if (used + w > col) break;
-    used += w;
-    idx += ch.length;
-  }
-  const pos = row.start + idx;
+  const pos = row.start + colIndex(row.text, col);
   if (pos < limit) return pos;
   if (pos <= row.start) return row.start;
   const parts = graphemes(row.text);
@@ -114,15 +92,11 @@ const indexAtWrapCol = (row, col, limit) => {
 const wrapMove = (text, cursor, width, delta, wantCol) => {
   const rows = wrapDoc(text, width);
   const pos = cursorInWrap(text, cursor, width);
-  let next = pos.row + delta;
-  if (next < 0) next = 0;
-  if (next >= rows.length) next = rows.length - 1;
+  const next = Math.min(Math.max(pos.row + delta, 0), rows.length - 1);
   const col = wantCol ?? pos.col;
   if (next === pos.row) return { cursor, col };
-  const row = rows[next];
-  let limit = text.length + 1;
-  if (next + 1 < rows.length) limit = rows[next + 1].start;
-  return { cursor: indexAtWrapCol(row, col, limit), col };
+  const limit = next + 1 < rows.length ? rows[next + 1].start : text.length + 1;
+  return { cursor: indexAtWrapCol(rows[next], col, limit), col };
 };
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reslop",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Interactive code review and repair planning for AI-assisted changes",
   "keywords": [
     "code-review",