reslop 0.2.5 → 0.2.6

package/lib/session/change-actions.js

@@ -10,10 +10,8 @@ const { needsReload, npmBusyKind, sameBlock } = items;
 const diff = require('../diff/diff.js');
 const { hunkKey } = diff;
 
-const nextUnstageOrigin = (item) => {
-  if (item.file.isNew === true) return 'untracked';
-  return 'unstaged';
-};
+const nextUnstageOrigin = (item) =>
+  item.file.isNew === true ? 'untracked' : 'unstaged';
 
 const COMMANDS = {
   add: {
@@ -34,26 +32,15 @@ const COMMANDS = {
 
 const IGNORE_FILES = ['.gitignore', '.npmignore'];
 
-const ignorePatternListed = (text, pattern) => {
-  for (const line of `${text ?? ''}`.split('\n')) {
-    if (line.trim() === pattern) return true;
-  }
-  return false;
-};
-
-const appendIgnorePattern = (text, pattern) => {
-  if (ignorePatternListed(text, pattern)) return text;
-  const base = text.length && !text.endsWith('\n') ? `${text}\n` : text;
-  return `${base}${pattern}\n`;
-};
-
 const appendIgnoreFile = (top, name, pattern) => {
   const abs = path.join(top, name);
-  if (name === '.npmignore' && !fs.existsSync(abs)) return false;
-  const text = fs.existsSync(abs) ? fs.readFileSync(abs, 'utf8') : '';
-  const next = appendIgnorePattern(text, pattern);
-  if (next === text) return false;
-  fs.writeFileSync(abs, next);
+  const exists = fs.existsSync(abs);
+  if (name === '.npmignore' && !exists) return false;
+  const text = exists ? fs.readFileSync(abs, 'utf8') : '';
+  const lines = text.split('\n');
+  if (lines.some((line) => line.trim() === pattern)) return false;
+  const base = text && !text.endsWith('\n') ? `${text}\n` : text;
+  fs.writeFileSync(abs, `${base}${pattern}\n`);
   return true;
 };
 
@@ -63,11 +50,8 @@ const ignoreRelPath = (ui, rel) => {
     ui.status = 'not a diff block';
     return;
   }
-  let changed = false;
-  for (const name of IGNORE_FILES) {
-    if (appendIgnoreFile(ui.top, name, pattern)) changed = true;
-  }
-  if (!changed) {
+  const append = (name) => appendIgnoreFile(ui.top, name, pattern);
+  if (!IGNORE_FILES.map(append).includes(true)) {
     ui.status = 'already ignored';
     return;
   }
@@ -77,8 +61,6 @@ const ignoreRelPath = (ui, rel) => {
   ui.status = 'ignored';
 };
 
-const sameEntry = (entry) => entry;
-
 const keepOrigin = (ui, item, origin) => {
   ui.collection.keepOrigin(item, origin);
   const idx = ui.collection.findRestoredIndex({ ...item, origin });
@@ -89,22 +71,12 @@ const keepOrigin = (ui, item, origin) => {
   ui.syncFileCursor();
 };
 
-const fileCursorEntry = (ui) => {
-  const list = ui.fileList();
-  return list[ui.nav.fileCursor] ?? null;
-};
-
 const fileActionItems = (ui) => {
-  const entry = fileCursorEntry(ui);
+  const entry = ui.fileCursorEntry();
   if (!entry || isTasksEntry(entry)) return [];
-  const rel = entry.path;
-  const selected = [];
-  for (const item of ui.items) {
-    if (isTaskItem(item)) continue;
-    if (listPath(item) !== rel) continue;
-    selected.push(item);
-  }
-  return selected;
+  return ui.items.filter(
+    (item) => !isTaskItem(item) && listPath(item) === entry.path,
+  );
 };
 
 const activeDiffItem = (ui) => {
@@ -144,16 +116,12 @@ const selectNextFileAfter = (ui, rel) => {
   nav.index = entry.firstIndex;
 };
 
-const liveItem = (ui, item) => {
-  for (const entry of ui.items) {
-    if (sameBlock(entry, item)) return entry;
-  }
-  return item;
-};
+const liveItem = (ui, item) =>
+  ui.items.find((entry) => sameBlock(entry, item)) ?? item;
 
-const applyGit = (ui, item, label, write, after) => {
+const applyGit = (ui, label, write, after) => {
   try {
-    write(ui.top, item);
+    write(ui.top);
     ui.status = label;
     after();
   } catch (error) {
@@ -161,45 +129,35 @@ const applyGit = (ui, item, label, write, after) => {
   }
 };
 
-const applyFileGit = (ui, targets, label, write, afterItem) => {
-  const { length } = targets;
-  const completed = new Array(length);
-  let n = 0;
+const applyFileGit = (ui, targets, label, write, afterItem = () => {}) => {
+  let written = 0;
   try {
-    for (let i = 0; i < length; i++) {
-      const current = liveItem(ui, targets[i]);
+    for (const target of targets) {
+      const current = liveItem(ui, target);
       write(ui.top, current);
       afterItem(current);
-      completed[n++] = current;
+      written++;
     }
-    completed.length = n;
     ui.status = label;
-    return { ok: true, completed };
+    return { ok: true, written };
   } catch (error) {
-    completed.length = n;
     ui.status = error.message;
-    return { ok: false, completed };
+    return { ok: false, written };
   }
 };
 
 const reconcilePartial = (ui, result) => {
   if (result.ok) return false;
-  if (result.completed.length) ui.reloadAfterChange();
+  if (result.written) ui.reloadAfterChange();
   return true;
 };
 
-const applyBlockAdd = (ui, item) => {
-  if (needsReload(item)) return void ui.reloadAfterChange();
-  keepOrigin(ui, item, 'staged');
-};
-
 const enqueueOrigins = (ui, targets, spec) => {
-  const writes = new Array(targets.length);
-  for (let i = 0; i < targets.length; i++) {
-    const current = liveItem(ui, targets[i]);
-    writes[i] = current;
-    keepOrigin(ui, current, spec.originOf(current));
-  }
+  const writes = targets.map((target) => {
+    const item = liveItem(ui, target);
+    keepOrigin(ui, item, spec.originOf(item));
+    return item;
+  });
   if (spec.afterUi) spec.afterUi();
   if (!spec.busy) ui.status = spec.done;
   ui.ops.enqueueLazy({
@@ -239,22 +197,24 @@ const unstageLazy = (ui, targets, extra = {}) => {
   });
 };
 
+const dismissReloadable = (ui, targets) => {
+  for (const item of targets) {
+    if (needsReload(item)) ui.collection.dismiss(item);
+  }
+};
+
 const onBlockAdd = (ui, item) => {
-  const busy = npmBusyKind(item);
-  const repo = ui.repo;
+  const reload = needsReload(item);
   if (ui.uiOpen) {
-    return void stageLazy(ui, [item], {
-      busy,
-      reload: needsReload(item),
-    });
+    return void stageLazy(ui, [item], { busy: npmBusyKind(item), reload });
   }
   applyGit(
     ui,
-    item,
     'staged',
-    (top, current) => repo.add(top, current),
+    (top) => ui.repo.add(top, item),
     () => {
-      applyBlockAdd(ui, item);
+      if (reload) ui.reloadAfterChange();
+      else keepOrigin(ui, item, 'staged');
     },
   );
 };
@@ -262,29 +222,19 @@ const onBlockAdd = (ui, item) => {
 const onBlockUnstage = (ui, item) => {
   if (ui.uiOpen) return void unstageLazy(ui, [item]);
   const origin = nextUnstageOrigin(item);
-  const repo = ui.repo;
   applyGit(
     ui,
-    item,
     'unstaged',
-    (top, current) => repo.unstage(top, current),
+    (top) => ui.repo.unstage(top, item),
     () => keepOrigin(ui, item, origin),
   );
 };
 
-const dismissReloadable = (ui, targets) => {
-  for (const item of targets) {
-    if (needsReload(item)) ui.collection.dismiss(item);
-  }
-};
-
 const onBlockRevert = (ui, item) => {
-  const repo = ui.repo;
   applyGit(
     ui,
-    item,
     'dropped',
-    (top, current) => repo.revert(top, current),
+    (top) => ui.repo.revert(top, item),
     () => {
       dismissReloadable(ui, [item]);
       ui.reloadAfterChange();
@@ -340,14 +290,8 @@ const unstageTargets = (ui, targets, after = null) => {
 
 const revertTargets = (ui, targets) => {
   dismissReloadable(ui, targets);
-  const result = applyFileGit(
-    ui,
-    targets,
-    'dropped',
-    ui.repo.revert,
-    sameEntry,
-  );
-  if (!result.ok && !result.completed.length) return;
+  const result = applyFileGit(ui, targets, 'dropped', ui.repo.revert);
+  if (!result.ok && !result.written) return;
   ui.reloadAfterChange();
 };
 
@@ -391,13 +335,7 @@ const onFileCommand = (ui, name) => {
 
 const hunkActionItems = (ui, item) => {
   const key = hunkKey(item);
-  const selected = [];
-  if (!key) return selected;
-  for (const entry of ui.items) {
-    if (hunkKey(entry) !== key) continue;
-    selected.push(entry);
-  }
-  return selected;
+  return key ? ui.items.filter((entry) => hunkKey(entry) === key) : [];
 };
 
 const onUnitCommand = (ui, name) => {
@@ -419,12 +357,4 @@ const onCommand = (ui, name) => {
   onBlockCommand(ui, name);
 };
 
-const createChangeActions = (ui) => ({
-  fileCursorEntry: () => fileCursorEntry(ui),
-  onAdd: () => onCommand(ui, 'add'),
-  onUnstage: () => onCommand(ui, 'unstage'),
-  onRevert: () => onCommand(ui, 'revert'),
-  onIgnore: () => onCommand(ui, 'ignore'),
-});
-
-module.exports = { createChangeActions };
+module.exports = { onCommand };