@sb1/ffe-formatters 5.0.1 → 5.0.3

package/README.md

@@ -12,7 +12,7 @@ npm install --save @sb1/ffe-formatters
 
 ## Usage
 
-Full documentation on formatter usage is available at https://design.sparebank1.no/komponenter/formatering/.
+Full documentation on formatter usage is available at https://design.sparebank1.no/Komponenter/Formatters.
 
 Import the formatter(s) you need the following way:
 

package/es/formatCurrency.js

@@ -14,7 +14,7 @@ import { parseNumber } from './internal/parseNumber';
 import { NON_BREAKING_SPACE } from './internal/unicode';
 export var formatCurrency = function (amount, opts) {
     var locale = opts.locale;
-    var _a = __assign({ prefix: "kr".concat(NON_BREAKING_SPACE), postfix: ',–' }, opts), prefix = _a.prefix, postfix = _a.postfix;
+    var _a = __assign({}, opts), _b = _a.prefix, prefix = _b === void 0 ? "kr".concat(NON_BREAKING_SPACE) : _b, _c = _a.postfix, postfix = _c === void 0 ? ',–' : _c;
     var parsed = parseNumber(amount, locale);
     // A ',-' postfix is not allowed for amounts with øre, see:
     // http://www.sprakradet.no/svardatabase/sporsmal-og-svar/kronebelop-rekkjefolgje-komma-og-strek/

package/es/formatDistance.js

@@ -2,9 +2,10 @@ import { formatNumber } from './formatNumber';
 import { parseNumber } from './internal/parseNumber';
 import { NON_BREAKING_SPACE } from './internal/unicode';
 export var formatDistance = function (distance, opts) {
-    if (opts === void 0) { opts = { unit: 'km' }; }
+    if (opts === void 0) { opts = {}; }
+    var _a = opts.unit, unit = _a === void 0 ? 'km' : _a;
     var toFormat = parseNumber(distance, 'nb');
     return toFormat === null
         ? ''
-        : "".concat(formatNumber(toFormat, { locale: 'nb' })).concat(NON_BREAKING_SPACE).concat(opts.unit);
+        : "".concat(formatNumber(toFormat, { locale: 'nb' })).concat(NON_BREAKING_SPACE).concat(unit);
 };

package/es/formatNumber.js

@@ -1,11 +1,12 @@
 import { parseNumber } from './internal/parseNumber';
 export var formatNumber = function (number, opts) {
     var _a = opts.decimals, decimals = _a === void 0 ? 0 : _a, locale = opts.locale;
-    var toFormat = parseNumber(number, locale);
+    var supportedLocale = locale === 'en' ? 'en' : 'nb';
+    var toFormat = parseNumber(number, supportedLocale);
     if (typeof toFormat !== 'number') {
         return number;
     }
-    return new Intl.NumberFormat(locale === 'en' ? 'en' : 'nb', {
+    return new Intl.NumberFormat(supportedLocale, {
         maximumFractionDigits: decimals,
         minimumFractionDigits: decimals,
     }).format(toFormat);

package/es/formatPercentage.js

@@ -5,7 +5,7 @@ export var formatPercentage = function (amount, opts) {
         maxDecimals: 2,
     }; }
     if (typeof amount !== 'number') {
-        return '';
+        return "".concat(amount.replace('.', ',')).concat(NON_BREAKING_SPACE, "%");
     }
     var percentage = amount.toLocaleString('nb-NO', {
         minimumFractionDigits: opts.minDecimals,

package/es/internal/parseNumber.js

@@ -23,7 +23,10 @@ var NumberParser = /** @class */ (function () {
     };
     return NumberParser;
 }());
+var nbParser = new NumberParser('nb');
+var enParser = new NumberParser('en');
 export var parseNumber = function (number, locale) {
-    var parsed = new NumberParser(locale === 'en' ? 'en' : 'nb').parse("".concat(number).replace(/\s/g, ''));
+    var parser = locale === 'en' ? enParser : nbParser;
+    var parsed = parser.parse("".concat(number).replace(/\s/g, ''));
     return Number.isNaN(parsed) ? null : parsed;
 };

package/lib/formatCurrency.js

@@ -17,7 +17,7 @@ var parseNumber_1 = require("./internal/parseNumber");
 var unicode_1 = require("./internal/unicode");
 var formatCurrency = function (amount, opts) {
     var locale = opts.locale;
-    var _a = __assign({ prefix: "kr".concat(unicode_1.NON_BREAKING_SPACE), postfix: ',–' }, opts), prefix = _a.prefix, postfix = _a.postfix;
+    var _a = __assign({}, opts), _b = _a.prefix, prefix = _b === void 0 ? "kr".concat(unicode_1.NON_BREAKING_SPACE) : _b, _c = _a.postfix, postfix = _c === void 0 ? ',–' : _c;
     var parsed = (0, parseNumber_1.parseNumber)(amount, locale);
     // A ',-' postfix is not allowed for amounts with øre, see:
     // http://www.sprakradet.no/svardatabase/sporsmal-og-svar/kronebelop-rekkjefolgje-komma-og-strek/

package/lib/formatDistance.js

@@ -5,10 +5,11 @@ var formatNumber_1 = require("./formatNumber");
 var parseNumber_1 = require("./internal/parseNumber");
 var unicode_1 = require("./internal/unicode");
 var formatDistance = function (distance, opts) {
-    if (opts === void 0) { opts = { unit: 'km' }; }
+    if (opts === void 0) { opts = {}; }
+    var _a = opts.unit, unit = _a === void 0 ? 'km' : _a;
     var toFormat = (0, parseNumber_1.parseNumber)(distance, 'nb');
     return toFormat === null
         ? ''
-        : "".concat((0, formatNumber_1.formatNumber)(toFormat, { locale: 'nb' })).concat(unicode_1.NON_BREAKING_SPACE).concat(opts.unit);
+        : "".concat((0, formatNumber_1.formatNumber)(toFormat, { locale: 'nb' })).concat(unicode_1.NON_BREAKING_SPACE).concat(unit);
 };
 exports.formatDistance = formatDistance;

package/lib/formatNumber.js

@@ -4,11 +4,12 @@ exports.formatNumber = void 0;
 var parseNumber_1 = require("./internal/parseNumber");
 var formatNumber = function (number, opts) {
     var _a = opts.decimals, decimals = _a === void 0 ? 0 : _a, locale = opts.locale;
-    var toFormat = (0, parseNumber_1.parseNumber)(number, locale);
+    var supportedLocale = locale === 'en' ? 'en' : 'nb';
+    var toFormat = (0, parseNumber_1.parseNumber)(number, supportedLocale);
     if (typeof toFormat !== 'number') {
         return number;
     }
-    return new Intl.NumberFormat(locale === 'en' ? 'en' : 'nb', {
+    return new Intl.NumberFormat(supportedLocale, {
         maximumFractionDigits: decimals,
         minimumFractionDigits: decimals,
     }).format(toFormat);

package/lib/formatPercentage.js

@@ -8,7 +8,7 @@ var formatPercentage = function (amount, opts) {
         maxDecimals: 2,
     }; }
     if (typeof amount !== 'number') {
-        return '';
+        return "".concat(amount.replace('.', ',')).concat(unicode_1.NON_BREAKING_SPACE, "%");
     }
     var percentage = amount.toLocaleString('nb-NO', {
         minimumFractionDigits: opts.minDecimals,

package/lib/internal/parseNumber.js

@@ -26,8 +26,11 @@ var NumberParser = /** @class */ (function () {
     };
     return NumberParser;
 }());
+var nbParser = new NumberParser('nb');
+var enParser = new NumberParser('en');
 var parseNumber = function (number, locale) {
-    var parsed = new NumberParser(locale === 'en' ? 'en' : 'nb').parse("".concat(number).replace(/\s/g, ''));
+    var parser = locale === 'en' ? enParser : nbParser;
+    var parsed = parser.parse("".concat(number).replace(/\s/g, ''));
     return Number.isNaN(parsed) ? null : parsed;
 };
 exports.parseNumber = parseNumber;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sb1/ffe-formatters",
-    "version": "5.0.1",
+    "version": "5.0.3",
     "description": "JavaScript general use string formatters",
     "keywords": [
         "ffe"
@@ -34,5 +34,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "daa0ca2fa732cec9d22bd9ffe80d0c611555b989"
+    "gitHead": "58de7e398d74d58063d329c8bb05535e6d0ba0af"
 }