paperclip-github-plugin 0.7.4 → 0.7.5

package/dist/manifest.js

@@ -520,7 +520,7 @@ var COMPANY_METRIC_API_ROUTE_URL_PATH = `/api/plugins/${GITHUB_SYNC_PLUGIN_ID}/a
 var require2 = createRequire(import.meta.url);
 var packageJson = require2("../package.json");
 var SCHEDULE_TICK_CRON = "* * * * *";
-var MANIFEST_VERSION = "0.7.4"?.trim() || typeof packageJson.version === "string" && packageJson.version.trim() || process.env.npm_package_version?.trim() || "0.0.0-dev";
+var MANIFEST_VERSION = "0.7.5"?.trim() || typeof packageJson.version === "string" && packageJson.version.trim() || process.env.npm_package_version?.trim() || "0.0.0-dev";
 var manifest = {
   id: GITHUB_SYNC_PLUGIN_ID,
   apiVersion: 1,

package/dist/worker.js

@@ -2304,6 +2304,18 @@ async function resolvePaperclipIssueGitHubLink(ctx, issueId, companyId, options
   };
   return await hydrateRecoveredPaperclipIssueGitHubLink(ctx, issueId, fallbackLink) ?? fallbackLink;
 }
+async function resolvePaperclipIssueGitHubPullRequestLink(ctx, issueId, companyId) {
+  const links = await listGitHubPullRequestLinkRecords(ctx, {
+    paperclipIssueId: issueId
+  });
+  return links.filter((record) => !record.data.companyId || record.data.companyId === companyId).sort((left, right) => {
+    const rightTimestamp = Date.parse(right.updatedAt ?? right.createdAt ?? "");
+    const leftTimestamp = Date.parse(left.updatedAt ?? left.createdAt ?? "");
+    const safeRightTimestamp = Number.isFinite(rightTimestamp) ? rightTimestamp : 0;
+    const safeLeftTimestamp = Number.isFinite(leftTimestamp) ? leftTimestamp : 0;
+    return safeRightTimestamp - safeLeftTimestamp;
+  })[0] ?? null;
+}
 async function hydrateRecoveredPaperclipIssueGitHubLink(ctx, issueId, fallbackLink) {
   const repository = parseRepositoryReference(fallbackLink.repositoryUrl);
   if (!repository) {
@@ -2379,21 +2391,33 @@ async function resolveManualSyncTarget(ctx, settings, input) {
     }
     const link = await resolvePaperclipIssueGitHubLink(ctx, input.issueId, companyId2);
     if (!link) {
-      throw new Error("This Paperclip issue is not linked to a GitHub issue yet. Run a broader sync first.");
-    }
-    const candidateMappings = getSyncableMappingsForTarget(settings.mappings, {
-      kind: "issue",
-      companyId: companyId2,
-      projectId: link.paperclipProjectId,
-      repositoryUrl: link.repositoryUrl,
-      issueId: input.issueId,
-      githubIssueId: link.githubIssueId,
-      githubIssueNumber: link.githubIssueNumber,
-      githubIssueUrl: link.githubIssueUrl,
-      displayLabel: `issue #${link.githubIssueNumber}`
-    });
-    if (candidateMappings.length === 0) {
-      throw new Error("No saved GitHub repository mapping matches this Paperclip issue.");
+      const pullRequestLink = await resolvePaperclipIssueGitHubPullRequestLink(ctx, input.issueId, companyId2);
+      if (!pullRequestLink) {
+        throw new Error("This Paperclip issue is not linked to a GitHub issue or pull request yet. Run a broader sync first.");
+      }
+      const candidateMappings = getSyncableMappingsForTarget(settings.mappings, {
+        kind: "issue",
+        companyId: companyId2,
+        projectId: pullRequestLink.data.paperclipProjectId,
+        repositoryUrl: pullRequestLink.data.repositoryUrl,
+        issueId: input.issueId,
+        githubPullRequestNumber: pullRequestLink.data.githubPullRequestNumber,
+        githubPullRequestUrl: pullRequestLink.data.githubPullRequestUrl,
+        displayLabel: `pull request #${pullRequestLink.data.githubPullRequestNumber}`
+      });
+      if (candidateMappings.length === 0) {
+        throw new Error("No saved GitHub repository mapping matches this Paperclip issue.");
+      }
+      return {
+        kind: "issue",
+        companyId: companyId2,
+        projectId: pullRequestLink.data.paperclipProjectId,
+        issueId: input.issueId,
+        repositoryUrl: pullRequestLink.data.repositoryUrl,
+        githubPullRequestNumber: pullRequestLink.data.githubPullRequestNumber,
+        githubPullRequestUrl: pullRequestLink.data.githubPullRequestUrl,
+        displayLabel: `pull request #${pullRequestLink.data.githubPullRequestNumber}`
+      };
     }
     return {
       kind: "issue",
@@ -2517,23 +2541,46 @@ async function buildToolbarSyncState(ctx, input) {
   }
   if (entityType === "issue" && entityId && companyId) {
     const link = await resolvePaperclipIssueGitHubLink(ctx, entityId, companyId);
-    const mappings = link ? getSyncableMappingsForTarget(settings.mappings, {
+    if (link) {
+      const mappings2 = getSyncableMappingsForTarget(settings.mappings, {
+        kind: "issue",
+        companyId,
+        projectId: link.paperclipProjectId,
+        issueId: entityId,
+        repositoryUrl: link.repositoryUrl,
+        githubIssueId: link.githubIssueId,
+        githubIssueNumber: link.githubIssueNumber,
+        githubIssueUrl: link.githubIssueUrl,
+        displayLabel: `issue #${link.githubIssueNumber}`
+      });
+      return {
+        kind: "issue",
+        visible: false,
+        canRun: githubTokenConfigured && mappings2.length > 0,
+        label: `Sync #${link.githubIssueNumber}`,
+        message: `Sync ${link.repositoryUrl.replace(/^https:\/\/github\.com\//, "")} issue #${link.githubIssueNumber}.`,
+        syncState: settings.syncState,
+        githubTokenConfigured,
+        savedMappingCount
+      };
+    }
+    const pullRequestLink = await resolvePaperclipIssueGitHubPullRequestLink(ctx, entityId, companyId);
+    const mappings = pullRequestLink ? getSyncableMappingsForTarget(settings.mappings, {
       kind: "issue",
       companyId,
-      projectId: link.paperclipProjectId,
+      projectId: pullRequestLink.data.paperclipProjectId,
       issueId: entityId,
-      repositoryUrl: link.repositoryUrl,
-      githubIssueId: link.githubIssueId,
-      githubIssueNumber: link.githubIssueNumber,
-      githubIssueUrl: link.githubIssueUrl,
-      displayLabel: `issue #${link.githubIssueNumber}`
+      repositoryUrl: pullRequestLink.data.repositoryUrl,
+      githubPullRequestNumber: pullRequestLink.data.githubPullRequestNumber,
+      githubPullRequestUrl: pullRequestLink.data.githubPullRequestUrl,
+      displayLabel: `pull request #${pullRequestLink.data.githubPullRequestNumber}`
     }) : [];
     return {
       kind: "issue",
       visible: false,
       canRun: githubTokenConfigured && mappings.length > 0,
-      label: link?.githubIssueNumber ? `Sync #${link.githubIssueNumber}` : "Sync issue",
-      message: link ? `Sync ${link.repositoryUrl.replace(/^https:\/\/github\.com\//, "")} issue #${link.githubIssueNumber}.` : "This Paperclip issue is not linked to GitHub yet.",
+      label: pullRequestLink?.data.githubPullRequestNumber ? `Sync PR #${pullRequestLink.data.githubPullRequestNumber}` : "Sync issue",
+      message: pullRequestLink ? `Sync ${pullRequestLink.data.repositoryUrl.replace(/^https:\/\/github\.com\//, "")} pull request #${pullRequestLink.data.githubPullRequestNumber}.` : "This Paperclip issue is not linked to GitHub yet.",
       syncState: settings.syncState,
       githubTokenConfigured,
       savedMappingCount
@@ -8040,6 +8087,40 @@ async function listRepositoryIssues(octokit, repository, state = "open", options
   }
   return normalizedIssues;
 }
+async function listRepositoryIssuesForSyncTarget(octokit, repository, state, target, options = {}) {
+  if (target?.kind !== "issue") {
+    return listRepositoryIssues(octokit, repository, state, options);
+  }
+  if (target.githubIssueNumber === void 0) {
+    if (options.onProgress) {
+      await options.onProgress({
+        loadedIssueCount: 0
+      });
+    }
+    return [];
+  }
+  const response = await octokit.rest.issues.get({
+    owner: repository.owner,
+    repo: repository.repo,
+    issue_number: target.githubIssueNumber,
+    headers: {
+      accept: "application/vnd.github+json",
+      "X-GitHub-Api-Version": GITHUB_API_VERSION
+    }
+  });
+  const issue = response.data;
+  if ("pull_request" in issue) {
+    return [];
+  }
+  const normalizedIssue = normalizeGitHubIssueRecord(issue);
+  const issues = state === "open" && normalizedIssue.state !== "open" ? [] : [normalizedIssue];
+  if (options.onProgress) {
+    await options.onProgress({
+      loadedIssueCount: issues.length
+    });
+  }
+  return issues;
+}
 async function listRepositoryIssuesForImport(allIssues) {
   return sortIssuesForImport(allIssues.filter((issue) => issue.state === "open"));
 }
@@ -12301,10 +12382,11 @@ async function performSync(ctx, trigger, options = {}) {
         updateSyncFailureContext(failureContext, {
           phase: "listing_github_issues"
         });
-        const allIssues = await listRepositoryIssues(
+        const allIssues = await listRepositoryIssuesForSyncTarget(
           octokit,
           repository,
           shouldLoadClosedIssues ? "all" : "open",
+          options.target,
           {
             onProgress: async (progress) => {
               currentProgress = {
@@ -12427,7 +12509,7 @@ async function performSync(ctx, trigger, options = {}) {
         };
         await persistRunningProgress(true);
         try {
-          const warmedLinkedPullRequests = await loadLinkedPullRequestsForOpenIssues(octokit, repository);
+          const warmedLinkedPullRequests = options.target?.kind === "issue" ? /* @__PURE__ */ new Map() : await loadLinkedPullRequestsForOpenIssues(octokit, repository);
           for (const [issueNumber, linkedPullRequests] of warmedLinkedPullRequests.entries()) {
             linkedPullRequestsByIssueNumber.set(issueNumber, linkedPullRequests);
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paperclip-github-plugin",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "Paperclip plugin for synchronizing GitHub issues into Paperclip projects.",
   "license": "Apache-2.0",
   "type": "module",