fix: some linting for new proto 5

packages/bot/src/commands/breakdown/render.tsx

@@ -188,7 +188,7 @@ export async function renderBreakdown(
           key={id}
           displayType="tank"
           class={tankDefinition?.class}
-          displayType={tankDefinition?.type}
+          type={tankDefinition?.type}
           title={
             tankDefinition?.name ??
             translate('bot.commands.breakdown.body.unknown_tank', [`${id}`])

packages/bot/src/commands/replay.tsx

@@ -1,11 +1,8 @@
 import {
-  blitzStarsTankAverages,
   calculateWN8,
   emblemURL,
   getClanAccountInfo,
   idToRegion,
-  mapDefinitions,
-  tankDefinitions,
   tankIcon,
   TIER_ROMAN_NUMERALS,
 } from '@blitzkit/core';
@@ -13,7 +10,12 @@ import { clamp } from 'lodash-es';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { TitleBar } from '../components/TitleBar';
 import { iconPng } from '../core/blitzkit/iconPng';
+import {
+  mapDefinitions,
+  tankDefinitions,
+} from '../core/blitzkit/nonBlockingPromises';
 import { RenderConfiguration } from '../core/blitzkit/renderConfiguration';
+import { blitzStarsTankAverages } from '../core/blitzstars/tankAverages';
 import { buttonLink } from '../core/discord/buttonLink';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
 import { CommandRegistry } from '../events/interactionCreate';
@@ -223,7 +225,7 @@ async function playerListing(
 ) {
   const awaitedTankAverages = await blitzStarsTankAverages;
   const awaitedTankDefinitions = await tankDefinitions;
-  const tank = awaitedTankDefinitions[player.vehicle_descr];
+  const tank = awaitedTankDefinitions.tanks[player.vehicle_descr];
   const blockAccent = recordingPlayer ? '_amber' : '';
   const healthAccent = protagonistTeam
     ? recordingPlayer
@@ -502,7 +504,7 @@ export const replayCommand = new Promise<CommandRegistry>((resolve) => {
               replayData.protagonist_team === replayData.winner_team
                 ? 'Victory'
                 : 'Defeat'
-            } • ${awaitedMapDefinitions[replayData.map_id].name}`}
+            } • ${awaitedMapDefinitions.maps[replayData.map_id].name}`}
           />
 
           <div

packages/bot/src/commands/research.tsx

@@ -6,7 +6,7 @@ import {
   getClanAccountInfo,
   getTankStats,
   TANK_ICONS,
-  tankDefinitions,
+  TankType,
   TIER_ROMAN_NUMERALS,
 } from '@blitzkit/core';
 import { escapeMarkdown, Locale } from 'discord.js';
@@ -15,6 +15,7 @@ import { TitleBar } from '../components/TitleBar';
 import { resolveTankId } from '../core/blitz/resolveTankId';
 import { buildTechTreeLine } from '../core/blitzkit/buildTechTreeLine';
 import { iconPng } from '../core/blitzkit/iconPng';
+import { tankDefinitions } from '../core/blitzkit/nonBlockingPromises';
 import { resolveAncestry } from '../core/blitzkit/resolveAncestry';
 import { tankIconPng } from '../core/blitzkit/tankIconPng';
 import { addUsernameChoices } from '../core/discord/addUsernameChoices';
@@ -76,7 +77,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
         true,
       );
       const startingTankRaw = interaction.options.getString('starting-tank');
-      const targetTank = awaitedTankDefinitions[targetTankId];
+      const targetTank = awaitedTankDefinitions.tanks[targetTankId];
       const { id, region } = await resolvePlayerFromCommand(interaction);
       let startingTankId: number;
       const targetTankAncestry = await resolveAncestry(targetTankId);
@@ -94,7 +95,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
           ]);
         }
 
-        const startingTank = awaitedTankDefinitions[startingTankId];
+        const startingTank = awaitedTankDefinitions.tanks[startingTankId];
 
         if (startingTank.tier > targetTank.tier) {
           return translate('bot.commands.research.errors.unordered', [
@@ -111,7 +112,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
           ]);
         }
       } else {
-        if (targetTank.treeType !== 'researchable') {
+        if (targetTank.type !== TankType.RESEARCHABLE) {
           return translate('bot.commands.research.errors.non_tech_tree', [
             escapeMarkdown(targetTank.name),
           ]);
@@ -137,7 +138,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
         const foundAncestor = targetTankAncestry.find(
           (id) =>
-            awaitedTankDefinitions[id].tier === 1 ||
+            awaitedTankDefinitions.tanks[id].tier === 1 ||
             tankStats.some(({ tank_id }) => tank_id === id),
         );
 
@@ -159,7 +160,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
       const clanImage = clan ? emblemURL(clan.emblem_set_id) : undefined;
       const costs = await Promise.all(
         line.map(async (id) => {
-          const tank = awaitedTankDefinitions[id];
+          const tank = awaitedTankDefinitions.tanks[id];
           const turretXps = new Map<number, number>();
           const gunXps = new Map<number, number>();
           const engineXps = new Map<number, number>();
@@ -171,8 +172,11 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
             }
 
             turret.guns.forEach((gun) => {
-              if (gun.xp !== undefined) {
-                gunXps.set(gun.id, gun.xp);
+              if (gun.gunType!.value.base.xp !== undefined) {
+                gunXps.set(
+                  gun.gunType!.value.base.id,
+                  gun.gunType!.value.base.xp,
+                );
               }
             });
           });
@@ -353,7 +357,7 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
 
             {await Promise.all(
               line.map(async (id, index) => {
-                const tank = awaitedTankDefinitions[id];
+                const tank = awaitedTankDefinitions.tanks[id];
 
                 return (
                   <div

packages/bot/src/core/blitz/resolveTankId.ts

@@ -1,7 +1,7 @@
-import { tankDefinitions, tankNames } from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { go } from 'fuzzysort';
 import markdownEscape from 'markdown-escape';
+import { tankNames } from '../blitzkit/nonBlockingPromises';
 import { UserError } from '../blitzkit/userError';
 import { tankNamesTechTreeOnly } from '../discord/autocompleteTanks';
 import { translator } from '../localization/translator';

packages/bot/src/core/blitzkit/buildTechTreeLine.ts

@@ -1,9 +1,9 @@
-import { tankDefinitions } from '@blitzkit/core';
+import { fetchTankDefinitions } from '@blitzkit/core';
 import { resolveAncestry } from './resolveAncestry';
 
 export async function buildTechTreeLine(start: number, end: number) {
-  const awaitedTankDefinitions = await tankDefinitions;
-  const endTank = awaitedTankDefinitions[end];
+  const tankDefinitions = await fetchTankDefinitions();
+  const endTank = tankDefinitions.tanks[end];
   if (!endTank.ancestors) throw new Error('End tank has no ancestors');
   const line = [end];
 

packages/bot/src/core/blitzkit/filtersToDescription.ts

@@ -1,30 +1,30 @@
 import {
-  StatFilters,
-  tankDefinitions,
+  fetchTankDefinitions,
   Tier,
   TIER_ROMAN_NUMERALS,
 } from '@blitzkit/core';
 import { Locale } from 'discord.js';
+import { StatFilters } from '../blitzstars/filterStats';
 import { translator } from '../localization/translator';
 
 export async function filtersToDescription(
-  { nation, tier, tankType, treeType, tank }: StatFilters,
+  { nation, tier, type, class: tankClass, tank }: StatFilters,
   locale: Locale,
 ) {
   const { translate } = translator(locale);
-  const awaitedTankDefinitions = await tankDefinitions;
+  const awaitedTankDefinitions = await fetchTankDefinitions();
   const info: string[] = [];
 
   // TODO: somehow localize tank names?
-  if (tank) return awaitedTankDefinitions[tank].name;
+  if (tank) return awaitedTankDefinitions.tanks[tank].name;
   if (nation) info.push(translate(`common.nations.${nation}`));
   if (tier) {
     info.push(
       translate('bot.common.filters.tier', [TIER_ROMAN_NUMERALS[tier as Tier]]),
     );
   }
-  if (tankType) info.push(translate(`common.tank_class_short.${tankType}`));
-  if (treeType) info.push(translate(`common.tree_type.${treeType}`));
+  if (tankClass) info.push(translate(`common.tank_class_short.${tankClass}`));
+  if (type) info.push(translate(`common.tree_type.${type}`));
 
   return info.length === 0
     ? translate('bot.common.filters.none')

packages/bot/src/core/blitzkit/nonBlockingPromises.ts

@@ -1,4 +1,11 @@
-import { fetchGameDefinitions, fetchTankDefinitions } from '@blitzkit/core';
+import {
+  fetchGameDefinitions,
+  fetchMapDefinitions,
+  fetchTankDefinitions,
+  fetchTankNames,
+} from '@blitzkit/core';
 
 export const tankDefinitions = fetchTankDefinitions();
 export const gameDefinitions = fetchGameDefinitions();
+export const tankNames = fetchTankNames();
+export const mapDefinitions = fetchMapDefinitions();

packages/bot/src/core/blitzkit/resolveAncestry.ts

@@ -1,8 +1,8 @@
-import { tankDefinitions } from '@blitzkit/core';
+import { fetchTankDefinitions } from '@blitzkit/core';
 
 export async function resolveAncestry(id: number) {
-  const awaitedTankDefinitions = await tankDefinitions;
-  const tank = awaitedTankDefinitions[id];
+  const tankDefinitions = await fetchTankDefinitions();
+  const tank = tankDefinitions.tanks[id];
   const ancestors: number[] = [];
 
   if (tank.ancestors) {
@@ -20,6 +20,6 @@ export async function resolveAncestry(id: number) {
   }
 
   return ancestors.sort(
-    (a, b) => awaitedTankDefinitions[b].tier - awaitedTankDefinitions[a].tier,
+    (a, b) => tankDefinitions.tanks[b].tier - tankDefinitions.tanks[a].tier,
   );
 }

packages/bot/src/core/discord/autocompleteTanks.ts

@@ -1,4 +1,4 @@
-import { tankNames } from '@blitzkit/core';
+import { fetchTankNames, TankType } from '@blitzkit/core';
 import {
   ApplicationCommandOptionChoiceData,
   AutocompleteInteraction,
@@ -9,9 +9,10 @@ import {
   DISCORD_CHOICES_MAX_NAME_SIZE,
   OVERFLOW_SUFFIX,
 } from './autocompleteClan/constants';
+import { tankNames } from '../blitzkit/nonBlockingPromises';
 
-export const tankNamesTechTreeOnly = tankNames.then((names) =>
-  names.filter((tank) => tank.treeType === 'researchable'),
+export const tankNamesTechTreeOnly = fetchTankNames().then((names) =>
+  names.filter((tank) => tank.treeType === TankType.RESEARCHABLE),
 );
 
 export async function autocompleteTanks(