From 03a51c47bb5aac4851fb45697ff29d843e5a6122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sun, 12 Oct 2025 15:05:58 +0000 Subject: [PATCH] fix: self core imports --- bun.lock | 12 +++++----- packages/core/package.json | 10 ++++---- packages/core/src/blitz/canSplash.ts | 4 ++-- packages/core/src/blitz/generateStats.ts | 2 +- .../core/src/blitz/getAccountAchievements.ts | 11 +++++---- packages/core/src/blitz/getAccountInfo.ts | 19 +++++++-------- packages/core/src/blitz/getClanAccountInfo.ts | 13 +++++----- packages/core/src/blitz/getClanInfo.ts | 9 +++---- packages/core/src/blitz/getLeagueFromScore.ts | 2 +- packages/core/src/blitz/getRatingInfo.ts | 15 ++++++------ packages/core/src/blitz/getRatingLeague.ts | 24 ++++++++++--------- packages/core/src/blitz/getRatingNeighbors.ts | 21 ++++++++-------- packages/core/src/blitz/getTankStats.ts | 13 ++++------ .../core/src/blitz/isOnGoingRatingSeason.ts | 4 ++-- packages/core/src/blitz/isValidBlitzId.ts | 18 +++++++------- .../core/src/blitz/regionSubdomainToRegion.ts | 4 ++-- .../core/src/blitz/regionToRegionSubdomain.ts | 4 ++-- .../src/blitz/searchClansAcrossRegions.ts | 23 +++++++++--------- .../src/blitz/searchCurrentRatingPlayers.ts | 12 +++++----- .../blitz/searchPlayersAcrossRegions/index.ts | 3 ++- packages/core/src/blitz/toUniqueId.ts | 2 +- .../core/src/blitzkit/availableProvisions.ts | 12 ++++------ .../core/src/blitzkit/createDefaultSkills.ts | 4 ++-- .../blitzkit/getArchivedLatestSeasonNumber.ts | 17 ++++++------- .../blitzkit/getArchivedRatingLeaderboard.ts | 6 +++-- packages/core/src/blitzkit/getTimeDaysAgo.ts | 2 +- packages/core/src/blitzkit/isExplosive.ts | 4 ++-- .../core/src/blitzkit/normalizeBoundingBox.ts | 3 ++- packages/core/src/blitzkit/parseBkni.ts | 2 +- packages/core/src/blitzkit/tankIcon.ts | 2 +- .../core/src/blitzkit/unionBoundingBox.ts | 2 +- 31 files changed, 143 insertions(+), 136 deletions(-) diff --git a/bun.lock b/bun.lock index 3e432349f..44be6d8c9 100644 --- a/bun.lock +++ b/bun.lock @@ -57,22 +57,24 @@ "packages/core": { "name": "@blitzkit/core", "dependencies": { + "@blitzkit/i18n": "workspace:*", + "@bufbuild/protobuf": "^2.9.0", "@octokit/plugin-throttling": "^11.0.1", "@octokit/rest": "^22.0.0", "@prisma/client": "^6.16.2", + "@types/adm-zip": "^0.5.7", + "@types/lz4js": "^0.2.1", + "@types/three": "^0.180.0", "adm-zip": "^0.5.16", "crc": "^4.3.2", "dotenv": "^17.2.2", "lz4js": "^0.2.0", "pickleparser": "^0.2.1", "protobufjs": "^7.5.4", + "three": "^0.180.0", "ts-proto": "^2.7.7", "yaml": "^2.8.1", }, - "devDependencies": { - "@types/adm-zip": "^0.5.7", - "@types/lz4js": "^0.2.1", - }, }, "packages/i18n": { "name": "@blitzkit/i18n", @@ -2741,8 +2743,6 @@ "@blitzkit/app/typescript": ["typescript@5.6.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw=="], - "@blitzkit/core/@prisma/client": ["@prisma/client@6.16.2", "", { "peerDependencies": { "prisma": "*", "typescript": ">=5.1.0" }, "optionalPeers": ["prisma", "typescript"] }, "sha512-E00PxBcalMfYO/TWnXobBVUai6eW/g5OsifWQsQDzJYm7yaY+IRLo7ZLsaefi0QkTpxfuhFcQ/w180i6kX3iJw=="], - "@discordjs/rest/@discordjs/collection": ["@discordjs/collection@2.1.1", "", {}, "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg=="], "@discordjs/rest/undici": ["undici@6.21.3", "", {}, "sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw=="], diff --git a/packages/core/package.json b/packages/core/package.json index 1958fd6f2..f2187088d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -4,20 +4,22 @@ "type": "module", "main": "src/index.ts", "dependencies": { + "@blitzkit/i18n": "workspace:*", + "@bufbuild/protobuf": "^2.9.0", "@octokit/plugin-throttling": "^11.0.1", "@octokit/rest": "^22.0.0", "@prisma/client": "^6.16.2", + "@types/adm-zip": "^0.5.7", + "@types/lz4js": "^0.2.1", + "@types/three": "^0.180.0", "adm-zip": "^0.5.16", "crc": "^4.3.2", "dotenv": "^17.2.2", "lz4js": "^0.2.0", "pickleparser": "^0.2.1", "protobufjs": "^7.5.4", + "three": "^0.180.0", "ts-proto": "^2.7.7", "yaml": "^2.8.1" - }, - "devDependencies": { - "@types/adm-zip": "^0.5.7", - "@types/lz4js": "^0.2.1" } } diff --git a/packages/core/src/blitz/canSplash.ts b/packages/core/src/blitz/canSplash.ts index d9b4a8c5b..61746feb1 100644 --- a/packages/core/src/blitz/canSplash.ts +++ b/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; } diff --git a/packages/core/src/blitz/generateStats.ts b/packages/core/src/blitz/generateStats.ts index 84f8ea95e..5ae7ca19a 100644 --- a/packages/core/src/blitz/generateStats.ts +++ b/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; diff --git a/packages/core/src/blitz/getAccountAchievements.ts b/packages/core/src/blitz/getAccountAchievements.ts index b212b3513..b34a4c2e4 100644 --- a/packages/core/src/blitz/getAccountAchievements.ts +++ b/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( 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; diff --git a/packages/core/src/blitz/getAccountInfo.ts b/packages/core/src/blitz/getAccountInfo.ts index d0c1dfb7a..31836ee75 100644 --- a/packages/core/src/blitz/getAccountInfo.ts +++ b/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(region, 'account/info', { + const object = await fetchBlitz(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; diff --git a/packages/core/src/blitz/getClanAccountInfo.ts b/packages/core/src/blitz/getClanAccountInfo.ts index 715721f52..50cf07537 100644 --- a/packages/core/src/blitz/getClanAccountInfo.ts +++ b/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( 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; diff --git a/packages/core/src/blitz/getClanInfo.ts b/packages/core/src/blitz/getClanInfo.ts index c6ef99a9f..859e69226 100644 --- a/packages/core/src/blitz/getClanInfo.ts +++ b/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(region, 'clans/info', { + const object = await fetchBlitz(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; diff --git a/packages/core/src/blitz/getLeagueFromScore.ts b/packages/core/src/blitz/getLeagueFromScore.ts index ee58bcbb5..46d578d01 100644 --- a/packages/core/src/blitz/getLeagueFromScore.ts +++ b/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)!; diff --git a/packages/core/src/blitz/getRatingInfo.ts b/packages/core/src/blitz/getRatingInfo.ts index afe2f96dc..b22f740cd 100644 --- a/packages/core/src/blitz/getRatingInfo.ts +++ b/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; diff --git a/packages/core/src/blitz/getRatingLeague.ts b/packages/core/src/blitz/getRatingLeague.ts index 9946586ca..e0045140f 100644 --- a/packages/core/src/blitz/getRatingLeague.ts +++ b/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; } diff --git a/packages/core/src/blitz/getRatingNeighbors.ts b/packages/core/src/blitz/getRatingNeighbors.ts index 6a8e71962..39923b6ad 100644 --- a/packages/core/src/blitz/getRatingNeighbors.ts +++ b/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; diff --git a/packages/core/src/blitz/getTankStats.ts b/packages/core/src/blitz/getTankStats.ts index 30c277a6a..0f814e358 100644 --- a/packages/core/src/blitz/getTankStats.ts +++ b/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(region, 'tanks/stats', { + const tankStats = await fetchBlitz(region, "tanks/stats", { account_id: id, ...params, }); diff --git a/packages/core/src/blitz/isOnGoingRatingSeason.ts b/packages/core/src/blitz/isOnGoingRatingSeason.ts index b4adf9e7f..dbbfaa69e 100644 --- a/packages/core/src/blitz/isOnGoingRatingSeason.ts +++ b/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; } diff --git a/packages/core/src/blitz/isValidBlitzId.ts b/packages/core/src/blitz/isValidBlitzId.ts index 3eab4fed6..a1750c147 100644 --- a/packages/core/src/blitz/isValidBlitzId.ts +++ b/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; } - | { status: 'error' } - >, + | { status: "error" } + > ); - return json.status === 'ok' && json.data[id] !== null; + return json.status === "ok" && json.data[id] !== null; } diff --git a/packages/core/src/blitz/regionSubdomainToRegion.ts b/packages/core/src/blitz/regionSubdomainToRegion.ts index 2df097250..88fefa96a 100644 --- a/packages/core/src/blitz/regionSubdomainToRegion.ts +++ b/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; } diff --git a/packages/core/src/blitz/regionToRegionSubdomain.ts b/packages/core/src/blitz/regionToRegionSubdomain.ts index 8cdaf8f9c..4940e2299 100644 --- a/packages/core/src/blitz/regionToRegionSubdomain.ts +++ b/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; } diff --git a/packages/core/src/blitz/searchClansAcrossRegions.ts b/packages/core/src/blitz/searchClansAcrossRegions.ts index f0b868616..cd71d6545 100644 --- a/packages/core/src/blitz/searchClansAcrossRegions.ts +++ b/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('com', 'clans/list', { + fetchBlitz("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('eu', 'clans/list', { + fetchBlitz("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('asia', 'clans/list', { + fetchBlitz("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) ), ]) ) diff --git a/packages/core/src/blitz/searchCurrentRatingPlayers.ts b/packages/core/src/blitz/searchCurrentRatingPlayers.ts index e2c10edb0..9355d32d0 100644 --- a/packages/core/src/blitz/searchCurrentRatingPlayers.ts +++ b/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; diff --git a/packages/core/src/blitz/searchPlayersAcrossRegions/index.ts b/packages/core/src/blitz/searchPlayersAcrossRegions/index.ts index 8b1a4789b..2c47731e4 100644 --- a/packages/core/src/blitz/searchPlayersAcrossRegions/index.ts +++ b/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 { diff --git a/packages/core/src/blitz/toUniqueId.ts b/packages/core/src/blitz/toUniqueId.ts index 3c080081a..ef1803f93 100644 --- a/packages/core/src/blitz/toUniqueId.ts +++ b/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; diff --git a/packages/core/src/blitzkit/availableProvisions.ts b/packages/core/src/blitzkit/availableProvisions.ts index f4799f24c..2359f6f55 100644 --- a/packages/core/src/blitzkit/availableProvisions.ts +++ b/packages/core/src/blitzkit/availableProvisions.ts @@ -1,16 +1,12 @@ -import { - GunDefinition, - ProvisionDefinitions, - TankDefinition, -} from '@blitzkit/core'; -import { checkConsumableProvisionInclusivity } from './checkConsumableProvisionInclusivity'; +import { GunDefinition, ProvisionDefinitions, TankDefinition } from "../protos"; +import { checkConsumableProvisionInclusivity } from "./checkConsumableProvisionInclusivity"; export function availableProvisions( tank: TankDefinition, gun: GunDefinition, - provisionDefinitions: ProvisionDefinitions, + provisionDefinitions: ProvisionDefinitions ) { return Object.values(provisionDefinitions.provisions).filter((provision) => - checkConsumableProvisionInclusivity(provision, tank, gun), + checkConsumableProvisionInclusivity(provision, tank, gun) ); } diff --git a/packages/core/src/blitzkit/createDefaultSkills.ts b/packages/core/src/blitzkit/createDefaultSkills.ts index 25e3604bf..b36611f90 100644 --- a/packages/core/src/blitzkit/createDefaultSkills.ts +++ b/packages/core/src/blitzkit/createDefaultSkills.ts @@ -1,5 +1,5 @@ -import { SkillDefinitions } from '@blitzkit/core'; -import { permanentSkills } from '../blitz/permanentSkills'; +import { SkillDefinitions } from ".."; +import { permanentSkills } from "../blitz/permanentSkills"; export function createDefaultSkills(skillDefinitions: SkillDefinitions) { const skills: Record = {}; diff --git a/packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts b/packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts index 6479290d4..1b9d60c90 100644 --- a/packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts +++ b/packages/core/src/blitzkit/getArchivedLatestSeasonNumber.ts @@ -1,4 +1,5 @@ -import { assertSecret, getRatingInfo } from '@blitzkit/core'; +import { getRatingInfo } from "../blitz/getRatingInfo"; +import { assertSecret } from "./assertSecret"; interface GitHubTrees { tree: { path: string; url: string }[]; @@ -11,21 +12,21 @@ export async function getArchivedLatestSeasonNumber() { return cachedLatestArchivedSeasonNumber; } - const ratingInfo = await getRatingInfo('com'); + const ratingInfo = await getRatingInfo("com"); if (ratingInfo.detail) { const regionsURL = ( (await fetch( `https://api.github.com/repos/tresabhi/${assertSecret( - import.meta.env.PUBLIC_ASSET_REPO, - )}/git/trees/main`, + import.meta.env.PUBLIC_ASSET_REPO + )}/git/trees/main` ).then((response) => response.json())) as GitHubTrees - ).tree.find(({ path }) => path === 'regions')!.url; + ).tree.find(({ path }) => path === "regions")!.url; const comURL = ( (await fetch(regionsURL).then((response) => - response.json(), + response.json() )) as GitHubTrees - ).tree.find(({ path }) => path === 'com')!.url; + ).tree.find(({ path }) => path === "com")!.url; const ratingURL = ( (await fetch(comURL).then((response) => response.json())) as { tree: [{ url: string }]; @@ -36,7 +37,7 @@ export async function getArchivedLatestSeasonNumber() { (await fetch(ratingURL).then((response) => response.json())) as { tree: { path: string }[]; } - ).tree.map(({ path }) => Number(path)), + ).tree.map(({ path }) => Number(path)) ); cachedLatestArchivedSeasonNumber = latestSeason; diff --git a/packages/core/src/blitzkit/getArchivedRatingLeaderboard.ts b/packages/core/src/blitzkit/getArchivedRatingLeaderboard.ts index 4eee07a1b..75bc3b239 100644 --- a/packages/core/src/blitzkit/getArchivedRatingLeaderboard.ts +++ b/packages/core/src/blitzkit/getArchivedRatingLeaderboard.ts @@ -1,4 +1,6 @@ -import { asset, RatingLeaderboard, Region } from '@blitzkit/core'; +import { Region } from "../blitz/regions"; +import { RatingLeaderboard } from "../protos"; +import { asset } from "./asset"; const cache: Record> = { asia: {}, @@ -8,7 +10,7 @@ const cache: Record> = { export async function getArchivedRatingLeaderboard( region: Region, - season: number, + season: number ) { if (!cache[region][season]) { const info = await fetch(asset(`regions/${region}/rating/${season}.pb`)) diff --git a/packages/core/src/blitzkit/getTimeDaysAgo.ts b/packages/core/src/blitzkit/getTimeDaysAgo.ts index 579d38cc8..8f70463de 100644 --- a/packages/core/src/blitzkit/getTimeDaysAgo.ts +++ b/packages/core/src/blitzkit/getTimeDaysAgo.ts @@ -1,4 +1,4 @@ -import { Region } from '@blitzkit/core'; +import { Region } from "../blitz/regions"; const TIME_ZONE_MAPPINGS: Record = { com: -5, // Central North American Time diff --git a/packages/core/src/blitzkit/isExplosive.ts b/packages/core/src/blitzkit/isExplosive.ts index d487d17b8..8bafa89bf 100644 --- a/packages/core/src/blitzkit/isExplosive.ts +++ b/packages/core/src/blitzkit/isExplosive.ts @@ -1,7 +1,7 @@ -import { ShellDefinition, ShellType } from '@blitzkit/core'; +import { ShellDefinition, ShellType } from "../protos"; export function isExplosive( - type: ShellDefinition['type'], + type: ShellDefinition["type"] ): type is ShellType.HEAT | ShellType.HE { return type === ShellType.HEAT || type === ShellType.HE; } diff --git a/packages/core/src/blitzkit/normalizeBoundingBox.ts b/packages/core/src/blitzkit/normalizeBoundingBox.ts index f50d3e435..d060c249a 100644 --- a/packages/core/src/blitzkit/normalizeBoundingBox.ts +++ b/packages/core/src/blitzkit/normalizeBoundingBox.ts @@ -1,4 +1,5 @@ -import { BoundingBox, Vector3 } from '@blitzkit/core'; +import { Vector3 } from "three"; +import { BoundingBox } from "../protos"; export function normalizeBoundingBox(boundingBox: BoundingBox) { return { diff --git a/packages/core/src/blitzkit/parseBkni.ts b/packages/core/src/blitzkit/parseBkni.ts index c6074b093..c599f98e6 100644 --- a/packages/core/src/blitzkit/parseBkni.ts +++ b/packages/core/src/blitzkit/parseBkni.ts @@ -1,4 +1,4 @@ -import { BKNI_COLORS, BkniPercentile, getBkniPercentile } from '@blitzkit/core'; +import { BKNI_COLORS, BkniPercentile, getBkniPercentile } from "../statistics"; export function parseBkni(bkni: number) { const bkniFraction = (bkni + 1) / 2; diff --git a/packages/core/src/blitzkit/tankIcon.ts b/packages/core/src/blitzkit/tankIcon.ts index fbe4d1daa..546ef5f8f 100644 --- a/packages/core/src/blitzkit/tankIcon.ts +++ b/packages/core/src/blitzkit/tankIcon.ts @@ -1,4 +1,4 @@ -import { asset } from "@blitzkit/core"; +import { asset } from "./asset"; export const BLITZKIT_TANK_ICON_SIZE = { width: 40 * 16, height: 30 * 16 }; diff --git a/packages/core/src/blitzkit/unionBoundingBox.ts b/packages/core/src/blitzkit/unionBoundingBox.ts index b20748087..29964b34a 100644 --- a/packages/core/src/blitzkit/unionBoundingBox.ts +++ b/packages/core/src/blitzkit/unionBoundingBox.ts @@ -1,4 +1,4 @@ -import { BoundingBox } from '@blitzkit/core'; +import { BoundingBox } from "../protos"; export function unionBoundingBox(a: BoundingBox, b: BoundingBox) { return {