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

package/dist/index.d.ts

@@ -1666,7 +1666,7 @@ 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(metricString: string): metricString is Metric;
+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;
@@ -1677,7 +1677,7 @@ 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): string | null;
+declare function parseMetricAbbreviation(abbreviation: string): Metric | null;
 
 declare type PeriodPropsMap = MapOf<Period, {
     name: string;
@@ -1705,7 +1705,7 @@ 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 formatNumber(num: number, withLetters?: boolean, decimalPrecision?: number): string | -1;
 declare function padNumber(value: number): string;
 declare function round(num: number, cases: number): number;
 

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.6",
+  "version": "2.0.0-beta.7",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",