fix: parse accounting numbers with negative format

Author: danielkaradachki

src/numbers/format-number.js

@@ -1,49 +1,8 @@
 import { localeInfo } from '../cldr';
-import { CURRENCY, ACCOUNTING, DECIMAL, PERCENT, SCIENTIFIC, DEFAULT_LOCALE, NUMBER_PLACEHOLDER, EMPTY } from '../common/constants';
-import isString from '../common/is-string';
+import { DECIMAL, DEFAULT_LOCALE, NUMBER_PLACEHOLDER, EMPTY } from '../common/constants';
 import standardNumberFormat from './standard-number-format';
 import customNumberFormat from './custom-number-format';
-
-const standardFormatRegExp = /^(n|c|p|e|a)(\d*)$/i;
-
-function standardFormatOptions(format) {
-    const formatAndPrecision = standardFormatRegExp.exec(format);
-
-    if (formatAndPrecision) {
-        const options = {
-            style: DECIMAL
-        };
-
-        let style = formatAndPrecision[1].toLowerCase();
-
-        if (style === "c") {
-            options.style = CURRENCY;
-        } else if (style === "a") {
-            options.style = ACCOUNTING;
-        } else if (style === "p") {
-            options.style = PERCENT;
-        } else if (style === "e") {
-            options.style = SCIENTIFIC;
-        }
-
-        if (formatAndPrecision[2]) {
-            options.minimumFractionDigits = options.maximumFractionDigits = parseInt(formatAndPrecision[2], 10);
-        }
-
-        return options;
-    }
-}
-
-function getFormatOptions(format) {
-    let formatOptions;
-    if (isString(format)) {
-        formatOptions = standardFormatOptions(format);
-    } else {
-        formatOptions = format;
-    }
-
-    return formatOptions;
-}
+import formatOptions from './format-options';
 
 export default function formatNumber(number, format = NUMBER_PLACEHOLDER, locale = DEFAULT_LOCALE) {
     if (number === undefined || number === null) {
@@ -55,12 +14,12 @@ export default function formatNumber(number, format = NUMBER_PLACEHOLDER, locale
     }
 
     const info = localeInfo(locale);
-    const formatOptions = getFormatOptions(format);
+    const options = formatOptions(format);
 
     let result;
-    if (formatOptions) {
-        const style = (formatOptions || {}).style || DECIMAL;
-        result = standardNumberFormat(number, Object.assign({}, info.numbers[style], formatOptions), info);
+    if (options) {
+        const style = (options || {}).style || DECIMAL;
+        result = standardNumberFormat(number, Object.assign({}, info.numbers[style], options), info);
     } else {
         result = customNumberFormat(number, format, info);
     }

src/numbers/format-options.js

@@ -0,0 +1,43 @@
+import { CURRENCY, ACCOUNTING, DECIMAL, PERCENT, SCIENTIFIC } from '../common/constants';
+import isString from '../common/is-string';
+
+const standardFormatRegExp = /^(n|c|p|e|a)(\d*)$/i;
+
+function standardFormatOptions(format) {
+    const formatAndPrecision = standardFormatRegExp.exec(format);
+
+    if (formatAndPrecision) {
+        const options = {
+            style: DECIMAL
+        };
+
+        let style = formatAndPrecision[1].toLowerCase();
+
+        if (style === "c") {
+            options.style = CURRENCY;
+        } else if (style === "a") {
+            options.style = ACCOUNTING;
+        } else if (style === "p") {
+            options.style = PERCENT;
+        } else if (style === "e") {
+            options.style = SCIENTIFIC;
+        }
+
+        if (formatAndPrecision[2]) {
+            options.minimumFractionDigits = options.maximumFractionDigits = parseInt(formatAndPrecision[2], 10);
+        }
+
+        return options;
+    }
+}
+
+export default function formatOptions(format) {
+    let options;
+    if (isString(format)) {
+        options = standardFormatOptions(format);
+    } else {
+        options = format;
+    }
+
+    return options;
+}

src/numbers/parse-number.js

@@ -2,16 +2,27 @@ import { localeInfo, localeCurrency, currencyDisplays } from '../cldr';
 import { PERCENT, NUMBER_PLACEHOLDER, CURRENCY_PLACEHOLDER, DEFAULT_LOCALE, EMPTY, POINT } from '../common/constants';
 import isNumber from '../common/is-number';
 import isCurrencyStyle from './is-currency-style';
+import formatOptions from './format-options';
 
 const exponentRegExp = /[eE][\-+]?[0-9]+/;
 const nonBreakingSpaceRegExp = /\u00A0/g;
 
+function cleanNegativePattern(number, patterns) {
+    if (patterns.length > 1) {
+        const parts = (patterns[1] || EMPTY).replace(CURRENCY_PLACEHOLDER, EMPTY).split(NUMBER_PLACEHOLDER);
+        if (number.indexOf(parts[0]) > -1 && number.indexOf(parts[1]) > -1) {
+            return number.replace(parts[0], EMPTY).replace(parts[1], EMPTY);
+        }
+    }
+}
+
 function cleanCurrencyNumber(value, info, format) {
-    let isCurrency = isCurrencyStyle(format.style);
+    const options = formatOptions(format) || {};
+    let isCurrency = isCurrencyStyle(options.style);
     let number = value;
     let negative;
 
-    const currency = format.currency || localeCurrency(info, isCurrency);
+    const currency = options.currency || localeCurrency(info, isCurrency);
 
     if (currency) {
         const displays = currencyDisplays(info, currency, isCurrency);
@@ -27,14 +38,14 @@ function cleanCurrencyNumber(value, info, format) {
         }
 
         if (isCurrency) {
-            const patterns = info.numbers.currency.patterns;
-            if (patterns.length > 1) {
-                const parts = (patterns[1] || EMPTY).replace(CURRENCY_PLACEHOLDER, EMPTY).split(NUMBER_PLACEHOLDER);
-                if (number.indexOf(parts[0]) > -1 && number.indexOf(parts[1]) > -1) {
-                    number = number.replace(parts[0], EMPTY).replace(parts[1], EMPTY);
-                    negative = true;
-                }
+            const cleanNumber = cleanNegativePattern(number, info.numbers.currency.patterns) ||
+                cleanNegativePattern(number, info.numbers.accounting.patterns);
+
+            if (cleanNumber) {
+                negative = true;
+                number = cleanNumber;
             }
+
         }
     }
 

test/numbers.js

@@ -674,6 +674,15 @@ describe('parseNumber', () => {
         expect(parseNumber("€12", "en", { currency: "EUR"})).toEqual(12);
     });
 
+    it("parses accounting numbers", () => {
+        expect(parseNumber("$12", 'en', 'a')).toEqual(12);
+        expect(parseNumber("$12", 'en', { style: 'accounting' })).toEqual(12);
+    });
+
+    it("parses accounting numbers with negative pattern", () => {
+        expect(parseNumber("($12)", 'en', 'a')).toEqual(-12);
+    });
+
     it("parses percent numbers", () => {
         expect(parseNumber("% 12")).toEqual(0.12);
     });