reslop 0.1.8 → 0.2.0

package/lib/github.js

@@ -1,18 +1,11 @@
 'use strict';
 
-const { jsonParse } = require('metautil');
-
-const diff = require('./diff.js');
-const { parseDiff, itemsFromFiles } = diff;
 const { isPathInScope } = require('./files.js');
-const { foldDepItems } = require('./deps.js');
-const http = require('./remote/http.js');
-const { createTransport, isRecord, oneLine, isAbortError } = http;
-const { TRANSIENT_STATUS } = http;
-const { parseLinkNext } = require('./remote/headers.js');
-const { filterChangeFiles, changeFiles } = require('./remote/changes.js');
-const remoteNotes = require('./remote/notes.js');
-const { importedText, importedTodo, noteFromLocation } = remoteNotes;
+const remote = require('./remote.js');
+const { isRecord, isAbortError } = remote;
+const { createClient, listUrl, parseLinkNext } = remote;
+const { filterChangeFiles, changeFiles, loadChange } = remote;
+const { importedText, importedTodo, noteFromLocation } = remote;
 
 const GITHUB_API = 'https://api.github.com';
 const API_VERSION = '2022-11-28';
@@ -20,7 +13,6 @@ const USER_AGENT = 'reslop';
 const JSON_ACCEPT = 'application/vnd.github+json';
 const DIFF_ACCEPT = 'application/vnd.github.diff';
 const PR_TODO_FILE = 'pull request';
-const LIST_PER_PAGE = 100;
 const IMPORT_HOST = 'github';
 const GRAPHQL_URL = `${GITHUB_API}/graphql`;
 const REVIEW_THREADS_QUERY =
@@ -41,17 +33,6 @@ const GITHUB_PR_RE = new RegExp(
   'i',
 );
 
-const githubError = (code, message) => {
-  const error = new Error(message);
-  error.code = code;
-  return error;
-};
-
-const withStatus = (error, status) => {
-  error.status = status;
-  return error;
-};
-
 const asRecord = (value) => (isRecord(value) ? value : {});
 
 const parseGithubPrUrl = (text) => {
@@ -72,59 +53,7 @@ const githubToken = (env) => {
   return from.GITHUB_TOKEN || from.GH_TOKEN || '';
 };
 
-const parseApiMessage = (body) => {
-  const text = `${body ?? ''}`.trim();
-  if (!text) return '';
-  const parsed = jsonParse(text);
-  if (isRecord(parsed) && typeof parsed.message === 'string') {
-    return parsed.message;
-  }
-  return oneLine(text);
-};
-
-const githubHttpError = (status, body, token) => {
-  const message = parseApiMessage(body);
-  if (status === 404) {
-    const hint = token ? '' : ' (set GITHUB_TOKEN for private repositories)';
-    const error = githubError(
-      'GITHUB_NOT_FOUND',
-      `GitHub pull request not found${hint}`,
-    );
-    return withStatus(error, status);
-  }
-  if (status === 401) {
-    const error = githubError('GITHUB_AUTH', 'GitHub authentication failed');
-    return withStatus(error, status);
-  }
-  if (status === 403 && /rate limit/i.test(message)) {
-    const error = githubError(
-      'GITHUB_RATE_LIMIT',
-      'GitHub API rate limit exceeded',
-    );
-    return withStatus(error, status);
-  }
-  let detail = `GitHub API HTTP ${status}`;
-  if (message) detail = `GitHub API: ${oneLine(message)}`;
-  return withStatus(githubError('GITHUB_HTTP', detail), status);
-};
-
-const wrapNetworkError = (error) => {
-  const detail = oneLine(error && error.message);
-  const suffix = detail ? `: ${detail}` : '';
-  const wrapped = githubError(
-    'GITHUB_NETWORK',
-    `GitHub request failed${suffix}`,
-  );
-  wrapped.cause = error;
-  return wrapped;
-};
-
-const isRetryable = (error) => {
-  if (error.code === 'GITHUB_NETWORK') return true;
-  return TRANSIENT_STATUS.includes(error.status);
-};
-
-const githubHeaders = (token, accept) => {
+const githubHeaders = (token, accept = JSON_ACCEPT) => {
   const headers = {
     Accept: accept,
     'User-Agent': USER_AGENT,
@@ -134,62 +63,17 @@ const githubHeaders = (token, accept) => {
   return { ...headers, Authorization: `Bearer ${token}` };
 };
 
-const parseGithubJson = (text, label) => {
-  let data;
-  try {
-    data = JSON.parse(text);
-  } catch {
-    throw githubError('GITHUB_PARSE', `GitHub API: invalid ${label}`);
-  }
-  return data;
-};
-
-const transportOf = (options) =>
-  createTransport({
-    fetch: options.fetch,
-    delay: options.delay,
-    signal: options.signal,
-  });
-
-const requestPolicy = (options) => {
-  const token = options.token || '';
-  return {
-    retry: options.retry ?? {},
-    isRetryable,
-    wrapNetwork: wrapNetworkError,
-    missingFetch: () => githubError('GITHUB_FETCH', 'fetch is not available'),
-    toHttpError: (status, body) => githubHttpError(status, body, token),
-  };
-};
-
-const requestGithub = async (url, options) => {
-  const token = options.token || '';
-  const headers = { ...githubHeaders(token, options.accept) };
-  if (options.contentType) headers['Content-Type'] = options.contentType;
-  return transportOf(options).request(url, {
-    ...requestPolicy(options),
-    method: options.method || 'GET',
-    headers,
-    body: options.body,
-  });
-};
-
-const requestGithubList = async (url, options) => {
-  const token = options.token || '';
-  return transportOf(options).listPages(url, {
-    ...requestPolicy(options),
-    method: 'GET',
-    headers: githubHeaders(token, JSON_ACCEPT),
-    parsePage: (text) => {
-      const data = parseGithubJson(text, 'list payload');
-      if (!Array.isArray(data)) {
-        throw githubError('GITHUB_PARSE', 'GitHub API: invalid list payload');
-      }
-      return data;
-    },
-    nextPage: (headers) => parseLinkNext(headers),
-  });
-};
+const client = createClient({
+  name: 'GitHub',
+  subject: 'pull request',
+  headers: githubHeaders,
+  nextPage: parseLinkNext,
+});
+const {
+  request: requestGithub,
+  list: requestGithubList,
+  parseJson: parseGithubJson,
+} = client;
 
 const requestGraphql = async (query, variables, options) => {
   const payload = JSON.stringify({ query, variables });
@@ -200,11 +84,7 @@ const requestGraphql = async (query, variables, options) => {
     contentType: 'application/json',
     body: payload,
   });
-  const data = parseGithubJson(page.body, 'GraphQL payload');
-  if (!isRecord(data)) {
-    throw githubError('GITHUB_PARSE', 'GitHub API: invalid GraphQL payload');
-  }
-  return data;
+  return parseGithubJson(page.body, 'GraphQL payload');
 };
 
 const prApiUrl = (pr) => {
@@ -213,12 +93,6 @@ const prApiUrl = (pr) => {
   return `${GITHUB_API}/repos/${owner}/${repo}/pulls/${pr.number}`;
 };
 
-const listUrl = (base) => {
-  const url = new URL(base);
-  url.searchParams.set('per_page', `${LIST_PER_PAGE}`);
-  return url.toString();
-};
-
 const discussionUrls = (pr) => {
   const pull = prApiUrl(pr);
   const issue = pull.replace('/pulls/', '/issues/');
@@ -247,17 +121,6 @@ const readRepoName = (data, pr) => {
   return `${pr.owner}/${pr.repo}`;
 };
 
-const parsePullRequestPayload = (text) => {
-  const data = parseGithubJson(text, 'pull request payload');
-  if (!isRecord(data)) {
-    throw githubError(
-      'GITHUB_PARSE',
-      'GitHub API: invalid pull request payload',
-    );
-  }
-  return data;
-};
-
 const toChange = (pr, data, items) => {
   const number = data.number || pr.number;
   const repository = readRepoName(data, pr);
@@ -271,7 +134,7 @@ const toChange = (pr, data, items) => {
   const id = `github.com/${repository}/pull/${number}`;
   return {
     id,
-    source: 'github-pr',
+    source: 'pr',
     title,
     author,
     files,
@@ -441,48 +304,16 @@ const loadDiscussion = async (pr, options) => {
   return { reviewComments, reviews, issueComments, resolvedById };
 };
 
-const loadImportedNotes = async (pr, items, paths, options) => {
-  try {
-    const discussion = await loadDiscussion(pr, options);
-    return discussionToNotes(discussion, items, paths);
-  } catch (error) {
-    if (isAbortError(error, options.signal)) throw error;
-    // ignore: discussion import is optional
-    return { feedback: [], todos: [] };
-  }
-};
-
-const loadPullRequest = async (pr, options = {}) => {
-  const token = options.token ?? '';
-  const fetchImpl = options.fetch ?? globalThis.fetch;
-  const paths = options.paths ?? [];
-  const retryOpts = options.retry ?? {};
-  const url = prApiUrl(pr);
-  const request = {
-    fetch: fetchImpl,
-    token,
-    retry: retryOpts,
-    delay: options.delay,
-    signal: options.signal,
-  };
-  const jsonPage = await requestGithub(url, {
-    ...request,
-    accept: JSON_ACCEPT,
-  });
-  const data = parsePullRequestPayload(jsonPage.body);
-  const diffPage = await requestGithub(url, {
-    ...request,
-    accept: DIFF_ACCEPT,
+const loadPullRequest = (pr, options = {}) =>
+  loadChange(pr, options, {
+    client,
+    url: prApiUrl(pr),
+    diffAccept: DIFF_ACCEPT,
+    prefix: '#',
+    toChange,
+    loadDiscussion,
+    discussionToNotes,
   });
-  const parsed = parseDiff(diffPage.body);
-  const files = filterChangeFiles(parsed, paths);
-  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);
-  return { top: options.cwd, items, sourceLabel, change, imported };
-};
 
 module.exports = {
   parseGithubPrUrl,

package/lib/gitlab.js

@@ -1,24 +1,16 @@
 'use strict';
 
-const { jsonParse } = require('metautil');
-
-const diff = require('./diff.js');
-const { parseDiff, itemsFromFiles } = diff;
 const { isPathInScope } = require('./files.js');
-const { foldDepItems } = require('./deps.js');
-const http = require('./remote/http.js');
-const { createTransport, isRecord, oneLine, isAbortError } = http;
-const { TRANSIENT_STATUS } = http;
-const { parseNextPage } = require('./remote/headers.js');
-const { filterChangeFiles, changeFiles } = require('./remote/changes.js');
-const remoteNotes = require('./remote/notes.js');
-const { importedText, importedTodo, noteFromLocation } = remoteNotes;
+const remote = require('./remote.js');
+const { isRecord } = remote;
+const { createClient, listUrl, parseNextPage } = remote;
+const { filterChangeFiles, changeFiles, loadChange } = remote;
+const { importedText, importedTodo, noteFromLocation } = remote;
 
 const USER_AGENT = 'reslop';
 const JSON_ACCEPT = 'application/json';
 const DIFF_ACCEPT = 'text/plain';
 const MR_TODO_FILE = 'merge request';
-const LIST_PER_PAGE = 100;
 const IMPORT_HOST = 'gitlab';
 
 const GITLAB_MR_RE = new RegExp(
@@ -30,17 +22,6 @@ const GITLAB_MR_RE = new RegExp(
   'i',
 );
 
-const gitlabError = (code, message) => {
-  const error = new Error(message);
-  error.code = code;
-  return error;
-};
-
-const withStatus = (error, status) => {
-  error.status = status;
-  return error;
-};
-
 const parseGitlabMrUrl = (text) => {
   if (typeof text !== 'string' || !text) return null;
   const match = GITLAB_MR_RE.exec(text.trim());
@@ -61,67 +42,7 @@ const gitlabToken = (env) => {
   return from.GITLAB_TOKEN || from.GL_TOKEN || '';
 };
 
-const parseApiMessage = (body) => {
-  const text = `${body ?? ''}`.trim();
-  if (!text) return '';
-  const parsed = jsonParse(text);
-  if (isRecord(parsed)) {
-    if (typeof parsed.message === 'string') return parsed.message;
-    if (typeof parsed.error === 'string') return parsed.error;
-  }
-  return oneLine(text);
-};
-
-const gitlabHttpError = (status, body, token) => {
-  const message = parseApiMessage(body);
-  if (status === 404) {
-    const hint = token ? '' : ' (set GITLAB_TOKEN for private repositories)';
-    const error = gitlabError(
-      'GITLAB_NOT_FOUND',
-      `GitLab merge request not found${hint}`,
-    );
-    return withStatus(error, status);
-  }
-  if (status === 401) {
-    const error = gitlabError('GITLAB_AUTH', 'GitLab authentication failed');
-    return withStatus(error, status);
-  }
-  if (status === 429) {
-    const error = gitlabError(
-      'GITLAB_RATE_LIMIT',
-      'GitLab API rate limit exceeded',
-    );
-    return withStatus(error, status);
-  }
-  if (status === 403 && /rate limit/i.test(message)) {
-    const error = gitlabError(
-      'GITLAB_RATE_LIMIT',
-      'GitLab API rate limit exceeded',
-    );
-    return withStatus(error, status);
-  }
-  let detail = `GitLab API HTTP ${status}`;
-  if (message) detail = `GitLab API: ${oneLine(message)}`;
-  return withStatus(gitlabError('GITLAB_HTTP', detail), status);
-};
-
-const wrapNetworkError = (error) => {
-  const detail = oneLine(error && error.message);
-  const suffix = detail ? `: ${detail}` : '';
-  const wrapped = gitlabError(
-    'GITLAB_NETWORK',
-    `GitLab request failed${suffix}`,
-  );
-  wrapped.cause = error;
-  return wrapped;
-};
-
-const isRetryable = (error) => {
-  if (error.code === 'GITLAB_NETWORK') return true;
-  return TRANSIENT_STATUS.includes(error.status);
-};
-
-const gitlabHeaders = (token, accept) => {
+const gitlabHeaders = (token, accept = JSON_ACCEPT) => {
   const headers = {
     Accept: accept,
     'User-Agent': USER_AGENT,
@@ -130,59 +51,13 @@ const gitlabHeaders = (token, accept) => {
   return { ...headers, 'PRIVATE-TOKEN': token };
 };
 
-const parseGitlabJson = (text, label) => {
-  let data;
-  try {
-    data = JSON.parse(text);
-  } catch {
-    throw gitlabError('GITLAB_PARSE', `GitLab API: invalid ${label}`);
-  }
-  return data;
-};
-
-const transportOf = (options) =>
-  createTransport({
-    fetch: options.fetch,
-    delay: options.delay,
-    signal: options.signal,
-  });
-
-const requestPolicy = (options) => {
-  const token = options.token || '';
-  return {
-    retry: options.retry ?? {},
-    isRetryable,
-    wrapNetwork: wrapNetworkError,
-    missingFetch: () => gitlabError('GITLAB_FETCH', 'fetch is not available'),
-    toHttpError: (status, body) => gitlabHttpError(status, body, token),
-  };
-};
-
-const requestGitlab = async (url, options) => {
-  const token = options.token || '';
-  return transportOf(options).request(url, {
-    ...requestPolicy(options),
-    method: options.method || 'GET',
-    headers: gitlabHeaders(token, options.accept),
-  });
-};
-
-const requestGitlabList = async (url, options) => {
-  const token = options.token || '';
-  return transportOf(options).listPages(url, {
-    ...requestPolicy(options),
-    method: 'GET',
-    headers: gitlabHeaders(token, JSON_ACCEPT),
-    parsePage: (text) => {
-      const data = parseGitlabJson(text, 'list payload');
-      if (!Array.isArray(data)) {
-        throw gitlabError('GITLAB_PARSE', 'GitLab API: invalid list payload');
-      }
-      return data;
-    },
-    nextPage: parseNextPage,
-  });
-};
+const client = createClient({
+  name: 'GitLab',
+  subject: 'merge request',
+  headers: gitlabHeaders,
+  nextPage: parseNextPage,
+});
+const { list: requestGitlabList } = client;
 
 const mrApiUrl = (mr) => {
   const project = encodeURIComponent(mr.project);
@@ -190,12 +65,6 @@ const mrApiUrl = (mr) => {
   return `${base}/merge_requests/${mr.number}`;
 };
 
-const listUrl = (base) => {
-  const url = new URL(base);
-  url.searchParams.set('per_page', `${LIST_PER_PAGE}`);
-  return url.toString();
-};
-
 const readUsername = (user) => {
   if (!isRecord(user)) return '';
   return user.username || '';
@@ -211,17 +80,6 @@ const readProject = (data, mr) => {
   return mr.project;
 };
 
-const parseMergeRequestPayload = (text) => {
-  const data = parseGitlabJson(text, 'merge request payload');
-  if (!isRecord(data)) {
-    throw gitlabError(
-      'GITLAB_PARSE',
-      'GitLab API: invalid merge request payload',
-    );
-  }
-  return data;
-};
-
 const toChange = (mr, data, items) => {
   const number = data.iid || mr.number;
   const repository = readProject(data, mr);
@@ -235,7 +93,7 @@ const toChange = (mr, data, items) => {
   const id = `${mr.host}/${repository}/merge_requests/${number}`;
   return {
     id,
-    source: 'gitlab-mr',
+    source: 'mr',
     title,
     author,
     files,
@@ -322,47 +180,18 @@ const loadDiscussion = async (mr, options) => {
   return requestGitlabList(url, options);
 };
 
-const loadImportedNotes = async (mr, items, paths, options) => {
-  try {
-    const discussions = await loadDiscussion(mr, options);
-    return discussionToNotes(discussions, items, paths);
-  } catch (error) {
-    if (isAbortError(error, options.signal)) throw error;
-    // ignore: discussion import is optional
-    return { feedback: [], todos: [] };
-  }
-};
-
-const loadMergeRequest = async (mr, options = {}) => {
-  const token = options.token ?? '';
-  const fetchImpl = options.fetch ?? globalThis.fetch;
-  const paths = options.paths ?? [];
-  const retryOpts = options.retry ?? {};
+const loadMergeRequest = (mr, options = {}) => {
   const url = mrApiUrl(mr);
-  const request = {
-    fetch: fetchImpl,
-    token,
-    retry: retryOpts,
-    delay: options.delay,
-    signal: options.signal,
-  };
-  const jsonPage = await requestGitlab(url, {
-    ...request,
-    accept: JSON_ACCEPT,
-  });
-  const data = parseMergeRequestPayload(jsonPage.body);
-  const diffPage = await requestGitlab(`${url}/raw_diffs`, {
-    ...request,
-    accept: DIFF_ACCEPT,
+  return loadChange(mr, options, {
+    client,
+    url,
+    diffUrl: `${url}/raw_diffs`,
+    diffAccept: DIFF_ACCEPT,
+    prefix: '!',
+    toChange,
+    loadDiscussion,
+    discussionToNotes,
   });
-  const parsed = parseDiff(diffPage.body);
-  const files = filterChangeFiles(parsed, paths);
-  const parsedItems = itemsFromFiles(files, 'pr');
-  const items = foldDepItems(parsedItems);
-  const change = toChange(mr, data, items);
-  const sourceLabel = `!${change.number}`;
-  const imported = await loadImportedNotes(mr, items, paths, request);
-  return { top: options.cwd, items, sourceLabel, change, imported };
 };
 
 module.exports = {

package/lib/highlight/bash.js

@@ -143,8 +143,6 @@ const bashWordStyle = (word, nextCh) => {
   return 'plain';
 };
 
-const bashOpLen = (ch, next) => ('|&><'.includes(ch) && next === ch ? 2 : 1);
-
 const highlight = (source) => {
   const out = [];
   let i = 0;
@@ -205,7 +203,7 @@ const highlight = (source) => {
     }
 
     if ('|&;<>(){}'.includes(ch)) {
-      const j = i + bashOpLen(ch, next);
+      const j = i + ('|&><'.includes(ch) && next === ch ? 2 : 1);
       emit(out, 'operator', source.slice(i, j));
       i = j;
       continue;

package/lib/highlight/css.js

@@ -7,8 +7,6 @@ const CSS_NEXT_STYLE = {
   '{': 'tag',
 };
 
-const cssWordStyle = (next) => CSS_NEXT_STYLE[next] ?? 'plain';
-
 const highlight = (source) => {
   const out = [];
   let i = 0;
@@ -56,7 +54,7 @@ const highlight = (source) => {
       const word = source.slice(i, j);
       let k = j;
       while (k < n && /\s/.test(source[k])) k += 1;
-      emit(out, cssWordStyle(source[k]), word);
+      emit(out, CSS_NEXT_STYLE[source[k]] ?? 'plain', word);
       i = j;
       continue;
     }

package/lib/highlight/js.js

@@ -178,10 +178,6 @@ const TS_WORD_STYLE = {
   ...wordStyle(TYPES, 'type'),
 };
 
-const plainTail = (out) => tokensText(out).slice(-8);
-
-const styleExpected = ({ expectName }) => EXPECT_STYLE[expectName];
-
 const styleKeyword = ({ word, ts }) => {
   const table = ts ? TS_WORD_STYLE : WORD_STYLE;
   if (!Object.hasOwn(table, word)) return null;
@@ -199,12 +195,12 @@ const styleAssign = ({ after, source, k }) => {
 };
 
 const styleProperty = ({ out }) => {
-  const prev = plainTail(out);
+  const prev = tokensText(out).slice(-8);
   return /\.$/.test(prev) ? 'property' : null;
 };
 
 const IDENT_RULES = [
-  styleExpected,
+  ({ expectName }) => EXPECT_STYLE[expectName],
   styleKeyword,
   styleConstant,
   stylePascal,
@@ -496,9 +492,6 @@ const readPunctAt = (source, i) => {
   return { end: i + 1, tokens: [{ text, style: 'punct' }] };
 };
 
-const readDotToken = (source, i) =>
-  readNumberAt(source, i) || readPunctAt(source, i);
-
 const readDecorator = (source, i) => {
   let j = i + 1;
   while (j < source.length && /[A-Za-z0-9_$]/.test(source[j])) j += 1;
@@ -534,9 +527,6 @@ const readJsxAt = (source, i, scan) => {
   return { end, tokens, expectName: null };
 };
 
-const readLessToken = (source, i, scan) =>
-  readJsxAt(source, i, scan) || readOperatorAt(source, i);
-
 const readPlain = (source, i) => {
   const text = source[i];
   return { end: i + 1, tokens: [{ text, style: 'plain' }] };
@@ -544,8 +534,15 @@ const readPlain = (source, i) => {
 
 const CHAR_READER_GROUPS = [
   { chars: '/', reader: readSlashToken },
-  { chars: '<', reader: readLessToken },
-  { chars: '.', reader: readDotToken },
+  {
+    chars: '<',
+    reader: (source, i, scan) =>
+      readJsxAt(source, i, scan) || readOperatorAt(source, i),
+  },
+  {
+    chars: '.',
+    reader: (source, i) => readNumberAt(source, i) || readPunctAt(source, i),
+  },
   { chars: '`', reader: readTemplateAt },
   { chars: QUOTES, reader: readQuoted },
   { chars: '@', reader: readDecorator },