reslop 0.2.5 → 0.2.7

package/lib/highlight/css.js

@@ -1,71 +1,38 @@
 'use strict';
 
 const core = require('./core.js');
-const { QUOTES, emit, readBlockComment, readString } = core;
+const { QUOTES, emit, scanWhile, blockCommentEnd, stringEnd } = core;
 
-const CSS_NEXT_STYLE = {
-  ':': 'property',
-  '{': 'tag',
-};
+const CSS_NEXT_STYLE = { ':': 'property', '{': 'tag' };
+const CSS_NAME = /[A-Za-z0-9_-]/;
 
 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];
-    const next = source[i + 1];
-    if (ch === '/' && next === '*') {
-      const { text, end } = readBlockComment(source, i);
-      emit(out, 'comment', text);
-      i = end;
-      continue;
-    }
-    if (QUOTES.includes(ch)) {
-      const { text, end } = readString(source, i);
-      emit(out, 'string', text);
-      i = end;
-      continue;
-    }
-    if (ch === '@') {
-      let j = i + 1;
-      while (j < n && /[A-Za-z0-9-]/.test(source[j])) j += 1;
-      emit(out, 'keyword', source.slice(i, j));
-      i = j;
-      continue;
-    }
-    if ('#.'.includes(ch)) {
-      let j = i + 1;
-      while (j < n && /[A-Za-z0-9_-]/.test(source[j])) j += 1;
-      const kind = ch === '#' ? 'constant' : 'className';
-      emit(out, kind, source.slice(i, j));
-      i = j;
-      continue;
-    }
-    if (/[0-9]/.test(ch)) {
-      let j = i;
-      while (j < n && /[0-9.%]/.test(source[j])) j += 1;
-      emit(out, 'number', source.slice(i, j));
-      i = j;
-      continue;
-    }
-    if (/[A-Za-z_-]/.test(ch)) {
-      let j = i + 1;
-      while (j < n && /[A-Za-z0-9_-]/.test(source[j])) j += 1;
-      const word = source.slice(i, j);
-      let k = j;
-      while (k < n && /\s/.test(source[k])) k += 1;
-      emit(out, CSS_NEXT_STYLE[source[k]] ?? 'plain', word);
-      i = j;
-      continue;
-    }
-    if (/[{};:,]/.test(ch)) {
-      emit(out, 'punct', ch);
-      i += 1;
-      continue;
+    if (ch === '/' && source[i + 1] === '*') {
+      take('comment', blockCommentEnd(source, i));
+    } else if (QUOTES.includes(ch)) {
+      take('string', stringEnd(source, i));
+    } else if (ch === '@') {
+      take('keyword', scanWhile(source, i + 1, /[A-Za-z0-9-]/));
+    } else if (ch === '#' || ch === '.') {
+      const style = ch === '#' ? 'constant' : 'className';
+      take(style, scanWhile(source, i + 1, CSS_NAME));
+    } else if (/[0-9]/.test(ch)) {
+      take('number', scanWhile(source, i, /[0-9.%]/));
+    } else if (/[A-Za-z_-]/.test(ch)) {
+      const end = scanWhile(source, i + 1, CSS_NAME);
+      const after = source[scanWhile(source, end, /\s/)];
+      take(CSS_NEXT_STYLE[after] ?? 'plain', end);
+    } else {
+      take(/[{};:,]/.test(ch) ? 'punct' : 'plain', i + 1);
     }
-    emit(out, 'plain', ch);
-    i += 1;
   }
   return out;
 };

package/lib/highlight/csv.js

@@ -1,65 +1,47 @@
 'use strict';
 
 const core = require('./core.js');
-const { emit } = core;
+const { emit, highlightLines } = core;
 
 const splitCsv = (line) => {
   const cells = [];
   let cur = '';
-  let inQ = false;
+  let inQuotes = false;
   for (let i = 0; i < line.length; i += 1) {
     const ch = line[i];
-    if (ch === '"') {
-      if (inQ && line[i + 1] === '"') {
-        cur += '"';
-        i += 1;
-      } else {
-        inQ = !inQ;
-        cur += ch;
-      }
-      continue;
-    }
-    if (ch === ',' && !inQ) {
+    if (ch === '"' && inQuotes && line[i + 1] === '"') {
+      cur += '"';
+      i += 1;
+    } else if (ch === '"') {
+      inQuotes = !inQuotes;
+      cur += ch;
+    } else if (ch === ',' && !inQuotes) {
       cells.push(cur);
       cur = '';
-      continue;
+    } else {
+      cur += ch;
     }
-    cur += ch;
   }
   cells.push(cur);
   return cells;
 };
 
-const highlightCsvCell = (cell, row, col) => {
-  if (row === 0) return { text: cell, style: 'function' };
-  const num = /^-?\d+(\.\d+)?$/.test(cell.trim());
-  if (num) return { text: cell, style: 'number' };
-  if (col % 2 === 0) return { text: cell, style: 'string' };
-  return { text: cell, style: 'variable' };
+const cellStyle = (cell, col) => {
+  if (/^-?\d+(\.\d+)?$/.test(cell.trim())) return 'number';
+  return col % 2 === 0 ? 'string' : 'variable';
 };
 
-const highlightCsvLine = (line, row) => {
-  if (!line) return [];
+const highlightCsvLine = (line) => {
   const cells = splitCsv(line);
   const out = [];
   for (let col = 0; col < cells.length; col += 1) {
     if (col) emit(out, 'punct', ',');
-    const cell = highlightCsvCell(cells[col], row, col);
-    emit(out, cell.style, cell.text);
+    emit(out, cellStyle(cells[col], col), cells[col]);
   }
   return out;
 };
 
-const highlight = (source) => {
-  const lines = source.split(/\r?\n/);
-  const out = [];
-  for (let row = 0; row < lines.length; row += 1) {
-    if (row) emit(out, 'plain', '\n');
-    for (const t of highlightCsvLine(lines[row], row === 0 ? 1 : row)) {
-      out.push(t);
-    }
-  }
-  return out;
+module.exports = {
+  langs: ['csv'],
+  highlight: highlightLines(highlightCsvLine, /\r?\n/),
 };
-
-module.exports = { langs: ['csv'], highlight };

package/lib/highlight/dart.js

@@ -1,245 +1,104 @@
 'use strict';
 
-const hl = require('./core.js');
-const { SQUOTE, QUOTES, EXPECT_STYLE, emit, wordStyle } = hl;
-const { peekIdent, skipWs, readUntilNl, readBlockComment } = hl;
-const { readJsNumber, readJsOperator, readTemplateInterp } = hl;
-const { styleConstant, stylePascal, styleCall } = hl;
+const core = require('./core.js');
+const { QUOTES, IDENT_START, IDENT_CHAR, EXPECT_STYLE } = core;
+const { words, emit, wordStyles, appendNode, scanWhile } = core;
+const { lineEnd, blockCommentEnd, numberEnd, operatorEnd } = core;
+const { highlightInterpolated, nameStyle } = core;
 
-const STORAGE = [
-  'abstract',
-  'as',
-  'base',
-  'class',
-  'const',
-  'covariant',
-  'deferred',
-  'enum',
-  'export',
-  'extends',
-  'extension',
-  'external',
-  'factory',
-  'final',
-  'get',
-  'hide',
-  'implements',
-  'import',
-  'interface',
-  'late',
-  'library',
-  'mixin',
-  'on',
-  'operator',
-  'part',
-  'required',
-  'sealed',
-  'set',
-  'show',
-  'static',
-  'typedef',
-  'var',
-  'with',
-];
+const STORAGE = words(`
+  abstract as base class const covariant deferred enum export extends
+  extension external factory final get hide implements import interface late
+  library mixin on operator part required sealed set show static typedef var
+  with
+`);
 
-const CONTROL = [
-  'assert',
-  'async',
-  'await',
-  'break',
-  'case',
-  'catch',
-  'continue',
-  'default',
-  'do',
-  'else',
-  'for',
-  'if',
-  'in',
-  'is',
-  'new',
-  'rethrow',
-  'return',
-  'switch',
-  'sync',
-  'throw',
-  'try',
-  'when',
-  'while',
-  'yield',
-];
+const CONTROL = words(`
+  assert async await break case catch continue default do else for if in is
+  new rethrow return switch sync throw try when while yield
+`);
 
-const LITERALS = ['true', 'false', 'null', 'this', 'super'];
+const LITERALS = words('true false null this super');
 
-const TYPES = ['void', 'dynamic', 'Never', 'int', 'double', 'num', 'bool'];
+const TYPES = words('void dynamic Never int double num bool');
 
-const NEXT_EXPECT = {
-  class: 'class',
-  mixin: 'class',
-  enum: 'class',
-  extension: 'class',
-  typedef: 'type',
-};
+const NEXT_EXPECT = wordStyles({
+  class: ['class', 'mixin', 'enum', 'extension'],
+  type: ['typedef'],
+});
 
-const WORD_STYLE = {
-  ...wordStyle(CONTROL, 'control'),
-  ...wordStyle(LITERALS, 'literal'),
-  ...wordStyle(STORAGE, 'storage'),
-  ...wordStyle(TYPES, 'type'),
-};
+const WORD_STYLE = wordStyles({
+  control: CONTROL,
+  literal: LITERALS,
+  storage: STORAGE,
+  type: TYPES,
+});
 
-const dartStringOpen = (source, i) => {
-  let at = i;
+const stringOpen = (source, i) => {
   const raw = source[i] === 'r';
-  if (raw) at = i + 1;
+  const at = raw ? i + 1 : i;
   let quote = '';
-  const triple = SQUOTE.repeat(3);
-  const dtriple = '"'.repeat(3);
-  if (source.startsWith(triple, at) || source.startsWith(dtriple, at)) {
+  if (source.startsWith(`'''`, at) || source.startsWith('"""', at)) {
     quote = source.slice(at, at + 3);
   } else if (QUOTES.includes(source[at] || '')) {
     quote = source[at];
   }
   if (!quote) return null;
-  return { raw, quote, body: at + quote.length };
-};
-
-const dartIdentStyle = (ctx) => {
-  const known = WORD_STYLE[ctx.word];
-  if (known) return known;
-  if (EXPECT_STYLE[ctx.expectName]) return EXPECT_STYLE[ctx.expectName];
-  if (styleConstant(ctx)) return 'constant';
-  if (stylePascal(ctx)) return 'className';
-  if (styleCall(ctx)) return 'function';
-  return 'variable';
-};
-
-const highlightDartString = (source, i, inner) => {
-  const open = dartStringOpen(source, i);
-  const n = source.length;
-  const parts = [];
-  emit(parts, 'string', source.slice(i, open.body));
-  let j = open.body;
-  let buf = '';
-  const flush = () => {
-    if (!buf) return;
-    emit(parts, 'string', buf);
-    buf = '';
-  };
-  const quote = open.quote;
-  while (j < n) {
-    if (!open.raw && source[j] === '\\') {
-      flush();
-      emit(parts, 'escape', source.slice(j, j + 2));
-      j += 2;
-      continue;
-    }
-    if (source.startsWith(quote, j)) {
-      flush();
-      emit(parts, 'string', quote);
-      j += quote.length;
-      break;
-    }
-    if (!open.raw && source[j] === '$') {
-      const next = source[j + 1];
-      if (next === '{') {
-        flush();
-        emit(parts, 'interpolation', '${');
-        j += 2;
-        const interp = readTemplateInterp(source, j);
-        for (const t of inner(interp.expr)) parts.push(t);
-        j = interp.end;
-        if (source[j] === '}') {
-          emit(parts, 'interpolation', '}');
-          j += 1;
-        }
-        continue;
-      }
-      if (/[A-Za-z_$]/.test(next || '')) {
-        flush();
-        const ident = peekIdent(source, j + 1);
-        emit(parts, 'interpolation', `$${ident}`);
-        j += 1 + ident.length;
-        continue;
-      }
-    }
-    if (quote.length === 1 && source[j] === '\n') break;
-    buf += source[j];
-    j += 1;
-  }
-  flush();
-  return { tokens: parts, end: j };
+  const multiline = quote.length === 3;
+  const kind = { style: 'string', quote, raw, multiline, dollarIdent: true };
+  return { body: at + quote.length, kind };
 };
 
 const highlight = (source) => {
-  const inner = (expr) => highlight(expr);
   const out = [];
   let i = 0;
-  const n = source.length;
   let expectName = null;
-  while (i < n) {
+  const take = (style, end) => {
+    emit(out, style, source.slice(i, end));
+    i = end;
+  };
+  while (i < source.length) {
     const ch = source[i];
     const next = source[i + 1];
+    const open = stringOpen(source, i);
     if (ch === '/' && next === '/') {
-      const { text, end } = readUntilNl(source, i);
-      emit(out, 'comment', text);
-      i = end;
-      continue;
-    }
-    if (ch === '/' && next === '*') {
-      const { text, end } = readBlockComment(source, i);
-      emit(out, 'comment', text);
-      i = end;
-      continue;
-    }
-    if (dartStringOpen(source, i)) {
-      const node = highlightDartString(source, i, inner);
-      for (const t of node.tokens) out.push(t);
-      i = node.end;
+      take('comment', lineEnd(source, i));
+    } else if (ch === '/' && next === '*') {
+      take('comment', blockCommentEnd(source, i));
+    } else if (open) {
+      const node = highlightInterpolated(
+        source,
+        i,
+        open.body,
+        open.kind,
+        highlight,
+      );
+      i = appendNode(out, node);
       expectName = null;
-      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 === '@' || ch === '#') {
-      let j = i + 1;
-      while (j < n && /[A-Za-z0-9_$]/.test(source[j])) j += 1;
-      const kind = ch === '@' ? 'decorator' : 'constant';
-      emit(out, kind, source.slice(i, j));
-      i = j;
+    } else if (/[0-9]/.test(ch) || (ch === '.' && /[0-9]/.test(next || ''))) {
+      take('number', numberEnd(source, i));
+    } else if (ch === '@' || ch === '#') {
+      const style = ch === '@' ? 'decorator' : 'constant';
+      take(style, scanWhile(source, i + 1, IDENT_CHAR));
       expectName = null;
-      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, after, expectName };
-      emit(out, dartIdentStyle(ctx), word);
-      if (EXPECT_STYLE[expectName]) expectName = null;
-      else expectName = NEXT_EXPECT[word] ?? null;
-      i = end;
-      continue;
-    }
-    if (/[=<>!+\-*/%&|^~?:]/.test(ch)) {
-      const { text, end } = readJsOperator(source, i);
-      emit(out, 'operator', text);
-      i = end;
+    } else if (IDENT_START.test(ch)) {
+      const end = scanWhile(source, i + 1, IDENT_CHAR);
+      const word = source.slice(i, end);
+      const after = source[scanWhile(source, end, /\s/)];
+      const style =
+        WORD_STYLE[word] ||
+        EXPECT_STYLE[expectName] ||
+        nameStyle(word, after) ||
+        'variable';
+      const nextExpect = NEXT_EXPECT[word] ?? null;
+      take(style, end);
+      expectName = EXPECT_STYLE[expectName] ? null : nextExpect;
+    } else if (/[=<>!+\-*/%&|^~?:]/.test(ch)) {
+      take('operator', operatorEnd(source, i));
       expectName = null;
-      continue;
-    }
-    if (/[{}()[\];,.]/.test(ch)) {
-      emit(out, 'punct', ch);
-      i += 1;
-      continue;
+    } else {
+      take(/[{}()[\];,.]/.test(ch) ? 'punct' : 'plain', i + 1);
     }
-    emit(out, 'plain', ch);
-    i += 1;
   }
   return out;
 };

package/lib/highlight/dot.js

@@ -3,30 +3,30 @@
 const core = require('./core.js');
 const { emit, highlightLines } = core;
 
+const ASSIGN_RE = /^(\s*)([A-Za-z_][A-Za-z0-9_.-]*)(\s*=\s*)(.*)$/;
+
 const highlightDotLine = (line) => {
-  if (!line) return [];
   const out = [];
-  const t = line.trimStart();
-  if (t.startsWith('#') || t.startsWith(';')) {
+  const trimmed = line.trimStart();
+  if (trimmed.startsWith('#') || trimmed.startsWith(';')) {
     emit(out, 'comment', line);
     return out;
   }
-  if (t.startsWith('!')) {
-    const lead = line.slice(0, line.length - t.length);
-    emit(out, 'plain', lead);
+  if (trimmed.startsWith('!')) {
+    emit(out, 'plain', line.slice(0, line.length - trimmed.length));
     emit(out, 'operator', '!');
-    emit(out, 'plain', t.slice(1));
+    emit(out, 'plain', trimmed.slice(1));
     return out;
   }
-  const eq = line.match(/^(\s*)([A-Za-z_][A-Za-z0-9_.-]*)(\s*=\s*)(.*)$/);
-  if (eq) {
-    emit(out, 'plain', eq[1]);
-    emit(out, 'variable', eq[2]);
-    emit(out, 'operator', eq[3]);
-    emit(out, 'string', eq[4]);
+  const assign = ASSIGN_RE.exec(line);
+  if (!assign) {
+    emit(out, 'plain', line);
     return out;
   }
-  emit(out, 'plain', line);
+  emit(out, 'plain', assign[1]);
+  emit(out, 'variable', assign[2]);
+  emit(out, 'operator', assign[3]);
+  emit(out, 'string', assign[4]);
   return out;
 };
 

package/lib/highlight/html.js

@@ -1,85 +1,64 @@
 'use strict';
 
 const core = require('./core.js');
-const { SQUOTE, emit, skipQuoted } = core;
+const { QUOTES, emit, scanWhile, quotedEnd } = core;
 
 const colorHtmlTag = (tag) => {
   const out = [];
   let i = 1;
-  const n = tag.length;
+  const take = (style, end) => {
+    emit(out, style, tag.slice(i, end));
+    i = end;
+  };
   emit(out, 'punct', '<');
-  if (tag[i] === '/') {
-    emit(out, 'punct', '/');
-    i += 1;
-  }
-  let j = i;
-  while (j < n && /[A-Za-z0-9:-]/.test(tag[j])) j += 1;
-  emit(out, 'tag', tag.slice(i, j));
-  i = j;
-  while (i < n) {
-    if (tag[i] === '>' || (tag[i] === '/' && tag[i + 1] === '>')) {
-      emit(out, 'punct', tag.slice(i));
-      break;
-    }
-    if (/\s/.test(tag[i])) {
-      emit(out, 'plain', tag[i]);
-      i += 1;
-      continue;
-    }
-    if (tag[i] === '"' || tag[i] === SQUOTE) {
-      const q = tag[i];
-      let k = i + 1;
-      while (k < n && tag[k] !== q) k += 1;
-      k = Math.min(k + 1, n);
-      emit(out, 'string', tag.slice(i, k));
-      i = k;
-      continue;
+  if (tag[i] === '/') take('punct', i + 1);
+  take('tag', scanWhile(tag, i, /[A-Za-z0-9:-]/));
+  while (i < tag.length) {
+    const ch = tag[i];
+    if (ch === '>' || (ch === '/' && tag[i + 1] === '>')) {
+      take('punct', tag.length);
+    } else if (/\s/.test(ch)) {
+      take('plain', i + 1);
+    } else if (QUOTES.includes(ch)) {
+      const close = tag.indexOf(ch, i + 1);
+      take('string', close < 0 ? tag.length : close + 1);
+    } else if (/[A-Za-z_:]/.test(ch)) {
+      take('attr', scanWhile(tag, i + 1, /[A-Za-z0-9_:.-]/));
+    } else {
+      take('punct', i + 1);
     }
-    if (/[A-Za-z_:]/.test(tag[i])) {
-      let k = i + 1;
-      while (k < n && /[A-Za-z0-9_:.-]/.test(tag[k])) k += 1;
-      emit(out, 'attr', tag.slice(i, k));
-      i = k;
-      continue;
-    }
-    emit(out, 'punct', tag[i]);
-    i += 1;
   }
   return out;
 };
 
+const tagEnd = (source, i) => {
+  const n = source.length;
+  let j = i + 1;
+  while (j < n && source[j] !== '>') {
+    j = QUOTES.includes(source[j]) ? quotedEnd(source, j) : j + 1;
+  }
+  return j < n ? j + 1 : j;
+};
+
 const highlight = (source) => {
   const out = [];
-  let i = 0;
   const n = source.length;
+  let i = 0;
   while (i < n) {
+    let end;
     if (source.startsWith('<!--', i)) {
-      let j = source.indexOf('-->', i + 4);
-      j = j === -1 ? n : j + 3;
-      emit(out, 'comment', source.slice(i, j));
-      i = j;
-      continue;
-    }
-    if (source[i] === '<') {
-      let j = i + 1;
-      while (j < n && source[j] !== '>') {
-        if (source[j] === '"' || source[j] === SQUOTE) {
-          j = skipQuoted(source, j);
-          continue;
-        }
-        j += 1;
-      }
-      if (j < n) j += 1;
-      for (const t of colorHtmlTag(source.slice(i, j))) out.push(t);
-      i = j;
-      continue;
-    }
-    let j = i + 1;
-    while (j < n && source[j] !== '<' && !source.startsWith('<!--', j)) {
-      j += 1;
+      const close = source.indexOf('-->', i + 4);
+      end = close < 0 ? n : close + 3;
+      emit(out, 'comment', source.slice(i, end));
+    } else if (source[i] === '<') {
+      end = tagEnd(source, i);
+      for (const token of colorHtmlTag(source.slice(i, end))) out.push(token);
+    } else {
+      const next = source.indexOf('<', i + 1);
+      end = next < 0 ? n : next;
+      emit(out, 'plain', source.slice(i, end));
     }
-    emit(out, 'plain', source.slice(i, j));
-    i = j;
+    i = end;
   }
   return out;
 };