@staff0rd/assist 0.793.3 → 0.794.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.793.3",
+  version: "0.794.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -14138,8 +14138,8 @@ var peerPrFields = `number
           }
         }`;
 
-// src/commands/sessions/web/next/ownerPeerPrsQuery.ts
-var ownerPeerPrsQuery = `query($requested: String!, $authored: String!, $hasPeers: Boolean!) {
+// src/commands/sessions/web/next/ownerOpenPrsQuery.ts
+var ownerOpenPrsQuery = `query($requested: String!, $authored: String!, $mine: String!, $hasPeers: Boolean!) {
   viewer { login }
   requested: search(query: $requested, type: ISSUE, first: 100) {
     nodes { ... on PullRequest { repository { nameWithOwner } ${peerPrFields} } }
@@ -14147,14 +14147,11 @@ var ownerPeerPrsQuery = `query($requested: String!, $authored: String!, $hasPeer
   authored: search(query: $authored, type: ISSUE, first: 100) @include(if: $hasPeers) {
     nodes { ... on PullRequest { repository { nameWithOwner } ${peerPrFields} } }
   }
+  mine: search(query: $mine, type: ISSUE, first: 100) {
+    nodes { ... on PullRequest { repository { nameWithOwner } ${peerPrFields} } }
+  }
 }`;
 
-// src/commands/prs/status/isDoNotMerge.ts
-var DO_NOT_MERGE = /^\s*[[(]\s*(do[\s_-]*not\b[^\])]*|dnm)\s*[\])]/i;
-function isDoNotMerge(title) {
-  return DO_NOT_MERGE.test(title);
-}
-
 // src/commands/sessions/web/next/sameLogin.ts
 var sameLogin = (a, b) => a?.toLowerCase() === b.toLowerCase();
 
@@ -14192,6 +14189,17 @@ function toNextPr(node, author, requested, viewer) {
   };
 }
 
+// src/commands/sessions/web/next/selectMyPrs.ts
+function selectMyPrs(nodes, viewer) {
+  return nodes.filter((node) => sameLogin(node.author?.login, viewer)).map((node) => toNextPr(node, node.author?.login ?? viewer, false, viewer)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
+}
+
+// src/commands/prs/status/isDoNotMerge.ts
+var DO_NOT_MERGE = /^\s*[[(]\s*(do[\s_-]*not\b[^\])]*|dnm)\s*[\])]/i;
+function isDoNotMerge(title) {
+  return DO_NOT_MERGE.test(title);
+}
+
 // src/commands/sessions/web/next/selectPeerPrs.ts
 function isRequested(node, viewer) {
   return (node.reviewRequests?.nodes ?? []).some(
@@ -14218,39 +14226,53 @@ function selectPeerPrs(nodes, viewer, peers) {
   return selected.sort((a, b) => a.requestedAt.localeCompare(b.requestedAt));
 }
 
-// src/commands/sessions/web/next/fetchOwnerPeerPrs.ts
+// src/commands/sessions/web/next/splitOpenPrs.ts
+function splitOpenPrs(nodes, viewer, peers, repoOf2) {
+  const withRepo = (prs2) => prs2.map((pr) => ({ ...pr, repo: repoOf2(pr) }));
+  return {
+    peerPrs: withRepo(selectPeerPrs(nodes, viewer, peers)),
+    myPrs: withRepo(selectMyPrs(nodes, viewer))
+  };
+}
+
+// src/commands/sessions/web/next/fetchOwnerOpenPrs.ts
 function uniqueNodes(...results) {
   const byUrl = /* @__PURE__ */ new Map();
   for (const node of results.flatMap((result) => result?.nodes ?? []))
     if (node?.url) byUrl.set(node.url, node);
   return [...byUrl.values()];
 }
-async function fetchOwnerPeerPrs(cwd, owner, peers) {
+async function fetchOwnerOpenPrs(cwd, owner, peers) {
   const base = `user:${owner} is:pr is:open archived:false`;
   const authors = peers.map((peer) => `author:${peer}`).join(" ");
   const response = await ghJson(cwd, [
     "api",
     "graphql",
     "-f",
-    `query=${ownerPeerPrsQuery}`,
+    `query=${ownerOpenPrsQuery}`,
     "-f",
     `requested=${base} review-requested:@me`,
     "-f",
     `authored=${base} ${authors}`,
+    "-f",
+    `mine=${base} author:@me`,
     "-F",
     `hasPeers=${peers.length > 0}`
   ]);
   const viewer = response.data?.viewer?.login;
   if (!viewer || !response.data?.requested)
     throw new Error("Owner not searchable");
-  const nodes = uniqueNodes(response.data.requested, response.data.authored);
+  const { requested, authored, mine } = response.data;
+  const nodes = uniqueNodes(requested, authored, mine);
   const repoOf2 = new Map(
     nodes.map((node) => [node.url, node.repository?.nameWithOwner ?? owner])
   );
-  return selectPeerPrs(nodes, viewer, peers).map((pr) => ({
-    ...pr,
-    repo: repoOf2.get(pr.url) ?? owner
-  }));
+  return splitOpenPrs(
+    nodes,
+    viewer,
+    peers,
+    (pr) => repoOf2.get(pr.url) ?? owner
+  );
 }
 
 // src/commands/sessions/web/next/peerPrsQuery.ts
@@ -14265,9 +14287,9 @@ var peerPrsQuery = `query($owner: String!, $name: String!) {
   }
 }`;
 
-// src/commands/sessions/web/next/fetchPeerPrs.ts
-async function fetchPeerPrs(cwd, repo, peers) {
-  if (isOwnerEntry(repo)) return fetchOwnerPeerPrs(cwd, repo, peers);
+// src/commands/sessions/web/next/fetchOpenPrs.ts
+async function fetchOpenPrs(cwd, repo, peers) {
+  if (isOwnerEntry(repo)) return fetchOwnerOpenPrs(cwd, repo, peers);
   const [owner, name] = repo.split("/");
   const response = await ghJson(cwd, [
     "api",
@@ -14285,7 +14307,7 @@ async function fetchPeerPrs(cwd, repo, peers) {
   const nodes = (repository.pullRequests?.nodes ?? []).filter(
     (node) => !!node
   );
-  return selectPeerPrs(nodes, viewer, peers).map((pr) => ({ ...pr, repo }));
+  return splitOpenPrs(nodes, viewer, peers, () => repo);
 }
 
 // src/commands/sessions/web/next/compareBoardOrder.ts
@@ -14532,16 +14554,29 @@ function scopeRepos(configured, selfRepo) {
 }
 
 // src/commands/sessions/web/next/nextItems.ts
+var byRequestedAt = (a, b) => a.requestedAt.localeCompare(b.requestedAt);
 async function nextItems(req, res) {
   const cwd = getCwdParam(req, res);
   if (!cwd) return;
   const scope = nextScope(cwd);
   const repos2 = scopeRepos(scope.repos, scope.selfRepo);
-  const [peerPrs, assignedIssues, { pickups, boards }] = await Promise.all([
+  const openPrs = new Map(
+    repos2.map((repo) => [
+      repo,
+      fetchOpenPrs(cwd, repo, scope.peers)
+    ])
+  );
+  const openPrsOf = (repo) => openPrs.get(repo);
+  const [peerPrs, myPrs, assignedIssues, { pickups, boards }] = await Promise.all([
+    sectionAcross(
+      repos2,
+      (repo) => openPrsOf(repo).then((prs2) => prs2.peerPrs),
+      byRequestedAt
+    ),
     sectionAcross(
       repos2,
-      (repo) => fetchPeerPrs(cwd, repo, scope.peers),
-      (a, b) => a.requestedAt.localeCompare(b.requestedAt)
+      (repo) => openPrsOf(repo).then((prs2) => prs2.myPrs),
+      byRequestedAt
     ),
     sectionAcross(
       repos2,
@@ -14553,6 +14588,7 @@ async function nextItems(req, res) {
   const body = {
     scope,
     peerPrs,
+    myPrs,
     assignedIssues,
     pickups,
     boards

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.793.3",
+	"version": "0.794.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {