feat(api): merge query

setchy · setchy · commit 7d9b27a66861 · 2025-12-29T11:39:27.000+11:00
Signed-off-by: Adam Setch &lt;adam.setch@outlook.com&gt;
diff --git a/src/renderer/utils/api/graphql/utils.ts b/src/renderer/utils/api/graphql/utils.ts
@@ -1,81 +1,74 @@
-// Shared patterns for fragment parsing
-const FRAGMENT_BLOCK_REGEX =
-  /fragment\s+[A-Za-z0-9_]+\s+on\s+[A-Za-z0-9_]+\s*\{/g;
-const FRAGMENT_NAME_REGEX = /fragment\s+([A-Za-z0-9_]+)\s+on\s+([A-Za-z0-9_]+)/;
-
-type ParsedFragment = {
-  name: string;
-  onType: string;
-  content: string; // inside the outermost braces
-  full: string; // full fragment text including header and braces
-};
-
-function sliceBraceBlock(doc: string, startIndex: number): string | null {
-  let depth = 0;
-  for (let i = startIndex; i < doc.length; i++) {
-    const ch = doc[i];
-    if (ch === '{') {
-      depth++;
-    } else if (ch === '}') {
-      depth--;
-      if (depth === 0) {
-        // Include braces
-        return doc.slice(startIndex, i + 1);
+import { type DocumentNode, parse, print } from 'graphql';
+
+import type { TypedDocumentString } from './generated/graphql';
+
+// AST-based helpers for robust fragment parsing and deduping
+
+function toDocumentNode(
+  doc: TypedDocumentString<unknown, unknown>,
+): DocumentNode {
+  return parse(doc.toString());
+}
+
+export function getQueryFragmentBody(
+  doc: TypedDocumentString<unknown, unknown>,
+): string | null {
+  const ast: DocumentNode = toDocumentNode(doc);
+
+  for (const def of ast.definitions) {
+    if (
+      def.kind === 'FragmentDefinition' &&
+      def.typeCondition.name.value === 'Query'
+    ) {
+      // Print just the fragment selection set body (without outer braces)
+      const printed = print(def);
+      const open = printed.indexOf('{');
+      const close = printed.lastIndexOf('}');
+
+      if (open !== -1 && close !== -1 && close > open) {
+        return printed.slice(open + 1, close).trim();
       }
     }
   }
   return null;
 }
 
-export function parseFragments(doc: string): ParsedFragment[] {
-  const results: ParsedFragment[] = [];
-  // Find each fragment header position
-  const indices: number[] = [];
-  for (const m of doc.matchAll(FRAGMENT_BLOCK_REGEX)) {
-    if (m.index !== undefined) {
-      indices.push(m.index);
-    }
-  }
+export function extractFragments(
+  doc: TypedDocumentString<unknown, unknown>,
+): Map<string, string> {
+  const ast: DocumentNode = toDocumentNode(doc);
 
-  for (const idx of indices) {
-    const header = doc.slice(idx, idx + 200); // small window for name/type parse
-    const nt = header.match(FRAGMENT_NAME_REGEX);
-    if (!nt) {
-      continue;
-    }
-    const name = nt[1];
-    const onType = nt[2];
-    // Find the opening brace for this header
-    const bracePos = doc.indexOf('{', idx);
-    if (bracePos === -1) {
-      continue;
-    }
-    const block = sliceBraceBlock(doc, bracePos);
-    if (!block) {
-      continue;
+  const map = new Map<string, string>();
+
+  for (const def of ast.definitions) {
+    if (def.kind === 'FragmentDefinition') {
+      const name = def.name.value;
+
+      if (!map.has(name)) {
+        map.set(name, print(def));
+      }
     }
-    const full = doc.slice(idx, bracePos) + block;
-    const content = block.slice(1, block.length - 1).trim();
-    results.push({ name, onType, content, full: full.trim() });
   }
-  return results;
-}
 
-export function getQueryFragmentBody(doc: string): string | null {
-  const frags = parseFragments(doc);
-  const qFrag = frags.find((f) => f.onType === 'Query');
-  return qFrag?.content ?? null;
+  return map;
 }
 
-export function extractFragments(doc: string): Map<string, string> {
-  const frags = parseFragments(doc);
-  const map = new Map<string, string>();
-  for (const f of frags) {
-    if (!map.has(f.name)) {
-      map.set(f.name, f.full);
+export function extractFragmentsAll(
+  docs: Array<TypedDocumentString<unknown, unknown>>,
+): Map<string, string> {
+  const out = new Map<string, string>();
+
+  for (const doc of docs) {
+    const m = extractFragments(doc);
+
+    for (const [k, v] of m) {
+      if (!out.has(k)) {
+        out.set(k, v);
+      }
     }
   }
-  return map;
+
+  return out;
 }
 
 // Helper to compose a merged query given selections, fragments and variable defs
diff --git a/src/renderer/utils/notifications/handlers/discussion.ts b/src/renderer/utils/notifications/handlers/discussion.ts
@@ -26,7 +26,6 @@ import {
   DiscussionDetailsFragmentDoc,
   DiscussionMergeQueryFragmentDoc,
 } from '../../api/graphql/generated/graphql';
-import { getQueryFragmentBody } from '../../api/graphql/utils';
 import { DefaultHandler, defaultHandler } from './default';
 import type { GraphQLMergedQueryConfig } from './types';
 import { getNotificationAuthor } from './utils';
@@ -36,23 +35,14 @@ class DiscussionHandler extends DefaultHandler {
 
   mergeQueryConfig() {
     return {
-      queryFragment: getQueryFragmentBody(
-        DiscussionMergeQueryFragmentDoc.toString(),
-      ),
-      responseFragment: DiscussionDetailsFragmentDoc.toString(),
+      queryFragment: DiscussionMergeQueryFragmentDoc,
+      responseFragment: DiscussionDetailsFragmentDoc,
       extras: [
         { name: 'lastComments', type: 'Int', defaultValue: 100 },
         { name: 'lastReplies', type: 'Int', defaultValue: 100 },
         { name: 'firstLabels', type: 'Int', defaultValue: 100 },
         { name: 'includeIsAnswered', type: 'Boolean!', defaultValue: true },
       ],
-      selection: (
-        index: number,
-      ) => `node${index}: repository(owner: $owner${index}, name: $name${index}) {
-          discussion(number: $number${index}) {
-            ...DiscussionDetails
-          }
-        }`,
     } as GraphQLMergedQueryConfig;
   }
 
@@ -88,7 +78,10 @@ class DiscussionHandler extends DefaultHandler {
         discussion.author,
       ]),
       comments: discussion.comments.totalCount,
-      labels: discussion.labels?.nodes.map((label) => label.name) ?? [],
+      labels:
+        discussion.labels?.nodes?.flatMap((label) =>
+          label ? [label.name] : [],
+        ) ?? [],
       htmlUrl: latestDiscussionComment?.url ?? discussion.url,
     };
   }
diff --git a/src/renderer/utils/notifications/handlers/issue.ts b/src/renderer/utils/notifications/handlers/issue.ts
@@ -21,7 +21,6 @@ import {
   IssueDetailsFragmentDoc,
   IssueMergeQueryFragmentDoc,
 } from '../../api/graphql/generated/graphql';
-import { getQueryFragmentBody } from '../../api/graphql/utils';
 import { DefaultHandler, defaultHandler } from './default';
 import type { GraphQLMergedQueryConfig } from './types';
 import { getNotificationAuthor } from './utils';
@@ -31,22 +30,13 @@ class IssueHandler extends DefaultHandler {
 
   mergeQueryConfig() {
     return {
-      queryFragment: getQueryFragmentBody(
-        IssueMergeQueryFragmentDoc.toString(),
-      ),
+      queryFragment: IssueMergeQueryFragmentDoc,
 
-      responseFragment: IssueDetailsFragmentDoc.toString(),
+      responseFragment: IssueDetailsFragmentDoc,
       extras: [
         { name: 'lastComments', type: 'Int', defaultValue: 100 },
         { name: 'firstLabels', type: 'Int', defaultValue: 100 },
       ],
-      selection: (
-        index: number,
-      ) => `node${index}: repository(owner: $owner${index}, name: $name${index}) {
-          issue(number: $number${index}) {
-            ...IssueDetails
-          }
-        }`,
     } as GraphQLMergedQueryConfig;
   }
 
@@ -59,7 +49,7 @@ class IssueHandler extends DefaultHandler {
 
     const issueState = issue.stateReason ?? issue.state;
 
-    const issueComment = issue.comments.nodes[0];
+    const issueComment = issue.comments?.nodes?.[0];
 
     const issueUser = getNotificationAuthor([
       issueComment?.author,
@@ -70,9 +60,11 @@ class IssueHandler extends DefaultHandler {
       number: issue.number,
       state: issueState,
       user: issueUser,
-      comments: issue.comments.totalCount,
-      labels: issue.labels?.nodes.map((label) => label.name),
-      milestone: issue.milestone,
+      comments: issue.comments?.totalCount ?? 0,
+      labels:
+        issue.labels?.nodes?.flatMap((label) => (label ? [label.name] : [])) ??
+        undefined,
+      milestone: issue.milestone ?? undefined,
       htmlUrl: issueComment?.url ?? issue.url,
     };
   }
diff --git a/src/renderer/utils/notifications/handlers/pullRequest.ts b/src/renderer/utils/notifications/handlers/pullRequest.ts
@@ -25,7 +25,6 @@ import {
   PullRequestMergeQueryFragmentDoc,
   type PullRequestReviewFieldsFragment,
 } from '../../api/graphql/generated/graphql';
-import { getQueryFragmentBody } from '../../api/graphql/utils';
 import { DefaultHandler, defaultHandler } from './default';
 import type { GraphQLMergedQueryConfig } from './types';
 import { getNotificationAuthor } from './utils';
@@ -35,10 +34,8 @@ class PullRequestHandler extends DefaultHandler {
 
   mergeQueryConfig() {
     return {
-      queryFragment: getQueryFragmentBody(
-        PullRequestMergeQueryFragmentDoc.toString(),
-      ),
-      responseFragment: PullRequestDetailsFragmentDoc.toString(),
+      queryFragment: PullRequestMergeQueryFragmentDoc,
+      responseFragment: PullRequestDetailsFragmentDoc,
       extras: [
         { name: 'firstLabels', type: 'Int', defaultValue: 100 },
         { name: 'lastComments', type: 'Int', defaultValue: 100 },
@@ -132,7 +129,7 @@ export function getLatestReviewForReviewers(
   }
 
   // Find the most recent review for each reviewer
-  const latestReviews = [];
+  const latestReviews: PullRequestReviewFieldsFragment[] = [];
   const sortedReviews = reviews.toReversed();
   for (const prReview of sortedReviews) {
     const reviewerFound = latestReviews.find(
diff --git a/src/renderer/utils/notifications/handlers/types.ts b/src/renderer/utils/notifications/handlers/types.ts
@@ -4,10 +4,11 @@ import type { OcticonProps } from '@primer/octicons-react';
 
 import type { GitifySubject, Link, SettingsState } from '../../../types';
 import type { Notification, Subject, SubjectType } from '../../../typesGitHub';
+import type { TypedDocumentString } from '../../api/graphql/generated/graphql';
 
 export type GraphQLMergedQueryConfig = {
-  queryFragment: string;
-  responseFragment: string;
+  queryFragment: TypedDocumentString<unknown, unknown>;
+  responseFragment: TypedDocumentString<unknown, unknown>;
   extras: Array<{
     name: string;
     type: string;
diff --git a/src/renderer/utils/notifications/notifications.ts b/src/renderer/utils/notifications/notifications.ts
@@ -10,7 +10,12 @@ import type {
 import type { Notification } from '../../typesGitHub';
 import { listNotificationsForAuthenticatedUser } from '../api/client';
 import { determineFailureType } from '../api/errors';
-import { composeMergedQuery, extractFragments } from '../api/graphql/utils';
+import type { TypedDocumentString } from '../api/graphql/generated/graphql';
+import {
+  composeMergedQuery,
+  extractFragments,
+  getQueryFragmentBody,
+} from '../api/graphql/utils';
 import { getHeaders } from '../api/request';
 import { getGitHubGraphQLUrl, getNumberFromUrl } from '../api/utils';
 import { rendererLogError, rendererLogWarn } from '../logger';
@@ -147,7 +152,7 @@ export async function enrichNotifications(
     handler: ReturnType<typeof createNotificationHandler>;
   }> = [];
 
-  const collectFragments = (doc: string) => {
+  const collectFragments = (doc: TypedDocumentString<unknown, unknown>) => {
     const found = extractFragments(doc);
     for (const [name, frag] of found.entries()) {
       if (!fragments.has(name)) {
@@ -168,10 +173,14 @@ export async function enrichNotifications(
     const repo = notification.repository.name;
     const number = getNumberFromUrl(notification.subject.url);
     const alias = `node${index}`;
-    const queryFragment = config.queryFragment.replaceAll(
+    const queryFragmentBody = getQueryFragmentBody(config.queryFragment) ?? '';
+    const queryFragment = queryFragmentBody.replaceAll(
       'INDEX',
       index.toString(),
     );
+    if (!queryFragment || queryFragment.trim().length === 0) {
+      continue;
+    }
     selections.push(queryFragment);
     variableDefinitions.push(
       `$owner${index}: String!, $name${index}: String!, $number${index}: Int!`,
