refactor: convert remaining JavaScript test files to TypeScript

This changeset converts all remaining JavaScript tests to TypeScript.
It's sort of a hack job; I used a bulk converter for most of it, then
hand-converted the rest. There's varying degrees of "hey, he did a nice
job in this file" and "hey, he did a terrible job in this file," but on
the whole this is an improvement.

I also updated all of the import paths in tests from importing
transpiled (`dist/`) code to untranspiled (`src/`) code. Ergonomically
this is better--it's confusing to work on tests that aren't necessarily
running code that reflects your edits--but really, I was forced into
this by spooky conflicts between transpiled types and untranspiled
types.

Author: ndhoule

package-lock.json

@@ -163,6 +163,7 @@
     "@sindresorhus/slugify": "2.2.1",
     "@tsconfig/node18": "^18.2.4",
     "@tsconfig/recommended": "^1.0.8",
+    "@types/backoff": "^2.5.5",
     "@types/content-type": "1.1.8",
     "@types/debug": "4.1.12",
     "@types/envinfo": "7.8.4",
@@ -206,6 +207,7 @@
     "strip-ansi": "7.1.0",
     "temp-dir": "3.0.0",
     "tree-kill": "1.2.2",
+    "tsx": "^4.19.3",
     "typescript": "5.8.3",
     "typescript-eslint": "^8.26.0",
     "verdaccio": "6.1.2",

package.json

@@ -17,6 +17,7 @@ export const envGet = async (name: string, options: OptionValues, command: BaseC
   const { siteInfo } = cachedConfig
   const env = await getEnvelopeEnv({ api, context, env: cachedConfig.env, key: name, scope, siteInfo })
 
+  // @ts-expect-error FIXME(ndhoule)
   const { value } = env[name] || {}
 
   // Return json response for piping commands

src/commands/env/env-get.ts

@@ -1,21 +1,17 @@
-/**
- * @typedef CompletionItem
- * @type import('tabtab').CompletionItem
- */
-/**
- *
- * @param {import('tabtab').TabtabEnv} env
- * @param {Record<string, CompletionItem & {options: CompletionItem[]}>} program
- * @returns {CompletionItem[]|void}
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'env' implicitly has an 'any' type.
-const getAutocompletion = function (env, program) {
+import type { CompletionItem } from '@pnpm/tabtab'
+
+const getAutocompletion = function (
+  env: { complete: boolean; lastPartial: string; line: string; words: number },
+  program: Record<
+    string,
+    CompletionItem & { description?: string | undefined; name?: string | undefined; options: CompletionItem[] }
+  >,
+): CompletionItem[] | undefined {
   if (!env.complete) {
     return
   }
   // means that we are currently in the first command (the root command)
   if (env.words === 1) {
-    // @ts-expect-error TS(2345) FIXME: Argument of type '({ description, name }: { descri... Remove this comment to see the full error message
     const rootCommands = Object.values(program).map(({ description, name }) => ({ name, description }))
 
     // suggest all commands
@@ -26,20 +22,18 @@ const getAutocompletion = function (env, program) {
 
     // $ netlify add<cursor>
     // we can now check if a command starts with the last partial
-    // @ts-expect-error TS(2769) FIXME: No overload matches this call.
     const autocomplete = rootCommands.filter(({ name }) => name.startsWith(env.lastPartial))
     return autocomplete
   }
 
   const [, command, ...args] = env.line.split(' ')
 
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   if (program[command]) {
     const usedArgs = new Set(args)
-    // @ts-expect-error TS(7031) FIXME: Binding element 'name' implicitly has an 'any' typ... Remove this comment to see the full error message
     const unusedOptions = program[command].options.filter(({ name }) => !usedArgs.has(name))
 
     if (env.lastPartial.length !== 0) {
-      // @ts-expect-error TS(7031) FIXME: Binding element 'name' implicitly has an 'any' typ... Remove this comment to see the full error message
       return unusedOptions.filter(({ name }) => name.startsWith(env.lastPartial))
     }
 

src/lib/completion/get-autocompletion.ts

@@ -19,7 +19,7 @@ import { BlobsContextWithEdgeAccess } from '../blobs/blobs.js'
 import { getGeoLocation } from '../geo-location.js'
 import { getPathInProject } from '../settings.js'
 import { type Spinner, startSpinner, stopSpinner } from '../spinner.js'
-import type { CLIState, ServerSettings, SiteInfo } from '../../utils/types.js'
+import type { CLIState, ServerSettings } from '../../utils/types.js'
 
 import { getBootstrapURL } from './bootstrap.js'
 import { DIST_IMPORT_MAP_PATH, EDGE_FUNCTIONS_SERVE_FOLDER } from './consts.js'
@@ -51,13 +51,16 @@ const getDownloadUpdateFunctions = () => {
   }
 }
 
-export const handleProxyRequest = (req: ExtendedIncomingMessage, proxyReq: ClientRequest) => {
+export const handleProxyRequest = (req: ExtendedIncomingMessage, proxyReq: ClientRequest): void => {
   Object.entries(req[headersSymbol]).forEach(([header, value]) => {
     proxyReq.setHeader(header, value)
   })
 }
 
-export const createSiteInfoHeader = (siteInfo: SiteInfo, localURL: string) => {
+export const createSiteInfoHeader = (
+  siteInfo: { id?: string | undefined; name?: string | undefined; url?: string | undefined },
+  localURL?: string,
+): string => {
   const { id, name, url } = siteInfo
   const site = { id, name, url: localURL ?? url }
   const siteString = JSON.stringify(site)

src/lib/edge-functions/proxy.ts

@@ -8,21 +8,27 @@ const CACHE_TTL = 8.64e7
 // 10 seconds
 const REQUEST_TIMEOUT = 1e4
 
-/**
- * @typedef GeoLocation
- * @type {object}
- * @property {string} city
- * @property {object} country
- * @property {string} country.code
- * @property {string} country.name
- * @property {object} subdivision
- * @property {string} subdivision.code
- * @property {string} subdivision.name
- * @property {number} longitude
- * @property {number} latitude
- * @property {string} timezone
- */
-export const mockLocation = {
+export type Geolocation = {
+  city: string
+  country: {
+    code: string
+    name: string
+  }
+  subdivision: {
+    code: string
+    name: string
+  }
+  longitude: number
+  latitude: number
+  timezone: string
+}
+
+interface State {
+  get(key: string): unknown
+  set(key: string, value: unknown): void
+}
+
+export const mockLocation: Geolocation = {
   city: 'San Francisco',
   country: { code: 'US', name: 'United States' },
   subdivision: { code: 'CA', name: 'California' },
@@ -32,19 +38,21 @@ export const mockLocation = {
 }
 
 /**
- * Returns geolocation data from a remote API, the local cache, or a mock
- * location, depending on the mode selected.
- *
- * @param {object} params
- * @param {"cache"|"update"|"mock"} params.mode
- * @param {string} params.geoCountry
- * @param {boolean} params.offline
- * @param {import('../utils/cli-state.js').default} params.state
- * @returns {Promise<GeoLocation>}
+ * Returns geolocation data from a remote API, the local cache, or a mock location, depending on the
+ * specified mode.
  */
-// @ts-expect-error TS(7031) FIXME: Binding element 'geoCountry' implicitly has an 'an... Remove this comment to see the full error message
-export const getGeoLocation = async ({ geoCountry, mode, offline, state }) => {
-  const cacheObject = state.get(STATE_GEO_PROPERTY)
+export const getGeoLocation = async ({
+  geoCountry,
+  mode,
+  offline = false,
+  state,
+}: {
+  mode: 'cache' | 'update' | 'mock'
+  geoCountry?: string | undefined
+  offline?: boolean | undefined
+  state: State
+}): Promise<Geolocation> => {
+  const cacheObject = state.get(STATE_GEO_PROPERTY) as { data: Geolocation; timestamp: number } | undefined
 
   // If `--country` was used, we also set `--mode=mock`.
   if (geoCountry) {
@@ -103,11 +111,9 @@ export const getGeoLocation = async ({ geoCountry, mode, offline, state }) => {
 }
 
 /**
- * Returns geolocation data from a remote API
- *
- * @returns {Promise<GeoLocation>}
+ * Returns geolocation data from a remote API.
  */
-const getGeoLocationFromAPI = async () => {
+const getGeoLocationFromAPI = async (): Promise<Geolocation> => {
   const res = await fetch(API_URL, {
     method: 'GET',
     signal: AbortSignal.timeout(REQUEST_TIMEOUT),

src/lib/geo-location.ts

@@ -31,8 +31,23 @@ const DEFAULT_HTTPS_PORT = 443
 // 50 seconds
 const AGENT_PORT_TIMEOUT = 50
 
-// @ts-expect-error TS(7031) FIXME: Binding element 'certificateFile' implicitly has a... Remove this comment to see the full error message
-export const tryGetAgent = async ({ certificateFile, httpProxy }) => {
+export const tryGetAgent = async ({
+  certificateFile,
+  httpProxy,
+}: {
+  httpProxy?: string | undefined
+  certificateFile?: string | undefined
+}): Promise<
+  | {
+      error?: string | undefined
+      warning?: string | undefined
+      message?: string | undefined
+    }
+  | {
+      agent: HttpsProxyAgentWithCA
+      response: unknown
+    }
+> => {
   if (!httpProxy) {
     return {}
   }

src/lib/http-agent.ts

@@ -3,21 +3,25 @@ import { pipeline } from 'stream/promises'
 import walker from 'folder-walker'
 
 import { fileFilterCtor, fileNormalizerCtor, hasherCtor, manifestCollectorCtor } from './hasher-segments.js'
+import { $TSFixMe } from '../../commands/types.js'
 
 const hashFiles = async ({
   assetType = 'file',
-  // @ts-expect-error TS(7031) FIXME: Binding element 'concurrentHash' implicitly has an... Remove this comment to see the full error message
   concurrentHash,
-  // @ts-expect-error TS(7031) FIXME: Binding element 'directories' implicitly has an 'a... Remove this comment to see the full error message
   directories,
-  // @ts-expect-error TS(7031) FIXME: Binding element 'filter' implicitly has an 'any' t... Remove this comment to see the full error message
   filter,
   hashAlgorithm = 'sha1',
-  // @ts-expect-error TS(7031) FIXME: Binding element 'normalizer' implicitly has an 'an... Remove this comment to see the full error message
   normalizer,
-  // @ts-expect-error TS(7031) FIXME: Binding element 'statusCb' implicitly has an 'any'... Remove this comment to see the full error message
   statusCb,
-}) => {
+}: {
+  assetType?: string | undefined
+  concurrentHash: $TSFixMe
+  directories: $TSFixMe
+  filter: $TSFixMe
+  hashAlgorithm?: string | undefined
+  normalizer?: $TSFixMe
+  statusCb: $TSFixMe
+}): Promise<{ files: Record<string, string>; filesShaMap: Record<string, $TSFixMe[]> }> => {
   if (!filter) throw new Error('Missing filter function option')
 
   const fileStream = walker(directories, { filter })