Update to ESlint 9 and flat config

adminShared/patchHelper.ts

@@ -71,7 +71,10 @@ export function setValueRecursive(
             let newObject: any = {}
             if (json !== undefined && checkIsPlainObjectWithGuard(json))
                 newObject = { ...json }
-            const currentValue = newObject.hasOwnProperty(currentPart)
+            const currentValue = Object.prototype.hasOwnProperty.call(
+                newObject,
+                currentPart
+            )
                 ? newObject[currentPart]
                 : undefined
             const updatedValue = setValueRecursive(

adminShared/schemaProcessing.ts

@@ -128,9 +128,9 @@ function extractSchemaRecursive(
         // then do not emit anything directly and recurse over the
         // described properties
         if (
-            schema.hasOwnProperty("type") &&
+            Object.prototype.hasOwnProperty.call(schema, "type") &&
             schema.type === "object" &&
-            schema.hasOwnProperty("properties") &&
+            Object.prototype.hasOwnProperty.call(schema, "properties") &&
             checkIsPlainObjectWithGuard(schema.properties)
         ) {
             // Color scales are complex objects that are treated as opaque objects with a special
@@ -166,15 +166,15 @@ function extractSchemaRecursive(
             // paternProperties is ".*" and the type of those
             // is string (interpreted as a color)
             // We yield something like this as a single entry
-            schema.hasOwnProperty("type") &&
+            Object.prototype.hasOwnProperty.call(schema, "type") &&
             schema.type === "object" &&
-            schema.hasOwnProperty("patternProperties") &&
+            Object.prototype.hasOwnProperty.call(schema, "patternProperties") &&
             Object.values(
                 schema.patternProperties as Record<string, any>
             ).every(
                 (item: any) =>
                     checkIsPlainObjectWithGuard(item) &&
-                    item.hasOwnProperty("type") &&
+                    Object.prototype.hasOwnProperty.call(item, "type") &&
                     isPlainTypeString((item as any).type)
             )
         ) {
@@ -234,7 +234,7 @@ function extractSchemaRecursive(
             // a primitive type. If so we collect all the types
             // and yield a single FieldDefinition with the merged
             // type
-            schema.hasOwnProperty("oneOf") &&
+            Object.prototype.hasOwnProperty.call(schema, "oneOf") &&
             isArray(schema.oneOf) &&
             schema.oneOf.map((item) => item.type).every(isPlainTypeStringOrNull)
         ) {
@@ -264,13 +264,13 @@ function recursiveDereference(
         schema !== undefined &&
         checkIsPlainObjectWithGuard(schema)
     ) {
-        if (schema.hasOwnProperty("$ref")) {
+        if (Object.prototype.hasOwnProperty.call(schema, "$ref")) {
             const ref = schema["$ref"] as string
             const localPrefix = "#/$defs/"
             if (!ref.startsWith(localPrefix))
                 throw "Only local refs are supported at the moment!"
             const refName = ref.substring(localPrefix.length)
-            if (!defs.hasOwnProperty(refName)) {
+            if (!Object.prototype.hasOwnProperty.call(defs, refName)) {
                 console.error("Reference not found", refName)
                 return schema
             } else return defs[refName] // Note: we are not using recursive dereferencing, i.e. if there are refs in the $defs section we don't resolve them here
@@ -281,7 +281,7 @@ function recursiveDereference(
 }
 
 function dereference(schema: Record<string, unknown>): any {
-    if (!schema.hasOwnProperty("$defs")) return
+    if (!Object.prototype.hasOwnProperty.call(schema, "$defs")) return
     const defs = schema["$defs"] as Record<string, unknown>
 
     const dereferenced = recursiveDereference(schema, defs)

adminSiteClient/Admin.tsx

@@ -162,7 +162,6 @@ export class Admin {
     }
 
     @action.bound private removeRequest(request: Promise<Response>): void {
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.currentRequests = this.currentRequests.filter(
             (req) => req !== request
         )

adminSiteClient/GrapherConfigGridEditorTypesAndUtils.tsx

@@ -136,7 +136,7 @@ export function fetchVariablesParametersFromQueryString(
     sExpressionContext: OperationContext
 ): FetchVariablesParameters {
     let filterQuery: Operation | undefined = undefined
-    if (params.hasOwnProperty("filter")) {
+    if (Object.prototype.hasOwnProperty.call(params, "filter")) {
         filterQuery = parseToOperation(params.filter!, sExpressionContext)
     }
     return {

adminSiteClient/SiteRedirectsIndexPage.tsx

@@ -7,10 +7,10 @@ import { AdminAppContext } from "./AdminAppContext.js"
 import { AdminLayout } from "./AdminLayout.js"
 import { Link } from "./Link.js"
 
-const SOURCE_PATTERN = /^\/$|^\/.*[^\/]+$/
+const SOURCE_PATTERN = /^\/$|^\/.*[^/]+$/
 const INVALID_SOURCE_MESSAGE =
     "URL must start with a slash and cannot end with a slash, unless it's the root."
-const TARGET_PATTERN = /^\/$|^(https?:\/\/|\/).*[^\/]+$/
+const TARGET_PATTERN = /^\/$|^(https?:\/\/|\/).*[^/]+$/
 const INVALID_TARGET_MESSAGE =
     "URL must start with a slash or http(s):// and cannot end with a slash, unless it's the root."
 

adminSiteClient/VariablesIndexPage.tsx

@@ -8,7 +8,7 @@ import {
     reaction,
     IReactionDisposer,
 } from "mobx"
-import * as lodash from "lodash"
+import lodash from "lodash"
 
 import { AdminLayout } from "./AdminLayout.js"
 import { SearchField, FieldsRow } from "./Forms.js"
@@ -42,7 +42,7 @@ export class VariablesIndexPage extends Component {
                 const html = text.replace(
                     new RegExp(
                         this.highlightSearch.replace(
-                            /[-\/\\^$*+?.()|[\]{}]/g,
+                            /[-/\\^$*+?.()|[\]{}]/g,
                             "\\$&"
                         ),
                         "i"

adminSiteClient/gdocsValidation.ts

@@ -33,7 +33,7 @@ function validatePublishedAt(gdoc: OwidGdoc, errors: OwidGdocErrorMessage[]) {
 }
 
 function validateSlug(gdoc: OwidGdoc, errors: OwidGdocErrorMessage[]) {
-    if (!gdoc.slug.match(/^[a-z0-9-\/]+$/)) {
+    if (!gdoc.slug.match(/^[a-z0-9-/]+$/)) {
         errors.push({
             property: "slug",
             type: OwidGdocErrorMessageType.Error,

adminSiteServer/app.test.tsx

@@ -39,7 +39,7 @@ jest.mock("googleapis", () => {
 import { OwidAdminApp } from "./appClass.js"
 
 import { logInAsUser } from "./authentication.js"
-import knex, { Knex } from "knex"
+import { Knex, knex } from "knex"
 import { dbTestConfig } from "../db/tests/dbTestConfig.js"
 import {
     TransactionCloseMode,

baker/batchTagWithGpt.ts

@@ -81,13 +81,10 @@ if (require.main === module) {
                     })
             },
             async (argv) => {
-                try {
-                    await db.knexReadonlyTransaction(
-                        (trx) => batchTagChartsWithGpt(trx, argv),
-                        db.TransactionCloseMode.Close
-                    )
-                } finally {
-                }
+                await db.knexReadonlyTransaction(
+                    (trx) => batchTagChartsWithGpt(trx, argv),
+                    db.TransactionCloseMode.Close
+                )
             }
         )
         .help()

baker/pageOverrides.tsx

@@ -14,13 +14,11 @@ export const getPostBySlugLogToSlackNoThrow = async (
     knex: KnexReadonlyTransaction,
     slug: string
 ) => {
-    let post
     try {
-        post = await getFullPostBySlugFromSnapshot(knex, slug)
+        return await getFullPostBySlugFromSnapshot(knex, slug)
     } catch (err) {
         void logErrorAndMaybeSendToBugsnag(err)
-    } finally {
-        return post
+        return undefined
     }
 }
 

baker/siteRenderers.tsx

@@ -11,7 +11,7 @@ import { ThankYouPage } from "../site/ThankYouPage.js"
 import TombstonePage from "../site/TombstonePage.js"
 import OwidGdocPage from "../site/gdocs/OwidGdocPage.js"
 import ReactDOMServer from "react-dom/server.js"
-import * as lodash from "lodash"
+import lodash from "lodash"
 import { formatCountryProfile, isCanonicalInternalUrl } from "./formatting.js"
 import {
     bakeGrapherUrls,
@@ -621,9 +621,9 @@ export const renderProminentLinks = async (
                         )
                     )
                     $block.remove()
-                    return
                 }
             }
+            if (!title) return
 
             const image =
                 $block.find("figure").html() ||

db/model/Gdoc/htmlToEnriched.ts

@@ -317,7 +317,7 @@ interface ParseContext {
     to some html tags like <br />
     */
 const wpTagRegex =
-    /wp:(?<tag>([\w\/-]+))\s*(?<attributes>{.*})?\s*(?<isVoidElement>\/)?$/
+    /wp:(?<tag>([\w/-]+))\s*(?<attributes>{.*})?\s*(?<isVoidElement>\/)?$/
 
 /** Unwraps a CheerioElement in the sense that it applies
     cheerioElementsToArchieML on the children, returning the result. In effect

db/refreshPageviewsFromDatasette.ts

@@ -76,7 +76,6 @@ const main = async (): Promise<void> => {
         )
     } catch (e) {
         console.error(e)
-    } finally {
     }
 }
 

devTools/cloudflareImagesSync/cloudflareImagesSync.ts

@@ -9,7 +9,7 @@ import {
     CLOUDFLARE_IMAGES_API_KEY,
     IMAGE_HOSTING_R2_CDN_URL,
 } from "../../settings/serverSettings.js"
-import { excludeNullish, keyBy } from "@ourworldindata/utils"
+import { keyBy } from "@ourworldindata/utils"
 
 type CloudflareImageDirectory = Record<string, { id: string; filename: string }>
 
@@ -89,6 +89,7 @@ async function validateDirectory(
     }
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function purgeRecords(trx: db.KnexReadWriteTransaction) {
     await new Promise<void>((resolve) => {
         const readlineInterface = readline.createInterface({
@@ -449,4 +450,9 @@ You need to set "CLOUDFLARE_IMAGES_ACCOUNT_ID" and "CLOUDFLARE_IMAGES_API_KEY" i
     })
 }
 
-main().then(() => process.exit(0))
+main()
+    .then(() => process.exit(0))
+    .catch((e) => {
+        console.error(e)
+        process.exit(1)
+    })

devTools/explorerTools/extractGrapherIds.ts

@@ -35,4 +35,4 @@ async function main(): Promise<void> {
     console.log(csvRows.join("\n"))
 }
 
-main()
+void main()

devTools/explorerTools/rewriteAllExplorers.ts

@@ -18,4 +18,4 @@ const rewriteAllExplorers = async () => {
     console.log("Finished rewriting", allExplorers.length, "explorers")
 }
 
-rewriteAllExplorers()
+void rewriteAllExplorers()

devTools/flagUpdater/update.ts

@@ -74,4 +74,4 @@ const main = async () => {
     }
 }
 
-main()
+void main()

devTools/gdocs/fetch-by-id.ts

@@ -1,9 +1,5 @@
 #! /usr/bin/env node
 
-import { TransactionCloseMode, knexReadonlyTransaction } from "../../db/db.js"
-
-import fs from "fs-extra"
-
 import parseArgs from "minimist"
 
 import { OwidGoogleAuth } from "../../db/OwidGoogleAuth.js"
@@ -19,7 +15,7 @@ async function main(parsedArgs: parseArgs.ParsedArgs) {
             suggestionsViewMode: "PREVIEW_WITHOUT_SUGGESTIONS",
         })
         // Remove the Authorization header from the response before printing it
-        delete response.config.headers.Authorization
+        delete response.config?.headers?.Authorization
         process.stdout.write(JSON.stringify(response, null, 2))
     } catch (error) {
         console.error("Encountered an error: ", error)
@@ -40,5 +36,5 @@ Usage:
     `)
     process.exit(0)
 } else {
-    main(parsedArgs)
+    void main(parsedArgs)
 }

devTools/graphersToGit/tasks.ts

@@ -71,7 +71,7 @@ const dumpGraphers = async () => {
         JSON.stringify(mapToObjectLiteral(graphersById), null, 2),
         "utf8"
     )
-    closeTypeOrmAndKnexConnections()
+    void closeTypeOrmAndKnexConnections()
 }
 
 // If an author changes the map variable then removes that variable, we don't remove it from map config.
@@ -205,7 +205,7 @@ const dumpComplexSelections = async () => {
             }),
         "utf8"
     )
-    closeTypeOrmAndKnexConnections()
+    void closeTypeOrmAndKnexConnections()
 }
 
 const getArgsOrErrorMessage = () => {
@@ -240,4 +240,4 @@ const tasks = [
     dumpColorScales,
 ]
 
-main()
+void main()

devTools/markdownTest/markdown.ts

@@ -1,16 +1,9 @@
-import {
-    TransactionCloseMode,
-    knexReadWriteTransaction,
-    knexReadonlyTransaction,
-} from "../../db/db.js"
+import { TransactionCloseMode, knexReadonlyTransaction } from "../../db/db.js"
 import { getPostRawBySlug } from "../../db/model/Post.js"
 import { enrichedBlocksToMarkdown } from "../../db/model/Gdoc/enrichedToMarkdown.js"
 
-import fs from "fs-extra"
-
 import parseArgs from "minimist"
-import { OwidEnrichedGdocBlock } from "@ourworldindata/utils"
-import { parsePostArchieml } from "@ourworldindata/utils"
+import { OwidEnrichedGdocBlock, parsePostArchieml } from "@ourworldindata/utils"
 import { getAndLoadGdocBySlug } from "../../db/model/Gdoc/GdocFactory.js"
 
 async function main(parsedArgs: parseArgs.ParsedArgs) {
@@ -58,4 +51,4 @@ async function main(parsedArgs: parseArgs.ParsedArgs) {
 }
 
 const parsedArgs = parseArgs(process.argv.slice(2))
-main(parsedArgs)
+void main(parsedArgs)

devTools/navigationTest/navigationTest.ts

@@ -17,7 +17,7 @@ const testSiteNavigation = async () => {
         return categorySlugs
     })
 
-    let promises = slugs.map((slug) => {
+    const promises = slugs.map((slug) => {
         return fetch(`https://ourworldindata.org/${slug}`, {
             method: "HEAD",
         })
@@ -36,4 +36,4 @@ const testSiteNavigation = async () => {
     console.log("✅ All fetches completed")
 }
 
-testSiteNavigation()
+void testSiteNavigation()

devTools/reconstructPostsGdocsComponents/reconstructPostsGdocsComponents.ts

@@ -1,13 +1,9 @@
 import parseArgs from "minimist"
 import { knexRaw, knexReadWriteTransaction } from "../../db/db.js"
-import {
-    DbInsertPostGdocComponent,
-    DbRawPostGdoc,
-    parsePostGdocContent,
-} from "@ourworldindata/types"
+import { DbRawPostGdoc, parsePostGdocContent } from "@ourworldindata/types"
 import { getGdocComponentsWithoutChildren } from "../../db/model/Gdoc/extractGdocComponentInfo.js"
 
-async function main(parsedArgs: parseArgs.ParsedArgs) {
+async function main() {
     await knexReadWriteTransaction(async (trx) => {
         await knexRaw(trx, `DELETE FROM posts_gdocs_components`)
         console.log("Deleted all rows from posts_gdocs_components")
@@ -47,5 +43,5 @@ if (parsedArgs["h"]) {
         `reconstructPostsGdocsComponents - Reconstruct posts_gdocs_components table from posts_gdocs table`
     )
 } else {
-    main(parsedArgs)
+    void main()
 }