fix: some linting for new proto 5

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(