reslop 0.1.0 → 0.1.2

package/lib/review.js

@@ -3,17 +3,13 @@
 const fs = require('node:fs');
 const path = require('node:path');
 
-const { itemPath } = require('./files.js');
+const { itemPath, REVIEW_DIR } = require('./files.js');
 
-const REVIEW_DIR = '.review';
 const TEMPLATES_FILE = 'templates.json';
 const TEMPLATE_SHOW = 5;
 const AUTOSAVE_MS = 3000;
 const REVIEW_NAME = /^(\d{4}-\d{2}-\d{2})-(\d+)\.md$/;
 const REVIEW_STATUSES = ['editing', 'ready', 'partial', 'done'];
-const STATUS_ALIAS = Object.assign(Object.create(null), {
-  pending: 'ready',
-});
 const FEED_HEAD = /^### Feedback `([^`]+)` \+(\d+) \((.*)\)\s*$/;
 const FEED_BLOCK = /^(.*), block (\d+)$/;
 const FEED_BLOCK_ONLY = /^block (\d+)$/;
@@ -22,11 +18,11 @@ const FEED_SUFFIX = /^(.*) - (.+):(\d+):(\d+):(\d+)$/;
 const CHECK_ITEM = /^- \[([ xX])\] (.*)$/;
 const FILE_QUOTE = /^> (.+)$/;
 const STATUS_LINE = /^status:\s*(\S+)\s*$/;
-const GIT_ORIGINS = ['unstaged', 'staged', 'untracked', 'commit'];
-const SECTION_LINE = Object.assign(Object.create(null), {
+const GIT_ORIGINS = ['unstaged', 'staged', 'untracked', 'commit', 'pr'];
+const SECTION_LINE = {
   '### Todo': 'todo',
   '### Feedback': 'feedback',
-});
+};
 
 const AGENT_INSTRUCTIONS = [
   'Execute reviews with `status: ready` or `status: partial`.',
@@ -94,7 +90,7 @@ const latestReviewName = (names) => {
 
 const canonicalStatus = (raw) => {
   if (!raw) return '';
-  const name = STATUS_ALIAS[raw] ?? raw;
+  const name = raw === 'pending' ? 'ready' : raw;
   if (REVIEW_STATUSES.includes(name)) return name;
   return '';
 };
@@ -116,7 +112,8 @@ const parseFrontmatterStatus = (text) => {
 
 const readReviewStatus = (reviewPath, readFileSync = fs.readFileSync) => {
   try {
-    return parseFrontmatterStatus(readFileSync(reviewPath, 'utf8'));
+    const text = readFileSync(reviewPath, 'utf8');
+    return parseFrontmatterStatus(text);
   } catch {
     return '';
   }
@@ -133,10 +130,9 @@ const resolveReviewPath = (dir, date, existingNames, options = {}) => {
       if (status === 'editing') return { reviewPath, resume: true };
     }
   }
-  return {
-    reviewPath: allocateReviewPath(dir, date, existingNames),
-    resume: false,
-  };
+  const reviewPath = allocateReviewPath(dir, date, existingNames);
+  const resume = false;
+  return { reviewPath, resume };
 };
 
 const rankedTemplates = (templates) => {
@@ -294,6 +290,32 @@ const feedbackKey = (note) => {
   return `${file}:${oldStart}:${newStart}:${block}`;
 };
 
+const applyImportedNotes = (store, imported) => {
+  if (!store || !imported) return;
+  const feedbacks = imported.feedback ?? [];
+  for (const note of feedbacks) {
+    const key = feedbackKey(note);
+    const prev = store.feedback.get(key);
+    const text = prev ? `${prev.text}\n\n${note.text}` : note.text;
+    const done = prev ? prev.done && !!note.done : !!note.done;
+    setFeedback(store, key, {
+      file: note.file,
+      oldStart: note.oldStart ?? 0,
+      newStart: note.newStart ?? 0,
+      blockId: note.blockId ?? 0,
+      origin: note.origin ?? '',
+      header: note.header ?? '',
+      text,
+      done,
+    });
+  }
+  const todos = imported.todos ?? [];
+  for (const todo of todos) {
+    const added = addTodo(store, todo.file || '', todo.text ?? '');
+    if (todo.done) added.done = true;
+  }
+};
+
 const storeFeedback = (store, note, key) => {
   const next = {
     file: note.file,
@@ -328,25 +350,19 @@ const parseLoc = (raw) => {
     fileParts = fileParts.slice(1);
   }
   if (!fileParts.length) return null;
-  return {
-    origin,
-    file: fileParts.join(':'),
-    oldStart,
-    newStart,
-    blockId,
-  };
+  const file = fileParts.join(':');
+  return { origin, file, oldStart, newStart, blockId };
 };
 
 const parseFeedSuffix = (textItem) => {
   const match = FEED_SUFFIX.exec(textItem);
   if (!match) return null;
-  return {
-    text: match[1],
-    file: match[2],
-    oldStart: toInt(match[3]),
-    newStart: toInt(match[4]),
-    blockId: toInt(match[5]),
-  };
+  const text = match[1];
+  const file = match[2];
+  const oldStart = toInt(match[3]);
+  const newStart = toInt(match[4]);
+  const blockId = toInt(match[5]);
+  return { text, file, oldStart, newStart, blockId };
 };
 
 const fileGroup = (groups, file) => {
@@ -364,7 +380,8 @@ const groupReviewNotes = (store) => {
     if (!todo.text.trim()) continue;
     fileGroup(groups, todo.file).todos.push(todo);
   }
-  for (const [key, note] of store.feedback) {
+  for (const key of store.feedback.keys()) {
+    const note = store.feedback.get(key);
     if (!note.text.trim()) continue;
     fileGroup(groups, note.file).feedback.push({ key, note });
   }
@@ -389,7 +406,8 @@ const reviewHeader = (store) => {
 };
 
 const emitReviewGroups = (lines, groups) => {
-  for (const [file, group] of groups) {
+  for (const file of groups.keys()) {
+    const group = groups.get(file);
     lines.push(`## ${file}`);
     lines.push('');
     for (const todo of group.todos) {
@@ -422,12 +440,9 @@ const parseFeedbackHeading = (line) => {
   if (!withHead) {
     return { file, newStart, header: rest, blockId: 0 };
   }
-  return {
-    file,
-    newStart,
-    header: withHead[1],
-    blockId: toInt(withHead[2]),
-  };
+  const header = withHead[1];
+  const blockId = toInt(withHead[2]);
+  return { file, newStart, header, blockId };
 };
 
 const flushPendingFeedback = (store, pending) => {
@@ -649,19 +664,12 @@ const mergeTodos = (gitItems, todos, extraFiles = []) => {
 };
 
 module.exports = {
-  REVIEW_DIR,
-  TEMPLATES_FILE,
   TEMPLATE_SHOW,
   AUTOSAVE_MS,
-  REVIEW_STATUSES,
-  AGENT_INSTRUCTIONS,
-  dateStamp,
   allocateReviewPath,
   listReviewNames,
-  compareReviewNames,
   latestReviewName,
   parseFrontmatterStatus,
-  readReviewStatus,
   resolveReviewPath,
   rankedTemplates,
   prefixTemplates,
@@ -674,14 +682,13 @@ module.exports = {
   addTodo,
   removeTodo,
   setTodoText,
-  isDoneMark,
   checkLabel,
   feedbackKey,
+  applyImportedNotes,
   serializeReview,
   parseReview,
   loadReview,
   loadTemplates,
   flushReview,
-  makeTodoItem,
   mergeTodos,
 };

package/lib/select.js

@@ -2,17 +2,9 @@
 
 const ansi = require('./ansi.js');
 
-const {
-  ESC,
-  RESET,
-  THEME,
-  fg: fgSeq,
-  bg: bgSeq,
-  seq,
-  stripAnsi,
-  graphemes,
-  graphemeWidth,
-} = ansi;
+const { ESC, RESET, THEME } = ansi;
+const { fg: fgSeq, bg: bgSeq, seq } = ansi;
+const { stripAnsi, graphemes, graphemeWidth } = ansi;
 
 const CSI_FINAL = /[@-~]/;
 const SGR_RESET = 0;
@@ -28,12 +20,12 @@ const isRange = (sel) => {
 };
 
 const ordered = (sel) => {
-  const a = sel.start;
-  const b = sel.end;
-  if (a.y < b.y) return [a, b];
-  if (a.y > b.y) return [b, a];
-  if (a.x <= b.x) return [a, b];
-  return [b, a];
+  const start = sel.start;
+  const end = sel.end;
+  if (start.y < end.y) return { first: start, last: end };
+  if (start.y > end.y) return { first: end, last: start };
+  if (start.x <= end.x) return { first: start, last: end };
+  return { first: end, last: start };
 };
 
 const slicePlain = (plain, fromCol, toCol) => {
@@ -51,25 +43,25 @@ const slicePlain = (plain, fromCol, toCol) => {
 };
 
 const lineRange = (rowIndex, sel) => {
-  const [a, b] = ordered(sel);
+  const { first, last } = ordered(sel);
   const y = rowIndex + 1;
-  if (y < a.y || y > b.y) return null;
+  if (y < first.y || y > last.y) return null;
   let from = 0;
-  let to = 1e9;
-  if (y === a.y) from = a.x - 1;
-  if (y === b.y) to = b.x;
+  let to = Infinity;
+  if (y === first.y) from = first.x - 1;
+  if (y === last.y) to = last.x;
   if (to <= from) return null;
   return { from, to };
 };
 
 const extractText = (rows, sel) => {
   if (!isRange(sel) || !rows || !rows.length) return '';
-  const [a, b] = ordered(sel);
+  const { first, last } = ordered(sel);
   const lines = [];
-  for (let r = a.y - 1; r <= b.y - 1; r++) {
-    const range = lineRange(r, sel);
+  for (let row = first.y - 1; row <= last.y - 1; row++) {
+    const range = lineRange(row, sel);
     if (!range) continue;
-    const plain = stripAnsi(rows[r] ?? '');
+    const plain = stripAnsi(rows[row] ?? '');
     const chunk = slicePlain(plain, range.from, range.to);
     lines.push(chunk.replace(/\s+$/g, ''));
   }
@@ -96,7 +88,7 @@ const applyRgb = (state, field, params, i) => {
   return 5;
 };
 
-const SGR = Object.assign(Object.create(null), {
+const SGR = {
   [SGR_RESET]: (state) => {
     state.fg = null;
     state.bg = null;
@@ -112,7 +104,7 @@ const SGR = Object.assign(Object.create(null), {
     state.bg = null;
     return 1;
   },
-});
+};
 
 const applySgr = (params, state) => {
   let i = 0;
@@ -210,9 +202,7 @@ const overlayRows = (rows, sel) => {
 
 module.exports = {
   isRange,
-  ordered,
   extractText,
-  overlayRows,
   overlayRange,
-  slicePlain,
+  overlayRows,
 };