chore: upgrade TypeScript from 5.6.3 to 6.0.3 (#504)

marcoscaceres · github-advanced-security[bot] · Copilot · web-flow · commit 708f32391636 · 2026-05-03T18:34:01.000+10:00
* chore: upgrade TypeScript from 5.6.3 to 6.0.3 - Update typescript to ^6.0.3 and @types/node to ^24.12.2 - Change tsconfig module/moduleResolution from esnext/node to nodenext - Fix catch clause variables typed as unknown (stricter in TS 6) - Replace @ts-ignore with @ts-expect-error - Fix definite assignment assertion for Logger.result - Fix view-engine type compatibility with express * Apply suggestions from code review Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * refactor: type engine directly as EngineCallback, remove async and cast Agent-Logs-Url: https://github.com/speced/respec-web-services/sessions/50c73c28-bbb9-43db-8a58-d5c85ae17fd3 * refactor: simplify engine body, let TS infer params from EngineCallback type Agent-Logs-Url: https://github.com/speced/respec-web-services/sessions/50c73c28-bbb9-43db-8a58-d5c85ae17fd3 * fix: resolve TaskModule TS errors, extract getErrnoCode helper Agent-Logs-Url: https://github.com/speced/respec-web-services/sessions/a465b3f6-aa1e-4a52-9998-11d12704f748 * test: add coverage for getErrnoCode utility Agent-Logs-Url: https://github.com/speced/respec-web-services/sessions/a465b3f6-aa1e-4a52-9998-11d12704f748 * fix(xref): include options.all in search cache key to prevent cache poisoning Agent-Logs-Url: https://github.com/speced/respec-web-services/sessions/9ff1c977-d8d7-467c-937f-9353541e3b87 * fix: address Sid's review feedback - Re-throw HTTPError directly in group.ts catch block instead of double-wrapping it - Revert cache key change in search.ts (behavior change, not a TS upgrade fix; should be a separate PR) --------- Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
diff --git a/package.json b/package.json
@@ -53,10 +53,10 @@
     "@types/cors": "^2.8.19",
     "@types/express": "^5.0.6",
     "@types/morgan": "^1.9.10",
-    "@types/node": "^22.9.0",
+    "@types/node": "^24.12.2",
     "@types/split2": "^4.2.3",
     "jasmine": "^6.2.0",
     "simple-git-hooks": "^2.13.1",
-    "typescript": "^5.6.3"
+    "typescript": "^6.0.3"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/routes/caniuse/feature.ts b/routes/caniuse/feature.ts
@@ -24,10 +24,12 @@ export default async function route(req: IRequest, res: Response) {
     }
     res.json({ result });
   } catch (error) {
-    const errorCode = error.message === "INTERNAL_ERROR" ? 500 : 404;
+    const message = error instanceof Error ? error.message : String(error);
+    const errorCode = message === "INTERNAL_ERROR" ? 500 : 404;
+    console.error("caniuse feature route error", error);
     res.status(errorCode);
     res.setHeader("Content-Type", "text/plain");
-    res.send(error.message);
+    res.send(errorCode === 500 ? "Internal Server Error" : "Not Found");
   }
 }
 
diff --git a/routes/caniuse/update.ts b/routes/caniuse/update.ts
@@ -5,7 +5,7 @@ import { cache } from "./lib/index.js";
 import { Request, Response } from "express";
 
 const workerFile = path.join(import.meta.dirname, "update.worker.js");
-const taskQueue = new BackgroundTaskQueue<typeof import("./update.worker")>(
+const taskQueue = new BackgroundTaskQueue<typeof import("./update.worker.ts")>(
   workerFile,
   "caniuse_update",
 );
diff --git a/routes/docs/update.ts b/routes/docs/update.ts
@@ -14,7 +14,8 @@ export default async function route(_req: Request, res: Response) {
     console.log(`Successfully regenerated docs in ${Date.now() - start}ms.`);
     res.sendStatus(200); // ok
   } catch (error) {
-    const { message = "", statusCode = 500 } = error;
+    const message = error instanceof Error ? error.message : String(error);
+    const statusCode = error instanceof HTTPError ? error.statusCode : 500;
     console.error(`Failed to regenerate docs: ${message.slice(0, 400)}...`);
     res.status(statusCode);
     res.send(message);
diff --git a/routes/github/commits.ts b/routes/github/commits.ts
@@ -36,7 +36,8 @@ export default async function route(req: IRequest, res: Response) {
     }
     res.json(commits);
   } catch (error) {
+    console.error("Failed to fetch commits", error);
     res.set("Content-Type", "text/plain");
-    res.status(404).send(error.message);
+    res.status(404).send("Unable to fetch commits");
   }
 }
diff --git a/routes/github/contributors.ts b/routes/github/contributors.ts
@@ -41,7 +41,7 @@ export default async function route(req: IRequest, res: Response) {
       contributors.push(contributor);
     }
   } catch (err) {
-    if (err.message && err.message.includes("404 Not Found")) {
+    if (err instanceof Error && err.message.includes("404 Not Found")) {
       await cache.set(cacheKey, null);
       return res.sendStatus(404);
     } else {
diff --git a/routes/github/files.ts b/routes/github/files.ts
@@ -17,10 +17,12 @@ export default async function route(req: IRequest, res: Response) {
     res.set("Cache-Control", `max-age=${seconds("30m")}`);
     res.json({ entries });
   } catch (error) {
-    const errorCode = error.message === "INTERNAL_ERROR" ? 500 : 404;
+    const message = error instanceof Error ? error.message : String(error);
+    const errorCode = message === "INTERNAL_ERROR" ? 500 : 404;
+    console.error("Failed to get repository files", error);
     res.status(errorCode);
     res.setHeader("Content-Type", "text/plain");
-    res.send(error.message);
+    res.send(errorCode === 500 ? "Internal server error" : "Not found");
   }
 }
 
diff --git a/routes/respec/builds/update.ts b/routes/respec/builds/update.ts
@@ -3,7 +3,7 @@ import { mkdir, readFile } from "node:fs/promises";
 
 import type { Request, Response } from "express";
 
-import { env } from "../../../utils/misc.js";
+import { env, HTTPError } from "../../../utils/misc.js";
 import sh from "../../../utils/sh.js";
 
 export const PKG_DIR = path.join(env("DATA_DIR"), "respec", "package");
@@ -25,7 +25,8 @@ export default async function route(req: Request, res: Response) {
     await pullRelease();
     res.sendStatus(200); // ok
   } catch (error) {
-    const { message = "", statusCode = 500 } = error;
+    const message = error instanceof Error ? error.message : String(error);
+    const statusCode = error instanceof HTTPError ? error.statusCode : 500;
     console.error(`Failed to pull respec release: ${message.slice(0, 400)}...`);
     res.status(statusCode);
     res.send(message);
diff --git a/routes/w3c/group.ts b/routes/w3c/group.ts
@@ -65,7 +65,8 @@ export default async function route(req: IRequest, res: Response) {
     res.set("Cache-Control", `max-age=${seconds("24h")}`);
     res.json(groupInfo);
   } catch (error) {
-    const { statusCode = 500, message } = error;
+    const statusCode = error instanceof HTTPError ? error.statusCode : 500;
+    const message = error instanceof Error ? error.message : String(error);
     res.set("Content-Type", "text/plain");
     res.status(statusCode).send(message);
   }
@@ -117,9 +118,10 @@ async function fetchGroupInfo(
     }
     var json = (await res.json()) as APIResponse;
   } catch (error) {
+    if (error instanceof HTTPError) throw error;
     throw new HTTPError(
-      error.statusCode || 500,
-      error.message
+      500,
+      error instanceof Error ? error.message : String(error),
     );
   }
 
diff --git a/routes/xref/lib/search.ts b/routes/xref/lib/search.ts
@@ -105,7 +105,7 @@ export function searchOne(
 
 function normalizeQuery(query: Query, options: Options) {
   if (Array.isArray(query.specs) && !Array.isArray(query.specs[0])) {
-    // @ts-ignore
+    // @ts-expect-error - backward compatibility: wrapping flat specs array
     query.specs = [query.specs]; // for backward compatibility
   }
   if (!Array.isArray(query.types) || !query.types.length) {
diff --git a/routes/xref/lib/store.ts b/routes/xref/lib/store.ts
@@ -1,7 +1,7 @@
 import path from "path";
 import { readFileSync } from "fs";
 
-import { env } from "../../../utils/misc.js";
+import { env, getErrnoCode } from "../../../utils/misc.js";
 import { DataEntry } from "./search.js";
 import { HeadingEntry, HeadingsBySpec } from "./scraper.js";
 
@@ -94,8 +94,8 @@ function readJson(filename: string) {
 function readJsonOptional(filename: string) {
   try {
     return readJson(filename);
-  } catch (err: any) {
-    if (err?.code === "ENOENT") {
+  } catch (err: unknown) {
+    if (getErrnoCode(err) === "ENOENT") {
       console.warn(`Optional data file not found: ${filename}`);
       return {};
     }
diff --git a/routes/xref/update.ts b/routes/xref/update.ts
@@ -9,7 +9,7 @@ import { cache as searchCache } from "./lib/search.js";
 import { store } from "./lib/store-init.js";
 
 const workerFile = path.join(import.meta.dirname, "update.worker.js");
-const taskQueue = new BackgroundTaskQueue<typeof import("./update.worker")>(
+const taskQueue = new BackgroundTaskQueue<typeof import("./update.worker.ts")>(
   workerFile,
   "xref_update",
 );
diff --git a/tests/utils/misc.test.js b/tests/utils/misc.test.js
@@ -0,0 +1,38 @@
+import { getErrnoCode } from "../../build/utils/misc.js";
+
+describe("utils/misc", () => {
+  describe("getErrnoCode", () => {
+    it("returns the string code from an Error with a code property", () => {
+      const err = Object.assign(new Error("ENOENT"), { code: "ENOENT" });
+      expect(getErrnoCode(err)).toBe("ENOENT");
+    });
+
+    it("returns the string code from a plain object with a code property", () => {
+      expect(getErrnoCode({ code: "EACCES" })).toBe("EACCES");
+    });
+
+    it("returns undefined when the code property is not a string", () => {
+      expect(getErrnoCode({ code: 42 })).toBeUndefined();
+    });
+
+    it("returns undefined for an Error without a code property", () => {
+      expect(getErrnoCode(new Error("oops"))).toBeUndefined();
+    });
+
+    it("returns undefined for null", () => {
+      expect(getErrnoCode(null)).toBeUndefined();
+    });
+
+    it("returns undefined for undefined", () => {
+      expect(getErrnoCode(undefined)).toBeUndefined();
+    });
+
+    it("returns undefined for a string", () => {
+      expect(getErrnoCode("ENOENT")).toBeUndefined();
+    });
+
+    it("returns undefined for a number", () => {
+      expect(getErrnoCode(404)).toBeUndefined();
+    });
+  });
+});
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,11 +5,11 @@
     "target": "ESNext",
     "removeComments": false,
     "allowSyntheticDefaultImports": true,
-    "moduleResolution": "node",
+    "moduleResolution": "nodenext",
     "noImplicitThis": true,
     "strictNullChecks": true,
     "noImplicitAny": true,
-    "module": "esnext",
+    "module": "nodenext",
     "outDir": "build",
     "sourceMap": true,
     "resolveJsonModule": true
diff --git a/utils/background-task-queue.ts b/utils/background-task-queue.ts
@@ -83,7 +83,7 @@ class Logger {
   id: string;
   input: unknown;
   timings: Record<string, Date> = {};
-  result: { type: "success" | "failure"; value: unknown };
+  result!: { type: "success" | "failure"; value: unknown };
   stdout: [date: Date, line: string][] = [];
   stderr: [date: Date, line: string][] = [];
 
@@ -118,7 +118,9 @@ class Logger {
   }
 }
 
-type TaskModule = { default: (input?: unknown) => unknown };
+// Method shorthand syntax enables bivariant parameter checking so concrete
+// worker input types (e.g. `{ webhookId: string }`) satisfy this constraint.
+type TaskModule = { default(input?: unknown): unknown };
 /**
  * Create a worker thread to run a task in background. A task/job added to the
  * queue with `add()`, and run serially in order of calling `run()` on the job
diff --git a/utils/disk-cache.ts b/utils/disk-cache.ts
@@ -1,7 +1,7 @@
 import path from "path";
 import { mkdir, readFile, unlink, writeFile } from "fs/promises";
 
-import { env } from "./misc.js";
+import { env, getErrnoCode } from "./misc.js";
 import { MemCache } from "./mem-cache.js";
 
 interface CacheEntry<V> {
@@ -86,7 +86,7 @@ export class DiskCache<ValueType> {
       const text = await readFile(fileName, "utf-8");
       return JSON.parse(text) as CacheEntry<ValueType>;
     } catch (error) {
-      if (error.code !== "ENOENT") {
+      if (getErrnoCode(error) !== "ENOENT") {
         console.error(error);
       }
     }
diff --git a/utils/misc.ts b/utils/misc.ts
@@ -50,6 +50,18 @@ export function ms(duration: string) {
   return seconds(duration) * 1000;
 }
 
+/**
+ * Extract the `code` property from a thrown value, or return `undefined`.
+ * Safe to call with any `unknown` catch value (strings, plain objects, etc.).
+ */
+export function getErrnoCode(err: unknown): string | undefined {
+  if (typeof err === "object" && err !== null && "code" in err) {
+    const { code } = err as NodeJS.ErrnoException;
+    return typeof code === "string" ? code : undefined;
+  }
+  return undefined;
+}
+
 export class HTTPError extends Error {
   constructor(public statusCode: number, message: string, public url?: string) {
     super(message);
diff --git a/utils/view-engine.ts b/utils/view-engine.ts

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@`
`53`	`53`	`"@types/cors": "^2.8.19",`
`54`	`54`	`"@types/express": "^5.0.6",`
`55`	`55`	`"@types/morgan": "^1.9.10",`
`56`		`- "@types/node": "^22.9.0",`
	`56`	`+ "@types/node": "^24.12.2",`
`57`	`57`	`"@types/split2": "^4.2.3",`
`58`	`58`	`"jasmine": "^6.2.0",`
`59`	`59`	`"simple-git-hooks": "^2.13.1",`
`60`		`- "typescript": "^5.6.3"`
	`60`	`+ "typescript": "^6.0.3"`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,12 @@ export default async function route(req: IRequest, res: Response) {`
`24`	`24`	`}`
`25`	`25`	`res.json({ result });`
`26`	`26`	`} catch (error) {`
`27`		`- const errorCode = error.message === "INTERNAL_ERROR" ? 500 : 404;`
	`27`	`+ const message = error instanceof Error ? error.message : String(error);`
	`28`	`+ const errorCode = message === "INTERNAL_ERROR" ? 500 : 404;`
	`29`	`+ console.error("caniuse feature route error", error);`
`28`	`30`	`res.status(errorCode);`
`29`	`31`	`res.setHeader("Content-Type", "text/plain");`
`30`		`- res.send(error.message);`
	`32`	`+ res.send(errorCode === 500 ? "Internal Server Error" : "Not Found");`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ export default async function route(req: IRequest, res: Response) {`
`36`	`36`	`}`
`37`	`37`	`res.json(commits);`
`38`	`38`	`} catch (error) {`
	`39`	`+ console.error("Failed to fetch commits", error);`
`39`	`40`	`res.set("Content-Type", "text/plain");`
`40`		`- res.status(404).send(error.message);`
	`41`	`+ res.status(404).send("Unable to fetch commits");`
`41`	`42`	`}`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export default async function route(req: IRequest, res: Response) {`
`41`	`41`	`contributors.push(contributor);`
`42`	`42`	`}`
`43`	`43`	`} catch (err) {`
`44`		`- if (err.message && err.message.includes("404 Not Found")) {`
	`44`	`+ if (err instanceof Error && err.message.includes("404 Not Found")) {`
`45`	`45`	`await cache.set(cacheKey, null);`
`46`	`46`	`return res.sendStatus(404);`
`47`	`47`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,12 @@ export default async function route(req: IRequest, res: Response) {`
`17`	`17`	res.set("Cache-Control", `max-age=${seconds("30m")}`);
`18`	`18`	`res.json({ entries });`
`19`	`19`	`} catch (error) {`
`20`		`- const errorCode = error.message === "INTERNAL_ERROR" ? 500 : 404;`
	`20`	`+ const message = error instanceof Error ? error.message : String(error);`
	`21`	`+ const errorCode = message === "INTERNAL_ERROR" ? 500 : 404;`
	`22`	`+ console.error("Failed to get repository files", error);`
`21`	`23`	`res.status(errorCode);`
`22`	`24`	`res.setHeader("Content-Type", "text/plain");`
`23`		`- res.send(error.message);`
	`25`	`+ res.send(errorCode === 500 ? "Internal server error" : "Not found");`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`