fix: some linting for new proto 2

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

@@ -1,15 +1,11 @@
 import {
-  blitzStarsTankAverages,
   BlitzStats,
   calculateWN8,
-  filterStats,
   getAccountInfo,
   getClanAccountInfo,
   getTankStats,
   getWN8Percentile,
-  StatFilters,
   TankDefinition,
-  tankDefinitions,
 } from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { chunk } from 'lodash-es';
@@ -18,8 +14,11 @@ import { CommandWrapper } from '../../components/CommandWrapper';
 import { NoData } from '../../components/NoData';
 import { TitleBar } from '../../components/TitleBar';
 import { filtersToDescription } from '../../core/blitzkit/filtersToDescription';
+import { tankDefinitions } from '../../core/blitzkit/nonBlockingPromises';
 import { UserError } from '../../core/blitzkit/userError';
+import { filterStats, StatFilters } from '../../core/blitzstars/filterStats';
 import { getStatsInPeriod } from '../../core/blitzstars/getStatsInPeriod';
+import { blitzStarsTankAverages } from '../../core/blitzstars/tankAverages';
 import { ResolvedPeriod } from '../../core/discord/resolvePeriodFromCommand';
 import { ResolvedPlayer } from '../../core/discord/resolvePlayerFromCommand';
 import { translator } from '../../core/localization/translator';
@@ -136,7 +135,7 @@ export async function renderBreakdown(
     children.push(
       <Breakdown.Row
         key={id}
-        type="summary"
+        displayType="summary"
         title={t`bot.commands.breakdown.body.total`}
         stats={[
           {
@@ -176,7 +175,7 @@ export async function renderBreakdown(
     );
 
     filteredOrder.forEach((id, index) => {
-      const tankDefinition = awaitedTankDefinitions[id] as
+      const tankDefinition = awaitedTankDefinitions.tanks[id] as
         | TankDefinition
         | undefined;
       const current = orderedCurrentStats[index];
@@ -187,9 +186,9 @@ export async function renderBreakdown(
       children.push(
         <Breakdown.Row
           key={id}
-          type="tank"
-          tankType={tankDefinition?.class}
-          treeType={tankDefinition?.treeType}
+          displayType="tank"
+          class={tankDefinition?.class}
+          displayType={tankDefinition?.type}
           title={
             tankDefinition?.name ??
             translate('bot.commands.breakdown.body.unknown_tank', [`${id}`])

packages/bot/src/components/Breakdown/components/Row.tsx

@@ -1,8 +1,8 @@
 import {
   Percentile,
   TankClass,
+  TankType,
   TREE_TYPE_ICONS,
-  TreeType,
 } from '@blitzkit/core';
 import { createColors } from 'bepaint';
 import {
@@ -21,12 +21,12 @@ export interface RowStatItem {
 }
 
 interface RowProps {
-  type?: 'tank' | 'summary';
+  displayType?: 'tank' | 'summary';
   naked?: boolean;
   title: string;
   minimized?: boolean;
-  treeType?: TreeType;
-  tankType?: TankClass;
+  type?: TankType;
+  class?: TankClass;
   color?: AccentColor | GrayColor;
   stats: (RowStatItem | undefined)[];
 }
@@ -36,10 +36,10 @@ export function Row({
   stats,
   title,
   minimized,
-  tankType,
-  treeType,
-  naked = false,
+  class: tankClass,
   type,
+  naked = false,
+  displayType,
 }: RowProps) {
   const palette = PALETTES[`${color}Dark`];
   const theme = createColors(palette);
@@ -70,10 +70,10 @@ export function Row({
             : theme.componentInteractive,
         }}
       >
-        {type === 'tank' && tankType !== undefined && (
+        {displayType === 'tank' && tankClass !== undefined && (
           <img
-            alt={tankType}
-            src={TREE_TYPE_ICONS[treeType ?? 'researchable'][tankType]}
+            alt={TankClass[tankClass]}
+            src={TREE_TYPE_ICONS[type ?? TankType.RESEARCHABLE][tankClass]}
             style={{ width: 16, height: 16 }}
           />
         )}
@@ -81,8 +81,8 @@ export function Row({
         <span
           style={{
             color:
-              type === 'tank'
-                ? treeType === 'collector'
+              displayType === 'tank'
+                ? type === TankType.COLLECTOR
                   ? theme.textLowContrast_blue
                   : treeType === 'premium'
                     ? theme.textLowContrast_amber

packages/bot/src/core/blitzstars/filterStats.ts

@@ -1,15 +1,16 @@
-import { blitzStarsTankAverages } from './tankAverages';
+import { TankClass, TankType } from '@blitzkit/core';
 import { SupplementaryStats } from '@blitzkit/core/src/blitz/getAccountInfo';
-import { tankDefinitions, TreeType } from '@blitzkit/core/src/blitzkit/tankDefinitions';
 import { calculateWN8 } from '@blitzkit/core/src/statistics/calculateWN8';
 import { BlitzStats } from '@blitzkit/core/src/statistics/compositeStats';
 import { sumAllStats } from '@blitzkit/core/src/statistics/sumAllStats';
+import { tankDefinitions } from '../blitzkit/nonBlockingPromises';
+import { blitzStarsTankAverages } from './tankAverages';
 
 export interface StatFilters {
   nation?: string;
   tier?: number;
-  tankType?: string;
-  treeType?: TreeType;
+  class?: TankClass;
+  type?: TankType;
   tank?: number;
 }
 
@@ -23,18 +24,20 @@ export async function filterStats(
   const awaitedTankDefinitions = await tankDefinitions;
   const awaitedTankAverages = await blitzStarsTankAverages;
   const filteredOrder = order.filter((id) => {
-    const entry = awaitedTankDefinitions[id];
+    const entry = awaitedTankDefinitions.tanks[id];
 
     return (
       entry &&
       (filters.nation === undefined || entry.nation === filters.nation) &&
       (filters.tier === undefined || entry.tier === filters.tier) &&
-      (filters.tankType === undefined || entry.class === filters.tankType) &&
-      (filters.treeType === undefined ||
-        (filters.treeType === 'collector' && entry.treeType === 'collector') ||
-        (filters.treeType === 'premium' && entry.treeType === 'premium') ||
-        (filters.treeType === 'researchable' &&
-          entry.treeType === 'researchable')) &&
+      (filters.class === undefined || entry.class === filters.class) &&
+      (filters.type === undefined ||
+        (filters.type === TankType.COLLECTOR &&
+          entry.type === TankType.COLLECTOR) ||
+        (filters.type === TankType.PREMIUM &&
+          entry.type === TankType.PREMIUM) ||
+        (filters.type === TankType.RESEARCHABLE &&
+          entry.type === TankType.RESEARCHABLE)) &&
       (filters.tank === undefined || entry.id === filters.tank)
     );
   });
@@ -46,7 +49,9 @@ export async function filterStats(
   );
   const battlesOfTanksWithTankDefinition = filteredOrder.reduce<number>(
     (accumulator, id) =>
-      awaitedTankDefinitions[id] ? accumulator + diff[id].battles : accumulator,
+      awaitedTankDefinitions.tanks[id]
+        ? accumulator + diff[id].battles
+        : accumulator,
     0,
   );
   const supplementary = {
@@ -63,8 +68,9 @@ export async function filterStats(
     tier:
       filteredOrder.reduce<number>(
         (accumulator, id) =>
-          awaitedTankDefinitions[id]
-            ? accumulator + awaitedTankDefinitions[id]!.tier * diff[id].battles
+          awaitedTankDefinitions.tanks[id]
+            ? accumulator +
+              awaitedTankDefinitions.tanks[id]!.tier * diff[id].battles
             : accumulator,
         0,
       ) / battlesOfTanksWithTankDefinition,

packages/bot/src/core/blitzstars/getStatsInPeriod.ts

@@ -1,10 +1,6 @@
-import {
-  BlitzStats,
-  DiffedTankStats,
-  emptyAllStats,
-  Region,
-} from '@blitzkit/core';
+import { BlitzStats, emptyAllStats, Region } from '@blitzkit/core';
 import { Locale } from 'discord.js';
+import { DiffedTankStats } from './filterStats';
 import {
   getTankHistories,
   TankHistories,