reslop 0.2.5 → 0.2.7

package/lib/files.js

@@ -6,9 +6,44 @@ const { listFilePath } = manifest;
 const REVIEW_DIR = '.review';
 const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit', 'pr'];
 const TASKS_FILE = 'TODOs';
-const REPO_TASKS_LABEL =
-  'Project Tasks: Backlog, Issues, Bug Reports, Feature Requests';
+const REPO_TASKS_LABEL = [
+  'Project Tasks: Feature requests, Bug reports,',
+  'Technical debt, Research, Security',
+].join(' ');
+const TASK_KINDS = [
+  { id: 'features', title: 'Feature requests' },
+  { id: 'bugs', title: 'Bug reports' },
+  { id: 'debt', title: 'Technical debt' },
+  { id: 'research', title: 'Research' },
+  { id: 'security', title: 'Security' },
+];
+const TASK_KIND_IDS = new Set(TASK_KINDS.map((kind) => kind.id));
+const TASK_KIND_ALIAS = { backlog: 'debt', issues: 'debt' };
+
+const taskKind = (todo) => {
+  const kind = todo && todo.kind;
+  if (TASK_KIND_IDS.has(kind)) return kind;
+  return TASK_KIND_ALIAS[kind] ?? 'debt';
+};
+
+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;
@@ -20,20 +55,17 @@ 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 isTaskItem = (item) => !!(item && item.origin === 'task');
+const isTaskItem = (item) => item?.origin === 'task';
 
 const isReadOnlyOrigin = (origin) => origin === 'commit' || origin === 'pr';
 
-const isTasksEntry = (entry) => !!(entry && entry.kind === 'tasks');
+const isTasksEntry = (entry) => entry?.kind === 'tasks';
 
-const isTotalEntry = (entry) => !!(entry && entry.kind === 'total');
+const isTotalEntry = (entry) => entry?.kind === 'total';
 
 const makeTaskItem = () => ({
   origin: 'task',
@@ -53,52 +85,30 @@ const makeTaskItem = () => ({
 });
 
 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;
@@ -118,6 +128,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;
@@ -141,19 +163,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,
   };
 };
 
@@ -165,22 +180,8 @@ const fileEntries = (items) => {
     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;
@@ -195,47 +196,30 @@ 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 (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;
 };
@@ -244,6 +228,9 @@ module.exports = {
   REVIEW_DIR,
   TASKS_FILE,
   REPO_TASKS_LABEL,
+  TASK_KINDS,
+  taskKind,
+  taskTitle,
   TOTAL_LABEL,
   isPathInScope,
   itemPath,
@@ -254,6 +241,7 @@ module.exports = {
   isTotalEntry,
   makeTaskItem,
   fileStatus,
+  lineDelta,
   fileEntries,
   fileTotals,
   relativeAge,

package/lib/find.js

@@ -0,0 +1,61 @@
+'use strict';
+
+const matchesIn = (text, query) => {
+  const spans = [];
+  if (!query || !text) return spans;
+  const hay = text.toLowerCase();
+  const needle = query.toLowerCase();
+  const step = needle.length;
+  let from = 0;
+  while (from <= hay.length - step) {
+    const at = hay.indexOf(needle, from);
+    if (at < 0) break;
+    spans.push({ start: at, end: at + step });
+    from = at + step;
+  }
+  return spans;
+};
+
+const fileMatches = (entries, query) => {
+  const hits = [];
+  if (!query) return hits;
+  for (let index = 0; index < entries.length; index++) {
+    const entry = entries[index];
+    const path = entry && entry.path ? entry.path : '';
+    if (!path) continue;
+    for (const span of matchesIn(path, query)) {
+      hits.push({ index, path, start: span.start, end: span.end });
+    }
+  }
+  return hits;
+};
+
+const activeHit = (entries, find) => {
+  if (!find || !find.query) return null;
+  const hits = fileMatches(entries, find.query);
+  if (!hits.length) return null;
+  const count = hits.length;
+  let at = find.at % count;
+  if (at < 0) at += count;
+  return hits[at];
+};
+
+const keptPrefix = (shown, full) => {
+  const mark = shown.endsWith('…') && shown !== full ? 1 : 0;
+  const keep = shown.length - mark;
+  if (!full.startsWith(shown.slice(0, keep))) return -1;
+  return keep;
+};
+
+const spansFor = (shown, full, query, hit) => {
+  const spans = matchesIn(shown, query);
+  if (!hit || hit.path !== full) return spans;
+  const keep = keptPrefix(shown, full);
+  if (keep < 0 || hit.start >= keep) return spans;
+  return spans.map((span) => ({
+    ...span,
+    on: span.start === hit.start,
+  }));
+};
+
+module.exports = { matchesIn, fileMatches, activeHit, spansFor };