From e4fe39f3c82ad985ea33f01a4e772b79bf77698e Mon Sep 17 00:00:00 2001
From: Hong Xu <hong@topbug.net>
Date: Sun, 24 Mar 2024 09:07:36 -0700
Subject: [PATCH 01/14] Fix a link to the doc of externalSymbolLinkMappings
 (#2533)

---
 internal-docs/third-party-symbols.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal-docs/third-party-symbols.md b/internal-docs/third-party-symbols.md
index 161661cb5..c593685f8 100644
--- a/internal-docs/third-party-symbols.md
+++ b/internal-docs/third-party-symbols.md
@@ -154,7 +154,7 @@ and, if the link was defined by the user, the [CommentDisplayPart] which was par
 
 If `--useTsLinkResolution` is on (the default), it may also be passed a [ReflectionSymbolId] referencing the symbol that TypeScript resolves the link to.
 
-[externalSymbolLinkMappings]: https://typedoc.org/guides/options/#externalsymbollinkmappings
+[externalSymbolLinkMappings]: https://typedoc.org/options/comments/#externalsymbollinkmappings
 [CommentDisplayPart]: https://typedoc.org/api/types/CommentDisplayPart.html
 [DeclarationReference]: https://typedoc.org/api/interfaces/DeclarationReference.html
 [ReflectionSymbolId]: https://typedoc.org/api/classes/Application.html

From cf8026166e43c7d3e095ddf3c88ed723b66bb4e9 Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Sun, 31 Mar 2024 16:15:38 -0600
Subject: [PATCH 02/14] Add gitRevision:short option

Resolves #2529
---
 CHANGELOG.md                          |  9 ++++
 src/lib/converter/utils/repository.ts | 14 +++---
 src/test/Repository.test.ts           | 63 ++++++++++++++++++++++++++-
 3 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 319a6e2f7..3bc636028 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Unreleased
 
+### Features
+
+-   Added `gitRevision:short` placeholder option to `--sourceLinkTemplate` option, #2529.
+    Links generated by TypeDoc will now default to using the non-short git revision.
+
+### Thanks!
+
+-   @xuhdev
+
 ## v0.25.12 (2024-03-10)
 
 ### Features
diff --git a/src/lib/converter/utils/repository.ts b/src/lib/converter/utils/repository.ts
index 23fbbecc3..07cba5e9e 100644
--- a/src/lib/converter/utils/repository.ts
+++ b/src/lib/converter/utils/repository.ts
@@ -32,12 +32,13 @@ export class AssumedRepository implements Repository {
     getURL(fileName: string, line: number): string | undefined {
         const replacements = {
             gitRevision: this.gitRevision,
+            "gitRevision:short": this.gitRevision.substring(0, 8),
             path: fileName.substring(this.path.length + 1),
             line,
         };
 
         return this.sourceLinkTemplate.replace(
-            /\{(gitRevision|path|line)\}/g,
+            /\{(gitRevision|gitRevision:short|path|line)\}/g,
             (_, key) => replacements[key as never],
         );
     }
@@ -93,12 +94,13 @@ export class GitRepository implements Repository {
 
         const replacements = {
             gitRevision: this.gitRevision,
+            "gitRevision:short": this.gitRevision.substring(0, 8),
             path: fileName.substring(this.path.length + 1),
             line,
         };
 
         return this.urlTemplate.replace(
-            /\{(gitRevision|path|line)\}/g,
+            /\{(gitRevision|gitRevision:short|path|line)\}/g,
             (_, key) => replacements[key as never],
         );
     }
@@ -122,13 +124,7 @@ export class GitRepository implements Repository {
         const topLevel = git("-C", path, "rev-parse", "--show-toplevel");
         if (topLevel.status !== 0) return;
 
-        gitRevision ||= git(
-            "-C",
-            path,
-            "rev-parse",
-            "--short",
-            "HEAD",
-        ).stdout.trim();
+        gitRevision ||= git("-C", path, "rev-parse", "HEAD").stdout.trim();
         if (!gitRevision) return; // Will only happen in a repo with no commits.
 
         let urlTemplate: string | undefined;
diff --git a/src/test/Repository.test.ts b/src/test/Repository.test.ts
index c68821fd0..9294729de 100644
--- a/src/test/Repository.test.ts
+++ b/src/test/Repository.test.ts
@@ -1,5 +1,12 @@
-import { guessSourceUrlTemplate } from "../lib/converter/utils/repository";
-import { strictEqual as equal } from "assert";
+import {
+    GitRepository,
+    guessSourceUrlTemplate,
+} from "../lib/converter/utils/repository";
+import { strictEqual as equal, ok } from "assert";
+import { tempdirProject } from "@typestrong/fs-fixture-builder";
+import { spawnSync } from "child_process";
+import { TestLogger } from "./TestLogger";
+import { join } from "path";
 
 describe("Repository", function () {
     describe("guessSourceUrlTemplate helper", () => {
@@ -99,4 +106,56 @@ describe("Repository", function () {
             equal(guessSourceUrlTemplate(mockRemotes), undefined);
         });
     });
+
+    describe("getURL", () => {
+        const project = tempdirProject();
+        function git(...args: string[]) {
+            const env = {
+                GIT_AUTHOR_NAME: "test",
+                GIT_AUTHOR_EMAIL: "test@example.com",
+                GIT_AUTHOR_DATE: "2024-03-31T22:04:50.119Z",
+                GIT_COMMITTER_NAME: "test",
+                GIT_COMMITTER_EMAIL: "test@example.com",
+                GIT_COMMITTER_DATE: "2024-03-31T22:04:50.119Z",
+            };
+            return spawnSync("git", ["-C", project.cwd, ...args], {
+                encoding: "utf-8",
+                windowsHide: true,
+                env,
+            });
+        }
+
+        afterEach(() => {
+            project.rm();
+        });
+
+        it("Handles replacements", function () {
+            project.addFile("test.js", "console.log('hi!')");
+            project.write();
+
+            git("init", "-b", "test");
+            git("add", ".");
+            git("commit", "-m", "Test commit");
+            git(
+                "remote",
+                "add",
+                "origin",
+                "git@github.com:TypeStrong/typedoc.git",
+            );
+
+            const repo = GitRepository.tryCreateRepository(
+                project.cwd,
+                "{gitRevision}/{gitRevision:short}/{path}/{line}",
+                "", // revision, empty to get from repo
+                "origin", // remote
+                new TestLogger(),
+            );
+
+            ok(repo);
+            equal(
+                repo.getURL(join(project.cwd, "test.js"), 1),
+                "b53cc55bcdd9bc5920787a1d4a4a15fa24123b04/b53cc55b/test.js/1",
+            );
+        });
+    });
 });

From 3398e98dce4de5d7c5a53f1f6c66e1af8aa28cc9 Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Sun, 31 Mar 2024 16:25:53 -0600
Subject: [PATCH 03/14] Normalize path for Windows

---
 .github/workflows/ci.yml                |   2 +-
 .github/workflows/publish-beta.yml      |   2 +-
 .github/workflows/publish-lts.yml       |   2 +-
 .github/workflows/publish.yml           |   2 +-
 .github/workflows/visual-regression.yml |   2 +-
 package-lock.json                       | 312 ++++++++++++------------
 package.json                            |  10 +-
 src/test/Repository.test.ts             |   3 +-
 8 files changed, 168 insertions(+), 167 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b41d41f67..ab76207fc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                node: ["16", "18", "20"]
+                node: ["18", "20", "22"]
         name: Node ${{ matrix.node }}
         steps:
             - name: Checkout repository
diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml
index ea4f480e5..4a004bf39 100644
--- a/.github/workflows/publish-beta.yml
+++ b/.github/workflows/publish-beta.yml
@@ -18,7 +18,7 @@ jobs:
               if: steps.check.outputs.changed == 'true' && contains(steps.check.outputs.version, 'beta')
               uses: actions/setup-node@v1
               with:
-                  node-version: "16"
+                  node-version: "20"
             - name: Upgrade npm
               if: steps.check.outputs.changed == 'true' && contains(steps.check.outputs.version, 'beta')
               run: npm i -g npm@latest
diff --git a/.github/workflows/publish-lts.yml b/.github/workflows/publish-lts.yml
index 5136a01c7..ccc9e894f 100644
--- a/.github/workflows/publish-lts.yml
+++ b/.github/workflows/publish-lts.yml
@@ -18,7 +18,7 @@ jobs:
               if: steps.check.outputs.changed == 'true'
               uses: actions/setup-node@v3
               with:
-                  node-version: "16"
+                  node-version: "20"
             - name: Upgrade npm
               if: steps.check.outputs.changed == 'true'
               run: npm i -g npm@latest
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7605ade4e..627066b5a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -20,7 +20,7 @@ jobs:
               if: steps.check.outputs.changed == 'true'
               uses: actions/setup-node@v3
               with:
-                  node-version: "16"
+                  node-version: "20"
             - name: Install
               if: steps.check.outputs.changed == 'true'
               run: npm ci
diff --git a/.github/workflows/visual-regression.yml b/.github/workflows/visual-regression.yml
index 892d09179..734faeee5 100644
--- a/.github/workflows/visual-regression.yml
+++ b/.github/workflows/visual-regression.yml
@@ -9,7 +9,7 @@ jobs:
             - name: Set up Node
               uses: actions/setup-node@v3
               with:
-                  node-version: 16
+                  node-version: 20
             - name: Upgrade npm
               run: npm i -g npm@latest
             - name: Get baseline screenshots
diff --git a/package-lock.json b/package-lock.json
index 29bb38576..beeeef112 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,17 +22,17 @@
         "@types/marked": "^4.0.8",
         "@types/mocha": "^10.0.6",
         "@types/node": "16",
-        "@typescript-eslint/eslint-plugin": "^7.1.1",
-        "@typescript-eslint/parser": "^7.1.1",
+        "@typescript-eslint/eslint-plugin": "^7.4.0",
+        "@typescript-eslint/parser": "^7.4.0",
         "@typestrong/fs-fixture-builder": "github:TypeStrong/fs-fixture-builder#8abd1494280116ff5318dde2c50ad01e1663790c",
         "c8": "^9.1.0",
-        "esbuild": "^0.20.1",
+        "esbuild": "^0.20.2",
         "eslint": "^8.57.0",
-        "mocha": "^10.3.0",
+        "mocha": "^10.4.0",
         "prettier": "3.0.3",
         "puppeteer": "^13.5.2",
         "ts-node": "^10.9.2",
-        "typescript": "5.4.2"
+        "typescript": "5.4.3"
       },
       "engines": {
         "node": ">= 16"
@@ -69,9 +69,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz",
-      "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
+      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
       "cpu": [
         "ppc64"
       ],
@@ -85,9 +85,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz",
-      "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
+      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
       "cpu": [
         "arm"
       ],
@@ -101,9 +101,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz",
-      "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
+      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
       "cpu": [
         "arm64"
       ],
@@ -117,9 +117,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz",
-      "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
+      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
       "cpu": [
         "x64"
       ],
@@ -133,9 +133,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz",
-      "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
+      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
       "cpu": [
         "arm64"
       ],
@@ -149,9 +149,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz",
-      "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
+      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
       "cpu": [
         "x64"
       ],
@@ -165,9 +165,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz",
-      "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
+      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
       "cpu": [
         "arm64"
       ],
@@ -181,9 +181,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz",
-      "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
+      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
       "cpu": [
         "x64"
       ],
@@ -197,9 +197,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz",
-      "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
+      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
       "cpu": [
         "arm"
       ],
@@ -213,9 +213,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz",
-      "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
+      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
       "cpu": [
         "arm64"
       ],
@@ -229,9 +229,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
-      "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
+      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
       "cpu": [
         "ia32"
       ],
@@ -245,9 +245,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz",
-      "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
+      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
       "cpu": [
         "loong64"
       ],
@@ -261,9 +261,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz",
-      "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
+      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
       "cpu": [
         "mips64el"
       ],
@@ -277,9 +277,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz",
-      "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
+      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
       "cpu": [
         "ppc64"
       ],
@@ -293,9 +293,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz",
-      "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
+      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
       "cpu": [
         "riscv64"
       ],
@@ -309,9 +309,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz",
-      "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
+      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
       "cpu": [
         "s390x"
       ],
@@ -325,9 +325,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
-      "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
       "cpu": [
         "x64"
       ],
@@ -341,9 +341,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
       "cpu": [
         "x64"
       ],
@@ -357,9 +357,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
       "cpu": [
         "x64"
       ],
@@ -373,9 +373,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz",
-      "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
+      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
       "cpu": [
         "x64"
       ],
@@ -389,9 +389,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz",
-      "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
+      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
       "cpu": [
         "arm64"
       ],
@@ -405,9 +405,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz",
-      "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
+      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
       "cpu": [
         "ia32"
       ],
@@ -421,9 +421,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz",
-      "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
+      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
       "cpu": [
         "x64"
       ],
@@ -715,16 +715,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.1.tgz",
-      "integrity": "sha512-zioDz623d0RHNhvx0eesUmGfIjzrk18nSBC8xewepKXbBvN/7c1qImV7Hg8TI1URTxKax7/zxfxj3Uph8Chcuw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.4.0.tgz",
+      "integrity": "sha512-yHMQ/oFaM7HZdVrVm/M2WHaNPgyuJH4WelkSVEWSSsir34kxW2kDJCxlXRhhGWEsMN0WAW/vLpKfKVcm8k+MPw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "7.1.1",
-        "@typescript-eslint/type-utils": "7.1.1",
-        "@typescript-eslint/utils": "7.1.1",
-        "@typescript-eslint/visitor-keys": "7.1.1",
+        "@typescript-eslint/scope-manager": "7.4.0",
+        "@typescript-eslint/type-utils": "7.4.0",
+        "@typescript-eslint/utils": "7.4.0",
+        "@typescript-eslint/visitor-keys": "7.4.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -733,7 +733,7 @@
         "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -750,19 +750,19 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.1.1.tgz",
-      "integrity": "sha512-ZWUFyL0z04R1nAEgr9e79YtV5LbafdOtN7yapNbn1ansMyaegl2D4bL7vHoJ4HPSc4CaLwuCVas8CVuneKzplQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.4.0.tgz",
+      "integrity": "sha512-ZvKHxHLusweEUVwrGRXXUVzFgnWhigo4JurEj0dGF1tbcGh6buL+ejDdjxOQxv6ytcY1uhun1p2sm8iWStlgLQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.1.1",
-        "@typescript-eslint/types": "7.1.1",
-        "@typescript-eslint/typescript-estree": "7.1.1",
-        "@typescript-eslint/visitor-keys": "7.1.1",
+        "@typescript-eslint/scope-manager": "7.4.0",
+        "@typescript-eslint/types": "7.4.0",
+        "@typescript-eslint/typescript-estree": "7.4.0",
+        "@typescript-eslint/visitor-keys": "7.4.0",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -778,16 +778,16 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.1.1.tgz",
-      "integrity": "sha512-cirZpA8bJMRb4WZ+rO6+mnOJrGFDd38WoXCEI57+CYBqta8Yc8aJym2i7vyqLL1vVYljgw0X27axkUXz32T8TA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.4.0.tgz",
+      "integrity": "sha512-68VqENG5HK27ypafqLVs8qO+RkNc7TezCduYrx8YJpXq2QGZ30vmNZGJJJC48+MVn4G2dCV8m5ZTVnzRexTVtw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.1.1",
-        "@typescript-eslint/visitor-keys": "7.1.1"
+        "@typescript-eslint/types": "7.4.0",
+        "@typescript-eslint/visitor-keys": "7.4.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -795,18 +795,18 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.1.1.tgz",
-      "integrity": "sha512-5r4RKze6XHEEhlZnJtR3GYeCh1IueUHdbrukV2KSlLXaTjuSfeVF8mZUVPLovidCuZfbVjfhi4c0DNSa/Rdg5g==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.4.0.tgz",
+      "integrity": "sha512-247ETeHgr9WTRMqHbbQdzwzhuyaJ8dPTuyuUEMANqzMRB1rj/9qFIuIXK7l0FX9i9FXbHeBQl/4uz6mYuCE7Aw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.1.1",
-        "@typescript-eslint/utils": "7.1.1",
+        "@typescript-eslint/typescript-estree": "7.4.0",
+        "@typescript-eslint/utils": "7.4.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -822,12 +822,12 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.1.1.tgz",
-      "integrity": "sha512-KhewzrlRMrgeKm1U9bh2z5aoL4s7K3tK5DwHDn8MHv0yQfWFz/0ZR6trrIHHa5CsF83j/GgHqzdbzCXJ3crx0Q==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.4.0.tgz",
+      "integrity": "sha512-mjQopsbffzJskos5B4HmbsadSJQWaRK0UxqQ7GuNA9Ga4bEKeiO6b2DnB6cM6bpc8lemaPseh0H9B/wyg+J7rw==",
       "dev": true,
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -835,13 +835,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.1.tgz",
-      "integrity": "sha512-9ZOncVSfr+sMXVxxca2OJOPagRwT0u/UHikM2Rd6L/aB+kL/QAuTnsv6MeXtjzCJYb8PzrXarypSGIPx3Jemxw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.4.0.tgz",
+      "integrity": "sha512-A99j5AYoME/UBQ1ucEbbMEmGkN7SE0BvZFreSnTd1luq7yulcHdyGamZKizU7canpGDWGJ+Q6ZA9SyQobipePg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.1.1",
-        "@typescript-eslint/visitor-keys": "7.1.1",
+        "@typescript-eslint/types": "7.4.0",
+        "@typescript-eslint/visitor-keys": "7.4.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -850,7 +850,7 @@
         "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -863,21 +863,21 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.1.1.tgz",
-      "integrity": "sha512-thOXM89xA03xAE0lW7alstvnyoBUbBX38YtY+zAUcpRPcq9EIhXPuJ0YTv948MbzmKh6e1AUszn5cBFK49Umqg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.4.0.tgz",
+      "integrity": "sha512-NQt9QLM4Tt8qrlBVY9lkMYzfYtNz8/6qwZg8pI3cMGlPnj6mOpRxxAm7BMJN9K0AiY+1BwJ5lVC650YJqYOuNg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "7.1.1",
-        "@typescript-eslint/types": "7.1.1",
-        "@typescript-eslint/typescript-estree": "7.1.1",
+        "@typescript-eslint/scope-manager": "7.4.0",
+        "@typescript-eslint/types": "7.4.0",
+        "@typescript-eslint/typescript-estree": "7.4.0",
         "semver": "^7.5.4"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -888,16 +888,16 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.1.tgz",
-      "integrity": "sha512-yTdHDQxY7cSoCcAtiBzVzxleJhkGB9NncSIyMYe2+OGON1ZsP9zOPws/Pqgopa65jvknOjlk/w7ulPlZ78PiLQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.4.0.tgz",
+      "integrity": "sha512-0zkC7YM0iX5Y41homUUeW1CHtZR01K3ybjM1l6QczoMuay0XKtrb93kv95AxUGwdjGr64nNqnOCwmEl616N8CA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.1.1",
+        "@typescript-eslint/types": "7.4.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -1424,9 +1424,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz",
-      "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
+      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -1436,29 +1436,29 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.1",
-        "@esbuild/android-arm": "0.20.1",
-        "@esbuild/android-arm64": "0.20.1",
-        "@esbuild/android-x64": "0.20.1",
-        "@esbuild/darwin-arm64": "0.20.1",
-        "@esbuild/darwin-x64": "0.20.1",
-        "@esbuild/freebsd-arm64": "0.20.1",
-        "@esbuild/freebsd-x64": "0.20.1",
-        "@esbuild/linux-arm": "0.20.1",
-        "@esbuild/linux-arm64": "0.20.1",
-        "@esbuild/linux-ia32": "0.20.1",
-        "@esbuild/linux-loong64": "0.20.1",
-        "@esbuild/linux-mips64el": "0.20.1",
-        "@esbuild/linux-ppc64": "0.20.1",
-        "@esbuild/linux-riscv64": "0.20.1",
-        "@esbuild/linux-s390x": "0.20.1",
-        "@esbuild/linux-x64": "0.20.1",
-        "@esbuild/netbsd-x64": "0.20.1",
-        "@esbuild/openbsd-x64": "0.20.1",
-        "@esbuild/sunos-x64": "0.20.1",
-        "@esbuild/win32-arm64": "0.20.1",
-        "@esbuild/win32-ia32": "0.20.1",
-        "@esbuild/win32-x64": "0.20.1"
+        "@esbuild/aix-ppc64": "0.20.2",
+        "@esbuild/android-arm": "0.20.2",
+        "@esbuild/android-arm64": "0.20.2",
+        "@esbuild/android-x64": "0.20.2",
+        "@esbuild/darwin-arm64": "0.20.2",
+        "@esbuild/darwin-x64": "0.20.2",
+        "@esbuild/freebsd-arm64": "0.20.2",
+        "@esbuild/freebsd-x64": "0.20.2",
+        "@esbuild/linux-arm": "0.20.2",
+        "@esbuild/linux-arm64": "0.20.2",
+        "@esbuild/linux-ia32": "0.20.2",
+        "@esbuild/linux-loong64": "0.20.2",
+        "@esbuild/linux-mips64el": "0.20.2",
+        "@esbuild/linux-ppc64": "0.20.2",
+        "@esbuild/linux-riscv64": "0.20.2",
+        "@esbuild/linux-s390x": "0.20.2",
+        "@esbuild/linux-x64": "0.20.2",
+        "@esbuild/netbsd-x64": "0.20.2",
+        "@esbuild/openbsd-x64": "0.20.2",
+        "@esbuild/sunos-x64": "0.20.2",
+        "@esbuild/win32-arm64": "0.20.2",
+        "@esbuild/win32-ia32": "0.20.2",
+        "@esbuild/win32-x64": "0.20.2"
       }
     },
     "node_modules/escalade": {
@@ -2365,9 +2365,9 @@
       "dev": true
     },
     "node_modules/mocha": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz",
-      "integrity": "sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz",
+      "integrity": "sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==",
       "dev": true,
       "dependencies": {
         "ansi-colors": "4.1.1",
@@ -3311,9 +3311,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
-      "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz",
+      "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
diff --git a/package.json b/package.json
index 6adc07a9c..2efd03ec0 100644
--- a/package.json
+++ b/package.json
@@ -37,17 +37,17 @@
     "@types/marked": "^4.0.8",
     "@types/mocha": "^10.0.6",
     "@types/node": "16",
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1",
+    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/parser": "^7.4.0",
     "@typestrong/fs-fixture-builder": "github:TypeStrong/fs-fixture-builder#8abd1494280116ff5318dde2c50ad01e1663790c",
     "c8": "^9.1.0",
-    "esbuild": "^0.20.1",
+    "esbuild": "^0.20.2",
     "eslint": "^8.57.0",
-    "mocha": "^10.3.0",
+    "mocha": "^10.4.0",
     "prettier": "3.0.3",
     "puppeteer": "^13.5.2",
     "ts-node": "^10.9.2",
-    "typescript": "5.4.2"
+    "typescript": "5.4.3"
   },
   "files": [
     "/bin",
diff --git a/src/test/Repository.test.ts b/src/test/Repository.test.ts
index 9294729de..e62d95383 100644
--- a/src/test/Repository.test.ts
+++ b/src/test/Repository.test.ts
@@ -7,6 +7,7 @@ import { tempdirProject } from "@typestrong/fs-fixture-builder";
 import { spawnSync } from "child_process";
 import { TestLogger } from "./TestLogger";
 import { join } from "path";
+import { normalizePath } from "../lib/utils/paths";
 
 describe("Repository", function () {
     describe("guessSourceUrlTemplate helper", () => {
@@ -153,7 +154,7 @@ describe("Repository", function () {
 
             ok(repo);
             equal(
-                repo.getURL(join(project.cwd, "test.js"), 1),
+                repo.getURL(normalizePath(join(project.cwd, "test.js")), 1),
                 "b53cc55bcdd9bc5920787a1d4a4a15fa24123b04/b53cc55b/test.js/1",
             );
         });

From b76d80475f2db046e9b03fdca89a7ef9804dcccc Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Sat, 6 Apr 2024 17:02:19 -0600
Subject: [PATCH 04/14] Fix conversion of NoInfer

Resolves #2539
---
 CHANGELOG.md                 | 4 ++++
 src/lib/converter/types.ts   | 9 +++++++--
 src/test/behavior.c2.test.ts | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bc636028..d3c9c2b8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@
 -   Added `gitRevision:short` placeholder option to `--sourceLinkTemplate` option, #2529.
     Links generated by TypeDoc will now default to using the non-short git revision.
 
+### Bug Fixes
+
+-   Fixed conversion of `NoInfer` missing type parameter reference, #2539.
+
 ### Thanks!
 
 -   @xuhdev
diff --git a/src/lib/converter/types.ts b/src/lib/converter/types.ts
index e7d0c284e..01b88154f 100644
--- a/src/lib/converter/types.ts
+++ b/src/lib/converter/types.ts
@@ -697,7 +697,7 @@ const queryConverter: TypeConverter<ts.TypeQueryNode> = {
 
 const referenceConverter: TypeConverter<
     ts.TypeReferenceNode,
-    ts.TypeReference | ts.StringMappingType
+    ts.TypeReference | ts.StringMappingType | ts.SubstitutionType
 > = {
     kind: [ts.SyntaxKind.TypeReference],
     convert(context, node) {
@@ -747,7 +747,12 @@ const referenceConverter: TypeConverter<
             context.resolveAliasedSymbol(symbol),
             context,
         );
-        if (type.flags & ts.TypeFlags.StringMapping) {
+        if (type.flags & ts.TypeFlags.Substitution) {
+            // NoInfer<T>
+            ref.typeArguments = [
+                convertType(context, (type as ts.SubstitutionType).baseType),
+            ];
+        } else if (type.flags & ts.TypeFlags.StringMapping) {
             ref.typeArguments = [
                 convertType(context, (type as ts.StringMappingType).type),
             ];
diff --git a/src/test/behavior.c2.test.ts b/src/test/behavior.c2.test.ts
index 44085dc8d..ff1f5c970 100644
--- a/src/test/behavior.c2.test.ts
+++ b/src/test/behavior.c2.test.ts
@@ -1177,6 +1177,6 @@ describe("Behavior Tests", () => {
         const sig = querySig(project, "createStreetLight");
         equal(sig.parameters?.length, 2);
         equal(sig.parameters[0].type?.toString(), "C[]");
-        equal(sig.parameters[1].type?.toString(), "NoInfer");
+        equal(sig.parameters[1].type?.toString(), "NoInfer<C>");
     });
 });

From 7ed0e46db9c213e218c9a1fa2b839bc1e2e6937c Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Sun, 7 Apr 2024 15:41:36 -0600
Subject: [PATCH 05/14] I thought Node 22 existed already

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab76207fc..f05ed0295 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                node: ["18", "20", "22"]
+                node: ["18", "20", "21"]
         name: Node ${{ matrix.node }}
         steps:
             - name: Checkout repository

From b53300433f288c8adbb87f21480f56fcc7367f56 Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Sun, 7 Apr 2024 15:47:56 -0600
Subject: [PATCH 06/14] Move generator into `<footer>`

Resolves #2532
---
 CHANGELOG.md                                      |  2 ++
 src/lib/output/renderer.ts                        | 10 ++++++++++
 src/lib/output/themes/default/partials/footer.tsx | 15 +++++++++------
 static/style.css                                  |  9 +++------
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3c9c2b8e..41269a14f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 -   Added `gitRevision:short` placeholder option to `--sourceLinkTemplate` option, #2529.
     Links generated by TypeDoc will now default to using the non-short git revision.
+-   Moved "Generated by TypeDoc" footer into a `<footer>` tag, added `footer.begin` and `footer.end`
+    render hooks for use by custom plugins, #2532.
 
 ### Bug Fixes
 
diff --git a/src/lib/output/renderer.ts b/src/lib/output/renderer.ts
index c3d4a7a5b..3ec4aa27d 100644
--- a/src/lib/output/renderer.ts
+++ b/src/lib/output/renderer.ts
@@ -81,6 +81,16 @@ export interface RendererHooks {
      * Applied immediately after calling `context.pageSidebar`.
      */
     "pageSidebar.end": [DefaultThemeRenderContext];
+
+    /**
+     * Applied immediately before the "Generated by TypeDoc" link in the footer.
+     */
+    "footer.begin": [DefaultThemeRenderContext];
+
+    /**
+     * Applied immediately after the "Generated by TypeDoc" link in the footer.
+     */
+    "footer.end": [DefaultThemeRenderContext];
 }
 
 /**
diff --git a/src/lib/output/themes/default/partials/footer.tsx b/src/lib/output/themes/default/partials/footer.tsx
index d1d1613b2..0bca03947 100644
--- a/src/lib/output/themes/default/partials/footer.tsx
+++ b/src/lib/output/themes/default/partials/footer.tsx
@@ -3,15 +3,18 @@ import type { DefaultThemeRenderContext } from "../DefaultThemeRenderContext";
 
 export function footer(context: DefaultThemeRenderContext) {
     const hideGenerator = context.options.getValue("hideGenerator");
-    if (!hideGenerator)
-        return (
-            <div class="tsd-generator">
-                <p>
+    return (
+        <footer>
+            {context.hook("footer.begin")}
+            {hideGenerator || (
+                <p class="tsd-generator">
                     {"Generated using "}
                     <a href="https://typedoc.org/" target="_blank">
                         TypeDoc
                     </a>
                 </p>
-            </div>
-        );
+            )}
+            {context.hook("footer.end")}
+        </footer>
+    );
 }
diff --git a/static/style.css b/static/style.css
index 072daed85..778b94927 100644
--- a/static/style.css
+++ b/static/style.css
@@ -327,17 +327,14 @@ dd {
 }
 
 /* Footer */
-.tsd-generator {
+footer {
     border-top: 1px solid var(--color-accent);
     padding-top: 1rem;
     padding-bottom: 1rem;
     max-height: 3.5rem;
 }
-
-.tsd-generator > p {
-    margin-top: 0;
-    margin-bottom: 0;
-    padding: 0 1rem;
+.tsd-generator {
+    margin: 0 1em;
 }
 
 .container-main {

From 307da6d3608558b0563130f013c45705092499e7 Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Sun, 7 Apr 2024 15:55:18 -0600
Subject: [PATCH 07/14] Fix "normally hidden" banner

---
 CHANGELOG.md                                              | 2 ++
 .../output/themes/default/assets/typedoc/Application.ts   | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41269a14f..a9e68985b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@
 ### Bug Fixes
 
 -   Fixed conversion of `NoInfer` missing type parameter reference, #2539.
+-   Linking to a member on a page no longer incorrectly claims that
+    "This member is normally hidden due to your filter settings" for every member.
 
 ### Thanks!
 
diff --git a/src/lib/output/themes/default/assets/typedoc/Application.ts b/src/lib/output/themes/default/assets/typedoc/Application.ts
index 4d1e4a1d8..0406e1d27 100644
--- a/src/lib/output/themes/default/assets/typedoc/Application.ts
+++ b/src/lib/output/themes/default/assets/typedoc/Application.ts
@@ -42,8 +42,9 @@ export class Application {
         // We're on a *really* slow network connection and the inline JS
         // has already made the page display.
         if (!document.body.style.display) {
-            this.scrollToHash();
+            this.ensureFocusedElementVisible();
             this.updateIndexVisibility();
+            this.scrollToHash();
         }
     }
 
@@ -67,15 +68,18 @@ export class Application {
 
     public showPage() {
         if (!document.body.style.display) return;
+        console.log("Show page");
         document.body.style.removeProperty("display");
-        this.scrollToHash();
+        this.ensureFocusedElementVisible();
         this.updateIndexVisibility();
+        this.scrollToHash();
     }
 
     public scrollToHash() {
         // Because we hid the entire page until the navigation loaded or we hit a timeout,
         // we have to manually resolve the url hash here.
         if (location.hash) {
+            console.log("Scorlling");
             const reflAnchor = document.getElementById(
                 location.hash.substring(1),
             );

From f41dee88cd8b6f0eab04f2815f2557b7359926fd Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Sun, 7 Apr 2024 15:58:47 -0600
Subject: [PATCH 08/14] Bump version to 0.25.13

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index beeeef112..998be1249 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "typedoc",
-  "version": "0.25.12",
+  "version": "0.25.13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "typedoc",
-      "version": "0.25.12",
+      "version": "0.25.13",
       "license": "Apache-2.0",
       "dependencies": {
         "lunr": "^2.3.9",
diff --git a/package.json b/package.json
index 2efd03ec0..0ec52d3d6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "typedoc",
   "description": "Create api documentation for TypeScript projects.",
-  "version": "0.25.12",
+  "version": "0.25.13",
   "homepage": "https://typedoc.org",
   "exports": {
     ".": "./dist/index.js",

From 6b8be1702e50cc574694c679daa82cb59c47a4cd Mon Sep 17 00:00:00 2001
From: TypeDoc Bot <typedoc@gerritbirkeland.com>
Date: Sun, 7 Apr 2024 21:59:31 +0000
Subject: [PATCH 09/14] Update changelog for release

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9e68985b..baf867a4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+## v0.25.13 (2024-04-07)
+
 ### Features
 
 -   Added `gitRevision:short` placeholder option to `--sourceLinkTemplate` option, #2529.

From d4b9c74e2b141d769e069a229d06096c3a7d114c Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Sat, 13 Apr 2024 20:50:37 -0600
Subject: [PATCH 10/14] Fix coloring of links in Returns header

Resolves #2546
---
 CHANGELOG.md                                  |  5 +++++
 scripts/download_plugins.js                   | 11 +++++++++-
 src/lib/output/themes/MarkedPlugin.tsx        | 21 ++++++++++++++-----
 .../default/DefaultThemeRenderContext.ts      |  7 +++++--
 .../themes/default/partials/hierarchy.tsx     |  6 +-----
 static/style.css                              | 13 +++---------
 6 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index baf867a4f..b8780fcb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Unreleased
 
+### Bug Fixes
+
+-   Header anchor links in rendered markdown are now more consistent with headers generated by TypeDoc, #2546.
+-   Types rendered in the `Returns` header are now properly colored, #2546.
+
 ## v0.25.13 (2024-04-07)
 
 ### Features
diff --git a/scripts/download_plugins.js b/scripts/download_plugins.js
index 66600d03c..1931c1365 100644
--- a/scripts/download_plugins.js
+++ b/scripts/download_plugins.js
@@ -28,7 +28,16 @@ function exec(command) {
 
 async function getPlugins() {
     const plugins = JSON.parse(await exec("npm search --json typedocplugin"));
-    return plugins.filter((plugin) => Date.parse(plugin.date) > CUTOFF_MS);
+    const plugins2 = JSON.parse(await exec("npm search --json typedoc-plugin"));
+    const plugins3 = JSON.parse(await exec("npm search --json typedoc-theme"));
+    const recentlyUpdated = [...plugins, ...plugins2, ...plugins3].filter(
+        (plugin) => Date.parse(plugin.date) > CUTOFF_MS,
+    );
+
+    return recentlyUpdated.filter(
+        (plugin, i) =>
+            i === recentlyUpdated.findIndex((p) => p.name === plugin.name),
+    );
 }
 
 function getTarballUrl(package) {
diff --git a/src/lib/output/themes/MarkedPlugin.tsx b/src/lib/output/themes/MarkedPlugin.tsx
index 6d201537a..b1aaee5cf 100644
--- a/src/lib/output/themes/MarkedPlugin.tsx
+++ b/src/lib/output/themes/MarkedPlugin.tsx
@@ -8,6 +8,8 @@ import { Option, readFile, copySync, isFile, JSX, renderElement } from "../../ut
 import { highlight, isSupportedLanguage } from "../../utils/highlighter";
 import type { Theme } from "shiki";
 import { escapeHtml, getTextContent } from "../../utils/html";
+import { anchorIcon } from "./default/partials/anchor-icon";
+import type { DefaultThemeRenderContext } from "..";
 
 /**
  * Implements markdown and relativeURL helpers for templates.
@@ -27,6 +29,12 @@ export class MarkedPlugin extends ContextAwareRendererComponent {
     @Option("darkHighlightTheme")
     accessor darkTheme!: Theme;
 
+    /**
+     * This needing to be here really feels hacky... probably some nicer way to do this.
+     * Revisit when adding support for arbitrary pages.
+     */
+    private renderContext: DefaultThemeRenderContext = null!;
+
     /**
      * The path referenced files are located in.
      */
@@ -89,7 +97,9 @@ output file :
      * @param text  The markdown string that should be parsed.
      * @returns The resulting html string.
      */
-    public parseMarkdown(text: string, page: PageEvent<any>) {
+    public parseMarkdown(text: string, page: PageEvent<any>, context: DefaultThemeRenderContext) {
+        this.renderContext = context;
+
         if (this.includes) {
             text = text.replace(this.includePattern, (_match, path) => {
                 path = Path.join(this.includes!, path.trim());
@@ -121,6 +131,7 @@ output file :
         const event = new MarkdownEvent(MarkdownEvent.PARSE, page, text, text);
 
         this.owner.trigger(event);
+        this.renderContext = null!;
         return event.parsedText;
     }
 
@@ -190,10 +201,9 @@ output file :
                 return renderElement(
                     <>
                         <a id={`md:${slug}`} class="tsd-anchor" />
-                        <H>
-                            <a href={`#md:${slug}`}>
-                                <JSX.Raw html={text} />
-                            </a>
+                        <H class="tsd-anchor-link">
+                            <JSX.Raw html={text} />
+                            {anchorIcon(this.renderContext, `md:${slug}`)}
                         </H>
                     </>,
                 );
@@ -218,6 +228,7 @@ output file :
 
 // Basically a copy/paste of Marked's code, with the addition of the button
 // https://github.com/markedjs/marked/blob/v4.3.0/src/Renderer.js#L15-L39
+// cSpell:ignore infostring
 function renderCode(this: Marked.marked.Renderer, code: string, infostring: string | undefined, escaped: boolean) {
     const lang = (infostring || "").match(/\S*/)![0];
     if (this.options.highlight) {
diff --git a/src/lib/output/themes/default/DefaultThemeRenderContext.ts b/src/lib/output/themes/default/DefaultThemeRenderContext.ts
index 0e663f377..ddd3b7e90 100644
--- a/src/lib/output/themes/default/DefaultThemeRenderContext.ts
+++ b/src/lib/output/themes/default/DefaultThemeRenderContext.ts
@@ -62,7 +62,7 @@ export class DefaultThemeRenderContext {
         options: Options,
     ) {
         this.options = options;
-        this._refIcons = buildRefIcons(icons, this);
+        this._refIcons = buildRefIcons(theme.icons, this);
     }
 
     /**
@@ -105,9 +105,12 @@ export class DefaultThemeRenderContext {
             return this.theme.markedPlugin.parseMarkdown(
                 Comment.displayPartsToMarkdown(md, this.urlTo),
                 this.page,
+                this,
             );
         }
-        return md ? this.theme.markedPlugin.parseMarkdown(md, this.page) : "";
+        return md
+            ? this.theme.markedPlugin.parseMarkdown(md, this.page, this)
+            : "";
     };
 
     getNavigation = () => this.theme.getNavigation(this.page.project);
diff --git a/src/lib/output/themes/default/partials/hierarchy.tsx b/src/lib/output/themes/default/partials/hierarchy.tsx
index fa979eeb3..b56c496c6 100644
--- a/src/lib/output/themes/default/partials/hierarchy.tsx
+++ b/src/lib/output/themes/default/partials/hierarchy.tsx
@@ -21,11 +21,7 @@ export function hierarchy(context: DefaultThemeRenderContext, props: Declaration
     const fullLink = hasAnyLinkedReferenceType(props) ? (
         <>
             {" "}
-            (
-            <a class="link" href={context.relativeURL("hierarchy.html") + "#" + context.page.model.getFullName()}>
-                view full
-            </a>
-            )
+            (<a href={context.relativeURL("hierarchy.html") + "#" + context.page.model.getFullName()}>view full</a>)
         </>
     ) : (
         <></>
diff --git a/static/style.css b/static/style.css
index 778b94927..b1ef2fb7d 100644
--- a/static/style.css
+++ b/static/style.css
@@ -266,16 +266,6 @@ h6 {
     line-height: 1.2;
 }
 
-h1 > a:not(.link),
-h2 > a:not(.link),
-h3 > a:not(.link),
-h4 > a:not(.link),
-h5 > a:not(.link),
-h6 > a:not(.link) {
-    text-decoration: none;
-    color: var(--color-text);
-}
-
 h1 {
     font-size: 1.875rem;
     margin: 0.67rem 0;
@@ -421,6 +411,9 @@ a.external[target="_blank"] {
     background-repeat: no-repeat;
     padding-right: 13px;
 }
+a.tsd-anchor-link {
+    color: var(--color-text);
+}
 
 code,
 pre {

From eb363a2dbbb4c2250a0baffa40d4ebdf8079ae56 Mon Sep 17 00:00:00 2001
From: Harel M <harel.mazor@gmail.com>
Date: Sat, 27 Apr 2024 19:35:37 +0300
Subject: [PATCH 11/14] Fix navigation links on mobile (#2548)

* An attempt to fixissue with navigation links on mobile

* Fix lint

* Fix incorrect css
---
 src/lib/output/themes/default/partials/navigation.tsx | 9 ++++++++-
 static/style.css                                      | 9 +++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/lib/output/themes/default/partials/navigation.tsx b/src/lib/output/themes/default/partials/navigation.tsx
index 6622fa70d..7ae6968ad 100644
--- a/src/lib/output/themes/default/partials/navigation.tsx
+++ b/src/lib/output/themes/default/partials/navigation.tsx
@@ -27,12 +27,19 @@ function buildFilterItem(context: DefaultThemeRenderContext, name: string, displ
 
 export function sidebarLinks(context: DefaultThemeRenderContext) {
     const links = Object.entries(context.options.getValue("sidebarLinks"));
-    if (!links.length) return null;
+    const navLinks = Object.entries(context.options.getValue("navigationLinks"));
+
+    if (!links.length && !navLinks.length) return null;
     return (
         <nav id="tsd-sidebar-links" class="tsd-navigation">
             {links.map(([label, url]) => (
                 <a href={url}>{label}</a>
             ))}
+            {navLinks.map(([label, url]) => (
+                <a href={url} class="tsd-nav-link">
+                    {label}
+                </a>
+            ))}
         </nav>
     );
 }
diff --git a/static/style.css b/static/style.css
index b1ef2fb7d..da5e73a66 100644
--- a/static/style.css
+++ b/static/style.css
@@ -762,6 +762,9 @@ input[type="checkbox"]:checked ~ svg .tsd-checkbox-checkmark {
     padding: 0;
     max-width: 100%;
 }
+.tsd-navigation .tsd-nav-link {
+    display: none;
+}
 .tsd-nested-navigation {
     margin-left: 3rem;
 }
@@ -1340,6 +1343,12 @@ img {
     .has-menu .tsd-navigation {
         max-height: 100%;
     }
+    #tsd-toolbar-links {
+        display: none;
+    }
+    .tsd-navigation .tsd-nav-link {
+        display: flex;
+    }
 }
 
 /* one sidebar */

From 4e562399d67dab89259e23fa620cba74ff858d29 Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Sat, 27 Apr 2024 10:37:01 -0600
Subject: [PATCH 12/14] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8780fcb2..fa1e9051c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 -   Header anchor links in rendered markdown are now more consistent with headers generated by TypeDoc, #2546.
 -   Types rendered in the `Returns` header are now properly colored, #2546.
+-   Links added with the `navigationLinks` option are now moved into the pull out navigation on mobile displays, #2548.
+
+### Thanks!
+
+-   @HarelM
 
 ## v0.25.13 (2024-04-07)
 

From 95bf5d0143c1a69837ffcb3fca617924b1333cdb Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Sat, 27 Apr 2024 11:32:56 -0600
Subject: [PATCH 13/14] Ignore `@license` and `@import` comments at the top of
 files

Resolves #2552
---
 CHANGELOG.md                            |  1 +
 scripts/testcase.js                     |  7 ++---
 src/lib/converter/comments/discovery.ts | 12 ++++-----
 src/lib/converter/comments/index.ts     | 35 ++++++++++++++++++-------
 src/lib/utils/options/tsdoc-defaults.ts |  2 ++
 src/test/converter2/issues/gh2552.js    | 16 +++++++++++
 src/test/issues.c2.test.ts              |  8 ++++++
 tsdoc.json                              |  9 +++++++
 8 files changed, 72 insertions(+), 18 deletions(-)
 create mode 100644 src/test/converter2/issues/gh2552.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa1e9051c..667933a59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 -   Header anchor links in rendered markdown are now more consistent with headers generated by TypeDoc, #2546.
 -   Types rendered in the `Returns` header are now properly colored, #2546.
 -   Links added with the `navigationLinks` option are now moved into the pull out navigation on mobile displays, #2548.
+-   `@license` and `@import` comments will be ignored at the top of files, #2552.
 
 ### Thanks!
 
diff --git a/scripts/testcase.js b/scripts/testcase.js
index b531d9529..8b53bda68 100644
--- a/scripts/testcase.js
+++ b/scripts/testcase.js
@@ -37,8 +37,8 @@ function guessExtension(code) {
 }
 
 async function main() {
-    if (process.argv.length !== 3) {
-        console.log("Usage: node scripts/testcase.js <issue number>");
+    if (process.argv.length !== 3 && process.argv.length !== 4) {
+        console.log("Usage: node scripts/testcase.js <issue number> [lang]");
         process.exit(1);
     }
 
@@ -62,7 +62,8 @@ async function main() {
         return;
     }
 
-    const file = `src/test/converter2/issues/gh${issue}${guessExtension(code)}`;
+    const ext = process.argv[3] ? `.${process.argv[3]}` : guessExtension(code);
+    const file = `src/test/converter2/issues/gh${issue}${ext}`;
     await writeFile(file, code.text);
     await exec(`code ${file} src/test/issues.c2.test.ts`);
 }
diff --git a/src/lib/converter/comments/discovery.ts b/src/lib/converter/comments/discovery.ts
index 2a15f4a99..27c50b108 100644
--- a/src/lib/converter/comments/discovery.ts
+++ b/src/lib/converter/comments/discovery.ts
@@ -110,7 +110,7 @@ export interface DiscoveredComment {
     jsDoc: ts.JSDoc | undefined;
 }
 
-export function discoverFileComment(
+export function discoverFileComments(
     node: ts.SourceFile,
     commentStyle: CommentStyle,
 ) {
@@ -120,17 +120,17 @@ export function discoverFileComment(
         ts.getLeadingCommentRanges(text, node.pos),
     );
 
-    const selectedDocComment = comments.find((ranges) =>
+    const selectedDocComments = comments.filter((ranges) =>
         permittedRange(text, ranges, commentStyle),
     );
 
-    if (selectedDocComment) {
+    return selectedDocComments.map((ranges) => {
         return {
             file: node,
-            ranges: selectedDocComment,
-            jsDoc: findJsDocForComment(node, selectedDocComment),
+            ranges,
+            jsDoc: findJsDocForComment(node, ranges),
         };
-    }
+    });
 }
 
 export function discoverNodeComment(
diff --git a/src/lib/converter/comments/index.ts b/src/lib/converter/comments/index.ts
index da7b776db..c233c07a7 100644
--- a/src/lib/converter/comments/index.ts
+++ b/src/lib/converter/comments/index.ts
@@ -9,7 +9,7 @@ import { lexBlockComment } from "./blockLexer";
 import {
     DiscoveredComment,
     discoverComment,
-    discoverFileComment,
+    discoverFileComments,
     discoverNodeComment,
     discoverSignatureComment,
 } from "./discovery";
@@ -143,8 +143,12 @@ export function getComment(
         );
     }
 
+    const sf = declarations.find(ts.isSourceFile);
+    if (sf) {
+        return getFileComment(sf, config, logger, commentStyle, checker);
+    }
+
     const isModule = declarations.some((decl) => {
-        if (ts.isSourceFile(decl)) return true;
         if (ts.isModuleDeclaration(decl) && ts.isStringLiteral(decl.name)) {
             return true;
         }
@@ -196,13 +200,26 @@ export function getFileComment(
     commentStyle: CommentStyle,
     checker: ts.TypeChecker | undefined,
 ): Comment | undefined {
-    return getCommentImpl(
-        discoverFileComment(file, commentStyle),
-        config,
-        logger,
-        /* moduleComment */ true,
-        checker,
-    );
+    for (const commentSource of discoverFileComments(file, commentStyle)) {
+        const comment = getCommentWithCache(
+            commentSource,
+            config,
+            logger,
+            checker,
+        );
+
+        if (comment?.getTag("@license") || comment?.getTag("@import")) {
+            continue;
+        }
+
+        if (
+            comment?.getTag("@module") ||
+            comment?.hasModifier("@packageDocumentation")
+        ) {
+            return comment;
+        }
+        return;
+    }
 }
 
 function getConstructorParamPropertyComment(
diff --git a/src/lib/utils/options/tsdoc-defaults.ts b/src/lib/utils/options/tsdoc-defaults.ts
index 9ae30e874..c09ba21cf 100644
--- a/src/lib/utils/options/tsdoc-defaults.ts
+++ b/src/lib/utils/options/tsdoc-defaults.ts
@@ -28,6 +28,8 @@ export const blockTags = [
     "@prop",
     "@property",
     "@satisfies",
+    "@license",
+    "@import",
 ] as const;
 
 export const tsdocInlineTags = ["@link", "@inheritDoc", "@label"] as const;
diff --git a/src/test/converter2/issues/gh2552.js b/src/test/converter2/issues/gh2552.js
new file mode 100644
index 000000000..18af18ab5
--- /dev/null
+++ b/src/test/converter2/issues/gh2552.js
@@ -0,0 +1,16 @@
+/**
+ * Summary
+ * @license MIT
+ *
+ * Full permission notice.
+ */
+
+// TS 5.5 @import comments
+/** @import * as ts from "typescript" */
+
+/**
+ * This is an awesome module.
+ * @module good-module
+ */
+
+export function goodFunction() {}
diff --git a/src/test/issues.c2.test.ts b/src/test/issues.c2.test.ts
index 7c2c69425..033067d1e 100644
--- a/src/test/issues.c2.test.ts
+++ b/src/test/issues.c2.test.ts
@@ -1430,4 +1430,12 @@ describe("Issue Tests", () => {
         equal(cb2.type?.type, "reflection");
         equal(cb2.type.declaration.signatures![0].comment, undefined);
     });
+
+    it("Ignores @license and @import comments at the top of the file, #2552", () => {
+        const project = convert();
+        equal(
+            Comment.combineDisplayParts(project.comment?.summary),
+            "This is an awesome module.",
+        );
+    });
 });
diff --git a/tsdoc.json b/tsdoc.json
index 5e5590ec3..977281fbe 100644
--- a/tsdoc.json
+++ b/tsdoc.json
@@ -1,5 +1,6 @@
 {
     "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
+    // If updating this, also update tsdoc-defaults.ts
     "noStandardTags": false,
     "tagDefinitions": [
         {
@@ -93,6 +94,14 @@
             "tagName": "@satisfies",
             "syntaxKind": "block"
         },
+        {
+            "tagName": "@license",
+            "syntaxKind": "block"
+        },
+        {
+            "tagName": "@import",
+            "syntaxKind": "block"
+        },
         {
             "tagName": "@overload",
             "syntaxKind": "modifier"

From cf3dcd103a302f9e14cef00cf80a191b9c7b3219 Mon Sep 17 00:00:00 2001
From: Gerrit Birkeland <gerrit@gerritbirkeland.com>
Date: Sat, 27 Apr 2024 12:18:00 -0600
Subject: [PATCH 14/14] Fix constructor signature validation

Resolves #2553
---
 CHANGELOG.md                         |  1 +
 src/lib/validation/documentation.ts  |  9 +++++++++
 src/test/converter2/issues/gh2553.ts | 16 ++++++++++++++++
 src/test/issues.c2.test.ts           |  6 ++++++
 4 files changed, 32 insertions(+)
 create mode 100644 src/test/converter2/issues/gh2553.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 667933a59..59567db0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 -   Types rendered in the `Returns` header are now properly colored, #2546.
 -   Links added with the `navigationLinks` option are now moved into the pull out navigation on mobile displays, #2548.
 -   `@license` and `@import` comments will be ignored at the top of files, #2552.
+-   Fixed issue in documentation validation where constructor signatures where improperly considered not documented, #2553.
 
 ### Thanks!
 
diff --git a/src/lib/validation/documentation.ts b/src/lib/validation/documentation.ts
index 29e7fcdda..213bc88b3 100644
--- a/src/lib/validation/documentation.ts
+++ b/src/lib/validation/documentation.ts
@@ -71,6 +71,15 @@ export function validateDocumentation(
             continue;
         }
 
+        // Call signatures are considered documented if they are directly within a documented type alias.
+        if (
+            ref.kindOf(ReflectionKind.ConstructorSignature) &&
+            ref.parent?.parent?.kindOf(ReflectionKind.TypeAlias)
+        ) {
+            toProcess.push(ref.parent.parent);
+            continue;
+        }
+
         if (ref instanceof DeclarationReflection) {
             const signatures =
                 ref.type instanceof ReflectionType
diff --git a/src/test/converter2/issues/gh2553.ts b/src/test/converter2/issues/gh2553.ts
new file mode 100644
index 000000000..892454b11
--- /dev/null
+++ b/src/test/converter2/issues/gh2553.ts
@@ -0,0 +1,16 @@
+/**
+ * Constructor.
+ *
+ * @param args - Constructor arguments.
+ * @returns New instance.
+ */
+export type Constructor = new (...args: any[]) => object;
+
+/**
+ * Typed constructor.
+ *
+ * @typeParam T - Class type.
+ * @param args - Constructor arguments.
+ * @returns New instance.
+ */
+export type TypedConstructor<T> = new (...args: any[]) => T;
diff --git a/src/test/issues.c2.test.ts b/src/test/issues.c2.test.ts
index 033067d1e..c41b253d6 100644
--- a/src/test/issues.c2.test.ts
+++ b/src/test/issues.c2.test.ts
@@ -1438,4 +1438,10 @@ describe("Issue Tests", () => {
             "This is an awesome module.",
         );
     });
+
+    it("Does not warn about documented constructor signature type aliases, #2553", () => {
+        const project = convert();
+        app.validate(project);
+        logger.expectNoOtherMessages();
+    });
 });