groupBy

package.json

@@ -31,7 +31,7 @@
     "style-loader": "^3.3.2",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.2",
     "webpack": "^5.76.2",
     "webpack-cli": "^5.0.1",
     "webpack-dev-server": "^5.0.2",

src/base.ts

@@ -256,19 +256,6 @@ export function renderLink(id: string, type: ItemType, names: I18nObject) {
   )}">${formatName(names)}</a>`;
 }
 
-export function groupBy<W, T>(f: (w: W) => T, ws?: W[]): Map<T, W[]> {
-  const map = new Map<T, W[]>();
-  return (
-    ws?.reduce((m, w) => {
-      const key = f(w);
-      const arr = m.get(key) ?? [];
-      arr.push(w);
-      m.set(key, arr);
-      return m;
-    }, map) ?? map
-  );
-}
-
 function renderQTableRow(
   materials: Material[],
   objects: (OfMaterial | [Domain, number])[],

src/components/characters_table.ts

@@ -1,4 +1,4 @@
-import { TYPE_CHARACTER, groupBy, renderLink } from "../base";
+import { TYPE_CHARACTER, renderLink } from "../base";
 import { hasBookmarks } from "../bookmarks";
 import { DELIMITER, I18nObject, formatName } from "../i18n";
 import { Character, characters } from "../models/characters";
@@ -8,7 +8,7 @@ const title: I18nObject = { en: "Characters", "zh-CN": "角色" };
 export class CharactersTable extends HTMLElement {
   constructor() {
     super();
-    const byRarity = groupBy((o) => o.rarity, characters);
+    const byRarity = Map.groupBy(characters, ({ rarity }) => rarity);
     const rarities = Array.from(byRarity.keys()).sort().reverse();
     this.innerHTML = `<details class="section" ${hasBookmarks() ? "" : "open"}>
         <summary>🦸 ${formatName(title)}</summary>

src/components/enemies_table.ts

@@ -7,7 +7,6 @@ import {
   TYPE_WEEKLY_BOSS,
   getTimezone,
   getWeekday,
-  groupBy,
   renderDomainLink,
   renderLink,
 } from "../base";
@@ -37,14 +36,14 @@ const regions: Record<Region, I18nObject> = {
 export class EnemiesTable extends HTMLElement {
   constructor() {
     super();
-    const weeklyBosses: Map<Region, Enemies.Boss[]> = groupBy(
-      (b) => b.region,
+    const weeklyBosses: Map<Region, Enemies.Boss[]> = Map.groupBy(
       Enemies.bosses.filter((b) => b.type === TYPE_WEEKLY_BOSS),
+      (b) => b.region,
     );
     const weeklyBossKeys = Array.from(weeklyBosses.keys());
-    const bosses: Map<Region, Enemies.Boss[]> = groupBy(
-      (b) => b.region,
+    const bosses: Map<Region, Enemies.Boss[]> = Map.groupBy(
       Enemies.bosses.filter((b) => b.type === TYPE_BOSS),
+      ({ region }) => region,
     );
     const bossKeys = Array.from(bosses.keys());
     const talentDomains = Enemies.domains.filter(

src/components/weapons_table.ts

@@ -1,4 +1,4 @@
-import { TYPE_WEAPON, groupBy, renderLink } from "../base";
+import { TYPE_WEAPON, renderLink } from "../base";
 import { hasBookmarks } from "../bookmarks";
 import { DELIMITER, I18nObject, formatName } from "../i18n";
 import { Category, Weapon, weapons } from "../models/weapons";
@@ -7,15 +7,15 @@ const title: I18nObject = { en: "Weapons", "zh-CN": "武器" };
 export class WeaponsTable extends HTMLElement {
   constructor() {
     super();
-    const byRarity = groupBy((w) => w.rarity, weapons);
+    const byRarity = Map.groupBy(weapons, ({ rarity }) => rarity);
     const rarities = Array.from(byRarity.keys()).sort().reverse();
     this.innerHTML = `<details class="section" ${hasBookmarks() ? "" : "open"}>
       <summary>🗡️ ${formatName(title)}</summary><table class="ctable">
       ${rarities
         .map((rarity) => {
-          const ws2: Map<Category, Weapon[]> = groupBy(
-            (w) => w.category,
-            byRarity.get(rarity),
+          const ws2: Map<Category, Weapon[]> = Map.groupBy(
+            byRarity.get(rarity) || [],
+            ({ category }) => category,
           );
           const categories = Array.from(ws2.keys());
           return `<tr><th rowspan="${categories.length}">${"⭐".repeat(rarity)}</th>

tsconfig.json

@@ -2,7 +2,7 @@
     "compilerOptions": {
         "lib": [
             "DOM",
-            "ES2023"
+            "ESNext"
         ],
         "module": "ES2020",
         "moduleResolution": "node",