Add currencySymbol & currencyPosition to format

Fix #344 * src/validating.js: * src/formatting.js: add support for `currencyPosition` and `currencySymbol`. * tests/src/numbro-tests.js: add regression test.
BenjaminVanRyseghem · Mar 21, 2018 · 0d99ddd · 0d99ddd
1 parent d21d347
commit 0d99ddd
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/src/formatting.js b/src/formatting.js
@@ -284,13 +284,15 @@ function formatCurrency(instance, providedFormat, state) {
     let decimalSeparator = undefined;
     let space = "";
     let average = !!options.totalLength || !!options.forceAverage || options.average;
+    let position = providedFormat.currencyPosition || currentCurrency.position;
+    let symbol = providedFormat.currencySymbol || currentCurrency.symbol;
 
     if (options.spaceSeparated) {
         space = " ";
     }
 
-    if (currentCurrency.position === "infix") {
-        decimalSeparator = space + currentCurrency.symbol + space;
+    if (position === "infix") {
+        decimalSeparator = space + symbol + space;
     }
 
     let output = formatNumber({
@@ -300,17 +302,17 @@ function formatCurrency(instance, providedFormat, state) {
         decimalSeparator
     });
 
-    if (currentCurrency.position === "prefix") {
+    if (position === "prefix") {
         if (instance._value < 0 && options.negative === "sign") {
-            output = `-${space}${currentCurrency.symbol}${output.slice(1)}`;
+            output = `-${space}${symbol}${output.slice(1)}`;
         } else {
-            output = currentCurrency.symbol + space + output;
+            output = symbol + space + output;
         }
     }
 
-    if (!currentCurrency.position || currentCurrency.position === "postfix") {
+    if (!position || position === "postfix") {
         space = average ? "" : space;
-        output = output + space + currentCurrency.symbol;
+        output = output + space + symbol;
     }
 
     return output;

diff --git a/src/validating.js b/src/validating.js
@@ -41,6 +41,12 @@ const validForceAverageValues = [
     "thousand"
 ];
 
+const validCurrencyPosition = [
+    "prefix",
+    "infix",
+    "postfix"
+];
+
 const validNegativeValues = [
     "sign",
     "parenthesis"
@@ -109,6 +115,11 @@ const validFormat = {
         validValues: validForceAverageValues
     },
     average: "boolean",
+    currencyPosition: {
+        type: "string",
+        validValues: validCurrencyPosition
+    },
+    currencySymbol: "string",
     totalLength: {
         type: "number",
         restrictions: [

diff --git a/tests/src/numbro-tests.js b/tests/src/numbro-tests.js
@@ -327,5 +327,14 @@ describe("numbro", () => {
             let result = numbro("1000").format({ mantissa: 2 });
             expect(result).toBe("1000.00");
         });
+
+        it("Issue 344", () => {
+            let result = numbro("1000").formatCurrency({
+                currencyPosition: "infix",
+                currencySymbol: "FOO",
+                mantissa: 2
+            });
+            expect(result).toBe("1000FOO00");
+        });
     });
 });