reslop 0.2.4 → 0.2.6

package/lib/editor.js

@@ -6,6 +6,7 @@ const wrap = require('./wrap.js');
 const { wrapMove } = wrap;
 
 const UNDO_CAP = 100;
+const WORD_RE = /[\p{L}\p{N}_]/u;
 
 const graphemeIndex = (text, cursor) => {
   const parts = graphemes(text);
@@ -24,10 +25,10 @@ const offsetAt = (parts, count) => {
   return pos;
 };
 
-const WORD_RE = /[\p{L}\p{N}_]/u;
-
 const isWordChar = (ch) => WORD_RE.test(ch);
 
+const isSeparator = (ch) => !isWordChar(ch);
+
 const skipWhile = (parts, at, dir, pred) => {
   if (dir > 0) {
     while (at < parts.length && pred(parts[at])) at += 1;
@@ -38,20 +39,10 @@ const skipWhile = (parts, at, dir, pred) => {
 };
 
 const wordIndex = (parts, at, dir) => {
-  const word = (ch) => isWordChar(ch);
-  const sep = (ch) => !isWordChar(ch);
-  if (dir > 0) {
-    if (at < parts.length && word(parts[at])) {
-      return skipWhile(parts, at, 1, word);
-    }
-    at = skipWhile(parts, at, 1, sep);
-    return skipWhile(parts, at, 1, word);
-  }
-  if (at > 0 && word(parts[at - 1])) {
-    return skipWhile(parts, at, -1, word);
-  }
-  at = skipWhile(parts, at, -1, sep);
-  return skipWhile(parts, at, -1, word);
+  const ahead = dir > 0 ? parts[at] : parts[at - 1];
+  const inWord = ahead !== undefined && isWordChar(ahead);
+  const start = inWord ? at : skipWhile(parts, at, dir, isSeparator);
+  return skipWhile(parts, start, dir, isWordChar);
 };
 
 class Editor {
@@ -62,32 +53,70 @@ class Editor {
     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;
+  }
+
+  hasSelect() {
+    return this.anchor !== null && this.anchor !== this.cursor;
+  }
+
+  span() {
+    if (!this.hasSelect()) return { lo: this.cursor, hi: this.cursor };
+    const lo = Math.min(this.anchor, this.cursor);
+    const hi = Math.max(this.anchor, this.cursor);
+    return { lo, hi };
+  }
+
+  selectedText() {
+    const { lo, hi } = this.span();
+    return this.text.slice(lo, hi);
+  }
+
+  beginSelect() {
+    if (this.anchor === null) this.anchor = this.cursor;
+  }
+
+  clearSelect() {
+    this.anchor = null;
+  }
+
+  collapse(delta) {
+    const { lo, hi } = this.span();
+    this.anchor = null;
+    this.cursor = delta < 0 ? lo : hi;
+  }
+
+  removeSpan() {
+    if (!this.hasSelect()) return false;
+    const { lo, hi } = this.span();
+    this.edit(this.text.slice(0, lo) + this.text.slice(hi), lo);
+    return true;
   }
 
   edit(nextText, nextCursor) {
     this.undo.push(this.snapshot());
-    if (this.undo.length > UNDO_CAP) {
-      this.undo = this.undo.slice(this.undo.length - UNDO_CAP);
-    }
+    if (this.undo.length > UNDO_CAP) this.undo.shift();
     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 { lo, hi } = this.span();
+    const next = this.text.slice(0, lo) + chunk + this.text.slice(hi);
+    this.edit(next, lo + chunk.length);
   }
 
   replace(text) {
@@ -95,33 +124,46 @@ class Editor {
     this.edit(text, text.length);
   }
 
+  place(offset) {
+    this.wantCol = null;
+    this.anchor = null;
+    this.cursor = Math.max(0, Math.min(offset, this.text.length));
+  }
+
   backspace() {
     this.wantCol = null;
-    const { parts, i } = graphemeIndex(this.text, this.cursor);
+    if (this.removeSpan()) return;
+    const { parts, i, pos } = graphemeIndex(this.text, this.cursor);
     if (i === 0) return;
-    const drop = parts[i - 1];
-    const nextParts = [...parts.slice(0, i - 1), ...parts.slice(i)];
-    this.edit(nextParts.join(''), this.cursor - drop.length);
+    const size = parts[i - 1].length;
+    const next = this.text.slice(0, pos - size) + this.text.slice(pos);
+    this.edit(next, this.cursor - size);
   }
 
   delete() {
     this.wantCol = null;
-    const { parts, i } = graphemeIndex(this.text, this.cursor);
+    if (this.removeSpan()) return;
+    const { parts, i, pos } = 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);
+    const next =
+      this.text.slice(0, pos) + this.text.slice(pos + parts[i].length);
+    this.edit(next, 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));
@@ -129,15 +171,14 @@ class Editor {
 
   linePos() {
     const before = this.text.slice(0, this.cursor);
-    const at = before.lastIndexOf('\n');
     const line = before.split('\n').length - 1;
-    const col = at < 0 ? before.length : before.length - at - 1;
+    const col = before.length - before.lastIndexOf('\n') - 1;
     return { line, col };
   }
 
   visibleLineCol() {
     const { col, line } = this.linePos();
-    const row = this.text.split('\n')[line] ?? '';
+    const row = this.text.split('\n')[line];
     return visibleWidth(row.slice(0, col));
   }
 
@@ -148,55 +189,57 @@ class Editor {
     if (col >= this.scrollCol + room) this.scrollCol = col - room + 1;
   }
 
-  moveLine(delta, width) {
+  moveLine(delta, width, extend) {
+    if (extend) this.beginSelect();
+    else this.clearSelect();
     if (width !== undefined) {
-      const col = this.wantCol;
-      const moved = wrapMove(this.text, this.cursor, width, delta, col);
+      const moved = wrapMove(
+        this.text,
+        this.cursor,
+        width,
+        delta,
+        this.wantCol,
+      );
       this.wantCol = moved.col;
       this.cursor = moved.cursor;
       return;
     }
     const rows = this.text.split('\n');
     const { line, col } = this.linePos();
-    let next = line + delta;
-    if (next < 0) next = 0;
-    if (next >= rows.length) next = rows.length - 1;
+    const next = Math.min(Math.max(line + delta, 0), rows.length - 1);
     if (next === line) return;
-    const row = rows[next];
-    const c = Math.min(col, row.length);
     let cursor = 0;
     for (let i = 0; i < next; i++) cursor += rows[i].length + 1;
-    this.cursor = cursor + c;
+    this.cursor = cursor + Math.min(col, rows[next].length);
   }
 
-  home() {
+  home(extend) {
     this.wantCol = null;
-    const { col } = this.linePos();
-    this.cursor -= col;
+    if (extend) this.beginSelect();
+    else this.clearSelect();
+    this.cursor -= this.linePos().col;
   }
 
-  end() {
+  end(extend) {
     this.wantCol = null;
+    if (extend) this.beginSelect();
+    else this.clearSelect();
     const { line, col } = this.linePos();
-    const rows = this.text.split('\n');
-    const row = rows[line] ?? '';
-    this.cursor += row.length - col;
+    this.cursor += this.text.split('\n')[line].length - col;
   }
 
   undoEdit() {
     if (!this.undo.length) return;
     this.wantCol = null;
-    const prev = this.undo.pop();
     this.redo.push(this.snapshot());
-    this.restore(prev);
+    this.restore(this.undo.pop());
   }
 
   redoEdit() {
     if (!this.redo.length) return;
     this.wantCol = null;
-    const next = this.redo.pop();
     this.undo.push(this.snapshot());
-    this.restore(next);
+    this.restore(this.redo.pop());
   }
 }
 

package/lib/files.js

@@ -5,9 +5,40 @@ const { listFilePath } = manifest;
 
 const REVIEW_DIR = '.review';
 const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit', 'pr'];
-const TODO_FILE = 'TODOs';
-const REPO_TODOS_LABEL = 'Project Backlog and Issues';
+const TASKS_FILE = 'TODOs';
+const REPO_TASKS_LABEL =
+  'Project Tasks: Backlog, Issues, Bug Reports, Feature Requests';
+const TASK_KINDS = [
+  { id: 'backlog', title: 'Backlog' },
+  { id: 'issues', title: 'Issues' },
+  { id: 'bugs', title: 'Bug Reports' },
+  { id: 'features', title: 'Feature Requests' },
+];
+const TASK_KIND_IDS = new Set(TASK_KINDS.map((kind) => kind.id));
+
+const taskKind = (todo) => {
+  const kind = todo && todo.kind;
+  return TASK_KIND_IDS.has(kind) ? kind : 'backlog';
+};
+
+const taskTitle = (id) => {
+  for (const kind of TASK_KINDS) {
+    if (kind.id === id) return kind.title;
+  }
+  return TASK_KINDS[0].title;
+};
 const TOTAL_LABEL = 'total';
+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 isPathInScope = (rel, paths) => {
   if (!paths.length) return true;
@@ -19,26 +50,23 @@ const isPathInScope = (rel, paths) => {
   return false;
 };
 
-const itemPath = (item) => {
-  if (!item || !item.file) return '';
-  return item.file.newPath || item.file.oldPath || '';
-};
+const itemPath = (item) => item?.file?.newPath || item?.file?.oldPath || '';
 
 const listPath = (item) => listFilePath(itemPath(item));
 
-const isTodoItem = (item) => !!(item && item.origin === 'todo');
+const isTaskItem = (item) => item?.origin === 'task';
 
 const isReadOnlyOrigin = (origin) => origin === 'commit' || origin === 'pr';
 
-const isTodosEntry = (entry) => !!(entry && entry.kind === 'todos');
+const isTasksEntry = (entry) => entry?.kind === 'tasks';
 
-const isTotalEntry = (entry) => !!(entry && entry.kind === 'total');
+const isTotalEntry = (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,
@@ -46,58 +74,36 @@ const makeTodoItem = () => ({
     hunks: [],
   },
   hunk: null,
-  blockId: 'todo',
+  blockId: 'task',
   patchAdd: '',
   patchRevert: '',
 });
 
 const fileStatus = (origins) => {
-  const present = new Set(origins);
-  const seen = ORIGIN_ORDER.filter((origin) => present.has(origin));
+  const seen = ORIGIN_ORDER.filter((origin) => origins.includes(origin));
   const key = seen.join('+');
-  if (!key) return '';
-  if (key === 'staged+unstaged') return 'partial';
-  return key;
+  return key === 'staged+unstaged' ? 'partial' : key;
 };
 
 const lineDelta = ({ hunk, blockId }) => {
   const delta = { added: 0, removed: 0 };
-  if (!hunk) return delta;
-  const { lines } = hunk;
-  if (!lines) return delta;
+  if (!hunk || !hunk.lines) return delta;
   const scoped = typeof blockId === 'number';
-  for (const { type, blockId: lineBlock } of lines) {
-    if (scoped && lineBlock !== blockId) continue;
-    if (type === 'add') delta.added += 1;
-    else if (type === 'del') delta.removed += 1;
+  for (const line of hunk.lines) {
+    if (scoped && line.blockId !== blockId) continue;
+    if (line.type === 'add') delta.added += 1;
+    else if (line.type === 'del') delta.removed += 1;
   }
   return delta;
 };
 
-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`;
-  }
+  if (match) return shortUnit(match[1], match[2].toLowerCase());
   const brief = AGE_SHORT.exec(raw);
   if (brief) return `${brief[1]}${brief[2].toLowerCase()} ago`;
   return raw;
@@ -117,6 +123,18 @@ const relativeAge = (thenMs, nowMs = Date.now()) => {
   return shortUnit(Math.round(days / 365), 'year');
 };
 
+const emptyCounts = () => ({
+  remaining: 0,
+  added: 0,
+  removed: 0,
+  stagedAdded: 0,
+  stagedRemoved: 0,
+  unstagedAdded: 0,
+  unstagedRemoved: 0,
+  staged: 0,
+  unstaged: 0,
+});
+
 const addLineDelta = (group, origin, delta) => {
   group.added += delta.added;
   group.removed += delta.removed;
@@ -140,19 +158,12 @@ const originLineDelta = (entry) => {
   }
   const added = entry.added ?? 0;
   const removed = entry.removed ?? 0;
-  if ((entry.status ?? '') === 'staged') {
-    return {
-      stagedAdded: added,
-      stagedRemoved: removed,
-      unstagedAdded: 0,
-      unstagedRemoved: 0,
-    };
-  }
+  const staged = entry.status === 'staged';
   return {
-    stagedAdded: 0,
-    stagedRemoved: 0,
-    unstagedAdded: added,
-    unstagedRemoved: removed,
+    stagedAdded: staged ? added : 0,
+    stagedRemoved: staged ? removed : 0,
+    unstagedAdded: staged ? 0 : added,
+    unstagedRemoved: staged ? 0 : removed,
   };
 };
 
@@ -160,26 +171,12 @@ 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)) {
-      groups.set(rel, {
-        path: rel,
-        origins: [],
-        firstIndex: i,
-        openIndex: i,
-        remaining: 0,
-        added: 0,
-        removed: 0,
-        stagedAdded: 0,
-        stagedRemoved: 0,
-        unstagedAdded: 0,
-        unstagedRemoved: 0,
-        staged: 0,
-        unstaged: 0,
-        date: '',
-      });
+      const fields = { origins: [], firstIndex: i, openIndex: i };
+      groups.set(rel, { path: rel, ...fields, ...emptyCounts(), date: '' });
     }
     const group = groups.get(rel);
     const { origin } = item;
@@ -194,64 +191,50 @@ const fileEntries = (items) => {
     }
   }
   const entries = [...groups.values()];
-  for (const group of entries) {
-    group.status = fileStatus(group.origins);
-  }
+  for (const group of entries) group.status = fileStatus(group.origins);
   entries.sort((left, right) => left.path.localeCompare(right.path, 'en'));
   return entries;
 };
 
 const fileTotals = (files) => {
-  const total = {
-    path: TOTAL_LABEL,
-    kind: 'total',
-    status: '',
-    remaining: 0,
-    added: 0,
-    removed: 0,
-    stagedAdded: 0,
-    stagedRemoved: 0,
-    unstagedAdded: 0,
-    unstagedRemoved: 0,
-    staged: 0,
-    unstaged: 0,
-  };
+  const total = { path: TOTAL_LABEL, kind: 'total', status: '' };
+  Object.assign(total, emptyCounts());
   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;
-    const removed = entry.removed ?? 0;
     const lines = originLineDelta(entry);
     const listed = entry.unstaged ?? Math.max(0, remaining - staged);
-    const untracked = (entry.status ?? '') === 'untracked';
-    const unstaged = untracked && listed === 0 ? remaining : listed;
+    const untracked = entry.status === 'untracked';
     total.remaining += remaining;
-    total.added += added;
-    total.removed += removed;
+    total.added += entry.added ?? 0;
+    total.removed += entry.removed ?? 0;
     total.stagedAdded += lines.stagedAdded;
     total.stagedRemoved += lines.stagedRemoved;
     total.unstagedAdded += lines.unstagedAdded;
     total.unstagedRemoved += lines.unstagedRemoved;
     total.staged += staged;
-    total.unstaged += unstaged;
+    total.unstaged += untracked && listed === 0 ? remaining : listed;
   }
   return total;
 };
 
 module.exports = {
   REVIEW_DIR,
-  TODO_FILE,
-  REPO_TODOS_LABEL,
+  TASKS_FILE,
+  REPO_TASKS_LABEL,
+  TASK_KINDS,
+  taskKind,
+  taskTitle,
   TOTAL_LABEL,
   isPathInScope,
   itemPath,
   listPath,
-  isTodoItem,
+  isTaskItem,
   isReadOnlyOrigin,
-  isTodosEntry,
+  isTasksEntry,
   isTotalEntry,
-  makeTodoItem,
+  makeTaskItem,
   fileStatus,
   fileEntries,
   fileTotals,