@semantic-release/github 10.0.6 → 10.0.7

package/lib/success.js

@@ -7,7 +7,6 @@ import debugFactory from "debug";
 import parseGithubUrl from "./parse-github-url.js";
 import resolveConfig from "./resolve-config.js";
 import { toOctokitOptions } from "./octokit.js";
-import getSearchQueries from "./get-search-queries.js";
 import getSuccessComment from "./get-success-comment.js";
 import findSRIssues from "./find-sr-issues.js";
 import { RELEASE_NAME } from "./definitions/constants.js";
@@ -65,44 +64,38 @@ export default async function success(pluginConfig, context, { Octokit }) {
     const releaseInfos = releases.filter((release) => Boolean(release.name));
     const shas = commits.map(({ hash }) => hash);
 
-    const searchQueries = getSearchQueries(
-      `repo:${owner}/${repo}+type:pr+is:merged`,
-      shas,
-    ).map(
-      async (q) =>
-        (await octokit.request("GET /search/issues", { q })).data.items,
+    const { repository } = await octokit.graphql(
+      buildAssociatedPRsQuery(shas),
+      { owner, repo },
     );
-
-    const searchQueriesResults = await Promise.all(searchQueries);
-    const uniqueSearchQueriesResults = uniqBy(
-      flatten(searchQueriesResults),
-      "number",
+    const associatedPRs = Object.values(repository).map(
+      (item) => item.associatedPullRequests.nodes,
     );
-    const prs = await pFilter(
-      uniqueSearchQueriesResults,
-      async ({ number }) => {
-        const commits = await octokit.paginate(
-          "GET /repos/{owner}/{repo}/pulls/{pull_number}/commits",
-          {
-            owner,
-            repo,
-            pull_number: number,
-          },
-        );
-        const matchingCommit = commits.find(({ sha }) => shas.includes(sha));
-        if (matchingCommit) return matchingCommit;
 
-        const { data: pullRequest } = await octokit.request(
-          "GET /repos/{owner}/{repo}/pulls/{pull_number}",
-          {
-            owner,
-            repo,
-            pull_number: number,
-          },
-        );
-        return shas.includes(pullRequest.merge_commit_sha);
-      },
-    );
+    const uniqueAssociatedPRs = uniqBy(flatten(associatedPRs), "number");
+
+    const prs = await pFilter(uniqueAssociatedPRs, async ({ number }) => {
+      const commits = await octokit.paginate(
+        "GET /repos/{owner}/{repo}/pulls/{pull_number}/commits",
+        {
+          owner,
+          repo,
+          pull_number: number,
+        },
+      );
+      const matchingCommit = commits.find(({ sha }) => shas.includes(sha));
+      if (matchingCommit) return matchingCommit;
+
+      const { data: pullRequest } = await octokit.request(
+        "GET /repos/{owner}/{repo}/pulls/{pull_number}",
+        {
+          owner,
+          repo,
+          pull_number: number,
+        },
+      );
+      return shas.includes(pullRequest.merge_commit_sha);
+    });
 
     debug(
       "found pull requests: %O",
@@ -250,3 +243,32 @@ export default async function success(pluginConfig, context, { Octokit }) {
     throw new AggregateError(errors);
   }
 }
+
+/**
+ * Builds GraphQL query for fetching associated PRs to a list of commit hash (sha)
+ * @param {Array<string>} shas
+ * @returns {string}
+ */
+export function buildAssociatedPRsQuery(shas) {
+  return `#graphql
+    query getAssociatedPRs($owner: String!, $repo: String!) {
+      repository(owner: $owner, name: $repo) {
+        ${shas
+          .map((sha) => {
+            return `commit${sha.slice(0, 6)}: object(oid: "${sha}") {
+            ...on Commit {
+              associatedPullRequests(first: 100) {
+                nodes {
+                  url
+                  number
+                  body
+                }
+              }
+            }
+          }`;
+          })
+          .join("")}
+      }
+    }
+  `;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@semantic-release/github",
   "description": "semantic-release plugin to publish a GitHub release and comment on released Pull Requests/Issues",
-  "version": "10.0.6",
+  "version": "10.0.7",
   "type": "module",
   "author": "Pierre Vanduynslager (https://twitter.com/@pvdlg_)",
   "ava": {
@@ -41,14 +41,14 @@
   },
   "devDependencies": {
     "ava": "6.1.3",
-    "c8": "9.1.0",
+    "c8": "10.1.2",
     "cpy": "11.0.1",
     "cz-conventional-changelog": "3.3.0",
     "fetch-mock": "npm:@gr2m/fetch-mock@9.11.0-pull-request-644.1",
-    "lockfile-lint": "4.13.2",
-    "ls-engines": "0.9.1",
+    "lockfile-lint": "4.14.0",
+    "ls-engines": "0.9.2",
     "npm-run-all2": "6.2.0",
-    "prettier": "3.3.0",
+    "prettier": "3.3.2",
     "publint": "0.2.8",
     "semantic-release": "24.0.0",
     "sinon": "18.0.0",

package/lib/get-search-queries.js

@@ -1,16 +0,0 @@
-export default function getSearchQueries(base, commits, separator = "+") {
-  return commits.reduce((searches, commit) => {
-    const lastSearch = searches[searches.length - 1];
-
-    if (
-      lastSearch &&
-      lastSearch.length + commit.length <= 256 - separator.length
-    ) {
-      searches[searches.length - 1] = `${lastSearch}${separator}${commit}`;
-    } else {
-      searches.push(`${base}${separator}${commit}`);
-    }
-
-    return searches;
-  }, []);
-}