fix: more imports 3

packages/api/src/app/[region]/rating/current/league/[league]/route.ts

@@ -1,5 +1,4 @@
-import { Region } from '@blitzkit/core';
+import { getRatingLeague, Region } from '@blitzkit/core';
-import { getRatingLeague } from '@blitzkit/core/src/blitz/getRatingLeague';
 import { NextResponse } from 'next/server';
 
 export async function GET(

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

@@ -3,14 +3,14 @@ import {
   BlitzStats,
   calculateWN8,
   filterStats,
+  getAccountInfo,
+  getClanAccountInfo,
+  getTankStats,
   getWN8Percentile,
   StatFilters,
   TankDefinition,
   tankDefinitions,
 } from '@blitzkit/core';
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
-import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo';
-import { getTankStats } from '@blitzkit/core/src/blitz/getTankStats';
 import { Locale } from 'discord.js';
 import { chunk } from 'lodash';
 import { UserError } from '../../../../website/src/hooks/userError';

packages/bot/src/commands/evolution.tsx

@@ -1,5 +1,4 @@
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
+import { getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
-import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo';
 import { Locale, SlashCommandSubcommandGroupBuilder } from 'discord.js';
 import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { CommandWrapper } from '../components/CommandWrapper';

packages/bot/src/commands/fullStats.tsx

@@ -1,6 +1,10 @@
-import { StatFilters, filterStats, getTierWeights } from '@blitzkit/core';
+import {
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
+  StatFilters,
-import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo';
+  filterStats,
+  getAccountInfo,
+  getClanAccountInfo,
+  getTierWeights,
+} from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { CommandWrapper } from '../components/CommandWrapper';

packages/bot/src/commands/inactive.tsx

@@ -1,5 +1,4 @@
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
+import { getAccountInfo, getClanInfo } from '@blitzkit/core';
-import { getClanInfo } from '@blitzkit/core/src/blitz/getClanInfo';
 import { Locale } from 'discord.js';
 import { CommandWrapper } from '../components/CommandWrapper';
 import { GenericStats } from '../components/GenericStats';

packages/bot/src/commands/link.tsx

@@ -1,5 +1,4 @@
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
+import { getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
-import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo';
 import { teal } from '@radix-ui/colors';
 import { linkBlitzAndDiscord } from '../../../website/src/core/blitzkit/linkBlitzAndDiscord';
 import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';

packages/bot/src/commands/ownedTanks.tsx

@@ -5,10 +5,10 @@ import {
   Tier,
   flags,
   gameDefinitions,
+  getAccountInfo,
+  getTankStats,
   tankDefinitions,
 } from '@blitzkit/core';
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
-import { getTankStats } from '@blitzkit/core/src/blitz/getTankStats';
 import { chunk } from 'lodash';
 import markdownEscape from 'markdown-escape';
 import { addTierChoices } from '../core/discord/addTierChoices';

packages/bot/src/commands/playerInfo.ts

@@ -1,4 +1,4 @@
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
+import { getAccountInfo } from '@blitzkit/core';
 import markdownEscape from 'markdown-escape';
 import { addUsernameChoices } from '../core/discord/addUsernameChoices';
 import { autocompleteUsername } from '../core/discord/autocompleteUsername';

packages/bot/src/commands/rating.tsx

@@ -1,13 +1,13 @@
 import {
   BkrlFormat,
   deltaBkrlBlitzStats,
+  getAccountInfo,
+  getArchivedRatingMidnightLeaderboard,
+  getClanAccountInfo,
   getLeagueFromScore,
   getRatingInfo,
+  getRatingNeighbors,
 } from '@blitzkit/core';
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
-import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo';
-import { getRatingNeighbors } from '@blitzkit/core/src/blitz/getRatingNeighbors';
-import { getArchivedRatingMidnightLeaderboard } from '@blitzkit/core/src/blitzkit/getArchivedRatingMidnightLeaderboard';
 import { SlashCommandSubcommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';

packages/bot/src/commands/ratingLeaderboard.tsx

@@ -1,19 +1,19 @@
 import {
   BkrlDiscriminatedEntries,
   FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
+  getAccountInfo,
   getArchivedLatestSeasonNumber,
   getArchivedRatingInfo,
   getArchivedRatingLeaderboard,
+  getArchivedRatingMidnightLeaderboard,
+  getClanAccountInfo,
   getRatingInfo,
+  getRatingLeague,
+  getRatingNeighbors,
   LEAGUES,
   RatingInfo,
   Region,
 } from '@blitzkit/core';
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
-import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo';
-import { getRatingLeague } from '@blitzkit/core/src/blitz/getRatingLeague';
-import { getRatingNeighbors } from '@blitzkit/core/src/blitz/getRatingNeighbors';
-import { getArchivedRatingMidnightLeaderboard } from '@blitzkit/core/src/blitzkit/getArchivedRatingMidnightLeaderboard';
 import {
   APIApplicationCommandOptionChoice,
   Locale,

packages/bot/src/commands/replay.tsx

@@ -1,12 +1,12 @@
 import {
   blitzStarsTankAverages,
   calculateWN8,
+  getClanAccountInfo,
   idToRegion,
   tankDefinitions,
   tankIcon,
   TIER_ROMAN_NUMERALS,
 } from '@blitzkit/core';
-import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo';
 import { clamp } from 'lodash';
 import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { iconPng } from '../../../website/src/core/blitzkit/iconPng';

packages/bot/src/commands/research.tsx

@@ -1,13 +1,13 @@
 import {
   asset,
   equipmentPriceMatrix,
+  getAccountInfo,
+  getClanAccountInfo,
+  getTankStats,
   TANK_ICONS,
   tankDefinitions,
   TIER_ROMAN_NUMERALS,
 } from '@blitzkit/core';
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
-import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo';
-import { getTankStats } from '@blitzkit/core/src/blitz/getTankStats';
 import { escapeMarkdown, Locale } from 'discord.js';
 import { buildTechTreeLine } from '../../../website/src/core/blitzkit/buildTechTreeLine';
 import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';

packages/bot/src/commands/searchClans.ts

@@ -1,5 +1,4 @@
-import { ClanList, Region } from '@blitzkit/core';
+import { ClanList, fetchBlitz, Region } from '@blitzkit/core';
-import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz';
 import { Locale } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import { addClanChoices } from '../core/discord/addClanChoices';

packages/bot/src/commands/searchPlayers.ts

@@ -1,5 +1,9 @@
-import { AccountList, fetchBlitz, Region } from '@blitzkit/core';
+import {
-import { usernamePattern } from '@blitzkit/core/src/blitz/searchPlayersAcrossRegions/constants';
+  AccountList,
+  fetchBlitz,
+  Region,
+  usernamePattern,
+} from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import { addRegionChoices } from '../core/discord/addRegionChoices';

packages/bot/src/commands/stats.tsx

@@ -1,6 +1,9 @@
-import { StatFilters, filterStats } from '@blitzkit/core';
+import {
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
+  StatFilters,
-import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo';
+  filterStats,
+  getAccountInfo,
+  getClanAccountInfo,
+} from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL';
 import { AllStatsOverview } from '../components/AllStatsOverview';

packages/bot/src/components/AllStatsOverview/index.tsx

@@ -1,5 +1,8 @@
-import { getWN8Percentile, Percentile } from '@blitzkit/core';
+import {
-import { SupplementaryStats } from '@blitzkit/core/src/blitz/getAccountInfo';
+  getWN8Percentile,
+  Percentile,
+  SupplementaryStats,
+} from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { translator } from '../../core/localization/translator';
 import { PERCENTILE_COLORS } from '../PercentileIndicator/constants';

packages/bot/src/components/GenericAllStats/index.tsx

@@ -1,5 +1,9 @@
-import { BlitzStats, getWN8Percentile, isNumber } from '@blitzkit/core';
+import {
-import { SupplementaryStats } from '@blitzkit/core/src/blitz/getAccountInfo';
+  BlitzStats,
+  getWN8Percentile,
+  isNumber,
+  SupplementaryStats,
+} from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { translator } from '../../core/localization/translator';
 import { Card } from './components/Card';

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

@@ -1,5 +1,4 @@
-import { Region } from '@blitzkit/core';
+import { getAccountInfo, Region } from '@blitzkit/core';
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
 import { buttonLink } from '../discord/buttonLink';
 
 export async function getBlitzStarsLinkButton(

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

@@ -1,5 +1,4 @@
-import { Region, emptyAllStats } from '@blitzkit/core';
+import { Region, emptyAllStats, getAccountInfo } from '@blitzkit/core';
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
 import {
   GetHistoriesOptions,
   Histories,

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

@@ -1,5 +1,4 @@
-import { Region, emptyAllStats } from '@blitzkit/core';
+import { Region, emptyAllStats, getTankStats } from '@blitzkit/core';
-import { getTankStats } from '@blitzkit/core/src/blitz/getTankStats';
 import { Locale } from 'discord.js';
 import { UserError } from '../../../../website/src/hooks/userError';
 import {

packages/bot/tsconfig.json

@@ -1,4 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src/**/*", "../core/src/blitz/getRatingInfo.ts"]
+  "include": ["src/**/*"]
 }

packages/core/src/blitz/getAccountAchievements.ts

@@ -1,5 +1,4 @@
-import { Region } from '@blitzkit/core';
+import { fetchBlitz, Region } from '@blitzkit/core';
-import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz';
 import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds';
 
 interface IndividualAccountAchievements {

packages/core/src/blitz/getAccountInfo.ts

@@ -1,8 +1,9 @@
-import { BlitzStats, Region } from '@blitzkit/core';
 import {
+  BlitzStats,
   FetchBlitzParams,
+  Region,
   fetchBlitz,
-} from '@blitzkit/core/src/blitz/fetchBlitz';
+} from '@blitzkit/core';
 import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds';
 
 export interface SupplementaryStats {

packages/core/src/blitz/getClanAccountInfo.ts

@@ -1,5 +1,4 @@
-import { Region } from '@blitzkit/core';
+import { fetchBlitz, Region } from '@blitzkit/core';
-import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz';
 import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds';
 
 type IndividualClanAccountInfo = {

packages/core/src/blitz/getClanInfo.ts

@@ -1,5 +1,4 @@
-import { Region } from '@blitzkit/core';
+import { fetchBlitz, Region } from '@blitzkit/core';
-import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz';
 import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds';
 
 interface IndividualClanInfo {

packages/core/src/blitz/getTankStats.ts

@@ -1,8 +1,9 @@
-import { Region, TanksStats } from '@blitzkit/core';
 import {
   fetchBlitz,
   FetchBlitzParams,
-} from '@blitzkit/core/src/blitz/fetchBlitz';
+  Region,
+  TanksStats,
+} from '@blitzkit/core';
 
 export async function getTankStats(
   region: Region,

packages/core/src/blitz/searchPlayersAcrossRegions/index.ts

@@ -1,5 +1,4 @@
-import { Region } from '@blitzkit/core';
+import { fetchBlitz, Region } from '@blitzkit/core';
-import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz';
 import { usernamePattern } from './constants';
 
 export interface AccountListItem {

packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts

@@ -1,5 +1,4 @@
-import { assertSecret } from '@blitzkit/core';
+import { assertSecret, getRatingInfo } from '@blitzkit/core';
-import { getRatingInfo } from '@blitzkit/core/src/blitz/getRatingInfo';
 
 interface GitHubTrees {
   tree: { path: string; url: string }[];

packages/scripts/src/averages.ts

@@ -10,10 +10,10 @@ import {
   averageDefinitionsAllStatsKeys,
   emptySamples,
   encodeProtobufToBase64,
+  getAccountInfo,
   getTankStats,
   idToRegion,
 } from '@blitzkit/core';
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
 import { chunk, times } from 'lodash';
 import { commitAssets } from './core/github/commitAssets';
 import { fetchPreDiscoveredIds } from './core/github/fetchPreDiscoveredIds';

packages/scripts/src/buildRatingLeaderboard.ts

@@ -5,6 +5,7 @@ import {
   BkrlWriteStream,
   CdonValue,
   CdonWriteStream,
+  getAccountInfo,
   RatingInfo,
   RatingNeighbors,
   RatingPlayer,
@@ -12,7 +13,6 @@ import {
   regionSubdomainToRegion,
   superCompress,
 } from '@blitzkit/core';
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
 import { chunk } from 'lodash';
 import { argv } from 'process';
 import { patientFetchJSON } from '../../website/src/core/blitzkit/patientFetchJSON';

packages/scripts/src/discoverIds.ts

@@ -5,10 +5,10 @@ import {
   REGIONS,
   Region,
   asset,
+  getAccountInfo,
   idToRegion,
+  retryAbleBlitzFetchEvent,
 } from '@blitzkit/core';
-import { retryAbleBlitzFetchEvent } from '@blitzkit/core/src/blitz/fetchBlitz';
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
 import { chunk, times, uniq } from 'lodash';
 import { compress, decompress } from 'lz4js';
 import { DiscoveredIdsDefinitions } from '../../website/src/core/blitzkit/discoveredIdDefinitions';

packages/website/src/app/tools/rating/page.tsx

@@ -3,8 +3,15 @@
 import {
   AccountList,
   AccountListItem,
+  fetchBlitz,
   FIRST_MINIMAL_ARCHIVED_RATING_SEASON,
   getArchivedLatestSeasonNumber,
+  getArchivedRatingInfo,
+  getArchivedRatingLeaderboard,
+  getClanAccountInfo,
+  getRatingInfo,
+  getRatingLeague,
+  getRatingNeighbors,
   LEAGUES,
   RatingInfo,
   RatingPlayer,
@@ -13,13 +20,6 @@ import {
   UNLOCALIZED_REGION_NAMES,
   Var,
 } from '@blitzkit/core';
-import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz';
-import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo';
-import { getRatingInfo } from '@blitzkit/core/src/blitz/getRatingInfo';
-import { getRatingLeague } from '@blitzkit/core/src/blitz/getRatingLeague';
-import { getRatingNeighbors } from '@blitzkit/core/src/blitz/getRatingNeighbors';
-import { getArchivedRatingInfo } from '@blitzkit/core/src/blitzkit/getArchivedRatingInfo';
-import { getArchivedRatingLeaderboard } from '@blitzkit/core/src/blitzkit/getArchivedRatingLeaderboard';
 import { blackA, orangeDark } from '@radix-ui/colors';
 import { MagnifyingGlassIcon } from '@radix-ui/react-icons';
 import {

packages/website/src/app/tools/session/page.tsx

@@ -2,27 +2,23 @@
 
 import {
   AccountListWithServer,
+  IndividualAccountInfo,
   IndividualTankStats,
-  UNLOCALIZED_REGION_NAMES_SHORT,
-  blitzStarsTankAverages,
-  deltaTankStats,
-  idToRegion,
-  searchPlayersAcrossRegions,
-  tankDefinitions,
-} from '@blitzkit/core';
-import {
   STAT_KEYS,
   STAT_NAMES,
   Stat,
+  UNLOCALIZED_REGION_NAMES_SHORT,
+  blitzStarsTankAverages,
+  deltaTankStats,
   generateStats,
-  prettifyStats,
-  sumBlitzStarsStats,
-} from '@blitzkit/core/src/blitz/generateStats';
-import {
-  IndividualAccountInfo,
   getAccountInfo,
-} from '@blitzkit/core/src/blitz/getAccountInfo';
+  getTankStats,
-import { getTankStats } from '@blitzkit/core/src/blitz/getTankStats';
+  idToRegion,
+  prettifyStats,
+  searchPlayersAcrossRegions,
+  sumBlitzStarsStats,
+  tankDefinitions,
+} from '@blitzkit/core';
 import {
   ArrowDownIcon,
   MagnifyingGlassIcon,

packages/website/src/components/Navbar/components/WargamingAccountName.tsx

@@ -1,5 +1,4 @@
-import { idToRegion } from '@blitzkit/core';
+import { getAccountInfo, idToRegion } from '@blitzkit/core';
-import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo';
 import { Text } from '@radix-ui/themes';
 import { use, useMemo } from 'react';
 import * as App from '../../../stores/app';

packages/website/src/core/blitz/isOnGoingRatingSeason.ts

@@ -1,4 +1,4 @@
-import { getRatingInfo } from '@blitzkit/core/src/blitz/getRatingInfo';
+import { getRatingInfo } from '@blitzkit/core';
 
 export async function isOnGoingRatingSeason() {
   const ratingInfo = await getRatingInfo('com');

packages/website/src/stores/session.ts

@@ -3,9 +3,9 @@
 import {
   IndividualTankStats,
   Region,
+  Stat,
   createNextSafeStore,
 } from '@blitzkit/core';
-import { Stat } from '@blitzkit/core/src/blitz/generateStats';
 import { merge } from 'lodash';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';

packages/website/tsconfig.json

@@ -7,25 +7,5 @@
       }
     ]
   },
-  "include": [
+  "include": ["src/**/*", ".next/types/**/*.ts"]
-    "src/**/*",
-    ".next/types/**/*.ts",
-    "../core/src/blitz/getRatingInfo.ts",
-    "../core/src/blitz/getLeagueFromScore.ts",
-    "../bot/src/core/blitz/normalizeLeagueIcon.ts",
-    "../core/src/blitzkit/getArchivedLatestSeasonNumber.ts",
-    "../core/src/blitzkit/getArchivedRatingInfo.ts",
-    "../core/src/blitzkit/getArchivedRatingLeaderboard.ts",
-    "../core/src/blitzkit/getArchivedRatingMidnightLeaderboard.ts",
-    "../core/src/blitz/fetchBlitz.ts",
-    "../core/src/blitz/regionSubdomainToRegion.ts",
-    "../core/src/blitz/generateStats.ts",
-    "../core/src/blitz/getAccountAchievements.ts",
-    "../core/src/blitz/getAccountInfo.ts",
-    "../core/src/blitz/getClanAccountInfo.ts",
-    "../core/src/blitz/getClanInfo.ts",
-    "../core/src/blitz/getRatingLeague.ts",
-    "../core/src/blitz/getRatingNeighbors.ts",
-    "../core/src/blitz/getTankStats.ts"
-  ]
 }