reslop 0.1.1 → 0.1.2

package/lib/highlight.js

@@ -294,7 +294,7 @@ const NEXT_EXPECT = {
 };
 
 const wordStyle = (words, style) => {
-  const table = Object.create(null);
+  const table = {};
   for (const word of words) table[word] = style;
   return table;
 };
@@ -424,8 +424,6 @@ const styleProperty = ({ out }) => {
   return /\.$/.test(prev) ? 'property' : null;
 };
 
-const styleVariable = () => 'variable';
-
 const IDENT_RULES = [
   styleExpected,
   styleKeyword,
@@ -434,7 +432,6 @@ const IDENT_RULES = [
   styleCall,
   styleAssign,
   styleProperty,
-  styleVariable,
 ];
 
 const identStyle = (ctx) => {
@@ -442,7 +439,7 @@ const identStyle = (ctx) => {
     const style = rule(ctx);
     if (style) return style;
   }
-  return 'plain';
+  return 'variable';
 };
 
 const readString = (source, i) => {
@@ -519,150 +516,143 @@ const isRegexContext = (out) => {
   return afterOperator || afterKeyword;
 };
 
-class JsHighlighter {
-  highlightJsFamily(source, ts = false) {
-    const out = [];
-    let i = 0;
-    const n = source.length;
-    let expectName = null;
-
-    while (i < n) {
-      const ch = source[i];
-      const next = source[i + 1];
-
-      if (ch === '/' && next === '/') {
-        const { text, end } = readUntilNl(source, i);
-        emit(out, 'comment', text);
-        i = end;
-        continue;
+const highlightTemplate = (source, i, highlightExpr) => {
+  const n = source.length;
+  let j = i + 1;
+  const parts = [];
+  emit(parts, 'template', '`');
+  let buf = '';
+  const flush = () => {
+    if (buf) {
+      emit(parts, 'template', buf);
+      buf = '';
+    }
+  };
+  while (j < n) {
+    if (source[j] === '\\') {
+      flush();
+      emit(parts, 'escape', source.slice(j, j + 2));
+      j += 2;
+      continue;
+    }
+    if (source[j] === '`') {
+      flush();
+      emit(parts, 'template', '`');
+      j += 1;
+      break;
+    }
+    if (source[j] === '$' && source[j + 1] === '{') {
+      flush();
+      emit(parts, 'interpolation', '${');
+      j += 2;
+      const interp = readTemplateInterp(source, j);
+      const inner = highlightExpr(interp.expr, false);
+      for (const t of inner) parts.push(t);
+      j = interp.end;
+      if (source[j] === '}') {
+        emit(parts, 'interpolation', '}');
+        j += 1;
       }
+      continue;
+    }
+    buf += source[j];
+    j += 1;
+  }
+  flush();
+  return { tokens: parts, end: j };
+};
 
-      if (ch === '/' && next === '*') {
-        const { text, end } = readBlockComment(source, i);
-        emit(out, 'comment', text);
-        i = end;
-        continue;
-      }
+const highlightJsFamily = (source, ts = false) => {
+  const out = [];
+  let i = 0;
+  const n = source.length;
+  let expectName = null;
 
-      if (ch === '`') {
-        const r = this.highlightTemplate(source, i);
-        for (const t of r.tokens) out.push(t);
-        i = r.end;
-        continue;
-      }
+  while (i < n) {
+    const ch = source[i];
+    const next = source[i + 1];
 
-      if (QUOTES.includes(ch)) {
-        const { text, end } = readString(source, i);
-        emit(out, 'string', text);
-        i = end;
-        continue;
-      }
+    if (ch === '/' && next === '/') {
+      const { text, end } = readUntilNl(source, i);
+      emit(out, 'comment', text);
+      i = end;
+      continue;
+    }
 
-      if (ch === '/' && isRegexContext(out)) {
-        const { text, end } = readRegex(source, i);
-        emit(out, 'regex', text);
-        i = end;
-        continue;
-      }
+    if (ch === '/' && next === '*') {
+      const { text, end } = readBlockComment(source, i);
+      emit(out, 'comment', text);
+      i = end;
+      continue;
+    }
 
-      if (/[0-9]/.test(ch) || (ch === '.' && /[0-9]/.test(next || ''))) {
-        const { text, end } = readJsNumber(source, i);
-        emit(out, 'number', text);
-        i = end;
-        continue;
-      }
+    if (ch === '`') {
+      const r = highlightTemplate(source, i, highlightJsFamily);
+      for (const t of r.tokens) out.push(t);
+      i = r.end;
+      continue;
+    }
 
-      if (ch === '@') {
-        let j = i + 1;
-        while (j < n && /[A-Za-z0-9_$]/.test(source[j])) j += 1;
-        emit(out, 'decorator', source.slice(i, j));
-        i = j;
-        expectName = null;
-        continue;
-      }
+    if (QUOTES.includes(ch)) {
+      const { text, end } = readString(source, i);
+      emit(out, 'string', text);
+      i = end;
+      continue;
+    }
 
-      if (/[A-Za-z_$]/.test(ch)) {
-        const word = peekIdent(source, i);
-        const end = i + word.length;
-        const k = skipWs(source, end);
-        const after = source[k];
-        const ctx = { word, ts, after, source, k, out, expectName };
-        emit(out, identStyle(ctx), word);
-        if (EXPECT_STYLE[expectName]) expectName = null;
-        else expectName = NEXT_EXPECT[word] ?? null;
-        i = end;
-        continue;
-      }
+    if (ch === '/' && isRegexContext(out)) {
+      const { text, end } = readRegex(source, i);
+      emit(out, 'regex', text);
+      i = end;
+      continue;
+    }
 
-      if (/[=<>!+\-*/%&|^~?:]/.test(ch)) {
-        const { text, end } = readJsOperator(source, i);
-        emit(out, 'operator', text);
-        i = end;
-        expectName = null;
-        continue;
-      }
-      if (/[{}()[\];,.]/.test(ch)) {
-        emit(out, 'punct', ch);
-        i += 1;
-        continue;
-      }
-      emit(out, 'plain', ch);
-      i += 1;
+    if (/[0-9]/.test(ch) || (ch === '.' && /[0-9]/.test(next || ''))) {
+      const { text, end } = readJsNumber(source, i);
+      emit(out, 'number', text);
+      i = end;
+      continue;
     }
-    return out;
-  }
 
-  highlightTemplate(source, i) {
-    const n = source.length;
-    let j = i + 1;
-    const parts = [];
-    emit(parts, 'template', '`');
-    let buf = '';
-    const flush = () => {
-      if (buf) {
-        emit(parts, 'template', buf);
-        buf = '';
-      }
-    };
-    while (j < n) {
-      if (source[j] === '\\') {
-        flush();
-        emit(parts, 'escape', source.slice(j, j + 2));
-        j += 2;
-        continue;
-      }
-      if (source[j] === '`') {
-        flush();
-        emit(parts, 'template', '`');
-        j += 1;
-        break;
-      }
-      if (source[j] === '$' && source[j + 1] === '{') {
-        flush();
-        emit(parts, 'interpolation', '${');
-        j += 2;
-        const interp = readTemplateInterp(source, j);
-        const inner = this.highlightJsFamily(interp.expr, false);
-        for (const t of inner) parts.push(t);
-        j = interp.end;
-        if (source[j] === '}') {
-          emit(parts, 'interpolation', '}');
-          j += 1;
-        }
-        continue;
-      }
-      buf += source[j];
-      j += 1;
+    if (ch === '@') {
+      let j = i + 1;
+      while (j < n && /[A-Za-z0-9_$]/.test(source[j])) j += 1;
+      emit(out, 'decorator', source.slice(i, j));
+      i = j;
+      expectName = null;
+      continue;
     }
-    flush();
-    return { tokens: parts, end: j };
-  }
-}
 
-const jsHighlighter = new JsHighlighter();
+    if (/[A-Za-z_$]/.test(ch)) {
+      const word = peekIdent(source, i);
+      const end = i + word.length;
+      const k = skipWs(source, end);
+      const after = source[k];
+      const ctx = { word, ts, after, source, k, out, expectName };
+      emit(out, identStyle(ctx), word);
+      if (EXPECT_STYLE[expectName]) expectName = null;
+      else expectName = NEXT_EXPECT[word] ?? null;
+      i = end;
+      continue;
+    }
 
-const highlightJsFamily = (source, ts = false) =>
-  jsHighlighter.highlightJsFamily(source, ts);
+    if (/[=<>!+\-*/%&|^~?:]/.test(ch)) {
+      const { text, end } = readJsOperator(source, i);
+      emit(out, 'operator', text);
+      i = end;
+      expectName = null;
+      continue;
+    }
+    if (/[{}()[\];,.]/.test(ch)) {
+      emit(out, 'punct', ch);
+      i += 1;
+      continue;
+    }
+    emit(out, 'plain', ch);
+    i += 1;
+  }
+  return out;
+};
 
 const highlightJson = (source) => {
   const out = [];
@@ -1158,9 +1148,6 @@ const HIGHLIGHTERS = {
   html: highlightHtml,
   csv: highlightCsv,
   bash: highlightBash,
-  sh: highlightBash,
-  shell: highlightBash,
-  zsh: highlightBash,
   log: highlightLog,
   dot: highlightDot,
   txt: highlightTxt,
@@ -1224,8 +1211,7 @@ const overlayTokens = (tokens, spans) => {
 };
 
 module.exports = {
+  tokensText,
   tokenize,
   overlayTokens,
-  tokensText,
-  HIGHLIGHTERS,
 };

package/lib/keys.js

@@ -1,40 +1,36 @@
 'use strict';
 
-const ACTIONS = [
-  { id: 'add', keys: ['a'], label: 'Add' },
-  { id: 'unstage', keys: ['u'], label: 'Unstage' },
-  { id: 'revert', keys: ['r'], label: 'Revert' },
-  { id: 'skip', keys: ['s'], label: 'Skip' },
-  { id: 'prev', keys: ['left', 'p'], hot: '←', label: 'Prev' },
-  { id: 'next', keys: ['right', 'n'], hot: '→', label: 'Next' },
-  { id: 'layout', keys: ['m'], label: 'Mode' },
-  { id: 'files', keys: ['l'], label: 'Files' },
-  { id: 'feedback', keys: ['f'], label: 'Feedback' },
-  { id: 'todo', keys: ['t'], label: 'Todo' },
-  { id: 'quit', keys: ['q', 'ctrl-c'], label: 'Quit' },
-];
-
-const FILES_DISABLED = ['skip', 'layout', 'feedback'];
+const ACTIONS = {
+  add: { keys: ['a'], label: 'Add' },
+  unstage: { keys: ['u'], label: 'Unstage' },
+  revert: { keys: ['r'], label: 'Revert' },
+  prev: { keys: ['left', 'p'], hot: '←', label: 'Prev' },
+  next: { keys: ['right', 'n'], hot: '→', label: 'Next' },
+  layout: { keys: ['m'], label: 'Mode' },
+  files: { keys: ['l'], label: 'Files' },
+  feedback: { keys: ['f'], label: 'Feedback' },
+  todo: { keys: ['t'], label: 'Todo' },
+  quit: { keys: ['q', 'ctrl-c'], label: 'Quit' },
+};
+const ACTION_IDS = Object.keys(ACTIONS);
+
+const FILES_DISABLED = ['layout', 'feedback'];
 
 const SCROLL = {
   up: 'scrollUp',
-  k: 'scrollUp',
   down: 'scrollDown',
-  j: 'scrollDown',
-  h: 'help',
-  '?': 'help',
   enter: 'open',
   backspace: 'removeTodo',
   delete: 'removeTodo',
 };
 
-const KEY_TO_ACTION = Object.create(null);
+const KEY_TO_ACTION = {};
 
-for (const action of ACTIONS) {
-  for (const key of action.keys) KEY_TO_ACTION[key] = action.id;
+for (const id of ACTION_IDS) {
+  for (const key of ACTIONS[id].keys) KEY_TO_ACTION[key] = id;
 }
 
-for (const [key, id] of Object.entries(SCROLL)) KEY_TO_ACTION[key] = id;
+for (const key of Object.keys(SCROLL)) KEY_TO_ACTION[key] = SCROLL[key];
 
 const CSI_KEYS = {
   A: 'up',
@@ -51,6 +47,15 @@ const CSI_TILDE = {
   4: 'end',
 };
 
+const LITERAL_KEY = {
+  '\x7f': 'backspace',
+  '\x08': 'backspace',
+  '\t': 'tab',
+  '\x03': 'ctrl-c',
+  '\r': 'enter',
+  '\n': 'enter',
+};
+
 const MOUSE_WHEEL = {
   64: 'wheelUp',
   65: 'wheelDown',
@@ -64,11 +69,6 @@ const mouseKindFromButton = (button, press) => {
   return 'press';
 };
 
-const mouseKind = (event) => {
-  if (event.kind) return event.kind;
-  return mouseKindFromButton(event.button, event.press);
-};
-
 const parseMouse = (body, flag) => {
   const parts = body.split(';');
   if (parts.length < 3) return null;
@@ -123,15 +123,6 @@ const parseEsc = (text, start) => {
   return { event: { type: 'key', key: 'escape' }, end: start + 1 };
 };
 
-const LITERAL_KEY = {
-  '\x7f': 'backspace',
-  '\x08': 'backspace',
-  '\t': 'tab',
-  '\x03': 'ctrl-c',
-  '\r': 'enter',
-  '\n': 'enter',
-};
-
 const decodeChunk = (text, carry = '') => {
   const source = carry + text;
   const events = [];
@@ -199,13 +190,12 @@ const hitAction = (hits, x) => {
 
 module.exports = {
   ACTIONS,
+  ACTION_IDS,
   FILES_DISABLED,
-  KEY_TO_ACTION,
   decodeChunk,
   actionFromKey,
   actionHot,
   actionLetter,
   buttonWord,
   hitAction,
-  mouseKind,
 };