Merge pull request #10 from bchainhub/update/undefined-01

Added undefined
bchainhub · Mar 18, 2024 · 40e4b2d · 40e4b2d
2 parents a915171 + 9fc5909
commit 40e4b2d
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 16 deletions.
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -6,7 +6,7 @@ declare class ExchNumberFormat {
     private intlOptions;
     private customCurrencyData;
     private originalCurrency;
-    constructor(locales: string, options?: RoundNumberOptions);
+    constructor(locales: string | undefined, options?: RoundNumberOptions);
     format(number: number): string;
     formatToParts(number: number): Intl.NumberFormatPart[];
     private replaceCurrency;

diff --git a/dist/index.js b/dist/index.js
@@ -1,6 +1,13 @@
 class ExchNumberFormat {
     constructor(locales, options = {}) {
         this.customCurrencyData = {
+            'ADA': {
+                'symbol': '₳',
+                'narrowSymbol': 'ADA₳',
+                'code': 'ADA',
+                'name': 'Cardano',
+                'defaultDecimals': 2,
+            },
             'BCH': {
                 'symbol': 'Ƀ',
                 'narrowSymbol': 'BCHɃ',
@@ -22,6 +29,20 @@ class ExchNumberFormat {
                 'name': 'CoreToken',
                 'defaultDecimals': 2,
             },
+            'DOT': {
+                'symbol': '•',
+                'narrowSymbol': 'DOT•',
+                'code': 'DOT',
+                'name': 'Polkadot',
+                'defaultDecimals': 2,
+            },
+            'ETC': {
+                'symbol': 'ξ',
+                'narrowSymbol': 'ETCξ',
+                'code': 'ETC',
+                'name': 'EthereumClassic',
+                'defaultDecimals': 3,
+            },
             'ETH': {
                 'symbol': 'Ξ',
                 'narrowSymbol': 'ETHΞ',
@@ -34,7 +55,21 @@ class ExchNumberFormat {
                 'narrowSymbol': 'LTCŁ',
                 'code': 'LTC',
                 'name': 'Litecoin',
-                'defaultDecimals': 4,
+                'defaultDecimals': 3,
+            },
+            'SOL': {
+                'symbol': 'S◎L',
+                'narrowSymbol': 'SOLS◎L',
+                'code': 'SOL',
+                'name': 'Solana',
+                'defaultDecimals': 2,
+            },
+            'TRX': {
+                'symbol': '₵',
+                'narrowSymbol': 'TRX₵',
+                'code': 'TRX',
+                'name': 'Tron',
+                'defaultDecimals': 2,
             },
             'USC': {
                 'symbol': 'Ⓢ',
@@ -55,14 +90,14 @@ class ExchNumberFormat {
                 'narrowSymbol': 'XCB₡',
                 'code': 'XCB',
                 'name': 'Core',
-                'defaultDecimals': 4,
+                'defaultDecimals': 3,
             },
             'XMR': {
                 'symbol': 'ɱ',
                 'narrowSymbol': 'XMRɱ',
                 'code': 'XMR',
                 'name': 'Monero',
-                'defaultDecimals': 4,
+                'defaultDecimals': 3,
             },
             'XRP': {
                 'symbol': '✕',
@@ -84,7 +119,7 @@ class ExchNumberFormat {
         };
         this.intlOptions = { ...defaultOptions, ...options };
         this.originalCurrency = this.intlOptions.currency;
-        let setLocale;
+        let setLocale = undefined;
         if (locales === 'auto') {
             if (typeof window !== 'undefined' && navigator.languages && navigator.languages.length) {
                 setLocale = navigator.languages[0];
@@ -103,6 +138,11 @@ class ExchNumberFormat {
             const currencyData = this.customCurrencyData[this.originalCurrency.toUpperCase()];
             this.intlOptions.minimumFractionDigits = currencyData.defaultDecimals;
         }
+        else if (!this.originalCurrency) {
+            this.intlOptions.style = 'decimal';
+            this.intlOptions.minimumFractionDigits = 2;
+            this.intlOptions.maximumFractionDigits = 2;
+        }
         this.formatter = new Intl.NumberFormat(setLocale, this.intlOptions);
     }
     format(number) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "exchange-rounding",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Exchange Number Formatting",
   "main": "dist/index.js",
   "type": "module",

diff --git a/src/index.ts b/src/index.ts
@@ -8,9 +8,16 @@ class ExchNumberFormat {
 	private customCurrencyData: { [key: string]: { symbol: string, narrowSymbol: string, code: string, name: string, defaultDecimals: number } };
 	private originalCurrency: string | undefined;
 
-	constructor(locales: string, options: RoundNumberOptions = {}) {
+	constructor(locales: string | undefined, options: RoundNumberOptions = {}) {
 		// Custom currency data
 		this.customCurrencyData = {
+			'ADA': {
+				'symbol': '₳',
+				'narrowSymbol': 'ADA₳',
+				'code': 'ADA',
+				'name': 'Cardano',
+				'defaultDecimals': 2,
+			},
 			'BCH': {
 				'symbol': 'Ƀ',
 				'narrowSymbol': 'BCHɃ',
@@ -32,6 +39,20 @@ class ExchNumberFormat {
 				'name': 'CoreToken',
 				'defaultDecimals': 2,
 			},
+			'DOT': {
+				'symbol': '•',
+				'narrowSymbol': 'DOT•',
+				'code': 'DOT',
+				'name': 'Polkadot',
+				'defaultDecimals': 2,
+			},
+			'ETC': {
+				'symbol': 'ξ',
+				'narrowSymbol': 'ETCξ',
+				'code': 'ETC',
+				'name': 'EthereumClassic',
+				'defaultDecimals': 3,
+			},
 			'ETH': {
 				'symbol': 'Ξ',
 				'narrowSymbol': 'ETHΞ',
@@ -44,7 +65,21 @@ class ExchNumberFormat {
 				'narrowSymbol': 'LTCŁ',
 				'code': 'LTC',
 				'name': 'Litecoin',
-				'defaultDecimals': 4,
+				'defaultDecimals': 3,
+			},
+			'SOL': {
+				'symbol': 'S◎L',
+				'narrowSymbol': 'SOLS◎L',
+				'code': 'SOL',
+				'name': 'Solana',
+				'defaultDecimals': 2,
+			},
+			'TRX': {
+				'symbol': '₵',
+				'narrowSymbol': 'TRX₵',
+				'code': 'TRX',
+				'name': 'Tron',
+				'defaultDecimals': 2,
 			},
 			'USC': {
 				'symbol': 'Ⓢ',
@@ -65,14 +100,14 @@ class ExchNumberFormat {
 				'narrowSymbol': 'XCB₡',
 				'code': 'XCB',
 				'name': 'Core',
-				'defaultDecimals': 4,
+				'defaultDecimals': 3,
 			},
 			'XMR': {
 				'symbol': 'ɱ',
 				'narrowSymbol': 'XMRɱ',
 				'code': 'XMR',
 				'name': 'Monero',
-				'defaultDecimals': 4,
+				'defaultDecimals': 3,
 			},
 			'XRP': {
 				'symbol': '✕',
@@ -101,7 +136,7 @@ class ExchNumberFormat {
 		this.originalCurrency = this.intlOptions.currency;
 
 		// Determine the locale
-		let setLocale: string;
+		let setLocale: string | undefined = undefined;
 		if (locales === 'auto') {
 			// Check if running in a browser environment
 			if (typeof window !== 'undefined' && navigator.languages && navigator.languages.length) {
@@ -118,6 +153,10 @@ class ExchNumberFormat {
 		if (this.originalCurrency && this.customCurrencyData[this.originalCurrency.toUpperCase()]) {
 			const currencyData = this.customCurrencyData[this.originalCurrency.toUpperCase()];
 			this.intlOptions.minimumFractionDigits = currencyData.defaultDecimals;
+		} else if (!this.originalCurrency) {
+			this.intlOptions.style = 'decimal';
+			this.intlOptions.minimumFractionDigits = 2;
+			this.intlOptions.maximumFractionDigits = 2;
 		}
 
 		// Create an Intl.NumberFormat instance

diff --git a/test/roundNumber.test.ts b/test/roundNumber.test.ts
@@ -20,7 +20,7 @@ describe('Added currencies', () => {
       currencyDisplay: 'name'
     });
     const result = formatter.format(1234.1234567899);
-    expect(result).toBe('1 234,1234 Core');
+    expect(result).toBe('1 234,123 Core');
   });
 
   it('XCB with symbol, locale en', () => {
@@ -30,7 +30,7 @@ describe('Added currencies', () => {
       currencyDisplay: 'symbol'
     });
     const result = formatter.format(1234.1234567899);
-    expect(result).toBe('₡ 1,234.1235');
+    expect(result).toBe('₡ 1,234.123');
   });
 
   it('USDC with narrowSymbol, locale it-CH currency and default 2 decimals', () => {
@@ -142,7 +142,17 @@ describe('Different locales', () => {
       currency: 'LTC'
     });
     const result = formatter.format(1234.1234567899);
-    expect(result).toBe('Ł 1.234,1235');
+    expect(result).toBe('Ł 1.234,123');
+  });
+});
+
+describe('Defaults', () => {
+  it('Default locale and no currency', () => {
+    const formatter = new ExchNumberFormat(undefined, {
+      style: 'currency'
+    });
+    const result = formatter.format(1234.1234567899);
+    expect(result).toBe('1,234.12');
   });
 });
 
@@ -179,6 +189,6 @@ describe('Decomposed', () => {
       currencyDisplay: 'symbol'
     });
     const result = formatter.formatToParts(1234.1234567899);
-    expect(result).toEqual([{"type": "currency", "value": "₡"}, {"type": "literal", "value": " "}, {"type": "integer", "value": "1"}, {"type": "group", "value": ","}, {"type": "integer", "value": "234"}, {"type": "decimal", "value": "."}, {"type": "fraction", "value": "1234"}]);
+    expect(result).toEqual([{"type": "currency", "value": "₡"}, {"type": "literal", "value": " "}, {"type": "integer", "value": "1"}, {"type": "group", "value": ","}, {"type": "integer", "value": "234"}, {"type": "decimal", "value": "."}, {"type": "fraction", "value": "123"}]);
   });
 });
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -16,7 +16,7 @@ export declare class ExchNumberFormat {
 	private customCurrencyData: { [key: string]: CurrencyData };
 	private originalCurrency: string | undefined;
 
-	constructor(locales: string, options?: RoundNumberOptions);
+	constructor(locales: string | undefined, options?: RoundNumberOptions);
 
 	format(number: number): string;
 	formatToParts(number: number): Intl.NumberFormatPart[];