diff --git a/.eslintrc.js b/.eslintrc.js
index 61ad70d2e8..afb03336b6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -110,7 +110,7 @@ module.exports = {
     {
       files: ["tools/**/*.js"],
       parserOptions: {
-        ecmaVersion: 2018
+        ecmaVersion: 2020
       },
       rules: {
         camelcase: "off"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ced7e2f6f3..a504121cd0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: "*" # latest
     - run: npm ci
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fa4e2b4c37..bd2c6a7f0a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,10 +48,10 @@ jobs:
         env:
           TAG_PREFIX: refs/tags/ # Optional, default prefix refs/tags/
 
-      - name: Use Node.js 15.x
-        uses: actions/setup-node@v3
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v4
         with:
-          node-version: 15.x
+          node-version: 20.x
       - name: Build Node.js package
         run: |
           npm install
@@ -60,7 +60,7 @@ jobs:
 
       - name: Publish highlight.js to NPM
         id: publish
-        uses: JS-DevTools/npm-publish@v2
+        uses: JS-DevTools/npm-publish@v3
         with:
           check-version: true
           token: ${{ secrets.NPM_TOKEN }}
@@ -112,7 +112,7 @@ jobs:
 
       - name: Publish cdn-assets to NPM
         id: publish_cdn
-        uses: JS-DevTools/npm-publish@v2
+        uses: JS-DevTools/npm-publish@v3
         with:
           check-version: true
           token: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/size_report_comment.yml b/.github/workflows/size_report_comment.yml
index 80d00c4d51..874f894a98 100644
--- a/.github/workflows/size_report_comment.yml
+++ b/.github/workflows/size_report_comment.yml
@@ -14,7 +14,7 @@ jobs:
       github.event.workflow_run.conclusion == 'success'
     steps:
       - name: "Download size report artifact"
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -37,7 +37,7 @@ jobs:
       - run: unzip -d size_report size_report.zip
 
       - name: "Comment on PR"
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
diff --git a/.github/workflows/size_report_create.yml b/.github/workflows/size_report_create.yml
index ab2f9ef2aa..18ce504d98 100644
--- a/.github/workflows/size_report_create.yml
+++ b/.github/workflows/size_report_create.yml
@@ -39,7 +39,7 @@ jobs:
           echo "$REPORT" > size_report/report.md
 
       - name: Save Size Report as Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: size_report
           path: ./size_report
diff --git a/.github/workflows/tests.js.yml b/.github/workflows/tests.js.yml
index ac5fcec71f..b03a59c937 100644
--- a/.github/workflows/tests.js.yml
+++ b/.github/workflows/tests.js.yml
@@ -19,13 +19,14 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        # All 'LTS' and 'Current' versions (https://nodejs.org/en/about/previous-releases)
+        node-version: [18.x, 20.x, 21.x]
         build-how: ["node", "browser", "browser -n", "cdn :common"]
 
     steps:
     - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install
@@ -52,5 +53,5 @@ jobs:
     - if: contains(matrix.build-how, 'node')
       name: Test Node.js build is "use strict" safe
       run: |
-        ./node_modules/.bin/rollup -c test/builds/rollup_import_via_commonjs.js
+        ./node_modules/.bin/rollup -c test/builds/rollup_import_via_commonjs.mjs
         node build/bundle.js
diff --git a/CHANGES.md b/CHANGES.md
index 145d96edfb..c460b28773 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,25 +1,117 @@
-## Version 11.9.0 (next release)
+## Version 11.10.0 (Next Release)
+
+CAVEATS / POTENTIALLY BREAKING CHANGES
+
+- Drops support for Node 16.x, which is no longer supported by Node.js.
+
+Core Grammars:
+
+- enh(c) added more C23 keywords and preprcoessor directives [Eisenwave][]
+- enh(js/ts) support namespaced tagged template strings [Aral Balkan][]
+- enh(perl) fix false-positive variable match at end of string [Josh Goebel][]
+- fix(cpp) not all kinds of number literals are highlighted correctly [Lê Duy Quang][]
+- fix(css) fix overly greedy pseudo class matching [Bradley Mackey][]
+- enh(arcade) updated to ArcGIS Arcade version 1.24 [Kristian Ekenes][]
+- fix(typescript): params types [Mohamed Ali][]
+- fix(rust) fix escaped double quotes in string  [Mohamed Ali][]
+- fix(rust) fix for r# raw identifier not being highlighted correctly. [JaeBaek Lee][]
+- enh(rust) Adding union to be recognized as a keyword in Rust. [JaeBaek Lee][]
+- fix(yaml) fix for yaml with keys having brackets highlighted incorrectly [Aneesh Kulkarni][]
+- fix(csharp) add raw string highlighting for C# 11. [Tara][]
+- fix(bash) fix # within token being detected as the start of a comment [Felix Uhl][]
+- fix(python) fix `or` conflicts with string highlighting [Mohamed Ali][]
+- enh(delphi) allow digits to be omitted for hex and binary literals [Jonah Jeleniewski][]
+- enh(delphi) add support for digit separators [Jonah Jeleniewski][]
+- enh(delphi) add support for character strings with non-decimal numerics [Jonah Jeleniewski][]
+- fix(javascript) incorrect function name highlighting [CY Fung][]
+- fix(1c) fix escaped symbols "+-;():=,[]" literals [Vitaly Barilko][]
+- fix(swift) correctly highlight generics and conformances in type definitions [Bradley Mackey][]
+- enh(swift) add package keyword [Bradley Mackey][]
+- fix(swift) ensure keyword attributes highlight correctly [Bradley Mackey][]
+- fix(types) fix interface LanguageDetail > keywords [Patrick Chiu]
+- enh(java) add `goto` to be recognized as a keyword in Java [Alvin Joy][]
+- enh(bash) add keyword `sudo` [Alvin Joy][]
+- fix(haxe) captures `new` keyword without capturing it within variables/class names [Cameron Taylor][]
+- fix(go) fix go number literals to accept `_` separators, add hex p exponents [Lisa Ugray][]
+- enh(markdown) add entity support [David Schach][] [TaraLei][]
+- enh(css) add `justify-items` and `justify-self` attributes [Vasily Polovnyov][]
+- enh(css) add `accent-color`, `appearance`, `color-scheme`, `rotate`, `scale` and `translate` attributes [Carl Räfting][]
+
+New Grammars:
+
+- added 3rd party CODEOWNERS grammar to SUPPORTED_LANGUAGES [nataliia-radina][]
+- added 3rd party Luau grammar to SUPPORTED_LANGUAGES [Robloxian Demo][]
+- added 3rd party ReScript grammar to SUPPORTED_LANGUAGES [Paul Tsnobiladzé][]
+- added 3rd party Zig grammar to SUPPORTED_LANGUAGES [Hyou BunKen][]
+- added 3rd party WGSL grammar to SUPPORTED_LANGUAGES [Arman Uguray][]
+- added 3rd party Unison grammar to SUPPORTED_LANGUAGES [Rúnar Bjarnason][]
+
+Developer Tool:
+
+- enh(tools): order CSS options picklist [David Schach][]
+- enh(tools): remove duplicate CSS options [David Schach][]
+- (typescript): deprecate old `highlight` API [Misha Kaletsky][]
+
+Themes:
+
+- Added `1c-light` theme a like in the IDE 1C:Enterprise 8 (for 1c) [Vitaly Barilko][]
+
+[Eisenwave]: https://github.com/Eisenwave 
+[Aral Balkan]: https://github.com/aral
+[Lê Duy Quang]: https://github.com/leduyquang753
+[Mohamed Ali]: https://github.com/MohamedAli00949
+[JaeBaek Lee]: https://github.com/ThinkingVincent
+[Bradley Mackey]: https://github.com/bradleymackey
+[Kristian Ekenes]: https://github.com/ekenes
+[Aneesh Kulkarni]: https://github.com/aneesh98
+[Bruno Meneguele]: https://github.com/bmeneg
+[Tara]: https://github.com/taralei
+[Felix Uhl]: https://github.com/iFreilicht
+[nataliia-radina]: https://github.com/Nataliia-Radina
+[Robloxian Demo]: https://github.com/RobloxianDemo
+[Paul Tsnobiladzé]: https://github.com/tsnobip
+[Jonah Jeleniewski]: https://github.com/cirras
+[Josh Goebel]: https://github.com/joshgoebel
+[CY Fung]: https://github.com/cyfung1031
+[Vitaly Barilko]: https://github.com/Diversus23
+[Patrick Chiu]: https://github.com/patrick-kw-chiu
+[Alvin Joy]: https://github.com/alvinsjoy
+[Lisa Ugray]: https://github.com/lugray
+[TaraLei]: https://github.com/TaraLei
+[Cameron Taylor]: https://github.com/ninjamuffin99
+[Vasily Polovnyov]: https://github.com/vast
+[Arman Uguray]: https://github.com/armansito
+[Rúnar Bjarnason]: https://github.com/runarorama
+[Carl Räfting]: https://github.com/carlrafting
+
+
+
+## Version 11.9.0
 
 CAVEATS / POTENTIALLY BREAKING CHANGES
 
 - Drops support for Node 14.x, which is no longer supported by Node.js.
-- In the `node` build `styles/*.css` files now ship un-minified 
+- In the `node` build `styles/*.css` files now ship un-minified
   with minified counterparts as: `styles/*.min.css` [mvorisek][]
-  (this makes things consistent with our `cdn` builds) 
+  (this makes things consistent with our `cdn` builds)
 
 Parser:
 
-- (enh) prevent rehighlighting of an element [joshgoebel][]
-- added 3rd party Iptables grammar to SUPPORTED_LANGUAGES [Checconio][]
+- (enh) prevent re-highlighting of an element [joshgoebel][]
+- (chore) Remove discontinued badges from README [Bradley Mackey][]
+- (chore) Fix build size report [Bradley Mackey][]
 
 New Grammars:
 
+- added 3rd party Iptables grammar to SUPPORTED_LANGUAGES [Checconio][]
 - added 3rd party x86asmatt grammar to SUPPORTED_LANGUAGES [gondow][]
 - added 3rd party riscv64 grammar to SUPPORTED_LANGUAGES [aana-h2][]
 - added 3rd party Ballerina grammar to SUPPORTED_LANGUAGES [Yasith Deelaka][]
 
 Core Grammars:
 
+- fix(cpp) fixed highlighter break state [Md Saad Akhtar][]
+- fix(rust) added negative-lookahead for callable keywords `if` `while` `for` [Omar Hussein][]
 - enh(armasm) added `x0-x30` and `w0-w30` ARMv8 registers [Nicholas Thompson][]
 - enh(haxe) added `final`, `is`, `macro` keywords and `$` identifiers [Robert Borghese][]
 - enh(haxe) support numeric separators and suffixes [Robert Borghese][]
@@ -42,13 +134,13 @@ Core Grammars:
 - enh(swift) macro attributes are highlighted as keywords [Bradley Mackey][]
 - enh(stan) updated for version 2.33 (#3859) [Brian Ward][]
 - enh(llvm) match additional types [wtz][]
+- fix(css) added '_'  css variable detection [Md Saad Akhtar][]
+- enh(groovy) add `record` and `var` as keywords [Guillaume Laforge][]
 
-Dev tool:
+Developer Tool:
 
-- (chore) Remove discontinued badges from README [Bradley Mackey][]
 - (chore) Update dev tool to use the new `highlight` API. [Shah Shabbir Ahmmed][]
 - (enh) Auto-update the highlighted output when the language dropdown changes. [Shah Shabbir Ahmmed][]
-- (chore) Fix build size report [Bradley Mackey][]
 
 [Robert Borghese]: https://github.com/RobertBorghese
 [Isaac Nonato]: https://github.com/isaacnonato
@@ -66,6 +158,9 @@ Dev tool:
 [Yasith Deelaka]: https://github.com/YasithD
 [Brian Ward]: https://github.com/WardBrian
 [wtz]: https://github.com/wangtz0607
+[Md Saad Akhtar]: https://github.com/akhtarmdsaad
+[Guillaume Laforge]: https://github.com/glaforge
+
 
 ## Version 11.8.0
 
@@ -118,6 +213,7 @@ Core Grammars:
 [Cyrus Kao]: https://github.com/CyrusKao
 [Zlondrej]: https://github.com/zlondrej
 
+
 ## Version 11.7.0
 
 New Grammars:
@@ -205,6 +301,7 @@ Grammars:
 [Mousetail]: https://github.com/mousetail
 [Gabriel Gonçalves]: https://github.com/KTSnowy
 [Nikita Sobolev]: https://github.com/sobolevn
+[Misha Kaletsky]: https://github.com/mmkal
 
 ## Version 11.5.0
 
diff --git a/README.md b/README.md
index 979a060d0e..11a343166c 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ library along with one of the themes and calling [`highlightAll`][1]:
 
 This will find and highlight code inside of `<pre><code>` tags; it tries
 to detect the language automatically. If automatic detection doesn’t
-work for you, or you simply prefer to be explicit, you can specify the language manually in the using the `class` attribute:
+work for you, or you simply prefer to be explicit, you can specify the language manually by using the `class` attribute:
 
 
 ```html
@@ -325,20 +325,20 @@ see [DIGESTS.md](https://github.com/highlightjs/cdn-release/blob/main/DIGESTS.md
 ##### Common JS <!-- omit in toc -->
 
 ```html
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/styles/default.min.css">
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/highlight.min.js"></script>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/default.min.css">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
 <!-- and it's easy to individually load additional languages -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/languages/go.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/languages/go.min.js"></script>
 ```
 
 ##### ES6 Modules <!-- omit in toc -->
 
 ````html
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/styles/dark.min.css">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/dark.min.css">
 <script type="module">
-import hljs from 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/es/highlight.min.js';
+import hljs from 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/es/highlight.min.js';
 //  and it's easy to individually load additional languages
-import go from 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/es/languages/go.min.js';
+import go from 'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/es/languages/go.min.js';
 hljs.registerLanguage('go', go);
 </script>
 
@@ -350,20 +350,20 @@ hljs.registerLanguage('go', go);
 ##### Common JS <!-- omit in toc -->
 
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.8.0/build/styles/default.min.css">
-<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.8.0/build/highlight.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.9.0/build/styles/default.min.css">
+<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.9.0/build/highlight.min.js"></script>
 <!-- and it's easy to individually load additional languages -->
-<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.8.0/build/languages/go.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.9.0/build/languages/go.min.js"></script>
 ```
 
 ##### ES6 Modules <!-- omit in toc -->
 
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.8.0/build/styles/default.min.css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.9.0/build/styles/default.min.css">
 <script type="module">
-import hljs from 'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.8.0/build/es/highlight.min.js';
+import hljs from 'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.9.0/build/es/highlight.min.js';
 //  and it's easy to individually load additional languages
-import go from 'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.8.0/build/es/languages/go.min.js';
+import go from 'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.9.0/build/es/languages/go.min.js';
 hljs.registerLanguage('go', go);
 </script>
 ```
@@ -373,20 +373,20 @@ hljs.registerLanguage('go', go);
 ##### Common JS <!-- omit in toc -->
 
 ```html
-<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.8.0/styles/default.min.css">
-<script src="https://unpkg.com/@highlightjs/cdn-assets@11.8.0/highlight.min.js"></script>
+<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.9.0/styles/default.min.css">
+<script src="https://unpkg.com/@highlightjs/cdn-assets@11.9.0/highlight.min.js"></script>
 <!-- and it's easy to individually load additional languages -->
-<script src="https://unpkg.com/@highlightjs/cdn-assets@11.8.0/languages/go.min.js"></script>
+<script src="https://unpkg.com/@highlightjs/cdn-assets@11.9.0/languages/go.min.js"></script>
 ```
 
 ##### ES6 Modules <!-- omit in toc -->
 
 ```html
-<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.8.0/styles/default.min.css">
+<link rel="stylesheet" href="https://unpkg.com/@highlightjs/cdn-assets@11.9.0/styles/default.min.css">
 <script type="module">
-import hljs from 'https://unpkg.com/@highlightjs/cdn-assets@11.8.0/es/highlight.min.js';
+import hljs from 'https://unpkg.com/@highlightjs/cdn-assets@11.9.0/es/highlight.min.js';
 //  and it's easy to individually load & register additional languages
-import go from 'https://unpkg.com/@highlightjs/cdn-assets@11.8.0/es/languages/go.min.js';
+import go from 'https://unpkg.com/@highlightjs/cdn-assets@11.9.0/es/languages/go.min.js';
 hljs.registerLanguage('go', go);
 </script>
 ```
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index d82b15801a..bac1ff419c 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -45,7 +45,8 @@ The table below shows the full list of languages (and corresponding classes/alia
 | Cache Object Script     | cos, cls               |         |
 | Candid                  | candid, did            | [highlightjs-motoko](https://github.com/rvanasa/highlightjs-motoko) |
 | CMake                   | cmake, cmake.in        |         |
-| COBOL                   | cobol, standard-cobol   | [highlightjs-cobol](https://github.com/otterkit/highlightjs-cobol) |
+| COBOL                   | cobol, standard-cobol  | [highlightjs-cobol](https://github.com/otterkit/highlightjs-cobol) |
+| CODEOWNERS              | codeowners             | [highlightjs-codeowners](https://github.com/highlightjs/highlightjs-codeowners) |
 | Coq                     | coq                    |         |
 | CSP                     | csp                    |         |
 | CSS                     | css                    |         |
@@ -79,7 +80,7 @@ The table below shows the full list of languages (and corresponding classes/alia
 | Erlang                  | erlang, erl            |         |
 | Excel                   | excel, xls, xlsx       |         |
 | Extempore               | extempore, xtlang, xtm | [highlightjs-xtlang](https://github.com/highlightjs/highlightjs-xtlang) |
-| F#                      | fsharp, fs             |         |
+| F#                      | fsharp, fs, fsx, fsi, fsscript   |         |
 | FIX                     | fix                    |         |
 | Flix                    | flix                   | [highlightjs-flix](https://github.com/flix/highlightjs-flix) |
 | Fortran                 | fortran, f90, f95      |         |
@@ -114,7 +115,8 @@ The table below shows the full list of languages (and corresponding classes/alia
 | Java                    | java, jsp              |         |
 | JavaScript              | javascript, js, jsx    |         |
 | Jolie                   | jolie, iol, ol         | [highlightjs-jolie](https://github.com/xiroV/highlightjs-jolie) |
-| Julia                   | julia, julia-repl      |         |
+| Julia                   | julia, jl               |         |   
+| Julia REPL              | julia-repl             |         |
 | Kotlin                  | kotlin, kt             |         |
 | Lang                    |                        | [highlightjs-lang](https://github.com/highlightjs/highlightjs-lang)
 | LaTeX                   | tex                    |         |
@@ -128,6 +130,7 @@ The table below shows the full list of languages (and corresponding classes/alia
 | LiveScript              | livescript, ls         |         |
 | LookML                  | lookml                 | [highlightjs-lookml](https://github.com/spectacles-ci/highlightjs-lookml) |
 | Lua                     | lua                    |         |
+| Luau                    | luau                   | [highlightjs-luau](https://github.com/highlightjs/highlightjs-luau) |
 | Macaulay2               | macaulay2              | [highlightjs-macaulay2](https://github.com/d-torrance/highlightjs-macaulay2) |
 | Makefile                | makefile, mk, mak, make |        |
 | Markdown                | markdown, md, mkdown, mkd |      |
@@ -187,6 +190,7 @@ The table below shows the full list of languages (and corresponding classes/alia
 | Rebol & Red             | redbol, rebol, red, red-system | [highlightjs-redbol](https://github.com/oldes/highlightjs-redbol) |
 | RenderMan RIB           | rib                    |         |
 | RenderMan RSL           | rsl                    |         |
+| ReScript                | rescript, res          | [highlightjs-rescript](https://github.com/tsnobip/highlightjs-rescript) | 
 | RiScript                | risc, riscript         | [highlightjs-riscript](https://github.com/highlightjs/highlightjs-riscript) |
 | RISC-V Assembly         | riscv, riscvasm        | [highlightjs-riscvasm](https://github.com/highlightjs/highlightjs-riscvasm) |
 | Roboconf                | graph, instances       |         |
@@ -228,6 +232,7 @@ The table below shows the full list of languages (and corresponding classes/alia
 | Twig                    | twig, craftcms         |         |
 | TypeScript              | typescript, ts, tsx, mts, cts |         |
 | Unicorn Rails log       | unicorn-rails-log      | [highlightjs-unicorn-rails-log](https://github.com/sweetppro/highlightjs-unicorn-rails-log) |
+| Unison                  | unison, u              | [highlightjs-unison](https://github.com/highlightjs/highlightjs-unison) |
 | VB.Net                  | vbnet, vb              |         |
 | VBA                     | vba                    | [highlightjs-vba](https://github.com/dullin/highlightjs-vba) |
 | VBScript                | vbscript, vbs          |         |
@@ -235,6 +240,7 @@ The table below shows the full list of languages (and corresponding classes/alia
 | Vala                    | vala                   |         |
 | Verilog                 | verilog, v             |         |
 | Vim Script              | vim                    |         |
+| WGSL                    | wgsl                   | [highlightjs-wgsl](https://github.com/highlightjs/highlightjs-wgsl) |
 | X#                      | xsharp, xs, prg        | [highlightjs-xsharp](https://github.com/InfomindsAg/highlightjs-xsharp) |
 | X++                     | axapta, x++            |         |
 | x86 Assembly            | x86asm                 |         |
@@ -244,6 +250,7 @@ The table below shows the full list of languages (and corresponding classes/alia
 | YAML                    | yml, yaml              |         |
 | ZenScript               | zenscript, zs          |[highlightjs-zenscript](https://github.com/highlightjs/highlightjs-zenscript) |
 | Zephir                  | zephir, zep            |         |
+| Zig                     | zig                    |[highlightjs-zig](https://github.com/fwx5618177/highlightjs-zig) |
 <!-- LANGLIST_END -->
 
 <!-- document it until we can fix it -->
diff --git a/docs/conf.py b/docs/conf.py
index b2a9ad7f06..ca485aa218 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@
 # built documents.
 
 # The full version, including alpha/beta/rc tags.
-release = '11.8.0'
+release = '11.9.0'
 # The short X.Y version.
 version = ".".join(release.split(".")[:2])
 
diff --git a/docs/language-requests.rst b/docs/language-requests.rst
index b00df95a01..b93268a1c9 100644
--- a/docs/language-requests.rst
+++ b/docs/language-requests.rst
@@ -7,8 +7,8 @@ time to time in the Highlight.js issue tracker and discussion group.
     Highlight.js does not have a fundamental plan for implementing new languages
     - i.e., the core team doesn't usually develop new languages. The core team
     instead focuses on parser development, bugs, and supporting the existing
-    languages. They also currently does not have time to review, merge and
-    maintain any additional languages (fixing bugs, dealing with issues, etc).
+    languages. They also do not have time to review, merge, and maintain
+    additional languages (fixing bugs, dealing with issues, etc).
 
     Instead, the project works by encouraging 3rd party language grammars from
     contributors willing to help develop and maintain them. We're also happy to
@@ -19,8 +19,8 @@ time to time in the Highlight.js issue tracker and discussion group.
     This means that *there's no point in requesting a new language without also
     providing a 3rd party implementation* (we'll simply close "Please support
     language Xyz" issues with a link to this explanation). If you'd like to see
-    a particular language available but cannot implement it, the best way to
-    make it happen is to find another developer interested in doing so.
+    a particular language supported, the best way forward is to build the grammar
+    yourself, or find a developer interested in doing so.
 
     For more info on actually developing a language see our :doc:`language-guide`,
     and for information on how to properly package your 3rd party language module
diff --git a/package-lock.json b/package-lock.json
index a07d052514..35ce5b4704 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,57 +1,66 @@
 {
   "name": "highlight.js",
-  "version": "11.8.0",
+  "version": "11.9.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "highlight.js",
-      "version": "11.8.0",
+      "version": "11.9.0",
       "license": "BSD-3-Clause",
       "devDependencies": {
-        "@colors/colors": "^1.5.0",
-        "@rollup/plugin-commonjs": "^24.1.0",
-        "@rollup/plugin-json": "^6.0.0",
-        "@rollup/plugin-node-resolve": "^15.0.2",
-        "@types/mocha": "^10.0.1",
-        "@typescript-eslint/eslint-plugin": "^5.59.1",
-        "@typescript-eslint/parser": "^5.59.1",
+        "@colors/colors": "^1.6.0",
+        "@rollup/plugin-commonjs": "^25.0.5",
+        "@rollup/plugin-json": "^6.0.1",
+        "@rollup/plugin-node-resolve": "^15.2.3",
+        "@types/mocha": "^10.0.2",
+        "@typescript-eslint/eslint-plugin": "^6.7.4",
+        "@typescript-eslint/parser": "^6.7.4",
         "clean-css": "^5.3.2",
         "cli-table": "^0.3.1",
-        "commander": "^10.0.1",
+        "commander": "^11.0.0",
         "css": "^3.0.0",
         "css-color-names": "^1.0.1",
-        "deep-freeze-es6": "^2.0.0",
-        "del": "^6.1.1",
+        "deep-freeze-es6": "^3.0.2",
+        "del": "^7.1.0",
         "dependency-resolver": "^2.0.1",
-        "eslint": "^8.39.0",
-        "eslint-config-standard": "^17.0.0",
-        "eslint-plugin-import": "^2.27.5",
+        "eslint": "^8.51.0",
+        "eslint-config-standard": "^17.1.0",
+        "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.1.1",
-        "glob": "^8.0.3",
-        "glob-promise": "^6.0.2",
-        "handlebars": "^4.7.6",
+        "glob": "^8.1.0",
+        "glob-promise": "^6.0.5",
+        "handlebars": "^4.7.8",
         "http-server": "^14.1.1",
-        "jsdom": "^21.1.1",
+        "jsdom": "^22.1.0",
         "lodash": "^4.17.20",
         "mocha": "^10.2.0",
         "refa": "^0.4.1",
-        "rollup": "^2.47.0",
+        "rollup": "^4.0.2",
         "should": "^13.2.3",
-        "terser": "^5.17.1",
+        "terser": "^5.21.0",
         "tiny-worker": "^2.3.0",
-        "typescript": "^5.0.4",
+        "typescript": "^5.2.2",
         "wcag-contrast": "^3.0.0"
       },
       "engines": {
         "node": ">=12.0.0"
       }
     },
+    "node_modules/@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@colors/colors": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
+      "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
       "dev": true,
       "engines": {
         "node": ">=0.1.90"
@@ -85,23 +94,23 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
-      "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
+      "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz",
-      "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.1",
+        "espree": "^9.6.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -117,18 +126,18 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.39.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz",
-      "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",
+      "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
+      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -159,12 +168,12 @@
       "dev": true
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
-      "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
         "@jridgewell/trace-mapping": "^0.3.9"
       },
@@ -173,27 +182,27 @@
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
-      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true,
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
-      "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
       "dev": true,
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
       "dev": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
@@ -201,19 +210,19 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
-      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==",
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
-      "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -252,9 +261,9 @@
       }
     },
     "node_modules/@rollup/plugin-commonjs": {
-      "version": "24.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-24.1.0.tgz",
-      "integrity": "sha512-eSL45hjhCWI0jCCXcNtLVqM5N1JlBGvlFfY0m6oOYnLCJ6N0qEXoZql4sY2MOUArzhH4SA/qBpTxvvZp2Sc+DQ==",
+      "version": "25.0.5",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.5.tgz",
+      "integrity": "sha512-xY8r/A9oisSeSuLCTfhssyDjo9Vp/eDiRLXkg1MXCcEEgEjPmLU+ZyDB20OOD0NlyDa/8SGbK5uIggF5XTx77w==",
       "dev": true,
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
@@ -268,7 +277,7 @@
         "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "rollup": "^2.68.0||^3.0.0"
+        "rollup": "^2.68.0||^3.0.0||^4.0.0"
       },
       "peerDependenciesMeta": {
         "rollup": {
@@ -286,9 +295,9 @@
       }
     },
     "node_modules/@rollup/plugin-json": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.0.tgz",
-      "integrity": "sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.1.tgz",
+      "integrity": "sha512-RgVfl5hWMkxN1h/uZj8FVESvPuBJ/uf6ly6GTj0GONnkfoBN5KC0MSz+PN2OLDgYXMhtG0mWpTrkiOjoxAIevw==",
       "dev": true,
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1"
@@ -297,7 +306,7 @@
         "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0||^3.0.0"
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
       },
       "peerDependenciesMeta": {
         "rollup": {
@@ -306,9 +315,9 @@
       }
     },
     "node_modules/@rollup/plugin-node-resolve": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.2.tgz",
-      "integrity": "sha512-Y35fRGUjC3FaurG722uhUuG8YHOJRJQbI6/CkbRkdPotSpDj9NtIN85z1zrcyDcCQIW4qp5mgG72U+gJ0TAFEg==",
+      "version": "15.2.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
+      "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==",
       "dev": true,
       "dependencies": {
         "@rollup/pluginutils": "^5.0.1",
@@ -322,7 +331,7 @@
         "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "rollup": "^2.78.0||^3.0.0"
+        "rollup": "^2.78.0||^3.0.0||^4.0.0"
       },
       "peerDependenciesMeta": {
         "rollup": {
@@ -331,9 +340,9 @@
       }
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
-      "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.5.tgz",
+      "integrity": "sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==",
       "dev": true,
       "dependencies": {
         "@types/estree": "^1.0.0",
@@ -344,7 +353,7 @@
         "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0||^3.0.0"
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
       },
       "peerDependenciesMeta": {
         "rollup": {
@@ -352,6 +361,162 @@
         }
       }
     },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.0.2.tgz",
+      "integrity": "sha512-xDvk1pT4vaPU2BOLy0MqHMdYZyntqpaBf8RhBiezlqG9OjY8F50TyctHo8znigYKd+QCFhCmlmXHOL/LoaOl3w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.0.2.tgz",
+      "integrity": "sha512-lqCglytY3E6raze27DD9VQJWohbwCxzqs9aSHcj5X/8hJpzZfNdbsr4Ja9Hqp6iPyF53+5PtPx0pKRlkSvlHZg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.0.2.tgz",
+      "integrity": "sha512-nkBKItS6E6CCzvRwgiKad+j+1ibmL7SIInj7oqMWmdkCjiSX6VeVZw2mLlRKIUL+JjsBgpATTfo7BiAXc1v0jA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.0.2.tgz",
+      "integrity": "sha512-vX2C8xvWPIbpEgQht95+dY6BReKAvtDgPDGi0XN0kWJKkm4WdNmq5dnwscv/zxvi+n6jUTBhs6GtpkkWT4q8Gg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.0.2.tgz",
+      "integrity": "sha512-DVFIfcHOjgmeHOAqji4xNz2wczt1Bmzy9MwBZKBa83SjBVO/i38VHDR+9ixo8QpBOiEagmNw12DucG+v55tCrg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.0.2.tgz",
+      "integrity": "sha512-GCK/a9ItUxPI0V5hQEJjH4JtOJO90GF2Hja7TO+EZ8rmkGvEi8/ZDMhXmcuDpQT7/PWrTT9RvnG8snMd5SrhBQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.0.2.tgz",
+      "integrity": "sha512-cLuBp7rOjIB1R2j/VazjCmHC7liWUur2e9mFflLJBAWCkrZ+X0+QwHLvOQakIwDymungzAKv6W9kHZnTp/Mqrg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.0.2.tgz",
+      "integrity": "sha512-Zqw4iVnJr2naoyQus0yLy7sLtisCQcpdMKUCeXPBjkJtpiflRime/TMojbnl8O3oxUAj92mxr+t7im/RbgA20w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.0.2.tgz",
+      "integrity": "sha512-jJRU9TyUD/iMqjf8aLAp7XiN3pIj5v6Qcu+cdzBfVTKDD0Fvua4oUoK8eVJ9ZuKBEQKt3WdlcwJXFkpmMLk6kg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.0.2.tgz",
+      "integrity": "sha512-ZkS2NixCxHKC4zbOnw64ztEGGDVIYP6nKkGBfOAxEPW71Sji9v8z3yaHNuae/JHPwXA+14oDefnOuVfxl59SmQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.0.2.tgz",
+      "integrity": "sha512-3SKjj+tvnZ0oZq2BKB+fI+DqYI83VrRzk7eed8tJkxeZ4zxJZcLSE8YDQLYGq1tZAnAX+H076RHHB4gTZXsQzw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.0.2.tgz",
+      "integrity": "sha512-MBdJIOxRauKkry7t2q+rTHa3aWjVez2eioWg+etRVS3dE4tChhmt5oqZYr48R6bPmcwEhxQr96gVRfeQrLbqng==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@tootallnate/once": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
@@ -378,9 +543,9 @@
       }
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "version": "7.0.13",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
+      "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==",
       "dev": true
     },
     "node_modules/@types/json5": {
@@ -396,9 +561,9 @@
       "dev": true
     },
     "node_modules/@types/mocha": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz",
-      "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.2.tgz",
+      "integrity": "sha512-NaHL0+0lLNhX6d9rs+NSt97WH/gIlRHmszXbQ/8/MV/eVcFNdeJ/GYhrFuUc8K7WuPhRhTSdMkCp8VMzhUq85w==",
       "dev": true
     },
     "node_modules/@types/node": {
@@ -414,38 +579,39 @@
       "dev": true
     },
     "node_modules/@types/semver": {
-      "version": "7.3.13",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==",
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz",
-      "integrity": "sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.4.tgz",
+      "integrity": "sha512-DAbgDXwtX+pDkAHwiGhqP3zWUGpW49B7eqmgpPtg+BKJXwdct79ut9+ifqOFPJGClGKSHXn2PTBatCnldJRUoA==",
       "dev": true,
       "dependencies": {
-        "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/type-utils": "5.59.1",
-        "@typescript-eslint/utils": "5.59.1",
+        "@eslint-community/regexpp": "^4.5.1",
+        "@typescript-eslint/scope-manager": "6.7.4",
+        "@typescript-eslint/type-utils": "6.7.4",
+        "@typescript-eslint/utils": "6.7.4",
+        "@typescript-eslint/visitor-keys": "6.7.4",
         "debug": "^4.3.4",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "natural-compare-lite": "^1.4.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.4",
+        "natural-compare": "^1.4.0",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
+        "eslint": "^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -453,26 +619,42 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.1.tgz",
-      "integrity": "sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.4.tgz",
+      "integrity": "sha512-I5zVZFY+cw4IMZUeNCU7Sh2PO5O57F7Lr0uyhgCJmhN/BuTlnc55KxPonR4+EM3GBdfiCyGZye6DgMjtubQkmA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/typescript-estree": "5.59.1",
+        "@typescript-eslint/scope-manager": "6.7.4",
+        "@typescript-eslint/types": "6.7.4",
+        "@typescript-eslint/typescript-estree": "6.7.4",
+        "@typescript-eslint/visitor-keys": "6.7.4",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "eslint": "^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -481,16 +663,16 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.1.tgz",
-      "integrity": "sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.4.tgz",
+      "integrity": "sha512-SdGqSLUPTXAXi7c3Ob7peAGVnmMoGzZ361VswK2Mqf8UOYcODiYvs8rs5ILqEdfvX1lE7wEZbLyELCW+Yrql1A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/visitor-keys": "5.59.1"
+        "@typescript-eslint/types": "6.7.4",
+        "@typescript-eslint/visitor-keys": "6.7.4"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -498,25 +680,25 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.1.tgz",
-      "integrity": "sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.4.tgz",
+      "integrity": "sha512-n+g3zi1QzpcAdHFP9KQF+rEFxMb2KxtnJGID3teA/nxKHOVi3ylKovaqEzGBbVY2pBttU6z85gp0D00ufLzViQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.59.1",
-        "@typescript-eslint/utils": "5.59.1",
+        "@typescript-eslint/typescript-estree": "6.7.4",
+        "@typescript-eslint/utils": "6.7.4",
         "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
+        "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "*"
+        "eslint": "^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -525,12 +707,12 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.1.tgz",
-      "integrity": "sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.4.tgz",
+      "integrity": "sha512-o9XWK2FLW6eSS/0r/tgjAGsYasLAnOWg7hvZ/dGYSSNjCh+49k5ocPN8OmG5aZcSJ8pclSOyVKP2x03Sj+RrCA==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -538,21 +720,21 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.1.tgz",
-      "integrity": "sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.4.tgz",
+      "integrity": "sha512-ty8b5qHKatlNYd9vmpHooQz3Vki3gG+3PchmtsA4TgrZBKWHNjWfkQid7K7xQogBqqc7/BhGazxMD5vr6Ha+iQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/visitor-keys": "5.59.1",
+        "@typescript-eslint/types": "6.7.4",
+        "@typescript-eslint/visitor-keys": "6.7.4",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -564,43 +746,72 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@typescript-eslint/utils": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.1.tgz",
-      "integrity": "sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.4.tgz",
+      "integrity": "sha512-PRQAs+HUn85Qdk+khAxsVV+oULy3VkbH3hQ8hxLRJXWBEd7iI+GbQxH5SEUSH7kbEoTp6oT1bOwyga24ELALTA==",
       "dev": true,
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/typescript-estree": "5.59.1",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.12",
+        "@types/semver": "^7.5.0",
+        "@typescript-eslint/scope-manager": "6.7.4",
+        "@typescript-eslint/types": "6.7.4",
+        "@typescript-eslint/typescript-estree": "6.7.4",
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.1.tgz",
-      "integrity": "sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.4.tgz",
+      "integrity": "sha512-pOW37DUhlTZbvph50x5zZCkFn3xzwkGtNoJHzIM3svpiSkJzwOYr/kVBaXmf+RAQiUDs1AHEZVNPg6UJCJpwRA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.59.1",
-        "eslint-visitor-keys": "^3.3.0"
+        "@typescript-eslint/types": "6.7.4",
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -608,9 +819,9 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
-      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -626,9 +837,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -637,16 +848,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/acorn-globals": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
-      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.1.0",
-        "acorn-walk": "^8.0.2"
-      }
-    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -656,15 +857,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -678,16 +870,19 @@
       }
     },
     "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.1.tgz",
+      "integrity": "sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==",
       "dev": true,
       "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
+        "clean-stack": "^4.0.0",
+        "indent-string": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/ajv": {
@@ -724,6 +919,21 @@
         "node": ">=8"
       }
     },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -784,6 +994,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
+      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array.prototype.flat": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
@@ -820,6 +1049,27 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
+      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/async": {
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
@@ -986,39 +1236,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/chalk/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/chalk/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/chalk/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/chalk/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1080,12 +1297,18 @@
       }
     },
     "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-4.2.0.tgz",
+      "integrity": "sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==",
       "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "5.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/cli-table": {
@@ -1120,6 +1343,24 @@
         "wrap-ansi": "^7.0.0"
       }
     },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -1133,12 +1374,12 @@
       }
     },
     "node_modules/commander": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz",
+      "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==",
       "dev": true,
       "engines": {
-        "node": ">=14"
+        "node": ">=16"
       }
     },
     "node_modules/commondir": {
@@ -1255,18 +1496,18 @@
       }
     },
     "node_modules/deep-freeze-es6": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/deep-freeze-es6/-/deep-freeze-es6-2.0.0.tgz",
-      "integrity": "sha512-NMcPpkMyCwEhoua6hn9rUS3hb4afnvWLp8cZWz5WNAI1CM5o+iE+HeX9SoojoFYX+iVxbar22PaRDZ4hO8PI8w==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/deep-freeze-es6/-/deep-freeze-es6-3.0.2.tgz",
+      "integrity": "sha512-snvTmNKjkzR1ywDMWN+jJtjEwqTPF0Nq0g1/puSkkaxgL71gJ0rJpsPF+WOqMRaVLWogtwb73lHthfSaqP8nIQ==",
       "dev": true,
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=18.12.0"
       }
     },
     "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
     "node_modules/deepmerge": {
@@ -1278,6 +1519,20 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
+      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/define-properties": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
@@ -1288,29 +1543,72 @@
         "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/del": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-7.1.0.tgz",
+      "integrity": "sha512-v2KyNk7efxhlyHpjEvfyxaAihKKK0nWCuf6ZtqZcFFpQRG0bJ12Qsr0RpvsICMjAAZ8DOVCxrlqpxISlMHC4Kg==",
+      "dev": true,
+      "dependencies": {
+        "globby": "^13.1.2",
+        "graceful-fs": "^4.2.10",
+        "is-glob": "^4.0.3",
+        "is-path-cwd": "^3.0.0",
+        "is-path-inside": "^4.0.0",
+        "p-map": "^5.5.0",
+        "rimraf": "^3.0.2",
+        "slash": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/del/node_modules/globby": {
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
+      "dev": true,
+      "dependencies": {
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.3.0",
+        "ignore": "^5.2.4",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/del": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
-      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
+    "node_modules/del/node_modules/is-path-inside": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz",
+      "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==",
       "dev": true,
-      "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
+      "engines": {
+        "node": ">=12"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/del/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -1395,18 +1693,19 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.21.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
-      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz",
+      "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==",
       "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.2",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.0",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
@@ -1421,19 +1720,23 @@
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
+        "is-typed-array": "^1.1.12",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
+        "regexp.prototype.flags": "^1.5.1",
+        "safe-array-concat": "^1.0.1",
         "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
+        "string.prototype.trim": "^1.2.8",
+        "string.prototype.trimend": "^1.0.7",
+        "string.prototype.trimstart": "^1.0.7",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+        "which-typed-array": "^1.1.11"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1491,59 +1794,40 @@
         "node": ">=6"
       }
     },
-    "node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+    "node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
       "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=12"
       },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/eslint": {
-      "version": "8.39.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz",
-      "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",
+      "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.2",
-        "@eslint/js": "8.39.0",
-        "@humanwhocodes/config-array": "^0.11.8",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "8.51.0",
+        "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.0",
-        "espree": "^9.5.1",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -1551,22 +1835,19 @@
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
         "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
       },
       "bin": {
@@ -1580,9 +1861,9 @@
       }
     },
     "node_modules/eslint-config-standard": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
-      "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
       "dev": true,
       "funding": [
         {
@@ -1598,10 +1879,13 @@
           "url": "https://feross.org/support"
         }
       ],
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "eslint": "^8.0.1",
         "eslint-plugin-import": "^2.25.2",
-        "eslint-plugin-n": "^15.0.0",
+        "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
         "eslint-plugin-promise": "^6.0.0"
       }
     },
@@ -1668,26 +1952,28 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "version": "2.28.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
+      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
         "array.prototype.flat": "^1.3.1",
         "array.prototype.flatmap": "^1.3.1",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.13.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
       },
       "engines": {
         "node": ">=4"
@@ -1718,9 +2004,9 @@
       }
     },
     "node_modules/eslint-plugin-import/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "bin": {
         "semver": "bin/semver.js"
@@ -1859,16 +2145,19 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-utils": {
@@ -1907,26 +2196,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
-      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
-      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1935,15 +2208,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/eslint/node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -1956,57 +2220,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/eslint/node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/esm": {
       "version": "3.2.25",
       "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
@@ -2017,14 +2230,14 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
-      "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.0"
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2034,9 +2247,9 @@
       }
     },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
-      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2045,19 +2258,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/esquery": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
@@ -2070,15 +2270,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -2091,19 +2282,10 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
       "engines": {
         "node": ">=4.0"
@@ -2137,9 +2319,9 @@
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -2161,7 +2343,7 @@
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
     "node_modules/fastq": {
@@ -2320,15 +2502,15 @@
       "dev": true
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2356,13 +2538,14 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       },
       "funding": {
@@ -2417,9 +2600,9 @@
       }
     },
     "node_modules/glob-promise": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-6.0.2.tgz",
-      "integrity": "sha512-Ni2aDyD1ekD6x8/+K4hDriRDbzzfuK4yKpqSymJ4P7IxbtARiOOuU+k40kbHM0sLIlbf1Qh0qdMkAHMZYE6XJQ==",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-6.0.5.tgz",
+      "integrity": "sha512-uUzvxo60yo/vMLXZHCNAlfdM5U5A07jCnUO8xTK44Z0Vc58poGDXhDx8ju1DmPdprOORh+4Lpog64hl+AJ5piA==",
       "dev": true,
       "dependencies": {
         "@types/glob": "^8.0.0"
@@ -2457,9 +2640,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "version": "13.23.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -2524,20 +2707,20 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
     "node_modules/handlebars": {
-      "version": "4.7.7",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
-      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+      "version": "4.7.8",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
       "dev": true,
       "dependencies": {
         "minimist": "^1.2.5",
-        "neo-async": "^2.6.0",
+        "neo-async": "^2.6.2",
         "source-map": "^0.6.1",
         "wordwrap": "^1.0.0"
       },
@@ -2725,9 +2908,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -2759,12 +2942,15 @@
       }
     },
     "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+      "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/inflight": {
@@ -2879,9 +3065,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
-      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -2914,6 +3100,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -2969,12 +3164,15 @@
       }
     },
     "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-3.0.0.tgz",
+      "integrity": "sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-path-inside": {
@@ -3060,16 +3258,12 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "which-typed-array": "^1.1.11"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3102,22 +3296,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "node_modules/js-sdsl": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
-      "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -3131,25 +3321,22 @@
       }
     },
     "node_modules/jsdom": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.1.tgz",
-      "integrity": "sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w==",
+      "version": "22.1.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
+      "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==",
       "dev": true,
       "dependencies": {
         "abab": "^2.0.6",
-        "acorn": "^8.8.2",
-        "acorn-globals": "^7.0.0",
         "cssstyle": "^3.0.0",
         "data-urls": "^4.0.0",
         "decimal.js": "^10.4.3",
         "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
         "form-data": "^4.0.0",
         "html-encoding-sniffer": "^3.0.0",
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.1",
         "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.2",
+        "nwsapi": "^2.2.4",
         "parse5": "^7.1.2",
         "rrweb-cssom": "^0.6.0",
         "saxes": "^6.0.0",
@@ -3164,7 +3351,7 @@
         "xml-name-validator": "^4.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=16"
       },
       "peerDependencies": {
         "canvas": "^2.5.0"
@@ -3200,13 +3387,13 @@
       }
     },
     "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
       "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -3523,16 +3710,10 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "node_modules/natural-compare-lite": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
-    },
     "node_modules/neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
     "node_modules/normalize-path": {
@@ -3586,6 +3767,35 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object.fromentries": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
+      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
+      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
     "node_modules/object.values": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
@@ -3622,17 +3832,17 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
+        "@aashutoshrathi/word-wrap": "^1.2.3",
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -3669,15 +3879,15 @@
       }
     },
     "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-5.5.0.tgz",
+      "integrity": "sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==",
       "dev": true,
       "dependencies": {
-        "aggregate-error": "^3.0.0"
+        "aggregate-error": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -3785,9 +3995,9 @@
       }
     },
     "node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
       "engines": {
         "node": ">= 0.8.0"
@@ -3880,14 +4090,14 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
+        "set-function-name": "^2.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4004,17 +4214,30 @@
       }
     },
     "node_modules/rollup": {
-      "version": "2.79.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
-      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.0.2.tgz",
+      "integrity": "sha512-MCScu4usMPCeVFaiLcgMDaBQeYi1z6vpWxz0r0hq0Hv77Y2YuOTZldkuNJ54BdYBH3e+nkrk6j0Rre/NLDBYzg==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
       },
       "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.0.2",
+        "@rollup/rollup-android-arm64": "4.0.2",
+        "@rollup/rollup-darwin-arm64": "4.0.2",
+        "@rollup/rollup-darwin-x64": "4.0.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.0.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.0.2",
+        "@rollup/rollup-linux-arm64-musl": "4.0.2",
+        "@rollup/rollup-linux-x64-gnu": "4.0.2",
+        "@rollup/rollup-linux-x64-musl": "4.0.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.0.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.0.2",
+        "@rollup/rollup-win32-x64-msvc": "4.0.2",
         "fsevents": "~2.3.2"
       }
     },
@@ -4047,6 +4270,24 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "node_modules/safe-array-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
+      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -4110,6 +4351,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
       "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -4129,6 +4371,20 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/set-function-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -4271,24 +4527,15 @@
         "node": ">=8"
       }
     },
-    "node_modules/string-width/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
+      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4298,28 +4545,28 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
+      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
+      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4377,13 +4624,13 @@
       "dev": true
     },
     "node_modules/terser": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz",
-      "integrity": "sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==",
+      "version": "5.21.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz",
+      "integrity": "sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -4454,46 +4701,37 @@
         "node": ">=14"
       }
     },
+    "node_modules/ts-api-utils": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
+      "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.13.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
       "dev": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^1.0.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       }
     },
-    "node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
     "node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
       "dependencies": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -4511,6 +4749,57 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/typed-array-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
@@ -4526,16 +4815,16 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
-      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=12.20"
+        "node": ">=14.17"
       }
     },
     "node_modules/uglify-js": {
@@ -4718,17 +5007,16 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
       "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4737,15 +5025,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -4775,39 +5054,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -4933,10 +5179,16 @@
     }
   },
   "dependencies": {
+    "@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true
+    },
     "@colors/colors": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
+      "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
       "dev": true
     },
     "@eslint-community/eslint-utils": {
@@ -4957,20 +5209,20 @@
       }
     },
     "@eslint-community/regexpp": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
-      "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
+      "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz",
-      "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.1",
+        "espree": "^9.6.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -4980,15 +5232,15 @@
       }
     },
     "@eslint/js": {
-      "version": "8.39.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz",
-      "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",
+      "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==",
       "dev": true
     },
     "@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
+      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -5009,32 +5261,32 @@
       "dev": true
     },
     "@jridgewell/gen-mapping": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
-      "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
       "dev": true,
       "requires": {
-        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
         "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
     "@jridgewell/resolve-uri": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
-      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true
     },
     "@jridgewell/set-array": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
-      "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
       "dev": true
     },
     "@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
       "dev": true,
       "requires": {
         "@jridgewell/gen-mapping": "^0.3.0",
@@ -5042,19 +5294,19 @@
       }
     },
     "@jridgewell/sourcemap-codec": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
-      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==",
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
-      "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
       "dev": true,
       "requires": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "@nodelib/fs.scandir": {
@@ -5084,9 +5336,9 @@
       }
     },
     "@rollup/plugin-commonjs": {
-      "version": "24.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-24.1.0.tgz",
-      "integrity": "sha512-eSL45hjhCWI0jCCXcNtLVqM5N1JlBGvlFfY0m6oOYnLCJ6N0qEXoZql4sY2MOUArzhH4SA/qBpTxvvZp2Sc+DQ==",
+      "version": "25.0.5",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.5.tgz",
+      "integrity": "sha512-xY8r/A9oisSeSuLCTfhssyDjo9Vp/eDiRLXkg1MXCcEEgEjPmLU+ZyDB20OOD0NlyDa/8SGbK5uIggF5XTx77w==",
       "dev": true,
       "requires": {
         "@rollup/pluginutils": "^5.0.1",
@@ -5109,18 +5361,18 @@
       }
     },
     "@rollup/plugin-json": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.0.tgz",
-      "integrity": "sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.1.tgz",
+      "integrity": "sha512-RgVfl5hWMkxN1h/uZj8FVESvPuBJ/uf6ly6GTj0GONnkfoBN5KC0MSz+PN2OLDgYXMhtG0mWpTrkiOjoxAIevw==",
       "dev": true,
       "requires": {
         "@rollup/pluginutils": "^5.0.1"
       }
     },
     "@rollup/plugin-node-resolve": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.2.tgz",
-      "integrity": "sha512-Y35fRGUjC3FaurG722uhUuG8YHOJRJQbI6/CkbRkdPotSpDj9NtIN85z1zrcyDcCQIW4qp5mgG72U+gJ0TAFEg==",
+      "version": "15.2.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
+      "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==",
       "dev": true,
       "requires": {
         "@rollup/pluginutils": "^5.0.1",
@@ -5132,9 +5384,9 @@
       }
     },
     "@rollup/pluginutils": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
-      "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.5.tgz",
+      "integrity": "sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==",
       "dev": true,
       "requires": {
         "@types/estree": "^1.0.0",
@@ -5142,6 +5394,90 @@
         "picomatch": "^2.3.1"
       }
     },
+    "@rollup/rollup-android-arm-eabi": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.0.2.tgz",
+      "integrity": "sha512-xDvk1pT4vaPU2BOLy0MqHMdYZyntqpaBf8RhBiezlqG9OjY8F50TyctHo8znigYKd+QCFhCmlmXHOL/LoaOl3w==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-android-arm64": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.0.2.tgz",
+      "integrity": "sha512-lqCglytY3E6raze27DD9VQJWohbwCxzqs9aSHcj5X/8hJpzZfNdbsr4Ja9Hqp6iPyF53+5PtPx0pKRlkSvlHZg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-darwin-arm64": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.0.2.tgz",
+      "integrity": "sha512-nkBKItS6E6CCzvRwgiKad+j+1ibmL7SIInj7oqMWmdkCjiSX6VeVZw2mLlRKIUL+JjsBgpATTfo7BiAXc1v0jA==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-darwin-x64": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.0.2.tgz",
+      "integrity": "sha512-vX2C8xvWPIbpEgQht95+dY6BReKAvtDgPDGi0XN0kWJKkm4WdNmq5dnwscv/zxvi+n6jUTBhs6GtpkkWT4q8Gg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.0.2.tgz",
+      "integrity": "sha512-DVFIfcHOjgmeHOAqji4xNz2wczt1Bmzy9MwBZKBa83SjBVO/i38VHDR+9ixo8QpBOiEagmNw12DucG+v55tCrg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.0.2.tgz",
+      "integrity": "sha512-GCK/a9ItUxPI0V5hQEJjH4JtOJO90GF2Hja7TO+EZ8rmkGvEi8/ZDMhXmcuDpQT7/PWrTT9RvnG8snMd5SrhBQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-arm64-musl": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.0.2.tgz",
+      "integrity": "sha512-cLuBp7rOjIB1R2j/VazjCmHC7liWUur2e9mFflLJBAWCkrZ+X0+QwHLvOQakIwDymungzAKv6W9kHZnTp/Mqrg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-x64-gnu": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.0.2.tgz",
+      "integrity": "sha512-Zqw4iVnJr2naoyQus0yLy7sLtisCQcpdMKUCeXPBjkJtpiflRime/TMojbnl8O3oxUAj92mxr+t7im/RbgA20w==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-linux-x64-musl": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.0.2.tgz",
+      "integrity": "sha512-jJRU9TyUD/iMqjf8aLAp7XiN3pIj5v6Qcu+cdzBfVTKDD0Fvua4oUoK8eVJ9ZuKBEQKt3WdlcwJXFkpmMLk6kg==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.0.2.tgz",
+      "integrity": "sha512-ZkS2NixCxHKC4zbOnw64ztEGGDVIYP6nKkGBfOAxEPW71Sji9v8z3yaHNuae/JHPwXA+14oDefnOuVfxl59SmQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.0.2.tgz",
+      "integrity": "sha512-3SKjj+tvnZ0oZq2BKB+fI+DqYI83VrRzk7eed8tJkxeZ4zxJZcLSE8YDQLYGq1tZAnAX+H076RHHB4gTZXsQzw==",
+      "dev": true,
+      "optional": true
+    },
+    "@rollup/rollup-win32-x64-msvc": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.0.2.tgz",
+      "integrity": "sha512-MBdJIOxRauKkry7t2q+rTHa3aWjVez2eioWg+etRVS3dE4tChhmt5oqZYr48R6bPmcwEhxQr96gVRfeQrLbqng==",
+      "dev": true,
+      "optional": true
+    },
     "@tootallnate/once": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
@@ -5165,9 +5501,9 @@
       }
     },
     "@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "version": "7.0.13",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
+      "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==",
       "dev": true
     },
     "@types/json5": {
@@ -5183,9 +5519,9 @@
       "dev": true
     },
     "@types/mocha": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz",
-      "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.2.tgz",
+      "integrity": "sha512-NaHL0+0lLNhX6d9rs+NSt97WH/gIlRHmszXbQ/8/MV/eVcFNdeJ/GYhrFuUc8K7WuPhRhTSdMkCp8VMzhUq85w==",
       "dev": true
     },
     "@types/node": {
@@ -5201,114 +5537,148 @@
       "dev": true
     },
     "@types/semver": {
-      "version": "7.3.13",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==",
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz",
-      "integrity": "sha512-AVi0uazY5quFB9hlp2Xv+ogpfpk77xzsgsIEWyVS7uK/c7MZ5tw7ZPbapa0SbfkqE0fsAMkz5UwtgMLVk2BQAg==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.4.tgz",
+      "integrity": "sha512-DAbgDXwtX+pDkAHwiGhqP3zWUGpW49B7eqmgpPtg+BKJXwdct79ut9+ifqOFPJGClGKSHXn2PTBatCnldJRUoA==",
       "dev": true,
       "requires": {
-        "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/type-utils": "5.59.1",
-        "@typescript-eslint/utils": "5.59.1",
+        "@eslint-community/regexpp": "^4.5.1",
+        "@typescript-eslint/scope-manager": "6.7.4",
+        "@typescript-eslint/type-utils": "6.7.4",
+        "@typescript-eslint/utils": "6.7.4",
+        "@typescript-eslint/visitor-keys": "6.7.4",
         "debug": "^4.3.4",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "natural-compare-lite": "^1.4.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.4",
+        "natural-compare": "^1.4.0",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.1.tgz",
-      "integrity": "sha512-nzjFAN8WEu6yPRDizIFyzAfgK7nybPodMNFGNH0M9tei2gYnYszRDqVA0xlnRjkl7Hkx2vYrEdb6fP2a21cG1g==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.4.tgz",
+      "integrity": "sha512-I5zVZFY+cw4IMZUeNCU7Sh2PO5O57F7Lr0uyhgCJmhN/BuTlnc55KxPonR4+EM3GBdfiCyGZye6DgMjtubQkmA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/typescript-estree": "5.59.1",
+        "@typescript-eslint/scope-manager": "6.7.4",
+        "@typescript-eslint/types": "6.7.4",
+        "@typescript-eslint/typescript-estree": "6.7.4",
+        "@typescript-eslint/visitor-keys": "6.7.4",
         "debug": "^4.3.4"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.1.tgz",
-      "integrity": "sha512-mau0waO5frJctPuAzcxiNWqJR5Z8V0190FTSqRw1Q4Euop6+zTwHAf8YIXNwDOT29tyUDrQ65jSg9aTU/H0omA==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.4.tgz",
+      "integrity": "sha512-SdGqSLUPTXAXi7c3Ob7peAGVnmMoGzZ361VswK2Mqf8UOYcODiYvs8rs5ILqEdfvX1lE7wEZbLyELCW+Yrql1A==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/visitor-keys": "5.59.1"
+        "@typescript-eslint/types": "6.7.4",
+        "@typescript-eslint/visitor-keys": "6.7.4"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.1.tgz",
-      "integrity": "sha512-ZMWQ+Oh82jWqWzvM3xU+9y5U7MEMVv6GLioM3R5NJk6uvP47kZ7YvlgSHJ7ERD6bOY7Q4uxWm25c76HKEwIjZw==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.4.tgz",
+      "integrity": "sha512-n+g3zi1QzpcAdHFP9KQF+rEFxMb2KxtnJGID3teA/nxKHOVi3ylKovaqEzGBbVY2pBttU6z85gp0D00ufLzViQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.59.1",
-        "@typescript-eslint/utils": "5.59.1",
+        "@typescript-eslint/typescript-estree": "6.7.4",
+        "@typescript-eslint/utils": "6.7.4",
         "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
+        "ts-api-utils": "^1.0.1"
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.1.tgz",
-      "integrity": "sha512-dg0ICB+RZwHlysIy/Dh1SP+gnXNzwd/KS0JprD3Lmgmdq+dJAJnUPe1gNG34p0U19HvRlGX733d/KqscrGC1Pg==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.4.tgz",
+      "integrity": "sha512-o9XWK2FLW6eSS/0r/tgjAGsYasLAnOWg7hvZ/dGYSSNjCh+49k5ocPN8OmG5aZcSJ8pclSOyVKP2x03Sj+RrCA==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.1.tgz",
-      "integrity": "sha512-lYLBBOCsFltFy7XVqzX0Ju+Lh3WPIAWxYpmH/Q7ZoqzbscLiCW00LeYCdsUnnfnj29/s1WovXKh2gwCoinHNGA==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.4.tgz",
+      "integrity": "sha512-ty8b5qHKatlNYd9vmpHooQz3Vki3gG+3PchmtsA4TgrZBKWHNjWfkQid7K7xQogBqqc7/BhGazxMD5vr6Ha+iQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/visitor-keys": "5.59.1",
+        "@typescript-eslint/types": "6.7.4",
+        "@typescript-eslint/visitor-keys": "6.7.4",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.1.tgz",
-      "integrity": "sha512-MkTe7FE+K1/GxZkP5gRj3rCztg45bEhsd8HYjczBuYm+qFHP5vtZmjx3B0yUCDotceQ4sHgTyz60Ycl225njmA==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.4.tgz",
+      "integrity": "sha512-PRQAs+HUn85Qdk+khAxsVV+oULy3VkbH3hQ8hxLRJXWBEd7iI+GbQxH5SEUSH7kbEoTp6oT1bOwyga24ELALTA==",
       "dev": true,
       "requires": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.59.1",
-        "@typescript-eslint/types": "5.59.1",
-        "@typescript-eslint/typescript-estree": "5.59.1",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.12",
+        "@types/semver": "^7.5.0",
+        "@typescript-eslint/scope-manager": "6.7.4",
+        "@typescript-eslint/types": "6.7.4",
+        "@typescript-eslint/typescript-estree": "6.7.4",
+        "semver": "^7.5.4"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.59.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.1.tgz",
-      "integrity": "sha512-6waEYwBTCWryx0VJmP7JaM4FpipLsFl9CvYf2foAE8Qh/Y0s+bxWysciwOs0LTBED4JCaNxTZ5rGadB14M6dwA==",
+      "version": "6.7.4",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.4.tgz",
+      "integrity": "sha512-pOW37DUhlTZbvph50x5zZCkFn3xzwkGtNoJHzIM3svpiSkJzwOYr/kVBaXmf+RAQiUDs1AHEZVNPg6UJCJpwRA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.59.1",
-        "eslint-visitor-keys": "^3.3.0"
+        "@typescript-eslint/types": "6.7.4",
+        "eslint-visitor-keys": "^3.4.1"
       },
       "dependencies": {
         "eslint-visitor-keys": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
-          "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
           "dev": true
         }
       }
@@ -5320,21 +5690,11 @@
       "dev": true
     },
     "acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true
     },
-    "acorn-globals": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
-      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.1.0",
-        "acorn-walk": "^8.0.2"
-      }
-    },
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -5342,12 +5702,6 @@
       "dev": true,
       "requires": {}
     },
-    "acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "dev": true
-    },
     "agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -5358,13 +5712,13 @@
       }
     },
     "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.1.tgz",
+      "integrity": "sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==",
       "dev": true,
       "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
+        "clean-stack": "^4.0.0",
+        "indent-string": "^5.0.0"
       }
     },
     "ajv": {
@@ -5391,6 +5745,15 @@
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true
     },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
     "anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -5436,6 +5799,19 @@
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
     },
+    "array.prototype.findlastindex": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
+      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
     "array.prototype.flat": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
@@ -5460,6 +5836,21 @@
         "es-shim-unscopables": "^1.0.0"
       }
     },
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
+      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
+      }
+    },
     "async": {
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
@@ -5589,30 +5980,6 @@
         "supports-color": "^7.1.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -5656,10 +6023,13 @@
       }
     },
     "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-4.2.0.tgz",
+      "integrity": "sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "5.0.0"
+      }
     },
     "cli-table": {
       "version": "0.3.11",
@@ -5689,6 +6059,21 @@
         "wrap-ansi": "^7.0.0"
       }
     },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -5699,9 +6084,9 @@
       }
     },
     "commander": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz",
+      "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==",
       "dev": true
     },
     "commondir": {
@@ -5792,15 +6177,15 @@
       "dev": true
     },
     "deep-freeze-es6": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/deep-freeze-es6/-/deep-freeze-es6-2.0.0.tgz",
-      "integrity": "sha512-NMcPpkMyCwEhoua6hn9rUS3hb4afnvWLp8cZWz5WNAI1CM5o+iE+HeX9SoojoFYX+iVxbar22PaRDZ4hO8PI8w==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/deep-freeze-es6/-/deep-freeze-es6-3.0.2.tgz",
+      "integrity": "sha512-snvTmNKjkzR1ywDMWN+jJtjEwqTPF0Nq0g1/puSkkaxgL71gJ0rJpsPF+WOqMRaVLWogtwb73lHthfSaqP8nIQ==",
       "dev": true
     },
     "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
     "deepmerge": {
@@ -5809,6 +6194,17 @@
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
       "dev": true
     },
+    "define-data-property": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
+      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
     "define-properties": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
@@ -5820,19 +6216,46 @@
       }
     },
     "del": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
-      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-7.1.0.tgz",
+      "integrity": "sha512-v2KyNk7efxhlyHpjEvfyxaAihKKK0nWCuf6ZtqZcFFpQRG0bJ12Qsr0RpvsICMjAAZ8DOVCxrlqpxISlMHC4Kg==",
       "dev": true,
       "requires": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
+        "globby": "^13.1.2",
+        "graceful-fs": "^4.2.10",
+        "is-glob": "^4.0.3",
+        "is-path-cwd": "^3.0.0",
+        "is-path-inside": "^4.0.0",
+        "p-map": "^5.5.0",
         "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
+        "slash": "^4.0.0"
+      },
+      "dependencies": {
+        "globby": {
+          "version": "13.2.2",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+          "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
+          "dev": true,
+          "requires": {
+            "dir-glob": "^3.0.1",
+            "fast-glob": "^3.3.0",
+            "ignore": "^5.2.4",
+            "merge2": "^1.4.1",
+            "slash": "^4.0.0"
+          }
+        },
+        "is-path-inside": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz",
+          "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==",
+          "dev": true
+        },
+        "slash": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+          "dev": true
+        }
       }
     },
     "delayed-stream": {
@@ -5893,18 +6316,19 @@
       "dev": true
     },
     "es-abstract": {
-      "version": "1.21.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
-      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz",
+      "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==",
       "dev": true,
       "requires": {
         "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.2",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.0",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
@@ -5919,19 +6343,23 @@
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
+        "is-typed-array": "^1.1.12",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
+        "regexp.prototype.flags": "^1.5.1",
+        "safe-array-concat": "^1.0.1",
         "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
+        "string.prototype.trim": "^1.2.8",
+        "string.prototype.trimend": "^1.0.7",
+        "string.prototype.trimstart": "^1.0.7",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+        "which-typed-array": "^1.1.11"
       }
     },
     "es-set-tostringtag": {
@@ -5971,49 +6399,34 @@
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "dev": true
     },
-    "escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dev": true,
-      "requires": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
-        }
-      }
+    "escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "dev": true
     },
     "eslint": {
-      "version": "8.39.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz",
-      "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",
+      "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.2",
-        "@eslint/js": "8.39.0",
-        "@humanwhocodes/config-array": "^0.11.8",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "8.51.0",
+        "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.0",
-        "espree": "^9.5.1",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -6021,22 +6434,19 @@
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
         "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
       },
       "dependencies": {
@@ -6046,26 +6456,10 @@
           "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
           "dev": true
         },
-        "eslint-scope": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
-          "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^5.2.0"
-          }
-        },
         "eslint-visitor-keys": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
-          "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
-          "dev": true
-        },
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
           "dev": true
         },
         "glob-parent": {
@@ -6076,52 +6470,13 @@
           "requires": {
             "is-glob": "^4.0.3"
           }
-        },
-        "levn": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "^1.2.1",
-            "type-check": "~0.4.0"
-          }
-        },
-        "optionator": {
-          "version": "0.9.1",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-          "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-          "dev": true,
-          "requires": {
-            "deep-is": "^0.1.3",
-            "fast-levenshtein": "^2.0.6",
-            "levn": "^0.4.1",
-            "prelude-ls": "^1.2.1",
-            "type-check": "^0.4.0",
-            "word-wrap": "^1.2.3"
-          }
-        },
-        "prelude-ls": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-          "dev": true
-        },
-        "type-check": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "^1.2.1"
-          }
         }
       }
     },
     "eslint-config-standard": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
-      "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
       "dev": true,
       "requires": {}
     },
@@ -6178,26 +6533,28 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "version": "2.28.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
+      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
         "array.prototype.flat": "^1.3.1",
         "array.prototype.flatmap": "^1.3.1",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.13.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
       },
       "dependencies": {
         "debug": {
@@ -6219,9 +6576,9 @@
           }
         },
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
           "dev": true
         }
       }
@@ -6317,13 +6674,13 @@
       "requires": {}
     },
     "eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
+        "estraverse": "^5.2.0"
       }
     },
     "eslint-utils": {
@@ -6348,30 +6705,24 @@
       "dev": true
     },
     "espree": {
-      "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
-      "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "requires": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.0"
+        "eslint-visitor-keys": "^3.4.1"
       },
       "dependencies": {
         "eslint-visitor-keys": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
-          "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
           "dev": true
         }
       }
     },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
     "esquery": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
@@ -6379,14 +6730,6 @@
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
       }
     },
     "esrecurse": {
@@ -6396,20 +6739,12 @@
       "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
-        }
       }
     },
     "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true
     },
     "estree-walker": {
@@ -6437,9 +6772,9 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -6458,7 +6793,7 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
     "fastq": {
@@ -6574,15 +6909,15 @@
       "dev": true
     },
     "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       }
     },
     "functions-have-names": {
@@ -6598,13 +6933,14 @@
       "dev": true
     },
     "get-intrinsic": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       }
     },
@@ -6661,18 +6997,18 @@
       }
     },
     "glob-promise": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-6.0.2.tgz",
-      "integrity": "sha512-Ni2aDyD1ekD6x8/+K4hDriRDbzzfuK4yKpqSymJ4P7IxbtARiOOuU+k40kbHM0sLIlbf1Qh0qdMkAHMZYE6XJQ==",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-6.0.5.tgz",
+      "integrity": "sha512-uUzvxo60yo/vMLXZHCNAlfdM5U5A07jCnUO8xTK44Z0Vc58poGDXhDx8ju1DmPdprOORh+4Lpog64hl+AJ5piA==",
       "dev": true,
       "requires": {
         "@types/glob": "^8.0.0"
       }
     },
     "globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "version": "13.23.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
       "dev": true,
       "requires": {
         "type-fest": "^0.20.2"
@@ -6716,20 +7052,20 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+    "graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
     "handlebars": {
-      "version": "4.7.7",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
-      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+      "version": "4.7.8",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
       "dev": true,
       "requires": {
         "minimist": "^1.2.5",
-        "neo-async": "^2.6.0",
+        "neo-async": "^2.6.2",
         "source-map": "^0.6.1",
         "uglify-js": "^3.1.4",
         "wordwrap": "^1.0.0"
@@ -6858,9 +7194,9 @@
       }
     },
     "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true
     },
     "import-fresh": {
@@ -6880,9 +7216,9 @@
       "dev": true
     },
     "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+      "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
       "dev": true
     },
     "inflight": {
@@ -6967,9 +7303,9 @@
       "dev": true
     },
     "is-core-module": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
-      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -6990,6 +7326,12 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
     "is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -7027,9 +7369,9 @@
       }
     },
     "is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-3.0.0.tgz",
+      "integrity": "sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==",
       "dev": true
     },
     "is-path-inside": {
@@ -7088,16 +7430,12 @@
       }
     },
     "is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
       "dev": true,
       "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "which-typed-array": "^1.1.11"
       }
     },
     "is-unicode-supported": {
@@ -7115,18 +7453,18 @@
         "call-bind": "^1.0.2"
       }
     },
+    "isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "js-sdsl": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
-      "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
-      "dev": true
-    },
     "js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -7137,25 +7475,22 @@
       }
     },
     "jsdom": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.1.tgz",
-      "integrity": "sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w==",
+      "version": "22.1.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
+      "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==",
       "dev": true,
       "requires": {
         "abab": "^2.0.6",
-        "acorn": "^8.8.2",
-        "acorn-globals": "^7.0.0",
         "cssstyle": "^3.0.0",
         "data-urls": "^4.0.0",
         "decimal.js": "^10.4.3",
         "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
         "form-data": "^4.0.0",
         "html-encoding-sniffer": "^3.0.0",
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.1",
         "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.2",
+        "nwsapi": "^2.2.4",
         "parse5": "^7.1.2",
         "rrweb-cssom": "^0.6.0",
         "saxes": "^6.0.0",
@@ -7192,13 +7527,13 @@
       }
     },
     "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       }
     },
     "locate-path": {
@@ -7432,16 +7767,10 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "natural-compare-lite": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
-    },
     "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
     "normalize-path": {
@@ -7480,6 +7809,29 @@
         "object-keys": "^1.1.1"
       }
     },
+    "object.fromentries": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
+      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
+      }
+    },
+    "object.groupby": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
+      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
     "object.values": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
@@ -7507,17 +7859,17 @@
       "dev": true
     },
     "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
+        "@aashutoshrathi/word-wrap": "^1.2.3",
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0"
       }
     },
     "p-limit": {
@@ -7539,12 +7891,12 @@
       }
     },
     "p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-5.5.0.tgz",
+      "integrity": "sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==",
       "dev": true,
       "requires": {
-        "aggregate-error": "^3.0.0"
+        "aggregate-error": "^4.0.0"
       }
     },
     "p-try": {
@@ -7624,9 +7976,9 @@
       }
     },
     "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
     "psl": {
@@ -7690,14 +8042,14 @@
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
+        "set-function-name": "^2.0.0"
       }
     },
     "regexpp": {
@@ -7776,11 +8128,23 @@
       }
     },
     "rollup": {
-      "version": "2.79.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
-      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
-      "dev": true,
-      "requires": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.0.2.tgz",
+      "integrity": "sha512-MCScu4usMPCeVFaiLcgMDaBQeYi1z6vpWxz0r0hq0Hv77Y2YuOTZldkuNJ54BdYBH3e+nkrk6j0Rre/NLDBYzg==",
+      "dev": true,
+      "requires": {
+        "@rollup/rollup-android-arm-eabi": "4.0.2",
+        "@rollup/rollup-android-arm64": "4.0.2",
+        "@rollup/rollup-darwin-arm64": "4.0.2",
+        "@rollup/rollup-darwin-x64": "4.0.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.0.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.0.2",
+        "@rollup/rollup-linux-arm64-musl": "4.0.2",
+        "@rollup/rollup-linux-x64-gnu": "4.0.2",
+        "@rollup/rollup-linux-x64-musl": "4.0.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.0.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.0.2",
+        "@rollup/rollup-win32-x64-msvc": "4.0.2",
         "fsevents": "~2.3.2"
       }
     },
@@ -7799,6 +8163,18 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "safe-array-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
+      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      }
+    },
     "safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -7842,6 +8218,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
       "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "dev": true,
+      "peer": true,
       "requires": {
         "lru-cache": "^6.0.0"
       }
@@ -7855,6 +8232,17 @@
         "randombytes": "^2.1.0"
       }
     },
+    "set-function-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "dev": true,
+      "requires": {
+        "define-data-property": "^1.0.1",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -7976,47 +8364,39 @@
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
         "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        }
       }
     },
     "string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
+      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
+      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
+      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "strip-ansi": {
@@ -8053,13 +8433,13 @@
       "dev": true
     },
     "terser": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz",
-      "integrity": "sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==",
+      "version": "5.21.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz",
+      "integrity": "sha512-WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw==",
       "dev": true,
       "requires": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -8117,40 +8497,32 @@
         "punycode": "^2.3.0"
       }
     },
+    "ts-api-utils": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
+      "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
+      "dev": true,
+      "requires": {}
+    },
     "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
       "dev": true,
       "requires": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^1.0.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       }
     },
-    "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      }
-    },
     "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "^1.2.1"
       }
     },
     "type-fest": {
@@ -8159,6 +8531,42 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true
     },
+    "typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
     "typed-array-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
@@ -8171,9 +8579,9 @@
       }
     },
     "typescript": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
-      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
       "dev": true
     },
     "uglify-js": {
@@ -8319,25 +8727,18 @@
       }
     },
     "which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
       "dev": true,
       "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "has-tostringtag": "^1.0.0"
       }
     },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
-    },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -8359,32 +8760,6 @@
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        }
       }
     },
     "wrappy": {
diff --git a/package.json b/package.json
index 4e97da126f..1baf20cb67 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "syntax"
   ],
   "homepage": "https://highlightjs.org/",
-  "version": "11.8.0",
+  "version": "11.9.0",
   "author": "Josh Goebel <hello@joshgoebel.com>",
   "contributors": [
     "Josh Goebel <hello@joshgoebel.com>",
@@ -58,39 +58,39 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@colors/colors": "^1.5.0",
-    "@rollup/plugin-commonjs": "^24.1.0",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.2",
-    "@types/mocha": "^10.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.1",
-    "@typescript-eslint/parser": "^5.59.1",
+    "@colors/colors": "^1.6.0",
+    "@rollup/plugin-commonjs": "^25.0.5",
+    "@rollup/plugin-json": "^6.0.1",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@types/mocha": "^10.0.2",
+    "@typescript-eslint/eslint-plugin": "^6.7.4",
+    "@typescript-eslint/parser": "^6.7.4",
     "clean-css": "^5.3.2",
     "cli-table": "^0.3.1",
-    "commander": "^10.0.1",
+    "commander": "^11.0.0",
     "css": "^3.0.0",
     "css-color-names": "^1.0.1",
-    "deep-freeze-es6": "^2.0.0",
-    "del": "^6.1.1",
+    "deep-freeze-es6": "^3.0.2",
+    "del": "^7.1.0",
     "dependency-resolver": "^2.0.1",
-    "eslint": "^8.39.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint": "^8.51.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
-    "glob": "^8.0.3",
-    "glob-promise": "^6.0.2",
-    "handlebars": "^4.7.6",
+    "glob": "^8.1.0",
+    "glob-promise": "^6.0.5",
+    "handlebars": "^4.7.8",
     "http-server": "^14.1.1",
-    "jsdom": "^21.1.1",
+    "jsdom": "^22.1.0",
     "lodash": "^4.17.20",
     "mocha": "^10.2.0",
     "refa": "^0.4.1",
-    "rollup": "^2.47.0",
+    "rollup": "^4.0.2",
     "should": "^13.2.3",
-    "terser": "^5.17.1",
+    "terser": "^5.21.0",
     "tiny-worker": "^2.3.0",
-    "typescript": "^5.0.4",
+    "typescript": "^5.2.2",
     "wcag-contrast": "^3.0.0"
   }
 }
diff --git a/src/languages/1c.js b/src/languages/1c.js
index 040c0c8bf7..ef06c7438a 100644
--- a/src/languages/1c.js
+++ b/src/languages/1c.js
@@ -443,6 +443,12 @@ export default function(hljs) {
     ]
   };
 
+  const PUNCTUATION = {
+    match: /[;()+\-:=,]/,
+    className: "punctuation",
+    relevance: 0
+  };
+
   // comment : комментарии
   const COMMENTS = hljs.inherit(hljs.C_LINE_COMMENT_MODE);
 
@@ -529,7 +535,8 @@ export default function(hljs) {
       SYMBOL,
       NUMBERS,
       STRINGS,
-      DATE
+      DATE,
+      PUNCTUATION
     ]
   };
 }
diff --git a/src/languages/abnf.js b/src/languages/abnf.js
index 906310da08..cc6d018719 100644
--- a/src/languages/abnf.js
+++ b/src/languages/abnf.js
@@ -2,6 +2,7 @@
 Language: Augmented Backus-Naur Form
 Author: Alex McKibben <alex@nullscope.net>
 Website: https://tools.ietf.org/html/rfc5234
+Category: syntax
 Audit: 2020
 */
 
diff --git a/src/languages/arcade.js b/src/languages/arcade.js
index 6de745189d..c7863467f5 100644
--- a/src/languages/arcade.js
+++ b/src/languages/arcade.js
@@ -8,34 +8,44 @@
 
 /** @type LanguageFn */
 export default function(hljs) {
+  const regex = hljs.regex;
   const IDENT_RE = '[A-Za-z_][0-9A-Za-z_]*';
   const KEYWORDS = {
     keyword: [
-      "if",
+      "break",
+      "case",
+      "catch",
+      "continue",
+      "debugger",
+      "do",
+      "else",
+      "export",
       "for",
-      "while",
-      "var",
-      "new",
       "function",
-      "do",
+      "if",
+      "import",
+      "in",
+      "new",
       "return",
+      "switch",
+      "try",
+      "var",
       "void",
-      "else",
-      "break"
+      "while"
     ],
     literal: [
       "BackSlash",
       "DoubleQuote",
-      "false",
       "ForwardSlash",
       "Infinity",
       "NaN",
       "NewLine",
-      "null",
       "PI",
       "SingleQuote",
       "Tab",
       "TextFormatting",
+      "false",
+      "null",
       "true",
       "undefined"
     ],
@@ -60,19 +70,22 @@ export default function(hljs) {
       "BufferGeodetic",
       "Ceil",
       "Centroid",
+      "ChangeTimeZone",
       "Clip",
       "Concatenate",
       "Console",
       "Constrain",
       "Contains",
       "ConvertDirection",
+      "ConvexHull",
       "Cos",
       "Count",
       "Crosses",
       "Cut",
-      "Date",
+      "Date|0",
       "DateAdd",
       "DateDiff",
+      "DateOnly",
       "Day",
       "Decode",
       "DefaultValue",
@@ -99,25 +112,34 @@ export default function(hljs) {
       "FeatureSetById",
       "FeatureSetByName",
       "FeatureSetByPortalItem",
+      "FeatureSetByRelationshipClass",
       "FeatureSetByRelationshipName",
       "Filter",
       "Find",
-      "First",
+      "First|0",
       "Floor",
       "FromCharCode",
       "FromCodePoint",
       "FromJSON",
+      "Front",
       "GdbVersion",
       "Generalize",
       "Geometry",
+      "GetEnvironment",
       "GetFeatureSet",
+      "GetFeatureSetInfo",
       "GetUser",
       "GroupBy",
       "Guid",
-      "Hash",
       "HasKey",
+      "HasValue",
+      "Hash",
       "Hour",
       "IIf",
+      "ISOMonth",
+      "ISOWeek",
+      "ISOWeekday",
+      "ISOYear",
       "Includes",
       "IndexOf",
       "Insert",
@@ -125,10 +147,6 @@ export default function(hljs) {
       "Intersects",
       "IsEmpty",
       "IsNan",
-      "ISOMonth",
-      "ISOWeek",
-      "ISOWeekday",
-      "ISOYear",
       "IsSelfIntersecting",
       "IsSimple",
       "Left|0",
@@ -147,11 +165,13 @@ export default function(hljs) {
       "Month",
       "MultiPartToSinglePart",
       "Multipoint",
+      "NearestCoordinate",
+      "NearestVertex",
       "NextSequenceValue",
       "None",
       "Now",
       "Number",
-      "Offset|0",
+      "Offset",
       "OrderBy",
       "Overlaps",
       "Point",
@@ -182,6 +202,7 @@ export default function(hljs) {
       "Splice",
       "Split",
       "Sqrt",
+      "StandardizeGuid",
       "Stdev",
       "SubtypeCode",
       "SubtypeName",
@@ -190,15 +211,18 @@ export default function(hljs) {
       "SymmetricDifference",
       "Tan",
       "Text",
+      "Time",
+      "TimeZone",
+      "TimeZoneOffset",
       "Timestamp",
       "ToCharCode",
       "ToCodePoint",
-      "Today",
       "ToHex",
       "ToLocal",
+      "ToUTC",
+      "Today",
       "Top|0",
       "Touches",
-      "ToUTC",
       "TrackAccelerationAt",
       "TrackAccelerationWindow",
       "TrackCurrentAcceleration",
@@ -223,14 +247,46 @@ export default function(hljs) {
       "Variance",
       "Week",
       "Weekday",
-      "When",
+      "When|0",
       "Within",
-      "Year"
+      "Year|0",
     ]
   };
+  const PROFILE_VARS = [
+    "aggregatedFeatures",
+    "analytic",
+    "config",
+    "datapoint",
+    "datastore",
+    "editcontext",
+    "feature",
+    "featureSet",
+    "feedfeature",
+    "fencefeature",
+    "fencenotificationtype",
+    "join",
+    "layer",
+    "locationupdate",
+    "map",
+    "measure",
+    "measure",
+    "originalFeature",
+    "record",
+    "reference",
+    "rowindex",
+    "sourcedatastore",
+    "sourcefeature",
+    "sourcelayer",
+    "target",
+    "targetdatastore",
+    "targetfeature",
+    "targetlayer",
+    "value",
+    "view"
+  ];
   const SYMBOL = {
     className: 'symbol',
-    begin: '\\$[datastore|feature|layer|map|measure|sourcefeature|sourcelayer|targetfeature|targetlayer|value|view]+'
+    begin: '\\$' + regex.either(...PROFILE_VARS)
   };
   const NUMBER = {
     className: 'number',
diff --git a/src/languages/arduino.js b/src/languages/arduino.js
index f6b94dc999..59261c8da8 100644
--- a/src/languages/arduino.js
+++ b/src/languages/arduino.js
@@ -3,6 +3,7 @@ Language: Arduino
 Author: Stefania Mellai <s.mellai@arduino.cc>
 Description: The Arduino® Language is a superset of C++. This rules are designed to highlight the Arduino® source code. For info about language see http://www.arduino.cc.
 Website: https://www.arduino.cc
+Category: system
 */
 
 import cPlusPlus from './cpp.js';
diff --git a/src/languages/aspectj.js b/src/languages/aspectj.js
index 23e5919766..83786b26ef 100644
--- a/src/languages/aspectj.js
+++ b/src/languages/aspectj.js
@@ -3,6 +3,7 @@ Language: AspectJ
 Author: Hakan Ozler <ozler.hakan@gmail.com>
 Website: https://www.eclipse.org/aspectj/
 Description: Syntax Highlighting for the AspectJ Language which is a general-purpose aspect-oriented extension to the Java programming language.
+Category: system
 Audit: 2020
 */
 
diff --git a/src/languages/awk.js b/src/languages/awk.js
index dfdb4f8588..26c93177b6 100644
--- a/src/languages/awk.js
+++ b/src/languages/awk.js
@@ -3,6 +3,7 @@ Language: Awk
 Author: Matthew Daly <matthewbdaly@gmail.com>
 Website: https://www.gnu.org/software/gawk/manual/gawk.html
 Description: language definition for Awk scripts
+Category: scripting
 */
 
 /** @type LanguageFn */
diff --git a/src/languages/bash.js b/src/languages/bash.js
index 17295c7f54..add137aa48 100644
--- a/src/languages/bash.js
+++ b/src/languages/bash.js
@@ -3,7 +3,7 @@ Language: Bash
 Author: vah <vahtenberg@gmail.com>
 Contributrors: Benjamin Pannell <contact@sierrasoftworks.com>
 Website: https://www.gnu.org/software/bash/
-Category: common
+Category: common, scripting
 */
 
 /** @type LanguageFn */
@@ -38,6 +38,18 @@ export default function(hljs) {
     end: /\)/,
     contains: [ hljs.BACKSLASH_ESCAPE ]
   };
+  const COMMENT = hljs.inherit(
+    hljs.COMMENT(),
+    {
+      match: [
+        /(^|\s)/,
+        /#.*$/
+      ],
+      scope: {
+        2: 'comment'
+      }
+    }
+  );
   const HERE_DOC = {
     begin: /<<-?\s*(?=\w+)/,
     starts: { contains: [
@@ -171,6 +183,7 @@ export default function(hljs) {
     "read",
     "readarray",
     "source",
+    "sudo",
     "type",
     "typeset",
     "ulimit",
@@ -356,7 +369,10 @@ export default function(hljs) {
 
   return {
     name: 'Bash',
-    aliases: [ 'sh' ],
+    aliases: [
+      'sh',
+      'zsh'
+    ],
     keywords: {
       $pattern: /\b[a-z][a-z0-9._-]+\b/,
       keyword: KEYWORDS,
@@ -376,7 +392,7 @@ export default function(hljs) {
       hljs.SHEBANG(), // to catch unknown shells but still highlight the shebang
       FUNCTION,
       ARITHMETIC,
-      hljs.HASH_COMMENT_MODE,
+      COMMENT,
       HERE_DOC,
       PATH_MODE,
       QUOTE_STRING,
diff --git a/src/languages/basic.js b/src/languages/basic.js
index e445ca1bd9..d359d541c2 100644
--- a/src/languages/basic.js
+++ b/src/languages/basic.js
@@ -3,6 +3,7 @@ Language: BASIC
 Author: Raphaël Assénat <raph@raphnet.net>
 Description: Based on the BASIC reference from the Tandy 1000 guide
 Website: https://en.wikipedia.org/wiki/Tandy_1000
+Category: system
 */
 
 /** @type LanguageFn */
diff --git a/src/languages/bnf.js b/src/languages/bnf.js
index 30f0ecd921..3069a6f0fe 100644
--- a/src/languages/bnf.js
+++ b/src/languages/bnf.js
@@ -1,6 +1,7 @@
 /*
 Language: Backus–Naur Form
 Website: https://en.wikipedia.org/wiki/Backus–Naur_form
+Category: syntax
 Author: Oleg Efimov <efimovov@gmail.com>
 */
 
diff --git a/src/languages/c.js b/src/languages/c.js
index 227927913f..cb7f51dbe4 100644
--- a/src/languages/c.js
+++ b/src/languages/c.js
@@ -70,7 +70,7 @@ export default function(hljs) {
     end: /$/,
     keywords: { keyword:
         'if else elif endif define undef warning error line '
-        + 'pragma _Pragma ifdef ifndef include' },
+        + 'pragma _Pragma ifdef ifndef elifdef elifndef include' },
     contains: [
       {
         begin: /\\\n/,
@@ -148,14 +148,26 @@ export default function(hljs) {
     "char",
     "void",
     "_Bool",
+    "_BitInt",
     "_Complex",
     "_Imaginary",
     "_Decimal32",
     "_Decimal64",
+    "_Decimal96",
     "_Decimal128",
+    "_Decimal64x",
+    "_Decimal128x",
+    "_Float16",
+    "_Float32",
+    "_Float64",
+    "_Float128",
+    "_Float32x",
+    "_Float64x",
+    "_Float128x",
     // modifiers
     "const",
     "static",
+    "constexpr",
     // aliases
     "complex",
     "bool",
diff --git a/src/languages/cal.js b/src/languages/cal.js
index 0131a26ec4..5f3c7bbd63 100644
--- a/src/languages/cal.js
+++ b/src/languages/cal.js
@@ -3,6 +3,7 @@ Language: C/AL
 Author: Kenneth Fuglsang Christensen <kfuglsang@gmail.com>
 Description: Provides highlighting of Microsoft Dynamics NAV C/AL code files
 Website: https://docs.microsoft.com/en-us/dynamics-nav/programming-in-c-al
+Category: enterprise
 */
 
 /** @type LanguageFn */
diff --git a/src/languages/ceylon.js b/src/languages/ceylon.js
index 684547541c..01203e6622 100644
--- a/src/languages/ceylon.js
+++ b/src/languages/ceylon.js
@@ -2,6 +2,7 @@
 Language: Ceylon
 Author: Lucas Werkmeister <mail@lucaswerkmeister.de>
 Website: https://ceylon-lang.org
+Category: system
 */
 
 /** @type LanguageFn */
diff --git a/src/languages/cmake.js b/src/languages/cmake.js
index e5ba49b8cc..40e02613e9 100644
--- a/src/languages/cmake.js
+++ b/src/languages/cmake.js
@@ -3,6 +3,7 @@ Language: CMake
 Description: CMake is an open-source cross-platform system for build automation.
 Author: Igor Kalnitsky <igor@kalnitsky.org>
 Website: https://cmake.org
+Category: build-system
 */
 
 /** @type LanguageFn */
diff --git a/src/languages/cpp.js b/src/languages/cpp.js
index 5dcb8e5657..64aee1d44e 100644
--- a/src/languages/cpp.js
+++ b/src/languages/cpp.js
@@ -52,9 +52,44 @@ export default function(hljs) {
   const NUMBERS = {
     className: 'number',
     variants: [
-      { begin: '\\b(0b[01\']+)' },
-      { begin: '(-?)\\b([\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)((ll|LL|l|L)(u|U)?|(u|U)(ll|LL|l|L)?|f|F|b|B)' },
-      { begin: '(-?)(\\b0[xX][a-fA-F0-9\']+|(\\b[\\d\']+(\\.[\\d\']*)?|\\.[\\d\']+)([eE][-+]?[\\d\']+)?)' }
+      // Floating-point literal.
+      { begin:
+        "[+-]?(?:" // Leading sign.
+          // Decimal.
+          + "(?:"
+            +"[0-9](?:'?[0-9])*\\.(?:[0-9](?:'?[0-9])*)?"
+            + "|\\.[0-9](?:'?[0-9])*"
+          + ")(?:[Ee][+-]?[0-9](?:'?[0-9])*)?"
+          + "|[0-9](?:'?[0-9])*[Ee][+-]?[0-9](?:'?[0-9])*"
+          // Hexadecimal.
+          + "|0[Xx](?:"
+            +"[0-9A-Fa-f](?:'?[0-9A-Fa-f])*(?:\\.(?:[0-9A-Fa-f](?:'?[0-9A-Fa-f])*)?)?"
+            + "|\\.[0-9A-Fa-f](?:'?[0-9A-Fa-f])*"
+          + ")[Pp][+-]?[0-9](?:'?[0-9])*"
+        + ")(?:" // Literal suffixes.
+          + "[Ff](?:16|32|64|128)?"
+          + "|(BF|bf)16"
+          + "|[Ll]"
+          + "|" // Literal suffix is optional.
+        + ")"
+      },
+      // Integer literal.
+      { begin:
+        "[+-]?\\b(?:" // Leading sign.
+          + "0[Bb][01](?:'?[01])*" // Binary.
+          + "|0[Xx][0-9A-Fa-f](?:'?[0-9A-Fa-f])*" // Hexadecimal.
+          + "|0(?:'?[0-7])*" // Octal or just a lone zero.
+          + "|[1-9](?:'?[0-9])*" // Decimal.
+        + ")(?:" // Literal suffixes.
+          + "[Uu](?:LL?|ll?)"
+          + "|[Uu][Zz]?"
+          + "|(?:LL?|ll?)[Uu]?"
+          + "|[Zz][Uu]"
+          + "|" // Literal suffix is optional.
+        + ")"
+        // Note: there are user-defined literal suffixes too, but perhaps having the custom suffix not part of the
+        // literal highlight actually makes it stand out more.
+      }
     ],
     relevance: 0
   };
diff --git a/src/languages/crystal.js b/src/languages/crystal.js
index 834abafb14..cf2c4eb04e 100644
--- a/src/languages/crystal.js
+++ b/src/languages/crystal.js
@@ -2,6 +2,7 @@
 Language: Crystal
 Author: TSUYUSATO Kitsune <make.just.on@gmail.com>
 Website: https://crystal-lang.org
+Category: system
 */
 
 /** @type LanguageFn */
diff --git a/src/languages/csharp.js b/src/languages/csharp.js
index 2f228a9839..2bc2e26c2f 100644
--- a/src/languages/csharp.js
+++ b/src/languages/csharp.js
@@ -164,6 +164,11 @@ export default function(hljs) {
     ],
     relevance: 0
   };
+  const RAW_STRING = {
+    className: 'string',
+    begin: /"""("*)(?!")(.|\n)*?"""\1/,
+    relevance: 1
+  };
   const VERBATIM_STRING = {
     className: 'string',
     begin: '@"',
@@ -229,6 +234,7 @@ export default function(hljs) {
     hljs.inherit(hljs.C_BLOCK_COMMENT_MODE, { illegal: /\n/ })
   ];
   const STRING = { variants: [
+    RAW_STRING,
     INTERPOLATED_VERBATIM_STRING,
     INTERPOLATED_STRING,
     VERBATIM_STRING,
diff --git a/src/languages/csp.js b/src/languages/csp.js
index bde26848fc..21c87721ad 100644
--- a/src/languages/csp.js
+++ b/src/languages/csp.js
@@ -3,6 +3,7 @@ Language: CSP
 Description: Content Security Policy definition highlighting
 Author: Taras <oxdef@oxdef.info>
 Website: https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
+Category: web
 
 vim: ts=2 sw=2 st=2
 */
diff --git a/src/languages/d.js b/src/languages/d.js
index b789f5341c..08ebdf6efd 100644
--- a/src/languages/d.js
+++ b/src/languages/d.js
@@ -4,6 +4,7 @@ Author: Aleksandar Ruzicic <aleksandar@ruzicic.info>
 Description: D is a language with C-like syntax and static typing. It pragmatically combines efficiency, control, and modeling power, with safety and programmer productivity.
 Version: 1.0a
 Website: https://dlang.org
+Category: system
 Date: 2012-04-08
 */
 
diff --git a/src/languages/delphi.js b/src/languages/delphi.js
index f5a3521f25..7c76bbf496 100644
--- a/src/languages/delphi.js
+++ b/src/languages/delphi.js
@@ -1,6 +1,7 @@
 /*
 Language: Delphi
 Website: https://www.embarcadero.com/products/delphi
+Category: system
 */
 
 /** @type LanguageFn */
@@ -163,20 +164,36 @@ export default function(hljs) {
     relevance: 0,
     // Source: https://www.freepascal.org/docs-html/ref/refse6.html
     variants: [
+      {
+        // Regular numbers, e.g., 123, 123.456.
+        match: /\b\d[\d_]*(\.\d[\d_]*)?/ },
       {
         // Hexadecimal notation, e.g., $7F.
-        begin: '\\$[0-9A-Fa-f]+' },
+        match: /\$[\dA-Fa-f_]+/ },
+      {
+        // Hexadecimal literal with no digits
+        match: /\$/,
+        relevance: 0 },
       {
         // Octal notation, e.g., &42.
-        begin: '&[0-7]+' },
+        match: /&[0-7][0-7_]*/ },
       {
         // Binary notation, e.g., %1010.
-        begin: '%[01]+' }
+        match: /%[01_]+/ },
+      {
+        // Binary literal with no digits
+        match: /%/,
+        relevance: 0 }
     ]
   };
   const CHAR_STRING = {
     className: 'string',
-    begin: /(#\d+)+/
+    variants: [
+      { match: /#\d[\d_]*/ },
+      { match: /#\$[\dA-Fa-f][\dA-Fa-f_]*/ },
+      { match: /#&[0-7][0-7_]*/ },
+      { match: /#%[01][01_]*/ }
+    ]
   };
   const CLASS = {
     begin: hljs.IDENT_RE + '\\s*=\\s*class\\s*\\(',
@@ -218,7 +235,6 @@ export default function(hljs) {
     contains: [
       STRING,
       CHAR_STRING,
-      hljs.NUMBER_MODE,
       NUMBER,
       CLASS,
       FUNCTION,
diff --git a/src/languages/dos.js b/src/languages/dos.js
index 1ac98eecca..fe14cae6a4 100644
--- a/src/languages/dos.js
+++ b/src/languages/dos.js
@@ -3,6 +3,7 @@ Language: Batch file (DOS)
 Author: Alexander Makarov <sam@rmcreative.ru>
 Contributors: Anton Kochkov <anton.kochkov@gmail.com>
 Website: https://en.wikipedia.org/wiki/Batch_file
+Category: scripting
 */
 
 /** @type LanguageFn */
diff --git a/src/languages/ebnf.js b/src/languages/ebnf.js
index 78550ac8b3..06ae672a46 100644
--- a/src/languages/ebnf.js
+++ b/src/languages/ebnf.js
@@ -2,6 +2,7 @@
 Language: Extended Backus-Naur Form
 Author: Alex McKibben <alex@nullscope.net>
 Website: https://en.wikipedia.org/wiki/Extended_Backus–Naur_form
+Category: syntax
 */
 
 /** @type LanguageFn */
diff --git a/src/languages/erlang.js b/src/languages/erlang.js
index 2a7787b336..4fea7a11ad 100644
--- a/src/languages/erlang.js
+++ b/src/languages/erlang.js
@@ -76,6 +76,10 @@ export default function(hljs) {
       }
     ]
   };
+  const CHAR_LITERAL = {
+    scope: 'string',
+    match: /\$(\\([^0-9]|[0-9]{1,3}|)|.)/,
+  };
 
   const BLOCK_STATEMENTS = {
     beginKeywords: 'fun receive if try case',
@@ -93,7 +97,8 @@ export default function(hljs) {
     TUPLE,
     VAR1,
     VAR2,
-    RECORD_ACCESS
+    RECORD_ACCESS,
+    CHAR_LITERAL
   ];
 
   const BASIC_MODES = [
@@ -106,7 +111,8 @@ export default function(hljs) {
     TUPLE,
     VAR1,
     VAR2,
-    RECORD_ACCESS
+    RECORD_ACCESS,
+    CHAR_LITERAL
   ];
   FUNCTION_CALL.contains[1].contains = BASIC_MODES;
   TUPLE.contains = BASIC_MODES;
@@ -142,6 +148,7 @@ export default function(hljs) {
     end: '\\)',
     contains: BASIC_MODES
   };
+
   return {
     name: 'Erlang',
     aliases: [ 'erl' ],
@@ -183,6 +190,7 @@ export default function(hljs) {
       VAR1,
       VAR2,
       TUPLE,
+      CHAR_LITERAL,
       { begin: /\.$/ } // relevance booster
     ]
   };
diff --git a/src/languages/excel.js b/src/languages/excel.js
index 8dc51e4550..39fdf8c270 100644
--- a/src/languages/excel.js
+++ b/src/languages/excel.js
@@ -3,6 +3,7 @@ Language: Excel formulae
 Author: Victor Zhou <OiCMudkips@users.noreply.github.com>
 Description: Excel formulae
 Website: https://products.office.com/en-us/excel/
+Category: enterprise
 */
 
 /** @type LanguageFn */
diff --git a/src/languages/gcode.js b/src/languages/gcode.js
index 041823784c..15bf97af7c 100644
--- a/src/languages/gcode.js
+++ b/src/languages/gcode.js
@@ -3,6 +3,7 @@
  Contributors: Adam Joseph Cook <adam.joseph.cook@gmail.com>
  Description: G-code syntax highlighter for Fanuc and other common CNC machine tool controls.
  Website: https://www.sis.se/api/document/preview/911952/
+ Category: hardware
  */
 
 export default function(hljs) {
diff --git a/src/languages/go.js b/src/languages/go.js
index 29b1251cfc..d7c963c490 100644
--- a/src/languages/go.js
+++ b/src/languages/go.js
@@ -109,10 +109,25 @@ export default function(hljs) {
         className: 'number',
         variants: [
           {
-            begin: hljs.C_NUMBER_RE + '[i]',
-            relevance: 1
+            match: /-?\b0[xX]\.[a-fA-F0-9](_?[a-fA-F0-9])*[pP][+-]?\d(_?\d)*i?/, // hex without a present digit before . (making a digit afterwards required)
+            relevance: 0
           },
-          hljs.C_NUMBER_MODE
+          {
+            match: /-?\b0[xX](_?[a-fA-F0-9])+((\.([a-fA-F0-9](_?[a-fA-F0-9])*)?)?[pP][+-]?\d(_?\d)*)?i?/, // hex with a present digit before . (making a digit afterwards optional)
+            relevance: 0
+          },
+          {
+            match: /-?\b0[oO](_?[0-7])*i?/, // leading 0o octal
+            relevance: 0
+          },
+          {
+            match: /-?\.\d(_?\d)*([eE][+-]?\d(_?\d)*)?i?/, // decimal without a present digit before . (making a digit afterwards required)
+            relevance: 0
+          },
+          {
+            match: /-?\b\d(_?\d)*(\.(\d(_?\d)*)?)?([eE][+-]?\d(_?\d)*)?i?/, // decimal with a present digit before . (making a digit afterwards optional)
+            relevance: 0
+          }
         ]
       },
       { begin: /:=/ // relevance booster
diff --git a/src/languages/golo.js b/src/languages/golo.js
index 1560859fd5..f4c4061358 100644
--- a/src/languages/golo.js
+++ b/src/languages/golo.js
@@ -3,6 +3,7 @@ Language: Golo
 Author: Philippe Charriere <ph.charriere@gmail.com>
 Description: a lightweight dynamic language for the JVM
 Website: http://golo-lang.org/
+Category: system
 */
 
 export default function(hljs) {
diff --git a/src/languages/gradle.js b/src/languages/gradle.js
index bdcc494a37..e186112886 100644
--- a/src/languages/gradle.js
+++ b/src/languages/gradle.js
@@ -3,6 +3,7 @@ Language: Gradle
 Description: Gradle is an open-source build automation tool focused on flexibility and performance.
 Website: https://gradle.org
 Author: Damian Mee <mee.damian@gmail.com>
+Category: build-system
 */
 
 export default function(hljs) {
diff --git a/src/languages/groovy.js b/src/languages/groovy.js
index 26aac79378..c9c9a8d046 100644
--- a/src/languages/groovy.js
+++ b/src/languages/groovy.js
@@ -3,6 +3,7 @@
  Author: Guillaume Laforge <glaforge@gmail.com>
  Description: Groovy programming language implementation inspired from Vsevolod's Java mode
  Website: https://groovy-lang.org
+ Category: system
  */
 
 function variants(variants, obj = {}) {
@@ -66,7 +67,7 @@ export default function(hljs) {
 
   const CLASS_DEFINITION = {
     match: [
-      /(class|interface|trait|enum|extends|implements)/,
+      /(class|interface|trait|enum|record|extends|implements)/,
       /\s+/,
       hljs.UNDERSCORE_IDENT_RE
     ],
@@ -126,7 +127,8 @@ export default function(hljs) {
     "import",
     "package",
     "return",
-    "instanceof"
+    "instanceof",
+    "var"
   ];
 
   return {
diff --git a/src/languages/haxe.js b/src/languages/haxe.js
index 2542a54f3f..084b80263b 100644
--- a/src/languages/haxe.js
+++ b/src/languages/haxe.js
@@ -4,6 +4,7 @@ Description: Haxe is an open source toolkit based on a modern, high level, stric
 Author: Christopher Kaster <ikasoki@gmail.com> (Based on the actionscript.js language file by Alexander Myadzel)
 Contributors: Kenton Hamaluik <kentonh@gmail.com>
 Website: https://haxe.org
+Category: system
 */
 
 export default function(hljs) {
@@ -88,7 +89,7 @@ export default function(hljs) {
       },
       {
         className: 'type', // instantiation
-        begin: /new */,
+        beginKeywords: 'new',
         end: /\W/,
         excludeBegin: true,
         excludeEnd: true
diff --git a/src/languages/inform7.js b/src/languages/inform7.js
index c5cc34566c..84daf9cfad 100644
--- a/src/languages/inform7.js
+++ b/src/languages/inform7.js
@@ -3,6 +3,7 @@ Language: Inform 7
 Author: Bruno Dias <bruno.r.dias@gmail.com>
 Description: Language definition for Inform 7, a DSL for writing parser interactive fiction.
 Website: http://inform7.com
+Category: gaming
 */
 
 export default function(hljs) {
diff --git a/src/languages/java.js b/src/languages/java.js
index cdbb1e9f94..a0e5d4cf9a 100644
--- a/src/languages/java.js
+++ b/src/languages/java.js
@@ -74,7 +74,8 @@ export default function(hljs) {
     'do',
     'sealed',
     'yield',
-    'permits'
+    'permits',
+    'goto'
   ];
 
   const BUILT_INS = [
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 4dd1090150..9cad8c9641 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -133,7 +133,7 @@ export default function(hljs) {
     contains: [] // defined later
   };
   const HTML_TEMPLATE = {
-    begin: 'html`',
+    begin: '\.?html`',
     end: '',
     starts: {
       end: '`',
@@ -146,7 +146,7 @@ export default function(hljs) {
     }
   };
   const CSS_TEMPLATE = {
-    begin: 'css`',
+    begin: '\.?css`',
     end: '',
     starts: {
       end: '`',
@@ -159,7 +159,7 @@ export default function(hljs) {
     }
   };
   const GRAPHQL_TEMPLATE = {
-    begin: 'gql`',
+    begin: '\.?gql`',
     end: '',
     starts: {
       end: '`',
@@ -256,7 +256,7 @@ export default function(hljs) {
   const PARAMS_CONTAINS = SUBST_AND_COMMENTS.concat([
     // eat recursive parens in sub expressions
     {
-      begin: /\(/,
+      begin: /(\s*)\(/,
       end: /\)/,
       keywords: KEYWORDS,
       contains: ["self"].concat(SUBST_AND_COMMENTS)
@@ -264,7 +264,8 @@ export default function(hljs) {
   ]);
   const PARAMS = {
     className: 'params',
-    begin: /\(/,
+    // convert this to negative lookbehind in v12
+    begin: /(\s*)\(/, // to match the parms with 
     end: /\)/,
     excludeBegin: true,
     excludeEnd: true,
@@ -387,8 +388,8 @@ export default function(hljs) {
         ...ECMAScript.BUILT_IN_GLOBALS,
         "super",
         "import"
-      ]),
-      IDENT_RE, regex.lookahead(/\(/)),
+      ].map(x => `${x}\\s*\\(`)),
+      IDENT_RE, regex.lookahead(/\s*\(/)),
     className: "title.function",
     relevance: 0
   };
@@ -509,7 +510,7 @@ export default function(hljs) {
                     skip: true
                   },
                   {
-                    begin: /\(/,
+                    begin: /(\s*)\(/,
                     end: /\)/,
                     excludeBegin: true,
                     excludeEnd: true,
diff --git a/src/languages/julia-repl.js b/src/languages/julia-repl.js
index f2d5882d43..6728e744dd 100644
--- a/src/languages/julia-repl.js
+++ b/src/languages/julia-repl.js
@@ -4,6 +4,7 @@ Description: Julia REPL sessions
 Author: Morten Piibeleht <morten.piibeleht@gmail.com>
 Website: https://julialang.org
 Requires: julia.js
+Category: scientific
 
 The Julia REPL code blocks look something like the following:
 
diff --git a/src/languages/julia.js b/src/languages/julia.js
index 9a6edb4dbb..0d7432f3ab 100644
--- a/src/languages/julia.js
+++ b/src/languages/julia.js
@@ -4,6 +4,7 @@ Description: Julia is a high-level, high-performance, dynamic programming langua
 Author: Kenta Sato <bicycle1885@gmail.com>
 Contributors: Alex Arslan <ararslan@comcast.net>, Fredrik Ekre <ekrefredrik@gmail.com>
 Website: https://julialang.org
+Category: scientific
 */
 
 export default function(hljs) {
diff --git a/src/languages/lasso.js b/src/languages/lasso.js
index bc90bb26b7..389e592d5b 100644
--- a/src/languages/lasso.js
+++ b/src/languages/lasso.js
@@ -3,6 +3,7 @@ Language: Lasso
 Author: Eric Knibbe <eric@lassosoft.com>
 Description: Lasso is a language and server platform for database-driven web applications. This definition handles Lasso 9 syntax and LassoScript for Lasso 8.6 and earlier.
 Website: http://www.lassosoft.com/What-Is-Lasso
+Category: database, web
 */
 
 export default function(hljs) {
diff --git a/src/languages/lib/css-shared.js b/src/languages/lib/css-shared.js
index 0717c63571..ebac80c205 100644
--- a/src/languages/lib/css-shared.js
+++ b/src/languages/lib/css-shared.js
@@ -38,12 +38,12 @@ export const MODES = (hljs) => {
     },
     CSS_VARIABLE: {
       className: "attr",
-      begin: /--[A-Za-z][A-Za-z0-9_-]*/
+      begin: /--[A-Za-z_][A-Za-z0-9_-]*/
     }
   };
 };
 
-export const TAGS = [
+const HTML_TAGS = [
   'a',
   'abbr',
   'address',
@@ -118,6 +118,58 @@ export const TAGS = [
   'video'
 ];
 
+const SVG_TAGS = [
+  'defs',
+  'g',
+  'marker',
+  'mask',
+  'pattern',
+  'svg',
+  'switch',
+  'symbol',
+  'feBlend',
+  'feColorMatrix',
+  'feComponentTransfer',
+  'feComposite',
+  'feConvolveMatrix',
+  'feDiffuseLighting',
+  'feDisplacementMap',
+  'feFlood',
+  'feGaussianBlur',
+  'feImage',
+  'feMerge',
+  'feMorphology',
+  'feOffset',
+  'feSpecularLighting',
+  'feTile',
+  'feTurbulence',
+  'linearGradient',
+  'radialGradient',
+  'stop',
+  'circle',
+  'ellipse',
+  'image',
+  'line',
+  'path',
+  'polygon',
+  'polyline',
+  'rect',
+  'text',
+  'use',
+  'textPath',
+  'tspan',
+  'foreignObject',
+  'clipPath'
+];
+
+export const TAGS = [
+  ...HTML_TAGS,
+  ...SVG_TAGS,
+];
+
+// Sorting, then reversing makes sure longer attributes/elements like
+// `font-weight` are matched fully instead of getting false positives on say `font`
+
 export const MEDIA_FEATURES = [
   'any-hover',
   'any-pointer',
@@ -153,7 +205,7 @@ export const MEDIA_FEATURES = [
   'max-width',
   'min-height',
   'max-height'
-];
+].sort().reverse();
 
 // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes
 export const PSEUDO_CLASSES = [
@@ -216,7 +268,7 @@ export const PSEUDO_CLASSES = [
   'valid',
   'visited',
   'where' // where()
-];
+].sort().reverse();
 
 // https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-elements
 export const PSEUDO_ELEMENTS = [
@@ -234,12 +286,14 @@ export const PSEUDO_ELEMENTS = [
   'selection',
   'slotted',
   'spelling-error'
-];
+].sort().reverse();
 
 export const ATTRIBUTES = [
+  'accent-color',
   'align-content',
   'align-items',
   'align-self',
+  'alignment-baseline',
   'all',
   'animation',
   'animation-delay',
@@ -250,6 +304,7 @@ export const ATTRIBUTES = [
   'animation-name',
   'animation-play-state',
   'animation-timing-function',
+  'appearance',
   'backface-visibility',
   'background',
   'background-attachment',
@@ -261,6 +316,7 @@ export const ATTRIBUTES = [
   'background-position',
   'background-repeat',
   'background-size',
+  'baseline-shift',
   'block-size',
   'border',
   'border-block',
@@ -326,6 +382,8 @@ export const ATTRIBUTES = [
   'break-after',
   'break-before',
   'break-inside',
+  'cx',
+  'cy',
   'caption-side',
   'caret-color',
   'clear',
@@ -333,6 +391,11 @@ export const ATTRIBUTES = [
   'clip-path',
   'clip-rule',
   'color',
+  'color-interpolation',
+  'color-interpolation-filters',
+  'color-profile',
+  'color-rendering',
+  'color-scheme',
   'column-count',
   'column-fill',
   'column-gap',
@@ -354,7 +417,12 @@ export const ATTRIBUTES = [
   'cursor',
   'direction',
   'display',
+  'dominant-baseline',
   'empty-cells',
+  'enable-background',
+  'fill',
+  'fill-opacity',
+  'fill-rule',
   'filter',
   'flex',
   'flex-basis',
@@ -365,6 +433,8 @@ export const ATTRIBUTES = [
   'flex-wrap',
   'float',
   'flow',
+  'flood-color',
+  'flood-opacity',
   'font',
   'font-display',
   'font-family',
@@ -386,6 +456,7 @@ export const ATTRIBUTES = [
   'font-variation-settings',
   'font-weight',
   'gap',
+  'glyph-orientation-horizontal',
   'glyph-orientation-vertical',
   'grid',
   'grid-area',
@@ -413,15 +484,24 @@ export const ATTRIBUTES = [
   'ime-mode',
   'inline-size',
   'isolation',
+  'kerning',
   'justify-content',
+  'justify-items',
+  'justify-self',
   'left',
   'letter-spacing',
+  'lighting-color',
   'line-break',
   'line-height',
   'list-style',
   'list-style-image',
   'list-style-position',
   'list-style-type',
+  'marker',
+  'marker-end',
+  'marker-mid',
+  'marker-start',
+  'mask',
   'margin',
   'margin-block',
   'margin-block-end',
@@ -503,12 +583,15 @@ export const ATTRIBUTES = [
   'pointer-events',
   'position',
   'quotes',
+  'r',
   'resize',
   'rest',
   'rest-after',
   'rest-before',
   'right',
+  'rotate',
   'row-gap',
+  'scale',
   'scroll-margin',
   'scroll-margin-block',
   'scroll-margin-block-end',
@@ -540,11 +623,23 @@ export const ATTRIBUTES = [
   'shape-image-threshold',
   'shape-margin',
   'shape-outside',
+  'shape-rendering',
+  'stop-color',
+  'stop-opacity',
+  'stroke',
+  'stroke-dasharray',
+  'stroke-dashoffset',
+  'stroke-linecap',
+  'stroke-linejoin',
+  'stroke-miterlimit',
+  'stroke-opacity',
+  'stroke-width',
   'speak',
   'speak-as',
   'src', // @font-face
   'tab-size',
   'table-layout',
+  'text-anchor',
   'text-align',
   'text-align-all',
   'text-align-last',
@@ -575,7 +670,9 @@ export const ATTRIBUTES = [
   'transition-duration',
   'transition-property',
   'transition-timing-function',
+  'translate',
   'unicode-bidi',
+  'vector-effect',
   'vertical-align',
   'visibility',
   'voice-balance',
@@ -594,10 +691,10 @@ export const ATTRIBUTES = [
   'word-spacing',
   'word-wrap',
   'writing-mode',
+  'x',
+  'y',
   'z-index'
-  // reverse makes sure longer attributes `font-weight` are matched fully
-  // instead of getting false positives on say `font`
-].reverse();
+].sort().reverse();
 
 // some grammars use them all as a single group
-export const PSEUDO_SELECTORS = PSEUDO_CLASSES.concat(PSEUDO_ELEMENTS);
+export const PSEUDO_SELECTORS = PSEUDO_CLASSES.concat(PSEUDO_ELEMENTS).sort().reverse();
diff --git a/src/languages/lib/kws_swift.js b/src/languages/lib/kws_swift.js
index a4b2fea08a..e2932bbb90 100644
--- a/src/languages/lib/kws_swift.js
+++ b/src/languages/lib/kws_swift.js
@@ -92,6 +92,7 @@ export const keywords = [
   'operator',
   'optional', // contextual
   'override', // contextual
+  'package',
   'postfix', // contextual
   'precedencegroup',
   'prefix', // contextual
diff --git a/src/languages/lua.js b/src/languages/lua.js
index 2d6d4b6110..9268e5f8f2 100644
--- a/src/languages/lua.js
+++ b/src/languages/lua.js
@@ -2,7 +2,7 @@
 Language: Lua
 Description: Lua is a powerful, efficient, lightweight, embeddable scripting language.
 Author: Andrew Fedorov <dmmdrs@mail.ru>
-Category: common, scripting
+Category: common, gaming, scripting
 Website: https://www.lua.org
 */
 
diff --git a/src/languages/makefile.js b/src/languages/makefile.js
index a616fffad5..569abb1c6f 100644
--- a/src/languages/makefile.js
+++ b/src/languages/makefile.js
@@ -3,7 +3,7 @@ Language: Makefile
 Author: Ivan Sagalaev <maniac@softwaremaniacs.org>
 Contributors: Joël Porquet <joel@porquet.org>
 Website: https://www.gnu.org/software/make/manual/html_node/Introduction.html
-Category: common
+Category: common, build-system
 */
 
 export default function(hljs) {
diff --git a/src/languages/markdown.js b/src/languages/markdown.js
index 7d5a15062f..3d73d062e9 100644
--- a/src/languages/markdown.js
+++ b/src/languages/markdown.js
@@ -216,6 +216,12 @@ export default function(hljs) {
     end: '$'
   };
 
+  const ENTITY = {
+    //https://spec.commonmark.org/0.31.2/#entity-references
+    scope: 'literal',
+    match: /&([a-zA-Z0-9]+|#[0-9]{1,7}|#[Xx][0-9a-fA-F]{1,6});/
+  };
+
   return {
     name: 'Markdown',
     aliases: [
@@ -233,7 +239,8 @@ export default function(hljs) {
       CODE,
       HORIZONTAL_RULE,
       LINK,
-      LINK_REFERENCE
+      LINK_REFERENCE,
+      ENTITY
     ]
   };
 }
diff --git a/src/languages/mercury.js b/src/languages/mercury.js
index 342ad1d603..efd22c6998 100644
--- a/src/languages/mercury.js
+++ b/src/languages/mercury.js
@@ -3,6 +3,7 @@ Language: Mercury
 Author: mucaho <mkucko@gmail.com>
 Description: Mercury is a logic/functional programming language which combines the clarity and expressiveness of declarative programming with advanced static analysis and error detection features.
 Website: https://www.mercurylang.org
+Category: functional
 */
 
 export default function(hljs) {
diff --git a/src/languages/monkey.js b/src/languages/monkey.js
index 12a1e2f238..0842c846e5 100644
--- a/src/languages/monkey.js
+++ b/src/languages/monkey.js
@@ -3,6 +3,7 @@ Language: Monkey
 Description: Monkey2 is an easy to use, cross platform, games oriented programming language from Blitz Research.
 Author: Arthur Bikmullin <devolonter@gmail.com>
 Website: https://blitzresearch.itch.io/monkey2
+Category: gaming
 */
 
 export default function(hljs) {
diff --git a/src/languages/n1ql.js b/src/languages/n1ql.js
index 3c6076a85e..ade0349433 100644
--- a/src/languages/n1ql.js
+++ b/src/languages/n1ql.js
@@ -4,6 +4,7 @@
  Contributors: Rene Saarsoo <nene@triin.net>
  Description: Couchbase query language
  Website: https://www.couchbase.com/products/n1ql
+ Category: database
  */
 
 export default function(hljs) {
diff --git a/src/languages/nix.js b/src/languages/nix.js
index 5f7eceae4f..cea7b7c489 100644
--- a/src/languages/nix.js
+++ b/src/languages/nix.js
@@ -3,6 +3,7 @@ Language: Nix
 Author: Domen Kožar <domen@dev.si>
 Description: Nix functional language
 Website: http://nixos.org/nix
+Category: system
 */
 
 export default function(hljs) {
diff --git a/src/languages/nsis.js b/src/languages/nsis.js
index 19021043dd..33c99090ff 100644
--- a/src/languages/nsis.js
+++ b/src/languages/nsis.js
@@ -3,6 +3,7 @@ Language: NSIS
 Description: Nullsoft Scriptable Install System
 Author: Jan T. Sott <jan.sott@gmail.com>
 Website: https://nsis.sourceforge.io/Main_Page
+Category: scripting
 */
 
 import * as regex from '../lib/regex.js';
diff --git a/src/languages/oxygene.js b/src/languages/oxygene.js
index c4129a68dc..5d2f797b9e 100644
--- a/src/languages/oxygene.js
+++ b/src/languages/oxygene.js
@@ -3,6 +3,7 @@ Language: Oxygene
 Author: Carlo Kok <ck@remobjects.com>
 Description: Oxygene is built on the foundation of Object Pascal, revamped and extended to be a modern language for the twenty-first century.
 Website: https://www.elementscompiler.com/elements/default.aspx
+Category: build-system
 */
 
 export default function(hljs) {
diff --git a/src/languages/perl.js b/src/languages/perl.js
index 36ca7868db..677dc48beb 100644
--- a/src/languages/perl.js
+++ b/src/languages/perl.js
@@ -26,6 +26,7 @@ export default function(hljs) {
     'chown',
     'chr',
     'chroot',
+    'class',
     'close',
     'closedir',
     'connect',
@@ -55,6 +56,7 @@ export default function(hljs) {
     'exit',
     'exp',
     'fcntl',
+    'field',
     'fileno',
     'flock',
     'for',
@@ -114,6 +116,7 @@ export default function(hljs) {
     'lt',
     'ma',
     'map',
+    'method',
     'mkdir',
     'msgctl',
     'msgget',
@@ -258,19 +261,45 @@ export default function(hljs) {
     end: /\}/
     // contains defined later
   };
-  const VAR = { variants: [
-    { begin: /\$\d/ },
-    { begin: regex.concat(
-      /[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/,
-      // negative look-ahead tries to avoid matching patterns that are not
-      // Perl at all like $ident$, @ident@, etc.
-      `(?![A-Za-z])(?![@$%])`
-    ) },
-    {
-      begin: /[$%@][^\s\w{]/,
-      relevance: 0
-    }
-  ] };
+  const ATTR = {
+    scope: 'attr',
+    match: /\s+:\s*\w+(\s*\(.*?\))?/,
+  };
+  const VAR = {
+    scope: 'variable',
+    variants: [
+      { begin: /\$\d/ },
+      { begin: regex.concat(
+        /[$%@](?!")(\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/,
+        // negative look-ahead tries to avoid matching patterns that are not
+        // Perl at all like $ident$, @ident@, etc.
+        `(?![A-Za-z])(?![@$%])`
+        )
+      },
+      {
+        // Only $= is a special Perl variable and one can't declare @= or %=.
+        begin: /[$%@](?!")[^\s\w{=]|\$=/,
+        relevance: 0
+      }
+    ],
+    contains: [ ATTR ],
+  };
+  const NUMBER = {
+    className: 'number',
+    variants: [
+      // decimal numbers:
+      // include the case where a number starts with a dot (eg. .9), and
+      // the leading 0? avoids mixing the first and second match on 0.x cases
+      { match: /0?\.[0-9][0-9_]+\b/ },
+      // include the special versioned number (eg. v5.38)
+      { match: /\bv?(0|[1-9][0-9_]*(\.[0-9_]+)?|[1-9][0-9_]*)\b/ },
+      // non-decimal numbers:
+      { match: /\b0[0-7][0-7_]*\b/ },
+      { match: /\b0x[0-9a-fA-F][0-9a-fA-F_]*\b/ },
+      { match: /\b0b[0-1][0-1_]*\b/ },
+    ],
+    relevance: 0
+  }
   const STRING_CONTAINS = [
     hljs.BACKSLASH_ESCAPE,
     SUBST,
@@ -385,11 +414,7 @@ export default function(hljs) {
         }
       ]
     },
-    {
-      className: 'number',
-      begin: '(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b',
-      relevance: 0
-    },
+    NUMBER,
     { // regexp container
       begin: '(\\/\\/|' + hljs.RE_STARTERS_RE + '|\\b(split|return|print|reverse|grep)\\b)\\s*',
       keywords: 'split return print reverse grep',
@@ -431,11 +456,19 @@ export default function(hljs) {
     },
     {
       className: 'function',
-      beginKeywords: 'sub',
+      beginKeywords: 'sub method',
       end: '(\\s*\\(.*?\\))?[;{]',
       excludeEnd: true,
       relevance: 5,
-      contains: [ hljs.TITLE_MODE ]
+      contains: [ hljs.TITLE_MODE, ATTR ]
+    },
+    {
+      className: 'class',
+      beginKeywords: 'class',
+      end: '[;{]',
+      excludeEnd: true,
+      relevance: 5,
+      contains: [ hljs.TITLE_MODE, ATTR, NUMBER ]
     },
     {
       begin: '-\\w\\b',
diff --git a/src/languages/pgsql.js b/src/languages/pgsql.js
index d5e73023df..6864eedd7d 100644
--- a/src/languages/pgsql.js
+++ b/src/languages/pgsql.js
@@ -14,6 +14,7 @@ Description:
     - Function names deliberately are not highlighted. There is no way to tell function
       call from other constructs, hence we can't highlight _all_ function names. And
       some names highlighted while others not looks ugly.
+Category: database
 */
 
 export default function(hljs) {
diff --git a/src/languages/pony.js b/src/languages/pony.js
index b8471db297..54cdc09873 100644
--- a/src/languages/pony.js
+++ b/src/languages/pony.js
@@ -4,6 +4,7 @@ Author: Joe Eli McIlvain <joe.eli.mac@gmail.com>
 Description: Pony is an open-source, object-oriented, actor-model,
              capabilities-secure, high performance programming language.
 Website: https://www.ponylang.io
+Category: system
 */
 
 export default function(hljs) {
diff --git a/src/languages/powershell.js b/src/languages/powershell.js
index 6d6f2b4ffb..eb182d7bd7 100644
--- a/src/languages/powershell.js
+++ b/src/languages/powershell.js
@@ -4,6 +4,7 @@ Description: PowerShell is a task-based command-line shell and scripting languag
 Author: David Mohundro <david@mohundro.com>
 Contributors: Nicholas Blumhardt <nblumhardt@nblumhardt.com>, Victor Zhou <OiCMudkips@users.noreply.github.com>, Nicolas Le Gall <contact@nlegall.fr>
 Website: https://docs.microsoft.com/en-us/powershell/
+Category: scripting
 */
 
 export default function(hljs) {
diff --git a/src/languages/prolog.js b/src/languages/prolog.js
index 73bc9194eb..5ae7d1f3f4 100644
--- a/src/languages/prolog.js
+++ b/src/languages/prolog.js
@@ -3,6 +3,7 @@ Language: Prolog
 Description: Prolog is a general purpose logic programming language associated with artificial intelligence and computational linguistics.
 Author: Raivo Laanemets <raivo@infdot.com>
 Website: https://en.wikipedia.org/wiki/Prolog
+Category: functional
 */
 
 export default function(hljs) {
diff --git a/src/languages/purebasic.js b/src/languages/purebasic.js
index 932654df08..6f81571d75 100644
--- a/src/languages/purebasic.js
+++ b/src/languages/purebasic.js
@@ -4,6 +4,7 @@ Author: Tristano Ajmone <tajmone@gmail.com>
 Description: Syntax highlighting for PureBASIC (v.5.00-5.60). No inline ASM highlighting. (v.1.2, May 2017)
 Credits: I've taken inspiration from the PureBasic language file for GeSHi, created by Gustavo Julio Fiorenza (GuShH).
 Website: https://www.purebasic.com
+Category: system
 */
 
 // Base deafult colors in PB IDE: background: #FFFFDF; foreground: #000000;
diff --git a/src/languages/python.js b/src/languages/python.js
index 877b67385e..e6c46217d5 100644
--- a/src/languages/python.js
+++ b/src/languages/python.js
@@ -381,6 +381,7 @@ export default function(hljs) {
         beginKeywords: "if",
         relevance: 0
       },
+      { match: /\bor\b/, scope: "keyword" },
       STRING,
       COMMENT_TYPE,
       hljs.HASH_COMMENT_MODE,
diff --git a/src/languages/q.js b/src/languages/q.js
index 7b02be211a..77906bb2e6 100644
--- a/src/languages/q.js
+++ b/src/languages/q.js
@@ -4,6 +4,7 @@ Description: Q is a vector-based functional paradigm programming language built
              (K/Q/Kdb+ from Kx Systems)
 Author: Sergey Vidyuk <svidyuk@gmail.com>
 Website: https://kx.com/connect-with-us/developers/
+Category: enterprise, functional, database
 */
 
 export default function(hljs) {
diff --git a/src/languages/routeros.js b/src/languages/routeros.js
index 025fdc481f..a72839fc4d 100644
--- a/src/languages/routeros.js
+++ b/src/languages/routeros.js
@@ -3,6 +3,7 @@ Language: MikroTik RouterOS script
 Author: Ivan Dementev <ivan_div@mail.ru>
 Description: Scripting host provides a way to automate some router maintenance tasks by means of executing user-defined scripts bounded to some event occurrence
 Website: https://wiki.mikrotik.com/wiki/Manual:Scripting
+Category: scripting
 */
 
 // Colors from RouterOS terminal:
diff --git a/src/languages/ruby.js b/src/languages/ruby.js
index 07af86ed33..026580e52b 100644
--- a/src/languages/ruby.js
+++ b/src/languages/ruby.js
@@ -4,7 +4,7 @@ Description: Ruby is a dynamic, open source programming language with a focus on
 Website: https://www.ruby-lang.org/
 Author: Anton Kovalyov <anton@kovalyov.net>
 Contributors: Peter Leonov <gojpeg@yandex.ru>, Vasily Polovnyov <vast@whiteants.net>, Loren Segal <lsegal@soen.ca>, Pascal Hurni <phi@ruby-reactive.org>, Cedric Sohrauer <sohrauer@googlemail.com>
-Category: common
+Category: common, scripting
 */
 
 export default function(hljs) {
diff --git a/src/languages/rust.js b/src/languages/rust.js
index 54b59a1423..d0e36fa6bf 100644
--- a/src/languages/rust.js
+++ b/src/languages/rust.js
@@ -7,15 +7,22 @@ Category: common, system
 */
 
 /** @type LanguageFn */
+
 export default function(hljs) {
   const regex = hljs.regex;
+  // ============================================
+  // Added to support the r# keyword, which is a raw identifier in Rust.
+  const RAW_IDENTIFIER = /(r#)?/;
+  const UNDERSCORE_IDENT_RE = regex.concat(RAW_IDENTIFIER, hljs.UNDERSCORE_IDENT_RE);
+  const IDENT_RE = regex.concat(RAW_IDENTIFIER, hljs.IDENT_RE);
+  // ============================================
   const FUNCTION_INVOKE = {
     className: "title.function.invoke",
     relevance: 0,
     begin: regex.concat(
       /\b/,
-      /(?!let\b)/,
-      hljs.IDENT_RE,
+      /(?!let|for|while|if|else|match\b)/,
+      IDENT_RE,
       regex.lookahead(/\s*\(/))
   };
   const NUMBER_SUFFIX = '([ui](8|16|32|64|128|size)|f(32|64))\?';
@@ -64,6 +71,7 @@ export default function(hljs) {
     "try",
     "type",
     "typeof",
+    "union",
     "unsafe",
     "unsized",
     "use",
@@ -216,7 +224,7 @@ export default function(hljs) {
         begin: [
           /fn/,
           /\s+/,
-          hljs.UNDERSCORE_IDENT_RE
+          UNDERSCORE_IDENT_RE
         ],
         className: {
           1: "keyword",
@@ -231,7 +239,10 @@ export default function(hljs) {
           {
             className: 'string',
             begin: /"/,
-            end: /"/
+            end: /"/,
+            contains: [
+              hljs.BACKSLASH_ESCAPE
+            ]
           }
         ]
       },
@@ -240,7 +251,7 @@ export default function(hljs) {
           /let/,
           /\s+/,
           /(?:mut\s+)?/,
-          hljs.UNDERSCORE_IDENT_RE
+          UNDERSCORE_IDENT_RE
         ],
         className: {
           1: "keyword",
@@ -253,7 +264,7 @@ export default function(hljs) {
         begin: [
           /for/,
           /\s+/,
-          hljs.UNDERSCORE_IDENT_RE,
+          UNDERSCORE_IDENT_RE,
           /\s+/,
           /in/
         ],
@@ -267,7 +278,7 @@ export default function(hljs) {
         begin: [
           /type/,
           /\s+/,
-          hljs.UNDERSCORE_IDENT_RE
+          UNDERSCORE_IDENT_RE
         ],
         className: {
           1: "keyword",
@@ -278,7 +289,7 @@ export default function(hljs) {
         begin: [
           /(?:trait|enum|struct|union|impl|for)/,
           /\s+/,
-          hljs.UNDERSCORE_IDENT_RE
+          UNDERSCORE_IDENT_RE
         ],
         className: {
           1: "keyword",
diff --git a/src/languages/sas.js b/src/languages/sas.js
index 262c5a365a..4904672acc 100644
--- a/src/languages/sas.js
+++ b/src/languages/sas.js
@@ -2,6 +2,7 @@
 Language: SAS
 Author: Mauricio Caceres <mauricio.caceres.bravo@gmail.com>
 Description: Syntax Highlighting for SAS
+Category: scientific
 */
 
 /** @type LanguageFn */
diff --git a/src/languages/smali.js b/src/languages/smali.js
index 54882a1732..897343a57c 100644
--- a/src/languages/smali.js
+++ b/src/languages/smali.js
@@ -3,6 +3,7 @@ Language: Smali
 Author: Dennis Titze <dennis.titze@gmail.com>
 Description: Basic Smali highlighting
 Website: https://github.com/JesusFreke/smali
+Category: assembler
 */
 
 export default function(hljs) {
diff --git a/src/languages/smalltalk.js b/src/languages/smalltalk.js
index 1cc3622ad4..3ee7466990 100644
--- a/src/languages/smalltalk.js
+++ b/src/languages/smalltalk.js
@@ -3,6 +3,7 @@ Language: Smalltalk
 Description: Smalltalk is an object-oriented, dynamically typed reflective programming language.
 Author: Vladimir Gubarkov <xonixx@gmail.com>
 Website: https://en.wikipedia.org/wiki/Smalltalk
+Category: system
 */
 
 export default function(hljs) {
diff --git a/src/languages/step21.js b/src/languages/step21.js
index b5badd8662..cb5008997e 100644
--- a/src/languages/step21.js
+++ b/src/languages/step21.js
@@ -3,6 +3,7 @@ Language: STEP Part 21
 Contributors: Adam Joseph Cook <adam.joseph.cook@gmail.com>
 Description: Syntax highlighter for STEP Part 21 files (ISO 10303-21).
 Website: https://en.wikipedia.org/wiki/ISO_10303-21
+Category: syntax
 */
 
 export default function(hljs) {
diff --git a/src/languages/subunit.js b/src/languages/subunit.js
index e0352ba62f..db63556541 100644
--- a/src/languages/subunit.js
+++ b/src/languages/subunit.js
@@ -2,6 +2,7 @@
 Language: SubUnit
 Author: Sergey Bronnikov <sergeyb@bronevichok.ru>
 Website: https://pypi.org/project/python-subunit/
+Category: protocols
 */
 
 export default function(hljs) {
diff --git a/src/languages/swift.js b/src/languages/swift.js
index d68503ea6c..0d8481a416 100644
--- a/src/languages/swift.js
+++ b/src/languages/swift.js
@@ -257,14 +257,17 @@ export default function(hljs) {
       }
     ] }
   };
+
   const KEYWORD_ATTRIBUTE = {
     scope: 'keyword',
-    match: concat(/@/, either(...Swift.keywordAttributes))
+    match: concat(/@/, either(...Swift.keywordAttributes), lookahead(either(/\(/, /\s+/))),
   };
+
   const USER_DEFINED_ATTRIBUTE = {
     scope: 'meta',
     match: concat(/@/, Swift.identifier)
   };
+
   const ATTRIBUTES = [
     AVAILABLE_ATTRIBUTE,
     KEYWORD_ATTRIBUTE,
@@ -457,6 +460,37 @@ export default function(hljs) {
     end: /}/
   };
 
+  const TYPE_DECLARATION = {
+    begin: [
+      /(struct|protocol|class|extension|enum|actor)/,
+      /\s+/,
+      Swift.identifier,
+      /\s*/,
+    ],
+    beginScope: {
+      1: "keyword",
+      3: "title.class"
+    },
+    keywords: KEYWORDS,
+    contains: [
+      GENERIC_PARAMETERS,
+      ...KEYWORD_MODES,
+      {
+        begin: /:/,
+        end: /\{/,
+        keywords: KEYWORDS,
+        contains: [
+          {
+            scope: "title.class.inherited",
+            match: Swift.typeIdentifier,
+          },
+          ...KEYWORD_MODES,
+        ],
+        relevance: 0,
+      },
+    ]
+  };
+
   // Add supported submodes to string interpolation.
   for (const variant of STRING.variants) {
     const interpolation = variant.contains.find(mode => mode.label === "interpol");
@@ -490,19 +524,7 @@ export default function(hljs) {
       ...COMMENTS,
       FUNCTION_OR_MACRO,
       INIT_SUBSCRIPT,
-      {
-        beginKeywords: 'struct protocol class extension enum actor',
-        end: '\\{',
-        excludeEnd: true,
-        keywords: KEYWORDS,
-        contains: [
-          hljs.inherit(hljs.TITLE_MODE, {
-            className: "title.class",
-            begin: /[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/
-          }),
-          ...KEYWORD_MODES
-        ]
-      },
+      TYPE_DECLARATION,
       OPERATOR_DECLARATION,
       PRECEDENCEGROUP,
       {
diff --git a/src/languages/taggerscript.js b/src/languages/taggerscript.js
index d95fe2226d..c1ba668ded 100644
--- a/src/languages/taggerscript.js
+++ b/src/languages/taggerscript.js
@@ -3,6 +3,7 @@ Language: Tagger Script
 Author: Philipp Wolfer <ph.wolfer@gmail.com>
 Description: Syntax Highlighting for the Tagger Script as used by MusicBrainz Picard.
 Website: https://picard.musicbrainz.org
+Category: scripting
  */
 export default function(hljs) {
   const NOOP = {
diff --git a/src/languages/tcl.js b/src/languages/tcl.js
index 4c10df4a66..2a2794310f 100644
--- a/src/languages/tcl.js
+++ b/src/languages/tcl.js
@@ -3,6 +3,7 @@ Language: Tcl
 Description: Tcl is a very simple programming language.
 Author: Radek Liska <radekliska@gmail.com>
 Website: https://www.tcl.tk/about/language.html
+Category: scripting
 */
 
 export default function(hljs) {
diff --git a/src/languages/tp.js b/src/languages/tp.js
index 834bb1ff21..b77469e91f 100644
--- a/src/languages/tp.js
+++ b/src/languages/tp.js
@@ -2,6 +2,7 @@
 Language: TP
 Author: Jay Strybis <jay.strybis@gmail.com>
 Description: FANUC TP programming language (TPP).
+Category: hardware
 */
 
 export default function(hljs) {
diff --git a/src/languages/typescript.js b/src/languages/typescript.js
index 98b9e89517..4e818849c8 100644
--- a/src/languages/typescript.js
+++ b/src/languages/typescript.js
@@ -28,10 +28,15 @@ export default function(hljs) {
     "unknown"
   ];
   const NAMESPACE = {
-    beginKeywords: 'namespace',
-    end: /\{/,
-    excludeEnd: true,
-    contains: [ tsLanguage.exports.CLASS_REFERENCE ]
+    begin: [
+      /namespace/,
+      /\s+/,
+      hljs.IDENT_RE
+    ],
+    beginScope: {
+      1: "keyword",
+      3: "title.class"
+    }
   };
   const INTERFACE = {
     beginKeywords: 'interface',
@@ -50,7 +55,7 @@ export default function(hljs) {
   };
   const TS_SPECIFIC_KEYWORDS = [
     "type",
-    "namespace",
+    // "namespace",
     "interface",
     "public",
     "private",
@@ -62,6 +67,13 @@ export default function(hljs) {
     "enum",
     "override"
   ];
+
+  /*
+    namespace is a TS keyword but it's fine to use it as a variable name too.
+    const message = 'foo';
+    const namespace = 'bar';
+  */
+
   const KEYWORDS = {
     $pattern: ECMAScript.IDENT_RE,
     keyword: ECMAScript.KEYWORDS.concat(TS_SPECIFIC_KEYWORDS),
@@ -87,6 +99,13 @@ export default function(hljs) {
   Object.assign(tsLanguage.keywords, KEYWORDS);
 
   tsLanguage.exports.PARAMS_CONTAINS.push(DECORATOR);
+
+  // highlight the function params
+  const ATTRIBUTE_HIGHLIGHT = tsLanguage.contains.find(c => c.className === "attr");
+  tsLanguage.exports.PARAMS_CONTAINS.push([
+    tsLanguage.exports.CLASS_REFERENCE, // class reference for highlighting the params types
+    ATTRIBUTE_HIGHLIGHT, // highlight the params key
+  ]);
   tsLanguage.contains = tsLanguage.contains.concat([
     DECORATOR,
     NAMESPACE,
diff --git a/src/languages/vala.js b/src/languages/vala.js
index e35792bee5..a8cb956b55 100644
--- a/src/languages/vala.js
+++ b/src/languages/vala.js
@@ -3,6 +3,7 @@ Language: Vala
 Author: Antono Vasiljev <antono.vasiljev@gmail.com>
 Description: Vala is a new programming language that aims to bring modern programming language features to GNOME developers without imposing any additional runtime requirements and without using a different ABI compared to applications and libraries written in C.
 Website: https://wiki.gnome.org/Projects/Vala
+Category: system
 */
 
 export default function(hljs) {
diff --git a/src/languages/verilog.js b/src/languages/verilog.js
index 04aa70431f..e07b6aacf6 100644
--- a/src/languages/verilog.js
+++ b/src/languages/verilog.js
@@ -4,6 +4,7 @@ Author: Jon Evans <jon@craftyjon.com>
 Contributors: Boone Severson <boone.severson@gmail.com>
 Description: Verilog is a hardware description language used in electronic design automation to describe digital and mixed-signal systems. This highlighter supports Verilog and SystemVerilog through IEEE 1800-2012.
 Website: http://www.verilog.com
+Category: hardware
 */
 
 export default function(hljs) {
diff --git a/src/languages/vhdl.js b/src/languages/vhdl.js
index 6d3af475da..1eb0bffc9d 100644
--- a/src/languages/vhdl.js
+++ b/src/languages/vhdl.js
@@ -4,6 +4,7 @@ Author: Igor Kalnitsky <igor@kalnitsky.org>
 Contributors: Daniel C.K. Kho <daniel.kho@tauhop.com>, Guillaume Savaton <guillaume.savaton@eseo.fr>
 Description: VHDL is a hardware description language used in electronic design automation to describe digital and mixed-signal systems.
 Website: https://en.wikipedia.org/wiki/VHDL
+Category: hardware
 */
 
 export default function(hljs) {
diff --git a/src/languages/yaml.js b/src/languages/yaml.js
index 01e9424cc3..ec8001d374 100644
--- a/src/languages/yaml.js
+++ b/src/languages/yaml.js
@@ -20,11 +20,12 @@ export default function(hljs) {
   const KEY = {
     className: 'attr',
     variants: [
-      { begin: '\\w[\\w :\\/.-]*:(?=[ \t]|$)' },
-      { // double quoted keys
-        begin: '"\\w[\\w :\\/.-]*":(?=[ \t]|$)' },
-      { // single quoted keys
-        begin: '\'\\w[\\w :\\/.-]*\':(?=[ \t]|$)' }
+      // added brackets support 
+      { begin: /\w[\w :()\./-]*:(?=[ \t]|$)/ },
+      { // double quoted keys - with brackets
+        begin: /"\w[\w :()\./-]*":(?=[ \t]|$)/ },
+      { // single quoted keys - with brackets
+        begin: /'\w[\w :()\./-]*':(?=[ \t]|$)/ },
     ]
   };
 
diff --git a/src/languages/zephir.js b/src/languages/zephir.js
index bb81001437..5e1734d8ae 100644
--- a/src/languages/zephir.js
+++ b/src/languages/zephir.js
@@ -3,6 +3,7 @@
  Description: Zephir, an open source, high-level language designed to ease the creation and maintainability of extensions for PHP with a focus on type and memory safety.
  Author: Oleg Efimov <efimovov@gmail.com>
  Website: https://zephir-lang.com/en
+ Category: web
  Audit: 2020
  */
 
diff --git a/src/styles/1c-light.css b/src/styles/1c-light.css
new file mode 100644
index 0000000000..c254db3dc3
--- /dev/null
+++ b/src/styles/1c-light.css
@@ -0,0 +1,121 @@
+/*!
+  Theme: 1c-light
+  Description: Style IDE 1C:Enterprise 8
+  Author: (c) Barilko Vitaliy <barilkovetal@gmail.com>
+  Maintainer: @Diversus23
+  Website: https://softonit.ru/
+  License: see project LICENSE
+  Touched: 2023
+*/
+  
+  /* end baseline CSS */
+  
+  .hljs {
+    color: #0000ff;
+    background: #ffffff;
+  }
+  
+  /* Base color: saturation 0; */
+  
+  .hljs-subst {
+    /* default */
+  }
+  
+  /* purposely ignored */
+  .hljs-formula,
+  .hljs-attr,
+  .hljs-property {}
+  
+  .hljs-comment {
+    color: #008000;
+  }
+  .hljs-tag {
+    color: #444a;
+  }
+  
+  .hljs-tag .hljs-name,
+  .hljs-tag .hljs-attr {
+    color: #444;
+  }
+  
+  .hljs-punctuation,
+  .hljs-function,
+  .hljs-keyword,
+  .hljs-attribute,
+  .hljs-selector-tag,
+  .hljs-doctag,
+  .hljs-name {
+    color: #ff0000;
+  }
+
+  .hljs-type,
+  .hljs-params {
+    color: #0000ff;
+  }
+  
+  /* User color: hue: 0 */
+
+  .hljs-string,
+  .hljs-number,
+  .hljs-selector-id,
+  .hljs-selector-class,
+  .hljs-quote,
+  .hljs-template-tag,
+  .hljs-symbol,
+  .hljs-deletion {
+    color: #000000;
+  }
+  
+  .hljs-title,
+  .hljs-section {
+    color: #0000ff;
+  }
+  
+  .hljs-regexp,
+  .hljs-variable,
+  .hljs-template-variable,
+  .hljs-link,
+  .hljs-selector-attr,
+  .hljs-operator,
+  .hljs-selector-pseudo {
+    color: #ab5656;
+  }   
+  
+  /* Language color: hue: 90; */
+  
+  .hljs-literal {
+    color: #ff0000;
+  }
+  
+  .hljs-built_in,
+  .hljs-bullet,
+  .hljs-code,
+  .hljs-addition {
+    color: #0000ff;
+  }
+  
+  
+  /* Meta color: hue: 200 */
+  
+  .hljs-meta {
+    color: #963200;
+  }
+  
+  .hljs-meta .hljs-string {
+    color: #963200;
+  }
+
+  .hljs-meta .hljs-keyword {
+    color: #963200;
+  }
+  
+  /* Misc effects */
+
+  .hljs-emphasis {
+    font-style: italic;
+  }
+  
+  .hljs-strong {
+    font-weight: bold;
+  }
+  
\ No newline at end of file
diff --git a/test/builds/rollup_import_via_commonjs.js b/test/builds/rollup_import_via_commonjs.mjs
similarity index 100%
rename from test/builds/rollup_import_via_commonjs.js
rename to test/builds/rollup_import_via_commonjs.mjs
diff --git a/test/detect/index.js b/test/detect/index.js
index cc317e2e9f..1617893ad1 100644
--- a/test/detect/index.js
+++ b/test/detect/index.js
@@ -31,31 +31,31 @@ function testAutoDetection(language, { detectPath }) {
   });
 }
 
-describe('hljs.highlightAuto()', () => {
-  before(async function() {
-    const thirdPartyPackages = await getThirdPartyPackages();
-
-    const languages = hljs.listLanguages();
-    describe(`hljs.highlightAuto()`, function() {
-      languages.filter(hljs.autoDetection).forEach((language) => {
-        const detectPath = detectTestDir(language);
-        testAutoDetection(language, { detectPath });
-      });
-    });
-
-    // assumes only one package provides the requested module name
-    function detectTestDir(name) {
-      for (let i = 0; i < thirdPartyPackages.length; ++i) {
-        const pkg = thirdPartyPackages[i];
-        const idx = pkg.names.indexOf(name);
-        if (idx !== -1) return pkg.detectTestPaths[idx];
-      }
-      return null; // test not found
-    }
-  });
-
-  it("compiling the grammars", async function() {
-    const languages = hljs.listLanguages();
-    languages.forEach(lang => hljs.highlight("", { language: lang} ))
-  }); // this is also required for the dynamic test generation above to work
-});
+// describe('hljs.highlightAuto()', () => {
+//   before(async function() {
+//     const thirdPartyPackages = await getThirdPartyPackages();
+
+//     const languages = hljs.listLanguages();
+//     describe(`hljs.highlightAuto()`, function() {
+//       languages.filter(hljs.autoDetection).forEach((language) => {
+//         const detectPath = detectTestDir(language);
+//         testAutoDetection(language, { detectPath });
+//       });
+//     });
+
+//     // assumes only one package provides the requested module name
+//     function detectTestDir(name) {
+//       for (let i = 0; i < thirdPartyPackages.length; ++i) {
+//         const pkg = thirdPartyPackages[i];
+//         const idx = pkg.names.indexOf(name);
+//         if (idx !== -1) return pkg.detectTestPaths[idx];
+//       }
+//       return null; // test not found
+//     }
+//   });
+
+//   it("compiling the grammars", async function() {
+//     const languages = hljs.listLanguages();
+//     languages.forEach(lang => hljs.highlight("", { language: lang} ))
+//   }); // this is also required for the dynamic test generation above to work
+// });
diff --git a/test/detect/rust/default.txt b/test/detect/rust/default.txt
index 5388d8f988..29ceb466e4 100644
--- a/test/detect/rust/default.txt
+++ b/test/detect/rust/default.txt
@@ -12,5 +12,12 @@ impl From<&'a str> for State {
             "closed" => State::Closed,
             _ => unreachable!(),
         }
+
+        if (str == "trans") {
+            State::Transient;
+        }
+        else if str == "start" {
+            State::Start;
+        }
     }
 }
diff --git a/test/detect/swift/default.txt b/test/detect/swift/default.txt
index 2d0ccc565d..6f77399197 100644
--- a/test/detect/swift/default.txt
+++ b/test/detect/swift/default.txt
@@ -1,15 +1,20 @@
-import Foundation
+/// A generic stack for equatable items.
+public struct Stack<T>: Equatable where T: Equatable {
+  private(set) var items: [T]
 
-@objc class Person: Entity {
-  var name: String!
-  var age:  Int!
-
-  init(name: String, age: Int) {
-    /* /* ... */ */
+  public init(items: [T] = []) {
+    self.items = items
   }
 
-  // Return a descriptive string for this person
-  func description(offset: Int = 0) -> String {
-    return "\(name) is \(age + offset) years old"
+  public mutating func push(item: T) { items.append(item) }
+
+  /* /* ... */ */
+
+  fileprivate var description: String {
+    if items.isEmpty {
+      "The stack is empty"
+    } else {
+      "\(items.count) items in the stack"
+    }
   }
 }
diff --git a/test/markup/1c/default.expect.txt b/test/markup/1c/default.expect.txt
index 94eef4386a..1225b841f0 100644
--- a/test/markup/1c/default.expect.txt
+++ b/test/markup/1c/default.expect.txt
@@ -4,27 +4,27 @@
 	<span class="hljs-function">Функция <span class="hljs-title">ТолстыйКлиентОбычноеПриложение</span>(<span class="hljs-params"><span class="hljs-keyword">Знач</span> Параметр<span class="hljs-number">1</span> = <span class="hljs-literal">Неопределено</span></span>, <span class="hljs-comment">// комментарий</span>
 		<span class="hljs-params">Параметр2 = <span class="hljs-string">&quot;&quot;</span></span>, <span class="hljs-params">ПараметрN = <span class="hljs-number">123.45</span></span>, <span class="hljs-params">ПарамNN</span></span>) <span class="hljs-keyword">Экспорт</span> <span class="hljs-comment">// еще комментарий</span>
 		<span class="hljs-keyword">Попытка</span>
-			Результат_Булевы_Значения = <span class="hljs-keyword">Новый</span> <span class="hljs-type">Структура</span>(<span class="hljs-string">&quot;П1, П2&quot;</span>, <span class="hljs-literal">Истина</span>, <span class="hljs-literal">Ложь</span>, <span class="hljs-literal">NULL</span>, <span class="hljs-literal">Неопределено</span>);
+			Результат_Булевы_Значения <span class="hljs-punctuation">=</span> <span class="hljs-keyword">Новый</span> <span class="hljs-type">Структура</span><span class="hljs-punctuation">(</span><span class="hljs-string">&quot;П1, П2&quot;</span><span class="hljs-punctuation">,</span> <span class="hljs-literal">Истина</span><span class="hljs-punctuation">,</span> <span class="hljs-literal">Ложь</span><span class="hljs-punctuation">,</span> <span class="hljs-literal">NULL</span><span class="hljs-punctuation">,</span> <span class="hljs-literal">Неопределено</span><span class="hljs-punctuation">)</span><span class="hljs-punctuation">;</span>
 			<span class="hljs-keyword">Перейти</span> <span class="hljs-symbol">~МеткаGOTO</span>; <span class="hljs-comment">// комментарий</span>
-			РезультатТаблицаДат = <span class="hljs-keyword">Новый</span> <span class="hljs-type">ТаблицаЗначений</span>;
-			РезультатТаблицаДат.Колонки.Добавить(<span class="hljs-string">&quot;Колонка1&quot;</span>, 
-			<span class="hljs-keyword">Новый</span> <span class="hljs-type">ОписаниеТипов</span>(<span class="hljs-string">&quot;Дата&quot;</span>, , ,
-			<span class="hljs-keyword">Новый</span> <span class="hljs-type">КвалификаторыДаты</span>(<span class="hljs-class">ЧастиДаты</span>.ДатаВремя));
-			НС = РезультатТаблицаДат.Добавить(); НС[<span class="hljs-string">&quot;Колонка1&quot;</span>] = &#x27;<span class="hljs-number">20170101120000</span>&#x27;);
+			РезультатТаблицаДат <span class="hljs-punctuation">=</span> <span class="hljs-keyword">Новый</span> <span class="hljs-type">ТаблицаЗначений</span><span class="hljs-punctuation">;</span>
+			РезультатТаблицаДат.Колонки.Добавить<span class="hljs-punctuation">(</span><span class="hljs-string">&quot;Колонка1&quot;</span><span class="hljs-punctuation">,</span> 
+			<span class="hljs-keyword">Новый</span> <span class="hljs-type">ОписаниеТипов</span><span class="hljs-punctuation">(</span><span class="hljs-string">&quot;Дата&quot;</span><span class="hljs-punctuation">,</span> <span class="hljs-punctuation">,</span> <span class="hljs-punctuation">,</span>
+			<span class="hljs-keyword">Новый</span> <span class="hljs-type">КвалификаторыДаты</span><span class="hljs-punctuation">(</span><span class="hljs-class">ЧастиДаты</span>.ДатаВремя<span class="hljs-punctuation">)</span><span class="hljs-punctuation">)</span><span class="hljs-punctuation">;</span>
+			НС <span class="hljs-punctuation">=</span> РезультатТаблицаДат.Добавить<span class="hljs-punctuation">(</span><span class="hljs-punctuation">)</span><span class="hljs-punctuation">;</span> НС[<span class="hljs-string">&quot;Колонка1&quot;</span>] <span class="hljs-punctuation">=</span> &#x27;<span class="hljs-number">20170101120000</span>&#x27;<span class="hljs-punctuation">)</span><span class="hljs-punctuation">;</span>
 		<span class="hljs-keyword">Исключение</span>
-			<span class="hljs-built_in">ОписаниеОшибки</span> = <span class="hljs-built_in">ОписаниеОшибки</span>(); <span class="hljs-comment">// встроенная функция</span>
-			Масс = <span class="hljs-keyword">Новый</span> <span class="hljs-type">Массив</span>; <span class="hljs-comment">// встроенный тип</span>
+			<span class="hljs-built_in">ОписаниеОшибки</span> <span class="hljs-punctuation">=</span> <span class="hljs-built_in">ОписаниеОшибки</span><span class="hljs-punctuation">(</span><span class="hljs-punctuation">)</span><span class="hljs-punctuation">;</span> <span class="hljs-comment">// встроенная функция</span>
+			Масс <span class="hljs-punctuation">=</span> <span class="hljs-keyword">Новый</span> <span class="hljs-type">Массив</span><span class="hljs-punctuation">;</span> <span class="hljs-comment">// встроенный тип</span>
 			<span class="hljs-keyword">Для</span> <span class="hljs-keyword">Каждого</span> Значение <span class="hljs-keyword">Из</span> Масс <span class="hljs-keyword">Цикл</span>
-				<span class="hljs-built_in">Сообщить</span>(Значение + <span class="hljs-class">Символы</span>.ПС + <span class="hljs-string">&quot;</span>
-				<span class="hljs-string">|продолжение строки&quot;</span>); <span class="hljs-comment">// продолжение многострочной строки</span>
-				<span class="hljs-keyword">Продолжить</span>; <span class="hljs-keyword">Прервать</span>;
-			<span class="hljs-keyword">КонецЦикла</span>;
-			СправочникСсылка   = <span class="hljs-built_in">Справочники</span>.Языки.НайтиПоНаименованию(<span class="hljs-string">&quot;ru&quot;</span>); <span class="hljs-comment">// встроенные типы</span>
-			СправочникОбъект   = СправочникСсылка.ПолучитьОбъект();
-			ПеречислениеСсылка = <span class="hljs-built_in">Перечисления</span>.ВидыМодификацииДанных.Изменен;
-			<span class="hljs-keyword">ВызватьИсключение</span> <span class="hljs-built_in">ОписаниеОшибки</span>;
-		<span class="hljs-keyword">КонецПопытки</span>;
+				<span class="hljs-built_in">Сообщить</span><span class="hljs-punctuation">(</span>Значение <span class="hljs-punctuation">+</span> <span class="hljs-class">Символы</span>.ПС <span class="hljs-punctuation">+</span> <span class="hljs-string">&quot;</span>
+				<span class="hljs-string">|продолжение строки&quot;</span><span class="hljs-punctuation">)</span><span class="hljs-punctuation">;</span> <span class="hljs-comment">// продолжение многострочной строки</span>
+				<span class="hljs-keyword">Продолжить</span><span class="hljs-punctuation">;</span> <span class="hljs-keyword">Прервать</span><span class="hljs-punctuation">;</span>
+			<span class="hljs-keyword">КонецЦикла</span><span class="hljs-punctuation">;</span>
+			СправочникСсылка   <span class="hljs-punctuation">=</span> <span class="hljs-built_in">Справочники</span>.Языки.НайтиПоНаименованию<span class="hljs-punctuation">(</span><span class="hljs-string">&quot;ru&quot;</span><span class="hljs-punctuation">)</span><span class="hljs-punctuation">;</span> <span class="hljs-comment">// встроенные типы</span>
+			СправочникОбъект   <span class="hljs-punctuation">=</span> СправочникСсылка.ПолучитьОбъект<span class="hljs-punctuation">(</span><span class="hljs-punctuation">)</span><span class="hljs-punctuation">;</span>
+			ПеречислениеСсылка <span class="hljs-punctuation">=</span> <span class="hljs-built_in">Перечисления</span>.ВидыМодификацииДанных.Изменен<span class="hljs-punctuation">;</span>
+			<span class="hljs-keyword">ВызватьИсключение</span> <span class="hljs-built_in">ОписаниеОшибки</span><span class="hljs-punctuation">;</span>
+		<span class="hljs-keyword">КонецПопытки</span><span class="hljs-punctuation">;</span>
 		<span class="hljs-symbol">~МеткаGOTO</span>: <span class="hljs-comment">// еще комментарий</span>
-		ВД = <span class="hljs-class">ВидДвиженияБухгалтерии</span>.Дебет;
+		ВД <span class="hljs-punctuation">=</span> <span class="hljs-class">ВидДвиженияБухгалтерии</span>.Дебет<span class="hljs-punctuation">;</span>
 	<span class="hljs-function">КонецФункции</span> <span class="hljs-comment">// ТолстыйКлиентОбычноеПриложение()</span>
 <span class="hljs-meta">#<span class="hljs-keyword">КонецЕсли</span></span>
\ No newline at end of file
diff --git a/test/markup/arcade/profile.expect.txt b/test/markup/arcade/profile.expect.txt
index f30c09e4b6..111073ac8d 100644
--- a/test/markup/arcade/profile.expect.txt
+++ b/test/markup/arcade/profile.expect.txt
@@ -7,3 +7,23 @@
    <span class="hljs-keyword">var</span> myLayer = <span class="hljs-built_in">FeatureSet</span>(<span class="hljs-symbol">$map</span>, [<span class="hljs-string">&quot;POPULATION&quot;</span>, <span class="hljs-string">&quot;ELECTION-DATA&quot;</span>]);
    <span class="hljs-keyword">return</span> popDensity;
 }
+
+<span class="hljs-built_in">Distance</span>(<span class="hljs-symbol">$feedfeature</span>, <span class="hljs-symbol">$originalFeature</span>);
+
+<span class="hljs-keyword">var</span> startDate = <span class="hljs-built_in">DateOnly</span>(<span class="hljs-number">1996</span>,<span class="hljs-number">11</span>,<span class="hljs-number">10</span>);
+<span class="hljs-keyword">var</span> endDate = <span class="hljs-built_in">DateOnly</span>();
+<span class="hljs-keyword">var</span> age = <span class="hljs-built_in">DateDiff</span>(endDate, startDate, <span class="hljs-string">&#x27;years&#x27;</span>);
+<span class="hljs-built_in">Floor</span>(age);
+
+<span class="hljs-keyword">var</span> natlPizzaDay = <span class="hljs-built_in">Date</span>(<span class="hljs-number">2024</span>, <span class="hljs-number">1</span>, <span class="hljs-number">9</span>, <span class="hljs-number">0</span>, <span class="hljs-number">0</span>, <span class="hljs-number">0</span>, <span class="hljs-number">0</span>, <span class="hljs-string">&quot;America/Los_Angeles&quot;</span>);
+<span class="hljs-built_in">TimeZone</span>(natlPizzaDay);
+
+<span class="hljs-keyword">var</span> n = <span class="hljs-number">0</span>;
+<span class="hljs-keyword">for</span>(<span class="hljs-keyword">var</span> i=<span class="hljs-number">1</span>; i&lt;<span class="hljs-number">100</span>; i++) {
+  <span class="hljs-keyword">if</span> (i % <span class="hljs-number">2</span> == <span class="hljs-number">1</span>) {
+    <span class="hljs-keyword">continue</span>;
+  }
+  n+=i;
+}
+
+<span class="hljs-keyword">return</span> n;
\ No newline at end of file
diff --git a/test/markup/arcade/profile.txt b/test/markup/arcade/profile.txt
index b4f54b004d..d44f508f09 100644
--- a/test/markup/arcade/profile.txt
+++ b/test/markup/arcade/profile.txt
@@ -7,3 +7,23 @@ function offsetPopulation(offset){
    var myLayer = FeatureSet($map, ["POPULATION", "ELECTION-DATA"]);
    return popDensity;
 }
+
+Distance($feedfeature, $originalFeature);
+
+var startDate = DateOnly(1996,11,10);
+var endDate = DateOnly();
+var age = DateDiff(endDate, startDate, 'years');
+Floor(age);
+
+var natlPizzaDay = Date(2024, 1, 9, 0, 0, 0, 0, "America/Los_Angeles");
+TimeZone(natlPizzaDay);
+
+var n = 0;
+for(var i=1; i<100; i++) {
+  if (i % 2 == 1) {
+    continue;
+  }
+  n+=i;
+}
+
+return n;
\ No newline at end of file
diff --git a/test/markup/bash/not-comments.expect.txt b/test/markup/bash/not-comments.expect.txt
new file mode 100644
index 0000000000..ab12864283
--- /dev/null
+++ b/test/markup/bash/not-comments.expect.txt
@@ -0,0 +1,3 @@
+<span class="hljs-built_in">echo</span> asdf#qwert yuiop
+
+<span class="hljs-built_in">echo</span> asdf <span class="hljs-comment">#qwert yuiop</span>
diff --git a/test/markup/bash/not-comments.txt b/test/markup/bash/not-comments.txt
new file mode 100644
index 0000000000..b8f6f88383
--- /dev/null
+++ b/test/markup/bash/not-comments.txt
@@ -0,0 +1,3 @@
+echo asdf#qwert yuiop
+
+echo asdf #qwert yuiop
diff --git a/test/markup/cpp/number-literals.expect.txt b/test/markup/cpp/number-literals.expect.txt
index ea9ef3fddd..987cc6a997 100644
--- a/test/markup/cpp/number-literals.expect.txt
+++ b/test/markup/cpp/number-literals.expect.txt
@@ -1,11 +1,55 @@
-<span class="hljs-comment">/* digit separators */</span>
-<span class="hljs-type">int</span> number = <span class="hljs-number">2&#x27;555&#x27;555&#x27;555</span>; <span class="hljs-comment">// digit separators</span>
-<span class="hljs-type">float</span> exponentFloat = <span class="hljs-number">.123&#x27;456e3&#x27;000</span>; <span class="hljs-comment">// digit separators in floats</span>
-<span class="hljs-type">float</span> suffixed = <span class="hljs-number">3.000&#x27;001&#x27;234f</span> <span class="hljs-comment">// digit separators in suffixed numbers</span>
-<span class="hljs-type">char</span> word[] = { <span class="hljs-string">&#x27;3&#x27;</span>, <span class="hljs-string">&#x27;\0&#x27;</span> }; <span class="hljs-comment">// make sure digit separators don&#x27;t mess up chars</span>
-<span class="hljs-type">float</span> negative = <span class="hljs-number">-123.0f</span>; <span class="hljs-comment">// negative floating point numbers</span>
+<span class="hljs-comment">/* Floating-point literals. */</span>
+<span class="hljs-comment">// Decimal.</span>
+<span class="hljs-number">1.</span>
+<span class="hljs-number">+12.</span>
+<span class="hljs-number">-1&#x27;234.</span>
+<span class="hljs-number">1.2</span>
+<span class="hljs-number">1.234&#x27;5</span>
+<span class="hljs-number">1&#x27;234.567&#x27;8</span>
+<span class="hljs-number">1&#x27;234.567&#x27;8e-9</span>
+<span class="hljs-number">1&#x27;234.567&#x27;8E9&#x27;0</span>
+<span class="hljs-number">1234e56</span>
+<span class="hljs-number">1&#x27;234e5&#x27;6</span>
+<span class="hljs-comment">// Hexadecimal.</span>
+<span class="hljs-number">0x1p2</span>
+<span class="hljs-number">+0x1.p2</span>
+<span class="hljs-number">-0X1A.P2</span>
+<span class="hljs-number">0x1A&#x27;2B3C.p4</span>
+<span class="hljs-number">0x1.Ap2</span>
+<span class="hljs-number">0x1A.2B3C&#x27;4Dp+5</span>
+<span class="hljs-number">0x1A&#x27;2b3C.4D5e&#x27;6Fp7&#x27;8</span>
+<span class="hljs-comment">// Literal suffixes.</span>
+<span class="hljs-number">1.F</span> <span class="hljs-number">1.F16</span> <span class="hljs-number">1.F32</span> <span class="hljs-number">1.f64</span> <span class="hljs-number">1.f128</span>
+<span class="hljs-number">2.BF16</span> <span class="hljs-number">2.bf16</span>
+<span class="hljs-number">0X3&#x27;4.P5L</span> <span class="hljs-number">0x3&#x27;4.p5l</span>
 
-<span class="hljs-comment">/* literal suffixes: these are to be highlighted as numbers */</span>
-<span class="hljs-number">90ll</span> <span class="hljs-number">90LL</span> <span class="hljs-number">90u</span> <span class="hljs-number">90U</span> <span class="hljs-number">90l</span> <span class="hljs-number">90L</span>
-<span class="hljs-number">90ul</span> <span class="hljs-number">90ul</span> <span class="hljs-number">90Ul</span> <span class="hljs-number">90UL</span> <span class="hljs-number">90lu</span> <span class="hljs-number">90lU</span> <span class="hljs-number">90Lu</span> <span class="hljs-number">90LU</span>
-<span class="hljs-number">90ull</span> <span class="hljs-number">90uLL</span> <span class="hljs-number">90Ull</span> <span class="hljs-number">90ULL</span> <span class="hljs-number">90llu</span> <span class="hljs-number">90llU</span> <span class="hljs-number">90LLu</span> <span class="hljs-number">90LLU</span>
\ No newline at end of file
+<span class="hljs-comment">/* Integer literals. */</span>
+<span class="hljs-comment">// Binary.</span>
+<span class="hljs-number">+0b1</span>
+<span class="hljs-number">0B01</span>
+<span class="hljs-number">-0b10&#x27;1011</span>
+<span class="hljs-comment">// Hexadecimal.</span>
+<span class="hljs-number">+0x1</span>
+<span class="hljs-number">0X1A</span>
+<span class="hljs-number">-0x1A&#x27;2b3C</span>
+<span class="hljs-comment">// Octal.</span>
+<span class="hljs-number">+01</span>
+<span class="hljs-number">012</span>
+<span class="hljs-number">-0123&#x27;4567</span>
+<span class="hljs-comment">// Decimal.</span>
+<span class="hljs-number">0</span>
+<span class="hljs-number">+1</span>
+<span class="hljs-number">12</span>
+<span class="hljs-number">-123&#x27;456&#x27;789</span>
+<span class="hljs-comment">// Literal suffixes.</span>
+<span class="hljs-number">0B1U</span> <span class="hljs-number">0b1u</span>
+<span class="hljs-number">0X2L</span> <span class="hljs-number">0x2l</span>
+<span class="hljs-number">03LL</span> <span class="hljs-number">03ll</span>
+<span class="hljs-number">4UL</span> <span class="hljs-number">4Ul</span> <span class="hljs-number">4uL</span> <span class="hljs-number">4ul</span>
+<span class="hljs-number">5LU</span> <span class="hljs-number">5Lu</span> <span class="hljs-number">5lU</span> <span class="hljs-number">5lu</span>
+<span class="hljs-number">6ULL</span> <span class="hljs-number">6Ull</span> <span class="hljs-number">6uLL</span> <span class="hljs-number">6ull</span>
+<span class="hljs-number">7LLU</span> <span class="hljs-number">7LLu</span> <span class="hljs-number">7llU</span> <span class="hljs-number">7llu</span>
+<span class="hljs-number">8ZU</span> <span class="hljs-number">8Zu</span> <span class="hljs-number">8zU</span> <span class="hljs-number">8zu</span>
+<span class="hljs-number">9&#x27;0UZ</span> <span class="hljs-number">9&#x27;0Uz</span> <span class="hljs-number">9&#x27;0uZ</span> <span class="hljs-number">9&#x27;0uz</span>
+
+<span class="hljs-type">char</span> word[] = { <span class="hljs-string">&#x27;3&#x27;</span>, <span class="hljs-string">&#x27;\0&#x27;</span> }; <span class="hljs-comment">// Make sure digit separators don&#x27;t mess up chars.</span>
diff --git a/test/markup/cpp/number-literals.txt b/test/markup/cpp/number-literals.txt
index 8684037f66..cb8dd29b08 100644
--- a/test/markup/cpp/number-literals.txt
+++ b/test/markup/cpp/number-literals.txt
@@ -1,11 +1,55 @@
-/* digit separators */
-int number = 2'555'555'555; // digit separators
-float exponentFloat = .123'456e3'000; // digit separators in floats
-float suffixed = 3.000'001'234f // digit separators in suffixed numbers
-char word[] = { '3', '\0' }; // make sure digit separators don't mess up chars
-float negative = -123.0f; // negative floating point numbers
+/* Floating-point literals. */
+// Decimal.
+1.
++12.
+-1'234.
+1.2
+1.234'5
+1'234.567'8
+1'234.567'8e-9
+1'234.567'8E9'0
+1234e56
+1'234e5'6
+// Hexadecimal.
+0x1p2
++0x1.p2
+-0X1A.P2
+0x1A'2B3C.p4
+0x1.Ap2
+0x1A.2B3C'4Dp+5
+0x1A'2b3C.4D5e'6Fp7'8
+// Literal suffixes.
+1.F 1.F16 1.F32 1.f64 1.f128
+2.BF16 2.bf16
+0X3'4.P5L 0x3'4.p5l
 
-/* literal suffixes: these are to be highlighted as numbers */
-90ll 90LL 90u 90U 90l 90L
-90ul 90ul 90Ul 90UL 90lu 90lU 90Lu 90LU
-90ull 90uLL 90Ull 90ULL 90llu 90llU 90LLu 90LLU
\ No newline at end of file
+/* Integer literals. */
+// Binary.
++0b1
+0B01
+-0b10'1011
+// Hexadecimal.
++0x1
+0X1A
+-0x1A'2b3C
+// Octal.
++01
+012
+-0123'4567
+// Decimal.
+0
++1
+12
+-123'456'789
+// Literal suffixes.
+0B1U 0b1u
+0X2L 0x2l
+03LL 03ll
+4UL 4Ul 4uL 4ul
+5LU 5Lu 5lU 5lu
+6ULL 6Ull 6uLL 6ull
+7LLU 7LLu 7llU 7llu
+8ZU 8Zu 8zU 8zu
+9'0UZ 9'0Uz 9'0uZ 9'0uz
+
+char word[] = { '3', '\0' }; // Make sure digit separators don't mess up chars.
diff --git a/test/markup/csharp/string-raw.expect.txt b/test/markup/csharp/string-raw.expect.txt
new file mode 100644
index 0000000000..70f0f65ffa
--- /dev/null
+++ b/test/markup/csharp/string-raw.expect.txt
@@ -0,0 +1,17 @@
+<span class="hljs-comment">// String raw literals since C# 11. &lt;https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/tokens/raw-string&gt;</span>
+
+<span class="hljs-built_in">string</span> longMessage1 = <span class="hljs-string">&quot;&quot;&quot;&quot;
+    This is a long message.
+    It has several lines.
+        Some are indented
+                more than others.
+    Some have &quot;&quot;&quot;quoted text&quot;&quot;&quot; in them. \&quot;
+    &quot;&quot;&quot;&quot;</span>;
+    
+<span class="hljs-built_in">string</span> longMessage2 = <span class="hljs-string">&quot;&quot;&quot;
+    This is a long message.
+    It has several lines.
+        Some are indented
+                more than others.
+    Some have &quot;&quot;quoted text&quot;&quot; in them. \&quot;
+    &quot;&quot;&quot;</span>;
\ No newline at end of file
diff --git a/test/markup/csharp/string-raw.txt b/test/markup/csharp/string-raw.txt
new file mode 100644
index 0000000000..0da0d498b2
--- /dev/null
+++ b/test/markup/csharp/string-raw.txt
@@ -0,0 +1,17 @@
+// String raw literals since C# 11. <https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/tokens/raw-string>
+
+string longMessage1 = """"
+    This is a long message.
+    It has several lines.
+        Some are indented
+                more than others.
+    Some have """quoted text""" in them. \"
+    """";
+    
+string longMessage2 = """
+    This is a long message.
+    It has several lines.
+        Some are indented
+                more than others.
+    Some have ""quoted text"" in them. \"
+    """;
diff --git a/test/markup/css/pseudo-selector.expect.txt b/test/markup/css/pseudo-selector.expect.txt
index 39d4746d61..b684638e6f 100644
--- a/test/markup/css/pseudo-selector.expect.txt
+++ b/test/markup/css/pseudo-selector.expect.txt
@@ -1,2 +1,24 @@
 <span class="hljs-selector-tag">li</span><span class="hljs-selector-pseudo">:not</span>(<span class="hljs-selector-class">.red</span>){}
 <span class="hljs-selector-tag">li</span><span class="hljs-selector-pseudo">:not</span>(<span class="hljs-selector-class">.red</span>)<span class="hljs-selector-pseudo">:not</span>(<span class="hljs-selector-class">.green</span>){}
+
+<span class="hljs-selector-pseudo">:first-child</span> {
+  <span class="hljs-attribute">padding</span>: <span class="hljs-number">0</span>;
+}
+
+<span class="hljs-selector-pseudo">:first-of-type</span> {
+  <span class="hljs-attribute">padding</span>: <span class="hljs-number">0</span>;
+}
+
+<span class="hljs-selector-pseudo">:last-child</span> {
+  <span class="hljs-attribute">padding</span>: <span class="hljs-number">0</span>;
+}
+
+<span class="hljs-selector-pseudo">:last-of-type</span> {
+  <span class="hljs-attribute">padding</span>: <span class="hljs-number">0</span>;
+}
+
+<span class="hljs-selector-tag">p</span><span class="hljs-selector-pseudo">::first-letter</span> {
+  <span class="hljs-attribute">font-size</span>: <span class="hljs-number">1.5rem</span>;
+  <span class="hljs-attribute">font-weight</span>: bold;
+  <span class="hljs-attribute">color</span>: brown;
+}
diff --git a/test/markup/css/pseudo-selector.txt b/test/markup/css/pseudo-selector.txt
index 4508da18fa..3365f6583a 100644
--- a/test/markup/css/pseudo-selector.txt
+++ b/test/markup/css/pseudo-selector.txt
@@ -1,2 +1,24 @@
 li:not(.red){}
 li:not(.red):not(.green){}
+
+:first-child {
+  padding: 0;
+}
+
+:first-of-type {
+  padding: 0;
+}
+
+:last-child {
+  padding: 0;
+}
+
+:last-of-type {
+  padding: 0;
+}
+
+p::first-letter {
+  font-size: 1.5rem;
+  font-weight: bold;
+  color: brown;
+}
diff --git a/test/markup/css/variables.expect.txt b/test/markup/css/variables.expect.txt
index f3f52a3eb6..ad28a9db20 100644
--- a/test/markup/css/variables.expect.txt
+++ b/test/markup/css/variables.expect.txt
@@ -7,3 +7,8 @@
  <span class="hljs-attr">--textBlue</span>: blue;
  <span class="hljs-attribute">color</span>: <span class="hljs-built_in">var</span>(--textBlue);
 }
+
+<span class="hljs-selector-tag">body</span> {
+ <span class="hljs-attr">--_margin-top</span>: <span class="hljs-number">1rem</span>;
+ <span class="hljs-attribute">margin-top</span>: <span class="hljs-built_in">var</span>(--_margin-top);
+}
\ No newline at end of file
diff --git a/test/markup/css/variables.txt b/test/markup/css/variables.txt
index 745a14ec90..3b1f9ae33c 100644
--- a/test/markup/css/variables.txt
+++ b/test/markup/css/variables.txt
@@ -7,3 +7,9 @@ body {
  --textBlue: blue;
  color: var(--textBlue);
 }
+
+body {
+ --_margin-top: 1rem;
+ margin-top: var(--_margin-top);
+}
+
diff --git a/test/markup/delphi/character-string.expect.txt b/test/markup/delphi/character-string.expect.txt
new file mode 100644
index 0000000000..bd2f8f5890
--- /dev/null
+++ b/test/markup/delphi/character-string.expect.txt
@@ -0,0 +1,12 @@
+<span class="hljs-keyword">const</span>
+  CDecimalCharacterString = <span class="hljs-string">#123</span>;
+  CHexadecimalCharacterString = <span class="hljs-string">#$7B</span>;
+  COctalCharacterString = <span class="hljs-string">#&amp;123</span>;
+  CBinaryCharacterString = <span class="hljs-string">#%1111011</span>;
+
+  CDecimalCharacterStringWithSeparator = <span class="hljs-string">#1_23</span>;
+  CHexadecimalCharacterStringWithSeparator = <span class="hljs-string">#$7_B</span>;
+  COctalCharacterStringWithSeparator = <span class="hljs-string">#&amp;123</span>;
+  CBinaryCharacterStringWithSeparator = <span class="hljs-string">#%1_111011</span>;
+
+  CMultipleCharacterStrings = <span class="hljs-string">#123</span><span class="hljs-string">#$ABC</span><span class="hljs-string">#&amp;765</span><span class="hljs-string">#%0011001</span>;
\ No newline at end of file
diff --git a/test/markup/delphi/character-string.txt b/test/markup/delphi/character-string.txt
new file mode 100644
index 0000000000..2ef4b9db1a
--- /dev/null
+++ b/test/markup/delphi/character-string.txt
@@ -0,0 +1,12 @@
+const
+  CDecimalCharacterString = #123;
+  CHexadecimalCharacterString = #$7B;
+  COctalCharacterString = #&123;
+  CBinaryCharacterString = #%1111011;
+
+  CDecimalCharacterStringWithSeparator = #1_23;
+  CHexadecimalCharacterStringWithSeparator = #$7_B;
+  COctalCharacterStringWithSeparator = #&123;
+  CBinaryCharacterStringWithSeparator = #%1_111011;
+
+  CMultipleCharacterStrings = #123#$ABC#&765#%0011001;
\ No newline at end of file
diff --git a/test/markup/delphi/numeric-literal.expect.txt b/test/markup/delphi/numeric-literal.expect.txt
new file mode 100644
index 0000000000..cbddbd27dd
--- /dev/null
+++ b/test/markup/delphi/numeric-literal.expect.txt
@@ -0,0 +1,18 @@
+<span class="hljs-keyword">const</span>
+  CDecimal = <span class="hljs-number">123456</span>;
+  CFloat = <span class="hljs-number">123.456</span>;
+  CHexadecimal = <span class="hljs-number">$ABC123</span>;
+  COctal = <span class="hljs-number">&amp;123456</span>;
+  CBinary = <span class="hljs-number">%000111</span>;
+
+  CDecimalWithSeparator = <span class="hljs-number">123_456</span>;
+  CFloatWithSeparator = <span class="hljs-number">12_3.78_9</span>;
+  CHexadecimalWithSeparator = <span class="hljs-number">$ABC_123</span>;
+  COctalWithSeparator = <span class="hljs-number">&amp;123_456</span>;
+  CBinaryWithSeparator = <span class="hljs-number">%000_111</span>;
+
+  CHexadecimalWithOnlySeparator = <span class="hljs-number">$_</span>;
+  CBinaryWithOnlySeparator = <span class="hljs-number">%_</span>;
+
+  CHexadecimalWithNoDigits = <span class="hljs-number">$</span>;
+  CBinaryWithNoDigits = <span class="hljs-number">%</span>;
\ No newline at end of file
diff --git a/test/markup/delphi/numeric-literal.txt b/test/markup/delphi/numeric-literal.txt
new file mode 100644
index 0000000000..9b049f15e1
--- /dev/null
+++ b/test/markup/delphi/numeric-literal.txt
@@ -0,0 +1,18 @@
+const
+  CDecimal = 123456;
+  CFloat = 123.456;
+  CHexadecimal = $ABC123;
+  COctal = &123456;
+  CBinary = %000111;
+
+  CDecimalWithSeparator = 123_456;
+  CFloatWithSeparator = 12_3.78_9;
+  CHexadecimalWithSeparator = $ABC_123;
+  COctalWithSeparator = &123_456;
+  CBinaryWithSeparator = %000_111;
+
+  CHexadecimalWithOnlySeparator = $_;
+  CBinaryWithOnlySeparator = %_;
+
+  CHexadecimalWithNoDigits = $;
+  CBinaryWithNoDigits = %;
\ No newline at end of file
diff --git a/test/markup/erlang/char_literal.expect.txt b/test/markup/erlang/char_literal.expect.txt
new file mode 100644
index 0000000000..f564777d55
--- /dev/null
+++ b/test/markup/erlang/char_literal.expect.txt
@@ -0,0 +1,23 @@
+Character = <span class="hljs-string">$a</span>
+TabCharacter = <span class="hljs-string">$\t</span>
+TabCharacterDecimal = <span class="hljs-string">$\011</span>
+TextWithDollar = <span class="hljs-string">&quot;This is just a normal text with a $ in the middle&quot;</span>
+StringStart = <span class="hljs-string">$&quot;</span>
+Backslash = <span class="hljs-string">$\\</span>
+ListStart = <span class="hljs-string">$[</span>
+ListEnd = <span class="hljs-string">$]</span>
+SpaceChar = <span class="hljs-string">$ </span> <span class="hljs-comment">% yes, that works</span>
+<span class="hljs-function"><span class="hljs-title">fun_takes_literal</span><span class="hljs-params">(<span class="hljs-string">$a</span>)</span> -&gt;</span> ok.
+<span class="hljs-function"><span class="hljs-title">fun_takes_literal_list</span><span class="hljs-params">([<span class="hljs-string">$a</span>|Rest])</span> -&gt;</span> ok.
+<span class="hljs-function"><span class="hljs-title">fun_takes_literal_binary</span><span class="hljs-params">(&lt;&lt;<span class="hljs-string">$a</span>, Rest/binary&gt;&gt;)</span> -&gt;</span> ok.
+<span class="hljs-function"><span class="hljs-title">convert_escape_sequence</span><span class="hljs-params">(&lt;&lt;<span class="hljs-string">$\\</span>, Escaped, Rest/binary&gt;&gt;)</span> -&gt;</span>
+    C = <span class="hljs-keyword">case</span> Escaped <span class="hljs-keyword">of</span>
+        <span class="hljs-string">$b</span> -&gt; <span class="hljs-string">$\b</span>;
+        <span class="hljs-string">$f</span> -&gt; <span class="hljs-string">$\f</span>;
+        <span class="hljs-string">$n</span> -&gt; <span class="hljs-string">$\n</span>;
+        <span class="hljs-string">$r</span> -&gt; <span class="hljs-string">$\r</span>;
+        <span class="hljs-string">$t</span> -&gt; <span class="hljs-string">$\t</span>;
+        <span class="hljs-string">$&quot;</span> -&gt; <span class="hljs-string">$&quot;</span>;
+        <span class="hljs-string">$\\</span> -&gt; <span class="hljs-string">$\\</span>;
+        _  -&gt; error
+    <span class="hljs-keyword">end</span>
diff --git a/test/markup/erlang/char_literal.txt b/test/markup/erlang/char_literal.txt
new file mode 100644
index 0000000000..b8402f32af
--- /dev/null
+++ b/test/markup/erlang/char_literal.txt
@@ -0,0 +1,23 @@
+Character = $a
+TabCharacter = $\t
+TabCharacterDecimal = $\011
+TextWithDollar = "This is just a normal text with a $ in the middle"
+StringStart = $"
+Backslash = $\\
+ListStart = $[
+ListEnd = $]
+SpaceChar = $  % yes, that works
+fun_takes_literal($a) -> ok.
+fun_takes_literal_list([$a|Rest]) -> ok.
+fun_takes_literal_binary(<<$a, Rest/binary>>) -> ok.
+convert_escape_sequence(<<$\\, Escaped, Rest/binary>>) ->
+    C = case Escaped of
+        $b -> $\b;
+        $f -> $\f;
+        $n -> $\n;
+        $r -> $\r;
+        $t -> $\t;
+        $" -> $";
+        $\\ -> $\\;
+        _  -> error
+    end
diff --git a/test/markup/go/numbers.expect.txt b/test/markup/go/numbers.expect.txt
index f7b1255f20..b60c687999 100644
--- a/test/markup/go/numbers.expect.txt
+++ b/test/markup/go/numbers.expect.txt
@@ -1,3 +1,64 @@
+-- Numbers
+
 float_var := <span class="hljs-number">1.0e10</span>
 complex_var := <span class="hljs-number">1.2e5</span>+<span class="hljs-number">2.3i</span>
 hex_int := <span class="hljs-number">0xcf3e4028ac084aea</span>
+
+int_simple := <span class="hljs-number">42</span>
+int_underscore := <span class="hljs-number">4_2</span>
+octal := <span class="hljs-number">0600</span>
+octal_underscore := <span class="hljs-number">0_600</span>
+octal_o := <span class="hljs-number">0o600</span>
+octal_upper_o := <span class="hljs-number">0O600</span>
+hex_mixed_case := <span class="hljs-number">0xBadFace</span>
+hex_underscore := <span class="hljs-number">0xBad_Face</span>
+hex_many_underscore := <span class="hljs-number">0x_67_7a_2f_cc_40_c6</span>
+long_int := <span class="hljs-number">170141183460469231731687303715884105727</span>
+long_int_underscore := <span class="hljs-number">170_141183_460469_231731_687303_715884_105727</span>
+
+float_no_post := <span class="hljs-number">0.</span>
+float_simple := <span class="hljs-number">72.40</span>
+float_leading_zero := <span class="hljs-number">072.40</span>
+float_e := <span class="hljs-number">1.e+0</span>
+float_e_neg := <span class="hljs-number">6.67428e-11</span>
+float_e_no_decimal := <span class="hljs-number">1E6</span>
+float_no_pre := <span class="hljs-number">.25</span>
+float_e_no_pre := <span class="hljs-number">.12345E+5</span>
+float_underscore := <span class="hljs-number">1_5.</span>
+float_underscore_in_e := <span class="hljs-number">0.15e+0_2</span>
+
+float_hex_p := <span class="hljs-number">0x1p-2</span>
+float_hex_p_no_post := <span class="hljs-number">0x2.p10</span>
+float_hex_p_sign := <span class="hljs-number">0x1.Fp+0</span>
+float_hex_p_neg := <span class="hljs-number">0X.8p-0</span>
+float_hex_underscore := <span class="hljs-number">0X_1FFFP-16</span>
+
+complex_zero := <span class="hljs-number">0i</span>
+complex_leading_zero := <span class="hljs-number">0123i</span>
+complex_octal := <span class="hljs-number">0o123i</span>
+complex_hex := <span class="hljs-number">0xabci</span>
+complex_float_zero := <span class="hljs-number">0.i</span>
+complex_float_simple := <span class="hljs-number">2.71828i</span>
+complex_float_e := <span class="hljs-number">1.e+0i</span>
+complex_float_e_neg := <span class="hljs-number">6.67428e-11i</span>
+complex_float_e_no_decimal := <span class="hljs-number">1E6i</span>
+complex_float_no_pre := <span class="hljs-number">.25i</span>
+complex_float_e_no_pre := <span class="hljs-number">.12345E+5i</span>
+complex_float_hex_p := <span class="hljs-number">0x1p-2i</span>
+
+-- Non-numbers
+
+identifier := _42
+trailing_underscore := <span class="hljs-number">42</span>_
+multiple_underscore := <span class="hljs-number">4</span>__2
+underscore_in_hex_prefix := <span class="hljs-number">0</span>_xBadFace
+
+float_minus_int := <span class="hljs-number">0x15e</span><span class="hljs-number">-2</span>
+no_mantissa_digits := <span class="hljs-number">0</span>x.p1
+p_exponent_on_decimal := <span class="hljs-number">1</span>p<span class="hljs-number">-2</span>
+missing_p_exponent := <span class="hljs-number">0x1</span><span class="hljs-number">.5e-2</span>
+underscore_before_decimal := <span class="hljs-number">1</span>_<span class="hljs-number">.5</span>
+underscore_after_decimal := <span class="hljs-number">1.</span>_5
+underscore_before_e := <span class="hljs-number">1.5</span>_e1
+underscore_after_e := <span class="hljs-number">1.5</span>e_1
+trailing_underscore_in_exponent := <span class="hljs-number">1.5e1</span>_
diff --git a/test/markup/go/numbers.txt b/test/markup/go/numbers.txt
index 48207de9a8..9e80ded0f2 100644
--- a/test/markup/go/numbers.txt
+++ b/test/markup/go/numbers.txt
@@ -1,3 +1,64 @@
+-- Numbers
+
 float_var := 1.0e10
 complex_var := 1.2e5+2.3i
 hex_int := 0xcf3e4028ac084aea
+
+int_simple := 42
+int_underscore := 4_2
+octal := 0600
+octal_underscore := 0_600
+octal_o := 0o600
+octal_upper_o := 0O600
+hex_mixed_case := 0xBadFace
+hex_underscore := 0xBad_Face
+hex_many_underscore := 0x_67_7a_2f_cc_40_c6
+long_int := 170141183460469231731687303715884105727
+long_int_underscore := 170_141183_460469_231731_687303_715884_105727
+
+float_no_post := 0.
+float_simple := 72.40
+float_leading_zero := 072.40
+float_e := 1.e+0
+float_e_neg := 6.67428e-11
+float_e_no_decimal := 1E6
+float_no_pre := .25
+float_e_no_pre := .12345E+5
+float_underscore := 1_5.
+float_underscore_in_e := 0.15e+0_2
+
+float_hex_p := 0x1p-2
+float_hex_p_no_post := 0x2.p10
+float_hex_p_sign := 0x1.Fp+0
+float_hex_p_neg := 0X.8p-0
+float_hex_underscore := 0X_1FFFP-16
+
+complex_zero := 0i
+complex_leading_zero := 0123i
+complex_octal := 0o123i
+complex_hex := 0xabci
+complex_float_zero := 0.i
+complex_float_simple := 2.71828i
+complex_float_e := 1.e+0i
+complex_float_e_neg := 6.67428e-11i
+complex_float_e_no_decimal := 1E6i
+complex_float_no_pre := .25i
+complex_float_e_no_pre := .12345E+5i
+complex_float_hex_p := 0x1p-2i
+
+-- Non-numbers
+
+identifier := _42
+trailing_underscore := 42_
+multiple_underscore := 4__2
+underscore_in_hex_prefix := 0_xBadFace
+
+float_minus_int := 0x15e-2
+no_mantissa_digits := 0x.p1
+p_exponent_on_decimal := 1p-2
+missing_p_exponent := 0x1.5e-2
+underscore_before_decimal := 1_.5
+underscore_after_decimal := 1._5
+underscore_before_e := 1.5_e1
+underscore_after_e := 1.5e_1
+trailing_underscore_in_exponent := 1.5e1_
diff --git a/test/markup/haxe/default.expect.txt b/test/markup/haxe/default.expect.txt
index ce81460df1..72d1b25922 100644
--- a/test/markup/haxe/default.expect.txt
+++ b/test/markup/haxe/default.expect.txt
@@ -84,7 +84,7 @@
 
 <span class="hljs-title class_"><span class="hljs-keyword">class</span> <span class="hljs-title">Main</span> <span class="hljs-keyword"><span class="hljs-keyword">extends</span> <span class="hljs-type">BaseClass</span></span> <span class="hljs-keyword"><span class="hljs-keyword">implements</span> <span class="hljs-type">SomeFunctionality</span></span> </span>{
     <span class="hljs-keyword">var</span> callback:<span class="hljs-type">Void-&gt;Void </span>= <span class="hljs-literal">null</span>;
-    <span class="hljs-keyword">var</span> myArray:<span class="hljs-type">Array</span>&lt;<span class="hljs-keyword">Float</span>&gt; = <span class="hljs-keyword">new</span> <span class="hljs-type">Array</span>&lt;<span class="hljs-keyword">Float</span>&gt;();
+    <span class="hljs-keyword">var</span> myArray:<span class="hljs-type">Array</span>&lt;<span class="hljs-keyword">Float</span>&gt; = <span class="hljs-keyword">new</span><span class="hljs-type"></span> <span class="hljs-keyword">Array</span>&lt;<span class="hljs-keyword">Float</span>&gt;();
     <span class="hljs-keyword">var</span> arr = [<span class="hljs-number">4</span>,<span class="hljs-number">8</span>,<span class="hljs-number">0</span>,<span class="hljs-number">3</span>,<span class="hljs-number">9</span>,<span class="hljs-number">1</span>,<span class="hljs-number">5</span>,<span class="hljs-number">2</span>,<span class="hljs-number">6</span>,<span class="hljs-number">7</span>];
 
     <span class="hljs-keyword">public</span> <span class="hljs-title function_"><span class="hljs-keyword">function</span> <span class="hljs-title">new</span></span>(x) {
@@ -120,8 +120,8 @@
             done = <span class="hljs-literal">true</span>;
         }
 
-        <span class="hljs-keyword">var</span> H:<span class="hljs-type">Int </span>= <span class="hljs-keyword">cast</span> <span class="hljs-keyword">new</span> <span class="hljs-type">MyAbstract</span>(<span class="hljs-number">42</span>);
-        <span class="hljs-keyword">var</span> h:<span class="hljs-type">Int </span>= <span class="hljs-keyword">cast</span>(<span class="hljs-keyword">new</span> <span class="hljs-type">MyAbstract</span>(<span class="hljs-number">31</span>), <span class="hljs-keyword">Int</span>);
+        <span class="hljs-keyword">var</span> H:<span class="hljs-type">Int </span>= <span class="hljs-keyword">cast</span> <span class="hljs-keyword">new</span><span class="hljs-type"></span> MyAbstract(<span class="hljs-number">42</span>);
+        <span class="hljs-keyword">var</span> h:<span class="hljs-type">Int </span>= <span class="hljs-keyword">cast</span>(<span class="hljs-keyword">new</span><span class="hljs-type"></span> MyAbstract(<span class="hljs-number">31</span>), <span class="hljs-keyword">Int</span>);
 
         <span class="hljs-keyword">try</span> {
             <span class="hljs-keyword">throw</span> <span class="hljs-string">&quot;error&quot;</span>;
@@ -130,7 +130,7 @@
             <span class="hljs-built_in">trace</span>(err);
         }
         
-        <span class="hljs-keyword">var</span> map = <span class="hljs-keyword">new</span> <span class="hljs-type">haxe</span>.ds.IntMap&lt;<span class="hljs-keyword">String</span>&gt;();
+        <span class="hljs-keyword">var</span> map = <span class="hljs-keyword">new</span><span class="hljs-type"></span> haxe.ds.IntMap&lt;<span class="hljs-keyword">String</span>&gt;();
         <span class="hljs-keyword">var</span> f = map.<span class="hljs-keyword">set</span>.bind(<span class="hljs-literal">_</span>, <span class="hljs-string">&quot;12&quot;</span>);
     }
 
@@ -175,4 +175,10 @@
         <span class="hljs-keyword">if</span>( lo &lt; j ) quicksort( lo, j );
         <span class="hljs-keyword">if</span>( i &lt; hi ) quicksort( i, hi );
     }
+
+    <span class="hljs-title function_"><span class="hljs-keyword">function</span> <span class="hljs-title">generateNewArray</span></span>(newArray:<span class="hljs-type">Array</span>):<span class="hljs-type">Void </span>{
+        <span class="hljs-keyword">var</span> i = newArray;
+        <span class="hljs-keyword">var</span> array = <span class="hljs-keyword">new</span><span class="hljs-type"></span> <span class="hljs-keyword">Array</span>();
+    }
+
 }
\ No newline at end of file
diff --git a/test/markup/haxe/default.txt b/test/markup/haxe/default.txt
index 6c4d8f69a6..4c11b45d2e 100644
--- a/test/markup/haxe/default.txt
+++ b/test/markup/haxe/default.txt
@@ -175,4 +175,10 @@ class Main extends BaseClass implements SomeFunctionality {
         if( lo < j ) quicksort( lo, j );
         if( i < hi ) quicksort( i, hi );
     }
+
+    function generateNewArray(newArray:Array):Void {
+        var i = newArray;
+        var array = new Array();
+    }
+
 }
\ No newline at end of file
diff --git a/test/markup/index.js b/test/markup/index.js
index d451e5da5d..822b175105 100644
--- a/test/markup/index.js
+++ b/test/markup/index.js
@@ -16,7 +16,7 @@ function testLanguage(language, {testDir}) {
       path.join(testDir, '*.expect.txt') :
       utility.buildPath('markup', language, '*.expect.txt');
     const filePath = where;
-    const filenames = glob.sync(filePath);
+    const filenames = glob.sync(filePath, {windowsPathsNoEscape: true});
 
     filenames.forEach(function(filename) {
       const testName = path.basename(filename, '.expect.txt');
diff --git a/test/markup/javascript/class.expect.txt b/test/markup/javascript/class.expect.txt
index 7e1dd67c80..3acfe87244 100644
--- a/test/markup/javascript/class.expect.txt
+++ b/test/markup/javascript/class.expect.txt
@@ -38,3 +38,29 @@
 <span class="hljs-title class_">InT</span>
 <span class="hljs-title class_">CSSParserT</span>
 <span class="hljs-title class_">IResponseTsS</span>
+
+<span class="hljs-comment">// this class to show that the params may be seperated with space after the function name and highlighted as params also.</span>
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">Car</span> <span class="hljs-keyword">extends</span> <span class="hljs-title class_ inherited__">Vehicle</span> {
+  <span class="hljs-title function_">constructor</span> (<span class="hljs-params">speed, cost</span>) {
+    <span class="hljs-variable language_">super</span>(speed);
+
+    <span class="hljs-keyword">var</span> c = <span class="hljs-title class_">Symbol</span>(<span class="hljs-string">&#x27;cost&#x27;</span>);
+    <span class="hljs-variable language_">this</span>[c] = cost;
+
+    <span class="hljs-variable language_">this</span>.<span class="hljs-property">intro</span> = <span class="hljs-string">`This is a car runs at
+      <span class="hljs-subst">${speed}</span>.`</span>;
+  }
+
+  <span class="hljs-title function_">join</span> () {
+  }
+
+  <span class="hljs-title function_">other</span> (a = ( ( <span class="hljs-number">3</span> + <span class="hljs-number">2</span> ) ) ) {
+    <span class="hljs-variable language_">console</span>.<span class="hljs-title function_">log</span>(a)
+  }
+
+  <span class="hljs-title function_">something</span> (a = ( ( <span class="hljs-number">3</span> + <span class="hljs-number">2</span> ) ), b = <span class="hljs-number">1</span> ) {
+    <span class="hljs-variable language_">console</span>.<span class="hljs-title function_">log</span>(a)
+  }
+
+  <span class="hljs-title function_">onemore</span> (a=(<span class="hljs-number">3</span>+<span class="hljs-number">2</span>, b=(<span class="hljs-number">5</span>*<span class="hljs-number">9</span>))) {}
+}
diff --git a/test/markup/javascript/class.txt b/test/markup/javascript/class.txt
index 4badef7377..57b9f0bea7 100644
--- a/test/markup/javascript/class.txt
+++ b/test/markup/javascript/class.txt
@@ -38,3 +38,29 @@ OutT
 InT
 CSSParserT
 IResponseTsS
+
+// this class to show that the params may be seperated with space after the function name and highlighted as params also.
+class Car extends Vehicle {
+  constructor (speed, cost) {
+    super(speed);
+
+    var c = Symbol('cost');
+    this[c] = cost;
+
+    this.intro = `This is a car runs at
+      ${speed}.`;
+  }
+
+  join () {
+  }
+
+  other (a = ( ( 3 + 2 ) ) ) {
+    console.log(a)
+  }
+
+  something (a = ( ( 3 + 2 ) ), b = 1 ) {
+    console.log(a)
+  }
+
+  onemore (a=(3+2, b=(5*9))) {}
+}
diff --git a/test/markup/javascript/inline-languages.expect.txt b/test/markup/javascript/inline-languages.expect.txt
index 61b1dd0297..72eef6419e 100644
--- a/test/markup/javascript/inline-languages.expect.txt
+++ b/test/markup/javascript/inline-languages.expect.txt
@@ -4,6 +4,8 @@ foo = <span class="hljs-literal">false</span>;
 
 html`<span class="language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">div</span> <span class="hljs-attr">id</span>=<span class="hljs-string">&quot;foo&quot;</span>&gt;</span>Hello world<span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span>`</span>;
 
+kitten.html`<span class="language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">div</span> <span class="hljs-attr">id</span>=<span class="hljs-string">&quot;foo&quot;</span>&gt;</span>Hello world<span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span>`</span>;
+
 html`<span class="language-xml"><span class="hljs-tag">&lt;<span class="hljs-name">div</span> <span class="hljs-attr">id</span>=<span class="hljs-string">&quot;foo&quot;</span>&gt;</span>Hello times </span><span class="hljs-subst">${<span class="hljs-number">10</span>}</span><span class="language-xml"> <span class="hljs-tag">&lt;<span class="hljs-name">span</span> <span class="hljs-attr">id</span>=<span class="hljs-string">&quot;bar&quot;</span>&gt;</span>world<span class="hljs-tag">&lt;/<span class="hljs-name">span</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span>`</span>;
 
 html`<span class="language-xml">
@@ -20,8 +22,16 @@ css`<span class="language-css">
   }
 `</span>;
 
+kitten.css`<span class="language-css">
+  <span class="hljs-selector-tag">body</span> {
+    <span class="hljs-attribute">color</span>: red;
+  }
+`</span>;
+
 gql`<span class="language-graphql"><span class="hljs-keyword">query</span> <span class="hljs-punctuation">{</span> viewer <span class="hljs-punctuation">{</span> id <span class="hljs-punctuation">}</span> <span class="hljs-punctuation">}</span>`</span>;
 
+kitten.gql`<span class="language-graphql"><span class="hljs-keyword">query</span> <span class="hljs-punctuation">{</span> viewer <span class="hljs-punctuation">{</span> id <span class="hljs-punctuation">}</span> <span class="hljs-punctuation">}</span>`</span>;
+
 gql`<span class="language-graphql">
   <span class="hljs-keyword">type</span> Project <span class="hljs-punctuation">{</span>
     <span class="hljs-symbol">name</span><span class="hljs-punctuation">:</span> String
diff --git a/test/markup/javascript/inline-languages.txt b/test/markup/javascript/inline-languages.txt
index 8f85860fa2..b9f035d3ac 100644
--- a/test/markup/javascript/inline-languages.txt
+++ b/test/markup/javascript/inline-languages.txt
@@ -4,6 +4,8 @@ foo = false;
 
 html`<div id="foo">Hello world</div>`;
 
+kitten.html`<div id="foo">Hello world</div>`;
+
 html`<div id="foo">Hello times ${10} <span id="bar">world</span></div>`;
 
 html`
@@ -20,8 +22,16 @@ css`
   }
 `;
 
+kitten.css`
+  body {
+    color: red;
+  }
+`;
+
 gql`query { viewer { id } }`;
 
+kitten.gql`query { viewer { id } }`;
+
 gql`
   type Project {
     name: String
diff --git a/test/markup/javascript/seperated-parameters.expect.txt b/test/markup/javascript/seperated-parameters.expect.txt
new file mode 100644
index 0000000000..f63006c91d
--- /dev/null
+++ b/test/markup/javascript/seperated-parameters.expect.txt
@@ -0,0 +1,5 @@
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">visibleTodoFilter</span> (<span class="hljs-params">state = <span class="hljs-string">&#x27;watch&#x27;</span>, action</span>) {}
+
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">visibleTodoFilter</span> (<span class="hljs-params">state, action</span>) {
+  <span class="hljs-comment">// ...</span>
+}
diff --git a/test/markup/javascript/seperated-parameters.txt b/test/markup/javascript/seperated-parameters.txt
new file mode 100644
index 0000000000..6dd0cd9eaf
--- /dev/null
+++ b/test/markup/javascript/seperated-parameters.txt
@@ -0,0 +1,5 @@
+function visibleTodoFilter (state = 'watch', action) {}
+
+function visibleTodoFilter (state, action) {
+  // ...
+}
diff --git a/test/markup/markdown/entity.expect.txt b/test/markup/markdown/entity.expect.txt
new file mode 100644
index 0000000000..8619e4d345
--- /dev/null
+++ b/test/markup/markdown/entity.expect.txt
@@ -0,0 +1,3 @@
+<span class="hljs-bullet">-</span> named entities: <span class="hljs-literal">&amp;amp;</span>, <span class="hljs-literal">&amp;frac34;</span>, <span class="hljs-literal">&amp;AElig;</span>
+<span class="hljs-bullet">-</span> decimal entities: <span class="hljs-literal">&amp;#65;</span> <span class="hljs-literal">&amp;#164;</span>
+<span class="hljs-bullet">-</span> hexadecimal entities: <span class="hljs-literal">&amp;#xFFFD;</span> <span class="hljs-literal">&amp;#x48;</span>.
\ No newline at end of file
diff --git a/test/markup/markdown/entity.txt b/test/markup/markdown/entity.txt
new file mode 100644
index 0000000000..42b63499b5
--- /dev/null
+++ b/test/markup/markdown/entity.txt
@@ -0,0 +1,3 @@
+- named entities: &amp;, &frac34;, &AElig;
+- decimal entities: &#65; &#164;
+- hexadecimal entities: &#xFFFD; &#x48;.
\ No newline at end of file
diff --git a/test/markup/mojolicious/default.expect.txt b/test/markup/mojolicious/default.expect.txt
index 692ae8d1fd..2238141169 100644
--- a/test/markup/mojolicious/default.expect.txt
+++ b/test/markup/mojolicious/default.expect.txt
@@ -1,21 +1,21 @@
-<span class="language-perl">%layout <span class="hljs-string">&#x27;bootstrap&#x27;</span>;</span><span class="language-xml">
+<span class="language-perl">% layout <span class="hljs-string">&#x27;bootstrap&#x27;</span>;</span><span class="language-xml">
 </span><span class="language-perl">% title <span class="hljs-string">&quot;Import your subs&quot;</span>;</span><span class="language-xml">
 </span><span class="language-perl">%= form_for <span class="hljs-string">&#x27;/settings/import&#x27;</span> =&gt; (<span class="hljs-string">method =&gt;</span> <span class="hljs-string">&#x27;post&#x27;</span>, <span class="hljs-string">enctype =&gt;</span> <span class="hljs-string">&#x27;multipart/form-data&#x27;</span>) =&gt; begin</span><span class="language-xml">
 </span><span class="language-perl">     %= file_field <span class="hljs-string">&#x27;opmlfile&#x27;</span> =&gt; <span class="hljs-string">multiple =&gt;</span> <span class="hljs-string">&#x27;true&#x27;</span></span><span class="language-xml">
 </span><span class="language-perl">     %= submit_button <span class="hljs-string">&#x27;Import&#x27;</span>, <span class="hljs-string">&#x27;class&#x27;</span> =&gt; <span class="hljs-string">&#x27;btn&#x27;</span></span><span class="language-xml">
 </span><span class="language-perl">% end</span><span class="language-xml">
 <span class="hljs-tag">&lt;<span class="hljs-name">div</span>&gt;</span>
-</span><span class="language-perl">% <span class="hljs-keyword">if</span> ($subs) {</span><span class="language-xml">
+</span><span class="language-perl">% <span class="hljs-keyword">if</span> (<span class="hljs-variable">$subs</span>) {</span><span class="language-xml">
 <span class="hljs-tag">&lt;<span class="hljs-name">dl</span>&gt;</span>
-</span><span class="language-perl">% <span class="hljs-keyword">for</span> <span class="hljs-keyword">my</span> $item (@$subs) {</span><span class="language-xml">
-</span><span class="language-perl">% <span class="hljs-keyword">my</span> ($dir, $align) = ($item-&gt;{rtl}) ? (<span class="hljs-string">&#x27;rtl&#x27;</span>, <span class="hljs-string">&#x27;right&#x27;</span>) : (<span class="hljs-string">&#x27;ltr&#x27;</span>, <span class="hljs-string">&#x27;left&#x27;</span>);</span><span class="language-xml">
-<span class="hljs-tag">&lt;<span class="hljs-name">dt</span> <span class="hljs-attr">align</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="language-perl"> $align </span><span class="language-xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span>&gt;</span><span class="hljs-tag">&lt;<span class="hljs-name">a</span> <span class="hljs-attr">href</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="language-perl"> $item-&gt;{<span class="hljs-string">&#x27;xmlUrl&#x27;</span>} </span><span class="language-xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span>&gt;</span><span class="hljs-tag">&lt;<span class="hljs-name">i</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;icon-rss&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">i</span>&gt;</span> rss<span class="hljs-tag">&lt;/<span class="hljs-name">a</span>&gt;</span>
-<span class="hljs-tag">&lt;<span class="hljs-name">a</span> <span class="hljs-attr">dir</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="language-perl"> $dir </span><span class="language-xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span> <span class="hljs-attr">href</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="language-perl"> $item-&gt;{htmlUrl} </span><span class="language-xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span>&gt;</span>&lt;%==</span><span class="language-perl"> $item-&gt;{title} </span><span class="language-xml">%&gt;<span class="hljs-tag">&lt;/<span class="hljs-name">a</span>&gt;</span>
+</span><span class="language-perl">% <span class="hljs-keyword">for</span> <span class="hljs-keyword">my</span> <span class="hljs-variable">$item</span> (<span class="hljs-variable">@$</span>subs) {</span><span class="language-xml">
+</span><span class="language-perl">% <span class="hljs-keyword">my</span> (<span class="hljs-variable">$dir</span>, <span class="hljs-variable">$align</span>) = (<span class="hljs-variable">$item</span>-&gt;{rtl}) ? (<span class="hljs-string">&#x27;rtl&#x27;</span>, <span class="hljs-string">&#x27;right&#x27;</span>) : (<span class="hljs-string">&#x27;ltr&#x27;</span>, <span class="hljs-string">&#x27;left&#x27;</span>);</span><span class="language-xml">
+<span class="hljs-tag">&lt;<span class="hljs-name">dt</span> <span class="hljs-attr">align</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="language-perl"> <span class="hljs-variable">$align</span> </span><span class="language-xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span>&gt;</span><span class="hljs-tag">&lt;<span class="hljs-name">a</span> <span class="hljs-attr">href</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="language-perl"> <span class="hljs-variable">$item</span>-&gt;{<span class="hljs-string">&#x27;xmlUrl&#x27;</span>} </span><span class="language-xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span>&gt;</span><span class="hljs-tag">&lt;<span class="hljs-name">i</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;icon-rss&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">i</span>&gt;</span> rss<span class="hljs-tag">&lt;/<span class="hljs-name">a</span>&gt;</span>
+<span class="hljs-tag">&lt;<span class="hljs-name">a</span> <span class="hljs-attr">dir</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="language-perl"> <span class="hljs-variable">$dir</span> </span><span class="language-xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span> <span class="hljs-attr">href</span>=<span class="hljs-string">&quot;&lt;%=</span></span></span><span class="language-perl"> <span class="hljs-variable">$item</span>-&gt;{htmlUrl} </span><span class="language-xml"><span class="hljs-tag"><span class="hljs-string">%&gt;&quot;</span>&gt;</span>&lt;%==</span><span class="language-perl"> <span class="hljs-variable">$item</span>-&gt;{title} </span><span class="language-xml">%&gt;<span class="hljs-tag">&lt;/<span class="hljs-name">a</span>&gt;</span>
 <span class="hljs-tag">&lt;/<span class="hljs-name">dt</span>&gt;</span>
 <span class="hljs-tag">&lt;<span class="hljs-name">dd</span>&gt;</span><span class="hljs-tag">&lt;<span class="hljs-name">b</span>&gt;</span>Categories<span class="hljs-tag">&lt;/<span class="hljs-name">b</span>&gt;</span>
-</span><span class="language-perl">%= <span class="hljs-keyword">join</span> <span class="hljs-string">q{, }</span>, <span class="hljs-keyword">sort</span> @{ $item-&gt;{categories} || [] };</span><span class="language-xml">
+</span><span class="language-perl">%= <span class="hljs-keyword">join</span> <span class="hljs-string">q{, }</span>, <span class="hljs-keyword">sort</span> @{ <span class="hljs-variable">$item</span>-&gt;{categories} || [] };</span><span class="language-xml">
 <span class="hljs-tag">&lt;/<span class="hljs-name">dd</span>&gt;</span>
 <span class="hljs-tag">&lt;/<span class="hljs-name">dl</span>&gt;</span>
 </span><span class="language-perl">% }</span><span class="language-xml">
 <span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span>
-</span>
\ No newline at end of file
+</span>
diff --git a/test/markup/mojolicious/default.txt b/test/markup/mojolicious/default.txt
index 2cd9426f3e..bcd3f42a64 100644
--- a/test/markup/mojolicious/default.txt
+++ b/test/markup/mojolicious/default.txt
@@ -1,4 +1,4 @@
-%layout 'bootstrap';
+% layout 'bootstrap';
 % title "Import your subs";
 %= form_for '/settings/import' => (method => 'post', enctype => 'multipart/form-data') => begin
      %= file_field 'opmlfile' => multiple => 'true'
diff --git a/test/markup/perl/class.expect.txt b/test/markup/perl/class.expect.txt
new file mode 100644
index 0000000000..f410d4b73f
--- /dev/null
+++ b/test/markup/perl/class.expect.txt
@@ -0,0 +1,10 @@
+<span class="hljs-keyword">use</span> <span class="hljs-number">v5.38</span>;
+
+<span class="hljs-class"><span class="hljs-keyword">class</span> <span class="hljs-title">Example</span>::<span class="hljs-title">Subclass</span><span class="hljs-attr"> :isa(Example::Base 2.345)</span> </span>{
+    <span class="hljs-keyword">field</span> <span class="hljs-variable">$_config<span class="hljs-attr"> :param</span><span class="hljs-attr"> :param</span><span class="hljs-attr"> :param</span></span>;
+    <span class="hljs-keyword">field</span> <span class="hljs-variable">$_name<span class="hljs-attr"> : param</span></span> = <span class="hljs-string">&#x27;Test&#x27;</span>;
+
+    <span class="hljs-function"><span class="hljs-keyword">method</span> <span class="hljs-title">test</span>() </span>{
+        <span class="hljs-variable">$_name</span> == <span class="hljs-string">&#x27;Test&#x27;</span> ? <span class="hljs-string">&#x27;y&#x27;</span> : <span class="hljs-string">&#x27;n&#x27;</span>;
+    }
+}
diff --git a/test/markup/perl/class.txt b/test/markup/perl/class.txt
new file mode 100644
index 0000000000..a63f4064f5
--- /dev/null
+++ b/test/markup/perl/class.txt
@@ -0,0 +1,10 @@
+use v5.38;
+
+class Example::Subclass :isa(Example::Base 2.345) {
+    field $_config :param :param :param;
+    field $_name : param = 'Test';
+
+    method test() {
+        $_name == 'Test' ? 'y' : 'n';
+    }
+}
diff --git a/test/markup/perl/default.expect.txt b/test/markup/perl/default.expect.txt
index c12eb5ed56..149bd1f41e 100644
--- a/test/markup/perl/default.expect.txt
+++ b/test/markup/perl/default.expect.txt
@@ -1,31 +1,35 @@
 <span class="hljs-comment"># loads object</span>
 <span class="hljs-function"><span class="hljs-keyword">sub</span> <span class="hljs-title">load</span>
 </span>{
-  <span class="hljs-keyword">my</span> $flds = $c-&gt;db_load($id,@_) || <span class="hljs-keyword">do</span> {
-    Carp::carp <span class="hljs-string">&quot;Can`t load (class: $c, id: $id): &#x27;$!&#x27;&quot;</span>; <span class="hljs-keyword">return</span> <span class="hljs-keyword">undef</span>
+  <span class="hljs-keyword">my</span> <span class="hljs-variable">$flds</span> = <span class="hljs-variable">$c</span>-&gt;db_load(<span class="hljs-variable">$id</span>,<span class="hljs-variable">@_</span>) || <span class="hljs-keyword">do</span> {
+    Carp::carp <span class="hljs-string">&quot;Can`t load (class: <span class="hljs-variable">$c</span>, id: <span class="hljs-variable">$id</span>): &#x27;<span class="hljs-variable">$!</span>&#x27;&quot;</span>; <span class="hljs-keyword">return</span> <span class="hljs-keyword">undef</span>
   };
-  <span class="hljs-keyword">my</span> $o = $c-&gt;_perl_new();
-  $id12 = $id / <span class="hljs-number">24</span> / <span class="hljs-number">3600</span>;
-  $o-&gt;{<span class="hljs-string">&#x27;ID&#x27;</span>} = $id12 + <span class="hljs-number">123</span>;
+  <span class="hljs-keyword">my</span> <span class="hljs-variable">$o</span> = <span class="hljs-variable">$c</span>-&gt;_perl_new();
+  <span class="hljs-variable">$id12</span> = <span class="hljs-variable">$id</span> / <span class="hljs-number">24</span> / <span class="hljs-number">3600</span>;
+  <span class="hljs-variable">$o</span>-&gt;{<span class="hljs-string">&#x27;ID&#x27;</span>} = <span class="hljs-variable">$id12</span> + <span class="hljs-number">123</span>;
   <span class="hljs-comment">#$o-&gt;{&#x27;SHCUT&#x27;} = $flds-&gt;{&#x27;SHCUT&#x27;};</span>
-  <span class="hljs-keyword">my</span> $p = $o-&gt;props;
-  <span class="hljs-keyword">my</span> $vt;
-  $string =~ <span class="hljs-regexp">m/^sought_text$/</span>;
-  $items = <span class="hljs-keyword">split</span> <span class="hljs-regexp">//</span>, <span class="hljs-string">&#x27;abc&#x27;</span>;
-  $string //= <span class="hljs-string">&quot;bar&quot;</span>;
-  <span class="hljs-keyword">for</span> <span class="hljs-keyword">my</span> $key (<span class="hljs-keyword">keys</span> %$p)
+  <span class="hljs-keyword">my</span> <span class="hljs-variable">$p</span> = <span class="hljs-variable">$o</span>-&gt;props;
+  <span class="hljs-keyword">my</span> <span class="hljs-variable">$vt</span>;
+  <span class="hljs-variable">$string</span> =~ <span class="hljs-regexp">m/^sought_text$/</span>;
+  <span class="hljs-variable">$items</span> = <span class="hljs-keyword">split</span> <span class="hljs-regexp">//</span>, <span class="hljs-string">&#x27;abc&#x27;</span>;
+  <span class="hljs-variable">$string</span> //= <span class="hljs-string">&quot;bar&quot;</span>;
+  <span class="hljs-keyword">for</span> <span class="hljs-keyword">my</span> <span class="hljs-variable">$key</span> (<span class="hljs-keyword">keys</span> <span class="hljs-variable">%$</span>p)
   {
-    <span class="hljs-keyword">if</span>(${$vt.<span class="hljs-string">&#x27;::property&#x27;</span>}) {
-      $o-&gt;{$key . <span class="hljs-string">&#x27;_real&#x27;</span>} = $flds-&gt;{$key};
-      <span class="hljs-keyword">tie</span> $o-&gt;{$key}, <span class="hljs-string">&#x27;CMSBuilder::Property&#x27;</span>, $o, $key;
+    <span class="hljs-keyword">if</span>(${<span class="hljs-variable">$vt</span>.<span class="hljs-string">&#x27;::property&#x27;</span>}) {
+      <span class="hljs-variable">$o</span>-&gt;{<span class="hljs-variable">$key</span> . <span class="hljs-string">&#x27;_real&#x27;</span>} = <span class="hljs-variable">$flds</span>-&gt;{<span class="hljs-variable">$key</span>};
+      <span class="hljs-keyword">tie</span> <span class="hljs-variable">$o</span>-&gt;{<span class="hljs-variable">$key</span>}, <span class="hljs-string">&#x27;CMSBuilder::Property&#x27;</span>, <span class="hljs-variable">$o</span>, <span class="hljs-variable">$key</span>;
     }
   }
-  $o-&gt;save <span class="hljs-keyword">if</span> <span class="hljs-keyword">delete</span> $o-&gt;{<span class="hljs-string">&#x27;_save_after_load&#x27;</span>};
+  <span class="hljs-variable">$o</span>-&gt;save <span class="hljs-keyword">if</span> <span class="hljs-keyword">delete</span> <span class="hljs-variable">$o</span>-&gt;{<span class="hljs-string">&#x27;_save_after_load&#x27;</span>};
 
   <span class="hljs-comment"># GH-117</span>
-  <span class="hljs-keyword">my</span> $g = <span class="hljs-keyword">glob</span>(<span class="hljs-string">&quot;/usr/bin/*&quot;</span>);
+  <span class="hljs-keyword">my</span> <span class="hljs-variable">$g</span> = <span class="hljs-keyword">glob</span>(<span class="hljs-string">&quot;/usr/bin/*&quot;</span>);
 
-  <span class="hljs-keyword">return</span> $o;
+  <span class="hljs-comment"># GH-3934</span>
+  <span class="hljs-keyword">print</span> <span class="hljs-string">&quot;@&quot;</span>;
+  <span class="hljs-keyword">print</span>;
+
+  <span class="hljs-keyword">return</span> <span class="hljs-variable">$o</span>;
 }
 
 <span class="language-mojolicious"><span class="hljs-meta">__DATA__</span><span class="language-xml">
@@ -39,4 +43,4 @@
 
 <span class="hljs-comment">=head1 NAME
 POD till the end of file
-</span>
\ No newline at end of file
+</span>
diff --git a/test/markup/perl/default.txt b/test/markup/perl/default.txt
index 3b08442d07..b98a443f76 100644
--- a/test/markup/perl/default.txt
+++ b/test/markup/perl/default.txt
@@ -25,6 +25,10 @@ sub load
   # GH-117
   my $g = glob("/usr/bin/*");
 
+  # GH-3934
+  print "@";
+  print;
+
   return $o;
 }
 
diff --git a/test/markup/perl/number.expect.txt b/test/markup/perl/number.expect.txt
new file mode 100644
index 0000000000..eacb05cf6e
--- /dev/null
+++ b/test/markup/perl/number.expect.txt
@@ -0,0 +1,21 @@
+<span class="hljs-keyword">use</span> <span class="hljs-number">v5.38</span>;
+<span class="hljs-keyword">use</span> <span class="hljs-number">5.0020</span>;
+
+<span class="hljs-keyword">my</span> <span class="hljs-variable">$number</span> = <span class="hljs-number">9</span>;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">0</span>;
+<span class="hljs-variable">$number</span> = 0_;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">00</span>;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">0.99</span>;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">99</span>;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">99.9</span>;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">99.99</span>;
+<span class="hljs-variable">$number</span> = ._99;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">0x99FF</span>;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">0x99_EE_FF</span>;
+<span class="hljs-variable">$number</span> = 0x_99_FF;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">0b00101011</span>;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">0b0010_1011</span>;
+<span class="hljs-variable">$number</span> = 0b_0010_1011;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">0777</span>;
+<span class="hljs-variable">$number</span> = <span class="hljs-number">07_7_7</span>;
+<span class="hljs-variable">$number</span> = 0_777;
diff --git a/test/markup/perl/number.txt b/test/markup/perl/number.txt
new file mode 100644
index 0000000000..5ce8913ba0
--- /dev/null
+++ b/test/markup/perl/number.txt
@@ -0,0 +1,21 @@
+use v5.38;
+use 5.0020;
+
+my $number = 9;
+$number = 0;
+$number = 0_;
+$number = 00;
+$number = 0.99;
+$number = 99;
+$number = 99.9;
+$number = 99.99;
+$number = ._99;
+$number = 0x99FF;
+$number = 0x99_EE_FF;
+$number = 0x_99_FF;
+$number = 0b00101011;
+$number = 0b0010_1011;
+$number = 0b_0010_1011;
+$number = 0777;
+$number = 07_7_7;
+$number = 0_777;
diff --git a/test/markup/python/f-strings.expect.txt b/test/markup/python/f-strings.expect.txt
index df3c72f38c..97266e6908 100644
--- a/test/markup/python/f-strings.expect.txt
+++ b/test/markup/python/f-strings.expect.txt
@@ -11,3 +11,26 @@
 <span class="hljs-string">f&quot;{{ }}&quot;</span>
 <span class="hljs-keyword">if</span><span class="hljs-string">&quot;text&quot;</span>==<span class="hljs-string">&quot;text&quot;</span>:
     <span class="hljs-string">&quot;good&quot;</span>
+<span class="hljs-string">rf&quot;https://www.<span class="hljs-subst">{domain}</span>.com&quot;</span>
+<span class="hljs-meta">&gt;&gt;&gt; </span><span class="hljs-string">fr&quot;&quot;&quot;
+<span class="hljs-meta">... </span>https://www.example.com/{{age}/360}
+...
+&quot;&quot;&quot;</span>
+<span class="hljs-string">br&quot;https://&quot;</span>
+<span class="hljs-keyword">or</span> <span class="hljs-string">br&quot;https://&quot;</span>
+<span class="hljs-string">rb&quot;https://&quot;</span>
+<span class="hljs-keyword">or</span> <span class="hljs-string">rb&quot;https://&quot;</span>
+test()<span class="hljs-keyword">or</span><span class="hljs-string">&quot;&quot;</span>
+
+<span class="hljs-string">&quot;my ...
+... name&quot;</span>
+<span class="hljs-meta">&gt;&gt;&gt; </span><span class="hljs-string">&quot;my ...
+... name&quot;</span>
+
+<span class="hljs-built_in">print</span>(<span class="hljs-string">&quot;kkds&quot;</span>+<span class="hljs-string">&quot;kdjsa&quot;</span>)
+<span class="hljs-built_in">print</span>(<span class="hljs-string">&quot;kkds&quot;</span>+<span class="hljs-string">b&quot;kdjsa&quot;</span>)
+<span class="hljs-built_in">print</span>(test()<span class="hljs-keyword">or</span><span class="hljs-string">&quot;kdjs&quot;</span>)
+<span class="hljs-built_in">print</span>(test()<span class="hljs-keyword">or</span> <span class="hljs-string">&quot;kdjs&quot;</span>)
+<span class="hljs-built_in">print</span>(test()<span class="hljs-keyword">or</span> <span class="hljs-string">f&quot;kdjs&quot;</span>)
+test()<span class="hljs-keyword">or</span><span class="hljs-string">&quot;me&quot;</span>
+<span class="hljs-built_in">print</span>(test()<span class="hljs-keyword">or</span><span class="hljs-string">&quot;me&quot;</span>)
diff --git a/test/markup/python/f-strings.txt b/test/markup/python/f-strings.txt
index 1c8422f620..3a13818a01 100644
--- a/test/markup/python/f-strings.txt
+++ b/test/markup/python/f-strings.txt
@@ -11,3 +11,26 @@ f"{name + f'{name}'}"
 f"{{ }}"
 if"text"=="text":
     "good"
+rf"https://www.{domain}.com"
+>>> fr"""
+... https://www.example.com/{{age}/360}
+...
+"""
+br"https://"
+or br"https://"
+rb"https://"
+or rb"https://"
+test()or""
+
+"my ...
+... name"
+>>> "my ...
+... name"
+
+print("kkds"+"kdjsa")
+print("kkds"+b"kdjsa")
+print(test()or"kdjs")
+print(test()or "kdjs")
+print(test()or f"kdjs")
+test()or"me"
+print(test()or"me")
diff --git a/test/markup/rust/invoked-keywords.expect.txt b/test/markup/rust/invoked-keywords.expect.txt
new file mode 100644
index 0000000000..aeaf02206a
--- /dev/null
+++ b/test/markup/rust/invoked-keywords.expect.txt
@@ -0,0 +1,9 @@
+<span class="hljs-keyword">if</span> (<span class="hljs-literal">true</span>) {}
+<span class="hljs-keyword">if</span> <span class="hljs-literal">true</span> {}
+<span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> (<span class="hljs-literal">true</span>) {}
+<span class="hljs-keyword">while</span> (<span class="hljs-literal">true</span>) {}
+<span class="hljs-keyword">while</span> <span class="hljs-literal">true</span> {}
+<span class="hljs-keyword">for</span> (a, b) <span class="hljs-title function_ invoke__">in</span> (<span class="hljs-number">0</span>..<span class="hljs-number">10</span>).<span class="hljs-title function_ invoke__">enumerate</span>() {}
+<span class="hljs-keyword">for</span> <span class="hljs-variable">a</span> <span class="hljs-keyword">in</span> <span class="hljs-number">0</span>..<span class="hljs-number">10</span> {}
+<span class="hljs-keyword">match</span> <span class="hljs-type">str</span> {}
+<span class="hljs-keyword">match</span> (<span class="hljs-type">str</span>) {}
diff --git a/test/markup/rust/invoked-keywords.txt b/test/markup/rust/invoked-keywords.txt
new file mode 100644
index 0000000000..504d9f8636
--- /dev/null
+++ b/test/markup/rust/invoked-keywords.txt
@@ -0,0 +1,9 @@
+if (true) {}
+if true {}
+else if (true) {}
+while (true) {}
+while true {}
+for (a, b) in (0..10).enumerate() {}
+for a in 0..10 {}
+match str {}
+match (str) {}
diff --git a/test/markup/rust/strings.expect.txt b/test/markup/rust/strings.expect.txt
index 4d0e7b03ca..030300a5c0 100644
--- a/test/markup/rust/strings.expect.txt
+++ b/test/markup/rust/strings.expect.txt
@@ -16,3 +16,5 @@
 <span class="hljs-string">br&quot; &quot;</span>;
 <span class="hljs-string">br#&quot;hello&quot;#</span>;
 <span class="hljs-string">br##&quot;foo&quot;##</span>;
+
+<span class="hljs-meta">#[error(<span class="hljs-string">&quot;\&quot; appears in a string&quot;</span>)]</span>
diff --git a/test/markup/rust/strings.txt b/test/markup/rust/strings.txt
index fef1927296..fc8194a697 100644
--- a/test/markup/rust/strings.txt
+++ b/test/markup/rust/strings.txt
@@ -16,3 +16,5 @@ r##" "###
 br" ";
 br#"hello"#;
 br##"foo"##;
+
+#[error("\" appears in a string")]
diff --git a/test/markup/rust/variables.expect.txt b/test/markup/rust/variables.expect.txt
index f0c1baf862..ed15fd04a9 100644
--- a/test/markup/rust/variables.expect.txt
+++ b/test/markup/rust/variables.expect.txt
@@ -1,3 +1,4 @@
 <span class="hljs-keyword">let</span> <span class="hljs-variable">foo</span>;
 <span class="hljs-keyword">let</span> <span class="hljs-keyword">mut </span><span class="hljs-variable">bar</span>;
 <span class="hljs-keyword">let</span> <span class="hljs-variable">_foo_bar</span>;
+<span class="hljs-keyword">let</span> <span class="hljs-variable">r#foo</span>;
\ No newline at end of file
diff --git a/test/markup/rust/variables.txt b/test/markup/rust/variables.txt
index 26420c1813..9b38b33923 100644
--- a/test/markup/rust/variables.txt
+++ b/test/markup/rust/variables.txt
@@ -1,3 +1,4 @@
 let foo;
 let mut bar;
 let _foo_bar;
+let r#foo;
\ No newline at end of file
diff --git a/test/markup/swift/attributes.expect.txt b/test/markup/swift/attributes.expect.txt
index 5e7b3d8372..d4316f19b2 100644
--- a/test/markup/swift/attributes.expect.txt
+++ b/test/markup/swift/attributes.expect.txt
@@ -5,8 +5,23 @@
 <span class="hljs-keyword">@propertyWrapper</span>
 <span class="hljs-meta">@SomeWrapper</span>(value: <span class="hljs-number">1.0</span>, other: <span class="hljs-string">&quot;string&quot;</span>, bool: <span class="hljs-literal">false</span>)
 <span class="hljs-keyword">@resultBuilder</span>
-<span class="hljs-keyword">@Sendable</span>
 <span class="hljs-keyword">@unchecked</span>
 <span class="hljs-keyword">@warn_unqualified_access</span>
 
+<span class="hljs-keyword">@objc</span>
+<span class="hljs-keyword">@objcMembers</span>
+<span class="hljs-meta">@CustomAttribute</span>
+<span class="hljs-keyword">@Sendable</span>
+<span class="hljs-meta">@SendableCustom</span>
+
 @ notAnAttribute
+
+<span class="hljs-comment">// keywords delimited by whitespace</span>
+<span class="hljs-keyword">@objc</span> <span class="hljs-keyword">@objcMembers</span> <span class="hljs-meta">@Custom</span> <span class="hljs-meta">@Custom</span>(param: <span class="hljs-string">&quot;test&quot;</span>)
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">Something</span> {}
+
+<span class="hljs-keyword">@objc</span>
+<span class="hljs-keyword">@objcMembers</span>
+<span class="hljs-meta">@Custom</span>
+<span class="hljs-meta">@Custom</span>(param: <span class="hljs-string">&quot;test&quot;</span>)
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">Something</span> {}
diff --git a/test/markup/swift/attributes.txt b/test/markup/swift/attributes.txt
index f881632f62..eda3b781d4 100644
--- a/test/markup/swift/attributes.txt
+++ b/test/markup/swift/attributes.txt
@@ -5,8 +5,23 @@
 @propertyWrapper
 @SomeWrapper(value: 1.0, other: "string", bool: false)
 @resultBuilder
-@Sendable
 @unchecked
 @warn_unqualified_access
 
+@objc
+@objcMembers
+@CustomAttribute
+@Sendable
+@SendableCustom
+
 @ notAnAttribute
+
+// keywords delimited by whitespace
+@objc @objcMembers @Custom @Custom(param: "test")
+class Something {}
+
+@objc
+@objcMembers
+@Custom
+@Custom(param: "test")
+class Something {}
diff --git a/test/markup/swift/functions.expect.txt b/test/markup/swift/functions.expect.txt
index c533960ebd..2398aaef43 100644
--- a/test/markup/swift/functions.expect.txt
+++ b/test/markup/swift/functions.expect.txt
@@ -23,7 +23,7 @@
 
 <span class="hljs-keyword">subscript</span>&lt;<span class="hljs-type">X</span>: <span class="hljs-type">A</span>&gt;(<span class="hljs-keyword">_</span> <span class="hljs-params">p</span>: <span class="hljs-meta">@attribute</span> <span class="hljs-keyword">inout</span> (x: <span class="hljs-type">Int</span>, var: <span class="hljs-type">Int</span>) <span class="hljs-operator">=</span> (<span class="hljs-number">0</span>, <span class="hljs-number">0</span>))  { }
 
-<span class="hljs-keyword">protocol</span> <span class="hljs-title class_">Comparable</span>: <span class="hljs-title class_">Equatable</span> {
+<span class="hljs-keyword">protocol</span> <span class="hljs-title class_">Comparable</span>: <span class="hljs-title class_ inherited__">Equatable</span> {
 
   <span class="hljs-keyword">static</span> <span class="hljs-keyword">func</span> <span class="hljs-title function_">&lt;</span> (<span class="hljs-params">lhs</span>: <span class="hljs-keyword">Self</span>, <span class="hljs-params">rhs</span>: <span class="hljs-keyword">Self</span>) -&gt; <span class="hljs-type">Bool</span>
   <span class="hljs-keyword">static</span> <span class="hljs-keyword">func</span> <span class="hljs-title function_">&lt;=</span> (<span class="hljs-params">lhs</span>: <span class="hljs-keyword">Self</span>, <span class="hljs-params">rhs</span>: <span class="hljs-keyword">Self</span>) -&gt; <span class="hljs-type">Bool</span>
diff --git a/test/markup/swift/keywords.expect.txt b/test/markup/swift/keywords.expect.txt
index dd1a4b7dbe..d9f90858e0 100644
--- a/test/markup/swift/keywords.expect.txt
+++ b/test/markup/swift/keywords.expect.txt
@@ -17,6 +17,7 @@ x <span class="hljs-keyword">is</span> <span class="hljs-type">String</span>
 <span class="hljs-keyword">unowned(safe)</span> <span class="hljs-keyword">unowned(unsafe)</span>
 <span class="hljs-keyword">async</span> <span class="hljs-keyword">await</span>
 <span class="hljs-keyword">isolated</span> <span class="hljs-keyword">nonisolated</span>
+<span class="hljs-keyword">public</span> <span class="hljs-keyword">private</span> <span class="hljs-keyword">fileprivate</span> <span class="hljs-keyword">package</span> <span class="hljs-keyword">internal</span> <span class="hljs-keyword">open</span>
 
 <span class="hljs-keyword">#if</span>
 <span class="hljs-keyword">#error</span>(<span class="hljs-string">&quot;Error&quot;</span>)
diff --git a/test/markup/swift/keywords.txt b/test/markup/swift/keywords.txt
index 73cb693e48..09b7da607f 100644
--- a/test/markup/swift/keywords.txt
+++ b/test/markup/swift/keywords.txt
@@ -17,6 +17,7 @@ fileprivate(set) internal(set) open(set) private(set) public(set)
 unowned(safe) unowned(unsafe)
 async await
 isolated nonisolated
+public private fileprivate package internal open
 
 #if
 #error("Error")
diff --git a/test/markup/swift/macro.expect.txt b/test/markup/swift/macro.expect.txt
index bd0bdf9dc8..a4e780f1b1 100644
--- a/test/markup/swift/macro.expect.txt
+++ b/test/markup/swift/macro.expect.txt
@@ -6,4 +6,7 @@
 <span class="hljs-keyword">@attached</span>(member)
 <span class="hljs-keyword">macro</span> <span class="hljs-title function_">OptionSetMembers</span>()
 
+<span class="hljs-keyword">@attached</span>(peer, names: overloaded)
+<span class="hljs-keyword">macro</span> <span class="hljs-title function_">OptionSetMembers</span>()
+
 #myMacro()
diff --git a/test/markup/swift/macro.txt b/test/markup/swift/macro.txt
index 23849d53da..dfd7833208 100644
--- a/test/markup/swift/macro.txt
+++ b/test/markup/swift/macro.txt
@@ -6,4 +6,7 @@ macro error(_ message: String) = #externalMacro(module: "MyMacros", type: "Error
 @attached(member)
 macro OptionSetMembers()
 
+@attached(peer, names: overloaded)
+macro OptionSetMembers()
+
 #myMacro()
diff --git a/test/markup/swift/ownership.expect.txt b/test/markup/swift/ownership.expect.txt
index af5aae9d16..d04b63c1fe 100644
--- a/test/markup/swift/ownership.expect.txt
+++ b/test/markup/swift/ownership.expect.txt
@@ -5,9 +5,9 @@ doStuffUniquely(with: <span class="hljs-keyword">consume</span> x)
 <span class="hljs-keyword">_</span> <span class="hljs-operator">=</span> <span class="hljs-keyword">copy</span> x
 doStuff(with: <span class="hljs-keyword">copy</span> x)
 
-<span class="hljs-keyword">struct</span> <span class="hljs-title class_">MoveOnly</span>: ~<span class="hljs-title class_">Copyable</span> {}
+<span class="hljs-keyword">struct</span> <span class="hljs-title class_">MoveOnly</span>: ~<span class="hljs-title class_ inherited__">Copyable</span> {}
 
-<span class="hljs-keyword">struct</span> <span class="hljs-title class_">B</span>: <span class="hljs-title class_">P</span> {
+<span class="hljs-keyword">struct</span> <span class="hljs-title class_">B</span>: <span class="hljs-title class_ inherited__">P</span> {
   <span class="hljs-keyword">func</span> <span class="hljs-title function_">foo</span>(<span class="hljs-params">x</span>: <span class="hljs-keyword">borrowing</span> <span class="hljs-type">Foo</span>, <span class="hljs-params">y</span>: <span class="hljs-keyword">consuming</span> <span class="hljs-type">Foo</span>)
 }
 <span class="hljs-keyword">func</span> <span class="hljs-title function_">foo</span>(<span class="hljs-keyword">_</span>: <span class="hljs-keyword">borrowing</span> <span class="hljs-type">Foo</span>)
@@ -20,4 +20,4 @@ doStuff(with: <span class="hljs-keyword">copy</span> x)
   <span class="hljs-keyword">consuming</span> <span class="hljs-keyword">func</span> <span class="hljs-title function_">foo</span>()
   <span class="hljs-keyword">borrowing</span> <span class="hljs-keyword">func</span> <span class="hljs-title function_">foo</span>()
   <span class="hljs-keyword">mutating</span> <span class="hljs-keyword">func</span> <span class="hljs-title function_">foo</span>()
-}
\ No newline at end of file
+}
diff --git a/test/markup/swift/swiftui.expect.txt b/test/markup/swift/swiftui.expect.txt
index ba23fe24b6..ce514f88fc 100644
--- a/test/markup/swift/swiftui.expect.txt
+++ b/test/markup/swift/swiftui.expect.txt
@@ -1,5 +1,5 @@
 <span class="hljs-keyword">@main</span>
-<span class="hljs-keyword">struct</span> <span class="hljs-title class_">MyApp</span>: <span class="hljs-title class_">App</span> {
+<span class="hljs-keyword">struct</span> <span class="hljs-title class_">MyApp</span>: <span class="hljs-title class_ inherited__">App</span> {
     <span class="hljs-keyword">var</span> body: <span class="hljs-keyword">some</span> <span class="hljs-type">Scene</span> {
         <span class="hljs-type">WindowGroup</span> {
             <span class="hljs-keyword">#if</span> os(iOS)
diff --git a/test/markup/swift/type-definition.expect.txt b/test/markup/swift/type-definition.expect.txt
index 1d39754e22..08e5a79ac8 100644
--- a/test/markup/swift/type-definition.expect.txt
+++ b/test/markup/swift/type-definition.expect.txt
@@ -1,6 +1,61 @@
 <span class="hljs-keyword">class</span> <span class="hljs-title class_">TestClass</span> {}
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">TestClass</span>: <span class="hljs-title class_ inherited__">Superclass</span> {}
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">TestClass</span>: <span class="hljs-title class_ inherited__">Superclass</span>, <span class="hljs-title class_ inherited__">Conform1</span>, <span class="hljs-title class_ inherited__">Conform2</span> {}
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">TestClass</span>&lt;<span class="hljs-type">T</span>&gt; {}
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">TestClass</span>&lt;<span class="hljs-type">T</span>, <span class="hljs-type">U</span>&gt; {}
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">TestClass</span>&lt;<span class="hljs-keyword">repeat</span> <span class="hljs-keyword">each</span> <span class="hljs-type">T</span>&gt; {}
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">TestClass</span>&lt;<span class="hljs-type">T</span>&gt; <span class="hljs-keyword">where</span> <span class="hljs-type">T</span>: <span class="hljs-type">Equatable</span> {}
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">TestClass</span>&lt;<span class="hljs-type">T</span>&gt;: <span class="hljs-title class_ inherited__">Superclass</span> <span class="hljs-keyword">where</span> <span class="hljs-title class_ inherited__">T</span>: <span class="hljs-title class_ inherited__">Equatable</span> {}
+
+<span class="hljs-keyword">class</span>
+<span class="hljs-title class_">MoreThanOneLine</span>
+{}
+
+<span class="hljs-keyword">class</span>
+<span class="hljs-title class_">MoreThanOneLineInherit</span>
+:
+<span class="hljs-title class_ inherited__">Superclass</span>
+{}
+
+<span class="hljs-keyword">class</span>
+<span class="hljs-title class_">MoreThanOneLineInherit</span>
+:
+<span class="hljs-title class_ inherited__">Superclass1</span>,
+<span class="hljs-title class_ inherited__">Superclass2</span>
+{}
+
+<span class="hljs-keyword">class</span>
+<span class="hljs-title class_">MoreThanOneLineInherit</span>:
+<span class="hljs-title class_ inherited__">Superclass</span>
+{}
+
+<span class="hljs-keyword">final</span> <span class="hljs-keyword">class</span>
+<span class="hljs-title class_">MoreThanOneLineGeneric</span>&lt;<span class="hljs-type">T</span>&gt;
+<span class="hljs-keyword">where</span>
+<span class="hljs-type">T</span>: <span class="hljs-type">Param</span>
+{}
+
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">Outer</span> {
+  <span class="hljs-keyword">class</span> <span class="hljs-title class_">Inner</span>&lt;<span class="hljs-type">T</span>&gt; {}
+  <span class="hljs-keyword">class</span> <span class="hljs-title class_">InnerInherit</span>: <span class="hljs-title class_ inherited__">Superclass</span> {}
+}
+
 <span class="hljs-keyword">struct</span> <span class="hljs-title class_">TestStruct</span> {}
+<span class="hljs-keyword">struct</span> <span class="hljs-title class_">TestStruct</span>: <span class="hljs-title class_ inherited__">Conform</span> {}
+<span class="hljs-keyword">struct</span> <span class="hljs-title class_">TestStruct</span>&lt;<span class="hljs-type">T</span>, <span class="hljs-type">U</span>&gt; {}
+
 <span class="hljs-keyword">enum</span> <span class="hljs-title class_">TestEnum</span> {}
+<span class="hljs-keyword">enum</span> <span class="hljs-title class_">TestEnum</span>: <span class="hljs-title class_ inherited__">Conform</span> {}
+<span class="hljs-keyword">enum</span> <span class="hljs-title class_">TestEnum</span>&lt;<span class="hljs-type">T</span>, <span class="hljs-type">U</span>&gt; {}
+
 <span class="hljs-keyword">actor</span> <span class="hljs-title class_">TestActor</span> {}
+<span class="hljs-keyword">actor</span> <span class="hljs-title class_">TestActor</span>: <span class="hljs-title class_ inherited__">Conform</span> {}
+<span class="hljs-keyword">actor</span> <span class="hljs-title class_">TestActor</span>&lt;<span class="hljs-type">T</span>, <span class="hljs-type">U</span>&gt; {}
+
 <span class="hljs-keyword">extension</span> <span class="hljs-title class_">TestExtension</span> {}
+<span class="hljs-keyword">extension</span> <span class="hljs-title class_">TestExtension</span>: <span class="hljs-title class_ inherited__">Conform</span> {}
+<span class="hljs-keyword">extension</span> <span class="hljs-title class_">TestExtension</span>&lt;<span class="hljs-type">T</span>, <span class="hljs-type">U</span>&gt; {}
+
 <span class="hljs-keyword">protocol</span> <span class="hljs-title class_">TestProtocol</span> {}
+<span class="hljs-keyword">protocol</span> <span class="hljs-title class_">TestProtocol</span>: <span class="hljs-title class_ inherited__">Conform</span> {}
+<span class="hljs-keyword">protocol</span> <span class="hljs-title class_">TestProtocol</span>&lt;<span class="hljs-type">T</span>, <span class="hljs-type">U</span>&gt; {}
diff --git a/test/markup/swift/type-definition.txt b/test/markup/swift/type-definition.txt
index 6469569a80..ef3edb11aa 100644
--- a/test/markup/swift/type-definition.txt
+++ b/test/markup/swift/type-definition.txt
@@ -1,6 +1,61 @@
 class TestClass {}
+class TestClass: Superclass {}
+class TestClass: Superclass, Conform1, Conform2 {}
+class TestClass<T> {}
+class TestClass<T, U> {}
+class TestClass<repeat each T> {}
+class TestClass<T> where T: Equatable {}
+class TestClass<T>: Superclass where T: Equatable {}
+
+class
+MoreThanOneLine
+{}
+
+class
+MoreThanOneLineInherit
+:
+Superclass
+{}
+
+class
+MoreThanOneLineInherit
+:
+Superclass1,
+Superclass2
+{}
+
+class
+MoreThanOneLineInherit:
+Superclass
+{}
+
+final class
+MoreThanOneLineGeneric<T>
+where
+T: Param
+{}
+
+class Outer {
+  class Inner<T> {}
+  class InnerInherit: Superclass {}
+}
+
 struct TestStruct {}
+struct TestStruct: Conform {}
+struct TestStruct<T, U> {}
+
 enum TestEnum {}
+enum TestEnum: Conform {}
+enum TestEnum<T, U> {}
+
 actor TestActor {}
+actor TestActor: Conform {}
+actor TestActor<T, U> {}
+
 extension TestExtension {}
+extension TestExtension: Conform {}
+extension TestExtension<T, U> {}
+
 protocol TestProtocol {}
+protocol TestProtocol: Conform {}
+protocol TestProtocol<T, U> {}
diff --git a/test/markup/typescript/class.expect.txt b/test/markup/typescript/class.expect.txt
index 0245c33418..13dc789278 100644
--- a/test/markup/typescript/class.expect.txt
+++ b/test/markup/typescript/class.expect.txt
@@ -9,3 +9,20 @@
       <span class="hljs-subst">${speed}</span>.`</span>;
   }
 }
+
+<span class="hljs-keyword">interface</span> <span class="hljs-title class_">TrainProps</span> {
+  <span class="hljs-attr">speed</span>: <span class="hljs-built_in">number</span>;
+  <span class="hljs-attr">cost</span>: <span class="hljs-built_in">number</span>;
+}
+
+<span class="hljs-keyword">class</span> <span class="hljs-title class_">Train</span> <span class="hljs-keyword">extends</span> <span class="hljs-title class_ inherited__">Vehicle</span> {
+  <span class="hljs-title function_">constructor</span> (<span class="hljs-params"><span class="hljs-attr">trainData</span>: <span class="hljs-title class_">TrainProps</span></span>) {
+    <span class="hljs-variable language_">super</span>(trainData.<span class="hljs-property">speed</span>);
+
+    <span class="hljs-keyword">var</span> c = <span class="hljs-title class_">Symbol</span>(<span class="hljs-string">&#x27;cost&#x27;</span>);
+    <span class="hljs-variable language_">this</span>[c] = trainData.<span class="hljs-property">cost</span>;
+
+    <span class="hljs-variable language_">this</span>.<span class="hljs-property">intro</span> = <span class="hljs-string">`This is a car runs at
+      <span class="hljs-subst">${trainData.speed}</span>.`</span>;
+  }
+}
diff --git a/test/markup/typescript/class.txt b/test/markup/typescript/class.txt
index 47fa67cc35..33f4921891 100644
--- a/test/markup/typescript/class.txt
+++ b/test/markup/typescript/class.txt
@@ -9,3 +9,20 @@ class Car extends Vehicle {
       ${speed}.`;
   }
 }
+
+interface TrainProps {
+  speed: number;
+  cost: number;
+}
+
+class Train extends Vehicle {
+  constructor (trainData: TrainProps) {
+    super(trainData.speed);
+
+    var c = Symbol('cost');
+    this[c] = trainData.cost;
+
+    this.intro = `This is a car runs at
+      ${trainData.speed}.`;
+  }
+}
diff --git a/test/markup/typescript/declares.expect.txt b/test/markup/typescript/declares.expect.txt
index 0521e1360c..689ee9a5f8 100644
--- a/test/markup/typescript/declares.expect.txt
+++ b/test/markup/typescript/declares.expect.txt
@@ -1,6 +1,6 @@
 <span class="hljs-keyword">export</span> <span class="hljs-keyword">declare</span> <span class="hljs-keyword">class</span> <span class="hljs-title class_">CommandHandler</span> <span class="hljs-keyword">extends</span> <span class="hljs-title class_ inherited__">EventEmitter</span> {
 
-    <span class="hljs-title function_">constructor</span>(<span class="hljs-params">config: CommandHandlerConfig</span>);
+    <span class="hljs-title function_">constructor</span>(<span class="hljs-params"><span class="hljs-attr">config</span>: <span class="hljs-title class_">CommandHandlerConfig</span></span>);
     <span class="hljs-comment">/**
      * Install the handler onto Discord.js
      * <span class="hljs-doctag">@param</span> <span class="hljs-variable">client</span> - Client to handle
diff --git a/test/markup/typescript/functions.expect.txt b/test/markup/typescript/functions.expect.txt
index 7aee291d5e..cd13295b96 100644
--- a/test/markup/typescript/functions.expect.txt
+++ b/test/markup/typescript/functions.expect.txt
@@ -4,7 +4,12 @@
   <span class="hljs-keyword">return</span> foo;
 };
 
-<span class="hljs-keyword">function</span> <span class="hljs-title function_">println</span>(<span class="hljs-params">value: <span class="hljs-built_in">string</span></span>);
+<span class="hljs-keyword">var</span> identity2 = <span class="hljs-keyword">function</span> (<span class="hljs-params">foo</span>) { <span class="hljs-comment">// seperate the params and function keyword</span>
+  <span class="hljs-keyword">return</span> foo;
+};
+
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">println</span>(<span class="hljs-params"><span class="hljs-attr">value</span>: <span class="hljs-built_in">string</span></span>);
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">println</span> (<span class="hljs-params"><span class="hljs-attr">value</span>: <span class="hljs-built_in">string</span></span>);<span class="hljs-comment">// seperate the params and function keyword</span>
 
 <span class="hljs-keyword">function</span> <span class="hljs-title function_">getArray</span>(<span class="hljs-params"></span>): <span class="hljs-built_in">number</span>[] {
   <span class="hljs-keyword">return</span> [<span class="hljs-number">1</span>, <span class="hljs-number">2</span>];
@@ -24,3 +29,23 @@
 <span class="hljs-keyword">const</span> bad = (<span class="hljs-function">(<span class="hljs-params">a=<span class="hljs-number">2</span>, b=<span class="hljs-number">5</span></span>) =&gt;</span> [...a, b]);
 sides.<span class="hljs-title function_">every</span>(<span class="hljs-function">(<span class="hljs-params">length,width=(<span class="hljs-number">3</span>+<span class="hljs-number">2</span>+(<span class="hljs-number">4</span>/<span class="hljs-number">5</span>))</span>) =&gt;</span> length &gt; <span class="hljs-number">0</span> );
 
+<span class="hljs-comment">// test props types with interface, types, and etc.</span>
+<span class="hljs-keyword">interface</span> <span class="hljs-title class_">Rect</span> {
+  <span class="hljs-attr">x</span>: <span class="hljs-built_in">number</span>;
+  <span class="hljs-attr">y</span>: <span class="hljs-built_in">number</span>;
+  <span class="hljs-attr">w</span>: <span class="hljs-built_in">number</span>;
+  <span class="hljs-attr">h</span>: <span class="hljs-built_in">number</span>;
+}
+
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">boundingRect</span>(<span class="hljs-params"><span class="hljs-attr">rect</span>: <span class="hljs-title class_">Rect</span></span>) {}
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">boundingRect</span> (<span class="hljs-params"><span class="hljs-attr">rect</span>: <span class="hljs-title class_">Rect</span></span>) {}
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">boundingRect</span>(<span class="hljs-params"><span class="hljs-attr">rect</span>: <span class="hljs-title class_">Rect</span></span>): <span class="hljs-title class_">Rect</span> {}
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">boundingRect</span> (<span class="hljs-params"><span class="hljs-attr">rect</span>: <span class="hljs-title class_">Rect</span></span>): <span class="hljs-title class_">Rect</span> {}
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">boundingRects</span>(<span class="hljs-params"><span class="hljs-attr">rects</span>: <span class="hljs-title class_">Rect</span>[]</span>) {}
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">boundingRects</span> (<span class="hljs-params"><span class="hljs-attr">rects</span>: <span class="hljs-title class_">Rect</span>[]</span>) {}
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">boundingRects</span>(<span class="hljs-params"><span class="hljs-attr">rects</span>: <span class="hljs-title class_">Rect</span>[]</span>): <span class="hljs-title class_">Rect</span> {}
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">boundingRects</span> (<span class="hljs-params"><span class="hljs-attr">rects</span>: <span class="hljs-title class_">Rect</span>[]</span>): <span class="hljs-title class_">Rect</span> {}
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">boundingRects</span>(<span class="hljs-params"><span class="hljs-attr">rects</span>: <span class="hljs-title class_">Array</span>&lt;<span class="hljs-title class_">Rect</span>&gt;</span>): <span class="hljs-title class_">Rect</span> {}
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">boundingRects</span> (<span class="hljs-params"><span class="hljs-attr">rects</span>: <span class="hljs-title class_">Array</span>&lt;<span class="hljs-title class_">Rect</span>&gt;</span>): <span class="hljs-title class_">Rect</span> {}
+<span class="hljs-keyword">function</span> <span class="hljs-title function_">boundingRects</span> (<span class="hljs-params"><span class="hljs-attr">rects</span>: <span class="hljs-title class_">Array</span>&lt;<span class="hljs-title class_">Rect</span>&gt;</span>) {}
+
diff --git a/test/markup/typescript/functions.txt b/test/markup/typescript/functions.txt
index 22d72f54ab..272f0163ee 100644
--- a/test/markup/typescript/functions.txt
+++ b/test/markup/typescript/functions.txt
@@ -4,7 +4,12 @@ var identity = function(foo) {
   return foo;
 };
 
+var identity2 = function (foo) { // seperate the params and function keyword
+  return foo;
+};
+
 function println(value: string);
+function println (value: string);// seperate the params and function keyword
 
 function getArray(): number[] {
   return [1, 2];
@@ -24,3 +29,22 @@ const array = [1, 2, 3].reduce<number[]>((acc, next) => [...acc, next], []);
 const bad = ((a=2, b=5) => [...a, b]);
 sides.every((length,width=(3+2+(4/5))) => length > 0 );
 
+// test props types with interface, types, and etc.
+interface Rect {
+  x: number;
+  y: number;
+  w: number;
+  h: number;
+}
+
+function boundingRect(rect: Rect) {}
+function boundingRect (rect: Rect) {}
+function boundingRect(rect: Rect): Rect {}
+function boundingRect (rect: Rect): Rect {}
+function boundingRects(rects: Rect[]) {}
+function boundingRects (rects: Rect[]) {}
+function boundingRects(rects: Rect[]): Rect {}
+function boundingRects (rects: Rect[]): Rect {}
+function boundingRects(rects: Array<Rect>): Rect {}
+function boundingRects (rects: Array<Rect>): Rect {}
+function boundingRects (rects: Array<Rect>) {}
diff --git a/test/markup/typescript/jsx.expect.txt b/test/markup/typescript/jsx.expect.txt
index 8171f9f24a..e774c97f4c 100644
--- a/test/markup/typescript/jsx.expect.txt
+++ b/test/markup/typescript/jsx.expect.txt
@@ -8,7 +8,7 @@
     }
 }
 
-<span class="hljs-keyword">export</span> <span class="hljs-keyword">function</span> <span class="hljs-title function_">getModuleInstanceState</span>(<span class="hljs-params">node: Node</span>): <span class="hljs-title class_">ModuleInstanceState</span> {
+<span class="hljs-keyword">export</span> <span class="hljs-keyword">function</span> <span class="hljs-title function_">getModuleInstanceState</span>(<span class="hljs-params"><span class="hljs-attr">node</span>: <span class="hljs-title class_">Node</span></span>): <span class="hljs-title class_">ModuleInstanceState</span> {
     <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> (node.<span class="hljs-property">kind</span> === <span class="hljs-title class_">SyntaxKind</span>.<span class="hljs-property">ModuleDeclaration</span>) {
         <span class="hljs-keyword">return</span> <span class="hljs-title function_">getModuleInstanceState</span>((&lt;<span class="hljs-title class_">Array</span>&lt;<span class="hljs-title class_">Array</span>&lt;<span class="hljs-built_in">number</span>&gt;&gt;node).<span class="hljs-property">body</span>);
         <span class="hljs-keyword">return</span> <span class="hljs-title function_">getModuleInstanceState</span>((&lt;<span class="hljs-title class_">ModuleDeclaration</span>&gt;node).<span class="hljs-property">body</span>);
diff --git a/test/markup/typescript/namespace_as_identifier.expect.txt b/test/markup/typescript/namespace_as_identifier.expect.txt
new file mode 100644
index 0000000000..e5f56f9998
--- /dev/null
+++ b/test/markup/typescript/namespace_as_identifier.expect.txt
@@ -0,0 +1,4 @@
+
+            <span class="hljs-keyword">const</span> message = <span class="hljs-string">&#x27;foo&#x27;</span>;
+            <span class="hljs-keyword">const</span> namespace = <span class="hljs-string">&#x27;bar&#x27;</span>;
+            <span class="hljs-keyword">function</span> <span class="hljs-title function_">baz</span>(<span class="hljs-params"></span>) {}
\ No newline at end of file
diff --git a/test/markup/typescript/namespace_as_identifier.txt b/test/markup/typescript/namespace_as_identifier.txt
new file mode 100644
index 0000000000..ed0b42ef2d
--- /dev/null
+++ b/test/markup/typescript/namespace_as_identifier.txt
@@ -0,0 +1,3 @@
+            const message = 'foo';
+            const namespace = 'bar';
+            function baz() {}
\ No newline at end of file
diff --git a/tools/build_browser.js b/tools/build_browser.js
index f4d7c30176..3b658a144c 100644
--- a/tools/build_browser.js
+++ b/tools/build_browser.js
@@ -24,7 +24,7 @@ const getDefaultHeader = () => ({
 function buildHeader(args = getDefaultHeader()) {
   return "/*!\n"
   + `  Highlight.js v${args.version} (git: ${args.git_sha})\n`
-  + `  (c) ${config.copyrightYears} ${args.author.name} and other contributors\n`
+  + `  (c) ${config.copyrightYears} ${args.author} and other contributors\n`
   + `  License: ${args.license}\n`
   + ` */`;
 }
diff --git a/tools/build_cdn.js b/tools/build_cdn.js
index d5b21e8370..a641901200 100644
--- a/tools/build_cdn.js
+++ b/tools/build_cdn.js
@@ -163,14 +163,17 @@ async function buildDistributable(language, options) {
 }
 
 async function buildCDNLanguage(language, options) {
-  const name = `languages/${language.name}.min.js`;
-
+  const name = `languages/${language.name}${options.minify ? '.min' : ''}.js`;
   await language.compile({ terser: config.terser });
-  shas[name] = bundling.sha384(language.minified);
-  await fs.writeFile(`${process.env.BUILD_DIR}/${name}`, language.minified);
+
+  const source = options.minify ? language.minified : language.module;
+  shas[name] = bundling.sha384(source);
+  await fs.writeFile(`${process.env.BUILD_DIR}/${name}`, source);
+
   if (options.esm) {
-    shas[`es/${name}`] = bundling.sha384(language.minifiedESM);
-    await fs.writeFile(`${process.env.BUILD_DIR}/es/${name}`, language.minifiedESM);
+    const sourceESM = options.minify ? language.minifiedESM : language.esm;
+    shas[`es/${name}`] = bundling.sha384(sourceESM);
+    await fs.writeFile(`${process.env.BUILD_DIR}/es/${name}`, sourceESM);
   }
 }
 
diff --git a/tools/developer.html b/tools/developer.html
index ea5b635871..3fbbd9f5a7 100644
--- a/tools/developer.html
+++ b/tools/developer.html
@@ -70,259 +70,256 @@ <h3>Code</h3>
         <button id="show-structure">Show/hide structure</button>
         Language: <select class="languages"><option value="">(Auto)</option></select>
         Theme: <select class="theme">
-          <option>stackoverflow-light.css</option>
-          <option>tokyo-night-dark.css</option>
-          <option>tokyo-night-light.css</option>
-          <option>qtcreator-light.css</option>
-          <option>codepen-embed.css</option>
-          <option>docco.css</option>
-          <option>github.css</option>
-          <option>github-dark.css</option>
-          <option>github-dark-dimmed.css</option>
-          <option>gml.css</option>
-          <option>googlecode.css</option>
-          <option>gradient-dark.css</option>
-          <option>stackoverflow-dark.css</option>
-          <option>grayscale.css</option>
-          <option>gml.css</option>
-          <option>srcery.css</option>
-          <option>sunburst.css</option>
-          <option>pojoaque.jpg</option>
-          <option>mono-blue.css</option>
-          <option>isbl-editor-light.css</option>
+          <option>1c-light.css</option>          
           <option>a11y-dark.css</option>
-          <option>nord.css</option>
-          <option>color-brewer.css</option>
-          <option>kimbie-light.css</option>
-          <option>routeros.css</option>
-          <option>kimbie-dark.css</option>
-          <option>shades-of-purple.css</option>
-          <option>arduino-light.css</option>
-          <option>xcode.css</option>
-          <option>dark.css</option>
-          <option>ir-black.css</option>
-          <option>obsidian.css</option>
-          <option>paraiso-dark.css</option>
-          <option>pojoaque.css</option>
-          <option>vs2015.css</option>
           <option>a11y-light.css</option>
-          <option>tomorrow-night-blue.css</option>
-          <option>monokai.css</option>
-          <option>idea.css</option>
-          <option>intellij-light.css</option>
-          <option>purebasic.css</option>
-          <option>qtcreator-dark.css</option>
-          <option>androidstudio.css</option>
-          <option>github-gist.css</option>
-          <option>xt256.css</option>
           <option>agate.css</option>
-          <option>vs.css</option>
-          <option>far.css</option>
-          <option>felipec.css</option>
-          <option>default.css</option>
-          <option>base16/pico.css</option>
-          <option>base16/porple.css</option>
-          <option>base16/gruvbox-light-soft.css</option>
-          <option>base16/equilibrium-dark.css</option>
-          <option>base16/atelier-cave-light.css</option>
-          <option>base16/windows-95.css</option>
-          <option>base16/atelier-estuary.css</option>
-          <option>base16/apprentice.css</option>
-          <option>base16/default-dark.css</option>
+          <option>an-old-hope.css</option>
+          <option>androidstudio.css</option>
+          <option>arduino-light.css</option>
+          <option>arta.css</option>
+          <option>ascetic.css</option>
+          <option>atom-one-dark-reasonable.css</option>
+          <option>atom-one-dark.css</option>
+          <option>atom-one-light.css</option>
+          <option>base16/3024.css</option>
           <option>base16/apathy.css</option>
-          <option>base16/atelier-savanna.css</option>
+          <option>base16/apprentice.css</option>
+          <option>base16/ashes.css</option>
+          <option>base16/atelier-cave-light.css</option>
           <option>base16/atelier-cave.css</option>
-          <option>base16/brewer.css</option>
-          <option>base16/eighties.css</option>
           <option>base16/atelier-dune-light.css</option>
-          <option>base16/windows-high-contrast.css</option>
-          <option>base16/atelier-savanna-light.css</option>
-          <option>base16/github.css</option>
-          <option>base16/windows-nt.css</option>
-          <option>base16/windows-nt-light.css</option>
-          <option>base16/hopscotch.css</option>
-          <option>base16/equilibrium-gray-light.css</option>
+          <option>base16/atelier-dune.css</option>
+          <option>base16/atelier-estuary-light.css</option>
+          <option>base16/atelier-estuary.css</option>
+          <option>base16/atelier-forest-light.css</option>
+          <option>base16/atelier-forest.css</option>
+          <option>base16/atelier-heath-light.css</option>
           <option>base16/atelier-heath.css</option>
-          <option>base16/ia-dark.css</option>
-          <option>base16/gruvbox-dark-soft.css</option>
-          <option>base16/solar-flare.css</option>
-          <option>base16/material-vivid.css</option>
-          <option>base16/google-light.css</option>
-          <option>base16/onedark.css</option>
-          <option>base16/summerfruit-light.css</option>
-          <option>base16/eva.css</option>
-          <option>base16/marrakesh.css</option>
-          <option>base16/equilibrium-gray-dark.css</option>
-          <option>base16/espresso.css</option>
-          <option>base16/gruvbox-dark-pale.css</option>
+          <option>base16/atelier-lakeside-light.css</option>
+          <option>base16/atelier-lakeside.css</option>
+          <option>base16/atelier-plateau-light.css</option>
+          <option>base16/atelier-plateau.css</option>
+          <option>base16/atelier-savanna-light.css</option>
+          <option>base16/atelier-savanna.css</option>
+          <option>base16/atelier-seaside-light.css</option>
+          <option>base16/atelier-seaside.css</option>
+          <option>base16/atelier-sulphurpool-light.css</option>
+          <option>base16/atelier-sulphurpool.css</option>
+          <option>base16/atlas.css</option>
+          <option>base16/bespin.css</option>
+          <option>base16/black-metal-bathory.css</option>
+          <option>base16/black-metal-burzum.css</option>
+          <option>base16/black-metal-dark-funeral.css</option>
           <option>base16/black-metal-gorgoroth.css</option>
-          <option>base16/grayscale-light.css</option>
           <option>base16/black-metal-immortal.css</option>
-          <option>base16/circus.css</option>
-          <option>base16/atelier-plateau.css</option>
-          <option>base16/nord.css</option>
-          <option>base16/equilibrium-light.css</option>
-          <option>base16/brush-trees-dark.css</option>
-          <option>base16/gruvbox-dark-medium.css</option>
-          <option>base16/gruvbox-dark-hard.css</option>
-          <option>base16/material.css</option>
-          <option>base16/papercolor-light.css</option>
-          <option>base16/nebula.css</option>
-          <option>base16/london-tube.css</option>
+          <option>base16/black-metal-khold.css</option>
           <option>base16/black-metal-marduk.css</option>
+          <option>base16/black-metal-mayhem.css</option>
+          <option>base16/black-metal-nile.css</option>
+          <option>base16/black-metal-venom.css</option>
+          <option>base16/black-metal.css</option>
+          <option>base16/brewer.css</option>
+          <option>base16/bright.css</option>
+          <option>base16/brogrammer.css</option>
+          <option>base16/brush-trees-dark.css</option>
+          <option>base16/brush-trees.css</option>
+          <option>base16/chalk.css</option>
+          <option>base16/circus.css</option>
+          <option>base16/classic-dark.css</option>
+          <option>base16/classic-light.css</option>
+          <option>base16/codeschool.css</option>
+          <option>base16/cupcake.css</option>
+          <option>base16/cupertino.css</option>
+          <option>base16/danqing.css</option>
+          <option>base16/darcula.css</option>
+          <option>base16/dark-violet.css</option>
+          <option>base16/darkmoss.css</option>
+          <option>base16/darktooth.css</option>
           <option>base16/decaf.css</option>
-          <option>base16/pasque.css</option>
+          <option>base16/default-dark.css</option>
+          <option>base16/default-light.css</option>
+          <option>base16/dirtysea.css</option>
+          <option>base16/dracula.css</option>
+          <option>base16/edge-dark.css</option>
+          <option>base16/edge-light.css</option>
+          <option>base16/eighties.css</option>
+          <option>base16/embers.css</option>
+          <option>base16/equilibrium-dark.css</option>
+          <option>base16/equilibrium-gray-dark.css</option>
+          <option>base16/equilibrium-gray-light.css</option>
+          <option>base16/equilibrium-light.css</option>
+          <option>base16/espresso.css</option>
+          <option>base16/eva-dim.css</option>
+          <option>base16/eva.css</option>
+          <option>base16/flat.css</option>
+          <option>base16/framer.css</option>
+          <option>base16/fruit-soda.css</option>
+          <option>base16/gigavolt.css</option>
+          <option>base16/github.css</option>
+          <option>base16/google-dark.css</option>
+          <option>base16/google-light.css</option>
           <option>base16/grayscale-dark.css</option>
-          <option>base16/heetch-light.css</option>
-          <option>base16/atelier-heath-light.css</option>
+          <option>base16/grayscale-light.css</option>
+          <option>base16/green-screen.css</option>
+          <option>base16/gruvbox-dark-hard.css</option>
+          <option>base16/gruvbox-dark-medium.css</option>
+          <option>base16/gruvbox-dark-pale.css</option>
+          <option>base16/gruvbox-dark-soft.css</option>
           <option>base16/gruvbox-light-hard.css</option>
-          <option>base16/synth-midnight-terminal-dark.css</option>
-          <option>base16/atelier-dune.css</option>
-          <option>base16/woodland.css</option>
-          <option>base16/isotope.css</option>
-          <option>base16/atelier-forest.css</option>
+          <option>base16/gruvbox-light-medium.css</option>
+          <option>base16/gruvbox-light-soft.css</option>
           <option>base16/hardcore.css</option>
-          <option>base16/default-light.css</option>
-          <option>base16/atelier-sulphurpool.css</option>
-          <option>base16/material-darker.css</option>
-          <option>base16/windows-95-light.css</option>
-          <option>base16/classic-dark.css</option>
-          <option>base16/ir-black.css</option>
-          <option>base16/dirtysea.css</option>
-          <option>base16/seti-ui.css</option>
-          <option>base16/black-metal-venom.css</option>
-          <option>base16/darkmoss.css</option>
           <option>base16/harmonic16-dark.css</option>
-          <option>base16/darcula.css</option>
-          <option>base16/mellow-purple.css</option>
-          <option>base16/mexico-light.css</option>
-          <option>base16/flat.css</option>
-          <option>base16/summercamp.css</option>
-          <option>base16/silk-dark.css</option>
+          <option>base16/harmonic16-light.css</option>
+          <option>base16/heetch-dark.css</option>
+          <option>base16/heetch-light.css</option>
+          <option>base16/helios.css</option>
+          <option>base16/hopscotch.css</option>
+          <option>base16/horizon-dark.css</option>
+          <option>base16/horizon-light.css</option>
+          <option>base16/humanoid-dark.css</option>
+          <option>base16/humanoid-light.css</option>
+          <option>base16/ia-dark.css</option>
+          <option>base16/ia-light.css</option>
           <option>base16/icy-dark.css</option>
-          <option>base16/papercolor-dark.css</option>
-          <option>base16/brogrammer.css</option>
-          <option>base16/3024.css</option>
-          <option>base16/twilight.css</option>
-          <option>base16/atelier-lakeside.css</option>
-          <option>base16/monokai.css</option>
-          <option>base16/solarized-light.css</option>
+          <option>base16/ir-black.css</option>
+          <option>base16/isotope.css</option>
+          <option>base16/kimber.css</option>
+          <option>base16/london-tube.css</option>
+          <option>base16/macintosh.css</option>
+          <option>base16/marrakesh.css</option>
+          <option>base16/materia.css</option>
+          <option>base16/material-darker.css</option>
           <option>base16/material-lighter.css</option>
-          <option>base16/edge-dark.css</option>
-          <option>base16/xcode-dusk.css</option>
-          <option>base16/summerfruit-dark.css</option>
-          <option>base16/atelier-forest-light.css</option>
-          <option>base16/black-metal.css</option>
-          <option>base16/dracula.css</option>
-          <option>base16/solarized-dark.css</option>
-          <option>base16/cupertino.css</option>
-          <option>base16/phd.css</option>
-          <option>base16/bright.css</option>
+          <option>base16/material-palenight.css</option>
+          <option>base16/material-vivid.css</option>
+          <option>base16/material.css</option>
+          <option>base16/mellow-purple.css</option>
+          <option>base16/mexico-light.css</option>
           <option>base16/mocha.css</option>
-          <option>base16/ashes.css</option>
-          <option>base16/ros-pine.css</option>
+          <option>base16/monokai.css</option>
+          <option>base16/nebula.css</option>
+          <option>base16/nord.css</option>
           <option>base16/nova.css</option>
-          <option>base16/black-metal-dark-funeral.css</option>
-          <option>base16/zenburn.css</option>
-          <option>base16/chalk.css</option>
-          <option>base16/brush-trees.css</option>
-          <option>base16/rebecca.css</option>
-          <option>base16/humanoid-light.css</option>
-          <option>base16/qualia.css</option>
           <option>base16/ocean.css</option>
-          <option>base16/sandcastle.css</option>
-          <option>base16/silk-light.css</option>
+          <option>base16/oceanicnext.css</option>
+          <option>base16/one-light.css</option>
+          <option>base16/onedark.css</option>
           <option>base16/outrun-dark.css</option>
-          <option>base16/synth-midnight-terminal-light.css</option>
-          <option>base16/windows-10-light.css</option>
-          <option>base16/humanoid-dark.css</option>
-          <option>base16/kimber.css</option>
-          <option>base16/helios.css</option>
-          <option>base16/railscasts.css</option>
-          <option>base16/ia-light.css</option>
-          <option>base16/unikitty-dark.css</option>
-          <option>base16/cupcake.css</option>
-          <option>base16/embers.css</option>
-          <option>base16/snazzy.css</option>
-          <option>base16/edge-light.css</option>
-          <option>base16/danqing.css</option>
-          <option>base16/black-metal-khold.css</option>
-          <option>base16/horizon-dark.css</option>
-          <option>base16/tomorrow-night.css</option>
-          <option>base16/heetch-dark.css</option>
-          <option>base16/windows-high-contrast-light.css</option>
-          <option>base16/atelier-plateau-light.css</option>
-          <option>base16/darktooth.css</option>
-          <option>base16/windows-10.css</option>
-          <option>base16/vulcan.css</option>
-          <option>base16/harmonic16-light.css</option>
-          <option>base16/macintosh.css</option>
-          <option>base16/fruit-soda.css</option>
-          <option>base16/google-dark.css</option>
-          <option>base16/classic-light.css</option>
+          <option>base16/papercolor-dark.css</option>
+          <option>base16/papercolor-light.css</option>
           <option>base16/paraiso.css</option>
-          <option>base16/black-metal-nile.css</option>
-          <option>base16/one-light.css</option>
-          <option>base16/codeschool.css</option>
-          <option>base16/shapeshifter.css</option>
-          <option>base16/dark-violet.css</option>
-          <option>base16/gigavolt.css</option>
-          <option>base16/unikitty-light.css</option>
-          <option>base16/atelier-seaside-light.css</option>
-          <option>base16/tomorrow.css</option>
+          <option>base16/pasque.css</option>
+          <option>base16/phd.css</option>
+          <option>base16/pico.css</option>
+          <option>base16/pop.css</option>
+          <option>base16/porple.css</option>
+          <option>base16/qualia.css</option>
+          <option>base16/railscasts.css</option>
+          <option>base16/rebecca.css</option>
           <option>base16/ros-pine-dawn.css</option>
-          <option>base16/framer.css</option>
-          <option>base16/black-metal-mayhem.css</option>
-          <option>base16/spacemacs.css</option>
-          <option>base16/atelier-seaside.css</option>
-          <option>base16/material-palenight.css</option>
-          <option>base16/green-screen.css</option>
-          <option>base16/horizon-light.css</option>
-          <option>base16/bespin.css</option>
-          <option>base16/oceanicnext.css</option>
-          <option>base16/black-metal-burzum.css</option>
           <option>base16/ros-pine-moon.css</option>
-          <option>base16/eva-dim.css</option>
-          <option>base16/black-metal-bathory.css</option>
+          <option>base16/ros-pine.css</option>
           <option>base16/sagelight.css</option>
-          <option>base16/atelier-lakeside-light.css</option>
+          <option>base16/sandcastle.css</option>
+          <option>base16/seti-ui.css</option>
+          <option>base16/shapeshifter.css</option>
+          <option>base16/silk-dark.css</option>
+          <option>base16/silk-light.css</option>
+          <option>base16/snazzy.css</option>
+          <option>base16/solar-flare-light.css</option>
+          <option>base16/solar-flare.css</option>
+          <option>base16/solarized-dark.css</option>
+          <option>base16/solarized-light.css</option>
+          <option>base16/spacemacs.css</option>
+          <option>base16/summercamp.css</option>
+          <option>base16/summerfruit-dark.css</option>
+          <option>base16/summerfruit-light.css</option>
+          <option>base16/synth-midnight-terminal-dark.css</option>
+          <option>base16/synth-midnight-terminal-light.css</option>
           <option>base16/tango.css</option>
-          <option>base16/pop.css</option>
-          <option>base16/gruvbox-light-medium.css</option>
-          <option>base16/atlas.css</option>
           <option>base16/tender.css</option>
-          <option>base16/atelier-estuary-light.css</option>
-          <option>base16/materia.css</option>
-          <option>base16/solar-flare-light.css</option>
-          <option>base16/atelier-sulphurpool-light.css</option>
-          <option>atom-one-light.css</option>
-          <option>monokai-sublime.css</option>
-          <option>paraiso-light.css</option>
-          <option>tomorrow-night-bright.css</option>
+          <option>base16/tomorrow-night.css</option>
+          <option>base16/tomorrow.css</option>
+          <option>base16/twilight.css</option>
+          <option>base16/unikitty-dark.css</option>
+          <option>base16/unikitty-light.css</option>
+          <option>base16/vulcan.css</option>
+          <option>base16/windows-10-light.css</option>
+          <option>base16/windows-10.css</option>
+          <option>base16/windows-95-light.css</option>
+          <option>base16/windows-95.css</option>
+          <option>base16/windows-high-contrast-light.css</option>
+          <option>base16/windows-high-contrast.css</option>
+          <option>base16/windows-nt-light.css</option>
+          <option>base16/windows-nt.css</option>
+          <option>base16/woodland.css</option>
+          <option>base16/xcode-dusk.css</option>
+          <option>base16/zenburn.css</option>
+          <option>brown-paper.css</option>
+          <option>brown-papersq.png</option>
+          <option>codepen-embed.css</option>
+          <option>color-brewer.css</option>
+          <option>dark.css</option>
+          <option>default.css</option>
+          <option>devibeans.css</option>
+          <option>docco.css</option>
+          <option>far.css</option>
+          <option>felipec.css</option>
+          <option>foundation.css</option>
+          <option>github-dark-dimmed.css</option>
+          <option>github-dark.css</option>
+          <option>github-gist.css</option>
+          <option>github.css</option>
+          <option>gml.css</option>
           <option>googlecode.css</option>
-          <option>atom-one-dark.css</option>
-          <option>ascetic.css</option>
-          <option>rainbow.css</option>
+          <option>gradient-dark.css</option>
           <option>gradient-light.css</option>
-          <option>magula.css</option>
-          <option>devibeans.css</option>
-          <option>arta.css</option>
-          <option>nnfx-light.css</option>
+          <option>grayscale.css</option>
           <option>hybrid.css</option>
-          <option>school-book.css</option>
-          <option>brown-papersq.png</option>
-          <option>lightfair.css</option>
-          <option>an-old-hope.css</option>
-          <option>gradient-dark.css</option>
-          <option>nnfx-dark.css</option>
+          <option>idea.css</option>
+          <option>intellij-light.css</option>
+          <option>ir-black.css</option>
           <option>isbl-editor-dark.css</option>
-          <option>foundation.css</option>
+          <option>isbl-editor-light.css</option>
+          <option>kimbie-dark.css</option>
+          <option>kimbie-light.css</option>
+          <option>lightfair.css</option>
           <option>lioshi.css</option>
-          <option>brown-paper.css</option>
+          <option>magula.css</option>
+          <option>mono-blue.css</option>
+          <option>monokai-sublime.css</option>
+          <option>monokai.css</option>
           <option>night-owl.css</option>
-          <option>atom-one-dark-reasonable.css</option>
+          <option>nnfx-dark.css</option>
+          <option>nnfx-light.css</option>
+          <option>nord.css</option>
+          <option>obsidian.css</option>
           <option>panda-syntax-dark.css</option>
           <option>panda-syntax-light.css</option>
+          <option>paraiso-dark.css</option>
+          <option>paraiso-light.css</option>
+          <option>pojoaque.css</option>
+          <option>purebasic.css</option>
+          <option>qtcreator-dark.css</option>
+          <option>qtcreator-light.css</option>
+          <option>rainbow.css</option>
+          <option>routeros.css</option>
+          <option>school-book.css</option>
+          <option>shades-of-purple.css</option>
+          <option>srcery.css</option>
+          <option>stackoverflow-dark.css</option>
+          <option>stackoverflow-light.css</option>
+          <option>sunburst.css</option>
+          <option>tokyo-night-dark.css</option>
+          <option>tokyo-night-light.css</option>
+          <option>tomorrow-night-blue.css</option>
+          <option>tomorrow-night-bright.css</option>
+          <option>vs.css</option>
+          <option>vs2015.css</option>
+          <option>xcode.css</option>
+          <option>xt256.css</option>
         </select>
       </p>
     </div>
diff --git a/tools/lib/language.js b/tools/lib/language.js
index 92e105546c..c8c8c2852f 100644
--- a/tools/lib/language.js
+++ b/tools/lib/language.js
@@ -96,6 +96,7 @@ async function compileLanguage(language, options) {
   const esm = `${HEADER}\n${data};\nexport default hljsGrammar;`;
 
   language.module = iife;
+  language.esm = esm;
   const miniESM = await Terser.minify(esm, options.terser);
   const miniIIFE = await Terser.minify(iife, options.terser);
   language.minified = miniIIFE.code;
diff --git a/tools/lib/makestuff.js b/tools/lib/makestuff.js
index 3d9b74b0d1..d8473fd5ed 100644
--- a/tools/lib/makestuff.js
+++ b/tools/lib/makestuff.js
@@ -2,11 +2,11 @@ const fs = require("fs");
 const CleanCSS = require('clean-css');
 const path = require('path');
 const _ = require('lodash');
-const del = require('del');
 const config = require("../build_config.js");
 
 async function clean(directory) {
-  del.sync([directory]);
+  const del = await import('del');
+  del.deleteSync([directory]);
   fs.mkdirSync(directory, { recursive: true });
 }
 
diff --git a/types/index.d.ts b/types/index.d.ts
index 1941e61091..8b5ffcbe68 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -29,7 +29,9 @@ declare module 'highlight.js' {
     }
 
     interface PublicApi {
-        highlight: (codeOrLanguageName: string, optionsOrCode: string | HighlightOptions, ignoreIllegals?: boolean) => HighlightResult
+        highlight(code: string, options: HighlightOptions): HighlightResult
+        /** @deprecated use `higlight(code, {lang: ..., ignoreIllegals: ...})` */
+        highlight(languageName: string, code: string, ignoreIllegals?: boolean): HighlightResult
         highlightAuto: (code: string, languageSubset?: string[]) => AutoHighlightResult
         highlightBlock: (element: HTMLElement) => void
         highlightElement: (element: HTMLElement) => void
@@ -169,7 +171,7 @@ declare module 'highlight.js' {
         disableAutodetect?: boolean
         contains: (Mode)[]
         case_insensitive?: boolean
-        keywords?: string | string[] | Record<string, string | string[]>
+        keywords?: string | string[] | Record<string, string | string[] | RegExp>
         isCompiled?: boolean,
         exports?: any,
         classNameAliases?: Record<string, string>