fix: self core imports

packages/core/src/blitz/canSplash.ts

@@ -1,5 +1,5 @@
-import { type ShellDefinition, ShellType } from '@blitzkit/core';
+import { ShellDefinition, ShellType } from "../protos";
 
-export function canSplash(type: ShellDefinition['type']): type is ShellType.HE {
+export function canSplash(type: ShellDefinition["type"]): type is ShellType.HE {
   return type === ShellType.HE;
 }

packages/core/src/blitz/generateStats.ts

@@ -1,4 +1,4 @@
-import { BlitzStats, calculateWN8 } from '@blitzkit/core';
+import { BlitzStats, calculateWN8 } from "../statistics";
 
 export type Stat = keyof ReturnType<typeof generateStats>;
 

packages/core/src/blitz/getAccountAchievements.ts

@@ -1,5 +1,6 @@
-import { fetchBlitz, Region } from '@blitzkit/core';
-import { normalizeIds } from './normalizeIds';
+import { fetchBlitz } from "./fetchBlitz";
+import { normalizeIds } from "./normalizeIds";
+import { Region } from "./regions";
 
 interface IndividualAccountAchievements {
   achievements: {
@@ -22,11 +23,11 @@ export async function getAccountAchievements<
 >(region: Region, ids: Ids) {
   const object = await fetchBlitz<AccountAchievements>(
     region,
-    'account/achievements',
-    { account_id: normalizeIds(ids) },
+    "account/achievements",
+    { account_id: normalizeIds(ids) }
   );
 
-  if (typeof ids === 'number') {
+  if (typeof ids === "number") {
     return object[ids as number] as ReturnType;
   } else {
     return ids.map((id) => object[id]) as ReturnType;

packages/core/src/blitz/getAccountInfo.ts

@@ -1,10 +1,7 @@
-import {
-  BlitzStats,
-  FetchBlitzParams,
-  Region,
-  fetchBlitz,
-} from '@blitzkit/core';
-import { normalizeIds } from './normalizeIds';
+import { BlitzStats } from "../statistics";
+import { FetchBlitzParams, fetchBlitz } from "./fetchBlitz";
+import { normalizeIds } from "./normalizeIds";
+import { Region } from "./regions";
 
 export interface SupplementaryStats {
   WN8?: number;
@@ -83,15 +80,15 @@ export async function getAccountInfo<
   region: Region,
   ids: Ids,
   extra: string[] = [],
-  params: FetchBlitzParams = {},
+  params: FetchBlitzParams = {}
 ) {
-  const object = await fetchBlitz<AccountInfo>(region, 'account/info', {
+  const object = await fetchBlitz<AccountInfo>(region, "account/info", {
     account_id: normalizeIds(ids),
-    extra: extra.length === 0 ? undefined : extra.join(','),
+    extra: extra.length === 0 ? undefined : extra.join(","),
     ...params,
   });
 
-  if (typeof ids === 'number') {
+  if (typeof ids === "number") {
     return object[ids as number] as ReturnType;
   } else {
     return ids.map((id) => object[id]) as ReturnType;

packages/core/src/blitz/getClanAccountInfo.ts

@@ -1,5 +1,6 @@
-import { fetchBlitz, Region } from '@blitzkit/core';
-import { normalizeIds } from './normalizeIds';
+import { fetchBlitz } from "./fetchBlitz";
+import { normalizeIds } from "./normalizeIds";
+import { Region } from "./regions";
 
 type IndividualClanAccountInfo = {
   account_id: number;
@@ -30,14 +31,14 @@ export async function getClanAccountInfo<
 >(region: Region, ids: Ids, extra: string[] = []) {
   const object = await fetchBlitz<ClanAccountInfo>(
     region,
-    'clans/accountinfo',
+    "clans/accountinfo",
     {
       account_id: normalizeIds(ids),
-      extra: extra.length === 0 ? undefined : extra.join(','),
-    },
+      extra: extra.length === 0 ? undefined : extra.join(","),
+    }
   );
 
-  if (typeof ids === 'number') {
+  if (typeof ids === "number") {
     return object[ids as number] as ReturnType;
   } else {
     return ids.map((id) => object[id]) as ReturnType;

packages/core/src/blitz/getClanInfo.ts

@@ -1,5 +1,6 @@
-import { fetchBlitz, Region } from '@blitzkit/core';
-import { normalizeIds } from './normalizeIds';
+import { fetchBlitz } from "./fetchBlitz";
+import { normalizeIds } from "./normalizeIds";
+import { Region } from "./regions";
 
 interface IndividualClanInfo {
   recruiting_options: {
@@ -38,11 +39,11 @@ export async function getClanInfo<
   Ids extends number | number[],
   ReturnType = Ids extends number ? IndividualClanInfo : IndividualClanInfo[],
 >(region: Region, ids: Ids) {
-  const object = await fetchBlitz<ClanInfo>(region, 'clans/info', {
+  const object = await fetchBlitz<ClanInfo>(region, "clans/info", {
     clan_id: normalizeIds(ids),
   });
 
-  if (typeof ids === 'number') {
+  if (typeof ids === "number") {
     return object[ids as number] as ReturnType;
   } else {
     return ids.map((id) => object[id]) as ReturnType;

packages/core/src/blitz/getLeagueFromScore.ts

@@ -1,4 +1,4 @@
-import { LEAGUES } from '@blitzkit/core';
+import { LEAGUES } from "./rating";
 
 export function getLeagueFromScore(score: number) {
   return LEAGUES.find(({ minScore }) => score >= minScore)!;

packages/core/src/blitz/getRatingInfo.ts

@@ -1,7 +1,8 @@
-import { RatingLeague, RatingReward, Region } from '@blitzkit/core';
-import { context } from '../blitzkit/context';
-import { patientFetch } from '../blitzkit/patientFetch';
-import { regionToRegionSubdomain } from './regionToRegionSubdomain';
+import { context } from "../blitzkit/context";
+import { patientFetch } from "../blitzkit/patientFetch";
+import { RatingLeague, RatingReward } from "./rating";
+import { Region } from "./regions";
+import { regionToRegionSubdomain } from "./regionToRegionSubdomain";
 
 export type RatingInfo =
   | {
@@ -26,12 +27,12 @@ export async function getRatingInfo(region: Region) {
   if (cache[region]) return cache[region]!;
 
   const response = await patientFetch(
-    context === 'website'
+    context === "website"
       ? `/api/${region}/rating/current/info`
       : `https://${regionToRegionSubdomain(
-          region,
+          region
         )}.wotblitz.com/en/api/rating-leaderboards/season/`,
-    undefined,
+    undefined
   );
   const data = (await response.json()) as RatingInfo;
 

packages/core/src/blitz/getRatingLeague.ts

@@ -1,27 +1,29 @@
-import { LeagueTop, RatingPlayer, Region } from '@blitzkit/core';
-import { context } from '../blitzkit/context';
-import { patientFetch } from '../blitzkit/patientFetch';
-import { regionToRegionSubdomain } from './regionToRegionSubdomain';
+import { context } from "../blitzkit/context";
+import { patientFetch } from "../blitzkit/patientFetch";
+import { RatingPlayer } from "../statistics";
+import { LeagueTop } from "./rating";
+import { Region } from "./regions";
+import { regionToRegionSubdomain } from "./regionToRegionSubdomain";
 
 export async function getRatingLeague(
   region: Region,
   league: number,
-  usePatientFetcher = false,
+  usePatientFetcher = false
 ) {
   const fetcher = (url: string) =>
     usePatientFetcher
-      ? patientFetch(url, undefined, { cache: 'no-store' })
-      : fetch(url, { cache: 'no-store' });
+      ? patientFetch(url, undefined, { cache: "no-store" })
+      : fetch(url, { cache: "no-store" });
   const response = await fetcher(
-    context === 'website'
+    context === "website"
       ? `/api/${region}/rating/current/league/${league}`
       : `https://${regionToRegionSubdomain(
-          region,
-        )}.wotblitz.com/en/api/rating-leaderboards/league/${league}/top/`,
+          region
+        )}.wotblitz.com/en/api/rating-leaderboards/league/${league}/top/`
   );
   const json = await response.json();
 
-  return context === 'website'
+  return context === "website"
     ? (json as RatingPlayer[])
     : (json as LeagueTop).result;
 }

packages/core/src/blitz/getRatingNeighbors.ts

@@ -1,24 +1,25 @@
-import { RatingNeighbors, Region } from '@blitzkit/core';
-import { patientFetch } from '../blitzkit/patientFetch';
-import { withCORSProxy } from '../blitzkit/withCORSProxy';
-import { regionToRegionSubdomain } from './regionToRegionSubdomain';
+import { patientFetch } from "../blitzkit/patientFetch";
+import { withCORSProxy } from "../blitzkit/withCORSProxy";
+import { RatingNeighbors } from "./rating";
+import { Region } from "./regions";
+import { regionToRegionSubdomain } from "./regionToRegionSubdomain";
 
 export async function getRatingNeighbors(
   region: Region,
   id: number,
   count: number,
-  usePatientFetcher = false,
+  usePatientFetcher = false
 ) {
   const fetcher = (url: string) =>
     usePatientFetcher
-      ? patientFetch(url, undefined, { cache: 'no-store' })
-      : fetch(url, { cache: 'no-store' });
+      ? patientFetch(url, undefined, { cache: "no-store" })
+      : fetch(url, { cache: "no-store" });
   const response = await fetcher(
     withCORSProxy(
       `https://${regionToRegionSubdomain(
-        region,
-      )}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${count}`,
-    ),
+        region
+      )}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${count}`
+    )
   );
   const json = (await response.json()) as RatingNeighbors;
 

packages/core/src/blitz/getTankStats.ts

@@ -1,16 +1,13 @@
-import {
-  fetchBlitz,
-  FetchBlitzParams,
-  Region,
-  TanksStats,
-} from '@blitzkit/core';
+import { TanksStats } from "../types";
+import { FetchBlitzParams, fetchBlitz } from "./fetchBlitz";
+import { Region } from "./regions";
 
 export async function getTankStats(
   region: Region,
   id: number,
-  params?: FetchBlitzParams,
+  params?: FetchBlitzParams
 ) {
-  const tankStats = await fetchBlitz<TanksStats>(region, 'tanks/stats', {
+  const tankStats = await fetchBlitz<TanksStats>(region, "tanks/stats", {
     account_id: id,
     ...params,
   });

packages/core/src/blitz/isOnGoingRatingSeason.ts

@@ -1,6 +1,6 @@
-import { getRatingInfo } from '@blitzkit/core';
+import { getRatingInfo } from "./getRatingInfo";
 
 export async function isOnGoingRatingSeason() {
-  const ratingInfo = await getRatingInfo('com');
+  const ratingInfo = await getRatingInfo("com");
   return ratingInfo.detail === undefined;
 }

packages/core/src/blitz/isValidBlitzId.ts

@@ -1,4 +1,6 @@
-import { Region, assertSecret, idToRegion } from '@blitzkit/core';
+import { assertSecret } from "../blitzkit";
+import { idToRegion } from "./idToRegion";
+import { Region } from "./regions";
 
 export async function isValidBlitzId(id: number, token?: string) {
   let region: Region;
@@ -11,20 +13,20 @@ export async function isValidBlitzId(id: number, token?: string) {
 
   const json = await fetch(
     `https://api.wotblitz.${region}/wotb/account/info/?account_id=${id}&application_id=${assertSecret(
-      import.meta.env.PUBLIC_WARGAMING_APPLICATION_ID,
+      import.meta.env.PUBLIC_WARGAMING_APPLICATION_ID
     )}${
-      token === undefined ? '' : `&access_token=${token}`
-    }&fields=account_id%2C-account_id`,
+      token === undefined ? "" : `&access_token=${token}`
+    }&fields=account_id%2C-account_id`
   ).then(
     (response) =>
       response.json() as Promise<
         | {
-            status: 'ok';
+            status: "ok";
             data: Record<number, {} | null>;
           }
-        | { status: 'error' }
-      >,
+        | { status: "error" }
+      >
   );
 
-  return json.status === 'ok' && json.data[id] !== null;
+  return json.status === "ok" && json.data[id] !== null;
 }

packages/core/src/blitz/regionSubdomainToRegion.ts

@@ -1,5 +1,5 @@
-import { Region, RegionSubdomain } from '@blitzkit/core';
+import { Region, RegionSubdomain } from "./regions";
 
 export function regionSubdomainToRegion(regionDomain: RegionSubdomain): Region {
-  return regionDomain === 'na' ? 'com' : regionDomain;
+  return regionDomain === "na" ? "com" : regionDomain;
 }

packages/core/src/blitz/regionToRegionSubdomain.ts

@@ -1,5 +1,5 @@
-import { Region, RegionSubdomain } from '@blitzkit/core';
+import { Region, RegionSubdomain } from "./regions";
 
 export function regionToRegionSubdomain(regionDomain: Region): RegionSubdomain {
-  return regionDomain === 'com' ? 'na' : regionDomain;
+  return regionDomain === "com" ? "na" : regionDomain;
 }

packages/core/src/blitz/searchClansAcrossRegions.ts

@@ -1,5 +1,6 @@
-import { fetchBlitz, Region } from '@blitzkit/core';
-import { ClanList } from './clans';
+import { ClanList } from "./clans";
+import { fetchBlitz } from "./fetchBlitz";
+import { Region } from "./regions";
 
 export async function searchClansAcrossRegions(search: string, limit = 25) {
   const trimmed = search.trim();
@@ -10,38 +11,38 @@ export async function searchClansAcrossRegions(search: string, limit = 25) {
 
   return (
     await Promise.all([
-      fetchBlitz<ClanList>('com', 'clans/list', {
+      fetchBlitz<ClanList>("com", "clans/list", {
         search,
         limit: normalizedLimit,
       }).then((value) =>
         value
           .map((account) => ({
             ...account,
-            region: 'com' as Region,
+            region: "com" as Region,
           }))
-          .splice(0, normalizedLimit),
+          .splice(0, normalizedLimit)
       ),
-      fetchBlitz<ClanList>('eu', 'clans/list', {
+      fetchBlitz<ClanList>("eu", "clans/list", {
         search,
         limit: normalizedLimit,
       }).then((value) =>
         value
           .map((account) => ({
             ...account,
-            region: 'eu' as Region,
+            region: "eu" as Region,
           }))
-          .splice(0, normalizedLimit),
+          .splice(0, normalizedLimit)
       ),
-      fetchBlitz<ClanList>('asia', 'clans/list', {
+      fetchBlitz<ClanList>("asia", "clans/list", {
         search,
         limit: normalizedLimit,
       }).then((value) =>
         value
           .map((account) => ({
             ...account,
-            region: 'asia' as Region,
+            region: "asia" as Region,
           }))
-          .splice(0, normalizedLimit),
+          .splice(0, normalizedLimit)
       ),
     ])
   )

packages/core/src/blitz/searchCurrentRatingPlayers.ts

@@ -1,6 +1,6 @@
-import { Region } from '@blitzkit/core';
-import { context } from '../blitzkit/context';
-import { regionToRegionSubdomain } from './regionToRegionSubdomain';
+import { context } from "../blitzkit/context";
+import { Region } from "./regions";
+import { regionToRegionSubdomain } from "./regionToRegionSubdomain";
 
 type CurrentRatingPlayerSearch = Record<
   number,
@@ -27,12 +27,12 @@ type CurrentRatingPlayerSearch = Record<
 export async function searchCurrentRatingPlayers(region: Region, name: string) {
   const encodedSearch = encodeURIComponent(name);
   const response = await fetch(
-    context === 'website'
+    context === "website"
       ? `/api/${region}/rating/current/search/${encodedSearch}`
       : `https://${regionToRegionSubdomain(
-          region,
+          region
         )}.wotblitz.com/en/api/rating-leaderboards/search/?prefix=${encodedSearch}`,
-    { cache: 'no-store' },
+    { cache: "no-store" }
   );
   const accountList = (await response.json()) as CurrentRatingPlayerSearch;
 

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

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

packages/core/src/blitz/toUniqueId.ts

@@ -1,4 +1,4 @@
-import { NATION_IDS } from "@blitzkit/core";
+import { NATION_IDS } from "./nations";
 
 export function toUniqueId(nation: string, id: number) {
   return (id << 8) + (NATION_IDS[nation] << 4) + 1;