v2.21.0

Bump cross-spawn from 7.0.3 to 7.0.6

README.md

@@ -5,22 +5,24 @@
 [![types](https://img.shields.io/npm/types/osrs-json-hiscores.svg?style=flat-square)](https://github.com/maxswa/osrs-json-hiscores/blob/master/src/types.ts)
 [![build](https://img.shields.io/github/actions/workflow/status/maxswa/osrs-json-hiscores/main.yml?style=flat-square&branch=main)](https://github.com/maxswa/osrs-json-hiscores/actions/workflows/main.yml?query=branch%3Amain)
 
-**The Old School Runescape API wrapper that does more!**
+**The Old School RuneScape API wrapper that does more!**
 
 ## What it does
 
-The official hiscores API for Old School Runescape (OSRS) returns CSV.
+The official hiscores API for Old School RuneScape (OSRS) can return CSV or a simple JSON array.
-This wrapper converts it to json and provides extra information about the given player. By comparing player info it infers the player's game mode, as well as any previous modes (de-ultimated, de-ironed and/or died as a hardcore ironman).
+This wrapper converts the hiscores data into a more usable JSON object and provides extra information about the given player. By comparing player info it infers the player's game mode, as well as any previous modes (de-ultimated, de-ironed and/or died as a hardcore ironman).
 
-Additional functions are provided that screen-scrape the OSRS leaderboards and return a list of players as json.
+Additional functions are provided that screen-scrape the OSRS leaderboards and return a list of players as json. Also simple utility functions are provided to fetch the raw responses from Jagex's APIs, if desired.
 
 `osrs-json-hiscores` has TypeScript support, with full definitions for all functions and custom data types.
 
 ---
 
-### Disclaimer
+### ⚠ Disclaimer ⚠
 
-Jagex does not provide `Access-Control-Allow-Origin` headers in their responses. This means that [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) will block all browser requests to their hiscores API. In order to get around this, osrs-json-hiscores should be installed on the server side and exposed to the front end via a simple API. Here is an example of this in use: [codesandbox.io/s/osrs-json-hiscores-demo](https://codesandbox.io/s/osrs-json-hiscores-demo-qz656)
+Jagex does not provide `Access-Control-Allow-Origin` headers in their responses. This means that [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) will block all browser requests to their hiscores API. In order to get around this, osrs-json-hiscores needs to be installed on the server side and exposed to the front end via a simple API. Here is an example of this in use: [codesandbox.io/s/osrs-json-hiscores-demo](https://codesandbox.io/s/osrs-json-hiscores-demo-qz656)
+
+TLDR: You cannot use this library directly in your client side app e.g. React or Vue, you must set up a server which uses this lib internally and have your client fetch data from your server.
 
 ---
 
@@ -42,27 +44,14 @@ $ yarn add osrs-json-hiscores
 
 Install the package and then import it into your project:
 
-```javascript
+```typescript
-const hiscores = require('osrs-json-hiscores');
+import { getStatsByGamemode, getSkillPage } from 'osrs-json-hiscores';
 ```
 
 Once you import it you can call the functions asynchronously:
 
-```javascript
+```typescript
-hiscores
+const stats = await getStatsByGamemode('Lynx Titan');
-  .getStats('Lynx Titan')
-  .then((res) => console.log(res))
-  .catch((err) => console.error(err));
-```
-
-If you are using TypeScript or transpiling your JS you can use ES6 syntax:
-
-```javascript
-import hiscores, { getSkillPage } from 'osrs-json-hiscores';
-
-// ...
-
-const stats = await hiscores.getStats('Lynx Titan');
 const topPage = await getSkillPage('overall');
 ```
 
@@ -81,9 +70,8 @@ const topPage = await getSkillPage('overall');
 
 `getSkillPage` and `getActivityPage` require a skill / activity and optionally a gamemode and page:
 
-```javascript
+```typescript
-hiscores
+getSkillPage('attack', 'main', 1)
-  .getSkillPage('attack', 'main', 1)
   .then((res) => console.log(res))
   .catch((err) => console.error(err));
 ```
@@ -105,7 +93,7 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 ### Minigames
 
 | Minigame                        |        Param        |
-| ------------------------------- | :---------------: |
+| ------------------------------- | :-----------------: |
 | Bounty Hunter (Legacy - Rogue)  |      `rogueBH`      |
 | Bounty Hunter (Legacy - Hunter) |     `hunterBH`      |
 | Bounty Hunter (Rogue)           |     `rogueBHV2`     |
@@ -114,6 +102,8 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 | PvP Arena - Rank                |     `pvpArena`      |
 | Soul Wars Zeal                  |   `soulWarsZeal`    |
 | Rifts closed                    |    `riftsClosed`    |
+| Colosseum Glory                 |  `colosseumGlory`   |
+| Collections Logged              | `collectionsLogged` |
 
 ### Points
 
@@ -128,6 +118,8 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 | --------------------------------- | :----------------------------: |
 | Abyssal Sire                      |         `abyssalSire`          |
 | Alchemical Hydra                  |       `alchemicalHydra`        |
+| Amoxliatl                         |          `amoxliatl`           |
+| Araxxor                           |           `araxxor`            |
 | Artio                             |            `artio`             |
 | Barrows Chests                    |           `barrows`            |
 | Bryophyta                         |          `bryophyta`           |
@@ -155,6 +147,7 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 | Kraken                            |            `kraken`            |
 | Kreearra                          |           `kreeArra`           |
 | K'ril Tsutsaroth                  |        `krilTsutsaroth`        |
+| Lunar Chests                      |         `lunarChests`          |
 | Mimic                             |            `mimic`             |
 | Nex                               |             `nex`              |
 | Nightmare                         |          `nightmare`           |
@@ -163,12 +156,16 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 | Phantom Muspah                    |        `phantomMuspah`         |
 | Sarachnis                         |          `sarachnis`           |
 | Scorpia                           |           `scorpia`            |
+| Scurrius                          |           `scurrius`           |
 | Skotizo                           |           `skotizo`            |
+| Sol Heredit                       |          `solHeredit`          |
 | Spindel                           |           `spindel`            |
 | Tempoross                         |          `tempoross`           |
 | The Gauntlet                      |           `gauntlet`           |
 | The Corrupted Gauntlet            |      `corruptedGauntlet`       |
+| The Hueycoatl                     |          `hueycoatl`           |
 | The Leviathan                     |          `leviathan`           |
+| The Royal Titans                  |         `royalTitans`          |
 | The Whisperer                     |          `whisperer`           |
 | Theatre Of Blood                  |        `theatreOfBlood`        |
 | Theatre Of Blood: Hard Mode       |    `theatreOfBloodHardMode`    |
@@ -189,7 +186,7 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 
 `getStats` returns a player object that looks like this:
 
-```javascript
+```typescript
 {
   name: 'Lynx Titan',
   mode: 'main',
@@ -210,6 +207,8 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
     pvpArena: {},
     soulWarsZeal: {},
     riftsClosed: {},
+    colosseumGlory: {},
+    collectionsLogged: {},
     bosses: {}
   }
 }
@@ -217,7 +216,7 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 
 `getSkillPage` returns and array of 25 players (This represents a page on the hiscores):
 
-```javascript
+```typescript
 [
   { rank: 1, name: 'Lynx Titan', level: 2277, xp: 4600000000, dead: false },
   {},
@@ -230,7 +229,7 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 
 Get the properly formatted name of any skill, boss, clue or other activity:
 
-```javascript
+```typescript
 // kril === "K'ril Tsutsaroth"
 const kril = FORMATTED_BOSS_NAMES['krilTsutsaroth'];
 ```

__tests__/b0atyStats.csv

@@ -1,99 +1,108 @@
-3745,2277,840426611
+2210,2277,1150073045
-24080,99,30276246
+23988,99,33320012
-9559,99,31228199
+3114,99,51215128
-2212,99,143599407
+1203,99,200000000
-3550,99,123248914
+1372,99,196290925
-6564,99,109953707
+3458,99,159426771
-4244,99,15144846
+2746,99,17744970
-4107,99,57072224
+2031,99,91566360
-135556,99,13353511
+161852,99,13386665
-25855,99,16903268
+25801,99,19461878
-53472,99,13456850
+64826,99,13473417
-22453,99,16654917
+26528,99,16672481
-17690,99,19118307
+20829,99,19483653
-45816,99,14059776
+58378,99,14103220
-10409,99,16530015
+13188,99,16573909
-27702,99,14765145
+36283,99,15061037
-39430,99,13235063
+17137,99,14670565
-6722,99,15754877
+8751,99,16169665
-51813,99,14023027
+60803,99,14390315
-5324,99,33835543
+1718,99,57850681
-3154,99,69527777
+2117,99,110369178
-4719,99,22733384
+5540,99,22739567
-15135,99,17952893
+22326,99,18052465
-1089,99,17998715
+1467,99,18050183
 -1,-1
 -1,-1
-26164,10
+38135,10
-12886,3
+19368,3
-148658,8
+146220,8
-103161,7
+100923,7
-377,9556
+433,9802
-862,825
+1542,825
-148,6000
+158,6000
-2153,1606
+2572,1606
-42107,298
+47979,311
-504,459
+1081,460
-1816,368
+880,600
-14701,2521
+4258,6785
 -1,-1
-6776,14780
+7596,14780
-4773,1060
+8124,1060
-2741,2192
+10438,43487
-90203,594
+1114,1155
-29573,143
+3497,2192
-3668,1830
+3204,4796
-206778,5
+1087,984
-32897,293
+2230,2328
-64112,58
+51533,143
-18492,1905
+4243,1830
-178941,34
+256985,5
-2379,501
+54424,293
-82902,50
+114691,58
-147358,26
+11700,2657
-51973,287
+211708,34
-2377,2000
+1779,736
-147406,41
+24958,215
-32225,707
+46504,116
-42229,698
+66096,287
-32212,714
+3133,2000
-79605,25
+26682,198
-9517,688
+19337,1078
-19125,1228
+25021,1062
-65849,474
+19290,1088
-2080,2140
+89474,25
-16433,182
+7535,1320
-2006,2046
+23251,1228
-48575,580
+82016,477
-115056,1908
+876,3642
-10406,920
+7073,310
-2196,1444
+2476,2046
-1005,33
+55411,580
-28413,620
+68801,2899
-4157,744
+4608,1740
-4261,500
+3079,1444
-993,217
+8344,324
-21848,251
+540,53
-66260,119
+38395,626
-108898,26
+4176,749
-373975,9
+5519,500
-2005,1569
+1394,217
-40001,273
+26127,379
-192608,7
+49730,249
-78367,201
+57206,91
-5679,583
+6106,1245
-478,1760
+185920,29
-22932,250
+3232,49
-15059,7
+4276,1569
-7161,3066
+57314,273
-101555,35
+256794,7
-610,933
+113862,201
-15733,2
+1969,538
--1,-1
+12346,671
-2051,2078
+5606,149
-194,7096
+550,2450
-69260,51
+25557,310
-14039,2780
+1391,538
-876367,62
+9325,3066
-165341,25
+131996,37
-226318,275
+214,1720
+8902,7
+148385,8
+6120,2113
+287,7096
+97368,51
+15591,2780
+1000405,67
+213696,25
+240082,340

__tests__/b0atyStats.json

@@ -3,199 +3,676 @@
     {
       "id": 0,
       "name": "Overall",
-      "rank": 3745,
+      "rank": 2210,
       "level": 2277,
-      "xp": 840426611
+      "xp": 1150073045
+    },
+    {
+      "id": 1,
+      "name": "Attack",
+      "rank": 23988,
+      "level": 99,
+      "xp": 33320012
+    },
+    {
+      "id": 2,
+      "name": "Defence",
+      "rank": 3114,
+      "level": 99,
+      "xp": 51215128
+    },
+    {
+      "id": 3,
+      "name": "Strength",
+      "rank": 1203,
+      "level": 99,
+      "xp": 200000000
     },
-    { "id": 1, "name": "Attack", "rank": 24080, "level": 99, "xp": 30276246 },
-    { "id": 2, "name": "Defence", "rank": 9559, "level": 99, "xp": 31228199 },
-    { "id": 3, "name": "Strength", "rank": 2212, "level": 99, "xp": 143599407 },
     {
       "id": 4,
       "name": "Hitpoints",
-      "rank": 3550,
+      "rank": 1372,
       "level": 99,
-      "xp": 123248914
+      "xp": 196290925
+    },
+    {
+      "id": 5,
+      "name": "Ranged",
+      "rank": 3458,
+      "level": 99,
+      "xp": 159426771
+    },
+    {
+      "id": 6,
+      "name": "Prayer",
+      "rank": 2746,
+      "level": 99,
+      "xp": 17744970
+    },
+    {
+      "id": 7,
+      "name": "Magic",
+      "rank": 2031,
+      "level": 99,
+      "xp": 91566360
+    },
+    {
+      "id": 8,
+      "name": "Cooking",
+      "rank": 161852,
+      "level": 99,
+      "xp": 13386665
     },
-    { "id": 5, "name": "Ranged", "rank": 6564, "level": 99, "xp": 109953707 },
-    { "id": 6, "name": "Prayer", "rank": 4244, "level": 99, "xp": 15144846 },
-    { "id": 7, "name": "Magic", "rank": 4107, "level": 99, "xp": 57072224 },
-    { "id": 8, "name": "Cooking", "rank": 135556, "level": 99, "xp": 13353511 },
     {
       "id": 9,
       "name": "Woodcutting",
-      "rank": 25855,
+      "rank": 25801,
       "level": 99,
-      "xp": 16903268
+      "xp": 19461878
     },
     {
       "id": 10,
       "name": "Fletching",
-      "rank": 53472,
+      "rank": 64826,
       "level": 99,
-      "xp": 13456850
+      "xp": 13473417
+    },
+    {
+      "id": 11,
+      "name": "Fishing",
+      "rank": 26528,
+      "level": 99,
+      "xp": 16672481
     },
-    { "id": 11, "name": "Fishing", "rank": 22453, "level": 99, "xp": 16654917 },
     {
       "id": 12,
       "name": "Firemaking",
-      "rank": 17690,
+      "rank": 20829,
       "level": 99,
-      "xp": 19118307
+      "xp": 19483653
     },
     {
       "id": 13,
       "name": "Crafting",
-      "rank": 45816,
+      "rank": 58378,
       "level": 99,
-      "xp": 14059776
+      "xp": 14103220
     },
     {
       "id": 14,
       "name": "Smithing",
-      "rank": 10409,
+      "rank": 13188,
       "level": 99,
-      "xp": 16530015
+      "xp": 16573909
+    },
+    {
+      "id": 15,
+      "name": "Mining",
+      "rank": 36283,
+      "level": 99,
+      "xp": 15061037
     },
-    { "id": 15, "name": "Mining", "rank": 27702, "level": 99, "xp": 14765145 },
     {
       "id": 16,
       "name": "Herblore",
-      "rank": 39430,
+      "rank": 17137,
       "level": 99,
-      "xp": 13235063
+      "xp": 14670565
+    },
+    {
+      "id": 17,
+      "name": "Agility",
+      "rank": 8751,
+      "level": 99,
+      "xp": 16169665
     },
-    { "id": 17, "name": "Agility", "rank": 6722, "level": 99, "xp": 15754877 },
     {
       "id": 18,
       "name": "Thieving",
-      "rank": 51813,
+      "rank": 60803,
       "level": 99,
-      "xp": 14023027
+      "xp": 14390315
+    },
+    {
+      "id": 19,
+      "name": "Slayer",
+      "rank": 1718,
+      "level": 99,
+      "xp": 57850681
+    },
+    {
+      "id": 20,
+      "name": "Farming",
+      "rank": 2117,
+      "level": 99,
+      "xp": 110369178
     },
-    { "id": 19, "name": "Slayer", "rank": 5324, "level": 99, "xp": 33835543 },
-    { "id": 20, "name": "Farming", "rank": 3154, "level": 99, "xp": 69527777 },
     {
       "id": 21,
       "name": "Runecraft",
-      "rank": 4719,
+      "rank": 5540,
       "level": 99,
-      "xp": 22733384
+      "xp": 22739567
+    },
+    {
+      "id": 22,
+      "name": "Hunter",
+      "rank": 22326,
+      "level": 99,
+      "xp": 18052465
     },
-    { "id": 22, "name": "Hunter", "rank": 15135, "level": 99, "xp": 17952893 },
     {
       "id": 23,
       "name": "Construction",
-      "rank": 1089,
+      "rank": 1467,
       "level": 99,
-      "xp": 17998715
+      "xp": 18050183
     }
   ],
   "activities": [
-    { "id": 0, "name": "League Points", "rank": -1, "score": -1 },
+    {
-    { "id": 1, "name": "Deadman Points", "rank": -1, "score": -1 },
+      "id": 0,
-    { "id": 2, "name": "Bounty Hunter - Hunter", "rank": 26164, "score": 10 },
+      "name": "League Points",
-    { "id": 3, "name": "Bounty Hunter - Rogue", "rank": 12886, "score": 3 },
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 1,
+      "name": "Deadman Points",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 2,
+      "name": "Bounty Hunter - Hunter",
+      "rank": 38135,
+      "score": 10
+    },
+    {
+      "id": 3,
+      "name": "Bounty Hunter - Rogue",
+      "rank": 19368,
+      "score": 3
+    },
     {
       "id": 4,
       "name": "Bounty Hunter (Legacy) - Hunter",
-      "rank": 148658,
+      "rank": 146220,
       "score": 8
     },
     {
       "id": 5,
       "name": "Bounty Hunter (Legacy) - Rogue",
-      "rank": 103161,
+      "rank": 100923,
       "score": 7
     },
-    { "id": 6, "name": "Clue Scrolls (all)", "rank": 377, "score": 9556 },
+    {
-    { "id": 7, "name": "Clue Scrolls (beginner)", "rank": 862, "score": 825 },
+      "id": 6,
-    { "id": 8, "name": "Clue Scrolls (easy)", "rank": 148, "score": 6000 },
+      "name": "Clue Scrolls (all)",
-    { "id": 9, "name": "Clue Scrolls (medium)", "rank": 2153, "score": 1606 },
+      "rank": 433,
-    { "id": 10, "name": "Clue Scrolls (hard)", "rank": 42107, "score": 298 },
+      "score": 9802
-    { "id": 11, "name": "Clue Scrolls (elite)", "rank": 504, "score": 459 },
+    },
-    { "id": 12, "name": "Clue Scrolls (master)", "rank": 1816, "score": 368 },
+    {
-    { "id": 13, "name": "LMS - Rank", "rank": 14701, "score": 2521 },
+      "id": 7,
-    { "id": 14, "name": "PvP Arena - Rank", "rank": -1, "score": -1 },
+      "name": "Clue Scrolls (beginner)",
-    { "id": 15, "name": "Soul Wars Zeal", "rank": 6776, "score": 14780 },
+      "rank": 1542,
-    { "id": 16, "name": "Rifts closed", "rank": 4773, "score": 1060 },
+      "score": 825
-    { "id": 17, "name": "Abyssal Sire", "rank": 2741, "score": 2192 },
+    },
-    { "id": 18, "name": "Alchemical Hydra", "rank": 90203, "score": 594 },
+    {
-    { "id": 19, "name": "Artio", "rank": 29573, "score": 143 },
+      "id": 8,
-    { "id": 20, "name": "Barrows Chests", "rank": 3668, "score": 1830 },
+      "name": "Clue Scrolls (easy)",
-    { "id": 21, "name": "Bryophyta", "rank": 206778, "score": 5 },
+      "rank": 158,
-    { "id": 22, "name": "Callisto", "rank": 32897, "score": 293 },
+      "score": 6000
-    { "id": 23, "name": "Calvar'ion", "rank": 64112, "score": 58 },
+    },
-    { "id": 24, "name": "Cerberus", "rank": 18492, "score": 1905 },
+    {
-    { "id": 25, "name": "Chambers of Xeric", "rank": 178941, "score": 34 },
+      "id": 9,
+      "name": "Clue Scrolls (medium)",
+      "rank": 2572,
+      "score": 1606
+    },
+    {
+      "id": 10,
+      "name": "Clue Scrolls (hard)",
+      "rank": 47979,
+      "score": 311
+    },
+    {
+      "id": 11,
+      "name": "Clue Scrolls (elite)",
+      "rank": 1081,
+      "score": 460
+    },
+    {
+      "id": 12,
+      "name": "Clue Scrolls (master)",
+      "rank": 880,
+      "score": 600
+    },
+    {
+      "id": 13,
+      "name": "LMS - Rank",
+      "rank": 4258,
+      "score": 6785
+    },
+    {
+      "id": 14,
+      "name": "PvP Arena - Rank",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 15,
+      "name": "Soul Wars Zeal",
+      "rank": 7596,
+      "score": 14780
+    },
+    {
+      "id": 16,
+      "name": "Rifts closed",
+      "rank": 8124,
+      "score": 1060
+    },
+    {
+      "id": 17,
+      "name": "Colosseum Glory",
+      "rank": 10438,
+      "score": 43487
+    },
+    {
+      "id": 18,
+      "name": "Collections Logged",
+      "rank": 1114,
+      "score": 1155
+    },
+    {
+      "id": 19,
+      "name": "Abyssal Sire",
+      "rank": 3497,
+      "score": 2192
+    },
+    {
+      "id": 20,
+      "name": "Alchemical Hydra",
+      "rank": 3204,
+      "score": 4796
+    },
+    {
+      "id": 21,
+      "name": "Amoxliatl",
+      "rank": 1087,
+      "score": 984
+    },
+    {
+      "id": 22,
+      "name": "Araxxor",
+      "rank": 2230,
+      "score": 2328
+    },
+    {
+      "id": 23,
+      "name": "Artio",
+      "rank": 51533,
+      "score": 143
+    },
+    {
+      "id": 24,
+      "name": "Barrows Chests",
+      "rank": 4243,
+      "score": 1830
+    },
+    {
+      "id": 25,
+      "name": "Bryophyta",
+      "rank": 256985,
+      "score": 5
+    },
     {
       "id": 26,
-      "name": "Chambers of Xeric: Challenge Mode",
+      "name": "Callisto",
-      "rank": 2379,
+      "rank": 54424,
-      "score": 501
+      "score": 293
+    },
+    {
+      "id": 27,
+      "name": "Calvar'ion",
+      "rank": 114691,
+      "score": 58
+    },
+    {
+      "id": 28,
+      "name": "Cerberus",
+      "rank": 11700,
+      "score": 2657
+    },
+    {
+      "id": 29,
+      "name": "Chambers of Xeric",
+      "rank": 211708,
+      "score": 34
+    },
+    {
+      "id": 30,
+      "name": "Chambers of Xeric: Challenge Mode",
+      "rank": 1779,
+      "score": 736
+    },
+    {
+      "id": 31,
+      "name": "Chaos Elemental",
+      "rank": 24958,
+      "score": 215
+    },
+    {
+      "id": 32,
+      "name": "Chaos Fanatic",
+      "rank": 46504,
+      "score": 116
+    },
+    {
+      "id": 33,
+      "name": "Commander Zilyana",
+      "rank": 66096,
+      "score": 287
+    },
+    {
+      "id": 34,
+      "name": "Corporeal Beast",
+      "rank": 3133,
+      "score": 2000
+    },
+    {
+      "id": 35,
+      "name": "Crazy Archaeologist",
+      "rank": 26682,
+      "score": 198
+    },
+    {
+      "id": 36,
+      "name": "Dagannoth Prime",
+      "rank": 19337,
+      "score": 1078
+    },
+    {
+      "id": 37,
+      "name": "Dagannoth Rex",
+      "rank": 25021,
+      "score": 1062
+    },
+    {
+      "id": 38,
+      "name": "Dagannoth Supreme",
+      "rank": 19290,
+      "score": 1088
+    },
+    {
+      "id": 39,
+      "name": "Deranged Archaeologist",
+      "rank": 89474,
+      "score": 25
+    },
+    {
+      "id": 40,
+      "name": "Duke Sucellus",
+      "rank": 7535,
+      "score": 1320
+    },
+    {
+      "id": 41,
+      "name": "General Graardor",
+      "rank": 23251,
+      "score": 1228
+    },
+    {
+      "id": 42,
+      "name": "Giant Mole",
+      "rank": 82016,
+      "score": 477
+    },
+    {
+      "id": 43,
+      "name": "Grotesque Guardians",
+      "rank": 876,
+      "score": 3642
+    },
+    {
+      "id": 44,
+      "name": "Hespori",
+      "rank": 7073,
+      "score": 310
+    },
+    {
+      "id": 45,
+      "name": "Kalphite Queen",
+      "rank": 2476,
+      "score": 2046
+    },
+    {
+      "id": 46,
+      "name": "King Black Dragon",
+      "rank": 55411,
+      "score": 580
+    },
+    {
+      "id": 47,
+      "name": "Kraken",
+      "rank": 68801,
+      "score": 2899
+    },
+    {
+      "id": 48,
+      "name": "Kree'Arra",
+      "rank": 4608,
+      "score": 1740
+    },
+    {
+      "id": 49,
+      "name": "K'ril Tsutsaroth",
+      "rank": 3079,
+      "score": 1444
+    },
+    {
+      "id": 50,
+      "name": "Lunar Chests",
+      "rank": 8344,
+      "score": 324
+    },
+    {
+      "id": 51,
+      "name": "Mimic",
+      "rank": 540,
+      "score": 53
+    },
+    {
+      "id": 52,
+      "name": "Nex",
+      "rank": 38395,
+      "score": 626
+    },
+    {
+      "id": 53,
+      "name": "Nightmare",
+      "rank": 4176,
+      "score": 749
+    },
+    {
+      "id": 54,
+      "name": "Phosani's Nightmare",
+      "rank": 5519,
+      "score": 500
+    },
+    {
+      "id": 55,
+      "name": "Obor",
+      "rank": 1394,
+      "score": 217
+    },
+    {
+      "id": 56,
+      "name": "Phantom Muspah",
+      "rank": 26127,
+      "score": 379
+    },
+    {
+      "id": 57,
+      "name": "Sarachnis",
+      "rank": 49730,
+      "score": 249
+    },
+    {
+      "id": 58,
+      "name": "Scorpia",
+      "rank": 57206,
+      "score": 91
+    },
+    {
+      "id": 59,
+      "name": "Scurrius",
+      "rank": 6106,
+      "score": 1245
+    },
+    {
+      "id": 60,
+      "name": "Skotizo",
+      "rank": 185920,
+      "score": 29
+    },
+    {
+      "id": 61,
+      "name": "Sol Heredit",
+      "rank": 3232,
+      "score": 49
     },
-    { "id": 27, "name": "Chaos Elemental", "rank": 82902, "score": 50 },
-    { "id": 28, "name": "Chaos Fanatic", "rank": 147358, "score": 26 },
-    { "id": 29, "name": "Commander Zilyana", "rank": 51973, "score": 287 },
-    { "id": 30, "name": "Corporeal Beast", "rank": 2377, "score": 2000 },
-    { "id": 31, "name": "Crazy Archaeologist", "rank": 147406, "score": 41 },
-    { "id": 32, "name": "Dagannoth Prime", "rank": 32225, "score": 707 },
-    { "id": 33, "name": "Dagannoth Rex", "rank": 42229, "score": 698 },
-    { "id": 34, "name": "Dagannoth Supreme", "rank": 32212, "score": 714 },
-    { "id": 35, "name": "Deranged Archaeologist", "rank": 79605, "score": 25 },
-    { "id": 36, "name": "Duke Sucellus", "rank": 9517, "score": 688 },
-    { "id": 37, "name": "General Graardor", "rank": 19125, "score": 1228 },
-    { "id": 38, "name": "Giant Mole", "rank": 65849, "score": 474 },
-    { "id": 39, "name": "Grotesque Guardians", "rank": 2080, "score": 2140 },
-    { "id": 40, "name": "Hespori", "rank": 16433, "score": 182 },
-    { "id": 41, "name": "Kalphite Queen", "rank": 2006, "score": 2046 },
-    { "id": 42, "name": "King Black Dragon", "rank": 48575, "score": 580 },
-    { "id": 43, "name": "Kraken", "rank": 115056, "score": 1908 },
-    { "id": 44, "name": "Kree'Arra", "rank": 10406, "score": 920 },
-    { "id": 45, "name": "K'ril Tsutsaroth", "rank": 2196, "score": 1444 },
-    { "id": 46, "name": "Mimic", "rank": 1005, "score": 33 },
-    { "id": 47, "name": "Nex", "rank": 28413, "score": 620 },
-    { "id": 48, "name": "Nightmare", "rank": 4157, "score": 744 },
-    { "id": 49, "name": "Phosani's Nightmare", "rank": 4261, "score": 500 },
-    { "id": 50, "name": "Obor", "rank": 993, "score": 217 },
-    { "id": 51, "name": "Phantom Muspah", "rank": 21848, "score": 251 },
-    { "id": 52, "name": "Sarachnis", "rank": 66260, "score": 119 },
-    { "id": 53, "name": "Scorpia", "rank": 108898, "score": 26 },
-    { "id": 54, "name": "Skotizo", "rank": 373975, "score": 9 },
-    { "id": 55, "name": "Spindel", "rank": 2005, "score": 1569 },
-    { "id": 56, "name": "Tempoross", "rank": 40001, "score": 273 },
-    { "id": 57, "name": "The Gauntlet", "rank": 192608, "score": 7 },
-    { "id": 58, "name": "The Corrupted Gauntlet", "rank": 78367, "score": 201 },
-    { "id": 59, "name": "The Leviathan", "rank": 5679, "score": 583 },
-    { "id": 60, "name": "The Whisperer", "rank": 478, "score": 1760 },
-    { "id": 61, "name": "Theatre of Blood", "rank": 22932, "score": 250 },
     {
       "id": 62,
-      "name": "Theatre of Blood: Hard Mode",
+      "name": "Spindel",
-      "rank": 15059,
+      "rank": 4276,
-      "score": 7
+      "score": 1569
     },
     {
       "id": 63,
-      "name": "Thermonuclear Smoke Devil",
+      "name": "Tempoross",
-      "rank": 7161,
+      "rank": 57314,
-      "score": 3066
+      "score": 273
+    },
+    {
+      "id": 64,
+      "name": "The Gauntlet",
+      "rank": 256794,
+      "score": 7
     },
-    { "id": 64, "name": "Tombs of Amascut", "rank": 101555, "score": 35 },
     {
       "id": 65,
-      "name": "Tombs of Amascut: Expert Mode",
+      "name": "The Corrupted Gauntlet",
-      "rank": 610,
+      "rank": 113862,
-      "score": 933
+      "score": 201
     },
-    { "id": 66, "name": "TzKal-Zuk", "rank": 15733, "score": 2 },
+    {
-    { "id": 67, "name": "TzTok-Jad", "rank": -1, "score": -1 },
+      "id": 66,
-    { "id": 68, "name": "Vardorvis", "rank": 2051, "score": 2078 },
+      "name": "The Hueycoatl",
-    { "id": 69, "name": "Venenatis", "rank": 194, "score": 7096 },
+      "rank": 1969,
-    { "id": 70, "name": "Vet'ion", "rank": 69260, "score": 51 },
+      "score": 538
-    { "id": 71, "name": "Vorkath", "rank": 14039, "score": 2780 },
+    },
-    { "id": 72, "name": "Wintertodt", "rank": 876367, "score": 62 },
+    {
-    { "id": 73, "name": "Zalcano", "rank": 165341, "score": 25 },
+      "id": 67,
-    { "id": 74, "name": "Zulrah", "rank": 226318, "score": 275 }
+      "name": "The Leviathan",
+      "rank": 12346,
+      "score": 671
+    },
+    {
+      "id": 68,
+      "name": "The Royal Titans",
+      "rank": 5606,
+      "score": 149
+    },
+    {
+      "id": 69,
+      "name": "The Whisperer",
+      "rank": 550,
+      "score": 2450
+    },
+    {
+      "id": 70,
+      "name": "Theatre of Blood",
+      "rank": 25557,
+      "score": 310
+    },
+    {
+      "id": 71,
+      "name": "Theatre of Blood: Hard Mode",
+      "rank": 1391,
+      "score": 538
+    },
+    {
+      "id": 72,
+      "name": "Thermonuclear Smoke Devil",
+      "rank": 9325,
+      "score": 3066
+    },
+    {
+      "id": 73,
+      "name": "Tombs of Amascut",
+      "rank": 131996,
+      "score": 37
+    },
+    {
+      "id": 74,
+      "name": "Tombs of Amascut: Expert Mode",
+      "rank": 214,
+      "score": 1720
+    },
+    {
+      "id": 75,
+      "name": "TzKal-Zuk",
+      "rank": 8902,
+      "score": 7
+    },
+    {
+      "id": 76,
+      "name": "TzTok-Jad",
+      "rank": 148385,
+      "score": 8
+    },
+    {
+      "id": 77,
+      "name": "Vardorvis",
+      "rank": 6120,
+      "score": 2113
+    },
+    {
+      "id": 78,
+      "name": "Venenatis",
+      "rank": 287,
+      "score": 7096
+    },
+    {
+      "id": 79,
+      "name": "Vet'ion",
+      "rank": 97368,
+      "score": 51
+    },
+    {
+      "id": 80,
+      "name": "Vorkath",
+      "rank": 15591,
+      "score": 2780
+    },
+    {
+      "id": 81,
+      "name": "Wintertodt",
+      "rank": 1000405,
+      "score": 67
+    },
+    {
+      "id": 82,
+      "name": "Zalcano",
+      "rank": 213696,
+      "score": 25
+    },
+    {
+      "id": 83,
+      "name": "Zulrah",
+      "rank": 240082,
+      "score": 340
+    }
   ]
 }

__tests__/hiscores.test.ts

@@ -102,8 +102,12 @@ test('Parse CSV to json', () => {
   13,4057
   37,225
   25,1110
+  7827,43249
+  1114,1155
   382,2780
   944,3000
+  561,398429
+  37,111
   704,892
   1981,1452
   4981,23
@@ -131,6 +135,7 @@ test('Parse CSV to json', () => {
   41643,1477
   625,2391
   120,2981
+  54,2958
   1,109
   99,39002
   3,22666
@@ -139,12 +144,16 @@ test('Parse CSV to json', () => {
   44,6233
   201,1101
   82,3404
+  555,7079
   5085,61
+  8731,1423
   678,903
   18823,23
   63,375
   2870,6
+  891,9102
   2871,7
+  5606,149
   2872,8
   6984,138
   23,923141
@@ -200,6 +209,8 @@ test('Parse CSV to json', () => {
     pvpArena: { rank: 13, score: 4057 },
     soulWarsZeal: { rank: 37, score: 225 },
     riftsClosed: { rank: 25, score: 1110 },
+    colosseumGlory: { rank: 7827, score: 43249 },
+    collectionsLogged: { rank: 1114, score: 1155 },
     clues: {
       all: { rank: 32, score: 12148 },
       beginner: { rank: 3105, score: 76 },
@@ -212,6 +223,8 @@ test('Parse CSV to json', () => {
     bosses: {
       abyssalSire: { rank: 382, score: 2780 },
       alchemicalHydra: { rank: 944, score: 3000 },
+      amoxliatl: { rank: 561, score: 398429 },
+      araxxor: { rank: 37, score: 111 },
       artio: { rank: 704, score: 892 },
       barrows: { rank: 1981, score: 1452 },
       bryophyta: { rank: 4981, score: 23 },
@@ -239,6 +252,7 @@ test('Parse CSV to json', () => {
       kraken: { rank: 41643, score: 1477 },
       kreeArra: { rank: 625, score: 2391 },
       krilTsutsaroth: { rank: 120, score: 2981 },
+      lunarChests: { rank: 54, score: 2958 },
       mimic: { rank: 1, score: 109 },
       nex: { rank: 99, score: 39002 },
       nightmare: { rank: 3, score: 22666 },
@@ -247,12 +261,16 @@ test('Parse CSV to json', () => {
       phantomMuspah: { rank: 44, score: 6233 },
       sarachnis: { rank: 201, score: 1101 },
       scorpia: { rank: 82, score: 3404 },
+      scurrius: { rank: 555, score: 7079 },
       skotizo: { rank: 5085, score: 61 },
+      solHeredit: { rank: 8731, score: 1423 },
       spindel: { rank: 678, score: 903 },
       tempoross: { rank: 18823, score: 23 },
       gauntlet: { rank: 63, score: 375 },
       corruptedGauntlet: { rank: 2870, score: 6 },
+      hueycoatl: { rank: 891, score: 9102 },
       leviathan: { rank: 2871, score: 7 },
+      royalTitans: { rank: 5606, score: 149 },
       whisperer: { rank: 2872, score: 8 },
       theatreOfBlood: { rank: 6984, score: 138 },
       theatreOfBloodHardMode: { rank: 23, score: 923141 },

__tests__/lynxTitanStats.json

@@ -1,14 +1,68 @@
 {
   "skills": [
-    { "id": 0, "name": "Overall", "rank": 1, "level": 2277, "xp": 4600000000 },
+    {
-    { "id": 1, "name": "Attack", "rank": 15, "level": 99, "xp": 200000000 },
+      "id": 0,
-    { "id": 2, "name": "Defence", "rank": 28, "level": 99, "xp": 200000000 },
+      "name": "Overall",
-    { "id": 3, "name": "Strength", "rank": 18, "level": 99, "xp": 200000000 },
+      "rank": 1,
-    { "id": 4, "name": "Hitpoints", "rank": 7, "level": 99, "xp": 200000000 },
+      "level": 2277,
-    { "id": 5, "name": "Ranged", "rank": 8, "level": 99, "xp": 200000000 },
+      "xp": 4600000000
-    { "id": 6, "name": "Prayer", "rank": 11, "level": 99, "xp": 200000000 },
+    },
-    { "id": 7, "name": "Magic", "rank": 31, "level": 99, "xp": 200000000 },
+    {
-    { "id": 8, "name": "Cooking", "rank": 155, "level": 99, "xp": 200000000 },
+      "id": 1,
+      "name": "Attack",
+      "rank": 15,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 2,
+      "name": "Defence",
+      "rank": 28,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 3,
+      "name": "Strength",
+      "rank": 18,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 4,
+      "name": "Hitpoints",
+      "rank": 7,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 5,
+      "name": "Ranged",
+      "rank": 8,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 6,
+      "name": "Prayer",
+      "rank": 11,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 7,
+      "name": "Magic",
+      "rank": 30,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 8,
+      "name": "Cooking",
+      "rank": 149,
+      "level": 99,
+      "xp": 200000000
+    },
     {
       "id": 9,
       "name": "Woodcutting",
@@ -16,8 +70,20 @@
       "level": 99,
       "xp": 200000000
     },
-    { "id": 10, "name": "Fletching", "rank": 12, "level": 99, "xp": 200000000 },
+    {
-    { "id": 11, "name": "Fishing", "rank": 9, "level": 99, "xp": 200000000 },
+      "id": 10,
+      "name": "Fletching",
+      "rank": 12,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 11,
+      "name": "Fishing",
+      "rank": 9,
+      "level": 99,
+      "xp": 200000000
+    },
     {
       "id": 12,
       "name": "Firemaking",
@@ -25,16 +91,76 @@
       "level": 99,
       "xp": 200000000
     },
-    { "id": 13, "name": "Crafting", "rank": 4, "level": 99, "xp": 200000000 },
+    {
-    { "id": 14, "name": "Smithing", "rank": 3, "level": 99, "xp": 200000000 },
+      "id": 13,
-    { "id": 15, "name": "Mining", "rank": 24, "level": 99, "xp": 200000000 },
+      "name": "Crafting",
-    { "id": 16, "name": "Herblore", "rank": 5, "level": 99, "xp": 200000000 },
+      "rank": 4,
-    { "id": 17, "name": "Agility", "rank": 24, "level": 99, "xp": 200000000 },
+      "level": 99,
-    { "id": 18, "name": "Thieving", "rank": 12, "level": 99, "xp": 200000000 },
+      "xp": 200000000
-    { "id": 19, "name": "Slayer", "rank": 2, "level": 99, "xp": 200000000 },
+    },
-    { "id": 20, "name": "Farming", "rank": 19, "level": 99, "xp": 200000000 },
+    {
-    { "id": 21, "name": "Runecraft", "rank": 6, "level": 99, "xp": 200000000 },
+      "id": 14,
-    { "id": 22, "name": "Hunter", "rank": 4, "level": 99, "xp": 200000000 },
+      "name": "Smithing",
+      "rank": 3,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 15,
+      "name": "Mining",
+      "rank": 23,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 16,
+      "name": "Herblore",
+      "rank": 5,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 17,
+      "name": "Agility",
+      "rank": 24,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 18,
+      "name": "Thieving",
+      "rank": 12,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 19,
+      "name": "Slayer",
+      "rank": 2,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 20,
+      "name": "Farming",
+      "rank": 19,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 21,
+      "name": "Runecraft",
+      "rank": 6,
+      "level": 99,
+      "xp": 200000000
+    },
+    {
+      "id": 22,
+      "name": "Hunter",
+      "rank": 3,
+      "level": 99,
+      "xp": 200000000
+    },
     {
       "id": 23,
       "name": "Construction",
@@ -44,10 +170,30 @@
     }
   ],
   "activities": [
-    { "id": 0, "name": "League Points", "rank": -1, "score": -1 },
+    {
-    { "id": 1, "name": "Deadman Points", "rank": -1, "score": -1 },
+      "id": 0,
-    { "id": 2, "name": "Bounty Hunter - Hunter", "rank": -1, "score": -1 },
+      "name": "League Points",
-    { "id": 3, "name": "Bounty Hunter - Rogue", "rank": -1, "score": -1 },
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 1,
+      "name": "Deadman Points",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 2,
+      "name": "Bounty Hunter - Hunter",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 3,
+      "name": "Bounty Hunter - Rogue",
+      "rank": -1,
+      "score": -1
+    },
     {
       "id": 4,
       "name": "Bounty Hunter (Legacy) - Hunter",
@@ -60,89 +206,473 @@
       "rank": -1,
       "score": -1
     },
-    { "id": 6, "name": "Clue Scrolls (all)", "rank": 805212, "score": 22 },
+    {
-    { "id": 7, "name": "Clue Scrolls (beginner)", "rank": -1, "score": -1 },
+      "id": 6,
-    { "id": 8, "name": "Clue Scrolls (easy)", "rank": -1, "score": -1 },
+      "name": "Clue Scrolls (all)",
-    { "id": 9, "name": "Clue Scrolls (medium)", "rank": -1, "score": -1 },
+      "rank": 937868,
-    { "id": 10, "name": "Clue Scrolls (hard)", "rank": 502504, "score": 22 },
+      "score": 22
-    { "id": 11, "name": "Clue Scrolls (elite)", "rank": -1, "score": -1 },
+    },
-    { "id": 12, "name": "Clue Scrolls (master)", "rank": -1, "score": -1 },
+    {
-    { "id": 13, "name": "LMS - Rank", "rank": -1, "score": -1 },
+      "id": 7,
-    { "id": 14, "name": "PvP Arena - Rank", "rank": -1, "score": -1 },
+      "name": "Clue Scrolls (beginner)",
-    { "id": 15, "name": "Soul Wars Zeal", "rank": -1, "score": -1 },
+      "rank": -1,
-    { "id": 16, "name": "Rifts closed", "rank": -1, "score": -1 },
+      "score": -1
-    { "id": 17, "name": "Abyssal Sire", "rank": -1, "score": -1 },
+    },
-    { "id": 18, "name": "Alchemical Hydra", "rank": -1, "score": -1 },
+    {
-    { "id": 19, "name": "Artio", "rank": -1, "score": -1 },
+      "id": 8,
-    { "id": 20, "name": "Barrows Chests", "rank": -1, "score": -1 },
+      "name": "Clue Scrolls (easy)",
-    { "id": 21, "name": "Bryophyta", "rank": -1, "score": -1 },
+      "rank": -1,
-    { "id": 22, "name": "Callisto", "rank": -1, "score": -1 },
+      "score": -1
-    { "id": 23, "name": "Calvar'ion", "rank": -1, "score": -1 },
+    },
-    { "id": 24, "name": "Cerberus", "rank": -1, "score": -1 },
+    {
-    { "id": 25, "name": "Chambers of Xeric", "rank": -1, "score": -1 },
+      "id": 9,
+      "name": "Clue Scrolls (medium)",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 10,
+      "name": "Clue Scrolls (hard)",
+      "rank": 578038,
+      "score": 22
+    },
+    {
+      "id": 11,
+      "name": "Clue Scrolls (elite)",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 12,
+      "name": "Clue Scrolls (master)",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 13,
+      "name": "LMS - Rank",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 14,
+      "name": "PvP Arena - Rank",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 15,
+      "name": "Soul Wars Zeal",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 16,
+      "name": "Rifts closed",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 17,
+      "name": "Colosseum Glory",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 18,
+      "name": "Collections Logged",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 19,
+      "name": "Abyssal Sire",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 20,
+      "name": "Alchemical Hydra",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 21,
+      "name": "Amoxliatl",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 22,
+      "name": "Araxxor",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 23,
+      "name": "Artio",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 24,
+      "name": "Barrows Chests",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 25,
+      "name": "Bryophyta",
+      "rank": -1,
+      "score": -1
+    },
     {
       "id": 26,
+      "name": "Callisto",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 27,
+      "name": "Calvar'ion",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 28,
+      "name": "Cerberus",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 29,
+      "name": "Chambers of Xeric",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 30,
       "name": "Chambers of Xeric: Challenge Mode",
       "rank": -1,
       "score": -1
     },
-    { "id": 27, "name": "Chaos Elemental", "rank": -1, "score": -1 },
+    {
-    { "id": 28, "name": "Chaos Fanatic", "rank": -1, "score": -1 },
+      "id": 31,
-    { "id": 29, "name": "Commander Zilyana", "rank": -1, "score": -1 },
+      "name": "Chaos Elemental",
-    { "id": 30, "name": "Corporeal Beast", "rank": -1, "score": -1 },
+      "rank": -1,
-    { "id": 31, "name": "Crazy Archaeologist", "rank": -1, "score": -1 },
+      "score": -1
-    { "id": 32, "name": "Dagannoth Prime", "rank": -1, "score": -1 },
+    },
-    { "id": 33, "name": "Dagannoth Rex", "rank": -1, "score": -1 },
+    {
-    { "id": 34, "name": "Dagannoth Supreme", "rank": -1, "score": -1 },
+      "id": 32,
-    { "id": 35, "name": "Deranged Archaeologist", "rank": -1, "score": -1 },
+      "name": "Chaos Fanatic",
-    { "id": 36, "name": "Duke Sucellus", "rank": -1, "score": -1 },
+      "rank": -1,
-    { "id": 37, "name": "General Graardor", "rank": -1, "score": -1 },
+      "score": -1
-    { "id": 38, "name": "Giant Mole", "rank": -1, "score": -1 },
+    },
-    { "id": 39, "name": "Grotesque Guardians", "rank": -1, "score": -1 },
+    {
-    { "id": 40, "name": "Hespori", "rank": -1, "score": -1 },
+      "id": 33,
-    { "id": 41, "name": "Kalphite Queen", "rank": -1, "score": -1 },
+      "name": "Commander Zilyana",
-    { "id": 42, "name": "King Black Dragon", "rank": -1, "score": -1 },
+      "rank": -1,
-    { "id": 43, "name": "Kraken", "rank": -1, "score": -1 },
+      "score": -1
-    { "id": 44, "name": "Kree'Arra", "rank": -1, "score": -1 },
+    },
-    { "id": 45, "name": "K'ril Tsutsaroth", "rank": -1, "score": -1 },
+    {
-    { "id": 46, "name": "Mimic", "rank": -1, "score": -1 },
+      "id": 34,
-    { "id": 47, "name": "Nex", "rank": -1, "score": -1 },
+      "name": "Corporeal Beast",
-    { "id": 48, "name": "Nightmare", "rank": -1, "score": -1 },
+      "rank": -1,
-    { "id": 49, "name": "Phosani's Nightmare", "rank": -1, "score": -1 },
+      "score": -1
-    { "id": 50, "name": "Obor", "rank": -1, "score": -1 },
+    },
-    { "id": 51, "name": "Phantom Muspah", "rank": -1, "score": -1 },
+    {
-    { "id": 52, "name": "Sarachnis", "rank": -1, "score": -1 },
+      "id": 35,
-    { "id": 53, "name": "Scorpia", "rank": -1, "score": -1 },
+      "name": "Crazy Archaeologist",
-    { "id": 54, "name": "Skotizo", "rank": -1, "score": -1 },
+      "rank": -1,
-    { "id": 55, "name": "Spindel", "rank": -1, "score": -1 },
+      "score": -1
-    { "id": 56, "name": "Tempoross", "rank": -1, "score": -1 },
+    },
-    { "id": 57, "name": "The Gauntlet", "rank": -1, "score": -1 },
+    {
-    { "id": 58, "name": "The Corrupted Gauntlet", "rank": -1, "score": -1 },
+      "id": 36,
-    { "id": 59, "name": "The Leviathan", "rank": -1, "score": -1 },
+      "name": "Dagannoth Prime",
-    { "id": 60, "name": "The Whisperer", "rank": -1, "score": -1 },
+      "rank": -1,
-    { "id": 61, "name": "Theatre of Blood", "rank": -1, "score": -1 },
+      "score": -1
+    },
+    {
+      "id": 37,
+      "name": "Dagannoth Rex",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 38,
+      "name": "Dagannoth Supreme",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 39,
+      "name": "Deranged Archaeologist",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 40,
+      "name": "Duke Sucellus",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 41,
+      "name": "General Graardor",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 42,
+      "name": "Giant Mole",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 43,
+      "name": "Grotesque Guardians",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 44,
+      "name": "Hespori",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 45,
+      "name": "Kalphite Queen",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 46,
+      "name": "King Black Dragon",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 47,
+      "name": "Kraken",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 48,
+      "name": "Kree'Arra",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 49,
+      "name": "K'ril Tsutsaroth",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 50,
+      "name": "Lunar Chests",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 51,
+      "name": "Mimic",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 52,
+      "name": "Nex",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 53,
+      "name": "Nightmare",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 54,
+      "name": "Phosani's Nightmare",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 55,
+      "name": "Obor",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 56,
+      "name": "Phantom Muspah",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 57,
+      "name": "Sarachnis",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 58,
+      "name": "Scorpia",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 59,
+      "name": "Scurrius",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 60,
+      "name": "Skotizo",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 61,
+      "name": "Sol Heredit",
+      "rank": -1,
+      "score": -1
+    },
     {
       "id": 62,
+      "name": "Spindel",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 63,
+      "name": "Tempoross",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 64,
+      "name": "The Gauntlet",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 65,
+      "name": "The Corrupted Gauntlet",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 66,
+      "name": "The Hueycoatl",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 67,
+      "name": "The Leviathan",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 68,
+      "name": "The Royal Titans",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 69,
+      "name": "The Whisperer",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 70,
+      "name": "Theatre of Blood",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 71,
       "name": "Theatre of Blood: Hard Mode",
       "rank": -1,
       "score": -1
     },
-    { "id": 63, "name": "Thermonuclear Smoke Devil", "rank": -1, "score": -1 },
-    { "id": 64, "name": "Tombs of Amascut", "rank": -1, "score": -1 },
     {
-      "id": 65,
+      "id": 72,
+      "name": "Thermonuclear Smoke Devil",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 73,
+      "name": "Tombs of Amascut",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 74,
       "name": "Tombs of Amascut: Expert Mode",
       "rank": -1,
       "score": -1
     },
-    { "id": 66, "name": "TzKal-Zuk", "rank": -1, "score": -1 },
+    {
-    { "id": 67, "name": "TzTok-Jad", "rank": 225, "score": 186 },
+      "id": 75,
-    { "id": 68, "name": "Vardorvis", "rank": -1, "score": -1 },
+      "name": "TzKal-Zuk",
-    { "id": 69, "name": "Venenatis", "rank": -1, "score": -1 },
+      "rank": -1,
-    { "id": 70, "name": "Vet'ion", "rank": -1, "score": -1 },
+      "score": -1
-    { "id": 71, "name": "Vorkath", "rank": -1, "score": -1 },
+    },
-    { "id": 72, "name": "Wintertodt", "rank": -1, "score": -1 },
+    {
-    { "id": 73, "name": "Zalcano", "rank": -1, "score": -1 },
+      "id": 76,
-    { "id": 74, "name": "Zulrah", "rank": -1, "score": -1 }
+      "name": "TzTok-Jad",
+      "rank": 317,
+      "score": 186
+    },
+    {
+      "id": 77,
+      "name": "Vardorvis",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 78,
+      "name": "Venenatis",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 79,
+      "name": "Vet'ion",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 80,
+      "name": "Vorkath",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 81,
+      "name": "Wintertodt",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 82,
+      "name": "Zalcano",
+      "rank": -1,
+      "score": -1
+    },
+    {
+      "id": 83,
+      "name": "Zulrah",
+      "rank": -1,
+      "score": -1
+    }
   ]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "osrs-json-hiscores",
-  "version": "2.16.3",
+  "version": "2.21.0",
   "description": "The Old School Runescape API wrapper that does more!",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

src/hiscores.ts

@@ -44,7 +44,9 @@ import {
   FORMATTED_PVP_ARENA,
   FORMATTED_SOUL_WARS,
   FORMATTED_RIFTS_CLOSED,
-  FORMATTED_DEADMAN_POINTS
+  FORMATTED_DEADMAN_POINTS,
+  FORMATTED_COLOSSEUM_GLORY,
+  FORMATTED_COLLECTIONS_LOGGED
 } from './utils';
 
 /**
@@ -162,6 +164,8 @@ export function parseJsonStats(json: HiscoresResponse): Stats {
   const pvpArena = getActivity(FORMATTED_PVP_ARENA);
   const soulWarsZeal = getActivity(FORMATTED_SOUL_WARS);
   const riftsClosed = getActivity(FORMATTED_RIFTS_CLOSED);
+  const colosseumGlory = getActivity(FORMATTED_COLOSSEUM_GLORY);
+  const collectionsLogged = getActivity(FORMATTED_COLLECTIONS_LOGGED);
 
   const stats: Stats = {
     skills,
@@ -172,6 +176,8 @@ export function parseJsonStats(json: HiscoresResponse): Stats {
     pvpArena,
     soulWarsZeal,
     riftsClosed,
+    colosseumGlory,
+    collectionsLogged,
     clues,
     bosses
   };
@@ -221,8 +227,14 @@ export function parseStats(csv: string): Stats {
   const [leaguePoints, deadmanPoints] = activityObjects.splice(0, 2);
   const bhObjects = activityObjects.splice(0, BH_MODES.length);
   const clueObjects = activityObjects.splice(0, CLUES.length);
-  const [lastManStanding, pvpArena, soulWarsZeal, riftsClosed] =
+  const [
-    activityObjects.splice(0, 4);
+    lastManStanding,
+    pvpArena,
+    soulWarsZeal,
+    riftsClosed,
+    colosseumGlory,
+    collectionsLogged
+  ] = activityObjects.splice(0, 6);
   const bossObjects = activityObjects.splice(0, BOSSES.length);
 
   const skills: Skills = skillObjects.reduce<Skills>((prev, curr, index) => {
@@ -258,6 +270,8 @@ export function parseStats(csv: string): Stats {
     pvpArena,
     soulWarsZeal,
     riftsClosed,
+    colosseumGlory,
+    collectionsLogged,
     clues,
     bosses
   };

src/types.ts

@@ -69,6 +69,8 @@ export type BH = { [Type in BHType]: Activity };
 export type Boss =
   | 'abyssalSire'
   | 'alchemicalHydra'
+  | 'amoxliatl'
+  | 'araxxor'
   | 'artio'
   | 'barrows'
   | 'bryophyta'
@@ -96,6 +98,7 @@ export type Boss =
   | 'kraken'
   | 'kreeArra'
   | 'krilTsutsaroth'
+  | 'lunarChests'
   | 'mimic'
   | 'nex'
   | 'nightmare'
@@ -104,12 +107,16 @@ export type Boss =
   | 'phantomMuspah'
   | 'sarachnis'
   | 'scorpia'
+  | 'scurrius'
   | 'skotizo'
+  | 'solHeredit'
   | 'spindel'
   | 'tempoross'
   | 'gauntlet'
   | 'corruptedGauntlet'
+  | 'hueycoatl'
   | 'leviathan'
+  | 'royalTitans'
   | 'whisperer'
   | 'theatreOfBlood'
   | 'theatreOfBloodHardMode'
@@ -146,6 +153,8 @@ export type ActivityName =
   | 'hardClues'
   | 'eliteClues'
   | 'masterClues'
+  | 'colosseumGlory'
+  | 'collectionsLogged'
   | Boss;
 
 export interface Stats {
@@ -164,6 +173,8 @@ export interface Stats {
   pvpArena: Activity;
   soulWarsZeal: Activity;
   riftsClosed: Activity;
+  colosseumGlory: Activity;
+  collectionsLogged: Activity;
   bosses: Bosses;
 }
 export type Modes = { [M in Gamemode]?: Stats };

src/utils/constants.ts

@@ -76,6 +76,8 @@ export const GAMEMODES: Gamemode[] = [
 export const BOSSES: Boss[] = [
   'abyssalSire',
   'alchemicalHydra',
+  'amoxliatl',
+  'araxxor',
   'artio',
   'barrows',
   'bryophyta',
@@ -103,6 +105,7 @@ export const BOSSES: Boss[] = [
   'kraken',
   'kreeArra',
   'krilTsutsaroth',
+  'lunarChests',
   'mimic',
   'nex',
   'nightmare',
@@ -111,12 +114,16 @@ export const BOSSES: Boss[] = [
   'phantomMuspah',
   'sarachnis',
   'scorpia',
+  'scurrius',
   'skotizo',
+  'solHeredit',
   'spindel',
   'tempoross',
   'gauntlet',
   'corruptedGauntlet',
+  'hueycoatl',
   'leviathan',
+  'royalTitans',
   'whisperer',
   'theatreOfBlood',
   'theatreOfBloodHardMode',
@@ -151,6 +158,8 @@ export const ACTIVITIES: ActivityName[] = [
   'pvpArena',
   'soulWarsZeal',
   'riftsClosed',
+  'colosseumGlory',
+  'collectionsLogged',
   ...BOSSES
 ];
 
@@ -161,6 +170,8 @@ export type FormattedBossNames = {
 export const FORMATTED_BOSS_NAMES: FormattedBossNames = {
   abyssalSire: 'Abyssal Sire',
   alchemicalHydra: 'Alchemical Hydra',
+  amoxliatl: 'Amoxliatl',
+  araxxor: 'Araxxor',
   artio: 'Artio',
   barrows: 'Barrows Chests',
   bryophyta: 'Bryophyta',
@@ -188,6 +199,7 @@ export const FORMATTED_BOSS_NAMES: FormattedBossNames = {
   kraken: 'Kraken',
   kreeArra: "Kree'Arra",
   krilTsutsaroth: "K'ril Tsutsaroth",
+  lunarChests: 'Lunar Chests',
   mimic: 'Mimic',
   nex: 'Nex',
   nightmare: 'Nightmare',
@@ -196,12 +208,16 @@ export const FORMATTED_BOSS_NAMES: FormattedBossNames = {
   phantomMuspah: 'Phantom Muspah',
   sarachnis: 'Sarachnis',
   scorpia: 'Scorpia',
+  scurrius: 'Scurrius',
   skotizo: 'Skotizo',
+  solHeredit: 'Sol Heredit',
   spindel: 'Spindel',
   tempoross: 'Tempoross',
   gauntlet: 'The Gauntlet',
   corruptedGauntlet: 'The Corrupted Gauntlet',
+  hueycoatl: 'The Hueycoatl',
   leviathan: 'The Leviathan',
+  royalTitans: 'The Royal Titans',
   whisperer: 'The Whisperer',
   theatreOfBlood: 'Theatre of Blood',
   theatreOfBloodHardMode: 'Theatre of Blood: Hard Mode',
@@ -281,6 +297,8 @@ export const FORMATTED_SOUL_WARS = 'Soul Wars Zeal';
 export const FORMATTED_LEAGUE_POINTS = 'League Points';
 export const FORMATTED_DEADMAN_POINTS = 'Deadman Points';
 export const FORMATTED_RIFTS_CLOSED = 'Rifts closed';
+export const FORMATTED_COLOSSEUM_GLORY = 'Colosseum Glory';
+export const FORMATTED_COLLECTIONS_LOGGED = 'Collections Logged';
 
 export const INVALID_FORMAT_ERROR = 'Invalid hiscores format';
 export const PLAYER_NOT_FOUND_ERROR = 'Player not found';

tsconfig.json

@@ -6,10 +6,7 @@
     "outDir": "./lib",
     "strict": true,
     "lib": ["ES2015", "DOM", "DOM.Iterable"],
-    "typeRoots": [
+    "typeRoots": ["./node_modules/@types", "./src/@types"]
-      "./node_modules/@types",
-      "./src/@types"
-    ]
   },
   "include": ["src"],
   "exclude": ["node_modules", "**/__tests__/*"]

yarn.lock

@@ -1288,11 +1288,11 @@ available-typed-arrays@^1.0.5:
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
 axios@^1.6.2:
-  version "1.6.2"
+  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"
-  integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==
+  integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==
   dependencies:
-    follow-redirects "^1.15.0"
+    follow-redirects "^1.15.6"
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
@@ -1383,12 +1383,12 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.1, braces@^3.0.2:
+braces@^3.0.3:
-  version "3.0.2"
+  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.21.9:
   version "4.21.9"
@@ -1729,9 +1729,9 @@ cosmiconfig@^7.0.0:
     yaml "^1.10.0"
 
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
+  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -2392,10 +2392,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-fill-range@^7.0.1:
+fill-range@^7.1.1:
-  version "7.0.1"
+  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -2428,10 +2428,10 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
   integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
 
-follow-redirects@^1.15.0:
+follow-redirects@^1.15.6:
-  version "1.15.3"
+  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -4092,20 +4092,12 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micromatch@^4.0.2:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
-  version "4.0.2"
+  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.1"
+    braces "^3.0.3"
-    picomatch "^2.0.5"
-
-micromatch@^4.0.4, micromatch@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
-  dependencies:
-    braces "^3.0.2"
     picomatch "^2.3.1"
 
 mime-db@1.45.0:
@@ -4667,7 +4659,7 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -5847,9 +5839,9 @@ write-file-atomic@^4.0.2:
     signal-exit "^3.0.7"
 
 ws@^8.13.0:
-  version "8.13.0"
+  version "8.17.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"