Commit 354fa99

@@ -34,10 +34,10 @@ export default define({
     }
 
     for (const discussion of data.discussionComments) {
-      if (discussion.reactions.totalCount > 0) {
+      if (discussion.reactions.totalCount > 0 && discussion.discussion) {
         reactions[discussion.discussion.repository.nameWithOwner] = {
           count: discussion.reactions.totalCount,
-          repository: discussion.discussion.repository.nameWithOwner,
+          repository: discussion.discussion?.repository.nameWithOwner,
         }
       }
     }

@@ -1,10 +1,10 @@
-import { define, Pull } from '#src'
+import { define, PullRequest } from '#src'
 
 export default define({
   url: import.meta.url,
   badges: ['my-badges-contributor'] as const,
   present(data, grant) {
-    const pulls: Pull[] = []
+    const pulls: PullRequest[] = []
     for (const pull of data.pulls) {
       if (
         pull.repository.name === 'my-badges' &&

@@ -21,7 +21,7 @@ export default define({
     for (const issue of data.issues.sort(age)) {
       if (!issue.closed) continue
       const createdAt = new Date(issue.createdAt)
-      const closedAt = new Date(issue.closedAt)
+      const closedAt = new Date(issue.closedAt!)
       let years = Math.floor(
         (closedAt.getTime() - createdAt.getTime()) / 1000 / 60 / 60 / 24 / 365,
       )
@@ -47,5 +47,5 @@ export default define({
 })
 
 function age(a: Issue, b: Issue) {
-  return new Date(a.closedAt).getTime() - new Date(b.closedAt).getTime()
+  return new Date(a.closedAt!).getTime() - new Date(b.closedAt!).getTime()
 }

@@ -1,4 +1,4 @@
-import { define, Pull } from '#src'
+import { define, PullRequest } from '#src'
 
 export default define({
   url: import.meta.url,
@@ -56,6 +56,6 @@ export default define({
   },
 })
 
-function byParticipantsCount(a: Pull, b: Pull) {
+function byParticipantsCount(a: PullRequest, b: PullRequest) {
   return a.participants.totalCount - b.participants.totalCount
 }

@@ -1,10 +1,10 @@
-import { define, Issue, Pull } from '#src'
+import { define, Issue, PullRequest } from '#src'
 
 export default define({
   url: import.meta.url,
   badges: ['the-ultimate-question'] as const,
   present(data, grant) {
-    const list: (Issue | Pull)[] = []
+    const list: (Issue | PullRequest)[] = []
 
     for (const issue of data.issues) {
       if (issue.number == 42) list.push(issue)
@@ -22,6 +22,6 @@ export default define({
   },
 })
 
-function link(x: Issue | Pull): string {
+function link(x: Issue | PullRequest): string {
   return `<a href="https://github.com/${x.repository.owner.login}/${x.repository.name}/issues/${x.number}">#${x.number}</a>`
 }

@@ -1,27 +1,27 @@
-import { define, Pull } from '#src'
+import { define, PullRequest } from '#src'
 
 export default define({
   url: import.meta.url,
   badges: ['this-is-fine'] as const,
   present(data, grant) {
-    const pulls: Pull[] = []
+    const pulls: PullRequest[] = []
 
     for (const pull of data.pulls) {
       if (!pull.merged) continue
       if (pull.mergedBy?.login != data.user.login) continue
 
-      const commit = pull.lastCommit.nodes[0]?.commit
+      const commit = pull.lastCommit.nodes?.[0]?.commit
       if (!commit) continue
 
-      const checkRuns = commit.checkSuites.nodes.flatMap(
-        (x) => x.lastCheckRun.nodes,
+      const checkRuns = commit.checkSuites?.nodes?.flatMap(
+        (x) => x.lastCheckRun?.nodes,
       )
-      if (checkRuns.length == 0) continue
+      if (!checkRuns || checkRuns?.length == 0) continue
       const successCount = checkRuns.filter(
-        (x) => x.conclusion == 'SUCCESS',
+        (x) => x?.conclusion == 'SUCCESS',
       ).length
       const failureCount = checkRuns.filter(
-        (x) => x.conclusion == 'FAILURE',
+        (x) => x?.conclusion == 'FAILURE',
       ).length
 
       if (successCount <= failureCount) {

@@ -0,0 +1,99 @@
+fragment DiscussionComment on DiscussionComment {
+  url
+  author {
+    login
+  }
+  discussion {
+    number
+    repository {
+      nameWithOwner
+    }
+    author {
+      login
+    }
+  }
+  body
+  createdAt
+  updatedAt
+  editor {
+    login
+  }
+  ...Reactions
+}
+
+fragment IssueComment on IssueComment {
+  url
+  author {
+    login
+  }
+  repository {
+    nameWithOwner
+  }
+  issue {
+    number
+    author {
+      login
+    }
+  }
+  body
+  createdAt
+  updatedAt
+  editor {
+    login
+  }
+  ...Reactions
+}
+
+fragment Reactions on Reactable {
+  reactions(first: 100) {
+    totalCount
+    nodes {
+      content
+      user {
+        login
+      }
+    }
+  }
+}
+
+query DiscussionCommentsQuery($login: String!, $num: Int = 100, $cursor: String) {
+  user(login: $login) {
+    repositoryDiscussionComments(first: $num, after: $cursor) {
+      totalCount
+      nodes {
+        ...DiscussionComment
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}
+
+query IssueCommentsQuery($login: String!, $num: Int = 100, $cursor: String) {
+  user(login: $login) {
+    issueComments(first: $num, after: $cursor) {
+      totalCount
+      nodes {
+        ...IssueComment
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}

@@ -0,0 +1,210 @@
+// DO NOT EDIT. This file was generated by megaera.
+
+const DiscussionComment = `#graphql
+fragment DiscussionComment on DiscussionComment {
+  url
+  author {
+    login
+  }
+  discussion {
+    number
+    repository {
+      nameWithOwner
+    }
+    author {
+      login
+    }
+  }
+  body
+  createdAt
+  updatedAt
+  editor {
+    login
+  }
+  ...Reactions
+}`
+
+export type DiscussionComment = {
+  url: string
+  author: {
+    login: string
+  } | null
+  discussion: {
+    number: number
+    repository: {
+      nameWithOwner: string
+    }
+    author: {
+      login: string
+    } | null
+  } | null
+  body: string
+  createdAt: string
+  updatedAt: string
+  editor: {
+    login: string
+  } | null
+} & Reactions
+
+
+const IssueComment = `#graphql
+fragment IssueComment on IssueComment {
+  url
+  author {
+    login
+  }
+  repository {
+    nameWithOwner
+  }
+  issue {
+    number
+    author {
+      login
+    }
+  }
+  body
+  createdAt
+  updatedAt
+  editor {
+    login
+  }
+  ...Reactions
+}`
+
+export type IssueComment = {
+  url: string
+  author: {
+    login: string
+  } | null
+  repository: {
+    nameWithOwner: string
+  }
+  issue: {
+    number: number
+    author: {
+      login: string
+    } | null
+  }
+  body: string
+  createdAt: string
+  updatedAt: string
+  editor: {
+    login: string
+  } | null
+} & Reactions
+
+
+const Reactions = `#graphql
+fragment Reactions on Reactable {
+  reactions(first: 100) {
+    totalCount
+    nodes {
+      content
+      user {
+        login
+      }
+    }
+  }
+}`
+
+export type Reactions = {
+  reactions: {
+    totalCount: number
+    nodes: Array<{
+      content: 'CONFUSED' | 'EYES' | 'HEART' | 'HOORAY' | 'LAUGH' | 'ROCKET' | 'THUMBS_DOWN' | 'THUMBS_UP'
+      user: {
+        login: string
+      } | null
+    }> | null
+  }
+}
+
+
+export const DiscussionCommentsQuery = `#graphql
+${Reactions}
+${IssueComment}
+${DiscussionComment}
+query DiscussionCommentsQuery($login: String!, $num: Int = 100, $cursor: String) {
+  user(login: $login) {
+    repositoryDiscussionComments(first: $num, after: $cursor) {
+      totalCount
+      nodes {
+        ...DiscussionComment
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}` as string & DiscussionCommentsQuery
+
+export type DiscussionCommentsQuery = (vars: { login: string, num?: number | null, cursor?: string | null }) => {
+  user: {
+    repositoryDiscussionComments: {
+      totalCount: number
+      nodes: Array<{} & DiscussionComment> | null
+      pageInfo: {
+        hasNextPage: boolean
+        endCursor: string | null
+      }
+    }
+  } | null
+  rateLimit: {
+    limit: number
+    cost: number
+    remaining: number
+    resetAt: string
+  } | null
+}
+
+
+export const IssueCommentsQuery = `#graphql
+${Reactions}
+${IssueComment}
+${DiscussionComment}
+query IssueCommentsQuery($login: String!, $num: Int = 100, $cursor: String) {
+  user(login: $login) {
+    issueComments(first: $num, after: $cursor) {
+      totalCount
+      nodes {
+        ...IssueComment
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}` as string & IssueCommentsQuery
+
+export type IssueCommentsQuery = (vars: { login: string, num?: number | null, cursor?: string | null }) => {
+  user: {
+    issueComments: {
+      totalCount: number
+      nodes: Array<{} & IssueComment> | null
+      pageInfo: {
+        hasNextPage: boolean
+        endCursor: string | null
+      }
+    }
+  } | null
+  rateLimit: {
+    limit: number
+    cost: number
+    remaining: number
+    resetAt: string
+  } | null
+}

@@ -0,0 +1,58 @@
+fragment Commit on Commit {
+  sha: oid
+  committedDate
+  message
+  messageBody
+  additions
+  deletions
+  author {
+    user {
+      login
+    }
+  }
+  committer {
+    user {
+      login
+    }
+  }
+  repository {
+    owner {
+      login
+    }
+    name
+  }
+}
+
+query CommitsQuery(
+  $owner: String!
+  $name: String!
+  $author: ID!
+  $num: Int = 100
+  $cursor: String
+) {
+  repository(owner: $owner, name: $name) {
+    defaultBranchRef {
+      target {
+        ... on Commit {
+          history(first: $num, after: $cursor, author: { id: $author }) {
+            totalCount
+            nodes {
+              ...Commit
+            }
+            pageInfo {
+              hasNextPage
+              endCursor
+            }
+          }
+        }
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}
+

@@ -0,0 +1,105 @@
+// DO NOT EDIT. This file was generated by megaera.
+
+const Commit = `#graphql
+fragment Commit on Commit {
+  sha: oid
+  committedDate
+  message
+  messageBody
+  additions
+  deletions
+  author {
+    user {
+      login
+    }
+  }
+  committer {
+    user {
+      login
+    }
+  }
+  repository {
+    owner {
+      login
+    }
+    name
+  }
+}`
+
+export type Commit = {
+  sha: string
+  committedDate: string
+  message: string
+  messageBody: string
+  additions: number
+  deletions: number
+  author: {
+    user: {
+      login: string
+    } | null
+  } | null
+  committer: {
+    user: {
+      login: string
+    } | null
+  } | null
+  repository: {
+    owner: {
+      login: string
+    }
+    name: string
+  }
+}
+
+
+export const CommitsQuery = `#graphql
+${Commit}
+query CommitsQuery($owner: String!, $name: String!, $author: ID!, $num: Int = 100, $cursor: String) {
+  repository(owner: $owner, name: $name) {
+    defaultBranchRef {
+      target {
+        ... on Commit {
+          history(first: $num, after: $cursor, author: {id: $author}) {
+            totalCount
+            nodes {
+              ...Commit
+            }
+            pageInfo {
+              hasNextPage
+              endCursor
+            }
+          }
+        }
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}` as string & CommitsQuery
+
+export type CommitsQuery = (vars: { owner: string, name: string, author: string, num?: number | null, cursor?: string | null }) => {
+  repository: {
+    defaultBranchRef: {
+      target: {} & {
+        history: {
+          totalCount: number
+          nodes: Array<{} & Commit> | null
+          pageInfo: {
+            hasNextPage: boolean
+            endCursor: string | null
+          }
+        }
+      } | null | null
+    } | null
+  } | null
+  rateLimit: {
+    limit: number
+    cost: number
+    remaining: number
+    resetAt: string
+  } | null
+}

@@ -1,101 +0,0 @@
-export const commitsQuery = `#graphql
-query CommitsQuery(
-  $owner: String!
-  $name: String!
-  $author: ID!
-  $num: Int = 100
-  $cursor: String
-) {
-  repository(owner: $owner, name: $name) {
-    defaultBranchRef {
-      target {
-        ... on Commit {
-          history(first: $num, after: $cursor, author: { id: $author }) {
-            totalCount
-            nodes {
-              sha: oid
-              committedDate
-              message
-              messageBody
-              additions
-              deletions
-              author {
-                user {
-                  login
-                }
-              }
-              committer {
-                user {
-                  login
-                }
-              }
-              repository {
-                owner {
-                  login
-                }
-                name
-              }
-            }
-            pageInfo {
-              hasNextPage
-              endCursor
-            }
-          }
-        }
-      }
-    }
-  }
-  rateLimit {
-    limit
-    cost
-    remaining
-    resetAt
-  }
-}
-`
-
-export type CommitsQuery = {
-  repository: {
-    defaultBranchRef: {
-      target: {
-        history: {
-          totalCount: number
-          nodes: Array<{
-            sha: string
-            committedDate: string
-            message: string
-            messageBody: string
-            additions: number
-            deletions: number
-            author: {
-              user: {
-                login: string
-              }
-            }
-            committer: {
-              user: {
-                login: string
-              }
-            }
-            repository: {
-              owner: {
-                login: string
-              }
-              name: string
-            }
-          }>
-          pageInfo: {
-            hasNextPage: boolean
-            endCursor: string
-          }
-        }
-      }
-    }
-  }
-  rateLimit: {
-    limit: number
-    cost: number
-    remaining: number
-    resetAt: string
-  }
-}

@@ -1,91 +0,0 @@
-import { Reactions } from './types.js'
-
-export const discussionCommentsQuery = `#graphql
-query DiscussionCommentsQuery($login: String!, $num: Int = 100, $cursor: String) {
-  user(login: $login) {
-    repositoryDiscussionComments(first: $num, after: $cursor) {
-      totalCount
-      nodes {
-        url
-        author {
-          login
-        }
-        discussion {
-          number
-          repository {
-            nameWithOwner
-          }
-          author {
-            login
-          }
-        }
-        body
-        createdAt
-        updatedAt
-        editor {
-          login
-        }
-        reactions(first: 100) {
-          totalCount
-          nodes {
-            content
-            user {
-              login
-            }
-          }
-        }
-      }
-      pageInfo {
-        hasNextPage
-        endCursor
-      }
-    }
-  }
-  rateLimit {
-    limit
-    cost
-    remaining
-    resetAt
-  }
-}
-`
-
-export type DiscussionCommentsQuery = {
-  user: {
-    repositoryDiscussionComments: {
-      totalCount: number
-      nodes: Array<{
-        url: string
-        author: {
-          login: string
-        }
-        discussion: {
-          number: number
-          repository: {
-            nameWithOwner: string
-          }
-          author: {
-            login: string
-          }
-        }
-        body: string
-        createdAt: string
-        updatedAt: string
-        editor: {
-          login: string
-        } | null
-        reactions: Reactions
-      }>
-      pageInfo: {
-        hasNextPage: boolean
-        endCursor: string
-      }
-    }
-  }
-  rateLimit: {
-    limit: number
-    cost: number
-    remaining: number
-    resetAt: string
-  }
-}

@@ -0,0 +1,22 @@
+import { Endpoints } from '@octokit/types'
+import { User } from './user.graphql.js'
+import { PullRequest } from './pulls.graphql.js'
+import { Issue } from './issues.graphql.js'
+import { DiscussionComment, IssueComment } from './comments.graphql.js'
+import { StarredRepo } from './stars.graphql.js'
+import { Commit } from './commits.graphql.js'
+
+export type Data = {
+  user: User
+  starredRepositories: StarredRepo[]
+  repos: Repo[]
+  pulls: PullRequest[]
+  issues: Issue[]
+  issueComments: IssueComment[]
+  discussionComments: DiscussionComment[]
+}
+
+export type Repo =
+  Endpoints['GET /users/{username}/repos']['response']['data'][0] & {
+    commits: Commit[]
+  }

@@ -1,91 +0,0 @@
-import { Reactions } from './types.js'
-
-export const issueCommentsQuery = `#graphql
-query IssueCommentsQuery($login: String!, $num: Int = 100, $cursor: String) {
-  user(login: $login) {
-    issueComments(first: $num, after: $cursor) {
-      totalCount
-      nodes {
-        url
-        author {
-          login
-        }
-        repository {
-          nameWithOwner
-        }
-        issue {
-          number
-          author {
-            login
-          }
-        }
-        body
-        createdAt
-        updatedAt
-        editor {
-          login
-        }
-        reactions(first: 100) {
-          totalCount
-          nodes {
-            content
-            user {
-              login
-            }
-          }
-        }
-      }
-      pageInfo {
-        hasNextPage
-        endCursor
-      }
-    }
-  }
-  rateLimit {
-    limit
-    cost
-    remaining
-    resetAt
-  }
-}
-`
-
-export type IssueCommentsQuery = {
-  user: {
-    issueComments: {
-      totalCount: number
-      nodes: Array<{
-        url: string
-        author: {
-          login: string
-        }
-        repository: {
-          nameWithOwner: string
-        }
-        issue: {
-          number: number
-          author: {
-            login: string
-          }
-        }
-        body: string
-        createdAt: string
-        updatedAt: string
-        editor: {
-          login: string
-        } | null
-        reactions: Reactions
-      }>
-      pageInfo: {
-        hasNextPage: boolean
-        endCursor: string
-      }
-    }
-  }
-  rateLimit: {
-    limit: number
-    cost: number
-    remaining: number
-    resetAt: string
-  }
-}

@@ -0,0 +1,28 @@
+query IssueTimelineQuery($owner: String!, $name: String!, $number: Int!, $num: Int = 100, $cursor: String) {
+  repository(owner: $owner, name: $name) {
+    issue(number: $number) {
+      timelineItems(first: $num, after: $cursor) {
+        totalCount
+        nodes {
+          __typename
+          ... on ClosedEvent {
+            createdAt
+            actor {
+              login
+            }
+          }
+        }
+        pageInfo {
+          hasNextPage
+          endCursor
+        }
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}

@@ -1,4 +1,6 @@
-export const issueTimelineQuery = `#graphql
+// DO NOT EDIT. This file was generated by megaera.
+
+export const IssueTimelineQuery = `#graphql
 query IssueTimelineQuery($owner: String!, $name: String!, $number: Int!, $num: Int = 100, $cursor: String) {
   repository(owner: $owner, name: $name) {
     issue(number: $number) {
@@ -26,32 +28,32 @@ query IssueTimelineQuery($owner: String!, $name: String!, $number: Int!, $num: I
     remaining
     resetAt
   }
-}
-`
+}` as string & IssueTimelineQuery
 
-export type IssueTimelineQuery = {
+export type IssueTimelineQuery = (vars: { owner: string, name: string, number: number, num?: number | null, cursor?: string | null }) => {
   repository: {
     issue: {
       timelineItems: {
         totalCount: number
         nodes: Array<{
           __typename: string
+        } & {
           createdAt: string
           actor: {
             login: string
-          }
-        }>
+          } | null
+        } | null> | null
         pageInfo: {
           hasNextPage: boolean
-          endCursor: string
+          endCursor: string | null
         }
       }
-    }
-  }
+    } | null
+  } | null
   rateLimit: {
     limit: number
     cost: number
     remaining: number
     resetAt: string
-  }
+  } | null
 }

@@ -0,0 +1,61 @@
+fragment Issue on Issue {
+  createdAt
+  closedAt
+  closed
+  author {
+    login
+  }
+  url
+  number
+  title
+  labels(first: 10) {
+    totalCount
+    nodes {
+      name
+    }
+  }
+  body
+  comments(first: 1) {
+    totalCount
+  }
+  reactions(first: 100) {
+    totalCount
+    nodes {
+      content
+      user {
+        login
+      }
+    }
+  }
+  assignees(first: 3) {
+    totalCount
+  }
+  repository {
+    nameWithOwner
+    owner {
+      login
+    }
+    name
+  }
+}
+
+query IssuesQuery($username: String!, $num: Int = 100, $cursor: String) {
+  user(login: $username) {
+    issues(first: $num, after: $cursor, filterBy: { createdBy: $username }) {
+      totalCount
+      nodes {
+        ...Issue
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}

@@ -0,0 +1,127 @@
+// DO NOT EDIT. This file was generated by megaera.
+
+const Issue = `#graphql
+fragment Issue on Issue {
+  createdAt
+  closedAt
+  closed
+  author {
+    login
+  }
+  url
+  number
+  title
+  labels(first: 10) {
+    totalCount
+    nodes {
+      name
+    }
+  }
+  body
+  comments(first: 1) {
+    totalCount
+  }
+  reactions(first: 100) {
+    totalCount
+    nodes {
+      content
+      user {
+        login
+      }
+    }
+  }
+  assignees(first: 3) {
+    totalCount
+  }
+  repository {
+    nameWithOwner
+    owner {
+      login
+    }
+    name
+  }
+}`
+
+export type Issue = {
+  createdAt: string
+  closedAt: string | null
+  closed: boolean
+  author: {
+    login: string
+  } | null
+  url: string
+  number: number
+  title: string
+  labels: {
+    totalCount: number
+    nodes: Array<{
+      name: string
+    }> | null
+  } | null
+  body: string
+  comments: {
+    totalCount: number
+  }
+  reactions: {
+    totalCount: number
+    nodes: Array<{
+      content: 'CONFUSED' | 'EYES' | 'HEART' | 'HOORAY' | 'LAUGH' | 'ROCKET' | 'THUMBS_DOWN' | 'THUMBS_UP'
+      user: {
+        login: string
+      } | null
+    }> | null
+  }
+  assignees: {
+    totalCount: number
+  }
+  repository: {
+    nameWithOwner: string
+    owner: {
+      login: string
+    }
+    name: string
+  }
+}
+
+
+export const IssuesQuery = `#graphql
+${Issue}
+query IssuesQuery($username: String!, $num: Int = 100, $cursor: String) {
+  user(login: $username) {
+    issues(first: $num, after: $cursor, filterBy: {createdBy: $username}) {
+      totalCount
+      nodes {
+        ...Issue
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}` as string & IssuesQuery
+
+export type IssuesQuery = (vars: { username: string, num?: number | null, cursor?: string | null }) => {
+  user: {
+    issues: {
+      totalCount: number
+      nodes: Array<{} & Issue> | null
+      pageInfo: {
+        hasNextPage: boolean
+        endCursor: string | null
+      }
+    }
+  } | null
+  rateLimit: {
+    limit: number
+    cost: number
+    remaining: number
+    resetAt: string
+  } | null
+}

@@ -1,112 +0,0 @@
-import { Extra, Reactions } from './types.js'
-
-export const issuesQuery = `#graphql
-query IssuesQuery($username: String!, $num: Int = 100, $cursor: String) {
-  user(login: $username) {
-    issues(first: $num, after: $cursor, filterBy: { createdBy: $username }) {
-      totalCount
-      nodes {
-        createdAt
-        closedAt
-        closed
-        author {
-          login
-        }
-        url
-        number
-        title
-        labels(first: 10) {
-          totalCount
-          nodes {
-            name
-          }
-        }
-        body
-        comments(first: 1) {
-          totalCount
-        }
-        reactions(first: 100) {
-          totalCount
-          nodes {
-            content
-            user {
-              login
-            }
-          }
-        }
-        assignees(first: 3) {
-          totalCount
-        }
-        repository {
-          nameWithOwner
-          owner {
-            login
-          }
-          name
-        }
-      }
-      pageInfo {
-        hasNextPage
-        endCursor
-      }
-    }
-  }
-  rateLimit {
-    limit
-    cost
-    remaining
-    resetAt
-  }
-}
-`
-
-export type IssuesQuery = {
-  user: {
-    issues: {
-      totalCount: number
-      nodes: Array<{
-        createdAt: string
-        closedAt: string
-        closed: boolean
-        closedBy: Extra<string>
-        author: {
-          login: string
-        }
-        url: string
-        number: number
-        title: string
-        labels: {
-          totalCount: number
-          nodes: Array<{
-            name: string
-          }>
-        }
-        body: string
-        comments: {
-          totalCount: number
-        }
-        reactions: Reactions
-        assignees: {
-          totalCount: number
-        }
-        repository: {
-          nameWithOwner: string
-          owner: {
-            login: string
-          }
-          name: string
-        }
-      }>
-      pageInfo: {
-        hasNextPage: boolean
-        endCursor: string
-      }
-    }
-  }
-  rateLimit: {
-    limit: number
-    cost: number
-    remaining: number
-    resetAt: string
-  }
-}

@@ -0,0 +1,91 @@
+fragment PullRequest on PullRequest {
+  createdAt
+  url
+  number
+  title
+  body
+  closed
+  merged
+  mergedAt
+  mergedBy {
+    login
+  }
+  repository {
+    nameWithOwner
+    owner {
+      login
+    }
+    name
+    languages(first: 10, orderBy: {field: SIZE, direction: DESC}) {
+      totalCount
+      nodes {
+        name
+      }
+    }
+  }
+  participants(first: 20) {
+    totalCount
+    nodes {
+      login
+    }
+  }
+  lastCommit: commits(last: 1) {
+    nodes {
+      commit {
+        checkSuites(first: 20) {
+          totalCount
+          nodes {
+            app {
+              name
+            }
+            workflowRun {
+              workflow {
+                name
+              }
+            }
+            lastCheckRun: checkRuns(last: 1) {
+              totalCount
+              nodes {
+                name
+                conclusion
+                status
+                startedAt
+                completedAt
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  reactions(first: 100) {
+    totalCount
+    nodes {
+      content
+      user {
+        login
+      }
+    }
+  }
+}
+
+query PullsQuery($username: String!, $num: Int = 100, $cursor: String) {
+  user(login: $username) {
+    pullRequests(first: $num, after: $cursor) {
+      totalCount
+      nodes {
+        ...PullRequest
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}

@@ -0,0 +1,187 @@
+// DO NOT EDIT. This file was generated by megaera.
+
+const PullRequest = `#graphql
+fragment PullRequest on PullRequest {
+  createdAt
+  url
+  number
+  title
+  body
+  closed
+  merged
+  mergedAt
+  mergedBy {
+    login
+  }
+  repository {
+    nameWithOwner
+    owner {
+      login
+    }
+    name
+    languages(first: 10, orderBy: {field: SIZE, direction: DESC}) {
+      totalCount
+      nodes {
+        name
+      }
+    }
+  }
+  participants(first: 20) {
+    totalCount
+    nodes {
+      login
+    }
+  }
+  lastCommit: commits(last: 1) {
+    nodes {
+      commit {
+        checkSuites(first: 20) {
+          totalCount
+          nodes {
+            app {
+              name
+            }
+            workflowRun {
+              workflow {
+                name
+              }
+            }
+            lastCheckRun: checkRuns(last: 1) {
+              totalCount
+              nodes {
+                name
+                conclusion
+                status
+                startedAt
+                completedAt
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  reactions(first: 100) {
+    totalCount
+    nodes {
+      content
+      user {
+        login
+      }
+    }
+  }
+}`
+
+export type PullRequest = {
+  createdAt: string
+  url: string
+  number: number
+  title: string
+  body: string
+  closed: boolean
+  merged: boolean
+  mergedAt: string | null
+  mergedBy: {
+    login: string
+  } | null
+  repository: {
+    nameWithOwner: string
+    owner: {
+      login: string
+    }
+    name: string
+    languages: {
+      totalCount: number
+      nodes: Array<{
+        name: string
+      }> | null
+    } | null
+  }
+  participants: {
+    totalCount: number
+    nodes: Array<{
+      login: string
+    }> | null
+  }
+  lastCommit: {
+    nodes: Array<{
+      commit: {
+        checkSuites: {
+          totalCount: number
+          nodes: Array<{
+            app: {
+              name: string
+            } | null
+            workflowRun: {
+              workflow: {
+                name: string
+              }
+            } | null
+            lastCheckRun: {
+              totalCount: number
+              nodes: Array<{
+                name: string
+                conclusion: 'ACTION_REQUIRED' | 'CANCELLED' | 'FAILURE' | 'NEUTRAL' | 'SKIPPED' | 'STALE' | 'STARTUP_FAILURE' | 'SUCCESS' | 'TIMED_OUT'
+                status: 'COMPLETED' | 'IN_PROGRESS' | 'PENDING' | 'QUEUED' | 'REQUESTED' | 'WAITING'
+                startedAt: string | null
+                completedAt: string | null
+              }> | null
+            } | null
+          }> | null
+        } | null
+      }
+    }> | null
+  }
+  reactions: {
+    totalCount: number
+    nodes: Array<{
+      content: 'CONFUSED' | 'EYES' | 'HEART' | 'HOORAY' | 'LAUGH' | 'ROCKET' | 'THUMBS_DOWN' | 'THUMBS_UP'
+      user: {
+        login: string
+      } | null
+    }> | null
+  }
+}
+
+
+export const PullsQuery = `#graphql
+${PullRequest}
+query PullsQuery($username: String!, $num: Int = 100, $cursor: String) {
+  user(login: $username) {
+    pullRequests(first: $num, after: $cursor) {
+      totalCount
+      nodes {
+        ...PullRequest
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}` as string & PullsQuery
+
+export type PullsQuery = (vars: { username: string, num?: number | null, cursor?: string | null }) => {
+  user: {
+    pullRequests: {
+      totalCount: number
+      nodes: Array<{} & PullRequest> | null
+      pageInfo: {
+        hasNextPage: boolean
+        endCursor: string | null
+      }
+    }
+  } | null
+  rateLimit: {
+    limit: number
+    cost: number
+    remaining: number
+    resetAt: string
+  } | null
+}

@@ -1,186 +0,0 @@
-import { Reactions } from './types.js'
-
-export const pullsQuery = `#graphql
-query PullsQuery($username: String!, $num: Int = 100, $cursor: String) {
-  user(login: $username) {
-    pullRequests(first: $num, after: $cursor) {
-      totalCount
-      nodes {
-        createdAt
-        url
-        number
-        title
-        body
-        closed
-        merged
-        mergedAt
-        mergedBy {
-          login
-        }
-        repository {
-          nameWithOwner
-          owner {
-            login
-          }
-          name
-          languages(first: 10, orderBy: {field: SIZE, direction: DESC}) {
-            totalCount
-            nodes {
-              name
-            }
-          }
-        }
-        participants(first: 20) {
-          totalCount
-          nodes {
-            login
-          }
-        }
-        lastCommit: commits(last: 1) {
-          nodes {
-            commit {
-              checkSuites(first: 20) {
-                totalCount
-                nodes {
-                  app {
-                    name
-                  }
-                  workflowRun {
-                    workflow {
-                      name
-                    }
-                  }
-                  lastCheckRun: checkRuns(last: 1) {
-                    totalCount
-                    nodes {
-                      name
-                      conclusion
-                      status
-                      startedAt
-                      completedAt
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        reactions(first: 100) {
-          totalCount
-          nodes {
-            content
-            user {
-              login
-            }
-          }
-        }
-      }
-      pageInfo {
-        hasNextPage
-        endCursor
-      }
-    }
-  }
-  rateLimit {
-    limit
-    cost
-    remaining
-    resetAt
-  }
-}
-`
-
-export type PullsQuery = {
-  user: {
-    pullRequests: {
-      totalCount: number
-      nodes: Array<{
-        createdAt: string
-        url: string
-        number: number
-        title: string
-        body: string
-        closed: boolean
-        merged: boolean
-        mergedAt: string
-        mergedBy?: {
-          login: string
-        }
-        repository: {
-          nameWithOwner: string
-          owner: {
-            login: string
-          }
-          name: string
-          languages: {
-            totalCount: number
-            nodes: Array<{
-              name: string
-            }>
-          }
-        }
-        participants: {
-          totalCount: number
-          nodes: Array<{
-            login: string
-          }>
-        }
-        lastCommit: {
-          nodes: Array<{
-            commit: {
-              checkSuites: {
-                totalCount: number
-                nodes: Array<{
-                  app: {
-                    name: string
-                  }
-                  workflowRun: {
-                    workflow: {
-                      name: string
-                    }
-                  }
-                  lastCheckRun: {
-                    totalCount: number
-                    nodes: Array<{
-                      name: string
-                      conclusion:
-                        | 'ACTION_REQUIRED'
-                        | 'TIMED_OUT'
-                        | 'CANCELLED'
-                        | 'FAILURE'
-                        | 'SUCCESS'
-                        | 'NEUTRAL'
-                        | 'SKIPPED'
-                        | 'STARTUP_FAILURE'
-                        | 'STALE'
-                      status:
-                        | 'COMPLETED'
-                        | 'IN_PROGRESS'
-                        | 'PENDING'
-                        | 'QUEUED'
-                        | 'REQUESTED'
-                        | 'WAITING'
-                      startedAt: string
-                      completedAt: string
-                    }>
-                  }
-                }>
-              }
-            }
-          }>
-        }
-        reactions: Reactions
-      }>
-    }
-    pageInfo: {
-      hasNextPage: boolean
-      endCursor: string
-    }
-  }
-  rateLimit: {
-    limit: number
-    cost: number
-    remaining: number
-    resetAt: string
-  }
-}

@@ -0,0 +1,43 @@
+fragment StarredRepo on Repository {
+  nameWithOwner
+  description
+  stargazers {
+    totalCount
+  }
+  languages(first: 10, orderBy: {field: SIZE, direction: DESC}) {
+    totalCount
+    edges {
+      size
+      node {
+        name
+      }
+    }
+  }
+  licenseInfo {
+    name
+    nickname
+  }
+}
+
+query StarsQuery($login: String!, $num: Int = 100, $cursor: String) {
+  user(login: $login) {
+    starredRepositories(first: $num, after: $cursor) {
+      totalCount
+      isOverLimit
+      nodes {
+        ...StarredRepo
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}
+

@@ -0,0 +1,89 @@
+// DO NOT EDIT. This file was generated by megaera.
+
+const StarredRepo = `#graphql
+fragment StarredRepo on Repository {
+  nameWithOwner
+  description
+  stargazers {
+    totalCount
+  }
+  languages(first: 10, orderBy: {field: SIZE, direction: DESC}) {
+    totalCount
+    edges {
+      size
+      node {
+        name
+      }
+    }
+  }
+  licenseInfo {
+    name
+    nickname
+  }
+}`
+
+export type StarredRepo = {
+  nameWithOwner: string
+  description: string | null
+  stargazers: {
+    totalCount: number
+  }
+  languages: {
+    totalCount: number
+    edges: Array<{
+      size: number
+      node: {
+        name: string
+      }
+    }> | null
+  } | null
+  licenseInfo: {
+    name: string
+    nickname: string | null
+  } | null
+}
+
+
+export const StarsQuery = `#graphql
+${StarredRepo}
+query StarsQuery($login: String!, $num: Int = 100, $cursor: String) {
+  user(login: $login) {
+    starredRepositories(first: $num, after: $cursor) {
+      totalCount
+      isOverLimit
+      nodes {
+        ...StarredRepo
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+  rateLimit {
+    limit
+    cost
+    remaining
+    resetAt
+  }
+}` as string & StarsQuery
+
+export type StarsQuery = (vars: { login: string, num?: number | null, cursor?: string | null }) => {
+  user: {
+    starredRepositories: {
+      totalCount: number
+      isOverLimit: boolean
+      nodes: Array<{} & StarredRepo> | null
+      pageInfo: {
+        hasNextPage: boolean
+        endCursor: string | null
+      }
+    }
+  } | null
+  rateLimit: {
+    limit: number
+    cost: number
+    remaining: number
+    resetAt: string
+  } | null
+}

@@ -1,79 +0,0 @@
-export const starsQuery = `#graphql
-query StarsQuery($login: String!, $num: Int = 100, $cursor: String) {
-  user(login: $login) {
-    starredRepositories(first: $num, after: $cursor) {
-      totalCount
-      isOverLimit
-      nodes {
-        nameWithOwner
-        description
-        stargazers {
-          totalCount
-        }
-        languages(first: 10, orderBy: {field: SIZE, direction: DESC}) {
-          totalCount
-          edges {
-            size
-            node {
-              name
-            }
-          }
-        }
-        licenseInfo {
-          name
-          nickname
-        }
-      }
-      pageInfo {
-        hasNextPage
-        endCursor
-      }
-    }
-  }
-  rateLimit {
-    limit
-    cost
-    remaining
-    resetAt
-  }
-}
-`
-
-export type StarsQuery = {
-  user: {
-    starredRepositories: {
-      totalCount: number
-      isOverLimit: boolean
-      nodes: Array<{
-        nameWithOwner: string
-        description: string
-        stargazers: {
-          totalCount: number
-        }
-        languages: {
-          totalCount: number
-          edges: Array<{
-            size: number
-            node: {
-              name: string
-            }
-          }>
-        }
-        licenseInfo: {
-          name: string
-          nickname: string
-        }
-      }>
-      pageInfo: {
-        hasNextPage: boolean
-        endCursor: string
-      }
-    }
-  }
-  rateLimit: {
-    limit: number
-    cost: number
-    remaining: number
-    resetAt: string
-  }
-}