@wise-old-man/utils 2.0.0-beta.5 → 2.0.0-beta.7

package/dist/index.d.ts

@@ -459,20 +459,20 @@ declare const Skill: {
 };
 declare type Skill = typeof Skill[keyof typeof Skill];
 declare const Activity: {
-    LEAGUE_POINTS: string;
-    BOUNTY_HUNTER_HUNTER: string;
-    BOUNTY_HUNTER_ROGUE: string;
-    CLUE_SCROLLS_ALL: string;
-    CLUE_SCROLLS_BEGINNER: string;
-    CLUE_SCROLLS_EASY: string;
-    CLUE_SCROLLS_MEDIUM: string;
-    CLUE_SCROLLS_HARD: string;
-    CLUE_SCROLLS_ELITE: string;
-    CLUE_SCROLLS_MASTER: string;
-    LAST_MAN_STANDING: string;
-    PVP_ARENA: string;
-    SOUL_WARS_ZEAL: string;
-    GUARDIANS_OF_THE_RIFT: string;
+    readonly LEAGUE_POINTS: "league_points";
+    readonly BOUNTY_HUNTER_HUNTER: "bounty_hunter_hunter";
+    readonly BOUNTY_HUNTER_ROGUE: "bounty_hunter_rogue";
+    readonly CLUE_SCROLLS_ALL: "clue_scrolls_all";
+    readonly CLUE_SCROLLS_BEGINNER: "clue_scrolls_beginner";
+    readonly CLUE_SCROLLS_EASY: "clue_scrolls_easy";
+    readonly CLUE_SCROLLS_MEDIUM: "clue_scrolls_medium";
+    readonly CLUE_SCROLLS_HARD: "clue_scrolls_hard";
+    readonly CLUE_SCROLLS_ELITE: "clue_scrolls_elite";
+    readonly CLUE_SCROLLS_MASTER: "clue_scrolls_master";
+    readonly LAST_MAN_STANDING: "last_man_standing";
+    readonly PVP_ARENA: "pvp_arena";
+    readonly SOUL_WARS_ZEAL: "soul_wars_zeal";
+    readonly GUARDIANS_OF_THE_RIFT: "guardians_of_the_rift";
 };
 declare type Activity = typeof Activity[keyof typeof Activity];
 declare const Boss: {
@@ -586,20 +586,20 @@ declare const Metric: {
     readonly WINTERTODT: "wintertodt";
     readonly ZALCANO: "zalcano";
     readonly ZULRAH: "zulrah";
-    readonly LEAGUE_POINTS: string;
-    readonly BOUNTY_HUNTER_HUNTER: string;
-    readonly BOUNTY_HUNTER_ROGUE: string;
-    readonly CLUE_SCROLLS_ALL: string;
-    readonly CLUE_SCROLLS_BEGINNER: string;
-    readonly CLUE_SCROLLS_EASY: string;
-    readonly CLUE_SCROLLS_MEDIUM: string;
-    readonly CLUE_SCROLLS_HARD: string;
-    readonly CLUE_SCROLLS_ELITE: string;
-    readonly CLUE_SCROLLS_MASTER: string;
-    readonly LAST_MAN_STANDING: string;
-    readonly PVP_ARENA: string;
-    readonly SOUL_WARS_ZEAL: string;
-    readonly GUARDIANS_OF_THE_RIFT: string;
+    readonly LEAGUE_POINTS: "league_points";
+    readonly BOUNTY_HUNTER_HUNTER: "bounty_hunter_hunter";
+    readonly BOUNTY_HUNTER_ROGUE: "bounty_hunter_rogue";
+    readonly CLUE_SCROLLS_ALL: "clue_scrolls_all";
+    readonly CLUE_SCROLLS_BEGINNER: "clue_scrolls_beginner";
+    readonly CLUE_SCROLLS_EASY: "clue_scrolls_easy";
+    readonly CLUE_SCROLLS_MEDIUM: "clue_scrolls_medium";
+    readonly CLUE_SCROLLS_HARD: "clue_scrolls_hard";
+    readonly CLUE_SCROLLS_ELITE: "clue_scrolls_elite";
+    readonly CLUE_SCROLLS_MASTER: "clue_scrolls_master";
+    readonly LAST_MAN_STANDING: "last_man_standing";
+    readonly PVP_ARENA: "pvp_arena";
+    readonly SOUL_WARS_ZEAL: "soul_wars_zeal";
+    readonly GUARDIANS_OF_THE_RIFT: "guardians_of_the_rift";
     readonly OVERALL: "overall";
     readonly ATTACK: "attack";
     readonly DEFENCE: "defence";
@@ -1187,233 +1187,6 @@ declare const Country: {
 };
 declare type Country = typeof Country[keyof typeof Country];
 
-declare enum CompetitionStatus {
-    UPCOMING = "upcoming",
-    ONGOING = "ongoing",
-    FINISHED = "finished"
-}
-declare type CompetitionStatusPropsMap = {
-    [status in CompetitionStatus]: {
-        name: string;
-    };
-};
-declare type CompetitionTypePropsMap = {
-    [type in CompetitionType]: {
-        name: string;
-    };
-};
-declare const CompetitionTypeProps: CompetitionTypePropsMap;
-declare const CompetitionStatusProps: CompetitionStatusPropsMap;
-declare const COMPETITION_TYPES: ("classic" | "team")[];
-declare const COMPETITION_STATUSES: CompetitionStatus[];
-declare function isCompetitionType(typeString: string): typeString is CompetitionType;
-declare function isCompetitionStatus(statusString: string): statusString is CompetitionStatus;
-
-interface CountryDetails {
-    code: Country;
-    name: string;
-}
-declare type CountryPropsMap = {
-    [c in Country]: CountryDetails;
-};
-declare const CountryProps: CountryPropsMap;
-declare const COUNTRY_CODES: ("AD" | "AE" | "AF" | "AG" | "AI" | "AL" | "AM" | "AO" | "AQ" | "AR" | "AS" | "AT" | "AU" | "AW" | "AX" | "AZ" | "BA" | "BB" | "BD" | "BE" | "BF" | "BG" | "BH" | "BI" | "BJ" | "BL" | "BM" | "BN" | "BO" | "BQ" | "BR" | "BS" | "BT" | "BV" | "BW" | "BY" | "BZ" | "CA" | "CC" | "CD" | "CF" | "CG" | "CH" | "CI" | "CK" | "CL" | "CM" | "CN" | "CO" | "CR" | "CU" | "CV" | "CW" | "CX" | "CY" | "CZ" | "DE" | "DJ" | "DK" | "DM" | "DO" | "DZ" | "EC" | "EE" | "EG" | "EH" | "ER" | "ES" | "ET" | "FI" | "FJ" | "FK" | "FM" | "FO" | "FR" | "GA" | "GB" | "GD" | "GE" | "GF" | "GG" | "GH" | "GI" | "GL" | "GM" | "GN" | "GP" | "GQ" | "GR" | "GS" | "GT" | "GU" | "GW" | "GY" | "HK" | "HM" | "HN" | "HR" | "HT" | "HU" | "ID" | "IE" | "IL" | "IM" | "IN" | "IO" | "IQ" | "IR" | "IS" | "IT" | "JE" | "JM" | "JO" | "JP" | "KE" | "KG" | "KH" | "KI" | "KM" | "KN" | "KP" | "KR" | "KW" | "KY" | "KZ" | "LA" | "LB" | "LC" | "LI" | "LK" | "LR" | "LS" | "LT" | "LU" | "LV" | "LY" | "MA" | "MC" | "MD" | "ME" | "MF" | "MG" | "MH" | "MK" | "ML" | "MM" | "MN" | "MO" | "MP" | "MQ" | "MR" | "MS" | "MT" | "MU" | "MV" | "MW" | "MX" | "MY" | "MZ" | "NA" | "NC" | "NE" | "NF" | "NG" | "NI" | "NL" | "NO" | "NP" | "NR" | "NU" | "NZ" | "OM" | "PA" | "PE" | "PF" | "PG" | "PH" | "PK" | "PL" | "PM" | "PN" | "PR" | "PS" | "PT" | "PW" | "PY" | "QA" | "RE" | "RO" | "RS" | "RU" | "RW" | "SA" | "SB" | "SC" | "SD" | "SE" | "SG" | "SH" | "SI" | "SJ" | "SK" | "SL" | "SM" | "SN" | "SO" | "SR" | "SS" | "ST" | "SV" | "SX" | "SY" | "SZ" | "TC" | "TD" | "TF" | "TG" | "TH" | "TJ" | "TK" | "TL" | "TM" | "TN" | "TO" | "TR" | "TT" | "TV" | "TW" | "TZ" | "UA" | "UG" | "UM" | "US" | "UY" | "UZ" | "VA" | "VC" | "VE" | "VG" | "VI" | "VN" | "VU" | "WF" | "WS" | "YE" | "YT" | "ZA" | "ZM" | "ZW")[];
-declare function isCountry(countryCodeString: string): countryCodeString is Country;
-declare function findCountry(countryIdentifier: string): CountryDetails | undefined;
-declare function findCountryByName(countryName: string): CountryDetails | undefined;
-declare function findCountryByCode(countryCode: string): CountryDetails | undefined;
-
-declare const MAX_LEVEL = 99;
-declare const MAX_VIRTUAL_LEVEL = 126;
-declare const MAX_SKILL_EXP = 200000000;
-declare const SKILL_EXP_AT_99 = 13034431;
-declare const CAPPED_MAX_TOTAL_XP: number;
-declare function getExpForLevel(level: number): number;
-declare function getLevel(exp: number, virtual?: boolean): number;
-declare function getCombatLevel(attack: number, strength: number, defence: number, ranged: number, magic: number, hitpoints: number, prayer: number): number;
-
-declare const GROUP_ROLES: ("magic" | "slayer" | "hunter" | "achiever" | "adamant" | "adept" | "administrator" | "admiral" | "adventurer" | "air" | "anchor" | "apothecary" | "archer" | "armadylean" | "artillery" | "artisan" | "asgarnian" | "assassin" | "assistant" | "astral" | "athlete" | "attacker" | "bandit" | "bandosian" | "barbarian" | "battlemage" | "beast" | "berserker" | "blisterwood" | "blood" | "blue" | "bob" | "body" | "brassican" | "brawler" | "brigadier" | "brigand" | "bronze" | "bruiser" | "bulwark" | "burglar" | "burnt" | "cadet" | "captain" | "carry" | "champion" | "chaos" | "cleric" | "collector" | "colonel" | "commander" | "competitor" | "completionist" | "constructor" | "cook" | "coordinator" | "corporal" | "cosmic" | "councillor" | "crafter" | "crew" | "crusader" | "cutpurse" | "death" | "defender" | "defiler" | "deputy_owner" | "destroyer" | "diamond" | "diseased" | "doctor" | "dogsbody" | "dragon" | "dragonstone" | "druid" | "duellist" | "earth" | "elite" | "emerald" | "enforcer" | "epic" | "executive" | "expert" | "explorer" | "farmer" | "feeder" | "fighter" | "fire" | "firemaker" | "firestarter" | "fisher" | "fletcher" | "forager" | "fremennik" | "gamer" | "gatherer" | "general" | "gnome_child" | "gnome_elder" | "goblin" | "gold" | "goon" | "green" | "grey" | "guardian" | "guthixian" | "harpoon" | "healer" | "hellcat" | "helper" | "herbologist" | "hero" | "holy" | "hoarder" | "ignitor" | "illusionist" | "imp" | "infantry" | "inquisitor" | "iron" | "jade" | "justiciar" | "kandarin" | "karamjan" | "kharidian" | "kitten" | "knight" | "labourer" | "law" | "leader" | "learner" | "legacy" | "legend" | "legionnaire" | "lieutenant" | "looter" | "lumberjack" | "magician" | "major" | "maple" | "marshal" | "master" | "maxed" | "mediator" | "medic" | "mentor" | "member" | "merchant" | "mind" | "miner" | "minion" | "misthalinian" | "mithril" | "moderator" | "monarch" | "morytanian" | "mystic" | "myth" | "natural" | "nature" | "necromancer" | "ninja" | "noble" | "novice" | "nurse" | "oak" | "officer" | "onyx" | "opal" | "oracle" | "orange" | "owner" | "page" | "paladin" | "pawn" | "pilgrim" | "pine" | "pink" | "prefect" | "priest" | "private" | "prodigy" | "proselyte" | "prospector" | "protector" | "pure" | "purple" | "pyromancer" | "quester" | "racer" | "raider" | "ranger" | "record_chaser" | "recruit" | "recruiter" | "red_topaz" | "red" | "rogue" | "ruby" | "rune" | "runecrafter" | "sage" | "sapphire" | "saradominist" | "saviour" | "scavenger" | "scholar" | "scourge" | "scout" | "scribe" | "seer" | "senator" | "sentry" | "serenist" | "sergeant" | "shaman" | "sheriff" | "short_green_guy" | "skiller" | "skulled" | "smiter" | "smith" | "smuggler" | "sniper" | "soul" | "specialist" | "speed_runner" | "spellcaster" | "squire" | "staff" | "steel" | "strider" | "striker" | "summoner" | "superior" | "supervisor" | "teacher" | "templar" | "therapist" | "thief" | "tirannian" | "trialist" | "trickster" | "tzkal" | "tztok" | "unholy" | "vagrant" | "vanguard" | "walker" | "wanderer" | "warden" | "warlock" | "warrior" | "water" | "wild" | "willow" | "wily" | "wintumber" | "witch" | "wizard" | "worker" | "wrath" | "xerician" | "yellow" | "yew" | "zamorakian" | "zarosian" | "zealot" | "zenyte")[];
-declare const PRIVELEGED_GROUP_ROLES: GroupRole[];
-declare type GroupRolePropsMap = {
-    [role in GroupRole]: {
-        name: string;
-        isPriveleged: boolean;
-    };
-};
-declare const GroupRoleProps: GroupRolePropsMap;
-declare function findGroupRole(roleName: string): GroupRole | null;
-declare function isGroupRole(roleString: string): roleString is GroupRole;
-
-declare enum MetricType {
-    SKILL = "skill",
-    BOSS = "boss",
-    ACTIVITY = "activity",
-    COMPUTED = "computed"
-}
-declare enum MetricMeasure {
-    EXPERIENCE = "experience",
-    KILLS = "kills",
-    SCORE = "score",
-    VALUE = "value"
-}
-interface SkillProperties {
-    name: string;
-    isCombat: boolean;
-    isMembers: boolean;
-    type: MetricType;
-    measure: MetricMeasure;
-}
-interface BossProperties {
-    name: string;
-    minimumKc: number;
-    isMembers: boolean;
-    type: MetricType;
-    measure: MetricMeasure;
-}
-interface ComputedMetricProperties {
-    name: string;
-    type: MetricType;
-    measure: MetricMeasure;
-}
-declare const MetricProps: {
-    ehp: ComputedMetricProperties;
-    ehb: ComputedMetricProperties;
-    abyssal_sire: BossProperties;
-    alchemical_hydra: BossProperties;
-    barrows_chests: BossProperties;
-    bryophyta: BossProperties;
-    callisto: BossProperties;
-    cerberus: BossProperties;
-    chambers_of_xeric: BossProperties;
-    chambers_of_xeric_challenge_mode: BossProperties;
-    chaos_elemental: BossProperties;
-    chaos_fanatic: BossProperties;
-    commander_zilyana: BossProperties;
-    corporeal_beast: BossProperties;
-    crazy_archaeologist: BossProperties;
-    dagannoth_prime: BossProperties;
-    dagannoth_rex: BossProperties;
-    dagannoth_supreme: BossProperties;
-    deranged_archaeologist: BossProperties;
-    general_graardor: BossProperties;
-    giant_mole: BossProperties;
-    grotesque_guardians: BossProperties;
-    hespori: BossProperties;
-    kalphite_queen: BossProperties;
-    king_black_dragon: BossProperties;
-    kraken: BossProperties;
-    kreearra: BossProperties;
-    kril_tsutsaroth: BossProperties;
-    mimic: BossProperties;
-    nex: BossProperties;
-    nightmare: BossProperties;
-    phosanis_nightmare: BossProperties;
-    obor: BossProperties;
-    sarachnis: BossProperties;
-    scorpia: BossProperties;
-    skotizo: BossProperties;
-    tempoross: BossProperties;
-    the_gauntlet: BossProperties;
-    the_corrupted_gauntlet: BossProperties;
-    theatre_of_blood: BossProperties;
-    theatre_of_blood_hard_mode: BossProperties;
-    thermonuclear_smoke_devil: BossProperties;
-    tombs_of_amascut: BossProperties;
-    tombs_of_amascut_expert: BossProperties;
-    tzkal_zuk: BossProperties;
-    tztok_jad: BossProperties;
-    venenatis: BossProperties;
-    vetion: BossProperties;
-    vorkath: BossProperties;
-    wintertodt: BossProperties;
-    zalcano: BossProperties;
-    zulrah: BossProperties;
-    overall: SkillProperties;
-    attack: SkillProperties;
-    defence: SkillProperties;
-    strength: SkillProperties;
-    hitpoints: SkillProperties;
-    ranged: SkillProperties;
-    prayer: SkillProperties;
-    magic: SkillProperties;
-    cooking: SkillProperties;
-    woodcutting: SkillProperties;
-    fletching: SkillProperties;
-    fishing: SkillProperties;
-    firemaking: SkillProperties;
-    crafting: SkillProperties;
-    smithing: SkillProperties;
-    mining: SkillProperties;
-    herblore: SkillProperties;
-    agility: SkillProperties;
-    thieving: SkillProperties;
-    slayer: SkillProperties;
-    farming: SkillProperties;
-    runecrafting: SkillProperties;
-    hunter: SkillProperties;
-    construction: SkillProperties;
-};
-declare const METRICS: string[];
-declare const SKILLS: ("overall" | "attack" | "defence" | "strength" | "hitpoints" | "ranged" | "prayer" | "magic" | "cooking" | "woodcutting" | "fletching" | "fishing" | "firemaking" | "crafting" | "smithing" | "mining" | "herblore" | "agility" | "thieving" | "slayer" | "farming" | "runecrafting" | "hunter" | "construction")[];
-declare const BOSSES: ("abyssal_sire" | "alchemical_hydra" | "barrows_chests" | "bryophyta" | "callisto" | "cerberus" | "chambers_of_xeric" | "chambers_of_xeric_challenge_mode" | "chaos_elemental" | "chaos_fanatic" | "commander_zilyana" | "corporeal_beast" | "crazy_archaeologist" | "dagannoth_prime" | "dagannoth_rex" | "dagannoth_supreme" | "deranged_archaeologist" | "general_graardor" | "giant_mole" | "grotesque_guardians" | "hespori" | "kalphite_queen" | "king_black_dragon" | "kraken" | "kreearra" | "kril_tsutsaroth" | "mimic" | "nex" | "nightmare" | "phosanis_nightmare" | "obor" | "sarachnis" | "scorpia" | "skotizo" | "tempoross" | "the_gauntlet" | "the_corrupted_gauntlet" | "theatre_of_blood" | "theatre_of_blood_hard_mode" | "thermonuclear_smoke_devil" | "tombs_of_amascut" | "tombs_of_amascut_expert" | "tzkal_zuk" | "tztok_jad" | "venenatis" | "vetion" | "vorkath" | "wintertodt" | "zalcano" | "zulrah")[];
-declare const ACTIVITIES: string[];
-declare const COMPUTED_METRICS: ("ehp" | "ehb")[];
-declare const REAL_SKILLS: ("overall" | "attack" | "defence" | "strength" | "hitpoints" | "ranged" | "prayer" | "magic" | "cooking" | "woodcutting" | "fletching" | "fishing" | "firemaking" | "crafting" | "smithing" | "mining" | "herblore" | "agility" | "thieving" | "slayer" | "farming" | "runecrafting" | "hunter" | "construction")[];
-declare const F2P_BOSSES: ("abyssal_sire" | "alchemical_hydra" | "barrows_chests" | "bryophyta" | "callisto" | "cerberus" | "chambers_of_xeric" | "chambers_of_xeric_challenge_mode" | "chaos_elemental" | "chaos_fanatic" | "commander_zilyana" | "corporeal_beast" | "crazy_archaeologist" | "dagannoth_prime" | "dagannoth_rex" | "dagannoth_supreme" | "deranged_archaeologist" | "general_graardor" | "giant_mole" | "grotesque_guardians" | "hespori" | "kalphite_queen" | "king_black_dragon" | "kraken" | "kreearra" | "kril_tsutsaroth" | "mimic" | "nex" | "nightmare" | "phosanis_nightmare" | "obor" | "sarachnis" | "scorpia" | "skotizo" | "tempoross" | "the_gauntlet" | "the_corrupted_gauntlet" | "theatre_of_blood" | "theatre_of_blood_hard_mode" | "thermonuclear_smoke_devil" | "tombs_of_amascut" | "tombs_of_amascut_expert" | "tzkal_zuk" | "tztok_jad" | "venenatis" | "vetion" | "vorkath" | "wintertodt" | "zalcano" | "zulrah")[];
-declare const MEMBER_SKILLS: ("overall" | "attack" | "defence" | "strength" | "hitpoints" | "ranged" | "prayer" | "magic" | "cooking" | "woodcutting" | "fletching" | "fishing" | "firemaking" | "crafting" | "smithing" | "mining" | "herblore" | "agility" | "thieving" | "slayer" | "farming" | "runecrafting" | "hunter" | "construction")[];
-declare const COMBAT_SKILLS: ("overall" | "attack" | "defence" | "strength" | "hitpoints" | "ranged" | "prayer" | "magic" | "cooking" | "woodcutting" | "fletching" | "fishing" | "firemaking" | "crafting" | "smithing" | "mining" | "herblore" | "agility" | "thieving" | "slayer" | "farming" | "runecrafting" | "hunter" | "construction")[];
-declare function findMetric(metricName: string): Metric | null;
-declare function isMetric(metricString: string): metricString is Metric;
-declare function isSkill(metric: Metric | string): metric is Skill;
-declare function isActivity(metric: Metric | string): metric is Activity;
-declare function isBoss(metric: Metric | string): metric is Boss;
-declare function isComputedMetric(metric: Metric | string): metric is ComputedMetric;
-declare function getMetricRankKey(metric: Metric): string;
-declare function getMetricValueKey(metric: Metric): string;
-declare function getMetricMeasure(metric: Metric): any;
-declare function getMetricName(metric: Metric): any;
-declare function getMinimumBossKc(metric: Metric): number;
-declare function getParentEfficiencyMetric(metric: Metric): "ehp" | "ehb";
-declare function parseMetricAbbreviation(abbreviation: string): string | null;
-
-declare type PeriodPropsMap = {
-    [period in Period]: {
-        name: string;
-        milliseconds: number;
-    };
-};
-declare const PeriodProps: PeriodPropsMap;
-declare const PERIODS: ("five_min" | "day" | "week" | "month" | "year")[];
-declare function findPeriod(periodName: string): Period | null;
-declare function isPeriod(periodString: string): periodString is Period;
-declare function parsePeriodExpression(periodExpression: string): {
-    expression: string;
-    durationMs: number;
-};
-
-declare type PlayerTypePropsMap = {
-    [playerType in PlayerType]: {
-        name: string;
-    };
-};
-declare type PlayerBuildPropsMap = {
-    [playerBuild in PlayerBuild]: {
-        name: string;
-    };
-};
-declare const PlayerTypeProps: PlayerTypePropsMap;
-declare const PlayerBuildProps: PlayerBuildPropsMap;
-declare const PLAYER_TYPES: ("unknown" | "regular" | "ironman" | "hardcore" | "ultimate")[];
-declare const PLAYER_BUILDS: ("main" | "f2p" | "lvl3" | "zerker" | "def1" | "hp10")[];
-declare function isPlayerType(typeString: string): typeString is PlayerType;
-declare function isPlayerBuild(buildString: string): buildString is PlayerBuild;
-declare function findPlayerType(typeName: string): PlayerType | null;
-declare function findPlayerBuild(buildName: string): PlayerBuild | null;
-
-declare function formatNumber(num: number, withLetters?: boolean): string | -1;
-declare function padNumber(value: number): string;
-declare function round(num: number, cases: number): number;
-
 declare type Achievement = Omit<Prisma_Base_Achievement, 'threshold'> & {
     threshold: number;
 };
@@ -1486,18 +1259,10 @@ interface PlayerDeltasArray {
     computed: Array<ComputedMetricDelta>;
 }
 interface PlayerDeltasMap {
-    skills: {
-        [skill in Skill]?: SkillDelta;
-    };
-    bosses: {
-        [boss in Boss]?: BossDelta;
-    };
-    activities: {
-        [activity in Activity]?: ActivityDelta;
-    };
-    computed: {
-        [computedMetric in ComputedMetric]?: ComputedMetricDelta;
-    };
+    skills: MapOf<Skill, SkillDelta>;
+    bosses: MapOf<Boss, BossDelta>;
+    activities: MapOf<Activity, ActivityDelta>;
+    computed: MapOf<ComputedMetric, ComputedMetricDelta>;
 }
 interface DeltaLeaderboardEntry {
     player: Player;
@@ -1541,18 +1306,10 @@ interface FormattedSnapshot {
     createdAt: Date;
     importedAt: Date | null;
     data: {
-        skills: {
-            [skill in Skill]?: SkillValue;
-        };
-        bosses: {
-            [boss in Boss]?: BossValue;
-        };
-        activities: {
-            [activity in Activity]?: ActivityValue;
-        };
-        computed: {
-            [computed in ComputedMetric]?: ComputedMetric;
-        };
+        skills: MapOf<Skill, SkillValue>;
+        bosses: MapOf<Boss, BossValue>;
+        activities: MapOf<Activity, ActivityValue>;
+        computed: MapOf<ComputedMetric, ComputedMetricValue>;
     };
 }
 
@@ -1646,15 +1403,9 @@ declare type Top5ProgressResult = Array<{
     }>;
 }>;
 
-declare type ExperienceMap = {
-    [skill in Skill]?: number;
-};
-declare type KillcountMap = {
-    [boss in Boss]?: number;
-};
-declare type EfficiencyMap = {
-    [m in Skill | Boss]?: number;
-};
+declare type ExperienceMap = MapOf<Skill, number>;
+declare type KillcountMap = MapOf<Boss, number>;
+declare type EfficiencyMap = ExperienceMap & KillcountMap;
 declare enum BonusType {
     START = 0,
     END = 1
@@ -1699,9 +1450,7 @@ interface EfficiencyAlgorithm {
     calculateSkillEHP(skill: Skill, experienceMap: ExperienceMap): number;
     calculateBossEHB(boss: Boss, killcountMap: KillcountMap): number;
 }
-declare type AlgorithmCache = {
-    [a in EfficiencyAlgorithmType]: EfficiencyAlgorithm;
-};
+declare type AlgorithmCache = MapOf<EfficiencyAlgorithmType, EfficiencyAlgorithm>;
 
 declare type NameChangeDetails = {
     nameChange: NameChange;
@@ -1729,6 +1478,237 @@ declare type RecordLeaderboardEntry = Record & {
     player: Player;
 };
 
+declare type MapOf<K extends keyof any, T> = {
+    [P in K]: T;
+};
+
+declare enum CompetitionStatus {
+    UPCOMING = "upcoming",
+    ONGOING = "ongoing",
+    FINISHED = "finished"
+}
+declare const CompetitionTypeProps: MapOf<CompetitionType, {
+    name: string;
+}>;
+declare const CompetitionStatusProps: MapOf<CompetitionStatus, {
+    name: string;
+}>;
+declare const COMPETITION_TYPES: ("classic" | "team")[];
+declare const COMPETITION_STATUSES: CompetitionStatus[];
+declare function isCompetitionType(typeString: string): typeString is CompetitionType;
+declare function isCompetitionStatus(statusString: string): statusString is CompetitionStatus;
+
+interface CountryDetails {
+    code: Country;
+    name: string;
+}
+declare const CountryProps: MapOf<Country, CountryDetails>;
+declare const COUNTRY_CODES: ("AD" | "AE" | "AF" | "AG" | "AI" | "AL" | "AM" | "AO" | "AQ" | "AR" | "AS" | "AT" | "AU" | "AW" | "AX" | "AZ" | "BA" | "BB" | "BD" | "BE" | "BF" | "BG" | "BH" | "BI" | "BJ" | "BL" | "BM" | "BN" | "BO" | "BQ" | "BR" | "BS" | "BT" | "BV" | "BW" | "BY" | "BZ" | "CA" | "CC" | "CD" | "CF" | "CG" | "CH" | "CI" | "CK" | "CL" | "CM" | "CN" | "CO" | "CR" | "CU" | "CV" | "CW" | "CX" | "CY" | "CZ" | "DE" | "DJ" | "DK" | "DM" | "DO" | "DZ" | "EC" | "EE" | "EG" | "EH" | "ER" | "ES" | "ET" | "FI" | "FJ" | "FK" | "FM" | "FO" | "FR" | "GA" | "GB" | "GD" | "GE" | "GF" | "GG" | "GH" | "GI" | "GL" | "GM" | "GN" | "GP" | "GQ" | "GR" | "GS" | "GT" | "GU" | "GW" | "GY" | "HK" | "HM" | "HN" | "HR" | "HT" | "HU" | "ID" | "IE" | "IL" | "IM" | "IN" | "IO" | "IQ" | "IR" | "IS" | "IT" | "JE" | "JM" | "JO" | "JP" | "KE" | "KG" | "KH" | "KI" | "KM" | "KN" | "KP" | "KR" | "KW" | "KY" | "KZ" | "LA" | "LB" | "LC" | "LI" | "LK" | "LR" | "LS" | "LT" | "LU" | "LV" | "LY" | "MA" | "MC" | "MD" | "ME" | "MF" | "MG" | "MH" | "MK" | "ML" | "MM" | "MN" | "MO" | "MP" | "MQ" | "MR" | "MS" | "MT" | "MU" | "MV" | "MW" | "MX" | "MY" | "MZ" | "NA" | "NC" | "NE" | "NF" | "NG" | "NI" | "NL" | "NO" | "NP" | "NR" | "NU" | "NZ" | "OM" | "PA" | "PE" | "PF" | "PG" | "PH" | "PK" | "PL" | "PM" | "PN" | "PR" | "PS" | "PT" | "PW" | "PY" | "QA" | "RE" | "RO" | "RS" | "RU" | "RW" | "SA" | "SB" | "SC" | "SD" | "SE" | "SG" | "SH" | "SI" | "SJ" | "SK" | "SL" | "SM" | "SN" | "SO" | "SR" | "SS" | "ST" | "SV" | "SX" | "SY" | "SZ" | "TC" | "TD" | "TF" | "TG" | "TH" | "TJ" | "TK" | "TL" | "TM" | "TN" | "TO" | "TR" | "TT" | "TV" | "TW" | "TZ" | "UA" | "UG" | "UM" | "US" | "UY" | "UZ" | "VA" | "VC" | "VE" | "VG" | "VI" | "VN" | "VU" | "WF" | "WS" | "YE" | "YT" | "ZA" | "ZM" | "ZW")[];
+declare function isCountry(countryCodeString: string): countryCodeString is Country;
+declare function findCountry(countryIdentifier: string): CountryDetails | undefined;
+declare function findCountryByName(countryName: string): CountryDetails | undefined;
+declare function findCountryByCode(countryCode: string): CountryDetails | undefined;
+
+declare const MAX_LEVEL = 99;
+declare const MAX_VIRTUAL_LEVEL = 126;
+declare const MAX_SKILL_EXP = 200000000;
+declare const SKILL_EXP_AT_99 = 13034431;
+declare const CAPPED_MAX_TOTAL_XP: number;
+declare function getExpForLevel(level: number): number;
+declare function getLevel(exp: number, virtual?: boolean): number;
+declare function getCombatLevel(attack: number, strength: number, defence: number, ranged: number, magic: number, hitpoints: number, prayer: number): number;
+
+declare const GROUP_ROLES: ("magic" | "slayer" | "hunter" | "achiever" | "adamant" | "adept" | "administrator" | "admiral" | "adventurer" | "air" | "anchor" | "apothecary" | "archer" | "armadylean" | "artillery" | "artisan" | "asgarnian" | "assassin" | "assistant" | "astral" | "athlete" | "attacker" | "bandit" | "bandosian" | "barbarian" | "battlemage" | "beast" | "berserker" | "blisterwood" | "blood" | "blue" | "bob" | "body" | "brassican" | "brawler" | "brigadier" | "brigand" | "bronze" | "bruiser" | "bulwark" | "burglar" | "burnt" | "cadet" | "captain" | "carry" | "champion" | "chaos" | "cleric" | "collector" | "colonel" | "commander" | "competitor" | "completionist" | "constructor" | "cook" | "coordinator" | "corporal" | "cosmic" | "councillor" | "crafter" | "crew" | "crusader" | "cutpurse" | "death" | "defender" | "defiler" | "deputy_owner" | "destroyer" | "diamond" | "diseased" | "doctor" | "dogsbody" | "dragon" | "dragonstone" | "druid" | "duellist" | "earth" | "elite" | "emerald" | "enforcer" | "epic" | "executive" | "expert" | "explorer" | "farmer" | "feeder" | "fighter" | "fire" | "firemaker" | "firestarter" | "fisher" | "fletcher" | "forager" | "fremennik" | "gamer" | "gatherer" | "general" | "gnome_child" | "gnome_elder" | "goblin" | "gold" | "goon" | "green" | "grey" | "guardian" | "guthixian" | "harpoon" | "healer" | "hellcat" | "helper" | "herbologist" | "hero" | "holy" | "hoarder" | "ignitor" | "illusionist" | "imp" | "infantry" | "inquisitor" | "iron" | "jade" | "justiciar" | "kandarin" | "karamjan" | "kharidian" | "kitten" | "knight" | "labourer" | "law" | "leader" | "learner" | "legacy" | "legend" | "legionnaire" | "lieutenant" | "looter" | "lumberjack" | "magician" | "major" | "maple" | "marshal" | "master" | "maxed" | "mediator" | "medic" | "mentor" | "member" | "merchant" | "mind" | "miner" | "minion" | "misthalinian" | "mithril" | "moderator" | "monarch" | "morytanian" | "mystic" | "myth" | "natural" | "nature" | "necromancer" | "ninja" | "noble" | "novice" | "nurse" | "oak" | "officer" | "onyx" | "opal" | "oracle" | "orange" | "owner" | "page" | "paladin" | "pawn" | "pilgrim" | "pine" | "pink" | "prefect" | "priest" | "private" | "prodigy" | "proselyte" | "prospector" | "protector" | "pure" | "purple" | "pyromancer" | "quester" | "racer" | "raider" | "ranger" | "record_chaser" | "recruit" | "recruiter" | "red_topaz" | "red" | "rogue" | "ruby" | "rune" | "runecrafter" | "sage" | "sapphire" | "saradominist" | "saviour" | "scavenger" | "scholar" | "scourge" | "scout" | "scribe" | "seer" | "senator" | "sentry" | "serenist" | "sergeant" | "shaman" | "sheriff" | "short_green_guy" | "skiller" | "skulled" | "smiter" | "smith" | "smuggler" | "sniper" | "soul" | "specialist" | "speed_runner" | "spellcaster" | "squire" | "staff" | "steel" | "strider" | "striker" | "summoner" | "superior" | "supervisor" | "teacher" | "templar" | "therapist" | "thief" | "tirannian" | "trialist" | "trickster" | "tzkal" | "tztok" | "unholy" | "vagrant" | "vanguard" | "walker" | "wanderer" | "warden" | "warlock" | "warrior" | "water" | "wild" | "willow" | "wily" | "wintumber" | "witch" | "wizard" | "worker" | "wrath" | "xerician" | "yellow" | "yew" | "zamorakian" | "zarosian" | "zealot" | "zenyte")[];
+declare const PRIVELEGED_GROUP_ROLES: GroupRole[];
+declare type GroupRolePropsMap = MapOf<GroupRole, {
+    name: string;
+    isPriveleged: boolean;
+}>;
+declare const GroupRoleProps: GroupRolePropsMap;
+declare function findGroupRole(roleName: string): GroupRole | null;
+declare function isGroupRole(roleString: string): roleString is GroupRole;
+
+declare enum MetricType {
+    SKILL = "skill",
+    BOSS = "boss",
+    ACTIVITY = "activity",
+    COMPUTED = "computed"
+}
+declare enum MetricMeasure {
+    EXPERIENCE = "experience",
+    KILLS = "kills",
+    SCORE = "score",
+    VALUE = "value"
+}
+interface SkillProperties {
+    name: string;
+    isCombat: boolean;
+    isMembers: boolean;
+    type: MetricType;
+    measure: MetricMeasure;
+}
+interface BossProperties {
+    name: string;
+    minimumKc: number;
+    isMembers: boolean;
+    type: MetricType;
+    measure: MetricMeasure;
+}
+interface ActivityProperties {
+    name: string;
+    type: MetricType;
+    measure: MetricMeasure;
+}
+interface ComputedMetricProperties {
+    name: string;
+    type: MetricType;
+    measure: MetricMeasure;
+}
+declare const MetricProps: {
+    readonly ehp: ComputedMetricProperties;
+    readonly ehb: ComputedMetricProperties;
+    readonly league_points: ActivityProperties;
+    readonly bounty_hunter_hunter: ActivityProperties;
+    readonly bounty_hunter_rogue: ActivityProperties;
+    readonly clue_scrolls_all: ActivityProperties;
+    readonly clue_scrolls_beginner: ActivityProperties;
+    readonly clue_scrolls_easy: ActivityProperties;
+    readonly clue_scrolls_medium: ActivityProperties;
+    readonly clue_scrolls_hard: ActivityProperties;
+    readonly clue_scrolls_elite: ActivityProperties;
+    readonly clue_scrolls_master: ActivityProperties;
+    readonly last_man_standing: ActivityProperties;
+    readonly pvp_arena: ActivityProperties;
+    readonly soul_wars_zeal: ActivityProperties;
+    readonly guardians_of_the_rift: ActivityProperties;
+    readonly abyssal_sire: BossProperties;
+    readonly alchemical_hydra: BossProperties;
+    readonly barrows_chests: BossProperties;
+    readonly bryophyta: BossProperties;
+    readonly callisto: BossProperties;
+    readonly cerberus: BossProperties;
+    readonly chambers_of_xeric: BossProperties;
+    readonly chambers_of_xeric_challenge_mode: BossProperties;
+    readonly chaos_elemental: BossProperties;
+    readonly chaos_fanatic: BossProperties;
+    readonly commander_zilyana: BossProperties;
+    readonly corporeal_beast: BossProperties;
+    readonly crazy_archaeologist: BossProperties;
+    readonly dagannoth_prime: BossProperties;
+    readonly dagannoth_rex: BossProperties;
+    readonly dagannoth_supreme: BossProperties;
+    readonly deranged_archaeologist: BossProperties;
+    readonly general_graardor: BossProperties;
+    readonly giant_mole: BossProperties;
+    readonly grotesque_guardians: BossProperties;
+    readonly hespori: BossProperties;
+    readonly kalphite_queen: BossProperties;
+    readonly king_black_dragon: BossProperties;
+    readonly kraken: BossProperties;
+    readonly kreearra: BossProperties;
+    readonly kril_tsutsaroth: BossProperties;
+    readonly mimic: BossProperties;
+    readonly nex: BossProperties;
+    readonly nightmare: BossProperties;
+    readonly phosanis_nightmare: BossProperties;
+    readonly obor: BossProperties;
+    readonly sarachnis: BossProperties;
+    readonly scorpia: BossProperties;
+    readonly skotizo: BossProperties;
+    readonly tempoross: BossProperties;
+    readonly the_gauntlet: BossProperties;
+    readonly the_corrupted_gauntlet: BossProperties;
+    readonly theatre_of_blood: BossProperties;
+    readonly theatre_of_blood_hard_mode: BossProperties;
+    readonly thermonuclear_smoke_devil: BossProperties;
+    readonly tombs_of_amascut: BossProperties;
+    readonly tombs_of_amascut_expert: BossProperties;
+    readonly tzkal_zuk: BossProperties;
+    readonly tztok_jad: BossProperties;
+    readonly venenatis: BossProperties;
+    readonly vetion: BossProperties;
+    readonly vorkath: BossProperties;
+    readonly wintertodt: BossProperties;
+    readonly zalcano: BossProperties;
+    readonly zulrah: BossProperties;
+    readonly overall: SkillProperties;
+    readonly attack: SkillProperties;
+    readonly defence: SkillProperties;
+    readonly strength: SkillProperties;
+    readonly hitpoints: SkillProperties;
+    readonly ranged: SkillProperties;
+    readonly prayer: SkillProperties;
+    readonly magic: SkillProperties;
+    readonly cooking: SkillProperties;
+    readonly woodcutting: SkillProperties;
+    readonly fletching: SkillProperties;
+    readonly fishing: SkillProperties;
+    readonly firemaking: SkillProperties;
+    readonly crafting: SkillProperties;
+    readonly smithing: SkillProperties;
+    readonly mining: SkillProperties;
+    readonly herblore: SkillProperties;
+    readonly agility: SkillProperties;
+    readonly thieving: SkillProperties;
+    readonly slayer: SkillProperties;
+    readonly farming: SkillProperties;
+    readonly runecrafting: SkillProperties;
+    readonly hunter: SkillProperties;
+    readonly construction: SkillProperties;
+};
+declare const METRICS: Metric[];
+declare const SKILLS: Skill[];
+declare const BOSSES: Boss[];
+declare const ACTIVITIES: Activity[];
+declare const COMPUTED_METRICS: ComputedMetric[];
+declare const REAL_SKILLS: Skill[];
+declare const F2P_BOSSES: Boss[];
+declare const MEMBER_SKILLS: Skill[];
+declare const COMBAT_SKILLS: Skill[];
+declare function findMetric(metricName: string): Metric | null;
+declare function isMetric(metric: Metric | string): metric is Metric;
+declare function isSkill(metric: Metric | string): metric is Skill;
+declare function isActivity(metric: Metric | string): metric is Activity;
+declare function isBoss(metric: Metric | string): metric is Boss;
+declare function isComputedMetric(metric: Metric | string): metric is ComputedMetric;
+declare function getMetricRankKey(metric: Metric): string;
+declare function getMetricValueKey(metric: Metric): string;
+declare function getMetricMeasure(metric: Metric): MetricMeasure;
+declare function getMetricName(metric: Metric): string;
+declare function getMinimumBossKc(metric: Metric): number;
+declare function getParentEfficiencyMetric(metric: Metric): "ehp" | "ehb";
+declare function parseMetricAbbreviation(abbreviation: string): Metric | null;
+
+declare type PeriodPropsMap = MapOf<Period, {
+    name: string;
+    milliseconds: number;
+}>;
+declare const PeriodProps: PeriodPropsMap;
+declare const PERIODS: ("five_min" | "day" | "week" | "month" | "year")[];
+declare function findPeriod(periodName: string): Period | null;
+declare function isPeriod(periodString: string): periodString is Period;
+declare function parsePeriodExpression(periodExpression: string): {
+    expression: string;
+    durationMs: number;
+};
+
+declare const PlayerTypeProps: MapOf<PlayerType, {
+    name: string;
+}>;
+declare const PlayerBuildProps: MapOf<PlayerBuild, {
+    name: string;
+}>;
+declare const PLAYER_TYPES: ("unknown" | "regular" | "ironman" | "hardcore" | "ultimate")[];
+declare const PLAYER_BUILDS: ("main" | "f2p" | "lvl3" | "zerker" | "def1" | "hp10")[];
+declare function isPlayerType(typeString: string): typeString is PlayerType;
+declare function isPlayerBuild(buildString: string): buildString is PlayerBuild;
+declare function findPlayerType(typeName: string): PlayerType | null;
+declare function findPlayerBuild(buildName: string): PlayerBuild | null;
+
+declare function formatNumber(num: number, withLetters?: boolean, decimalPrecision?: number): string | -1;
+declare function padNumber(value: number): string;
+declare function round(num: number, cases: number): number;
+
 interface GenericCountMessageResponse {
     count: number;
     message: string;
@@ -2148,4 +2128,4 @@ declare class WOMClient {
     constructor(options?: WOMClientOptions);
 }
 
-export { ACTIVITIES, Achievement, AchievementDefinition, AchievementProgress, AchievementTemplate, Activity, ActivityDelta, ActivityValue, AlgorithmCache, AssertPlayerTypeResponse, BOSSES, Bonus, BonusType, Boss, BossDelta, BossMetaConfig, BossValue, CAPPED_MAX_TOTAL_XP, CMLGroupData, COMBAT_SKILLS, COMPETITION_STATUSES, COMPETITION_TYPES, COMPUTED_METRICS, COUNTRY_CODES, ChangeMemberRolePayload, CompetitionDetails, CompetitionListItem, CompetitionStatus, CompetitionStatusProps, CompetitionType, CompetitionTypeProps, CompetitionWithParticipations, CompetitionsSearchFilter, ComputedMetric, ComputedMetricDelta, ComputedMetricValue, Country, CountryDetails, CountryProps, CreateCompetitionPayload, CreateCompetitionResponse, CreateGroupPayload, CreateGroupResponse, DeltaLeaderboardEntry, DeltaLeaderboardFilter, EditCompetitionPayload, EditGroupPayload, EfficiencyAlgorithm, EfficiencyAlgorithmType, EfficiencyAlgorithmTypeUnion, EfficiencyLeaderboardsFilter, EfficiencyMap, ExperienceMap, ExtendedAchievement, F2P_BOSSES, FormattedSnapshot, GROUP_ROLES, GenericCountMessageResponse, GenericMessageResponse, GetGroupGainsFilter, GetPlayerGainsResponse, GroupDetails, GroupHiscoresActivityItem, GroupHiscoresBossItem, GroupHiscoresComputedMetricItem, GroupHiscoresEntry, GroupHiscoresSkillItem, GroupListItem, GroupMemberFragment, GroupRecordsFilter, GroupRole, GroupRoleProps, GroupStatistics, KillcountMap, MAX_LEVEL, MAX_SKILL_EXP, MAX_VIRTUAL_LEVEL, MEMBER_SKILLS, METRICS, MeasuredDeltaProgress, MemberInput, MembershipWithGroup, MembershipWithPlayer, Metric, MetricMeasure, MetricProps, MetricType, MigrationDataSource, NameChangeDetails, NameChangeStatus, NameChangesSearchFilter, PERIODS, PLAYER_BUILDS, PLAYER_TYPES, PRIVELEGED_GROUP_ROLES, ParticipationWithCompetition, ParticipationWithPlayer, ParticipationWithPlayerAndProgress, Period, PeriodProps, Player, PlayerBuild, PlayerBuildProps, PlayerDeltasArray, PlayerDeltasMap, PlayerDetails, PlayerRecordsFilter, PlayerResolvable, PlayerType, PlayerTypeProps, REAL_SKILLS, Record, RecordLeaderboardEntry, RecordLeaderboardFilter, SKILLS, SKILL_EXP_AT_99, Skill, SkillDelta, SkillMetaConfig, SkillValue, Snapshot, SnapshotDataSource, SnapshotFragment, Team, TempleGroupData, TimeRangeFilter, Top5ProgressResult, WOMClient, findCountry, findCountryByCode, findCountryByName, findGroupRole, findMetric, findPeriod, findPlayerBuild, findPlayerType, formatNumber, getCombatLevel, getExpForLevel, getLevel, getMetricMeasure, getMetricName, getMetricRankKey, getMetricValueKey, getMinimumBossKc, getParentEfficiencyMetric, isActivity, isBoss, isCompetitionStatus, isCompetitionType, isComputedMetric, isCountry, isGroupRole, isMetric, isPeriod, isPlayerBuild, isPlayerType, isSkill, padNumber, parseMetricAbbreviation, parsePeriodExpression, round };
+export { ACTIVITIES, Achievement, AchievementDefinition, AchievementProgress, AchievementTemplate, Activity, ActivityDelta, ActivityValue, AlgorithmCache, AssertPlayerTypeResponse, BOSSES, Bonus, BonusType, Boss, BossDelta, BossMetaConfig, BossValue, CAPPED_MAX_TOTAL_XP, CMLGroupData, COMBAT_SKILLS, COMPETITION_STATUSES, COMPETITION_TYPES, COMPUTED_METRICS, COUNTRY_CODES, ChangeMemberRolePayload, CompetitionDetails, CompetitionListItem, CompetitionStatus, CompetitionStatusProps, CompetitionType, CompetitionTypeProps, CompetitionWithParticipations, CompetitionsSearchFilter, ComputedMetric, ComputedMetricDelta, ComputedMetricValue, Country, CountryDetails, CountryProps, CreateCompetitionPayload, CreateCompetitionResponse, CreateGroupPayload, CreateGroupResponse, DeltaLeaderboardEntry, DeltaLeaderboardFilter, EditCompetitionPayload, EditGroupPayload, EfficiencyAlgorithm, EfficiencyAlgorithmType, EfficiencyAlgorithmTypeUnion, EfficiencyLeaderboardsFilter, EfficiencyMap, ExperienceMap, ExtendedAchievement, F2P_BOSSES, FormattedSnapshot, GROUP_ROLES, GenericCountMessageResponse, GenericMessageResponse, GetGroupGainsFilter, GetPlayerGainsResponse, GroupDetails, GroupHiscoresActivityItem, GroupHiscoresBossItem, GroupHiscoresComputedMetricItem, GroupHiscoresEntry, GroupHiscoresSkillItem, GroupListItem, GroupMemberFragment, GroupRecordsFilter, GroupRole, GroupRoleProps, GroupStatistics, KillcountMap, MAX_LEVEL, MAX_SKILL_EXP, MAX_VIRTUAL_LEVEL, MEMBER_SKILLS, METRICS, MapOf, MeasuredDeltaProgress, MemberInput, MembershipWithGroup, MembershipWithPlayer, Metric, MetricMeasure, MetricProps, MetricType, MigrationDataSource, NameChangeDetails, NameChangeStatus, NameChangesSearchFilter, PERIODS, PLAYER_BUILDS, PLAYER_TYPES, PRIVELEGED_GROUP_ROLES, ParticipationWithCompetition, ParticipationWithPlayer, ParticipationWithPlayerAndProgress, Period, PeriodProps, Player, PlayerBuild, PlayerBuildProps, PlayerDeltasArray, PlayerDeltasMap, PlayerDetails, PlayerRecordsFilter, PlayerResolvable, PlayerType, PlayerTypeProps, REAL_SKILLS, Record, RecordLeaderboardEntry, RecordLeaderboardFilter, SKILLS, SKILL_EXP_AT_99, Skill, SkillDelta, SkillMetaConfig, SkillValue, Snapshot, SnapshotDataSource, SnapshotFragment, Team, TempleGroupData, TimeRangeFilter, Top5ProgressResult, WOMClient, findCountry, findCountryByCode, findCountryByName, findGroupRole, findMetric, findPeriod, findPlayerBuild, findPlayerType, formatNumber, getCombatLevel, getExpForLevel, getLevel, getMetricMeasure, getMetricName, getMetricRankKey, getMetricValueKey, getMinimumBossKc, getParentEfficiencyMetric, isActivity, isBoss, isCompetitionStatus, isCompetitionType, isComputedMetric, isCountry, isGroupRole, isMetric, isPeriod, isPlayerBuild, isPlayerType, isSkill, padNumber, parseMetricAbbreviation, parsePeriodExpression, round };

package/dist/index.js

@@ -1903,8 +1903,8 @@ function findMetric(metricName) {
     }
     return null;
 }
-function isMetric(metricString) {
-    return metricString in MetricProps;
+function isMetric(metric) {
+    return metric in MetricProps;
 }
 function isSkill(metric) {
     return metric in SkillProps;
@@ -1944,7 +1944,11 @@ function parseMetricAbbreviation(abbreviation) {
     if (!abbreviation || abbreviation.length === 0) {
         return null;
     }
-    switch (abbreviation.toLowerCase()) {
+    const fixedAbbreviation = abbreviation.toLowerCase();
+    if (isMetric(fixedAbbreviation)) {
+        return fixedAbbreviation;
+    }
+    switch (fixedAbbreviation) {
         // Bosses
         case 'sire':
             return Metric.ABYSSAL_SIRE;
@@ -2176,7 +2180,7 @@ function parseMetricAbbreviation(abbreviation) {
         case 'const':
             return Metric.CONSTRUCTION;
         default:
-            return abbreviation;
+            return null;
     }
 }
 
@@ -2265,25 +2269,34 @@ function findPlayerBuild(buildName) {
     return null;
 }
 
-function formatNumber(num, withLetters = false) {
+function formatNumber(num, withLetters = false, decimalPrecision = 2) {
     if (num === undefined || num === null)
         return -1;
     // If number is float
     if (num % 1 !== 0) {
-        return (Math.round(num * 100) / 100).toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
+        return (Math.round(num * 100) / 100).toLocaleString();
     }
     if ((num < 10000 && num > -10000) || !withLetters) {
-        return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
+        return num.toLocaleString();
     }
     // < 10 million
     if (num < 10000000 && num > -10000000) {
-        return `${Math.floor(num / 1000)}k`;
+        // If has no decimals, return as whole number instead (10.00k => 10k)
+        if ((num / 1000) % 1 === 0)
+            return `${num / 1000}k`;
+        return `${(num / 1000).toFixed(decimalPrecision)}k`;
     }
     // < 1 billion
     if (num < 1000000000 && num > -1000000000) {
-        return `${Math.round((num / 1000000 + Number.EPSILON) * 100) / 100}m`;
-    }
-    return `${Math.round((num / 1000000000 + Number.EPSILON) * 100) / 100}b`;
+        // If has no decimals, return as whole number instead (10.00m => 10m)
+        if ((num / 1000000) % 1 === 0)
+            return `${num / 1000000}m`;
+        return `${(num / 1000000).toFixed(decimalPrecision)}m`;
+    }
+    // If has no decimals, return as whole number instead (10.00b => 10b)
+    if ((num / 1000000000) % 1 === 0)
+        return `${num / 1000000000}b`;
+    return `${(num / 1000000000).toFixed(decimalPrecision)}b`;
 }
 function padNumber(value) {
     if (!value)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wise-old-man/utils",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,7 +10,7 @@
   "scripts": {
     "prepublish": "npm run build",
     "prebuild": "cd ../server && npm run prisma:generate",
-    "build": "rm -rf ./dist && npx rollup -c && node prisma-transform.js"
+    "build": "rm -rf ./dist && npx rollup -c && node prisma-transform.js && tsc dist/index.d.ts"
   },
   "keywords": [],
   "author": "",