reslop 0.2.4 → 0.2.5

package/lib/editor.js

@@ -62,15 +62,52 @@ 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 ?? 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) {
@@ -81,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) {
@@ -95,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];
@@ -106,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));
@@ -148,7 +202,9 @@ class Editor {
     if (col >= this.scrollCol + room) this.scrollCol = col - room + 1;
   }
 
-  moveLine(delta, width) {
+  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);
@@ -169,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

@@ -5,8 +5,9 @@ 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 TOTAL_LABEL = 'total';
 
 const isPathInScope = (rel, paths) => {
@@ -26,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,
@@ -46,7 +47,7 @@ const makeTodoItem = () => ({
     hunks: [],
   },
   hunk: null,
-  blockId: 'todo',
+  blockId: 'task',
   patchAdd: '',
   patchRevert: '',
 });
@@ -160,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)) {
@@ -217,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;
@@ -241,17 +242,17 @@ 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,

package/lib/git-deps.js

@@ -127,73 +127,61 @@ const hasDepFile = (items) => {
   return false;
 };
 
-const collectAudit = (top) => {
-  const lock = path.join(top, LOCKFILE);
-  if (!fs.existsSync(lock)) return null;
-  const args = ['audit', '--json', '--package-lock-only'];
-  const text = runNpmJson(top, args, AUDIT_MS);
-  return parseAuditReport(text);
+const NPM_REPORT = {
+  audit: {
+    file: LOCKFILE,
+    args: ['audit', '--json', '--package-lock-only'],
+    parse: parseAuditReport,
+  },
+  outdated: {
+    file: MANIFEST,
+    args: ['outdated', '--json', '--long'],
+    parse: parseOutdatedReport,
+  },
 };
 
-const collectOutdated = (top) => {
-  const manifest = path.join(top, MANIFEST);
-  if (!fs.existsSync(manifest)) return null;
-  const args = ['outdated', '--json', '--long'];
-  const text = runNpmJson(top, args, AUDIT_MS);
-  return parseOutdatedReport(text);
+const collectReport = (top, kind) => {
+  const { file, args, parse } = NPM_REPORT[kind];
+  if (!fs.existsSync(path.join(top, file))) return null;
+  return parse(runNpmJson(top, args, AUDIT_MS));
 };
 
-const collectAuditAsync = async (top, extra, signal) => {
-  if (extra.auditMap !== undefined) return extra.auditMap;
-  const lock = path.join(top, LOCKFILE);
-  if (!fs.existsSync(lock)) return null;
-  const args = ['audit', '--json', '--package-lock-only'];
-  const text = await runNpmJsonAsync(top, args, AUDIT_MS, signal);
-  return parseAuditReport(text);
+const collectReportAsync = async (top, kind, signal) => {
+  const { file, args, parse } = NPM_REPORT[kind];
+  if (!fs.existsSync(path.join(top, file))) return null;
+  return parse(await runNpmJsonAsync(top, args, AUDIT_MS, signal));
 };
 
-const collectOutdatedAsync = async (top, extra, signal) => {
-  if (extra.outdatedMap !== undefined) return extra.outdatedMap;
-  const manifest = path.join(top, MANIFEST);
-  if (!fs.existsSync(manifest)) return null;
-  const args = ['outdated', '--json', '--long'];
-  const text = await runNpmJsonAsync(top, args, AUDIT_MS, signal);
-  return parseOutdatedReport(text);
-};
-
-const pickNpmMap = (override, collect, top) => {
-  if (override !== undefined) return override;
-  return collect(top);
+const extrasNeeds = (items, rev, extra) => {
+  const live = extra.audit === true && !rev;
+  const hasDepDiff = hasDepFile(items);
+  const audit = live || (Boolean(extra.audit) && hasDepDiff);
+  return { live, scan: live || hasDepDiff, audit };
 };
 
 const foldLoaded = (items, top, rev, extra = {}) => {
   const readSides = (origin, rel) => readDepSides(top, rev, origin, rel);
-  const live = extra.audit === true && !rev;
-  const hasDepDiff = hasDepFile(items);
+  const needs = extrasNeeds(items, rev, extra);
   const collect = extra.collect !== false;
-  let usedNames = extra.usedNames ?? null;
-  let audit = extra.auditMap;
-  let outdated = extra.outdatedMap;
-  let exportEntries = extra.exportEntries;
-  if (collect && usedNames === null && (hasDepDiff || live)) {
-    usedNames = collectUsedNames(top);
-  }
-  if (collect && exportEntries === undefined && (hasDepDiff || live)) {
+  const scan = collect && needs.scan;
+  const usedNames = extra.usedNames ?? (scan ? collectUsedNames(top) : null);
+  let { exportEntries, auditMap: audit, outdatedMap: outdated } = extra;
+  if (scan && exportEntries === undefined) {
     exportEntries = collectExportMeta(top);
   }
-  if (collect && live) {
-    audit = pickNpmMap(extra.auditMap, collectAudit, top);
-    outdated = pickNpmMap(extra.outdatedMap, collectOutdated, top);
-  } else if (collect && extra.audit && hasDepDiff) {
-    audit = pickNpmMap(extra.auditMap, collectAudit, top);
+  if (collect && needs.audit && audit === undefined) {
+    audit = collectReport(top, 'audit');
+  }
+  if (collect && needs.live && outdated === undefined) {
+    outdated = collectReport(top, 'outdated');
   }
-  if (audit === undefined) audit = null;
-  if (outdated === undefined) outdated = null;
+  audit ??= null;
+  outdated ??= null;
   const folded = foldDepItems(items, readSides, usedNames, audit, outdated, {
     root: top,
     exportEntries,
   });
-  if (!live) return folded;
+  if (!needs.live) return folded;
   if (!isPathInScope(MANIFEST, extra.paths ?? [])) return folded;
   const pkgText = worktreeText(top, MANIFEST);
   const lockText = worktreeText(top, LOCKFILE);
@@ -201,12 +189,8 @@ const foldLoaded = (items, top, rev, extra = {}) => {
   return mergeProposedItems(folded, pkgText, outdated, audit, options);
 };
 
-const needsExtras = (parsed, rev, extra) => {
-  const live = extra.audit === true && !rev;
-  if (live) return true;
-  if (!extra.audit) return false;
-  return hasDepFile(parsed);
-};
+const needsExtras = (parsed, rev, extra) =>
+  extrasNeeds(parsed, rev, extra).audit;
 
 const finishLoad = (snapshot, extra) => {
   const options = { ...extra, paths: extra.paths ?? [] };
@@ -219,42 +203,29 @@ const finishLoad = (snapshot, extra) => {
   return { ...snapshot, items, pending };
 };
 
-const extrasMetaOf = (parsed, rev, extra, top, signal) => {
-  const live = extra.audit === true && !rev;
-  const hasDepDiff = hasDepFile(parsed);
-  const needScan = live || hasDepDiff;
-  let usedNames = Promise.resolve(null);
-  if (needScan) {
-    usedNames = Promise.resolve().then(() => collectUsedNames(top));
-  }
-  let exportEntries = Promise.resolve(undefined);
-  if (extra.exportEntries !== undefined) {
-    exportEntries = Promise.resolve(extra.exportEntries);
-  } else if (needScan) {
-    exportEntries = Promise.resolve().then(() => collectExportMeta(top));
-  }
-  let audit = Promise.resolve(null);
-  if (live || (extra.audit && hasDepDiff)) {
-    audit = collectAuditAsync(top, extra, signal);
-  }
-  let outdated = Promise.resolve(null);
-  if (live) {
-    outdated = collectOutdatedAsync(top, extra, signal);
-  }
-  return { usedNames, audit, outdated, exportEntries };
+const later = (fn) => Promise.resolve().then(fn);
+
+const reportTask = (wanted, known, collect) => {
+  if (!wanted) return null;
+  return known === undefined ? collect() : known;
 };
 
 const loadExtras = async (snapshot, extra = {}) => {
-  const top = snapshot.top;
-  const rev = snapshot.rev;
-  const parsed = snapshot.parsed;
-  const signal = extra.signal;
-  const tasks = extrasMetaOf(parsed, rev, extra, top, signal);
+  const { top, rev, parsed } = snapshot;
+  const { signal } = extra;
+  const needs = extrasNeeds(parsed, rev, extra);
+  const known = extra.exportEntries;
   const [usedNames, audit, outdated, exportEntries] = await Promise.all([
-    tasks.usedNames,
-    tasks.audit,
-    tasks.outdated,
-    tasks.exportEntries,
+    needs.scan ? later(() => collectUsedNames(top)) : null,
+    reportTask(needs.audit, extra.auditMap, () =>
+      collectReportAsync(top, 'audit', signal),
+    ),
+    reportTask(needs.live, extra.outdatedMap, () =>
+      collectReportAsync(top, 'outdated', signal),
+    ),
+    known === undefined && needs.scan
+      ? later(() => collectExportMeta(top))
+      : known,
   ]);
   if (signal && signal.aborted) throw abortError();
   const folded = foldLoaded(parsed, top, rev, {
@@ -498,25 +469,17 @@ const revertFile = (top, rel, items) => {
 };
 
 module.exports = {
-  hasProposed,
   itemsForPath,
   finishLoad,
   loadExtras,
   captureFile,
   restoreFile,
   applyProposedUpdate,
-  applyProposedUpdateAsync,
-  applyDepChange,
   addItem,
   addItemAsync,
   unstageItem,
   revertDepItem,
   revertFile,
-  AUDIT_MS,
   INSTALL_MS,
-  runNpm,
-  runNpmAsync,
-  runNpmJson,
-  runNpmJsonAsync,
   proposedNpmPlan,
 };

package/lib/github.js

@@ -216,26 +216,26 @@ const summaryToTodo = (record) => {
 
 const discussionToNotes = (discussion, items, paths = []) => {
   const feedback = [];
-  const todos = [];
+  const tasks = [];
   const resolvedById = discussion.resolvedById ?? new Map();
   const reviewComments = discussion.reviewComments ?? [];
   for (const comment of reviewComments) {
     const note = reviewCommentToNote(comment, items, resolvedById, paths);
     if (!note) continue;
     if (note.kind === 'feedback') feedback.push(note);
-    else todos.push(note);
+    else tasks.push(note);
   }
   const reviews = discussion.reviews ?? [];
   for (const review of reviews) {
-    const todo = summaryToTodo(review);
-    if (todo) todos.push(todo);
+    const task = summaryToTodo(review);
+    if (task) tasks.push(task);
   }
   const issueComments = discussion.issueComments ?? [];
   for (const comment of issueComments) {
-    const todo = summaryToTodo(comment);
-    if (todo) todos.push(todo);
+    const task = summaryToTodo(comment);
+    if (task) tasks.push(task);
   }
-  return { feedback, todos };
+  return { feedback, tasks };
 };
 
 const loadReviewThreads = async (pr, options) => {

package/lib/gitlab.js

@@ -161,7 +161,7 @@ const noteToImported = (note, items, paths) => {
 
 const discussionToNotes = (discussions, items, paths = []) => {
   const feedback = [];
-  const todos = [];
+  const tasks = [];
   const threads = discussions ?? [];
   for (const discussion of threads) {
     if (!isRecord(discussion)) continue;
@@ -170,10 +170,10 @@ const discussionToNotes = (discussions, items, paths = []) => {
       const mapped = noteToImported(note, items, paths);
       if (!mapped) continue;
       if (mapped.kind === 'feedback') feedback.push(mapped);
-      else todos.push(mapped);
+      else tasks.push(mapped);
     }
   }
-  return { feedback, todos };
+  return { feedback, tasks };
 };
 
 const loadDiscussion = async (mr, options) => {

package/lib/highlight/core.js

@@ -41,6 +41,16 @@ const emit = (out, style, text) => {
   out.push({ text, style: style || 'plain' });
 };
 
+const highlightLines = (highlightLine) => (source) => {
+  const lines = source.split('\n');
+  const out = [];
+  for (let i = 0; i < lines.length; i += 1) {
+    if (i) emit(out, 'plain', '\n');
+    for (const t of highlightLine(lines[i])) out.push(t);
+  }
+  return out;
+};
+
 const tokensText = (out) => {
   let s = '';
   for (const t of out) s += t.text;
@@ -177,6 +187,7 @@ module.exports = {
   ANY_QUOTE,
   EXPECT_STYLE,
   emit,
+  highlightLines,
   tokensText,
   wordStyle,
   peekIdent,

package/lib/highlight/dot.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const core = require('./core.js');
-const { emit } = core;
+const { emit, highlightLines } = core;
 
 const highlightDotLine = (line) => {
   if (!line) return [];
@@ -30,16 +30,6 @@ const highlightDotLine = (line) => {
   return out;
 };
 
-const highlight = (source) => {
-  const lines = source.split('\n');
-  const out = [];
-  for (let i = 0; i < lines.length; i += 1) {
-    if (i) emit(out, 'plain', '\n');
-    for (const t of highlightDotLine(lines[i])) out.push(t);
-  }
-  return out;
-};
-
 module.exports = {
   langs: ['dot'],
   aliases: {
@@ -51,5 +41,5 @@ module.exports = {
     yml: 'dot',
     toml: 'dot',
   },
-  highlight,
+  highlight: highlightLines(highlightDotLine),
 };

package/lib/highlight/log.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const core = require('./core.js');
-const { emit } = core;
+const { emit, highlightLines } = core;
 
 const LOG_DATETIME_RE = new RegExp(
   '^(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}' +
@@ -46,14 +46,7 @@ const highlightLogLine = (line) => {
   return out;
 };
 
-const highlight = (source) => {
-  const lines = source.split('\n');
-  const out = [];
-  for (let i = 0; i < lines.length; i += 1) {
-    if (i) emit(out, 'plain', '\n');
-    for (const t of highlightLogLine(lines[i])) out.push(t);
-  }
-  return out;
+module.exports = {
+  langs: ['log'],
+  highlight: highlightLines(highlightLogLine),
 };
-
-module.exports = { langs: ['log'], highlight };

package/lib/highlight/txt.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const core = require('./core.js');
-const { emit } = core;
+const { emit, highlightLines } = core;
 
 const highlightTxtLine = (line) => {
   if (!line) return [];
@@ -20,18 +20,8 @@ const highlightTxtLine = (line) => {
   return out;
 };
 
-const highlight = (source) => {
-  const lines = source.split('\n');
-  const out = [];
-  for (let i = 0; i < lines.length; i += 1) {
-    if (i) emit(out, 'plain', '\n');
-    for (const t of highlightTxtLine(lines[i])) out.push(t);
-  }
-  return out;
-};
-
 module.exports = {
   langs: ['txt', 'py', 'md'],
   aliases: { text: 'txt', plain: 'txt', markdown: 'md', python: 'py' },
-  highlight,
+  highlight: highlightLines(highlightTxtLine),
 };