reslop 0.1.4 → 0.1.5

package/lib/review.js

@@ -16,6 +16,8 @@ const FEED_BLOCK_ONLY = /^block (\d+)$/;
 const FEED_META = /^<!-- reslop:(.*) -->\s*$/;
 const FEED_SUFFIX = /^(.*) - (.+):(\d+):(\d+):(\d+)$/;
 const CHECK_ITEM = /^- \[([ xX])\] (.*)$/;
+const CODE_HEAD = /^- \[([ xX])\] code `([^`]+)`\s*$/;
+const FENCE_LINE = /^(`{3,})\s*$/;
 const FILE_QUOTE = /^> (.+)$/;
 const STATUS_LINE = /^status:\s*(\S+)\s*$/;
 const GIT_ORIGINS = ['unstaged', 'staged', 'untracked', 'commit', 'pr'];
@@ -28,6 +30,7 @@ const AGENT_INSTRUCTIONS = [
   'Execute reviews with `status: ready` or `status: partial`.',
   'Do not start `editing` or `done` review files.',
   'Work through unchecked items. After finishing one, mark it `[x]`.',
+  'For `code` items, replace added lines at that location with the fence.',
   'Set `status` to `partial` if some remain, or `done` if all are `[x]`.',
   'Do not redo items already marked `[x]`.',
 ].join('\n');
@@ -169,13 +172,14 @@ const createStore = (reviewPath, templates = []) => ({
   dirty: false,
   nextTodoId: 1,
   feedback: new Map(),
+  code: new Map(),
   todos: [],
   templates: [...templates],
   status: 'editing',
 });
 
 const noteCounts = (store) => {
-  const counts = { feedback: 0, todo: 0 };
+  const counts = { feedback: 0, todo: 0, code: 0 };
   if (!store) return counts;
   for (const todo of store.todos) {
     if (todo.text.trim()) counts.todo += 1;
@@ -183,12 +187,13 @@ const noteCounts = (store) => {
   for (const note of store.feedback.values()) {
     if (note.text.trim()) counts.feedback += 1;
   }
+  counts.code = store.code.size;
   return counts;
 };
 
 const hasNotes = (store) => {
   const counts = noteCounts(store);
-  return counts.feedback > 0 || counts.todo > 0;
+  return counts.feedback > 0 || counts.todo > 0 || counts.code > 0;
 };
 
 const rememberTemplate = (store, prevText, nextText) => {
@@ -224,6 +229,29 @@ const setFeedback = (store, key, note) => {
   store.dirty = true;
 };
 
+const setCode = (store, key, note) => {
+  const prev = store.code.get(key);
+  if (note.clear) {
+    if (!prev) return;
+    store.code.delete(key);
+    store.dirty = true;
+    return;
+  }
+  const text = note.text ?? '';
+  if (prev && prev.text === text) return;
+  store.code.set(key, {
+    file: note.file,
+    oldStart: note.oldStart ?? 0,
+    newStart: note.newStart ?? 0,
+    blockId: note.blockId ?? 0,
+    origin: note.origin ?? '',
+    header: note.header ?? '',
+    text,
+    done: note.done ?? prev?.done ?? false,
+  });
+  store.dirty = true;
+};
+
 const addTodo = (store, file, text = '') => {
   const id = store.nextTodoId;
   store.nextTodoId += 1;
@@ -330,6 +358,20 @@ const storeFeedback = (store, note, key) => {
   store.feedback.set(key || feedbackKey(next), next);
 };
 
+const storeCode = (store, note, key) => {
+  const next = {
+    file: note.file,
+    oldStart: note.oldStart ?? 0,
+    newStart: note.newStart ?? 0,
+    blockId: note.blockId ?? 0,
+    origin: note.origin ?? '',
+    header: note.header ?? '',
+    text: note.text,
+    done: note.done ?? false,
+  };
+  store.code.set(key || feedbackKey(next), next);
+};
+
 const feedbackLine = (note) => {
   const loc = feedbackKey(note);
   return `${checkboxLine(note.text, note.done)} - ${loc}`;
@@ -368,7 +410,7 @@ const parseFeedSuffix = (textItem) => {
 const fileGroup = (groups, file) => {
   let group = groups.get(file);
   if (!group) {
-    group = { todos: [], feedback: [] };
+    group = { todos: [], feedback: [], code: [] };
     groups.set(file, group);
   }
   return group;
@@ -385,6 +427,10 @@ const groupReviewNotes = (store) => {
     if (!note.text.trim()) continue;
     fileGroup(groups, note.file).feedback.push({ key, note });
   }
+  for (const key of store.code.keys()) {
+    const note = store.code.get(key);
+    fileGroup(groups, note.file).code.push({ key, note });
+  }
   return groups;
 };
 
@@ -405,6 +451,26 @@ const reviewHeader = (store) => {
   ];
 };
 
+const fenceFor = (text) => {
+  let n = 3;
+  for (const line of text.split('\n')) {
+    const match = /^(`{3,})/.exec(line);
+    if (!match) continue;
+    if (match[1].length >= n) n = match[1].length + 1;
+  }
+  return '`'.repeat(n);
+};
+
+const emitCodeItem = (lines, note) => {
+  const loc = feedbackKey(note);
+  const mark = note.done ? 'x' : ' ';
+  const fence = fenceFor(note.text);
+  lines.push(`- [${mark}] code \`${loc}\``);
+  lines.push(fence);
+  if (note.text !== '') lines.push(note.text);
+  lines.push(fence);
+};
+
 const emitReviewGroups = (lines, groups) => {
   for (const file of groups.keys()) {
     const group = groups.get(file);
@@ -416,6 +482,9 @@ const emitReviewGroups = (lines, groups) => {
     for (const item of group.feedback) {
       lines.push(feedbackLine(item.note));
     }
+    for (const item of group.code) {
+      emitCodeItem(lines, item.note);
+    }
     lines.push('');
   }
 };
@@ -543,18 +612,90 @@ const applyReviewLine = (store, file, section, pending, line) => {
   return { file, section, pending };
 };
 
+const startCodePending = (line) => {
+  const match = CODE_HEAD.exec(line);
+  if (!match) return null;
+  const loc = parseLoc(match[2]);
+  if (!loc) return null;
+  return {
+    done: isDoneMark(match[1]),
+    origin: loc.origin,
+    file: loc.file,
+    oldStart: loc.oldStart,
+    newStart: loc.newStart,
+    blockId: loc.blockId,
+    open: '',
+    lines: [],
+  };
+};
+
+const storeCodeNote = (store, pending, text) => {
+  storeCode(store, {
+    file: pending.file,
+    oldStart: pending.oldStart,
+    newStart: pending.newStart,
+    blockId: pending.blockId,
+    origin: pending.origin,
+    header: '',
+    text,
+    done: pending.done,
+  });
+};
+
+const flushPendingCode = (store, pending) => {
+  if (!pending) return;
+  const text = pending.open ? pending.lines.join('\n') : '';
+  storeCodeNote(store, pending, text);
+};
+
+const takeCodeLine = (store, pending, line) => {
+  const fence = FENCE_LINE.exec(line);
+  if (!pending.open) {
+    if (fence) {
+      pending.open = fence[1];
+      return pending;
+    }
+    if (!line.trim()) return pending;
+    storeCodeNote(store, pending, '');
+    return 'fallthrough';
+  }
+  if (fence && fence[1].length >= pending.open.length) {
+    storeCodeNote(store, pending, pending.lines.join('\n'));
+    return null;
+  }
+  pending.lines.push(line);
+  return pending;
+};
+
 const parseReview = (text, reviewPath, templates = []) => {
   const store = createStore(reviewPath, templates);
   store.status = parseFrontmatterStatus(text) || 'editing';
   let file = '';
   let section = '';
   let pending = null;
+  let pendingCode = null;
   for (const line of text.split('\n')) {
+    if (pendingCode) {
+      const nextCode = takeCodeLine(store, pendingCode, line);
+      if (nextCode === 'fallthrough') {
+        pendingCode = null;
+      } else {
+        pendingCode = nextCode;
+        continue;
+      }
+    }
+    const started = startCodePending(line);
+    if (started) {
+      pending = flushPendingFeedback(store, pending);
+      pendingCode = started;
+      continue;
+    }
     const next = applyReviewLine(store, file, section, pending, line);
     file = next.file;
     section = next.section;
     pending = next.pending;
   }
+  flushPendingCode(store, pendingCode);
   flushPendingFeedback(store, pending);
   store.dirty = false;
   return store;
@@ -679,6 +820,7 @@ module.exports = {
   hasNotes,
   rememberTemplate,
   setFeedback,
+  setCode,
   addTodo,
   removeTodo,
   setTodoText,

package/lib/select.js

@@ -7,12 +7,6 @@ const { fg: fgSeq, bg: bgSeq, seq } = ansi;
 const { stripAnsi, graphemes, graphemeWidth } = ansi;
 
 const CSI_FINAL = /[@-~]/;
-const SGR_RESET = 0;
-const SGR_FG = 38;
-const SGR_BG = 48;
-const SGR_DEFAULT_FG = 39;
-const SGR_DEFAULT_BG = 49;
-const SGR_TRUECOLOR = 2;
 
 const isRange = (sel) => {
   if (!sel || !sel.start || !sel.end) return false;
@@ -81,7 +75,8 @@ const parseParams = (body) => {
 };
 
 const applyRgb = (state, field, params, i) => {
-  const isTruecolor = params[i + 1] === SGR_TRUECOLOR;
+  const TRUECOLOR = 2;
+  const isTruecolor = params[i + 1] === TRUECOLOR;
   const hasRgb = isTruecolor && i + 4 < params.length;
   if (!hasRgb) return 1;
   state[field] = [params[i + 2], params[i + 3], params[i + 4]];
@@ -89,18 +84,18 @@ const applyRgb = (state, field, params, i) => {
 };
 
 const SGR = {
-  [SGR_RESET]: (state) => {
+  0: (state) => {
     state.fg = null;
     state.bg = null;
     return 1;
   },
-  [SGR_FG]: (state, params, i) => applyRgb(state, 'fg', params, i),
-  [SGR_BG]: (state, params, i) => applyRgb(state, 'bg', params, i),
-  [SGR_DEFAULT_FG]: (state) => {
+  38: (state, params, i) => applyRgb(state, 'fg', params, i),
+  48: (state, params, i) => applyRgb(state, 'bg', params, i),
+  39: (state) => {
     state.fg = null;
     return 1;
   },
-  [SGR_DEFAULT_BG]: (state) => {
+  49: (state) => {
     state.bg = null;
     return 1;
   },