reslop 0.1.0 → 0.1.2

package/lib/detect.js

@@ -46,9 +46,9 @@ const PROSE_BASENAMES = [
 
 const fileExt = (filePath) => {
   const base = path.basename(filePath || '');
-  const i = base.lastIndexOf('.');
-  if (i <= 0) return '';
-  return base.slice(i + 1).toLowerCase();
+  const dot = base.lastIndexOf('.');
+  if (dot <= 0) return '';
+  return base.slice(dot + 1).toLowerCase();
 };
 
 const mapLang = (name) => {
@@ -81,4 +81,4 @@ const detectLang = (filePath) => {
   return 'dot';
 };
 
-module.exports = { LANG, mapLang, detectLang, fileExt };
+module.exports = { mapLang, detectLang };

package/lib/diff.js

@@ -11,22 +11,29 @@ const PAIR_TOKEN_WEIGHT = 0.6;
 const WORD_REFINE_MIN = 0.6;
 const TOKEN_RE = /[A-Za-z_$][\w$]*|\d+|[^\s]/g;
 const PIECE_RE = /[A-Za-z_$][\w$]*|\d+|\s+|./g;
-const LINE_MARK = Object.assign(Object.create(null), {
+const LINE_MARK = {
   add: '+',
   del: '-',
   ctx: ' ',
-});
-const LINE_TYPE = Object.assign(Object.create(null), {
+  warn: ' ',
+  note: ' ',
+  noteSep: ' ',
+};
+const CTX_TYPES = ['ctx', 'warn', 'note', 'noteSep'];
+const LINE_TYPE = {
   '+': 'add',
   '-': 'del',
   ' ': 'ctx',
-});
-const INDEX_SIDE = Object.assign(Object.create(null), {
+};
+
+const isCtxType = (type) => CTX_TYPES.includes(type);
+const INDEX_SIDE = {
   staged: 'new',
   unstaged: 'old',
   untracked: 'old',
   commit: 'old',
-});
+  pr: 'old',
+};
 
 const collapseSpans = (parts) => {
   const spans = [];
@@ -235,27 +242,23 @@ const diffTokenMiddle = (midA, midB) => {
   return lcsSpans(midA, midB);
 };
 
-const joinTrimmedSpans = (prefix, mid, suffix) => {
-  const oldParts = [];
-  const newParts = [];
+const joinAffix = (prefix, mid, suffix) => {
+  const parts = [];
   if (prefix.length) {
-    const text = prefix.join('');
-    oldParts.push({ text, changed: false });
-    newParts.push({ text, changed: false });
+    parts.push({ text: prefix.join(''), changed: false });
   }
-  for (const span of mid.oldSpans) oldParts.push(span);
-  for (const span of mid.newSpans) newParts.push(span);
+  for (const span of mid) parts.push(span);
   if (suffix.length) {
-    const text = suffix.join('');
-    oldParts.push({ text, changed: false });
-    newParts.push({ text, changed: false });
+    parts.push({ text: suffix.join(''), changed: false });
   }
-  return {
-    oldSpans: collapseSpans(oldParts),
-    newSpans: collapseSpans(newParts),
-  };
+  return collapseSpans(parts);
 };
 
+const joinTrimmedSpans = (prefix, mid, suffix) => ({
+  oldSpans: joinAffix(prefix, mid.oldSpans, suffix),
+  newSpans: joinAffix(prefix, mid.newSpans, suffix),
+});
+
 const diffTokens = (a, b) => {
   if (a.length === 0 && b.length === 0) {
     return { oldSpans: [], newSpans: [] };
@@ -330,18 +333,6 @@ const spansFromWordOps = (ops) => {
   };
 };
 
-const joinAffix = (prefix, mid, suffix) => {
-  const parts = [];
-  if (prefix.length) {
-    parts.push({ text: prefix.join(''), changed: false });
-  }
-  for (const span of mid) parts.push(span);
-  if (suffix.length) {
-    parts.push({ text: suffix.join(''), changed: false });
-  }
-  return collapseSpans(parts);
-};
-
 const diffChars = (oldText, newText) => {
   const a = splitPieces(oldText);
   const b = splitPieces(newText);
@@ -349,18 +340,7 @@ const diffChars = (oldText, newText) => {
     return { oldSpans: [], newSpans: [] };
   }
   if (a.length === 0 || b.length === 0) return wholeChanged(a, b);
-  let lo = 0;
-  while (lo < a.length && lo < b.length && a[lo] === b[lo]) lo += 1;
-  let hiA = a.length;
-  let hiB = b.length;
-  while (hiA > lo && hiB > lo && a[hiA - 1] === b[hiB - 1]) {
-    hiA -= 1;
-    hiB -= 1;
-  }
-  const prefix = a.slice(0, lo);
-  const suffix = a.slice(hiA);
-  const midA = a.slice(lo, hiA);
-  const midB = b.slice(lo, hiB);
+  const { prefix, suffix, midA, midB } = trimSharedEnds(a, b);
   let mid;
   if (midA.length === 0 && midB.length === 0) {
     mid = { oldSpans: [], newSpans: [] };
@@ -432,7 +412,7 @@ const attachInline = (lines) => {
   );
   applyInlineSpans(dels, adds, delToAdd);
   for (const line of lines) {
-    if (line.type === 'ctx') {
+    if (isCtxType(line.type)) {
       line.spans = [{ text: line.text, changed: false }];
     }
   }
@@ -500,13 +480,13 @@ const mapHunkBlocks = (lines, onCtx, onChange) => {
   const out = [];
   let i = 0;
   while (i < lines.length) {
-    if (lines[i].type === 'ctx') {
+    if (isCtxType(lines[i].type)) {
       out.push(onCtx(lines[i]));
       i += 1;
       continue;
     }
     const start = i;
-    while (i < lines.length && lines[i].type !== 'ctx') i += 1;
+    while (i < lines.length && !isCtxType(lines[i].type)) i += 1;
     const block = lines.slice(start, i);
     const { dels, adds } = changeSides(block);
     const delToAdd = pairIndices(
@@ -697,7 +677,7 @@ const splitHunk = (hunk) => {
   let current = null;
   let blockId = -1;
   const lines = hunk.lines.map((line) => {
-    if (line.type === 'ctx') {
+    if (isCtxType(line.type)) {
       current = null;
       return { ...line, blockId: null };
     }
@@ -721,7 +701,7 @@ const otherContext = (contextSide, blockId) => {
 const flattenBlock = (hunk, blockId, contextSide) => {
   const out = [];
   for (const line of hunk.lines) {
-    if (line.blockId === blockId || line.type === 'ctx') {
+    if (line.blockId === blockId || isCtxType(line.type)) {
       out.push(line);
       continue;
     }
@@ -741,8 +721,8 @@ const countSides = (lines) => {
   let oldCount = 0;
   let newCount = 0;
   for (const line of lines) {
-    if (line.type === 'ctx' || line.type === 'del') oldCount += 1;
-    if (line.type === 'ctx' || line.type === 'add') newCount += 1;
+    if (isCtxType(line.type) || line.type === 'del') oldCount += 1;
+    if (isCtxType(line.type) || line.type === 'add') newCount += 1;
   }
   return { oldCount, newCount };
 };
@@ -774,10 +754,10 @@ const formatPatch = (file, hunk, blockId, contextSide) => {
   return `${parts.join('\n')}\n`;
 };
 
-const LAYOUT_ALIGN = Object.assign(Object.create(null), {
+const LAYOUT_ALIGN = {
   mixed: alignPairs,
   side: alignSplit,
-});
+};
 
 const windowAroundBlock = (lines, blockId, radius) => {
   let start = -1;
@@ -793,9 +773,10 @@ const windowAroundBlock = (lines, blockId, radius) => {
   return lines.slice(from, to);
 };
 
-const displayLines = (hunk, blockId, layout = 'unified') => {
+const displayLines = (hunk, blockId, layout = 'unified', radius) => {
   const flat = flattenBlock(hunk, blockId, 'new');
-  const windowed = windowAroundBlock(flat, blockId, DISPLAY_CONTEXT);
+  const around = radius ?? DISPLAY_CONTEXT;
+  const windowed = windowAroundBlock(flat, blockId, around);
   const lines = windowed.map((line) => ({ ...line }));
   const painted = attachInline(lines);
   const align = LAYOUT_ALIGN[layout];
@@ -875,7 +856,7 @@ const refreshIndexPatches = (items, item) => {
       siblings.push(other);
     }
   }
-  const sides = Object.create(null);
+  const sides = {};
   for (const other of siblings) {
     sides[other.blockId] = INDEX_SIDE[other.origin] ?? 'old';
   }
@@ -885,22 +866,18 @@ const refreshIndexPatches = (items, item) => {
 };
 
 module.exports = {
-  LCS_CELL_LIMIT,
   DISPLAY_CONTEXT,
-  PAIR_MIN_SIM,
+  isCtxType,
   diffChars,
-  similarity,
-  pairScore,
   pairIndices,
   attachInline,
   parseDiff,
   splitHunk,
   flattenBlock,
+  countSides,
   formatPatch,
   displayLines,
-  alignSplit,
   synthesizeNewFile,
   itemsFromFiles,
   refreshIndexPatches,
-  countSides,
 };

package/lib/editor.js

@@ -145,4 +145,4 @@ class Editor {
   }
 }
 
-module.exports = { UNDO_CAP, Editor };
+module.exports = { Editor };

package/lib/files.js

@@ -1,6 +1,20 @@
 'use strict';
 
-const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit'];
+const REVIEW_DIR = '.review';
+const ORIGIN_ORDER = ['staged', 'unstaged', 'untracked', 'commit', 'pr'];
+
+const normalizePathSpec = (spec) =>
+  `${spec ?? ''}`.replaceAll('\\', '/').replace(/\/+$/, '');
+
+const isPathInScope = (rel, paths) => {
+  if (!paths.length) return true;
+  for (const spec of paths) {
+    const norm = normalizePathSpec(spec);
+    if (!norm || norm === '.') return true;
+    if (rel === norm || rel.startsWith(`${norm}/`)) return true;
+  }
+  return false;
+};
 
 const itemPath = (item) => {
   if (!item || !item.file) return '';
@@ -19,10 +33,9 @@ const fileStatus = (origins) => {
   return key;
 };
 
-const fileEntries = (items, kept) => {
+const fileEntries = (items) => {
   const groups = new Map();
   for (let i = 0; i < items.length; i++) {
-    if (!kept.has(i)) continue;
     const item = items[i];
     const rel = itemPath(item);
     let group = groups.get(rel);
@@ -44,4 +57,10 @@ const fileEntries = (items, kept) => {
   return entries;
 };
 
-module.exports = { ORIGIN_ORDER, itemPath, fileStatus, fileEntries };
+module.exports = {
+  REVIEW_DIR,
+  isPathInScope,
+  itemPath,
+  fileStatus,
+  fileEntries,
+};