reslop 0.1.9 → 0.2.1

package/lib/select.js

@@ -145,8 +145,6 @@ const parseCells = (line) => {
 
 const rgbKey = (rgb) => (rgb ? `${rgb[0]},${rgb[1]},${rgb[2]}` : '');
 
-const styleKey = (fg, bg) => `${rgbKey(fg)}|${rgbKey(bg)}`;
-
 const styleSeq = (fg, bg) => {
   if (fg && bg) return RESET + seq(fg, bg);
   if (fg) return RESET + ansi.fg(fg);
@@ -169,7 +167,7 @@ const overlayRange = (line, fromCol, toCol) => {
       fg = cell.bg ?? THEME.ctxBg;
       bg = cell.fg ?? THEME.ctxFg;
     }
-    const key = styleKey(fg, bg);
+    const key = `${rgbKey(fg)}|${rgbKey(bg)}`;
     if (key !== last) {
       out += styleSeq(fg, bg);
       last = key;
@@ -181,14 +179,11 @@ const overlayRange = (line, fromCol, toCol) => {
 
 const overlayRows = (rows, sel) => {
   if (!isRange(sel)) return rows;
-  const next = [];
-  for (let i = 0; i < rows.length; i++) {
+  const { length } = rows;
+  const next = new Array(length);
+  for (let i = 0; i < length; i++) {
     const range = lineRange(i, sel);
-    if (!range) {
-      next.push(rows[i]);
-      continue;
-    }
-    next.push(overlayRange(rows[i], range.from, range.to));
+    next[i] = range ? overlayRange(rows[i], range.from, range.to) : rows[i];
   }
   return next;
 };

package/lib/session/accessors.js

@@ -22,4 +22,12 @@ const bindGetters = (target, owner, names) => {
   }
 };
 
-module.exports = { bindAccessors, bindGetters, bindAlias };
+const stateView = (state, methods, writable = [], readonly = []) => {
+  const descriptors = Object.getOwnPropertyDescriptors(methods);
+  const view = Object.defineProperties({}, descriptors);
+  bindAccessors(view, state, writable);
+  bindGetters(view, state, readonly);
+  return view;
+};
+
+module.exports = { bindAccessors, bindGetters, bindAlias, stateView };

package/lib/session/actions.js

@@ -7,11 +7,14 @@ const ACTIONS = {
   commit: ['c'],
   prev: ['left', 'p', 'k'],
   next: ['right', 'n', 'j'],
+  check: ['x', ' '],
   layout: ['m'],
   feedback: ['f'],
   todo: ['t'],
   code: ['e'],
   branch: ['b'],
+  file: ['f'],
+  diff: ['d'],
   quit: ['q', 'ctrl-c'],
 };
 const ACTION_IDS = Object.keys(ACTIONS);
@@ -26,8 +29,12 @@ const BRANCH_ACTIONS = {
 
 const COMMIT_ACTIONS = {
   amend: ['a'],
+  apply: ['a'],
+  reword: ['r'],
   fixup: ['f'],
   drop: ['d'],
+  pull: ['p'],
+  push: ['s'],
 };
 
 const ACTION_HOT = {
@@ -37,6 +44,7 @@ const ACTION_HOT = {
 
 const ACTION_LABEL = {
   revert: 'drop',
+  check: 'x',
   layout: 'mode',
   code: 'edit',
   newBranch: 'new',
@@ -45,9 +53,26 @@ const ACTION_LABEL = {
   next: '→',
 };
 
-const DIFF_DISABLED = ['commit', 'branch', 'pull', 'push'];
+const DIFF_DISABLED = [
+  'check',
+  'commit',
+  'branch',
+  'pull',
+  'push',
+  'file',
+  'diff',
+];
+const UNIT_DISABLED = [...DIFF_DISABLED, 'layout'];
 const FILES_DISABLED = ['layout', 'feedback', 'code'];
-const FILES_HIDDEN = [...FILES_DISABLED, 'prev', 'next', 'commit'];
+const FILES_HIDDEN = [
+  ...FILES_DISABLED,
+  'check',
+  'prev',
+  'next',
+  'commit',
+  'file',
+  'diff',
+];
 const FILES_GIT_DISABLED = ['add', 'unstage', 'revert'];
 const FILES_TODO_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED];
 const TODO_DISABLED = [
@@ -60,6 +85,8 @@ const TODO_DISABLED = [
   'todo',
   'code',
   'branch',
+  'file',
+  'diff',
   'pull',
   'push',
 ];
@@ -72,7 +99,10 @@ const BRANCHES_DISABLED = [
   'feedback',
   'todo',
   'code',
+  'check',
   'branch',
+  'file',
+  'diff',
   'prev',
   'next',
 ];
@@ -84,11 +114,12 @@ const COMMITS_DISABLED = [
   'feedback',
   'todo',
   'code',
+  'check',
   'branch',
+  'file',
+  'diff',
   'prev',
   'next',
-  'pull',
-  'push',
 ];
 
 const isTodosTarget = (item) =>
@@ -108,13 +139,17 @@ const branchGitDisabled = (item) => {
   return off;
 };
 
+const isFixupCommit = (item) =>
+  `${item && item.subject ? item.subject : ''}`.startsWith('fixup!');
+
 const commitWriteDisabled = (item) => {
-  if (!item || !item.sha) return ['amend', 'fixup', 'drop'];
+  if (!item || !item.sha) return ['amend', 'apply', 'reword', 'fixup', 'drop'];
   return [];
 };
 
 const commitGitDisabled = (item) => {
-  const off = commitWriteDisabled(item);
+  const off = [...commitWriteDisabled(item)];
+  if (!isFixupCommit(item)) off.push('apply');
   if (item && item.canCommit === true) return off;
   return [...off, 'commit', 'fixup'];
 };
@@ -122,6 +157,7 @@ const commitGitDisabled = (item) => {
 const disabledActions = (pane, item) => {
   const onTodos = isTodosTarget(item);
   if (pane === 'files') return onTodos ? FILES_TODO_DISABLED : FILES_DISABLED;
+  if (pane === 'unit') return [...UNIT_DISABLED, ...diffGitDisabled(item)];
   if (pane === 'branches') {
     return [...BRANCHES_DISABLED, ...branchGitDisabled(item)];
   }
@@ -132,6 +168,10 @@ const disabledActions = (pane, item) => {
   return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
 
+const HIDDEN_KEYS = {
+  l: 'theme',
+};
+
 const SCROLL = {
   up: 'scrollUp',
   down: 'scrollDown',
@@ -151,11 +191,9 @@ const SCROLL = {
 };
 
 const KEY_TO_ACTION = {};
-const PANE_ONLY = ['branch'];
+const PANE_ONLY = ['branch', 'file', 'diff'];
 const FILES_KEYS = {};
-for (const id of PANE_ONLY) {
-  for (const key of ACTIONS[id]) FILES_KEYS[key] = id;
-}
+for (const key of ACTIONS.branch) FILES_KEYS[key] = 'branch';
 for (const id of BRANCH_REMOTE) {
   for (const key of BRANCH_ACTIONS[id]) FILES_KEYS[key] = id;
 }
@@ -179,13 +217,20 @@ for (const id of ACTION_IDS) {
 }
 
 for (const key of Object.keys(SCROLL)) KEY_TO_ACTION[key] = SCROLL[key];
+for (const key of Object.keys(HIDDEN_KEYS)) {
+  KEY_TO_ACTION[key] = HIDDEN_KEYS[key];
+}
 
-const actionFromKey = (key, pane) => {
+const actionFromKey = (key, pane, fileScope) => {
   const listPane =
     pane === 'files' || pane === 'branches' || pane === 'commits';
   if (listPane && (key === 'left' || key === 'right')) return null;
   const paneKeys = PANE_KEYS[pane];
   if (paneKeys && paneKeys[key]) return paneKeys[key];
+  if (pane === 'files') {
+    if (key === 'f' && fileScope !== 'file') return 'file';
+    if (key === 'd' && fileScope === 'file') return 'diff';
+  }
   return KEY_TO_ACTION[key] ?? null;
 };
 
@@ -194,12 +239,10 @@ const actionKeys = (id) =>
 
 const actionHot = (id) => ACTION_HOT[id] ?? actionKeys(id)[0];
 
-const actionLabel = (id) => ACTION_LABEL[id] ?? ACTION_HOT[id] ?? id;
-
 const actionLetter = actionHot;
 
 const buttonWord = (id) => {
-  const word = actionLabel(id);
+  const word = ACTION_LABEL[id] ?? ACTION_HOT[id] ?? id;
   const mark = actionLetter(id);
   if (word.includes(mark)) return word;
   return `${mark}${word}`;
@@ -257,13 +300,11 @@ const CONFIRM = {
 
 const CONFIRM_MODE = Object.keys(CONFIRM);
 
-const normalizeConfirmKey = (key) =>
-  key.length === 1 ? key.toLowerCase() : key;
-
 const confirmKey = (mode, key) => {
   const spec = CONFIRM[mode];
   if (!spec) return null;
-  return spec.keys[normalizeConfirmKey(key)] ?? null;
+  const norm = key.length === 1 ? key.toLowerCase() : key;
+  return spec.keys[norm] ?? null;
 };
 
 const applyConfirm = (mode, key, handlers) => {
@@ -289,6 +330,7 @@ module.exports = {
   ACTION_HOT,
   ACTION_LABEL,
   DIFF_DISABLED,
+  UNIT_DISABLED,
   FILES_DISABLED,
   FILES_HIDDEN,
   FILES_GIT_DISABLED,
@@ -302,6 +344,7 @@ module.exports = {
   diffGitDisabled,
   branchGitDisabled,
   commitGitDisabled,
+  isFixupCommit,
   actionFromKey,
   actionKeys,
   actionHot,