Refactor to use @imports

lib/collective/configure.js

@@ -1,7 +1,6 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
- * @typedef {import('../util/types.js').GraphQl} GraphQl
- * @typedef {import('@octokit/graphql').GraphqlResponseError<unknown>} GraphqlResponseError
+ * @import {graphql as GraphQl, GraphqlResponseError} from '@octokit/graphql'
+ * @import {Context} from '../util/types.js'
  */
 
 import {graphql} from '@octokit/graphql'
@@ -59,7 +58,7 @@ function wrap(action) {
      * @returns
      */
     function retry(error) {
-      const exception = /** @type {GraphqlResponseError} */ (error)
+      const exception = /** @type {GraphqlResponseError<unknown>} */ (error)
       console.log('wrap err:', exception)
       console.log('to do:', 'does `status` really not exist?')
       const after =

lib/collective/labels.js

@@ -1,7 +1,6 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
- * @typedef {import('../util/types.js').Label} Label
- * @typedef {import('../util/types.js').Labels} Labels
+ * @import {ScaleLinear} from 'd3-scale'
+ * @import {Context, Labels, Label} from '../util/types.js'
  */
 
 /**
@@ -103,7 +102,7 @@ export async function labels(context) {
      */
     function addAll(group) {
       const {labels, color} = group
-      /** @type {import('d3-scale').ScaleLinear<number, string, unknown> | undefined} */
+      /** @type {ScaleLinear<number, string, unknown> | undefined} */
       let scale
 
       if (typeof color !== 'string' && color.from && color.to) {

lib/collective/orgs.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
+ * @import {Context} from '../util/types.js'
  */
 
 import {promisify} from 'node:util'

lib/org/people.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
+ * @import {Context} from '../util/types.js'
  */
 
 import chalk from 'chalk'

lib/org/repos.js

@@ -1,6 +1,5 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
- * @typedef {import('../util/types.js').Repo} Repo
+ * @import {Context, Repo} from '../util/types.js'
  */
 
 import {promisify} from 'node:util'

lib/org/teams.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
+ * @import {Context} from '../util/types.js'
  */
 
 import {promisify} from 'node:util'

lib/repo/collaborators.js

@@ -1,6 +1,5 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
- * @typedef {import('../util/types.js').Repo} Repo
+ * @import {Context, Repo} from '../util/types.js'
  */
 
 import chalk from 'chalk'

lib/repo/labels.js

@@ -1,7 +1,5 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
- * @typedef {import('../util/types.js').Label} Label
- * @typedef {import('../util/types.js').Repo} Repo
+ * @import {Context, Label, Repo} from '../util/types.js'
  */
 
 import assert from 'node:assert/strict'

lib/team/create.js

@@ -1,7 +1,5 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
- * @typedef {import('../util/types.js').GithubTeam} GithubTeam
- * @typedef {import('../util/types.js').TeamInfo} TeamInfo
+ * @import {Context, GithubTeam, TeamInfo} from '../util/types.js'
  */
 
 import chalk from 'chalk'

lib/team/members.js

@@ -1,7 +1,5 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
- * @typedef {import('../util/types.js').GithubTeam} GithubTeam
- * @typedef {import('../util/types.js').TeamInfo} TeamInfo
+ * @import {Context, GithubTeam, TeamInfo} from '../util/types.js'
  */
 
 import difference from 'arr-diff'

lib/team/repo.js

@@ -1,7 +1,5 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
- * @typedef {import('../util/types.js').GithubTeam} GithubTeam
- * @typedef {import('../util/types.js').TeamInfo} TeamInfo
+ * @import {Context, GithubTeam, TeamInfo} from '../util/types.js'
  */
 
 import assert from 'node:assert/strict'

lib/team/request.js

@@ -1,7 +1,5 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
- * @typedef {import('../util/types.js').GithubTeam} GithubTeam
- * @typedef {import('../util/types.js').TeamInfo} TeamInfo
+ * @import {Context, GithubTeam, TeamInfo} from '../util/types.js'
  */
 
 // Request a team.

lib/team/update.js

@@ -1,7 +1,5 @@
 /**
- * @typedef {import('../util/types.js').Context} Context
- * @typedef {import('../util/types.js').GithubTeam} GithubTeam
- * @typedef {import('../util/types.js').TeamInfo} TeamInfo
+ * @import {Context, GithubTeam, TeamInfo} from '../util/types.js'
  */
 
 import chalk from 'chalk'

lib/util/find.js

@@ -1,6 +1,5 @@
 /**
- * @typedef {import('./types.js').Context} Context
- * @typedef {import('./types.js').Role} Role
+ * @import {Context, Role} from './types.js'
  */
 
 import assert from 'node:assert/strict'

lib/util/types.js

@@ -1,7 +1,7 @@
 /**
- * @typedef {import('@octokit/graphql').graphql} GraphQl
- * @typedef {import('@octokit/plugin-paginate-rest').PaginateInterface} Paginate
- * @typedef {import('@octokit/types').RequestInterface<object>} Request
+ * @import {graphql as GraphQl} from '@octokit/graphql'
+ * @import {PaginateInterface} from '@octokit/plugin-paginate-rest'
+ * @import {RequestInterface} from '@octokit/types'
  */
 
 /**
@@ -19,9 +19,9 @@
  *   Name of the collective (example: `unified`).
  * @property {GraphQl} ghQuery
  *   Send a request to the GitHub GQL API.
- * @property {Request} ghRequest
+ * @property {RequestInterface} ghRequest
  *   Send a request to the GitHub REST API.
- * @property {Paginate} ghPaginate
+ * @property {PaginateInterface} ghPaginate
  *   Send a paginate request to the GitHub REST API.
  * @property {string} ghToken
  *   GH token.