reslop 0.2.4 → 0.2.6

package/lib/diff/patch.js

@@ -3,14 +3,7 @@
 const align = require('./align.js');
 const { isCtxType } = align;
 
-const LINE_MARK = {
-  add: '+',
-  del: '-',
-  ctx: ' ',
-  warn: ' ',
-  note: ' ',
-  noteSep: ' ',
-};
+const LINE_MARK = { add: '+', del: '-' };
 
 const splitHunk = (hunk) => {
   const { oldStart, oldCount, newStart, newCount, header } = hunk;
@@ -33,9 +26,8 @@ const splitHunk = (hunk) => {
   return { hunk: nextHunk, blocks };
 };
 
-const otherContext = (contextSide, blockId) => {
-  if (contextSide === 'new') return 'new';
-  if (contextSide === 'old') return 'old';
+const sideOf = (contextSide, blockId) => {
+  if (typeof contextSide === 'string') return contextSide;
   return contextSide[blockId] ?? 'old';
 };
 
@@ -46,12 +38,8 @@ const flattenBlock = (hunk, blockId, contextSide) => {
       out.push(line);
       continue;
     }
-    const side = otherContext(contextSide, line.blockId);
-    if (side === 'old' && line.type === 'del') {
-      out.push({ type: 'ctx', text: line.text, noNl: line.noNl });
-      continue;
-    }
-    if (side === 'new' && line.type === 'add') {
+    const kept = sideOf(contextSide, line.blockId) === 'old' ? 'del' : 'add';
+    if (line.type === kept) {
       out.push({ type: 'ctx', text: line.text, noNl: line.noNl });
     }
   }
@@ -62,8 +50,8 @@ const countSides = (lines) => {
   let oldCount = 0;
   let newCount = 0;
   for (const line of lines) {
-    if (isCtxType(line.type) || line.type === 'del') oldCount += 1;
-    if (isCtxType(line.type) || line.type === 'add') newCount += 1;
+    if (line.type !== 'add') oldCount += 1;
+    if (line.type !== 'del') newCount += 1;
   }
   return { oldCount, newCount };
 };
@@ -71,24 +59,15 @@ const countSides = (lines) => {
 const formatHunkHeader = (oldStart, oldCount, newStart, newCount) =>
   `@@ -${oldStart},${oldCount} +${newStart},${newCount} @@`;
 
-const formatBodyLine = (line) => {
-  const rows = [`${LINE_MARK[line.type] ?? ' '}${line.text}`];
-  if (line.noNl) rows.push('\');
-  return rows;
-};
-
 const formatPatch = (file, hunk, blockId, contextSide) => {
   const lines = flattenBlock(hunk, blockId, contextSide);
-  const counts = countSides(lines);
-  const header = formatHunkHeader(
-    hunk.oldStart,
-    counts.oldCount,
-    hunk.newStart,
-    counts.newCount,
-  );
+  const { oldCount, newCount } = countSides(lines);
+  const { oldStart, newStart } = hunk;
+  const header = formatHunkHeader(oldStart, oldCount, newStart, newCount);
   const parts = [...file.preamble, header];
   for (const line of lines) {
-    for (const row of formatBodyLine(line)) parts.push(row);
+    parts.push(`${LINE_MARK[line.type] ?? ' '}${line.text}`);
+    if (line.noNl) parts.push('\');
   }
   return `${parts.join('\n')}\n`;
 };

package/lib/diff/unit.js

@@ -5,16 +5,14 @@ const { attachInline } = align;
 const files = require('../files.js');
 const { listPath } = files;
 
-const splitEditor = (text) => {
-  const lines = `${text}`.split('\n');
-  if (!lines.length) return [''];
-  return lines;
-};
+const LCS_CELLS = 4000000;
+
+const splitEditor = (text) => text.split('\n');
 
 const splitFile = (text) => {
   if (!text) return [];
-  const lines = `${text}`.split('\n');
-  if (lines.length && lines[lines.length - 1] === '') lines.pop();
+  const lines = text.split('\n');
+  if (lines[lines.length - 1] === '') lines.pop();
   return lines;
 };
 
@@ -28,53 +26,13 @@ const hunkKey = (item) => {
 
 const sameHunk = (left, right) => {
   if (!left || !right) return false;
-  if (left.hunk && right.hunk && left.hunk === right.hunk) {
+  if (left.hunk && left.hunk === right.hunk) {
     return listPath(left) === listPath(right);
   }
-  const key = hunkKey(left);
-  if (!key) return false;
-  return key === hunkKey(right);
-};
-
-const emptyMarks = (last) => {
-  const size = last + 1;
-  const dels = new Array(size);
-  const adds = new Array(size);
-  for (let i = 0; i < size; i++) {
-    dels[i] = [];
-    adds[i] = null;
-  }
-  return { dels, adds };
-};
-
-const clipAt = (n, last) => Math.min(Math.max(1, n), last);
-
-const applyHunk = (marks, item) => {
-  const hunk = item.hunk;
-  if (!hunk || !hunk.lines) return;
-  const last = marks.dels.length - 1;
-  let newLine = hunk.newStart > 0 ? hunk.newStart : 1;
-  for (const line of hunk.lines) {
-    const extra = {
-      text: line.text ?? '',
-      item,
-      blockId: line.blockId,
-      origin: item.origin,
-    };
-    if (line.type === 'del') {
-      marks.dels[clipAt(newLine, last)].push(extra);
-      continue;
-    }
-    if (line.type === 'add') {
-      marks.adds[clipAt(newLine, last)] = extra;
-      newLine += 1;
-      continue;
-    }
-    newLine += 1;
-  }
+  return hunkKey(left) === hunkKey(right);
 };
 
-const tagged = (type, text, extra = {}) => ({
+const tagged = (type, text, extra) => ({
   type,
   text,
   noNl: false,
@@ -83,20 +41,35 @@ const tagged = (type, text, extra = {}) => ({
   item: extra.item ?? null,
 });
 
-const itemsForPath = (items, rel) => {
-  const out = [];
-  for (const item of items) {
-    if (listPath(item) === rel) out.push(item);
+const NO_EXTRA = {};
+
+const clipAt = (n, last) => Math.min(Math.max(1, n), last);
+
+const markHunk = (marks, item) => {
+  if (!item.hunk) return;
+  const last = marks.dels.length - 1;
+  let newLine = item.hunk.newStart > 0 ? item.hunk.newStart : 1;
+  for (const line of item.hunk.lines) {
+    const { type, text, blockId } = line;
+    const mark = { text, item, blockId, origin: item.origin };
+    if (type === 'del') {
+      marks.dels[clipAt(newLine, last)].push(mark);
+      continue;
+    }
+    if (type === 'add') marks.adds[clipAt(newLine, last)] = mark;
+    newLine += 1;
   }
-  return out;
 };
 
+const itemsForPath = (items, rel) =>
+  items.filter((item) => listPath(item) === rel);
+
 const rowsFromAdds = (items) => {
   const rows = [];
   for (const item of items) {
-    const lines = item.hunk && item.hunk.lines ? item.hunk.lines : [];
-    for (const line of lines) {
-      if (line.type === 'add') rows.push(line.text ?? '');
+    if (!item.hunk) continue;
+    for (const line of item.hunk.lines) {
+      if (line.type === 'add') rows.push(line.text);
     }
   }
   return rows;
@@ -105,75 +78,57 @@ const rowsFromAdds = (items) => {
 const unitLines = (text, items) => {
   let rows = splitFile(text);
   if (!rows.length) rows = rowsFromAdds(items);
-  const marks = emptyMarks(rows.length + 1);
-  for (const item of items) applyHunk(marks, item);
+  const size = rows.length + 2;
+  const marks = {
+    dels: Array.from({ length: size }, () => []),
+    adds: new Array(size).fill(null),
+  };
+  for (const item of items) markHunk(marks, item);
   const out = [];
   for (let i = 0; i < rows.length; i++) {
-    const n = i + 1;
-    for (const del of marks.dels[n]) out.push(tagged('del', del.text, del));
-    const add = marks.adds[n];
+    for (const del of marks.dels[i + 1]) out.push(tagged('del', del.text, del));
+    const add = marks.adds[i + 1];
     if (add) out.push(tagged('add', rows[i], add));
-    else out.push(tagged('ctx', rows[i], {}));
+    else out.push(tagged('ctx', rows[i], NO_EXTRA));
   }
   for (const del of marks.dels[rows.length + 1]) {
     out.push(tagged('del', del.text, del));
   }
-  if (!out.length) out.push(tagged('ctx', '', {}));
+  if (!out.length) out.push(tagged('ctx', '', NO_EXTRA));
   return attachInline(out);
 };
 
-const sameBlock = (line, item) => {
-  if (!line || !item) return false;
-  if (line.item !== item) return false;
-  return line.blockId === item.blockId;
-};
+const sameBlock = (line, item) =>
+  line.item === item && line.blockId === item.blockId;
 
-const blockLineRange = (lines, item) => {
-  let start = 0;
+const changedLineRange = (lines, item, belongs) => {
+  let start = -1;
   let end = 0;
-  let found = false;
-  if (!item) return { start, end };
+  if (!item) return { start: 0, end };
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
-    if (!sameBlock(line, item)) continue;
-    if (line.type === 'ctx') continue;
-    if (!found) {
-      start = i;
-      found = true;
-    }
+    if (line.type === 'ctx' || !belongs(line, item)) continue;
+    if (start < 0) start = i;
     end = i;
   }
-  return { start, end };
+  return { start: Math.max(start, 0), end };
 };
 
+const blockLineRange = (lines, item) =>
+  changedLineRange(lines, item, sameBlock);
+
 const blockLineIndex = (lines, item) => blockLineRange(lines, item).start;
 
-const hunkLineRange = (lines, item) => {
-  let start = 0;
-  let end = 0;
-  let found = false;
-  if (!item) return { start, end };
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    if (!sameHunk(line.item, item)) continue;
-    if (line.type === 'ctx') continue;
-    if (!found) {
-      start = i;
-      found = true;
-    }
-    end = i;
-  }
-  return { start, end };
-};
+const hunkLineRange = (lines, item) =>
+  changedLineRange(lines, item, (line) => sameHunk(line.item, item));
 
 const fileOffset = (lines, at) => {
   let offset = 0;
-  const target = Math.max(0, at);
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
     if (line.type === 'del') continue;
-    if (i >= target) return offset;
-    offset += (line.text ?? '').length + 1;
+    if (i >= at) return offset;
+    offset += line.text.length + 1;
   }
   return offset;
 };
@@ -190,37 +145,27 @@ const fileLineIndex = (lines, fileLine) => {
   return last;
 };
 
-const lastEditableIndex = (lines) => {
-  for (let i = lines.length - 1; i >= 0; i--) {
-    if (lines[i].type !== 'del') return i;
-  }
-  return -1;
-};
-
 const attachEditSpans = (lines) => {
+  let lastAt = lines.length - 1;
+  while (lastAt >= 0 && lines[lastAt].type === 'del') lastAt -= 1;
   let offset = 0;
-  const lastAt = lastEditableIndex(lines);
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
     if (line.type === 'del') continue;
-    const text = line.text ?? '';
-    const last = i === lastAt;
     line.wrap = true;
     line.editStart = offset;
-    line.editEnd = offset + text.length;
-    line.editLast = last;
-    offset = last ? offset + text.length : offset + text.length + 1;
+    line.editEnd = offset + line.text.length;
+    line.editLast = i === lastAt;
+    offset = line.editEnd + 1;
   }
   return lines;
 };
 
-const LCS_CELLS = 4000000;
-
 const lcsTable = (prev, next) => {
   const n = prev.length;
   const m = next.length;
   const dp = new Array(n + 1);
-  for (let i = 0; i <= n; i++) dp[i] = new Array(m + 1).fill(0);
+  for (let i = 0; i <= n; i++) dp[i] = new Uint32Array(m + 1);
   for (let i = n - 1; i >= 0; i--) {
     for (let j = m - 1; j >= 0; j--) {
       if (prev[i] === next[j]) dp[i][j] = dp[i + 1][j + 1] + 1;
@@ -232,44 +177,35 @@ const lcsTable = (prev, next) => {
 
 const zipOps = (prev, next) => {
   const n = Math.min(prev.length, next.length);
-  const ops = new Array(Math.max(prev.length, next.length));
-  let at = 0;
-  for (let i = 0; i < n; i++) ops[at++] = { kind: 'rep', text: next[i] };
-  for (let i = n; i < prev.length; i++) ops[at++] = { kind: 'del' };
+  const ops = [];
+  for (let i = 0; i < n; i++) ops.push({ kind: 'rep', text: next[i] });
+  for (let i = n; i < prev.length; i++) ops.push({ kind: 'del' });
   for (let i = n; i < next.length; i++) {
-    ops[at++] = { kind: 'ins', text: next[i] };
+    ops.push({ kind: 'ins', text: next[i] });
   }
   return ops;
 };
 
-const walkLcs = (prev, next, dp) => {
-  const ops = new Array(prev.length + next.length - dp[0][0]);
-  let n = 0;
+const lcsOps = (prev, next) => {
+  const dp = lcsTable(prev, next);
+  const ops = [];
   let i = 0;
   let j = 0;
   while (i < prev.length && j < next.length) {
     if (prev[i] === next[j]) {
-      ops[n++] = { kind: 'eq', text: next[j] };
+      ops.push({ kind: 'eq', text: next[j] });
       i += 1;
       j += 1;
-      continue;
-    }
-    if (dp[i + 1][j] >= dp[i][j + 1]) {
-      ops[n++] = { kind: 'del' };
+    } else if (dp[i + 1][j] >= dp[i][j + 1]) {
+      ops.push({ kind: 'del' });
       i += 1;
-      continue;
+    } else {
+      ops.push({ kind: 'ins', text: next[j] });
+      j += 1;
     }
-    ops[n++] = { kind: 'ins', text: next[j] };
-    j += 1;
-  }
-  while (i < prev.length) {
-    ops[n++] = { kind: 'del' };
-    i += 1;
-  }
-  while (j < next.length) {
-    ops[n++] = { kind: 'ins', text: next[j] };
-    j += 1;
   }
+  for (; i < prev.length; i++) ops.push({ kind: 'del' });
+  for (; j < next.length; j++) ops.push({ kind: 'ins', text: next[j] });
   return ops;
 };
 
@@ -278,13 +214,10 @@ const collapseRep = (ops) => {
   for (let i = 0; i < ops.length; i++) {
     const op = ops[i];
     const next = ops[i + 1];
-    if (op.kind === 'del' && next && next.kind === 'ins') {
-      out.push({ kind: 'rep', text: next.text });
-      i += 1;
-      continue;
-    }
-    if (op.kind === 'ins' && next && next.kind === 'del') {
-      out.push({ kind: 'rep', text: op.text });
+    const delIns = op.kind === 'del' && next?.kind === 'ins';
+    const insDel = op.kind === 'ins' && next?.kind === 'del';
+    if (delIns || insDel) {
+      out.push({ kind: 'rep', text: delIns ? next.text : op.text });
       i += 1;
       continue;
     }
@@ -296,91 +229,44 @@ const collapseRep = (ops) => {
 const lineOps = (prev, next) => {
   if (prev.length === next.length) return zipOps(prev, next);
   if (prev.length * next.length > LCS_CELLS) return zipOps(prev, next);
-  return collapseRep(walkLcs(prev, next, lcsTable(prev, next)));
+  return collapseRep(lcsOps(prev, next));
 };
 
-const copyRow = (row, text) => ({
-  type: row.type,
-  text,
-  noNl: row.noNl === true,
-  blockId: row.blockId ?? null,
-  origin: row.origin ?? '',
-  item: row.item ?? null,
-});
-
 const pushDels = (out, base, at) => {
   let i = at;
   while (i < base.length && base[i].type === 'del') {
-    out.push(copyRow(base[i], base[i].text ?? ''));
+    out.push(tagged('del', base[i].text, base[i]));
     i += 1;
   }
   return i;
 };
 
-const mergeEditRows = (baseRows, nextTexts) => {
-  const base = baseRows ?? [];
-  const texts = nextTexts && nextTexts.length ? nextTexts : [''];
+const mergeEditRows = (base, nextTexts) => {
+  const texts = nextTexts.length ? nextTexts : [''];
   const prev = [];
-  for (const row of base) {
-    if (row.type === 'del') continue;
-    prev.push(row.text ?? '');
-  }
-  const ops = lineOps(prev, texts);
+  for (const row of base) if (row.type !== 'del') prev.push(row.text);
   const out = [];
   let at = 0;
-  for (const op of ops) {
+  for (const op of lineOps(prev, texts)) {
     at = pushDels(out, base, at);
     if (op.kind === 'ins') {
-      out.push(tagged('ctx', op.text, {}));
+      out.push(tagged('ctx', op.text, NO_EXTRA));
       continue;
     }
     if (at >= base.length) continue;
-    if (op.kind === 'del') {
-      at += 1;
-      continue;
-    }
-    out.push(copyRow(base[at], op.text));
+    if (op.kind !== 'del') out.push(tagged(base[at].type, op.text, base[at]));
     at += 1;
   }
   pushDels(out, base, at);
-  if (!out.length) out.push(tagged('ctx', '', {}));
+  if (!out.length) out.push(tagged('ctx', '', NO_EXTRA));
   return attachEditSpans(attachInline(out));
 };
 
-const fileLines = (text) => {
-  const rows = splitFile(text);
-  if (!rows.length) rows.push('');
-  const { length } = rows;
-  const out = new Array(length);
-  let offset = 0;
-  for (let i = 0; i < length; i++) {
-    const row = rows[i];
-    const start = offset;
-    const end = start + row.length;
-    const last = i === length - 1;
-    out[i] = {
-      type: 'ctx',
-      text: row,
-      noNl: false,
-      wrap: true,
-      editStart: start,
-      editEnd: end,
-      editLast: last,
-      blockId: null,
-      origin: '',
-      item: null,
-    };
-    offset = last ? end : end + 1;
-  }
-  return out;
-};
-
 module.exports = {
   splitFile,
   splitEditor,
   itemsForPath,
   unitLines,
-  sameBlock,
   sameHunk,
   hunkKey,
   blockLineRange,
@@ -388,7 +274,5 @@ module.exports = {
   blockLineIndex,
   fileOffset,
   fileLineIndex,
-  attachEditSpans,
   mergeEditRows,
-  fileLines,
 };