reslop 0.1.1 → 0.1.3

package/lib/github.js

@@ -3,8 +3,9 @@
 const { delay } = require('metautil');
 
 const diff = require('./diff.js');
-const { parseDiff, itemsFromFiles } = diff;
-const { itemPath } = require('./files.js');
+const { parseDiff, itemsFromFiles, isCtxType } = diff;
+const { itemPath, isPathInScope } = require('./files.js');
+const { foldDepItems } = require('./deps.js');
 
 const GITHUB_API = 'https://api.github.com';
 const API_VERSION = '2022-11-28';
@@ -70,7 +71,6 @@ const parseGithubPrUrl = (text) => {
 
 const githubToken = (env) => {
   const from = env ?? process.env;
-  if (!isRecord(from)) return '';
   return from.GITHUB_TOKEN || from.GH_TOKEN || '';
 };
 
@@ -134,18 +134,15 @@ const isRetryable = (error) => {
 const retry = async (run, options) => {
   const attempts = options.attempts ?? RETRY_ATTEMPTS;
   const delayMs = options.delayMs ?? RETRY_DELAY_MS;
-  let lastError = null;
-  for (let i = 0; i < attempts; i++) {
+  for (let i = 0; ; i++) {
     try {
       return await run();
     } catch (error) {
-      lastError = error;
       const isLast = i === attempts - 1;
       if (isLast || !isRetryable(error)) throw error;
       await delay(delayMs * (i + 1));
     }
   }
-  throw lastError;
 };
 
 const githubHeaders = (token, accept) => {
@@ -164,7 +161,8 @@ const headerValue = (headers, name) => {
     return headers.get(name) || '';
   }
   const wanted = name.toLowerCase();
-  for (const [key, value] of Object.entries(headers)) {
+  for (const key of Object.keys(headers)) {
+    const value = headers[key];
     if (key.toLowerCase() === wanted) return `${value}`;
   }
   return '';
@@ -252,19 +250,6 @@ const requestGraphql = async (query, variables, options) => {
 
 const changePath = (file) => file.newPath || file.oldPath || '';
 
-const normalizePathSpec = (spec) =>
-  `${spec ?? ''}`.replaceAll('\\', '/').replace(/\/+$/, '');
-
-const isPathInScope = (rel, paths) => {
-  if (!paths.length) return true;
-  for (const spec of paths) {
-    const norm = normalizePathSpec(spec);
-    if (!norm || norm === '.') return true;
-    if (rel === norm || rel.startsWith(`${norm}/`)) return true;
-  }
-  return false;
-};
-
 const filterChangeFiles = (files, paths) => {
   if (!paths.length) return files;
   const kept = [];
@@ -314,14 +299,23 @@ const readRepoName = (data, pr) => {
   return `${pr.owner}/${pr.repo}`;
 };
 
+const pushChangeFile = (files, seen, rel) => {
+  if (!rel || seen.has(rel)) return;
+  seen.add(rel);
+  files.push(rel);
+};
+
 const changeFiles = (items) => {
   const files = [];
   const seen = new Set();
   for (const item of items) {
+    if (item.dep) {
+      const depFiles = item.dep.files ?? [];
+      for (const rel of depFiles) pushChangeFile(files, seen, rel);
+      continue;
+    }
     const rel = itemPath(item);
-    if (!rel || seen.has(rel)) continue;
-    seen.add(rel);
-    files.push(rel);
+    pushChangeFile(files, seen, rel);
   }
   return files;
 };
@@ -406,8 +400,12 @@ const locateLineInItem = (item, rel, line, side) => {
       const inBlock = entry.blockId === item.blockId;
       return { inBlock };
     }
-    if (entry.type === 'ctx' || entry.type === 'del') oldNo += 1;
-    if (entry.type === 'ctx' || entry.type === 'add') newNo += 1;
+    if (isCtxType(entry.type) || entry.type === 'del') {
+      oldNo += 1;
+    }
+    if (isCtxType(entry.type) || entry.type === 'add') {
+      newNo += 1;
+    }
   }
   return null;
 };
@@ -546,7 +544,6 @@ const loadReviewThreads = async (pr, options) => {
 const threadComments = (thread) => {
   if (!isRecord(thread)) return [];
   const comments = thread.comments;
-  if (Array.isArray(comments)) return comments;
   if (isRecord(comments) && Array.isArray(comments.nodes)) {
     return comments.nodes;
   }
@@ -581,20 +578,18 @@ const loadDiscussion = async (pr, options) => {
   return { reviewComments, reviews, issueComments, resolvedById };
 };
 
-const emptyImported = () => ({ feedback: [], todos: [] });
-
 const loadImportedNotes = async (pr, items, paths, options) => {
   try {
     const discussion = await loadDiscussion(pr, options);
     return discussionToNotes(discussion, items, paths);
   } catch {
     // ignore: discussion import is optional
-    return emptyImported();
+    return { feedback: [], todos: [] };
   }
 };
 
 const loadPullRequest = async (pr, options = {}) => {
-  const token = options.token ?? githubToken(options.env);
+  const token = options.token ?? '';
   const fetchImpl = options.fetch ?? globalThis.fetch;
   const paths = options.paths ?? [];
   const retryOpts = options.retry ?? {};
@@ -611,7 +606,8 @@ const loadPullRequest = async (pr, options = {}) => {
   });
   const parsed = parseDiff(diffPage.body);
   const files = filterChangeFiles(parsed, paths);
-  const items = itemsFromFiles(files, 'pr');
+  const parsedItems = itemsFromFiles(files, 'pr');
+  const items = foldDepItems(parsedItems);
   const change = toChange(pr, data, items);
   const sourceLabel = `#${change.number}`;
   const imported = await loadImportedNotes(pr, items, paths, request);
@@ -619,8 +615,6 @@ const loadPullRequest = async (pr, options = {}) => {
 };
 
 module.exports = {
-  GITHUB_API,
-  PR_TODO_FILE,
   parseGithubPrUrl,
   githubToken,
   filterChangeFiles,

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,293 @@ 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;
-      }
-
-      if (ch === '/' && next === '*') {
-        const { text, end } = readBlockComment(source, i);
-        emit(out, 'comment', text);
-        i = end;
-        continue;
-      }
-
-      if (ch === '`') {
-        const r = this.highlightTemplate(source, i);
-        for (const t of r.tokens) out.push(t);
-        i = r.end;
-        continue;
-      }
-
-      if (QUOTES.includes(ch)) {
-        const { text, end } = readString(source, i);
-        emit(out, 'string', 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);
+      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 === '/' && isRegexContext(out)) {
-        const { text, end } = readRegex(source, i);
-        emit(out, 'regex', text);
-        i = end;
-        continue;
-      }
+const isJsxTagStart = (source, i) => {
+  if (source[i] !== '<') return false;
+  if (i > 0 && /[A-Za-z0-9_$]/.test(source[i - 1])) return false;
+  const next = source[i + 1];
+  if (next === '>' || next === '/') return true;
+  if (!/[A-Za-z_$]/.test(next || '')) return false;
+  let j = i + 1;
+  while (j < source.length && /[A-Za-z0-9_$.:-]/.test(source[j])) j += 1;
+  const after = source[skipWs(source, j)];
+  if (after === '>' || after === '/' || after === '{') return true;
+  return /[A-Za-z_$]/.test(after || '');
+};
 
-      if (/[0-9]/.test(ch) || (ch === '.' && /[0-9]/.test(next || ''))) {
-        const { text, end } = readJsNumber(source, i);
-        emit(out, 'number', text);
-        i = end;
-        continue;
-      }
+const jsxNameStyle = (name) => {
+  if (/^[A-Z]/.test(name) || name.includes('.')) return 'className';
+  return 'tag';
+};
 
-      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;
-      }
+const readJsxName = (source, i) => {
+  let j = i;
+  while (j < source.length && /[A-Za-z0-9_$.:-]/.test(source[j])) j += 1;
+  return { text: source.slice(i, j), end: j };
+};
 
-      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 highlightJsxExpr = (source, i, inner) => {
+  const out = [];
+  emit(out, 'interpolation', '{');
+  const interp = readTemplateInterp(source, i + 1);
+  const tokens = inner(interp.expr);
+  for (const t of tokens) out.push(t);
+  let end = interp.end;
+  if (source[end] === '}') {
+    emit(out, 'interpolation', '}');
+    end += 1;
+  }
+  return { tokens: out, end };
+};
 
-      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;
-      }
+const highlightJsxTagTail = (source, i, inner, out) => {
+  const n = source.length;
+  let selfClosing = false;
+  while (i < n) {
+    const ch = source[i];
+    if (ch === '>') {
+      emit(out, 'punct', '>');
+      i += 1;
+      break;
+    }
+    if (ch === '/' && source[i + 1] === '>') {
+      emit(out, 'punct', '/>');
+      i += 2;
+      selfClosing = true;
+      break;
+    }
+    if (/\s/.test(ch)) {
       emit(out, 'plain', ch);
       i += 1;
+      continue;
     }
-    return out;
+    if (ch === '{') {
+      const expr = highlightJsxExpr(source, i, inner);
+      for (const t of expr.tokens) out.push(t);
+      i = expr.end;
+      continue;
+    }
+    if (QUOTES.includes(ch)) {
+      const { text, end } = readString(source, i);
+      emit(out, 'string', text);
+      i = end;
+      continue;
+    }
+    if (ch === '=') {
+      emit(out, 'punct', '=');
+      i += 1;
+      continue;
+    }
+    if (/[A-Za-z_$]/.test(ch)) {
+      const { text, end } = readJsxName(source, i);
+      emit(out, 'attr', text);
+      i = end;
+      continue;
+    }
+    emit(out, 'punct', ch);
+    i += 1;
   }
+  return { end: i, selfClosing };
+};
 
-  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;
+const highlightJsxElement = (source, i, inner) => {
+  const out = [];
+  const n = source.length;
+  emit(out, 'punct', '<');
+  i += 1;
+  let closing = false;
+  if (source[i] === '/') {
+    emit(out, 'punct', '/');
+    i += 1;
+    closing = true;
+  }
+  const nameRead = readJsxName(source, i);
+  const name = nameRead.text;
+  if (name) {
+    emit(out, jsxNameStyle(name), name);
+    i = nameRead.end;
+  }
+  const tail = highlightJsxTagTail(source, i, inner, out);
+  i = tail.end;
+  if (closing || tail.selfClosing) return { tokens: out, end: i };
+  while (i < n) {
+    if (source.startsWith('</', i)) {
+      const close = highlightJsxElement(source, i, inner);
+      for (const t of close.tokens) out.push(t);
+      return { tokens: out, end: close.end };
+    }
+    if (source[i] === '{') {
+      const expr = highlightJsxExpr(source, i, inner);
+      for (const t of expr.tokens) out.push(t);
+      i = expr.end;
+      continue;
+    }
+    if (source[i] === '<' && isJsxTagStart(source, i)) {
+      const child = highlightJsxElement(source, i, inner);
+      for (const t of child.tokens) out.push(t);
+      i = child.end;
+      continue;
+    }
+    let j = i;
+    while (j < n && source[j] !== '<' && source[j] !== '{') j += 1;
+    if (j === i) {
+      emit(out, 'plain', source[i]);
+      i += 1;
+      continue;
     }
-    flush();
-    return { tokens: parts, end: j };
+    emit(out, 'plain', source.slice(i, j));
+    i = j;
   }
-}
+  return { tokens: out, end: i };
+};
+
+const highlightJsFamily = (source, options = {}) => {
+  const ts = options.ts === true;
+  const jsx = options.jsx === true;
+  const inner = (expr) => highlightJsFamily(expr, options);
+  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;
+    }
+
+    if (ch === '/' && next === '*') {
+      const { text, end } = readBlockComment(source, i);
+      emit(out, 'comment', text);
+      i = end;
+      continue;
+    }
+
+    if (ch === '`') {
+      const r = highlightTemplate(source, i, inner);
+      for (const t of r.tokens) out.push(t);
+      i = r.end;
+      continue;
+    }
+
+    if (QUOTES.includes(ch)) {
+      const { text, end } = readString(source, i);
+      emit(out, 'string', text);
+      i = end;
+      continue;
+    }
+
+    if (ch === '/' && isRegexContext(out)) {
+      const { text, end } = readRegex(source, i);
+      emit(out, 'regex', 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 === '@') {
+      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;
+    }
 
-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;
+    }
+
+    if (jsx && ch === '<' && isJsxTagStart(source, i)) {
+      const node = highlightJsxElement(source, i, inner);
+      for (const t of node.tokens) out.push(t);
+      i = node.end;
+      expectName = null;
+      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 = [];
@@ -1146,21 +1286,23 @@ const highlightTxt = (source) => {
   return out;
 };
 
-const highlightJs = (source) => highlightJsFamily(source, false);
-const highlightTs = (source) => highlightJsFamily(source, true);
+const highlightJs = (source) => highlightJsFamily(source, {});
+const highlightTs = (source) => highlightJsFamily(source, { ts: true });
+const highlightJsx = (source) => highlightJsFamily(source, { jsx: true });
+const highlightTsx = (source) =>
+  highlightJsFamily(source, { ts: true, jsx: true });
 
 const HIGHLIGHTERS = {
   js: highlightJs,
   mjs: highlightJs,
   ts: highlightTs,
+  jsx: highlightJsx,
+  tsx: highlightTsx,
   json: highlightJson,
   css: highlightCss,
   html: highlightHtml,
   csv: highlightCsv,
   bash: highlightBash,
-  sh: highlightBash,
-  shell: highlightBash,
-  zsh: highlightBash,
   log: highlightLog,
   dot: highlightDot,
   txt: highlightTxt,
@@ -1224,8 +1366,7 @@ const overlayTokens = (tokens, spans) => {
 };
 
 module.exports = {
+  tokensText,
   tokenize,
   overlayTokens,
-  tokensText,
-  HIGHLIGHTERS,
 };