reslop 0.2.4 → 0.2.6

package/lib/session/items.js

@@ -1,10 +1,7 @@
 'use strict';
 
-const accessors = require('./accessors.js');
-const { stateView } = accessors;
-
 const files = require('../files.js');
-const { itemPath, TODO_FILE, isTodoItem } = files;
+const { itemPath, TASKS_FILE, isTaskItem } = files;
 const review = require('../review.js');
 const { feedbackKey } = review;
 const diff = require('../diff/diff.js');
@@ -29,28 +26,24 @@ const npmBusyKind = (item) => {
 const blockKey = (item) => {
   if (!item || !item.file) return '';
   const rel = itemPath(item);
-  if (isTodoItem(item)) return `todo:${TODO_FILE}`;
+  if (isTaskItem(item)) return `todo:${TASKS_FILE}`;
   const depId = depChangeKey(item);
   if (depId) return `${rel}:dep:${depId}`;
-  if (!item.hunk) {
-    const block = item.blockId ?? '-';
-    return `${rel}:file:${block}`;
-  }
-  const oldStart = item.hunk.oldStart;
-  const newStart = item.hunk.newStart;
   const block = item.blockId ?? '-';
+  if (!item.hunk) return `${rel}:file:${block}`;
+  const { oldStart, newStart } = item.hunk;
   return `${rel}:${oldStart}:${newStart}:${block}`;
 };
 
 const itemKey = (item) => {
   const key = blockKey(item);
-  if (!key || isTodoItem(item)) return key;
+  if (!key || isTaskItem(item)) return key;
   const origin = item.origin ?? '';
   return `${origin}:${key}`;
 };
 
 const blockLinesKey = (item) => {
-  if (!item || !item.file || isTodoItem(item)) return '';
+  if (!item || !item.file || isTaskItem(item)) return '';
   if (!item.hunk) return '';
   const parts = [itemPath(item)];
   for (const line of item.hunk.lines) {
@@ -122,37 +115,33 @@ const alignLoadedItems = (prev, next) => {
   const ordered = [];
   for (const [rel, list] of groupByPath(prev)) {
     seen.add(rel);
-    const aligned = alignGroup(list, nextGroups.get(rel) ?? []);
-    for (const item of aligned) ordered.push(item);
+    ordered.push(...alignGroup(list, nextGroups.get(rel) ?? []));
   }
   for (const [rel, list] of nextGroups) {
-    if (seen.has(rel)) continue;
-    for (const item of list) ordered.push(item);
+    if (!seen.has(rel)) ordered.push(...list);
   }
   return ordered;
 };
 
-const restoredIndex = (items, item) => {
-  if (!item || !item.file) return -1;
-  const origin = item.origin ?? '';
+const originOf = (item) => item.origin ?? '';
+
+const hunkStart = (item) => (item.hunk ? item.hunk.newStart : 0);
+
+const sameLinesIndex = (items, item) => {
   const lines = blockLinesKey(item);
-  if (lines) {
-    let any = -1;
-    for (let i = 0; i < items.length; i++) {
-      if (blockLinesKey(items[i]) !== lines) continue;
-      if (any < 0) any = i;
-      if ((items[i].origin ?? '') === origin) return i;
-    }
-    if (any >= 0) return any;
-  }
-  const key = itemKey(item);
-  if (key) {
-    const exact = items.findIndex((entry) => itemKey(entry) === key);
-    if (exact >= 0) return exact;
+  if (!lines) return -1;
+  let fallback = -1;
+  for (let i = 0; i < items.length; i++) {
+    if (blockLinesKey(items[i]) !== lines) continue;
+    if (originOf(items[i]) === originOf(item)) return i;
+    if (fallback < 0) fallback = i;
   }
+  return fallback;
+};
+
+const nearestHunkIndex = (items, item) => {
   const rel = itemPath(item);
   if (!rel) return -1;
-  const start = item.hunk ? item.hunk.newStart : 0;
   let fileMatch = -1;
   let best = -1;
   let bestDist = Infinity;
@@ -160,19 +149,27 @@ const restoredIndex = (items, item) => {
     const entry = items[i];
     if (itemPath(entry) !== rel) continue;
     if (fileMatch < 0) fileMatch = i;
-    if ((entry.origin ?? '') !== origin) continue;
-    const at = entry.hunk ? entry.hunk.newStart : 0;
-    const dist = Math.abs(at - start);
+    if (originOf(entry) !== originOf(item)) continue;
+    const dist = Math.abs(hunkStart(entry) - hunkStart(item));
     if (dist >= bestDist) continue;
     bestDist = dist;
     best = i;
   }
-  if (best >= 0) return best;
-  return fileMatch;
+  return best >= 0 ? best : fileMatch;
+};
+
+const restoredIndex = (items, item) => {
+  if (!item || !item.file) return -1;
+  const byLines = sameLinesIndex(items, item);
+  if (byLines >= 0) return byLines;
+  const key = itemKey(item);
+  const exact = key ? items.findIndex((entry) => itemKey(entry) === key) : -1;
+  if (exact >= 0) return exact;
+  return nearestHunkIndex(items, item);
 };
 
 const itemFeedKey = (item) => {
-  if (!item || !item.file || isTodoItem(item)) return '';
+  if (!item || !item.file || isTaskItem(item)) return '';
   const hunk = item.hunk;
   const depId = depChangeKey(item);
   const file = depId ? `${itemPath(item)}#${depId}` : itemPath(item);
@@ -190,88 +187,60 @@ const sameBlock = (left, right) => {
 };
 
 const canEditCode = (item) => {
-  if (!item || isTodoItem(item)) return false;
+  if (!item || isTaskItem(item)) return false;
   if (!item.hunk || !item.file) return false;
-  if (item.file.isBinary) return false;
-  return true;
+  return !item.file.isBinary;
 };
 
-const createItemCollection = () => {
-  const state = {
-    items: [],
-    dismissed: new Set(),
-  };
+class ItemCollection {
+  constructor() {
+    this.items = [];
+    this.dismissed = new Set();
+  }
 
-  const reset = () => {
-    state.items = [];
-    state.dismissed = new Set();
-  };
+  reset() {
+    this.items = [];
+    this.dismissed = new Set();
+  }
 
-  const isDismissed = (item) => state.dismissed.has(itemKey(item));
+  isDismissed(item) {
+    return this.dismissed.has(itemKey(item));
+  }
 
-  const replace = (items) => {
-    const aligned = alignLoadedItems(state.items, items);
-    const next = [];
-    for (const item of aligned) {
-      if (isDismissed(item)) continue;
-      next.push(item);
-    }
-    state.items = next;
-    return next;
-  };
+  replace(items) {
+    const aligned = alignLoadedItems(this.items, items);
+    this.items = aligned.filter((item) => !this.isDismissed(item));
+    return this.items;
+  }
 
-  const dismiss = (item) => {
-    state.dismissed.add(itemKey(item));
-  };
+  dismiss(item) {
+    this.dismissed.add(itemKey(item));
+  }
 
-  const clearDismissed = () => {
-    state.dismissed.clear();
-  };
+  clearDismissed() {
+    this.dismissed.clear();
+  }
 
-  const findRestoredIndex = (item) => restoredIndex(state.items, item);
+  findRestoredIndex(item) {
+    return restoredIndex(this.items, item);
+  }
 
-  const keepOrigin = (item, origin) => {
+  keepOrigin(item, origin) {
     const next = { ...item, origin };
-    const { length } = state.items;
-    const replaced = new Array(length);
-    for (let i = 0; i < length; i++) {
-      const entry = state.items[i];
-      replaced[i] = sameBlock(entry, item) ? next : entry;
-    }
-    if (next.dep) {
-      state.items = replaced;
-      return;
-    }
-    state.items = refreshIndexPatches(replaced, next);
-  };
-
-  return stateView(
-    state,
-    {
-      reset,
-      replace,
-      dismiss,
-      clearDismissed,
-      isDismissed,
-      findRestoredIndex,
-      keepOrigin,
-    },
-    ['items'],
-    ['dismissed'],
-  );
-};
+    const replaced = this.items.map((entry) =>
+      sameBlock(entry, item) ? next : entry,
+    );
+    this.items = next.dep ? replaced : refreshIndexPatches(replaced, next);
+  }
+}
 
 module.exports = {
-  depChangeKey,
   needsReload,
   npmBusyKind,
-  blockKey,
-  itemKey,
   itemFeedKey,
-  blockLinesKey,
   alignLoadedItems,
   restoredIndex,
   sameBlock,
   canEditCode,
-  createItemCollection,
+  ItemCollection,
 };