reslop 0.2.7 → 0.3.1

package/lib/diff/display.js

@@ -1,9 +1,7 @@
 'use strict';
 
-const align = require('./align.js');
-const { isCtxType, attachInline, LAYOUT_ALIGN } = align;
-const patch = require('./patch.js');
-const { flattenBlock } = patch;
+const { isCtxType, attachInline, LAYOUT_ALIGN } = require('./align.js');
+const { flattenBlock } = require('./patch.js');
 
 const DISPLAY_CONTEXT = 3;
 
@@ -80,11 +78,37 @@ const blockAddText = (hunk, blockId) => {
   return parts.join('\n');
 };
 
+const countsOld = (line) => {
+  if (line.type === 'add' || line.synthetic === true) return false;
+  return line.type !== 'note' && line.type !== 'noteSep';
+};
+
+const countsNew = (line) => line.type !== 'del';
+
+const stampLineNumbers = (lines, hunk) => {
+  let oldNo = hunk && hunk.oldStart > 0 ? hunk.oldStart : 0;
+  let newNo = hunk && hunk.newStart > 0 ? hunk.newStart : 1;
+  return lines.map((line) => {
+    const next = { ...line };
+    if (line.type === 'note' || line.type === 'noteSep') return next;
+    if (countsOld(line)) {
+      if (oldNo > 0) next.oldNo = oldNo;
+      oldNo += 1;
+    }
+    if (countsNew(line)) {
+      next.newNo = newNo;
+      newNo += 1;
+    }
+    return next;
+  });
+};
+
 const displayLines = (hunk, blockId, layout = 'unified', radius, overlay) => {
   const flat = flattenBlock(hunk, blockId, 'new');
   const source = overlay ? replaceAdds(flat, overlay, blockId) : flat;
+  const numbered = stampLineNumbers(source, hunk);
   const around = radius ?? DISPLAY_CONTEXT;
-  const painted = attachInline(windowAroundBlock(source, blockId, around));
+  const painted = attachInline(windowAroundBlock(numbered, blockId, around));
   const alignRows = LAYOUT_ALIGN[layout];
   return alignRows ? alignRows(painted) : painted;
 };

package/lib/diff/inline.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const ansi = require('../ansi.js');
-const { graphemes } = ansi;
+const { graphemes } = require('../term/ansi.js');
 
 const LCS_CELL_LIMIT = 250000;
 const NOISY_TINY_SPANS = 6;
@@ -131,10 +130,9 @@ const opsSpans = (ops) => {
       newParts.push({ text: op.text, changed: op.type === 'add' });
     }
   }
-  return {
-    oldSpans: collapseSpans(oldParts),
-    newSpans: collapseSpans(newParts),
-  };
+  const oldSpans = collapseSpans(oldParts);
+  const newSpans = collapseSpans(newParts);
+  return { oldSpans, newSpans };
 };
 
 const joinAffix = (prefix, mid, suffix) => {
@@ -154,10 +152,9 @@ const diffTrimmed = (a, b, spansOfOps) => {
   const mid = whole ? wholeChanged(midA, midB) : spansOfOps(lcsOps(midA, midB));
   const prefix = a.slice(0, lo);
   const suffix = a.slice(hiA);
-  return {
-    oldSpans: joinAffix(prefix, mid.oldSpans, suffix),
-    newSpans: joinAffix(prefix, mid.newSpans, suffix),
-  };
+  const oldSpans = joinAffix(prefix, mid.oldSpans, suffix);
+  const newSpans = joinAffix(prefix, mid.newSpans, suffix);
+  return { oldSpans, newSpans };
 };
 
 const diffTokens = (a, b) => {
@@ -221,10 +218,9 @@ const refineWordOps = (ops) => {
     if (dels.length) oldParts.push({ text: dels.join(''), changed: true });
     if (adds.length) newParts.push({ text: adds.join(''), changed: true });
   }
-  return {
-    oldSpans: collapseSpans(oldParts),
-    newSpans: collapseSpans(newParts),
-  };
+  const oldSpans = collapseSpans(oldParts);
+  const newSpans = collapseSpans(newParts);
+  return { oldSpans, newSpans };
 };
 
 const opRuns = (ops) => {

package/lib/diff/items.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const patch = require('./patch.js');
-const { splitHunk, formatHunkHeader, formatPatch } = patch;
+const { splitHunk, formatHunkHeader, formatPatch } = require('./patch.js');
 
 const BINARY_ITEM = {
   hunk: null,
@@ -70,8 +69,11 @@ const itemsFromFiles = (files, origin) => {
 
 const refreshIndexPatches = (items, item) => {
   if (!item.hunk) return items;
-  const isPeer = (other) =>
-    other.hunk === item.hunk && other.file === item.file;
+  const isPeer = (other) => {
+    const sameHunk = other.hunk === item.hunk;
+    const sameFile = other.file === item.file;
+    return sameHunk && sameFile;
+  };
   const peers = items.filter(isPeer);
   const sides = {};
   for (const peer of peers) sides[peer.blockId] = indexSide(peer.origin);

package/lib/diff/patch.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const align = require('./align.js');
-const { isCtxType } = align;
+const { clamp } = require('../common/utilities.js');
+const { isCtxType } = require('./align.js');
 
 const LINE_MARK = { add: '+', del: '-' };
 
@@ -40,7 +40,11 @@ const flattenBlock = (hunk, blockId, contextSide) => {
     }
     const kept = sideOf(contextSide, line.blockId) === 'old' ? 'del' : 'add';
     if (line.type === kept) {
-      out.push({ type: 'ctx', text: line.text, noNl: line.noNl });
+      const type = 'ctx';
+      const { text, noNl } = line;
+      const synthetic = true;
+      const row = { type, text, noNl, synthetic };
+      out.push(row);
     }
   }
   return out;
@@ -72,10 +76,42 @@ const formatPatch = (file, hunk, blockId, contextSide) => {
   return `${parts.join('\n')}\n`;
 };
 
+const addBlockRange = (hunk, blockId) => {
+  let newLine = hunk.newStart;
+  let start = 0;
+  let count = 0;
+  for (const line of hunk.lines) {
+    if (line.type === 'del') {
+      if (line.blockId === blockId && start === 0) start = newLine;
+      continue;
+    }
+    if (line.type === 'add' && line.blockId === blockId) {
+      if (count === 0) start = newLine;
+      count += 1;
+    }
+    newLine += 1;
+  }
+  if (start === 0) start = hunk.newStart;
+  return { start, count };
+};
+
+const replaceBlockAdds = (content, hunk, blockId, text) => {
+  const range = addBlockRange(hunk, blockId);
+  const ended = content.endsWith('\n');
+  const body = ended ? content.slice(0, -1) : content;
+  const lines = content === '' ? [] : body.split('\n');
+  const from = clamp(range.start - 1, 0, lines.length);
+  const added = text === '' ? [] : text.split('\n');
+  lines.splice(from, range.count, ...added);
+  return lines.join('\n') + (ended ? '\n' : '');
+};
+
 module.exports = {
   splitHunk,
   flattenBlock,
   countSides,
   formatHunkHeader,
   formatPatch,
+  addBlockRange,
+  replaceBlockAdds,
 };

package/lib/diff/unit.js

@@ -1,9 +1,7 @@
 'use strict';
 
-const align = require('./align.js');
-const { attachInline } = align;
-const files = require('../files.js');
-const { listPath } = files;
+const { attachInline } = require('./align.js');
+const { listPath } = require('../common/files.js');
 
 const LCS_CELLS = 4000000;
 
@@ -75,6 +73,16 @@ const rowsFromAdds = (items) => {
   return rows;
 };
 
+const stampFileNumbers = (lines) => {
+  let newNo = 1;
+  for (const line of lines) {
+    if (line.type === 'del') continue;
+    line.newNo = newNo;
+    newNo += 1;
+  }
+  return lines;
+};
+
 const unitLines = (text, items) => {
   let rows = splitFile(text);
   if (!rows.length) rows = rowsFromAdds(items);
@@ -95,11 +103,14 @@ const unitLines = (text, items) => {
     out.push(tagged('del', del.text, del));
   }
   if (!out.length) out.push(tagged('ctx', '', NO_EXTRA));
-  return attachInline(out);
+  return stampFileNumbers(attachInline(out));
 };
 
-const sameBlock = (line, item) =>
-  line.item === item && line.blockId === item.blockId;
+const sameBlock = (line, item) => {
+  const sameItem = line.item === item;
+  const sameId = line.blockId === item.blockId;
+  return sameItem && sameId;
+};
 
 const changedLineRange = (lines, item, belongs) => {
   let start = -1;
@@ -187,25 +198,33 @@ const zipOps = (prev, next) => {
 };
 
 const lcsOps = (prev, next) => {
-  const dp = lcsTable(prev, next);
   const ops = [];
+  const limit = Math.min(prev.length, next.length);
+  let head = 0;
+  while (head < limit && prev[head] === next[head]) {
+    ops.push({ kind: 'eq', text: next[head] });
+    head += 1;
+  }
+  const left = head ? prev.slice(head) : prev;
+  const right = head ? next.slice(head) : next;
+  const dp = lcsTable(left, right);
   let i = 0;
   let j = 0;
-  while (i < prev.length && j < next.length) {
-    if (prev[i] === next[j]) {
-      ops.push({ kind: 'eq', text: next[j] });
+  while (i < left.length && j < right.length) {
+    if (left[i] === right[j]) {
+      ops.push({ kind: 'eq', text: right[j] });
       i += 1;
       j += 1;
     } else if (dp[i + 1][j] >= dp[i][j + 1]) {
       ops.push({ kind: 'del' });
       i += 1;
     } else {
-      ops.push({ kind: 'ins', text: next[j] });
+      ops.push({ kind: 'ins', text: right[j] });
       j += 1;
     }
   }
-  for (; i < prev.length; i++) ops.push({ kind: 'del' });
-  for (; j < next.length; j++) ops.push({ kind: 'ins', text: next[j] });
+  for (; i < left.length; i++) ops.push({ kind: 'del' });
+  for (; j < right.length; j++) ops.push({ kind: 'ins', text: right[j] });
   return ops;
 };
 
@@ -241,7 +260,7 @@ const pushDels = (out, base, at) => {
   return i;
 };
 
-const mergeEditRows = (base, nextTexts) => {
+const mergeRows = (base, nextTexts) => {
   const texts = nextTexts.length ? nextTexts : [''];
   const prev = [];
   for (const row of base) if (row.type !== 'del') prev.push(row.text);
@@ -259,7 +278,17 @@ const mergeEditRows = (base, nextTexts) => {
   }
   pushDels(out, base, at);
   if (!out.length) out.push(tagged('ctx', '', NO_EXTRA));
-  return attachEditSpans(attachInline(out));
+  return stampFileNumbers(attachEditSpans(attachInline(out)));
+};
+
+let merged = { base: null, text: '', rows: [] };
+
+const mergeEditRows = (base, nextTexts) => {
+  const text = nextTexts.join('\n');
+  if (merged.base === base && merged.text === text) return merged.rows;
+  const rows = mergeRows(base, nextTexts);
+  merged = { base, text, rows };
+  return rows;
 };
 
 module.exports = {

package/lib/{git-branches.js → git/branches.js}

@@ -4,12 +4,9 @@ const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
 
-const utilities = require('./utilities.js');
-const { oneLine } = utilities;
-const files = require('./files.js');
-const { shortAge } = files;
-const worktree = require('./git-worktree.js');
-const { requireOk, runGit, command, gitOp } = worktree;
+const { oneLine, trimText } = require('../common/utilities.js');
+const { shortAge } = require('../common/format.js');
+const { requireOk, runGit, command, gitOp } = require('./worktree.js');
 
 const BRANCH_FORMAT = [
   '%(HEAD)',
@@ -43,9 +40,7 @@ const AUTOSQUASH_ARGS = [
   '--interactive',
   '--autosquash',
 ];
-const REWORD_TODO = path.join(__dirname, 'git-reword-todo.js');
-
-const trimText = (value) => `${value ?? ''}`.trim();
+const REWORD_TODO = path.join(__dirname, 'reword-todo.js');
 
 const required = (value, message) => {
   const text = trimText(value);
@@ -60,9 +55,9 @@ const messageBody = (message) => {
   return text.endsWith('\n') ? text : `${text}\n`;
 };
 
-const commitMessage = (top, sha) => {
+const commitMessage = async (top, sha) => {
   const spec = trimText(sha) || 'HEAD';
-  const result = runGit(['log', '-1', '--format=%B', spec], top);
+  const result = await runGit(['log', '-1', '--format=%B', spec], top);
   return result.status === 0 ? result.stdout.trimEnd() : '';
 };
 
@@ -112,7 +107,7 @@ const statCount = (stat, word) => {
   return match ? parseInt(match[1], 10) : 0;
 };
 
-const listCommits = (top) => {
+const listCommits = async (top) => {
   const args = [
     'log',
     '-z',
@@ -120,7 +115,7 @@ const listCommits = (top) => {
     `--format=${COMMIT_FORMAT}`,
     `--max-count=${COMMIT_LIMIT}`,
   ];
-  const result = requireOk(runGit(args, top), 'log failed');
+  const result = requireOk(await runGit(args, top), 'log failed');
   const commits = [];
   for (const chunk of result.stdout.split('\0')) {
     const stat = STAT_LEAD.exec(chunk);
@@ -141,11 +136,10 @@ const parseTrack = (text) => {
   const raw = trimText(text).replace(/^\[|\]$/g, '');
   const ahead = /ahead (\d+)/.exec(raw);
   const behind = /behind (\d+)/.exec(raw);
-  return {
-    ahead: ahead ? Number(ahead[1]) : 0,
-    behind: behind ? Number(behind[1]) : 0,
-    gone: raw === 'gone',
-  };
+  const aheadCount = ahead ? Number(ahead[1]) : 0;
+  const behindCount = behind ? Number(behind[1]) : 0;
+  const gone = raw === 'gone';
+  return { ahead: aheadCount, behind: behindCount, gone };
 };
 
 const parseBranchLine = (line) => {
@@ -163,31 +157,33 @@ const parseBranchLine = (line) => {
   };
 };
 
-const defaultBranch = (top, names) => {
-  const result = runGit(['symbolic-ref', '--short', ORIGIN_HEAD], top);
+const defaultBranch = async (top, names) => {
+  const args = ['symbolic-ref', '--short', ORIGIN_HEAD];
+  const result = await runGit(args, top);
   const ref = result.status === 0 ? result.stdout.trim() : '';
-  const remote = ref.startsWith(ORIGIN_PREFIX)
-    ? ref.slice(ORIGIN_PREFIX.length)
-    : ref;
+  let remote = ref;
+  if (ref.startsWith(ORIGIN_PREFIX)) {
+    remote = ref.slice(ORIGIN_PREFIX.length);
+  }
   if (names.has(remote)) return remote;
   return DEFAULT_BRANCHES.find((name) => names.has(name)) ?? '';
 };
 
-const listBranches = (top) => {
+const listBranches = async (top) => {
   const args = ['for-each-ref', `--format=${BRANCH_FORMAT}`, 'refs/heads'];
-  const result = requireOk(runGit(args, top), 'branch failed');
+  const result = requireOk(await runGit(args, top), 'branch failed');
   const lines = result.stdout.split('\n').filter(Boolean);
   const branches = lines.map((line) => parseBranchLine(line)).filter(Boolean);
   const names = new Set(branches.map((entry) => entry.name));
-  const primary = defaultBranch(top, names);
+  const primary = await defaultBranch(top, names);
   return branches.map((entry) => ({
     ...entry,
     isDefault: entry.name === primary,
   }));
 };
 
-const hasStaged = (top) => {
-  const result = runGit(['diff', '--cached', '--quiet'], top);
+const hasStaged = async (top) => {
+  const result = await runGit(['diff', '--cached', '--quiet'], top);
   return result.status === 1;
 };
 
@@ -243,6 +239,24 @@ const commitOp = gitOp(function* (kind, message) {
   requireOk(result);
 });
 
+const updateOp = gitOp(function* (sha) {
+  const commit = yield* resolveCommit(required(sha, 'empty commit'));
+  const head = yield* resolveCommit('HEAD');
+  if (commit === head) {
+    const result = yield command(['commit', '--amend', '--no-edit']);
+    return void requireOk(result);
+  }
+  const fixed = yield command(['commit', '--fixup', commit]);
+  requireOk(fixed);
+  const range = yield* rebaseRange(commit);
+  try {
+    yield* rebase([...AUTOSQUASH_ARGS, ...range]);
+  } catch (error) {
+    yield command(['reset', '--soft', 'HEAD~1']);
+    throw error;
+  }
+});
+
 const dropCommitOp = gitOp(function* (sha) {
   const target = yield* resolveCommit(required(sha, 'empty commit'));
   const parent = yield command(['rev-parse', '--verify', `${target}^`]);
@@ -363,24 +377,15 @@ module.exports = {
   listCommits,
   listBranches,
   hasStaged,
-  checkoutBranch: checkoutOp.sync,
-  checkoutBranchAsync: checkoutOp.async,
-  createBranch: createOp.sync,
-  createBranchAsync: createOp.async,
-  rebaseBranch: rebaseOp.sync,
-  rebaseBranchAsync: rebaseOp.async,
-  dropBranch: dropBranchOp.sync,
-  dropBranchAsync: dropBranchOp.async,
-  dropCommit: dropCommitOp.sync,
-  dropCommitAsync: dropCommitOp.async,
-  applyFixup: fixupOp.sync,
-  applyFixupAsync: fixupOp.async,
-  rewordCommit: rewordOp.sync,
-  rewordCommitAsync: rewordOp.async,
-  pullChanges: pullOp.sync,
-  pullChangesAsync: pullOp.async,
-  pushChanges: pushOp.sync,
-  pushChangesAsync: pushOp.async,
-  commitChanges: commitOp.sync,
-  commitChangesAsync: commitOp.async,
+  checkoutBranch: checkoutOp,
+  createBranch: createOp,
+  rebaseBranch: rebaseOp,
+  dropBranch: dropBranchOp,
+  dropCommit: dropCommitOp,
+  applyFixup: fixupOp,
+  rewordCommit: rewordOp,
+  pullChanges: pullOp,
+  pushChanges: pushOp,
+  commitChanges: commitOp,
+  updateCommit: updateOp,
 };