reslop 0.2.3 → 0.2.5

package/lib/diff/inline.js

@@ -1,10 +1,12 @@
 'use strict';
 
-const { graphemes } = require('../ansi.js');
+const ansi = require('../ansi.js');
+const { graphemes } = ansi;
 
 const LCS_CELL_LIMIT = 250000;
 const NOISY_TINY_SPANS = 6;
 const WORD_REFINE_MIN = 0.6;
+const WHOLE_MIN_SHARED = 0.25;
 const PIECE_RE = /[A-Za-z_$][\w$]*|\d+|\s+|./g;
 const CAMEL_RE = /[A-Z]+(?=[A-Z][a-z])|[A-Z]?[a-z]+|[A-Z]+|\d+|./g;
 
@@ -279,6 +281,65 @@ const spansFromWordOps = (ops) => {
   };
 };
 
+const opRuns = (ops) => {
+  const runs = [];
+  for (const op of ops) {
+    const eq = op.type === 'eq';
+    let run = runs[runs.length - 1];
+    if (!run || run.eq !== eq) {
+      run = { eq, del: [], add: [] };
+      runs.push(run);
+    }
+    if (op.type !== 'add') run.del.push(op.text);
+    if (op.type !== 'del') run.add.push(op.text);
+  }
+  return runs;
+};
+
+const textSize = (parts) => parts.join('').length;
+
+const editSize = (run) => Math.max(textSize(run.del), textSize(run.add));
+
+const absorbTinyEquals = (runs) => {
+  for (let k = 1; k < runs.length - 1; k++) {
+    const [before, eq, after] = runs.slice(k - 1, k + 2);
+    if (!eq.eq) continue;
+    const size = textSize(eq.del);
+    if (size > editSize(before) || size > editSize(after)) continue;
+    const del = [...before.del, ...eq.del, ...after.del];
+    const add = [...before.add, ...eq.add, ...after.add];
+    runs.splice(k - 1, 3, { eq: false, del, add });
+    k = 0;
+  }
+  return runs;
+};
+
+const runOps = (runs) => {
+  const ops = [];
+  for (const run of runs) {
+    if (run.eq) {
+      for (const text of run.del) ops.push({ type: 'eq', text });
+      continue;
+    }
+    for (const text of run.del) ops.push({ type: 'del', text });
+    for (const text of run.add) ops.push({ type: 'add', text });
+  }
+  return ops;
+};
+
+const cleanOps = (ops) => runOps(absorbTinyEquals(opRuns(ops)));
+
+const sharedShare = (spans) => {
+  let shared = 0;
+  let total = 0;
+  for (const span of spans) {
+    const size = span.text.replace(/\s/g, '').length;
+    total += size;
+    if (!span.changed) shared += size;
+  }
+  return total === 0 ? 1 : shared / total;
+};
+
 const diffChars = (oldText, newText) => {
   const a = splitPieces(oldText);
   const b = splitPieces(newText);
@@ -295,10 +356,15 @@ const diffChars = (oldText, newText) => {
   } else if (midA.length * midB.length > LCS_CELL_LIMIT) {
     mid = wholeChanged(midA, midB);
   } else {
-    mid = spansFromWordOps(lcsOps(midA, midB));
+    mid = spansFromWordOps(cleanOps(lcsOps(midA, midB)));
   }
   const oldSpans = joinAffix(prefix, mid.oldSpans, suffix);
   const newSpans = joinAffix(prefix, mid.newSpans, suffix);
+  const oldShare = sharedShare(oldSpans);
+  const newShare = sharedShare(newSpans);
+  if (oldShare < WHOLE_MIN_SHARED && newShare < WHOLE_MIN_SHARED) {
+    return wholeChanged(a, b);
+  }
   return { oldSpans, newSpans };
 };
 

package/lib/diff/patch.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { isCtxType } = require('./align.js');
+const align = require('./align.js');
+const { isCtxType } = align;
 
 const LINE_MARK = {
   add: '+',

package/lib/diff/unit.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const { attachInline } = require('./align.js');
-const { listPath } = require('../files.js');
+const align = require('./align.js');
+const { attachInline } = align;
+const files = require('../files.js');
+const { listPath } = files;
 
 const splitEditor = (text) => {
   const lines = `${text}`.split('\n');
@@ -126,43 +128,26 @@ const sameBlock = (line, item) => {
   return 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;

package/lib/editor.js

@@ -1,7 +1,9 @@
 'use strict';
 
-const { graphemes } = require('./ansi.js');
-const { wrapMove } = require('./wrap.js');
+const ansi = require('./ansi.js');
+const { graphemes, visibleWidth } = ansi;
+const wrap = require('./wrap.js');
+const { wrapMove } = wrap;
 
 const UNDO_CAP = 100;
 
@@ -59,15 +61,53 @@ class Editor {
     this.undo = [];
     this.redo = [];
     this.wantCol = null;
+    this.scrollCol = 0;
+    this.anchor = null;
   }
 
   snapshot() {
-    return { text: this.text, cursor: this.cursor };
+    return { text: this.text, cursor: this.cursor, anchor: this.anchor };
   }
 
   restore(snap) {
     this.text = snap.text;
     this.cursor = snap.cursor;
+    this.anchor = snap.anchor ?? null;
+  }
+
+  hasSelect() {
+    return this.anchor !== null && this.anchor !== this.cursor;
+  }
+
+  selectedText() {
+    if (!this.hasSelect()) return '';
+    const lo = Math.min(this.anchor, this.cursor);
+    const hi = Math.max(this.anchor, this.cursor);
+    return this.text.slice(lo, hi);
+  }
+
+  beginSelect() {
+    if (this.anchor === null) this.anchor = this.cursor;
+  }
+
+  clearSelect() {
+    this.anchor = null;
+  }
+
+  collapse(delta) {
+    const lo = Math.min(this.anchor, this.cursor);
+    const hi = Math.max(this.anchor, this.cursor);
+    this.anchor = null;
+    this.cursor = delta < 0 ? lo : hi;
+  }
+
+  removeSpan() {
+    if (!this.hasSelect()) return false;
+    const lo = Math.min(this.anchor, this.cursor);
+    const hi = Math.max(this.anchor, this.cursor);
+    const next = this.text.slice(0, lo) + this.text.slice(hi);
+    this.edit(next, lo);
+    return true;
   }
 
   edit(nextText, nextCursor) {
@@ -78,13 +118,17 @@ class Editor {
     this.redo = [];
     this.text = nextText;
     this.cursor = nextCursor;
+    this.anchor = null;
   }
 
   insert(chunk) {
     this.wantCol = null;
-    const before = this.text.slice(0, this.cursor);
-    const after = this.text.slice(this.cursor);
-    this.edit(before + chunk + after, this.cursor + chunk.length);
+    const selected = this.hasSelect();
+    const lo = selected ? Math.min(this.anchor, this.cursor) : this.cursor;
+    const hi = selected ? Math.max(this.anchor, this.cursor) : this.cursor;
+    const before = this.text.slice(0, lo);
+    const after = this.text.slice(hi);
+    this.edit(before + chunk + after, lo + chunk.length);
   }
 
   replace(text) {
@@ -92,8 +136,16 @@ class Editor {
     this.edit(text, text.length);
   }
 
+  place(offset) {
+    const next = Math.max(0, Math.min(offset, this.text.length));
+    this.wantCol = null;
+    this.anchor = null;
+    this.cursor = next;
+  }
+
   backspace() {
     this.wantCol = null;
+    if (this.removeSpan()) return;
     const { parts, i } = graphemeIndex(this.text, this.cursor);
     if (i === 0) return;
     const drop = parts[i - 1];
@@ -103,22 +155,27 @@ class Editor {
 
   delete() {
     this.wantCol = null;
+    if (this.removeSpan()) return;
     const { parts, i } = graphemeIndex(this.text, this.cursor);
     if (i >= parts.length) return;
     const nextParts = [...parts.slice(0, i), ...parts.slice(i + 1)];
     this.edit(nextParts.join(''), this.cursor);
   }
 
-  move(delta) {
+  move(delta, extend) {
     this.wantCol = null;
+    if (!extend && this.hasSelect()) return void this.collapse(delta);
+    if (extend) this.beginSelect();
     const { parts, i } = graphemeIndex(this.text, this.cursor);
     const next = i + delta;
     if (next < 0 || next > parts.length) return;
     this.cursor = offsetAt(parts, next);
   }
 
-  moveWord(delta) {
+  moveWord(delta, extend) {
     this.wantCol = null;
+    if (!extend && this.hasSelect()) return void this.collapse(delta);
+    if (extend) this.beginSelect();
     const dir = delta < 0 ? -1 : 1;
     const { parts, i } = graphemeIndex(this.text, this.cursor);
     this.cursor = offsetAt(parts, wordIndex(parts, i, dir));
@@ -132,7 +189,22 @@ class Editor {
     return { line, col };
   }
 
-  moveLine(delta, width) {
+  visibleLineCol() {
+    const { col, line } = this.linePos();
+    const row = this.text.split('\n')[line] ?? '';
+    return visibleWidth(row.slice(0, col));
+  }
+
+  reveal(width) {
+    const col = this.visibleLineCol();
+    const room = Math.max(1, width);
+    if (col < this.scrollCol) this.scrollCol = col;
+    if (col >= this.scrollCol + room) this.scrollCol = col - room + 1;
+  }
+
+  moveLine(delta, width, extend) {
+    if (!extend) this.clearSelect();
+    else this.beginSelect();
     if (width !== undefined) {
       const col = this.wantCol;
       const moved = wrapMove(this.text, this.cursor, width, delta, col);
@@ -142,8 +214,10 @@ class Editor {
     }
     const rows = this.text.split('\n');
     const { line, col } = this.linePos();
-    const next = line + delta;
-    if (next < 0 || next >= rows.length) return;
+    let next = line + delta;
+    if (next < 0) next = 0;
+    if (next >= rows.length) next = rows.length - 1;
+    if (next === line) return;
     const row = rows[next];
     const c = Math.min(col, row.length);
     let cursor = 0;
@@ -151,14 +225,18 @@ class Editor {
     this.cursor = cursor + c;
   }
 
-  home() {
+  home(extend) {
     this.wantCol = null;
+    if (!extend) this.clearSelect();
+    else this.beginSelect();
     const { col } = this.linePos();
     this.cursor -= col;
   }
 
-  end() {
+  end(extend) {
     this.wantCol = null;
+    if (!extend) this.clearSelect();
+    else this.beginSelect();
     const { line, col } = this.linePos();
     const rows = this.text.split('\n');
     const row = rows[line] ?? '';

package/lib/files.js

@@ -1,11 +1,13 @@
 'use strict';
 
-const { listFilePath } = require('./manifest.js');
+const manifest = require('./manifest.js');
+const { listFilePath } = manifest;
 
 const REVIEW_DIR = '.review';
 const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit', 'pr'];
-const TODO_FILE = 'TODOs';
-const REPO_TODOS_LABEL = 'Repository TODOs and Issues';
+const TASKS_FILE = 'TODOs';
+const REPO_TASKS_LABEL =
+  'Project Tasks: Backlog, Issues, Bug Reports, Feature Requests';
 const TOTAL_LABEL = 'total';
 
 const isPathInScope = (rel, paths) => {
@@ -25,19 +27,19 @@ const itemPath = (item) => {
 
 const listPath = (item) => listFilePath(itemPath(item));
 
-const isTodoItem = (item) => !!(item && item.origin === 'todo');
+const isTaskItem = (item) => !!(item && item.origin === 'task');
 
 const isReadOnlyOrigin = (origin) => origin === 'commit' || origin === 'pr';
 
-const isTodosEntry = (entry) => !!(entry && entry.kind === 'todos');
+const isTasksEntry = (entry) => !!(entry && entry.kind === 'tasks');
 
 const isTotalEntry = (entry) => !!(entry && entry.kind === 'total');
 
-const makeTodoItem = () => ({
-  origin: 'todo',
+const makeTaskItem = () => ({
+  origin: 'task',
   file: {
-    oldPath: TODO_FILE,
-    newPath: TODO_FILE,
+    oldPath: TASKS_FILE,
+    newPath: TASKS_FILE,
     isNew: false,
     isDeleted: false,
     isBinary: false,
@@ -45,7 +47,7 @@ const makeTodoItem = () => ({
     hunks: [],
   },
   hunk: null,
-  blockId: 'todo',
+  blockId: 'task',
   patchAdd: '',
   patchRevert: '',
 });
@@ -73,23 +75,47 @@ const lineDelta = ({ hunk, blockId }) => {
   return delta;
 };
 
-const countAgo = (n, unit) => {
-  const label = n === 1 ? unit : `${unit}s`;
-  return `${n} ${label} ago`;
+const AGE_UNIT = {
+  second: 's',
+  minute: 'm',
+  hour: 'h',
+  day: 'd',
+  week: 'w',
+  month: 'mo',
+  year: 'y',
+};
+
+const AGE_AGO = /^(\d+)\s+(second|minute|hour|day|week|month|year)s?\s+ago$/i;
+const AGE_SHORT = /^(\d+)(mo|[smhdwy])(?: ago)?$/i;
+
+const shortUnit = (n, unit) => `${n}${AGE_UNIT[unit]} ago`;
+
+const shortAge = (text) => {
+  const raw = `${text ?? ''}`.trim();
+  if (!raw) return '';
+  if (/^yesterday$/i.test(raw)) return '1d ago';
+  const match = AGE_AGO.exec(raw);
+  if (match) {
+    const unit = AGE_UNIT[match[2].toLowerCase()];
+    if (unit) return `${match[1]}${unit} ago`;
+  }
+  const brief = AGE_SHORT.exec(raw);
+  if (brief) return `${brief[1]}${brief[2].toLowerCase()} ago`;
+  return raw;
 };
 
 const relativeAge = (thenMs, nowMs = Date.now()) => {
   const diff = Math.max(0, Math.round((nowMs - thenMs) / 1000));
-  if (diff < 90) return countAgo(diff, 'second');
+  if (diff < 90) return shortUnit(diff, 'second');
   const minutes = Math.round(diff / 60);
-  if (minutes < 90) return countAgo(minutes, 'minute');
+  if (minutes < 90) return shortUnit(minutes, 'minute');
   const hours = Math.round(minutes / 60);
-  if (hours < 36) return countAgo(hours, 'hour');
+  if (hours < 36) return shortUnit(hours, 'hour');
   const days = Math.round(hours / 24);
-  if (days < 14) return countAgo(days, 'day');
-  if (days < 70) return countAgo(Math.round(days / 7), 'week');
-  if (days < 365) return countAgo(Math.round(days / 30), 'month');
-  return countAgo(Math.round(days / 365), 'year');
+  if (days < 14) return shortUnit(days, 'day');
+  if (days < 70) return shortUnit(Math.round(days / 7), 'week');
+  if (days < 365) return shortUnit(Math.round(days / 30), 'month');
+  return shortUnit(Math.round(days / 365), 'year');
 };
 
 const addLineDelta = (group, origin, delta) => {
@@ -135,7 +161,7 @@ const fileEntries = (items) => {
   const groups = new Map();
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
-    if (isTodoItem(item)) continue;
+    if (isTaskItem(item)) continue;
     const rel = listPath(item);
     if (!rel) continue;
     if (!groups.has(rel)) {
@@ -192,7 +218,7 @@ const fileTotals = (files) => {
     unstaged: 0,
   };
   for (const entry of files) {
-    if (isTodosEntry(entry) || isTotalEntry(entry)) continue;
+    if (isTasksEntry(entry) || isTotalEntry(entry)) continue;
     const remaining = entry.remaining ?? 0;
     const staged = entry.staged ?? 0;
     const added = entry.added ?? 0;
@@ -216,19 +242,20 @@ const fileTotals = (files) => {
 
 module.exports = {
   REVIEW_DIR,
-  TODO_FILE,
-  REPO_TODOS_LABEL,
+  TASKS_FILE,
+  REPO_TASKS_LABEL,
   TOTAL_LABEL,
   isPathInScope,
   itemPath,
   listPath,
-  isTodoItem,
+  isTaskItem,
   isReadOnlyOrigin,
-  isTodosEntry,
+  isTasksEntry,
   isTotalEntry,
-  makeTodoItem,
+  makeTaskItem,
   fileStatus,
   fileEntries,
   fileTotals,
   relativeAge,
+  shortAge,
 };