lint , type , fix errors

Author: gregsadetsky

.eslintrc.json

@@ -1,5 +1,6 @@
 {
   "extends": ["oclif", "oclif-typescript", "prettier"],
+  "ignorePatterns": ["tmp/**"],
   "rules": {
     "unicorn/better-regex": "off",
     "max-params": "off",

src/commands/apikeys/list.ts

@@ -3,6 +3,17 @@ import {Command, Flags} from '@oclif/core'
 import {getDisco} from '../../config.js'
 import {request} from '../../auth-request.js'
 
+export interface ApiKeyItem {
+  name: string
+  publicKey: string
+  privateKey: string
+  lastUsed: null | string
+}
+
+export interface ApiKeysResponse {
+  apiKeys: ApiKeyItem[]
+}
+
 export default class ApikeysList extends Command {
   static override description = 'list all api keys'
 
@@ -18,7 +29,7 @@ export default class ApikeysList extends Command {
 
     const url = `https://${discoConfig.host}/api/api-keys`
     const res = await request({method: 'GET', url, discoConfig})
-    const data = (await res.json()) as any
+    const data = (await res.json()) as ApiKeysResponse
     this.log('Public                           Private                          Name')
     for (const key of data.apiKeys) {
       const lastUsed = key.lastUsed === null ? 'never' : key.lastUsed

src/commands/deploy.ts

@@ -9,6 +9,12 @@ interface DeployRequest {
   discoFile?: string
 }
 
+export interface DeployResponse {
+  deployment: {
+    number: number
+  }
+}
+
 export default class Deploy extends Command {
   static override description = 'deploy a project, a specific commit or a disco.json file'
 
@@ -41,7 +47,7 @@ export default class Deploy extends Command {
     }
 
     const res = await request({method: 'POST', url, body: reqBody, discoConfig, expectedStatuses: [201]})
-    const data = (await res.json()) as any
+    const data = (await res.json()) as DeployResponse
 
     const deploymentUrl = `https://${discoConfig.host}/api/projects/${flags.project}/deployments/${data.deployment.number}/output`
     readEventSource(deploymentUrl, discoConfig, {

src/commands/deploy/list.ts

@@ -3,6 +3,17 @@ import {Command, Flags} from '@oclif/core'
 import {getDisco} from '../../config.js'
 import {request} from '../../auth-request.js'
 
+export interface DeploymentItem {
+  number: number
+  created: string
+  status: string
+  commitHash: null | string
+}
+
+export interface DeploymentsResponse {
+  deployments: DeploymentItem[]
+}
+
 export default class DeployList extends Command {
   static override description = 'list the deployments for a project'
 
@@ -19,9 +30,9 @@ export default class DeployList extends Command {
     const discoConfig = getDisco(flags.disco || null)
     const url = `https://${discoConfig.host}/api/projects/${flags.project}/deployments`
     const res = await request({method: 'GET', url, discoConfig})
-    const data = (await res.json()) as any
+    const data = (await res.json()) as DeploymentsResponse
     for (const deployment of data.deployments) {
-      console.log(`${deployment.created}\t${deployment.number}\t${deployment.status}`)
+      this.log(`${deployment.created}\t${deployment.number}\t${deployment.status}`)
     }
   }
 }

src/commands/domains/list.ts

@@ -3,6 +3,15 @@ import {Command, Flags} from '@oclif/core'
 import {getDisco} from '../../config.js'
 import {request} from '../../auth-request.js'
 
+export interface DomainItem {
+  id: string
+  name: string
+}
+
+export interface DomainsResponse {
+  domains: DomainItem[]
+}
+
 export default class DomainsList extends Command {
   static override description = 'list the domains'
 
@@ -18,7 +27,7 @@ export default class DomainsList extends Command {
     const discoConfig = getDisco(flags.disco || null)
     const url = `https://${discoConfig.host}/api/projects/${flags.project}/domains`
     const res = await request({method: 'GET', url, discoConfig, expectedStatuses: [200]})
-    const data = (await res.json()) as any
+    const data = (await res.json()) as DomainsResponse
     for (const domain of data.domains) {
       this.log(domain.name)
     }

src/commands/env/get.ts

@@ -36,7 +36,7 @@ export default class EnvGet extends Command {
       return
     }
 
-    const data: EnvVarResponse = (await res.json()) as any
+    const data = (await res.json()) as EnvVarResponse
     this.log(data.envVariable.value)
   }
 }

src/commands/env/list.ts

@@ -3,6 +3,15 @@ import {Command, Flags} from '@oclif/core'
 import {getDisco} from '../../config.js'
 import {request} from '../../auth-request.js'
 
+export interface EnvVariableItem {
+  name: string
+  value: string
+}
+
+export interface EnvVariablesResponse {
+  envVariables: EnvVariableItem[]
+}
+
 export default class EnvList extends Command {
   static override description = 'list the env vars'
 
@@ -24,7 +33,7 @@ export default class EnvList extends Command {
       return
     }
 
-    const data = (await res.json()) as any
+    const data = (await res.json()) as EnvVariablesResponse
     for (const variable of data.envVariables) {
       this.log(`${variable.name}=${variable.value}`)
     }

src/commands/env/remove.ts

@@ -3,6 +3,12 @@ import {Args, Command, Flags} from '@oclif/core'
 import {getDisco} from '../../config.js'
 import {request, readEventSource} from '../../auth-request.js'
 
+export interface EnvRemoveResponse {
+  deployment: {
+    number: number
+  } | null
+}
+
 export default class EnvRemove extends Command {
   static override args = {
     envVar: Args.string({description: 'variable to remove'}),
@@ -24,7 +30,7 @@ export default class EnvRemove extends Command {
     this.log(`Removing env variable for ${flags.project}: ${args.envVar}`)
     const url = `https://${discoConfig.host}/api/projects/${flags.project}/env/${args.envVar}`
     const res = await request({method: 'DELETE', url, discoConfig})
-    const data = (await res.json()) as any
+    const data = (await res.json()) as EnvRemoveResponse
     if (data.deployment) {
       // stream deployment
       const deploymentUrl = `https://${discoConfig.host}/api/projects/${flags.project}/deployments/${data.deployment.number}/output`

src/commands/env/set.ts

@@ -7,6 +7,12 @@ interface EnvVarRequestBody {
   envVariables: {name: string; value: string}[]
 }
 
+export interface EnvSetResponse {
+  deployment: {
+    number: number
+  } | null
+}
+
 export default class EnvSet extends Command {
   static override args = {
     variables: Args.string({description: 'variables to set'}),
@@ -49,14 +55,16 @@ export default class EnvSet extends Command {
     }
 
     const res = await request({method: 'POST', url, discoConfig, body})
-    const data = (await res.json()) as any
-    // stream deployment
-    const deploymentUrl = `https://${discoConfig.host}/api/projects/${flags.project}/deployments/${data.deployment.number}/output`
-    readEventSource(deploymentUrl, discoConfig, {
-      onMessage(event: MessageEvent) {
-        const output = JSON.parse(event.data)
-        process.stdout.write(output.text)
-      },
-    })
+    const data = (await res.json()) as EnvSetResponse
+    if (data.deployment) {
+      // stream deployment
+      const deploymentUrl = `https://${discoConfig.host}/api/projects/${flags.project}/deployments/${data.deployment.number}/output`
+      readEventSource(deploymentUrl, discoConfig, {
+        onMessage(event: MessageEvent) {
+          const output = JSON.parse(event.data)
+          process.stdout.write(output.text)
+        },
+      })
+    }
   }
 }

src/commands/github/apps/add.ts

@@ -1,8 +1,17 @@
 import {Command, Flags} from '@oclif/core'
-import {getDisco} from '../../../config.js'
-import {request} from '../../../auth-request.js'
-import open from 'open'
 import {input} from '@inquirer/prompts'
+import open from 'open'
+
+import {request} from '../../../auth-request.js'
+import {getDisco} from '../../../config.js'
+
+export interface GithubAppsCreateResponse {
+  pendingApp: {
+    id: string
+    expires: string
+    url: string
+  }
+}
 
 export default class GithubAppsAdd extends Command {
   static description = 'add a Github app'
@@ -23,7 +32,7 @@ export default class GithubAppsAdd extends Command {
     }
     const url = `https://${discoConfig.host}/api/github-apps/create`
     const res = await request({method: 'POST', url, discoConfig, body, expectedStatuses: [201]})
-    const respBody = (await res.json()) as any
+    const respBody = (await res.json()) as GithubAppsCreateResponse
 
     // thanks @robsimmons for this excellent suggestion!
     this.log('')