reslop 0.2.5 → 0.2.7

package/lib/highlight/json.js

@@ -1,51 +1,31 @@
 'use strict';
 
 const core = require('./core.js');
-const { emit, readString } = core;
+const { emit, wordStyles, scanWhile, stringEnd } = core;
 
-const JSON_LITERAL = {
-  true: 'literal',
-  false: 'literal',
-  null: 'literal',
-};
+const JSON_LITERAL = wordStyles({ literal: ['true', 'false', 'null'] });
 
 const highlight = (source) => {
   const out = [];
   let i = 0;
-  const n = source.length;
-  while (i < n) {
+  const take = (style, end) => {
+    emit(out, style, source.slice(i, end));
+    i = end;
+  };
+  while (i < source.length) {
     const ch = source[i];
     if (ch === '"') {
-      const { text, end } = readString(source, i);
-      let k = end;
-      while (k < n && /\s/.test(source[k])) k += 1;
-      const kind = source[k] === ':' ? 'property' : 'string';
-      emit(out, kind, text);
-      i = end;
-      continue;
-    }
-    if (/[0-9-]/.test(ch)) {
-      let j = i;
-      while (j < n && /[0-9.eE+-]/.test(source[j])) j += 1;
-      emit(out, 'number', source.slice(i, j));
-      i = j;
-      continue;
-    }
-    if (/[a-z]/.test(ch)) {
-      let j = i;
-      while (j < n && /[a-z]/.test(source[j])) j += 1;
-      const word = source.slice(i, j);
-      emit(out, JSON_LITERAL[word] ?? 'plain', word);
-      i = j;
-      continue;
-    }
-    if (/[{}[\],:]/.test(ch)) {
-      emit(out, 'punct', ch);
-      i += 1;
-      continue;
+      const end = stringEnd(source, i);
+      const after = source[scanWhile(source, end, /\s/)];
+      take(after === ':' ? 'property' : 'string', end);
+    } else if (/[0-9-]/.test(ch)) {
+      take('number', scanWhile(source, i, /[0-9.eE+-]/));
+    } else if (/[a-z]/.test(ch)) {
+      const end = scanWhile(source, i, /[a-z]/);
+      take(JSON_LITERAL[source.slice(i, end)] ?? 'plain', end);
+    } else {
+      take(/[{}[\],:]/.test(ch) ? 'punct' : 'plain', i + 1);
     }
-    emit(out, 'plain', ch);
-    i += 1;
   }
   return out;
 };

package/lib/highlight/log.js

@@ -1,48 +1,42 @@
 'use strict';
 
 const core = require('./core.js');
-const { emit, highlightLines } = core;
+const { emit, highlightLines, wordStyles } = core;
 
 const LOG_DATETIME_RE = new RegExp(
   '^(\\d{4}-\\d{2}-\\d{2}[T ]\\d{2}:\\d{2}:\\d{2}' +
     '(?:\\.\\d+)?(?:Z|[+-]\\d{2}:?\\d{2})?)',
 );
 
-const LOG_TAG_STYLE = {
-  error: 'logError',
-  err: 'logError',
-  warn: 'logWarn',
-  warning: 'logWarn',
-  info: 'logInfo',
-  debug: 'logDebug',
-  log: 'plain',
-};
+const LOG_TAG_RE = /^(\s*)(\[[^\]]+\])/;
+
+const LOG_TAG_STYLE = wordStyles({
+  logError: ['error', 'err'],
+  logWarn: ['warn', 'warning'],
+  logInfo: ['info'],
+  logDebug: ['debug'],
+});
 
 const highlightLogLine = (line) => {
-  if (!line) return [];
   const out = [];
   let rest = line;
-  const dm = rest.match(LOG_DATETIME_RE);
-  if (dm) {
-    emit(out, 'logDate', dm[1]);
-    rest = rest.slice(dm[1].length);
+  const date = LOG_DATETIME_RE.exec(rest);
+  if (date) {
+    emit(out, 'logDate', date[1]);
+    rest = rest.slice(date[1].length);
   }
-  const tag = rest.match(/^(\s*)(\[[^\]]+\])/);
+  const tag = LOG_TAG_RE.exec(rest);
   if (tag) {
     emit(out, 'plain', tag[1]);
-    const name = tag[2].replace(/^\[|\]$/g, '').toLowerCase();
+    const name = tag[2].slice(1, -1).toLowerCase();
     emit(out, LOG_TAG_STYLE[name] || 'plain', tag[2]);
     rest = rest.slice(tag[0].length);
   }
-  if (rest.includes('\t')) {
-    const parts = rest.split('\t');
-    for (let i = 0; i < parts.length; i += 1) {
-      if (i) emit(out, 'plain', '\t');
-      emit(out, `logCol${i}`, parts[i]);
-    }
-    return out;
+  const columns = rest.split('\t');
+  for (let i = 0; i < columns.length; i += 1) {
+    if (i) emit(out, 'plain', '\t');
+    emit(out, `logCol${i}`, columns[i]);
   }
-  if (rest) emit(out, 'logCol0', rest);
   return out;
 };
 

package/lib/highlight/txt.js

@@ -3,20 +3,17 @@
 const core = require('./core.js');
 const { emit, highlightLines } = core;
 
+const URL_RE = /https?:\/\/[^\s<>"']+|www\.[^\s<>"']+/g;
+
 const highlightTxtLine = (line) => {
-  if (!line) return [];
   const out = [];
-  const re = /(https?:\/\/[^\s<>"']+|www\.[^\s<>"']+)/g;
   let last = 0;
-  let m = re.exec(line);
-  while (m !== null) {
-    if (m.index > last) emit(out, 'plain', line.slice(last, m.index));
-    emit(out, 'string', m[0]);
-    last = m.index + m[0].length;
-    m = re.exec(line);
+  for (const match of line.matchAll(URL_RE)) {
+    emit(out, 'plain', line.slice(last, match.index));
+    emit(out, 'string', match[0]);
+    last = match.index + match[0].length;
   }
-  if (last < line.length) emit(out, 'plain', line.slice(last));
-  if (!out.length) emit(out, 'plain', line);
+  emit(out, 'plain', line.slice(last));
   return out;
 };
 

package/lib/highlight.js

@@ -1,40 +1,21 @@
 'use strict';
 
-const fs = require('node:fs');
-const path = require('node:path');
-
 const core = require('./highlight/core.js');
-const { tokensText } = core;
+const { tokensText, words } = core;
 
-const PLUGIN_DIR = path.join(__dirname, 'highlight');
-const SKIP = ['core.js'];
+const PLUGIN_NAMES = words('bash css csv dart dot html js json log txt');
 
-const loadPlugins = () => {
-  const names = fs
-    .readdirSync(PLUGIN_DIR)
-    .filter((name) => name.endsWith('.js') && !SKIP.includes(name));
-  names.sort();
-  return names.map((file) => require(path.join(PLUGIN_DIR, file)));
-};
+const HIGHLIGHTERS = Object.create(null);
+const LANG = Object.create(null);
 
-const indexPlugins = (plugins) => {
-  const highlighters = Object.create(null);
-  const lang = Object.create(null);
-  for (const plugin of plugins) {
-    for (const id of plugin.langs) {
-      highlighters[id] = plugin.highlight;
-      lang[id] = id;
-    }
-    const aliases = plugin.aliases ?? {};
-    for (const name of Object.keys(aliases)) lang[name] = aliases[name];
+for (const name of PLUGIN_NAMES) {
+  const plugin = require(`./highlight/${name}.js`);
+  for (const id of plugin.langs) {
+    HIGHLIGHTERS[id] = plugin.highlight;
+    LANG[id] = id;
   }
-  return { highlighters, lang };
-};
-
-const PLUGINS = loadPlugins();
-const registry = indexPlugins(PLUGINS);
-const HIGHLIGHTERS = registry.highlighters;
-const LANG = registry.lang;
+  Object.assign(LANG, plugin.aliases);
+}
 
 const mapLang = (name) => {
   if (!name) return 'txt';
@@ -42,10 +23,8 @@ const mapLang = (name) => {
 };
 
 const tokenize = (lang, source) => {
-  const text = source ?? '';
   const key = mapLang(lang);
-  const highlight = HIGHLIGHTERS[key] || HIGHLIGHTERS.txt;
-  return highlight(text, key);
+  return HIGHLIGHTERS[key](source ?? '', key);
 };
 
 const overlayTokens = (tokens, spans) => {
@@ -61,14 +40,12 @@ const overlayTokens = (tokens, spans) => {
     const span = diff[spanIndex];
     const tokenText = token.text ?? '';
     const spanText = span.text ?? '';
-    const tokenLeft = tokenText.length - tokenOff;
-    const spanLeft = spanText.length - spanOff;
-    const n = Math.min(tokenLeft, spanLeft);
+    const n = Math.min(tokenText.length - tokenOff, spanText.length - spanOff);
     if (n > 0) {
-      const name = typeof token.style === 'string' ? token.style : 'plain';
+      const style = typeof token.style === 'string' && token.style;
       pieces.push({
         text: tokenText.slice(tokenOff, tokenOff + n),
-        style: name || 'plain',
+        style: style || 'plain',
         changed: span.changed === true,
       });
     }
@@ -83,21 +60,15 @@ const overlayTokens = (tokens, spans) => {
       spanOff = 0;
     }
   }
-  while (spanIndex < diff.length) {
+  for (; spanIndex < diff.length; spanIndex++) {
     const span = diff[spanIndex];
     const text = (span.text ?? '').slice(spanOff);
     if (text) {
       pieces.push({ text, style: 'plain', changed: span.changed === true });
     }
-    spanIndex += 1;
     spanOff = 0;
   }
   return pieces;
 };
 
-module.exports = {
-  tokensText,
-  tokenize,
-  overlayTokens,
-  mapLang,
-};
+module.exports = { tokensText, tokenize, overlayTokens, mapLang };

package/lib/keys.js

@@ -3,15 +3,14 @@
 const actions = require('./session/actions.js');
 
 const { ACTIONS, ACTION_IDS, BRANCH_ACTIONS, COMMIT_ACTIONS } = actions;
-const { DIFF_DISABLED, FILES_DISABLED, FILES_GIT_DISABLED } = actions;
-const { FILES_HIDDEN, FILES_TASKS_DISABLED } = actions;
+const { DASH_IDS, DASH_HIDDEN } = actions;
+const { DIFF_DISABLED, FILES_GIT_DISABLED, FILES_HIDDEN } = actions;
 const { TASKS_DISABLED, BRANCHES_DISABLED } = actions;
 const { COMMITS_DISABLED, UNIT_DISABLED, NPM_DISABLED } = actions;
-const { disabledActions, diffGitDisabled, branchGitDisabled } = actions;
-const { commitGitDisabled } = actions;
-const { actionFromKey, actionHot, actionLetter, buttonWord } = actions;
-const { CONFIRM, CONFIRM_MODE, confirmKey, applyConfirm } = actions;
-const { confirmPrefix, promptFromChoices } = actions;
+const { diffGitDisabled, branchGitDisabled, commitGitDisabled } = actions;
+const { entryHasDiff, lineHasDiff, withoutMoves } = actions;
+const { actionLetter, buttonWord } = actions;
+const { CONFIRM, confirmPrefix, promptFromChoices } = actions;
 
 const CSI_KEYS = {
   A: 'up',
@@ -22,14 +21,35 @@ const CSI_KEYS = {
   F: 'end',
 };
 
+const SS3_KEYS = {
+  ...CSI_KEYS,
+  P: 'f1',
+  Q: 'f2',
+  R: 'f3',
+  S: 'f4',
+};
+
 const CSI_TILDE = {
   1: 'home',
+  2: 'insert',
   3: 'delete',
   4: 'end',
   5: 'pageUp',
   6: 'pageDown',
   7: 'home',
   8: 'end',
+  11: 'f1',
+  12: 'f2',
+  13: 'f3',
+  14: 'f4',
+  15: 'f5',
+  17: 'f6',
+  18: 'f7',
+  19: 'f8',
+  20: 'f9',
+  21: 'f10',
+  23: 'f11',
+  24: 'f12',
 };
 
 const CSI_MAX = 16;
@@ -48,34 +68,17 @@ const MOUSE_WHEEL = {
   65: 'wheelDown',
 };
 
-const parseCsiSeq = (rest) => {
-  const body = rest.slice(2);
-  let i = 0;
-  while (i < body.length) {
-    const code = body.charCodeAt(i);
-    if (code >= 64 && code <= 126) break;
-    i += 1;
-  }
-  if (i >= body.length) {
-    if (rest.length > CSI_MAX) {
-      return { event: { type: 'key', key: 'escape' }, eat: 1 };
-    }
-    return { needMore: true };
-  }
-  return { params: body.slice(0, i), final: body[i], eat: 2 + i + 1 };
-};
+const NEED_MORE = { needMore: true };
 
-const modifierBits = (modText) => {
-  const mod = parseInt(modText, 10);
-  if (!Number.isFinite(mod)) return 0;
-  return mod - 1;
-};
+const keyAt = (key, end) => ({ event: { type: 'key', key }, end });
 
-const modifiedKey = (base, bits) => {
+const modifiedKey = (base, modText) => {
   const arrow =
     base === 'left' || base === 'right' || base === 'up' || base === 'down';
   const end = base === 'home' || base === 'end';
   if (!arrow && !end) return base;
+  const mod = parseInt(modText, 10);
+  const bits = Number.isFinite(mod) ? mod - 1 : 0;
   const ctrl = (bits & 4) !== 0;
   const shift = (bits & 1) !== 0;
   if (ctrl && shift && arrow) return `ctrl-shift-${base}`;
@@ -89,15 +92,28 @@ const keyFromCsi = (paramsText, final) => {
   const base = final === '~' ? CSI_TILDE[params[0]] : CSI_KEYS[final];
   if (!base) return null;
   if (params.length < 2) return base;
-  return modifiedKey(base, modifierBits(params[1]));
+  return modifiedKey(base, params[1]);
 };
 
-const mouseKindFromButton = (button, press) => {
+const parseCsi = (rest, start) => {
+  let i = 2;
+  while (i < rest.length) {
+    const code = rest.charCodeAt(i);
+    if (code >= 64 && code <= 126) break;
+    i += 1;
+  }
+  if (i >= rest.length) {
+    return rest.length > CSI_MAX ? keyAt('escape', start + 1) : NEED_MORE;
+  }
+  const key = keyFromCsi(rest.slice(2, i), rest[i]);
+  return key ? keyAt(key, start + i + 1) : keyAt('escape', start + 1);
+};
+
+const mouseKind = (button, press) => {
   const wheel = MOUSE_WHEEL[button];
   if (wheel) return wheel;
   if (!press) return 'release';
-  if (button & 32) return 'drag';
-  return 'press';
+  return button & 32 ? 'drag' : 'press';
 };
 
 const parseMouse = (body, flag) => {
@@ -110,81 +126,60 @@ const parseMouse = (body, flag) => {
     return null;
   }
   const press = flag === 'M';
-  const kind = mouseKindFromButton(button, press);
+  const kind = mouseKind(button, press);
   return { type: 'mouse', button, x, y, press, kind, btn: button & 3 };
 };
 
 const parseEsc = (text, start) => {
   const rest = text.slice(start);
-  if (rest === '\x1b') return { needMore: true };
-  if (rest.startsWith('\x1b[') && rest.length === 2) return { needMore: true };
+  if (rest === '\x1b' || rest === '\x1b[') return NEED_MORE;
   if (rest.startsWith('\x1b[<')) {
     const endM = rest.search(/[Mm]/);
-    if (endM < 0) return { needMore: true };
-    const kind = rest[endM];
-    const body = rest.slice(3, endM);
-    const mouse = parseMouse(body, kind);
-    if (!mouse) {
-      return { event: { type: 'key', key: 'escape' }, end: start + endM + 1 };
-    }
-    return { event: mouse, end: start + endM + 1 };
-  }
-  if (rest.startsWith('\x1b[')) {
-    const csi = parseCsiSeq(rest);
-    if (csi.needMore) return csi;
-    if (csi.event) return { event: csi.event, end: start + csi.eat };
-    const key = keyFromCsi(csi.params, csi.final);
-    if (key) return { event: { type: 'key', key }, end: start + csi.eat };
-    return { event: { type: 'key', key: 'escape' }, end: start + 1 };
+    if (endM < 0) return NEED_MORE;
+    const mouse = parseMouse(rest.slice(3, endM), rest[endM]);
+    const end = start + endM + 1;
+    return mouse ? { event: mouse, end } : keyAt('escape', end);
   }
+  if (rest.startsWith('\x1b[')) return parseCsi(rest, start);
   if (rest.startsWith('\x1bO')) {
-    if (rest.length < 3) return { needMore: true };
-    const key = CSI_KEYS[rest[2]];
-    if (key) return { event: { type: 'key', key }, end: start + 3 };
-    return { event: { type: 'key', key: 'escape' }, end: start + 1 };
+    if (rest.length < 3) return NEED_MORE;
+    const key = SS3_KEYS[rest[2]];
+    return key ? keyAt(key, start + 3) : keyAt('escape', start + 1);
   }
-  return { event: { type: 'key', key: 'escape' }, end: start + 1 };
+  return keyAt('escape', start + 1);
 };
 
 const decodeChunk = (text, carry = '') => {
   const source = carry + text;
-  const events = new Array(source.length);
-  let n = 0;
+  const events = [];
   let i = 0;
   while (i < source.length) {
     const ch = source[i];
     if (ch === '\x1b') {
       const parsed = parseEsc(source, i);
-      if (parsed.needMore) {
-        events.length = n;
-        return { events, carry: source.slice(i) };
-      }
-      events[n++] = parsed.event;
+      if (parsed.needMore) return { events, carry: source.slice(i) };
+      events.push(parsed.event);
       i = parsed.end;
       continue;
     }
     const named = LITERAL_KEY[ch];
+    const code = source.charCodeAt(i);
     if (named) {
-      events[n++] = { type: 'key', key: named };
+      events.push({ type: 'key', key: named });
       i += 1;
       continue;
     }
-    const code = source.charCodeAt(i);
     if (code >= 1 && code <= 26) {
       const letter = String.fromCharCode(96 + code);
-      events[n++] = { type: 'key', key: `ctrl-${letter}` };
+      events.push({ type: 'key', key: `ctrl-${letter}` });
       i += 1;
       continue;
     }
-    if (code >= 0xd800 && code <= 0xdbff && i + 1 < source.length) {
-      events[n++] = { type: 'key', key: source.slice(i, i + 2) };
-      i += 2;
-      continue;
-    }
-    events[n++] = { type: 'key', key: ch };
-    i += 1;
+    const isPair = code >= 0xd800 && code <= 0xdbff && i + 1 < source.length;
+    const size = isPair ? 2 : 1;
+    events.push({ type: 'key', key: source.slice(i, i + size) });
+    i += size;
   }
-  events.length = n;
   return { events, carry: '' };
 };
 
@@ -198,32 +193,29 @@ const hitAction = (hits, x) => {
 module.exports = {
   ACTIONS,
   ACTION_IDS,
+  DASH_IDS,
+  DASH_HIDDEN,
   BRANCH_ACTIONS,
   COMMIT_ACTIONS,
   DIFF_DISABLED,
-  FILES_DISABLED,
   FILES_HIDDEN,
   FILES_GIT_DISABLED,
-  FILES_TASKS_DISABLED,
   TASKS_DISABLED,
   BRANCHES_DISABLED,
   COMMITS_DISABLED,
   NPM_DISABLED,
   UNIT_DISABLED,
-  disabledActions,
   diffGitDisabled,
+  entryHasDiff,
+  lineHasDiff,
+  withoutMoves,
   branchGitDisabled,
   commitGitDisabled,
   decodeChunk,
-  actionFromKey,
-  actionHot,
   actionLetter,
   buttonWord,
   hitAction,
   CONFIRM,
-  CONFIRM_MODE,
-  confirmKey,
-  applyConfirm,
   confirmPrefix,
   promptFromChoices,
 };