fix: parseNumber should not throw error if currency(s) are not loaded

Author: danielkaradachki

src/cldr/currency.js

@@ -3,6 +3,8 @@ import { errors } from '../errors';
 import localeTerritory from './territory';
 import parseRangeDate from './parse-range-date';
 
+/* eslint-disable consistent-return */
+
 const {
     NoCurrency,
     NoCurrencyDisplay,
@@ -21,17 +23,25 @@ const GLOBAL_CURRENCIES = {
 
 };
 
-function getCurrencyInfo(locale, currency) {
+function getCurrencyInfo(locale, currency, throwIfNoValid) {
     const info = getLocaleInfo(locale);
     const currencies = info.numbers.currencies;
     if (!currencies) {
-        throw NoCurrency.error();
+        if (throwIfNoValid) {
+            throw NoCurrency.error();
+        }
+
+        return;
     }
 
     const currencyDisplayInfo = currencies[currency];
 
     if (!currencyDisplayInfo) {
-        throw NoCurrencyDisplay.error();
+        if (throwIfNoValid) {
+            throw NoCurrencyDisplay.error();
+        }
+
+        return;
     }
 
     return currencyDisplayInfo;
@@ -73,8 +83,12 @@ function regionCurrency(regionCurrencies) {
     return latestStillValid || latestValidUntil;
 }
 
-export function currencyDisplays(locale, currency) {
-    const currencyInfo = getCurrencyInfo(locale, currency);
+export function currencyDisplays(locale, currency, throwIfNoValid = true) {
+    const currencyInfo = getCurrencyInfo(locale, currency, throwIfNoValid);
+    if (!currencyInfo) {
+        return;
+    }
+
     if (!currencyInfo.displays) {
         const displays = [ currency ];
         for (let field in currencyInfo) {
@@ -94,7 +108,7 @@ export function currencyDisplay(locale, options) {
         return currency;
     }
 
-    const currencyInfo = getCurrencyInfo(locale, currency);
+    const currencyInfo = getCurrencyInfo(locale, currency, true);
     let result;
 
     if (currencyDisplay === SYMBOL) {
@@ -126,20 +140,28 @@ export function currencyFractionOptions(code) {
     };
 }
 
-export function territoryCurrencyCode(territory) {
+export function territoryCurrencyCode(territory, throwIfNoValid = true) {
     if (GLOBAL_CURRENCIES[territory]) {
         return GLOBAL_CURRENCIES[territory];
     }
 
     const currencyData = cldr.supplemental.currencyData;
     if (!currencyData) {
-        throw NoSupplementalCurrency.error();
+        if (throwIfNoValid) {
+            throw NoSupplementalCurrency.error();
+        }
+
+        return;
     }
 
     const regionCurrencies = currencyData.region[territory];
 
     if (!regionCurrencies) {
-        throw NoCurrencyRegion.error(territory);
+        if (throwIfNoValid) {
+            throw NoCurrencyRegion.error(territory);
+        }
+
+        return;
     }
 
     const currencyCode = regionCurrency(regionCurrencies);
@@ -152,7 +174,7 @@ export function localeCurrency(locale, throwIfNoValid) {
     const numbers = info.numbers;
 
     if (!numbers.localeCurrency) {
-        const currency = territoryCurrencyCode(localeTerritory(info));
+        const currency = territoryCurrencyCode(localeTerritory(info), throwIfNoValid);
 
         if (!currency && throwIfNoValid) {
             throw NoValidCurrency.error(info.name);

src/numbers/parse-number.js

@@ -11,13 +11,15 @@ function cleanCurrencyNumber(value, info, format) {
     const currency = format.currency || localeCurrency(info, isCurrency);
 
     if (currency) {
-        const displays = currencyDisplays(info, currency);
-        for (let idx = 0; idx < displays.length; idx++) {
-            let display = displays[idx];
-            if (number.includes(display)) {
-                number = number.replace(display, "");
-                isCurrency = true;
-                break;
+        const displays = currencyDisplays(info, currency, isCurrency);
+        if (displays) {
+            for (let idx = 0; idx < displays.length; idx++) {
+                let display = displays[idx];
+                if (number.includes(display)) {
+                    number = number.replace(display, "");
+                    isCurrency = true;
+                    break;
+                }
             }
         }
 

test/numbers.js

@@ -6,9 +6,6 @@ const numbers = require("cldr-data/main/bg/numbers.json");
 const currencies = require("cldr-data/main/bg/currencies.json");
 const currencyData = require("cldr-data/supplemental/currencyData.json");
 
-// CUSTOM region is used in tests below
-currencyData.supplemental.currencyData.region.CUSTOM = [{ XXX: {} }];
-
 load(likelySubtags, currencyData, numbers, currencies);
 
 function loadCustom(options) {
@@ -64,8 +61,10 @@ describe('formatNumber', () => {
 
 
     describe('errors', () => {
-        currencyData.supplemental.currencyData.region.CUSTOM = [{ XXX: {} }];
-        loadCustom({ currencies: { USD: { symbol: "$" } } });
+        beforeAll(() => {
+            cldr.supplemental.currencyData.region.CUSTOM = [{ XXX: {} }];
+            loadCustom({ currencies: { USD: { symbol: "$" } } });
+        });
 
         it('throws error if the default locale currency cannot be determined', () => {
             expect(() => {
@@ -237,7 +236,6 @@ describe('standard decimal formatting', () => {
     //doesn't seem to be a locale with zero group size so not sure if this is needed
     it('should not add group if the integer length is equal to the non-zero group sizes', () => {
         loadCustom({ pattern: ",,###,##0.###"});
-        console.log(JSON.stringify(cldr.custom, null, 4));
 
         expect(formatNumber(123456, "n", "custom")).toEqual("123,456");
     });
@@ -652,8 +650,10 @@ describe('parseNumber', () => {
     });
 
     describe('errors', () => {
-        currencyData.supplemental.currencyData.region.CUSTOM = [{ XXX: {} }];
-        loadCustom({ currencies: { USD: { symbol: "$" } } });
+        beforeAll(() => {
+            cldr.supplemental.currencyData.region.CUSTOM = [{ XXX: {} }];
+            loadCustom({ currencies: { USD: { symbol: "$" } } });
+        });
 
         it('throws error if the default locale currency cannot be determined', () => {
             expect(() => {
@@ -672,5 +672,27 @@ describe('parseNumber', () => {
                 parseNumber("10", 'custom', "n");
             }).not.toThrow();
         });
+
+        it('does not throw error if the currencies are missing but the format does not require it', () => {
+            const currencies = cldr.bg.numbers.currencies;
+            delete cldr.bg.numbers.currencies;
+
+            expect(() => {
+                parseNumber("10", 'bg', "n");
+            }).not.toThrow();
+
+            cldr.bg.numbers.currencies = currencies;
+        });
+
+        it('does not throw error if the default currency is missing but the format does not require it', () => {
+            const BGN = cldr.bg.numbers.currencies.BGN;
+            delete cldr.bg.numbers.currencies.BGN;
+
+            expect(() => {
+                parseNumber("10", 'bg', "n");
+            }).not.toThrow();
+
+            cldr.bg.numbers.currencies.BGN = BGN;
+        });
     });
 });