reslop 0.2.7 → 0.3.0

package/lib/session/workspace.js

@@ -1,17 +1,13 @@
 'use strict';
 
 const path = require('node:path');
-
-const tree = require('../dashboard/tree.js');
-const { FileIndex, HEAT_MS } = tree;
-const watch = require('./watch.js');
-const { UNKNOWN_PATH } = watch;
-const workspace = require('../workspace.js');
+const { REVIEW_DIR } = require('../common/files.js');
+const { FileIndex, HEAT_MS } = require('../dashboard/tree.js');
+const { UNKNOWN_PATH } = require('../dashboard/watch.js');
+const workspace = require('../dashboard/workspace.js');
 const { emptyDiff, countCommits, readDiffStat, taskStats, pickRun } = workspace;
-const npmInfo = require('../dashboard/npm.js');
-const { readNpmSummary } = npmInfo;
-const gitDeps = require('../git-deps.js');
-const { collectReportAsync } = gitDeps;
+const { readNpmSummary } = require('../dashboard/npm.js');
+const { collectReport } = require('../git/deps.js');
 
 const TICK_ID = 'repos';
 const HEAT_TIMER = 'repos-heat';
@@ -104,7 +100,7 @@ const readRuns = (row) => {
 };
 
 const reportCount = async (dir, kind) => {
-  const report = await collectReportAsync(dir, kind);
+  const report = await collectReport(dir, kind);
   return report ? report.size : 0;
 };
 
@@ -138,13 +134,11 @@ const toTile = (row) => ({
   npmReady: row.npmReady,
 });
 
-const rowBusy = (row) =>
-  !row.filesReady ||
-  !row.commitsReady ||
-  !row.diffReady ||
-  !row.tasksReady ||
-  !row.runsReady ||
-  !row.npmReady;
+const rowBusy = (row) => {
+  if (!row.filesReady || !row.commitsReady) return true;
+  if (!row.diffReady || !row.tasksReady) return true;
+  return !row.runsReady || !row.npmReady;
+};
 
 const classifyRest = (rest) => {
   const bag = freshBag();
@@ -172,7 +166,7 @@ const classifyRest = (rest) => {
     bag.runs = true;
     return bag;
   }
-  if (rest === '.review' || rest.startsWith('.review/')) {
+  if (rest === REVIEW_DIR || rest.startsWith(`${REVIEW_DIR}/`)) {
     bag.tasks = true;
     return bag;
   }
@@ -193,13 +187,7 @@ class Workspace {
     this.rows = [];
     this.byName = new Map();
     this.cursor = 0;
-    this.screen = {
-      now: 0,
-      frame: 0,
-      cursor: 0,
-      cols: 1,
-      tiles: [],
-    };
+    this.cols = 1;
   }
 
   seed() {
@@ -349,61 +337,50 @@ class Workspace {
   }
 
   view() {
-    const screen = this.screen;
-    screen.now = Date.now();
-    screen.frame = this.ui.progressFrame;
-    screen.cursor = this.cursor;
-    screen.tiles = this.rows.map(toTile);
-    return screen;
+    return {
+      now: Date.now(),
+      frame: this.ui.progressFrame,
+      cursor: this.cursor,
+      tiles: this.rows.map(toTile),
+    };
   }
 
   move(dx, dy) {
     const count = this.rows.length;
     if (!count) return;
-    const cols = Math.max(1, this.screen.cols || 1);
+    const cols = Math.max(1, this.cols || 1);
     const next = this.cursor + dx + dy * cols;
     if (next < 0 || next >= count) return;
     this.cursor = next;
     if (this.ui.uiOpen) this.ui.paint();
   }
 
-  enter(name) {
-    const row = this.byName.get(name);
+  async switchTo(row) {
     const ui = this.ui;
-    if (!row || ui.mode !== 'review') return Promise.resolve();
     ui.flushReview();
     this.stop();
-    ui.lifecycle.stopWatch();
-    ui.dashboard.stop();
-    ui.loader.reset();
-    ui.cwd = row.dir;
-    ui.paths = [];
-    ui.repoName = row.name;
-    ui.branch = '';
-    ui.rev = null;
-    ui.revShort = '';
-    ui.change = null;
-    ui.dashboardHome = true;
-    ui.collection.reset();
-    ui.review.reset();
-    ui.nav.pane = 'dashboard';
-    ui.nav.tasksOpen = false;
-    ui.nav.scroll = 0;
-    ui.nav.clearSelection();
-    ui.status = '';
+    ui.retarget({ cwd: row.dir, repoName: row.name, pane: 'dashboard' });
     try {
-      ui.ensureRepo();
+      await ui.ensureRepo();
     } catch (error) {
       ui.status = error instanceof Error ? error.message : `${error}`;
-      return this.show();
+      return { loading: this.show() };
     }
-    const pending = ui.openLoad();
+    const loading = ui.openLoad();
     if (ui.uiOpen) {
       ui.lifecycle.startWatch();
       ui.dashboard.start();
       ui.paint();
     }
-    return pending ?? Promise.resolve();
+    return { loading };
+  }
+
+  async enter(name) {
+    const row = this.byName.get(name);
+    const ui = this.ui;
+    if (!row || ui.mode !== 'review') return;
+    const opened = await ui.ops.hold(this.switchTo(row));
+    if (opened) await opened.loading;
   }
 
   openSelected() {
@@ -423,25 +400,9 @@ class Workspace {
     const ui = this.ui;
     if (!ui.workspaceRoot) return Promise.resolve();
     ui.flushReview();
-    ui.dashboard.stop();
-    ui.lifecycle.stopWatch();
-    ui.loader.reset();
-    ui.cwd = ui.workspaceRoot;
-    ui.top = ui.workspaceRoot;
-    ui.paths = [];
-    ui.repoName = path.basename(ui.workspaceRoot);
-    ui.branch = '';
-    ui.rev = null;
-    ui.revShort = '';
-    ui.change = null;
-    ui.dashboardHome = false;
-    ui.collection.reset();
-    ui.review.reset();
-    ui.nav.pane = 'repos';
-    ui.nav.tasksOpen = false;
-    ui.nav.scroll = 0;
-    ui.nav.clearSelection();
-    ui.status = '';
+    const root = ui.workspaceRoot;
+    const repoName = path.basename(root);
+    ui.retarget({ cwd: root, top: root, repoName, pane: 'repos' });
     ui.loader.didLoad = true;
     this.start();
     if (ui.uiOpen) {
@@ -452,4 +413,4 @@ class Workspace {
   }
 }
 
-module.exports = { Workspace, classifyRest };
+module.exports = { Workspace };

package/lib/{capabilities.js → source/capabilities.js}

@@ -2,7 +2,6 @@
 
 const READ_METHODS = [
   'load',
-  'loadAsync',
   'loadExtras',
   'toplevel',
   'resolveRev',
@@ -12,7 +11,6 @@ const READ_METHODS = [
 
 const CHANGE_METHODS = [
   'add',
-  'addAsync',
   'unstage',
   'revert',
   'revertFile',
@@ -23,7 +21,7 @@ const CHANGE_METHODS = [
 
 const BRANCH_METHODS = [
   'commit',
-  'commitAsync',
+  'updateCommit',
   'hasStaged',
   'lastMessage',
   'commitMessage',
@@ -31,23 +29,14 @@ const BRANCH_METHODS = [
   'listCommits',
   'currentBranch',
   'checkout',
-  'checkoutAsync',
   'createBranch',
-  'createBranchAsync',
   'rebase',
-  'rebaseAsync',
   'drop',
-  'dropAsync',
   'dropCommit',
-  'dropCommitAsync',
   'applyFixup',
-  'applyFixupAsync',
   'reword',
-  'rewordAsync',
   'pull',
-  'pullAsync',
   'push',
-  'pushAsync',
 ];
 
 const VIEW_CAPS = { read: true, changes: false, branches: false, review: true };
@@ -57,6 +46,8 @@ const SOURCE_CAPS = {
   commit: VIEW_CAPS,
   pr: VIEW_CAPS,
   mr: VIEW_CAPS,
+  issue: VIEW_CAPS,
+  'gl-issue': VIEW_CAPS,
   readonly: VIEW_CAPS,
 };
 

package/lib/{github.js → source/github.js}

@@ -1,13 +1,12 @@
 'use strict';
 
-const metautil = require('metautil');
-const { isHashObject } = metautil;
-const files = require('./files.js');
-const { isPathInScope } = files;
+const { isHashObject } = require('metautil');
+const { isPathInScope } = require('../common/files.js');
+const { resource } = require('../common/utilities.js');
 const remote = require('./remote.js');
 const { RemoteClient, isAbortError, listUrl, parseLinkNext } = remote;
 const { commentBody, importedTodo, noteFromLocation } = remote;
-const { splitNotes, loadChange } = remote;
+const { splitNotes, loadChange, stateIs, loadIssue } = remote;
 
 const GITHUB_API = 'https://api.github.com';
 const API_VERSION = '2022-11-28';
@@ -17,14 +16,9 @@ const DIFF_ACCEPT = 'application/vnd.github.diff';
 const PR_TODO_FILE = 'pull request';
 const IMPORT_HOST = 'github';
 const GRAPHQL_URL = `${GITHUB_API}/graphql`;
-const REVIEW_THREADS_QUERY =
-  'query($owner: String!, $name: String!, $number: Int!, $after: String) {' +
-  ' repository(owner: $owner, name: $name) {' +
-  ' pullRequest(number: $number) {' +
-  ' reviewThreads(first: 100, after: $after) {' +
-  ' pageInfo { hasNextPage endCursor }' +
-  ' nodes { isResolved comments(first: 100) { nodes { databaseId } } }' +
-  ' } } } }';
+const REVIEW_THREADS_QUERY = resource(__dirname, 'review-threads.graphql')
+  .replace(/\s+/g, ' ')
+  .trim();
 
 const GITHUB_PR_RE = new RegExp(
   String.raw`^(?:https?://)?(?:www\.)?github\.com/` +
@@ -35,18 +29,41 @@ const GITHUB_PR_RE = new RegExp(
   'i',
 );
 
-const parseGithubPrUrl = (text) => {
+const GITHUB_ISSUE_RE = new RegExp(
+  String.raw`^(?:https?://)?(?:www\.)?github\.com/` +
+    String.raw`([^/?#]+)/([^/?#]+)/issues/(\d+)` +
+    String.raw`/?(?:[?#].*)?$`,
+  'i',
+);
+
+const GITHUB_ISSUE_LIST_RE = new RegExp(
+  String.raw`^(?:https?://)?(?:www\.)?github\.com/` +
+    String.raw`([^/?#]+)/([^/?#]+?)(?:\.git)?` +
+    String.raw`(?:/issues)?` +
+    String.raw`/?(?:[?#].*)?$`,
+  'i',
+);
+
+const parseGithubUrl = (text, pattern) => {
   if (typeof text !== 'string' || !text) return null;
-  const match = GITHUB_PR_RE.exec(text.trim());
+  const match = pattern.exec(text.trim());
   if (!match) return null;
   const owner = match[1];
   const repo = match[2].replace(/\.git$/i, '');
+  if (!owner || !repo) return null;
+  if (!match[3]) return { owner, repo, list: true };
   const number = parseInt(match[3], 10);
-  const hasNumber = Number.isFinite(number) && number >= 1;
-  if (!owner || !repo || !hasNumber) return null;
+  if (!Number.isFinite(number) || number < 1) return null;
   return { owner, repo, number };
 };
 
+const parseGithubPrUrl = (text) => parseGithubUrl(text, GITHUB_PR_RE);
+
+const parseGithubIssueUrl = (text) => parseGithubUrl(text, GITHUB_ISSUE_RE);
+
+const parseGithubIssueListUrl = (text) =>
+  parseGithubUrl(text, GITHUB_ISSUE_LIST_RE);
+
 const githubToken = (env) => {
   const from = env ?? process.env;
   return from.GITHUB_TOKEN || from.GH_TOKEN || '';
@@ -69,12 +86,13 @@ const client = new RemoteClient({
   nextPage: parseLinkNext,
 });
 
-const prApiUrl = (pr) => {
-  const owner = encodeURIComponent(pr.owner);
-  const repo = encodeURIComponent(pr.repo);
-  return `${GITHUB_API}/repos/${owner}/${repo}/pulls/${pr.number}`;
+const repositoryApiUrl = ({ owner, repo }) => {
+  const name = `${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`;
+  return `${GITHUB_API}/repos/${name}`;
 };
 
+const prApiUrl = (pr) => `${repositoryApiUrl(pr)}/pulls/${pr.number}`;
+
 const loginOf = (user) => user?.login || '';
 
 const toChange = (pr, data) => {
@@ -131,12 +149,15 @@ const discussionToNotes = (discussion, items, paths = []) => {
   const comments = discussion.reviewComments ?? [];
   const reviews = discussion.reviews ?? [];
   const issueComments = discussion.issueComments ?? [];
-  return splitNotes([
-    ...comments.map((comment) =>
-      reviewCommentToNote(comment, items, resolvedById, paths),
-    ),
-    ...[...reviews, ...issueComments].map((record) => summaryToTodo(record)),
-  ]);
+  const reviewNote = (comment) => {
+    const note = reviewCommentToNote(comment, items, resolvedById, paths);
+    return note;
+  };
+  const reviewNotes = comments.map(reviewNote);
+  const summaries = [...reviews, ...issueComments];
+  const summaryNotes = summaries.map(summaryToTodo);
+  const notes = [...reviewNotes, ...summaryNotes];
+  return splitNotes(notes);
 };
 
 const requestThreads = async (variables, options) => {
@@ -184,12 +205,15 @@ const loadResolvedById = async (pr, options) => {
 
 const loadDiscussion = async (pr, options) => {
   const pull = prApiUrl(pr);
-  const issue = pull.replace('/pulls/', '/issues/');
+  const issue = `${repositoryApiUrl(pr)}/issues/${pr.number}`;
   const list = (url) => client.list(listUrl(url), options);
-  const reviewComments = await list(`${pull}/comments`);
-  const reviews = await list(`${pull}/reviews`);
-  const issueComments = await list(`${issue}/comments`);
-  const resolvedById = await loadResolvedById(pr, options);
+  const [reviewComments, reviews, issueComments, resolvedById] =
+    await Promise.all([
+      list(`${pull}/comments`),
+      list(`${pull}/reviews`),
+      list(`${issue}/comments`),
+      loadResolvedById(pr, options),
+    ]);
   return { reviewComments, reviews, issueComments, resolvedById };
 };
 
@@ -204,10 +228,56 @@ const loadPullRequest = (pr, options = {}) =>
     discussionToNotes,
   });
 
+const issueSite = (issue) => {
+  const repository = `${issue.owner}/${issue.repo}`;
+  return {
+    repository,
+    id: `github.com/${repository}/issues`,
+    page: `https://github.com/${repository}/issues`,
+  };
+};
+
+const readIssue = (data) => ({
+  number: data.number,
+  title: data.title,
+  body: data.body,
+  author: loginOf(data.user),
+  state: data.state,
+  url: data['html_url'],
+  comments: data.comments,
+});
+
+const readIssueComment = (comment) => ({
+  reviewer: loginOf(comment.user),
+  body: comment.body,
+});
+
+const isOpenIssue = (data) => {
+  if (!isHashObject(data)) return false;
+  if (isHashObject(data['pull_request'])) return false;
+  return stateIs(data.state, 'open');
+};
+
+const loadGithubIssue = async (issue, options = {}) =>
+  loadIssue(issue, options, {
+    client,
+    host: IMPORT_HOST,
+    site: issueSite(issue),
+    issuesUrl: `${repositoryApiUrl(issue)}/issues`,
+    openState: 'open',
+    comments: 'comments',
+    isOpen: isOpenIssue,
+    readIssue,
+    readComment: readIssueComment,
+  });
+
 module.exports = {
   parseGithubPrUrl,
+  parseGithubIssueUrl,
+  parseGithubIssueListUrl,
   githubToken,
   prApiUrl,
   discussionToNotes,
   loadPullRequest,
+  loadGithubIssue,
 };

package/lib/{gitlab.js → source/gitlab.js}

@@ -1,12 +1,11 @@
 'use strict';
 
-const metautil = require('metautil');
-const { isHashObject } = metautil;
-const files = require('./files.js');
-const { isPathInScope } = files;
+const { isHashObject } = require('metautil');
+const { isPathInScope } = require('../common/files.js');
 const remote = require('./remote.js');
 const { RemoteClient, listUrl, parseNextPage, commentBody } = remote;
 const { importedTodo, noteFromLocation, splitNotes, loadChange } = remote;
+const { stateIs, loadIssue } = remote;
 
 const USER_AGENT = 'reslop';
 const JSON_ACCEPT = 'application/json';
@@ -24,9 +23,16 @@ const GITLAB_MR_RE = new RegExp(
   'i',
 );
 
-const parseGitlabMrUrl = (text) => {
+const GITLAB_ISSUE_RE = new RegExp(
+  String.raw`^(?:(https?)://)?(?:www\.)?([^/?#]+)/` +
+    String.raw`(.+?)(?:/-)?/issues/(\d+)` +
+    String.raw`/?(?:[?#].*)?$`,
+  'i',
+);
+
+const parseGitlabUrl = (text, pattern) => {
   if (typeof text !== 'string' || !text) return null;
-  const match = GITLAB_MR_RE.exec(text.trim());
+  const match = pattern.exec(text.trim());
   if (!match) return null;
   const scheme = (match[1] || 'https').toLowerCase();
   const host = match[2];
@@ -37,6 +43,35 @@ const parseGitlabMrUrl = (text) => {
   return { host, project, number, origin: `${scheme}://${host}` };
 };
 
+const GITLAB_HOST_RE = new RegExp(
+  String.raw`^(?:(https?)://)?(?:www\.)?([^/?#]+\.[^/?#]+)/([^?#]+)`,
+  'i',
+);
+
+const parseGitlabMrUrl = (text) => parseGitlabUrl(text, GITLAB_MR_RE);
+
+const parseGitlabIssueUrl = (text) => {
+  const issue = parseGitlabUrl(text, GITLAB_ISSUE_RE);
+  return issue?.host.toLowerCase() === 'github.com' ? null : issue;
+};
+
+const parseGitlabIssueListUrl = (text) => {
+  if (typeof text !== 'string' || !text) return null;
+  const match = GITLAB_HOST_RE.exec(text.trim());
+  if (!match) return null;
+  const scheme = (match[1] || 'https').toLowerCase();
+  const host = match[2];
+  if (!host || host.toLowerCase() === 'github.com') return null;
+  let path = match[3].replace(/\/+$/, '');
+  if (/\/issues\/\d+/.test(path)) return null;
+  const listed = /(?:\/-)?\/issues$/.test(path);
+  if (listed) path = path.replace(/(?:\/-)?\/issues$/, '');
+  else if (path.includes('/-/')) return null;
+  path = path.replace(/\.git$/i, '');
+  if (!path.includes('/')) return null;
+  return { host, project: path, origin: `${scheme}://${host}`, list: true };
+};
+
 const gitlabToken = (env) => {
   const from = env ?? process.env;
   return from.GITLAB_TOKEN || from.GL_TOKEN || '';
@@ -57,10 +92,10 @@ const client = new RemoteClient({
   limitStatus: 429,
 });
 
-const mrApiUrl = (mr) => {
-  const project = encodeURIComponent(mr.project);
-  return `${mr.origin}/api/v4/projects/${project}/merge_requests/${mr.number}`;
-};
+const projectApiUrl = (ref) =>
+  `${ref.origin}/api/v4/projects/${encodeURIComponent(ref.project)}`;
+
+const mrApiUrl = (mr) => `${projectApiUrl(mr)}/merge_requests/${mr.number}`;
 
 const usernameOf = (user) => user?.username || '';
 
@@ -133,6 +168,45 @@ const discussionToNotes = (discussions, items, paths = []) => {
 const loadDiscussion = (mr, options) =>
   client.list(listUrl(`${mrApiUrl(mr)}/discussions`), options);
 
+const issueSite = (issue) => ({
+  repository: issue.project,
+  id: `${issue.host}/${issue.project}/issues`,
+  page: `${issue.origin}/${issue.project}/-/issues`,
+});
+
+const readIssue = (data) => ({
+  number: data.iid,
+  title: data.title,
+  body: data.description,
+  author: usernameOf(data.author),
+  state: data.state,
+  url: data.web_url,
+  comments: data.user_notes_count,
+});
+
+const readIssueNote = (note) => {
+  if (!isHashObject(note) || note.system === true) return null;
+  return { reviewer: usernameOf(note.author), body: note.body };
+};
+
+const isOpenIssue = (data) => {
+  if (!isHashObject(data)) return false;
+  return stateIs(data.state, 'opened');
+};
+
+const loadGitlabIssue = async (issue, options = {}) =>
+  loadIssue(issue, options, {
+    client,
+    host: IMPORT_HOST,
+    site: issueSite(issue),
+    issuesUrl: `${projectApiUrl(issue)}/issues`,
+    openState: 'opened',
+    comments: 'notes',
+    isOpen: isOpenIssue,
+    readIssue,
+    readComment: readIssueNote,
+  });
+
 const loadMergeRequest = (mr, options = {}) => {
   const url = mrApiUrl(mr);
   return loadChange(mr, options, {
@@ -149,8 +223,11 @@ const loadMergeRequest = (mr, options = {}) => {
 
 module.exports = {
   parseGitlabMrUrl,
+  parseGitlabIssueUrl,
+  parseGitlabIssueListUrl,
   gitlabToken,
   mrApiUrl,
   discussionToNotes,
+  loadGitlabIssue,
   loadMergeRequest,
 };