Remove any type from 11 legacy exception files (#60116)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: heiskr

eslint.config.ts

@@ -204,13 +204,9 @@ export default [
       'src/article-api/transformers/audit-logs-transformer.ts',
       'src/article-api/transformers/rest-transformer.ts',
       'src/codeql-cli/scripts/convert-markdown-for-docs.ts',
-      'src/content-linter/lib/helpers/get-lintable-yml.ts',
-      'src/content-linter/lib/helpers/print-annotations.ts',
-      'src/content-linter/lib/helpers/utils.ts',
       'src/content-linter/lib/init-test.ts',
       'src/content-linter/lib/linting-rules/code-annotations.ts',
       'src/content-linter/lib/linting-rules/index.ts',
-      'src/content-linter/lib/linting-rules/internal-links-no-lang.ts',
       'src/content-linter/lib/linting-rules/journey-tracks-liquid.ts',
       'src/content-linter/lib/linting-rules/liquid-ifversion-versions.ts',
       'src/content-linter/lib/linting-rules/liquid-versioning.ts',
@@ -253,8 +249,6 @@ export default [
       'src/frame/lib/page-data.ts',
       'src/frame/lib/page.ts',
       'src/frame/lib/read-frontmatter.ts',
-      'src/frame/middleware/find-page.ts',
-      'src/frame/middleware/resolve-carousels.ts',
       'src/frame/tests/page.ts',
       'src/frame/tests/read-frontmatter.ts',
       'src/frame/tests/server.ts',
@@ -278,7 +272,6 @@ export default [
       'src/links/lib/update-internal-links.ts',
       'src/links/scripts/check-github-github-links.ts',
       'src/links/scripts/update-internal-links.ts',
-      'src/pages/_error.tsx',
       'src/redirects/middleware/handle-redirects.ts',
       'src/rest/components/get-rest-code-samples.ts',
       'src/rest/lib/index.ts',
@@ -302,8 +295,6 @@ export default [
       'src/search/lib/get-elasticsearch-results/general-search.ts',
       'src/search/lib/routes/combined-search-route.ts',
       'src/search/lib/search-request-params/get-search-from-request-params.ts',
-      'src/search/lib/search-request-params/search-params-objects.ts',
-      'src/search/lib/search-request-params/types.ts',
       'src/search/middleware/search-routes.ts',
       'src/search/scripts/index/index-cli.ts',
       'src/search/scripts/index/utils/indexing-elasticsearch-utils.ts',
@@ -318,9 +309,7 @@ export default [
       'src/types/markdownlint-rule-search-replace.d.ts',
       'src/types/primer__octicons.d.ts',
       'src/versions/scripts/use-short-versions.ts',
-      'src/webhooks/lib/index.ts',
       'src/workflows/projects.ts',
-      'src/workflows/tests/actions-workflows.ts',
     ],
     rules: {
       '@typescript-eslint/no-explicit-any': 'off',

src/content-linter/lib/helpers/get-lintable-yml.ts

@@ -37,9 +37,13 @@ ajv.addKeyword({
   type: 'string',
   // For docs on defining validate see
   // https://ajv.js.org/keywords.html#define-keyword-with-validate-function
-  // Using any for validate function params because AJV's type definitions for custom keywords are complex
-  validate: (compiled: any, data: any, schema: any, parentInfo: any): boolean => {
-    mdDict.set(parentInfo.instancePath, data)
+  validate: (
+    _compiled: boolean,
+    data: string,
+    _schema: unknown,
+    parentInfo?: { instancePath: string },
+  ): boolean => {
+    if (parentInfo) mdDict.set(parentInfo.instancePath, data)
     return true
   },
   errors: false,

src/content-linter/lib/helpers/print-annotations.ts

@@ -5,17 +5,25 @@
  *
  */
 
+interface LintFlaw {
+  ruleNames: string[]
+  severity: string
+  lineNumber?: number
+  ruleDescription?: string
+  errorDetail?: string
+  context?: string
+  [key: string]: unknown
+}
+
 export function printAnnotationResults(
-  // Using 'any' type as results structure is dynamic and comes from various linting tools with different formats
-  results: any,
+  results: Record<string, LintFlaw[]>,
   {
     skippableRules = [],
     skippableFlawProperties = [],
   }: { skippableRules?: string[]; skippableFlawProperties?: string[] } = {},
 ) {
   for (const [file, flaws] of Object.entries(results)) {
-    // Using 'any' type for flaws as they have varying structures depending on the linting rule
-    for (const flaw of flaws as any) {
+    for (const flaw of flaws) {
       if (intersection(flaw.ruleNames, skippableRules)) {
         continue
       }
@@ -57,7 +65,6 @@ export function printAnnotationResults(
   }
 }
 
-// Using 'any' types for generic array intersection utility function
-function intersection(arr1: any[], arr2: any[]) {
-  return arr1.some((item: any) => arr2.includes(item))
+function intersection(arr1: string[], arr2: string[]) {
+  return arr1.some((item) => arr2.includes(item))
 }

src/content-linter/lib/helpers/utils.ts

@@ -17,18 +17,14 @@ export function addFixErrorDetail(
   addError(onError, lineNumber, `Expected: ${expected}`, ` Actual: ${actual}`, range, fixInfo)
 }
 
-export function forEachInlineChild(
+export function forEachInlineChild<T = MarkdownToken>(
   params: RuleParams,
   type: string,
-  // Handler uses `any` for function parameter variance reasons. TypeScript's contravariance rules for function
-  // parameters mean that a function accepting a specific type cannot be assigned to a parameter of type `unknown`.
-  // Therefore, `unknown` cannot be used here, as different linting rules pass tokens with varying structures
-  // beyond the base MarkdownToken interface, and some handlers are async.
-  handler: (child: any, token?: any) => void | Promise<void>,
+  handler: (child: T, token?: MarkdownToken) => void | Promise<void>,
 ): void {
   filterTokens(params, 'inline', (token: MarkdownToken) => {
     for (const child of token.children!.filter((c) => c.type === type)) {
-      handler(child, token)
+      handler(child as unknown as T, token)
     }
   })
 }

src/content-linter/lib/linting-rules/internal-links-no-lang.ts

@@ -2,17 +2,16 @@ import { filterTokens } from 'markdownlint-rule-helpers'
 
 import { addFixErrorDetail, getRange } from '../helpers/utils'
 import { languageKeys } from '@/languages/lib/languages'
-import type { RuleParams, RuleErrorCallback, Rule } from '../../types'
+import type { RuleParams, RuleErrorCallback, Rule, MarkdownToken } from '../../types'
 
 export const internalLinksNoLang: Rule = {
   names: ['GHD002', 'internal-links-no-lang'],
   description: 'Internal links must not have a hardcoded language code',
   tags: ['links', 'url'],
   parser: 'markdownit',
   function: (params: RuleParams, onError: RuleErrorCallback) => {
-    // Using 'any' type for token as markdownlint-rule-helpers doesn't provide TypeScript types
-    filterTokens(params, 'inline', (token: any) => {
-      for (const child of token.children) {
+    filterTokens(params, 'inline', (token: MarkdownToken) => {
+      for (const child of token.children!) {
         if (child.type !== 'link_open') continue
 
         // Example child.attrs:
@@ -21,8 +20,8 @@ export const internalLinksNoLang: Rule = {
         //  ['rel', 'canonical'],
         // ]
         // Attribute arrays are tuples of [attributeName, attributeValue] from markdownit parser
-        const hrefsMissingSlashes = child.attrs
-          // The attribute could also be `target` or `rel`
+        const hrefsMissingSlashes = child
+          .attrs! // The attribute could also be `target` or `rel`
           .filter((attr: [string, string]) => attr[0] === 'href')
           .filter((attr: [string, string]) => attr[1].startsWith('/') || !attr[1].startsWith('//'))
           // Filter out link paths that start with language code

src/frame/middleware/find-page.ts

@@ -25,7 +25,7 @@ export default async function findPage(
     isDev = process.env.NODE_ENV === 'development',
     contentRoot = CONTENT_ROOT,
   }: FindPageOptions = {},
-): Promise<any> {
+): Promise<void> {
   // Filter out things like `/will/redirect` or `/_next/data/...`
   if (!req.pagePath || !languagePrefixPathRegex.test(req.pagePath)) {
     return next()
@@ -36,7 +36,7 @@ export default async function findPage(
   }
 
   // Using any for page because it's dynamically assigned properties (like version) that aren't in the Page type
-  let page: any = req.context.pages[req.pagePath]
+  let page = req.context.pages[req.pagePath] as Page | undefined
   if (page && isDev && englishPrefixRegex.test(req.pagePath)) {
     // The .applicableVersions and .permalinks properties are computed
     // when the page is read in from disk. But when the initial tree
@@ -67,19 +67,20 @@ export default async function findPage(
       req.context?.currentVersion &&
       !page.applicableVersions.includes(req.context.currentVersion)
     ) {
-      return res
+      res
         .status(404)
         .send(
           `After re-reading the page, '${req.context?.currentVersion}' is no longer an applicable version. ` +
             'A restart is required.',
         )
+      return
     }
   }
 
   if (page && req.context) {
     req.context.page = page
     // Note: Page doesn't have a version property, this might be setting it dynamically
-    ;(req.context.page as any).version = req.context.currentVersion
+    ;(req.context.page as Page & { version: string }).version = req.context.currentVersion || ''
 
     // We can't depend on `page.hidden` because the dedicated search
     // results page is a hidden page but it needs to offer all possible

src/frame/middleware/resolve-carousels.ts

@@ -1,11 +1,17 @@
-import type { ExtendedRequest, ResolvedArticle } from '@/types'
+import type { ExtendedRequest, Page, ResolvedArticle } from '@/types'
 import type { Response, NextFunction } from 'express'
 import findPage from '@/frame/lib/find-page'
 import { renderContent } from '@/content-render/index'
 import Permalink from '@/frame/lib/permalink'
 
 import { createLogger } from '@/observability/logger/index'
 
+// The Page class has rawCarousels and carousels properties that aren't on the Page type
+interface PageCarouselProps {
+  rawCarousels?: Record<string, string[]>
+  carousels?: Record<string, ResolvedArticle[]>
+}
+
 const logger = createLogger('middleware:resolve-carousels')
 
 /**
@@ -24,7 +30,7 @@ function tryResolveArticlePath(
   rawPath: string,
   pageRelativePath: string | undefined,
   req: ExtendedRequest,
-): any {
+): Page | undefined {
   const { pages, redirects } = req.context!
   const currentLanguage = req.context!.currentLanguage || 'en'
 
@@ -86,7 +92,7 @@ function tryResolveArticlePath(
 /**
  * Get the path for a page (without language/version)
  */
-function getPageHref(page: any): string {
+function getPageHref(page: Page): string {
   if (page.relativePath) {
     return Permalink.relativePathToSuffix(page.relativePath)
   }
@@ -103,7 +109,7 @@ async function resolveCarousels(
 ): Promise<void> {
   try {
     const page = req.context?.page
-    const rawCarousels = (page as any)?.rawCarousels
+    const rawCarousels = (page as unknown as PageCarouselProps)?.rawCarousels
 
     // Handle carousels format
     if (rawCarousels && typeof rawCarousels === 'object') {
@@ -158,7 +164,7 @@ async function resolveCarousels(
 
       // Store resolved carousels on the page
       if (page && Object.keys(resolvedCarousels).length > 0) {
-        ;(page as any).carousels = resolvedCarousels
+        ;(page as unknown as PageCarouselProps).carousels = resolvedCarousels
       }
     }
   } catch (error) {

src/pages/_error.tsx

@@ -2,6 +2,18 @@ import type { NextPageContext } from 'next'
 
 import { GenericError } from '@/frame/components/GenericError'
 
+interface ExpressRequestExtensions {
+  FailBot?: {
+    report: (
+      err: Error,
+      context: Record<string, string>,
+    ) => Array<Promise<Response | void>> | undefined
+  }
+  method?: string
+  query?: Record<string, unknown>
+  language?: string
+}
+
 function Error() {
   return <GenericError />
 }
@@ -34,15 +46,15 @@ Error.getInitialProps = async (ctx: NextPageContext) => {
     // do which mutate the Express request object by attaching
     // callables to it. This way it's only ever present in SSR executed
     // code and doesn't need any custom webpack configuration.
-    const expressRequest = req as any
+    const expressRequest = req as unknown as ExpressRequestExtensions
     const FailBot = expressRequest.FailBot
     if (FailBot) {
       try {
         // An inclusion-list of headers we're OK with sending because
         // they don't contain an PII.
         const OK_HEADER_KEYS = ['user-agent', 'referer', 'accept-encoding', 'accept-language']
         const reported = FailBot.report(err, {
-          path: req.url,
+          path: req.url || '',
           request: JSON.stringify(
             {
               method: expressRequest.method,

src/search/lib/search-request-params/get-search-from-request-params.ts

@@ -37,7 +37,7 @@ export function getSearchFromRequestParams<Type extends SearchTypes>(
       continue
     }
 
-    let value = req.query[key]
+    let value: unknown = req.query[key]
     if (!value || (typeof value === 'string' && !value.trim())) {
       if (default_ === undefined) {
         validationErrors.push({ error: `No truthy value for key '${key}'`, key })