Uppercase fix

bchainhub · Mar 12, 2024 · bdc9747 · bdc9747
1 parent b5ba159
commit bdc9747
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,6 @@ import ExchNumberFormat from 'exchange-rounding';
 const bitcoinFormatter = new ExchNumberFormat('en-US', {
     style: 'currency',
     currency: 'BTC',
-    customCurrency: 'BTC',
     roundingMode: 'halfFloor',
     currencyDisplay: 'symbol'
 });
@@ -69,7 +68,6 @@ Creates a new `ExchNumberFormat` instance.
 #### RoundNumberOptions
 
 - Inherits all options from `Intl.NumberFormatOptions`.
-- `customCurrency` (String): Specify a custom currency code, e.g., 'BTC', 'ETH'.
 - `roundingMode` (String): Rounding mode according to the `Intl.NumberFormat` documentation.
 
 ### format(number)

diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -1,5 +1,4 @@
 interface RoundNumberOptions extends Intl.NumberFormatOptions {
-    customCurrency?: string;
     roundingMode?: 'ceil' | 'floor' | 'expand' | 'trunc' | 'halfCeil' | 'halfFloor' | 'halfExpand' | 'halfTrunc' | 'halfEven';
 }
 declare class ExchNumberFormat {

diff --git a/dist/index.js b/dist/index.js
@@ -27,14 +27,14 @@ class ExchNumberFormat {
                 'narrowSymbol': 'ETHΞ',
                 'code': 'ETH',
                 'name': 'Ethereum',
-                'defaultDecimals': 6,
+                'defaultDecimals': 4,
             },
             'LTC': {
                 'symbol': 'Ł',
                 'narrowSymbol': 'LTCŁ',
                 'code': 'LTC',
                 'name': 'Litecoin',
-                'defaultDecimals': 8,
+                'defaultDecimals': 4,
             },
             'USC': {
                 'symbol': 'Ⓢ',
@@ -112,7 +112,8 @@ class ExchNumberFormat {
     formatToParts(number) {
         const parts = this.formatter.formatToParts(number);
         if (this.originalCurrency && this.customCurrencyData[this.originalCurrency.toUpperCase()]) {
-            const currencyData = this.customCurrencyData[this.originalCurrency.toUpperCase()];
+            const originalCurrency = this.originalCurrency.toUpperCase();
+            const currencyData = this.customCurrencyData[originalCurrency];
             let symbolToReplace = currencyData.symbol;
             switch (this.intlOptions.currencyDisplay) {
                 case 'narrowSymbol':
@@ -135,7 +136,8 @@ class ExchNumberFormat {
     }
     replaceCurrency(formattedString) {
         if (this.originalCurrency && this.customCurrencyData[this.originalCurrency.toUpperCase()]) {
-            const currencyData = this.customCurrencyData[this.originalCurrency.toUpperCase()];
+            const originalCurrency = this.originalCurrency.toUpperCase();
+            const currencyData = this.customCurrencyData[originalCurrency];
             let symbolToReplace = currencyData.symbol;
             switch (this.intlOptions.currencyDisplay) {
                 case 'narrowSymbol':
@@ -148,7 +150,7 @@ class ExchNumberFormat {
                     symbolToReplace = currencyData.name;
                     break;
             }
-            return formattedString.replace(this.originalCurrency, symbolToReplace);
+            return formattedString.replace(originalCurrency, symbolToReplace);
         }
         return formattedString;
     }

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

diff --git a/src/index.ts b/src/index.ts
@@ -1,5 +1,4 @@
 interface RoundNumberOptions extends Intl.NumberFormatOptions {
-	customCurrency?: string;
 	roundingMode?: 'ceil' | 'floor' | 'expand' | 'trunc' | 'halfCeil' | 'halfFloor' | 'halfExpand' | 'halfTrunc' | 'halfEven';
 }
 
@@ -38,14 +37,14 @@ class ExchNumberFormat {
 				'narrowSymbol': 'ETHΞ',
 				'code': 'ETH',
 				'name': 'Ethereum',
-				'defaultDecimals': 6,
+				'defaultDecimals': 4,
 			},
 			'LTC': {
 				'symbol': 'Ł',
 				'narrowSymbol': 'LTCŁ',
 				'code': 'LTC',
 				'name': 'Litecoin',
-				'defaultDecimals': 8,
+				'defaultDecimals': 4,
 			},
 			'USC': {
 				'symbol': 'Ⓢ',
@@ -134,7 +133,8 @@ class ExchNumberFormat {
 		const parts = this.formatter.formatToParts(number);
 
 		if (this.originalCurrency && this.customCurrencyData[this.originalCurrency.toUpperCase()]) {
-			const currencyData = this.customCurrencyData[this.originalCurrency.toUpperCase()];
+			const originalCurrency = this.originalCurrency.toUpperCase();
+			const currencyData = this.customCurrencyData[originalCurrency];
 			let symbolToReplace = currencyData.symbol;
 
 			switch (this.intlOptions.currencyDisplay) {
@@ -161,7 +161,8 @@ class ExchNumberFormat {
 
 	private replaceCurrency(formattedString: string): string {
 		if (this.originalCurrency && this.customCurrencyData[this.originalCurrency.toUpperCase()]) {
-			const currencyData = this.customCurrencyData[this.originalCurrency.toUpperCase()];
+			const originalCurrency = this.originalCurrency.toUpperCase();
+			const currencyData = this.customCurrencyData[originalCurrency];
 			let symbolToReplace = currencyData.symbol;
 			switch (this.intlOptions.currencyDisplay) {
 				case 'narrowSymbol':
@@ -174,7 +175,7 @@ class ExchNumberFormat {
 					symbolToReplace = currencyData.name;
 					break;
 			}
-			return formattedString.replace(this.originalCurrency, symbolToReplace);
+			return formattedString.replace(originalCurrency, symbolToReplace);
 		}
 		return formattedString;
 	}

diff --git a/test/roundNumber.test.ts b/test/roundNumber.test.ts
@@ -23,6 +23,16 @@ describe('Added currencies', () => {
     expect(result).toBe('1 234,1234 Core');
   });
 
+  it('XCB with symbol, locale en', () => {
+    const formatter = new ExchNumberFormat('en', {
+      style: 'currency',
+      currency: 'xcb',
+      currencyDisplay: 'symbol'
+    });
+    const result = formatter.format(1234.1234567899);
+    expect(result).toBe('₡ 1,234.1235');
+  });
+
   it('USDC with narrowSymbol, locale it-CH currency and default 2 decimals', () => {
     const formatter = new ExchNumberFormat('it-CH', {
       style: 'currency',
@@ -132,7 +142,7 @@ describe('Different locales', () => {
       currency: 'LTC'
     });
     const result = formatter.format(1234.1234567899);
-    expect(result).toBe('Ł 1.234,12345679');
+    expect(result).toBe('Ł 1.234,1235');
   });
 });
 
@@ -160,4 +170,15 @@ describe('Decomposed', () => {
     const result = formatter.formatToParts(1234.1234567899);
     expect(result).toEqual([{"type": "currency", "value": "USD"}, {"type": "literal", "value": " "}, {"type": "integer", "value": "001"}, {"type": "group", "value": "’"}, {"type": "integer", "value": "234"}, {"type": "decimal", "value": "."}, {"type": "fraction", "value": "1235"}]);
   });
+
+  it('XCB with symbol, locale en currency and default 4 decimals', () => {
+    const formatter = new ExchNumberFormat('en', {
+      style: 'currency',
+      currency: 'xcb',
+      roundingMode: 'floor',
+      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"}]);
+  });
 });
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1,5 +1,4 @@
 export interface RoundNumberOptions extends Intl.NumberFormatOptions {
-	customCurrency?: string;
 	roundingMode?: 'ceil' | 'floor' | 'expand' | 'trunc' | 'halfCeil' | 'halfFloor' | 'halfExpand' | 'halfTrunc' | 'halfEven';
 }