reslop 0.2.5 → 0.2.6

package/lib/select.js

@@ -1,11 +1,11 @@
 'use strict';
 
 const ansi = require('./ansi.js');
-
-const { ESC, RESET, THEME, seq, stripAnsi, graphemes, graphemeWidth } = ansi;
-const { visibleWidth } = ansi;
+const { ESC, RESET, THEME, seq, fg, bg, stripAnsi, visibleWidth } = ansi;
+const { graphemes, graphemeWidth, firstGrapheme } = ansi;
 
 const CSI_FINAL = /[@-~]/;
+const TRUECOLOR = 2;
 
 const isRange = (sel) => {
   if (!sel || !sel.start || !sel.end) return false;
@@ -13,21 +13,16 @@ const isRange = (sel) => {
 };
 
 const ordered = (sel) => {
-  const start = sel.start;
-  const end = sel.end;
-  if (start.y < end.y) return { first: start, last: end };
-  if (start.y > end.y) return { first: end, last: start };
-  if (start.x <= end.x) return { first: start, last: end };
-  return { first: end, last: start };
+  const { start, end } = sel;
+  const forward = start.y < end.y || (start.y === end.y && start.x <= end.x);
+  return forward ? { first: start, last: end } : { first: end, last: start };
 };
 
 const slicePlain = (plain, fromCol, toCol) => {
-  const parts = graphemes(plain);
   let col = 0;
   let out = '';
-  for (const ch of parts) {
-    const w = graphemeWidth(ch, col);
-    const next = col + w;
+  for (const ch of graphemes(plain)) {
+    const next = col + graphemeWidth(ch, col);
     if (next > fromCol && col < toCol) out += ch;
     col = next;
     if (col >= toCol) break;
@@ -39,10 +34,8 @@ const lineRange = (rowIndex, sel) => {
   const { first, last } = ordered(sel);
   const y = rowIndex + 1;
   if (y < first.y || y > last.y) return null;
-  let from = 0;
-  let to = Infinity;
-  if (y === first.y) from = first.x - 1;
-  if (y === last.y) to = last.x;
+  const from = y === first.y ? first.x - 1 : 0;
+  const to = y === last.y ? last.x : Infinity;
   if (to <= from) return null;
   return { from, to };
 };
@@ -61,11 +54,10 @@ const extractText = (rows, sel) => {
   return lines.join('\n');
 };
 
-const consumeCsi = (line, i) => {
+const csiEnd = (line, i) => {
   let j = i + 2;
   while (j < line.length && !CSI_FINAL.test(line[j])) j += 1;
-  if (j < line.length) j += 1;
-  return j;
+  return j < line.length ? j + 1 : j;
 };
 
 const parseParams = (body) => {
@@ -74,45 +66,30 @@ const parseParams = (body) => {
 };
 
 const applyRgb = (state, field, params, i) => {
-  const TRUECOLOR = 2;
   const isTruecolor = params[i + 1] === TRUECOLOR;
-  const hasRgb = isTruecolor && i + 4 < params.length;
-  if (!hasRgb) return 1;
+  if (!isTruecolor || i + 4 >= params.length) return 1;
   state[field] = [params[i + 2], params[i + 3], params[i + 4]];
   return 5;
 };
 
-const SGR = {
-  0: (state) => {
-    state.fg = null;
-    state.bg = null;
-    return 1;
-  },
-  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;
-  },
-  49: (state) => {
-    state.bg = null;
-    return 1;
-  },
-};
-
 const applySgr = (params, state) => {
   let i = 0;
   while (i < params.length) {
-    const apply = SGR[params[i]];
-    i += apply ? apply(state, params, i) : 1;
+    const code = params[i];
+    if (code === 38) {
+      i += applyRgb(state, 'fg', params, i);
+      continue;
+    }
+    if (code === 48) {
+      i += applyRgb(state, 'bg', params, i);
+      continue;
+    }
+    if (code === 0 || code === 39) state.fg = null;
+    if (code === 0 || code === 49) state.bg = null;
+    i += 1;
   }
 };
 
-const nextGrapheme = (line, index) => {
-  const parts = graphemes(line.slice(index));
-  return parts[0] ?? '';
-};
-
 const parseCells = (line) => {
   const cells = [];
   const state = { fg: null, bg: null };
@@ -120,24 +97,21 @@ const parseCells = (line) => {
   let i = 0;
   while (i < line.length) {
     if (line[i] === ESC && line[i + 1] === '[') {
-      const n = consumeCsi(line, i);
-      if (line[n - 1] === 'm') {
-        const body = line.slice(i + 2, n - 1);
-        applySgr(parseParams(body), state);
+      const end = csiEnd(line, i);
+      if (line[end - 1] === 'm') {
+        applySgr(parseParams(line.slice(i + 2, end - 1)), state);
       }
-      i = n;
+      i = end;
       continue;
     }
     if (line[i] === ESC) {
       i += 1;
       continue;
     }
-    const ch = nextGrapheme(line, i);
+    const ch = firstGrapheme(line.slice(i));
     if (!ch) break;
     const width = graphemeWidth(ch, col);
-    const fg = state.fg;
-    const bg = state.bg;
-    cells.push({ ch, fg, bg, col, width });
+    cells.push({ ch, fg: state.fg, bg: state.bg, col, width });
     col += width;
     i += ch.length;
   }
@@ -146,10 +120,10 @@ const parseCells = (line) => {
 
 const rgbKey = (rgb) => (rgb ? `${rgb[0]},${rgb[1]},${rgb[2]}` : '');
 
-const styleSeq = (fg, bg) => {
-  if (fg && bg) return RESET + seq(fg, bg);
-  if (fg) return RESET + ansi.fg(fg);
-  if (bg) return RESET + ansi.bg(bg);
+const styleSeq = (fgRgb, bgRgb) => {
+  if (fgRgb && bgRgb) return RESET + seq(fgRgb, bgRgb);
+  if (fgRgb) return RESET + fg(fgRgb);
+  if (bgRgb) return RESET + bg(bgRgb);
   return RESET;
 };
 
@@ -160,17 +134,15 @@ const overlayRange = (line, fromCol, toCol) => {
   let out = '';
   let last = null;
   for (const cell of cells) {
-    const next = cell.col + cell.width;
-    const hit = next > fromCol && cell.col < toCol;
-    let fg = cell.fg;
-    let bg = cell.bg;
-    if (hit) {
-      fg = cell.bg ?? THEME.ctxBg;
-      bg = cell.fg ?? THEME.ctxFg;
+    let cellFg = cell.fg;
+    let cellBg = cell.bg;
+    if (cell.col + cell.width > fromCol && cell.col < toCol) {
+      cellFg = cell.bg ?? THEME.ctxBg;
+      cellBg = cell.fg ?? THEME.ctxFg;
     }
-    const key = `${rgbKey(fg)}|${rgbKey(bg)}`;
+    const key = `${rgbKey(cellFg)}|${rgbKey(cellBg)}`;
     if (key !== last) {
-      out += styleSeq(fg, bg);
+      out += styleSeq(cellFg, cellBg);
       last = key;
     }
     out += cell.ch;
@@ -178,35 +150,29 @@ const overlayRange = (line, fromCol, toCol) => {
   return out;
 };
 
-const selectionOf = (source) => {
+const editorSelection = (view) => {
+  const source = view?.compose || view?.codeOverlay;
   if (!source || typeof source.anchor !== 'number') return null;
   const cursor = source.cursor ?? 0;
   if (source.anchor === cursor) return null;
   return { anchor: source.anchor, cursor };
 };
 
-const editorSelection = (view) => {
-  if (!view) return null;
-  if (view.compose) return selectionOf(view.compose);
-  return selectionOf(view.codeOverlay);
-};
-
 const spanCols = (hit, lo, hi) => {
   const start = hit.start ?? 0;
   const from = Math.max(lo, start);
   const to = Math.min(hi, hit.limit ?? start);
   if (to <= from) return null;
   const text = hit.text ?? '';
-  const head = Math.max(0, from - start);
-  const tail = Math.max(0, to - start);
-  const c0 = visibleWidth(text.slice(0, head));
-  const c1 = visibleWidth(text.slice(0, tail));
+  const c0 = visibleWidth(text.slice(0, Math.max(0, from - start)));
+  const c1 = visibleWidth(text.slice(0, Math.max(0, to - start)));
   const scroll = hit.scroll ?? 0;
-  const room = Math.max(0, (hit.x1 ?? hit.textX ?? 1) - (hit.textX ?? 1));
+  const textX = hit.textX ?? 1;
+  const room = Math.max(0, (hit.x1 ?? textX) - textX);
   const vis0 = Math.max(c0, scroll);
   const vis1 = Math.min(c1, scroll + room);
   if (vis1 <= vis0) return null;
-  const origin = (hit.textX ?? 1) - 1;
+  const origin = textX - 1;
   return { from: origin + vis0 - scroll, to: origin + vis1 - scroll };
 };
 
@@ -220,9 +186,8 @@ const markEditorSelection = (rows, view, hits, color) => {
   for (const hit of hits) {
     if (!hit.live || !hit.y) continue;
     const range = spanCols(hit, lo, hi);
-    if (!range) continue;
     const i = hit.y - 1;
-    if (i < 0 || i >= next.length) continue;
+    if (!range || i < 0 || i >= next.length) continue;
     next[i] = overlayRange(next[i], range.from, range.to);
   }
   return next;
@@ -230,13 +195,10 @@ const markEditorSelection = (rows, view, hits, color) => {
 
 const overlayRows = (rows, sel) => {
   if (!isRange(sel)) return rows;
-  const { length } = rows;
-  const next = new Array(length);
-  for (let i = 0; i < length; i++) {
+  return rows.map((row, i) => {
     const range = lineRange(i, sel);
-    next[i] = range ? overlayRange(rows[i], range.from, range.to) : rows[i];
-  }
-  return next;
+    return range ? overlayRange(row, range.from, range.to) : row;
+  });
 };
 
 module.exports = {

package/lib/session/accessors.js

@@ -1,33 +1,26 @@
 'use strict';
 
-const bindAlias = (target, name, get, set) => {
-  const desc = { configurable: true, enumerable: true, get };
-  if (set) desc.set = set;
-  Object.defineProperty(target, name, desc);
-};
-
 const bindAccessors = (target, owner, names) => {
   for (const name of names) {
-    const get = () => owner[name];
-    const set = (value) => {
-      owner[name] = value;
-    };
-    bindAlias(target, name, get, set);
+    Object.defineProperty(target, name, {
+      configurable: true,
+      enumerable: true,
+      get: () => owner[name],
+      set: (value) => {
+        owner[name] = value;
+      },
+    });
   }
 };
 
 const bindGetters = (target, owner, names) => {
   for (const name of names) {
-    bindAlias(target, name, () => owner[name]);
+    Object.defineProperty(target, name, {
+      configurable: true,
+      enumerable: true,
+      get: () => owner[name],
+    });
   }
 };
 
-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 };
+module.exports = { bindAccessors, bindGetters };

package/lib/session/actions.js

@@ -24,50 +24,75 @@ const ACTION_IDS = Object.keys(ACTIONS);
 
 const BRANCH_ACTIONS = {
   newBranch: ['n'],
-  rebase: ['r'],
-  drop: ['d'],
+  rebase: ['e'],
+  drop: ['delete'],
   pull: ['p'],
   push: ['s'],
 };
 
 const COMMIT_ACTIONS = {
   amend: ['a'],
-  apply: ['a'],
-  reword: ['r'],
-  fixup: ['f'],
-  drop: ['d'],
+  apply: ['p'],
+  reword: ['e'],
+  fixup: ['x'],
+  drop: ['delete'],
   view: ['v'],
-  pull: ['p'],
-  push: ['s'],
 };
 
 const NPM_ACTIONS = {
   npm: ['n'],
   npmEdit: ['e'],
-  npmNew: ['n'],
-  npmDrop: ['d'],
-  npmLogs: ['c'],
+  npmNew: ['i'],
+  npmDrop: ['delete'],
+  npmLogs: ['l'],
   npmStop: ['escape'],
   npmVerbose: ['v'],
   npmRerun: ['r'],
 };
 
+const DASH_ACTIONS = {
+  dashFiles: ['f'],
+  dashDiffs: ['d'],
+  dashTasks: ['t'],
+  dashBranches: ['b'],
+  dashCommits: ['c'],
+  dashRun: ['r'],
+  dashNpm: ['n'],
+};
+const DASH_IDS = Object.keys(DASH_ACTIONS);
+const DASH_BLOCKS = {
+  dashFiles: 'files',
+  dashDiffs: 'diffs',
+  dashCommits: 'commits',
+  dashBranches: 'branches',
+  dashNpm: 'npm',
+  dashRun: 'run',
+  dashTasks: 'tasks',
+};
+const DASH_ALLOWED = [...DASH_IDS, 'quit', 'theme'];
+const DASH_HIDDEN = ACTION_IDS.filter((id) => id !== 'quit');
+
 const ACTION_HOT = {
   prev: '←',
   next: '→',
+  drop: 'del',
+  npmDrop: 'del',
   npmStop: 'esc',
 };
 
 const ACTION_LABEL = {
+  ...DASH_BLOCKS,
   revert: 'drop',
   check: 'x',
   layout: 'mode',
   tasks: 'tasks',
   view: 'view',
   code: 'edit',
+  reword: 'edit',
+  drop: 'delete',
   newBranch: 'new',
   npmEdit: 'edit',
-  npmNew: 'new',
+  npmNew: 'insert',
   npmDrop: 'delete',
   npmLogs: 'cleanup',
   npmStop: 'esc',
@@ -86,9 +111,8 @@ const DIFF_DISABLED = [
   'push',
   'file',
   'diff',
-  'ignore',
 ];
-const UNIT_DISABLED = [...DIFF_DISABLED, 'layout'];
+const UNIT_DISABLED = [...DIFF_DISABLED, 'layout', 'ignore'];
 const FILES_DISABLED = ['layout', 'feedback', 'code'];
 const FILES_HIDDEN = [
   ...FILES_DISABLED,
@@ -98,6 +122,8 @@ const FILES_HIDDEN = [
   'commit',
   'file',
   'diff',
+  'tasks',
+  'branch',
 ];
 const FILES_GIT_DISABLED = ['add', 'unstage', 'revert', 'ignore'];
 const FILES_TASKS_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED];
@@ -188,7 +214,7 @@ const disabledActions = (pane, item) => {
     return [...COMMITS_DISABLED, ...commitWriteDisabled(item)];
   }
   if (pane === 'npm') return NPM_DISABLED;
-  if (onTodos) return TASKS_DISABLED;
+  if (pane === 'tasks' || onTodos) return TASKS_DISABLED;
   return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
 
@@ -223,25 +249,26 @@ const keysForActions = (actions) => {
 };
 
 const PANE_ONLY = ['branch', 'file', 'diff'];
-const FILES_KEYS = keysForActions({
-  branch: ACTIONS.branch,
-  pull: BRANCH_ACTIONS.pull,
-  push: BRANCH_ACTIONS.push,
-  npm: NPM_ACTIONS.npm,
-});
+const REVIEW_DROP = { d: 'revert' };
 const BRANCH_KEYS = keysForActions(BRANCH_ACTIONS);
-const COMMIT_KEYS = keysForActions(COMMIT_ACTIONS);
+const COMMIT_KEYS = { ...keysForActions(COMMIT_ACTIONS), c: 'commit' };
 const NPM_KEYS = {
   e: 'npmEdit',
-  n: 'npmNew',
-  d: 'npmDrop',
-  c: 'npmLogs',
+  i: 'npmNew',
+  delete: 'npmDrop',
+  l: 'npmLogs',
 };
+const DASH_KEYS = keysForActions(DASH_ACTIONS);
+const SCREEN_KEYS = DASH_KEYS;
 const PANE_KEYS = {
-  files: FILES_KEYS,
+  dashboard: DASH_KEYS,
+  files: REVIEW_DROP,
+  diff: REVIEW_DROP,
+  unit: REVIEW_DROP,
   branches: BRANCH_KEYS,
   commits: COMMIT_KEYS,
   npm: NPM_KEYS,
+  tasks: { delete: 'drop' },
 };
 
 const KEY_TO_ACTION = {
@@ -254,16 +281,13 @@ const KEY_TO_ACTION = {
   ...HIDDEN_KEYS,
 };
 
-const actionFromKey = (key, pane, fileScope) => {
+const actionFromKey = (key, pane) => {
   if (LIST_PANES.includes(pane) && (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';
-  }
+  if (pane && SCREEN_KEYS[key]) return SCREEN_KEYS[key];
   return KEY_TO_ACTION[key] ?? null;
 };
 
@@ -272,11 +296,10 @@ const actionKeys = (id) =>
   BRANCH_ACTIONS[id] ??
   COMMIT_ACTIONS[id] ??
   NPM_ACTIONS[id] ??
+  DASH_ACTIONS[id] ??
   [];
 
-const actionHot = (id) => ACTION_HOT[id] ?? actionKeys(id)[0];
-
-const actionLetter = actionHot;
+const actionLetter = (id) => ACTION_HOT[id] ?? actionKeys(id)[0];
 
 const buttonWord = (id) => {
   const word = ACTION_LABEL[id] ?? ACTION_HOT[id] ?? id;
@@ -344,13 +367,6 @@ const confirmKey = (mode, key) => {
   return spec.keys[norm] ?? null;
 };
 
-const applyConfirm = (mode, key, handlers) => {
-  const action = confirmKey(mode, key);
-  if (!action) return;
-  const handler = handlers[action];
-  if (handler) handler();
-};
-
 const confirmPrefix = (spec, view) => {
   if (typeof spec.prefix === 'function') return spec.prefix(view);
   return spec.prefix ?? '';
@@ -361,6 +377,10 @@ const promptFromChoices = (choices) =>
 
 module.exports = {
   LIST_PANES,
+  DASH_IDS,
+  DASH_BLOCKS,
+  DASH_ALLOWED,
+  DASH_HIDDEN,
   ACTIONS,
   ACTION_IDS,
   BRANCH_ACTIONS,
@@ -381,13 +401,11 @@ module.exports = {
   commitGitDisabled,
   isFixupCommit,
   actionFromKey,
-  actionHot,
   actionLetter,
   buttonWord,
   CONFIRM,
   CONFIRM_MODE,
   confirmKey,
-  applyConfirm,
   confirmPrefix,
   promptFromChoices,
 };