@sb1/ffe-formatters 100.12.3 → 101.0.0

package/es/formatAccountNumber.js

@@ -1,8 +1,8 @@
 import { NON_BREAKING_SPACE } from './internal/unicode';
-var foreignAccountNumber = function (accountNumber) {
-    var formattedAccountNumber = '';
-    for (var i = 0; i < accountNumber.length; i++) {
-        var isFourthIteration = (i + 1) % 4 === 0;
+const foreignAccountNumber = (accountNumber) => {
+    let formattedAccountNumber = '';
+    for (let i = 0; i < accountNumber.length; i++) {
+        const isFourthIteration = (i + 1) % 4 === 0;
         formattedAccountNumber += accountNumber[i].valueOf();
         if (isFourthIteration && i + 1 < accountNumber.length) {
             formattedAccountNumber += NON_BREAKING_SPACE;
@@ -10,8 +10,8 @@ var foreignAccountNumber = function (accountNumber) {
     }
     return formattedAccountNumber;
 };
-var domesticAccountNumber = function (accountNumber) {
-    var formattedAccountNumber = '';
+const domesticAccountNumber = (accountNumber) => {
+    let formattedAccountNumber = '';
     if (accountNumber.length > 0) {
         formattedAccountNumber += accountNumber.substring(0, 4);
     }
@@ -25,7 +25,7 @@ var domesticAccountNumber = function (accountNumber) {
     }
     return formattedAccountNumber;
 };
-export var formatAccountNumber = function (accountNumber) {
+export const formatAccountNumber = (accountNumber) => {
     if (!accountNumber) {
         return accountNumber;
     }

package/es/formatCurrency.js

@@ -1,29 +1,20 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 import { formatNumber } from './formatNumber';
 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({}, 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);
+export const formatCurrency = (amount, opts) => {
+    const { locale } = opts;
+    const { prefix = `kr${NON_BREAKING_SPACE}`, postfix = ',–' } = {
+        ...opts,
+    };
+    const 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/
     if (typeof parsed === 'number' && parsed % 1 !== 0) {
-        var decimalPostfix = ![',–', ',-'].includes(postfix) ? postfix : '';
-        return "".concat(prefix).concat(formatNumber(amount, {
+        const decimalPostfix = ![',–', ',-'].includes(postfix) ? postfix : '';
+        return `${prefix}${formatNumber(amount, {
             decimals: 2,
-            locale: locale,
-        })).concat(decimalPostfix);
+            locale,
+        })}${decimalPostfix}`;
     }
-    return "".concat(prefix).concat(formatNumber(amount, { locale: locale })).concat(postfix);
+    return `${prefix}${formatNumber(amount, { locale })}${postfix}`;
 };

package/es/formatDate.js

@@ -1,8 +1,8 @@
-var ensureTwoDigits = function (d) { return "00".concat(d).slice(-2); };
-export var formatDate = function (timestamp) {
-    var date = timestamp instanceof Date ? timestamp : new Date(timestamp);
-    var dd = ensureTwoDigits(date.getDate());
-    var mm = ensureTwoDigits(date.getMonth() + 1);
-    var yyyy = date.getFullYear();
-    return "".concat(dd, ".").concat(mm, ".").concat(yyyy);
+const ensureTwoDigits = (d) => `00${d}`.slice(-2);
+export const formatDate = (timestamp) => {
+    const date = timestamp instanceof Date ? timestamp : new Date(timestamp);
+    const dd = ensureTwoDigits(date.getDate());
+    const mm = ensureTwoDigits(date.getMonth() + 1);
+    const yyyy = date.getFullYear();
+    return `${dd}.${mm}.${yyyy}`;
 };

package/es/formatDistance.js

@@ -1,11 +1,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 = {}; }
-    var _a = opts.unit, unit = _a === void 0 ? 'km' : _a;
-    var toFormat = parseNumber(distance, 'nb');
+export const formatDistance = (distance, opts = {}) => {
+    const { unit = 'km' } = opts;
+    const toFormat = parseNumber(distance, 'nb');
     return toFormat === null
         ? ''
-        : "".concat(formatNumber(toFormat, { locale: 'nb' })).concat(NON_BREAKING_SPACE).concat(unit);
+        : `${formatNumber(toFormat, { locale: 'nb' })}${NON_BREAKING_SPACE}${unit}`;
 };

package/es/formatFodselsnummer.js

@@ -1,7 +1,7 @@
 import { NON_BREAKING_SPACE } from './internal/unicode';
-export var formatFodselsnummer = function (ssn) {
+export const formatFodselsnummer = (ssn) => {
     if (!ssn || ssn.length !== 11) {
         return ssn;
     }
-    return "".concat(ssn.substring(0, 6)).concat(NON_BREAKING_SPACE).concat(ssn.substring(6, 11));
+    return `${ssn.substring(0, 6)}${NON_BREAKING_SPACE}${ssn.substring(6, 11)}`;
 };

package/es/formatNumber.js

@@ -1,8 +1,8 @@
 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 supportedLocale = locale === 'en' ? 'en' : 'nb';
-    var toFormat = parseNumber(number, supportedLocale);
+export const formatNumber = (number, opts) => {
+    const { decimals = 0, locale } = opts;
+    const supportedLocale = locale === 'en' ? 'en' : 'nb';
+    const toFormat = parseNumber(number, supportedLocale);
     if (typeof toFormat !== 'number') {
         return number;
     }

package/es/formatPercentage.js

@@ -1,15 +1,14 @@
 import { NON_BREAKING_SPACE } from './internal/unicode';
-export var formatPercentage = function (amount, opts) {
-    if (opts === void 0) { opts = {
-        minDecimals: 0,
-        maxDecimals: 2,
-    }; }
+export const formatPercentage = (amount, opts = {
+    minDecimals: 0,
+    maxDecimals: 2,
+}) => {
     if (typeof amount !== 'number') {
-        return "".concat(amount.replace('.', ',')).concat(NON_BREAKING_SPACE, "%");
+        return `${amount.replace('.', ',')}${NON_BREAKING_SPACE}%`;
     }
-    var percentage = amount.toLocaleString('nb-NO', {
+    const percentage = amount.toLocaleString('nb-NO', {
         minimumFractionDigits: opts.minDecimals,
         maximumFractionDigits: opts.maxDecimals,
     });
-    return "".concat(percentage.replace('.', ',')).concat(NON_BREAKING_SPACE, "%");
+    return `${percentage.replace('.', ',')}${NON_BREAKING_SPACE}%`;
 };

package/es/internal/parseNumber.js

@@ -1,32 +1,31 @@
 // https://observablehq.com/@mbostock/localized-number-parsing
-var NumberParser = /** @class */ (function () {
-    function NumberParser(locale) {
+class NumberParser {
+    constructor(locale) {
         var _a, _b;
-        var parts = new Intl.NumberFormat(locale).formatToParts(12345.6);
-        var numerals = new Intl.NumberFormat(locale, { useGrouping: false })
+        const parts = new Intl.NumberFormat(locale).formatToParts(12345.6);
+        const numerals = new Intl.NumberFormat(locale, { useGrouping: false })
             .format(9876543210)
             .split('')
             .reverse();
-        var index = new Map(numerals.map(function (d, i) { return [d, i]; }));
-        this._group = new RegExp("[".concat((_a = parts.find(function (d) { return d.type === 'group'; })) === null || _a === void 0 ? void 0 : _a.value, "]"), 'g');
-        this._decimal = new RegExp("[".concat((_b = parts.find(function (d) { return d.type === 'decimal'; })) === null || _b === void 0 ? void 0 : _b.value, "]"));
-        this._numeral = new RegExp("[".concat(numerals.join(''), "]"), 'g');
-        this._index = function (d) { return "".concat(index.get(d)); };
+        const index = new Map(numerals.map((d, i) => [d, i]));
+        this._group = new RegExp(`[${(_a = parts.find(d => d.type === 'group')) === null || _a === void 0 ? void 0 : _a.value}]`, 'g');
+        this._decimal = new RegExp(`[${(_b = parts.find(d => d.type === 'decimal')) === null || _b === void 0 ? void 0 : _b.value}]`);
+        this._numeral = new RegExp(`[${numerals.join('')}]`, 'g');
+        this._index = d => `${index.get(d)}`;
     }
-    NumberParser.prototype.parse = function (input) {
-        var string = input
+    parse(input) {
+        const string = input
             .trim()
             .replace(this._group, '')
             .replace(this._decimal, '.')
             .replace(this._numeral, this._index);
         return string ? +string : Number.NaN;
-    };
-    return NumberParser;
-}());
-var nbParser = new NumberParser('nb');
-var enParser = new NumberParser('en');
-export var parseNumber = function (number, locale) {
-    var parser = locale === 'en' ? enParser : nbParser;
-    var parsed = parser.parse("".concat(number).replace(/\s/g, ''));
+    }
+}
+const nbParser = new NumberParser('nb');
+const enParser = new NumberParser('en');
+export const parseNumber = (number, locale) => {
+    const parser = locale === 'en' ? enParser : nbParser;
+    const parsed = parser.parse(`${number}`.replace(/\s/g, ''));
     return Number.isNaN(parsed) ? null : parsed;
 };

package/es/internal/unicode.js

@@ -1 +1 @@
-export var NON_BREAKING_SPACE = '\u00A0';
+export const NON_BREAKING_SPACE = '\u00A0';

package/lib/formatAccountNumber.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatAccountNumber = void 0;
-var unicode_1 = require("./internal/unicode");
-var foreignAccountNumber = function (accountNumber) {
-    var formattedAccountNumber = '';
-    for (var i = 0; i < accountNumber.length; i++) {
-        var isFourthIteration = (i + 1) % 4 === 0;
+const unicode_1 = require("./internal/unicode");
+const foreignAccountNumber = (accountNumber) => {
+    let formattedAccountNumber = '';
+    for (let i = 0; i < accountNumber.length; i++) {
+        const isFourthIteration = (i + 1) % 4 === 0;
         formattedAccountNumber += accountNumber[i].valueOf();
         if (isFourthIteration && i + 1 < accountNumber.length) {
             formattedAccountNumber += unicode_1.NON_BREAKING_SPACE;
@@ -13,8 +13,8 @@ var foreignAccountNumber = function (accountNumber) {
     }
     return formattedAccountNumber;
 };
-var domesticAccountNumber = function (accountNumber) {
-    var formattedAccountNumber = '';
+const domesticAccountNumber = (accountNumber) => {
+    let formattedAccountNumber = '';
     if (accountNumber.length > 0) {
         formattedAccountNumber += accountNumber.substring(0, 4);
     }
@@ -28,7 +28,7 @@ var domesticAccountNumber = function (accountNumber) {
     }
     return formattedAccountNumber;
 };
-var formatAccountNumber = function (accountNumber) {
+const formatAccountNumber = (accountNumber) => {
     if (!accountNumber) {
         return accountNumber;
     }

package/lib/formatCurrency.js

@@ -1,33 +1,24 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatCurrency = void 0;
-var formatNumber_1 = require("./formatNumber");
-var parseNumber_1 = require("./internal/parseNumber");
-var unicode_1 = require("./internal/unicode");
-var formatCurrency = function (amount, opts) {
-    var locale = opts.locale;
-    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);
+const formatNumber_1 = require("./formatNumber");
+const parseNumber_1 = require("./internal/parseNumber");
+const unicode_1 = require("./internal/unicode");
+const formatCurrency = (amount, opts) => {
+    const { locale } = opts;
+    const { prefix = `kr${unicode_1.NON_BREAKING_SPACE}`, postfix = ',–' } = {
+        ...opts,
+    };
+    const 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/
     if (typeof parsed === 'number' && parsed % 1 !== 0) {
-        var decimalPostfix = ![',–', ',-'].includes(postfix) ? postfix : '';
-        return "".concat(prefix).concat((0, formatNumber_1.formatNumber)(amount, {
+        const decimalPostfix = ![',–', ',-'].includes(postfix) ? postfix : '';
+        return `${prefix}${(0, formatNumber_1.formatNumber)(amount, {
             decimals: 2,
-            locale: locale,
-        })).concat(decimalPostfix);
+            locale,
+        })}${decimalPostfix}`;
     }
-    return "".concat(prefix).concat((0, formatNumber_1.formatNumber)(amount, { locale: locale })).concat(postfix);
+    return `${prefix}${(0, formatNumber_1.formatNumber)(amount, { locale })}${postfix}`;
 };
 exports.formatCurrency = formatCurrency;

package/lib/formatDate.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatDate = void 0;
-var ensureTwoDigits = function (d) { return "00".concat(d).slice(-2); };
-var formatDate = function (timestamp) {
-    var date = timestamp instanceof Date ? timestamp : new Date(timestamp);
-    var dd = ensureTwoDigits(date.getDate());
-    var mm = ensureTwoDigits(date.getMonth() + 1);
-    var yyyy = date.getFullYear();
-    return "".concat(dd, ".").concat(mm, ".").concat(yyyy);
+const ensureTwoDigits = (d) => `00${d}`.slice(-2);
+const formatDate = (timestamp) => {
+    const date = timestamp instanceof Date ? timestamp : new Date(timestamp);
+    const dd = ensureTwoDigits(date.getDate());
+    const mm = ensureTwoDigits(date.getMonth() + 1);
+    const yyyy = date.getFullYear();
+    return `${dd}.${mm}.${yyyy}`;
 };
 exports.formatDate = formatDate;

package/lib/formatDistance.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatDistance = void 0;
-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 = {}; }
-    var _a = opts.unit, unit = _a === void 0 ? 'km' : _a;
-    var toFormat = (0, parseNumber_1.parseNumber)(distance, 'nb');
+const formatNumber_1 = require("./formatNumber");
+const parseNumber_1 = require("./internal/parseNumber");
+const unicode_1 = require("./internal/unicode");
+const formatDistance = (distance, opts = {}) => {
+    const { unit = 'km' } = opts;
+    const 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(unit);
+        : `${(0, formatNumber_1.formatNumber)(toFormat, { locale: 'nb' })}${unicode_1.NON_BREAKING_SPACE}${unit}`;
 };
 exports.formatDistance = formatDistance;

package/lib/formatFodselsnummer.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatFodselsnummer = void 0;
-var unicode_1 = require("./internal/unicode");
-var formatFodselsnummer = function (ssn) {
+const unicode_1 = require("./internal/unicode");
+const formatFodselsnummer = (ssn) => {
     if (!ssn || ssn.length !== 11) {
         return ssn;
     }
-    return "".concat(ssn.substring(0, 6)).concat(unicode_1.NON_BREAKING_SPACE).concat(ssn.substring(6, 11));
+    return `${ssn.substring(0, 6)}${unicode_1.NON_BREAKING_SPACE}${ssn.substring(6, 11)}`;
 };
 exports.formatFodselsnummer = formatFodselsnummer;

package/lib/formatNumber.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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 supportedLocale = locale === 'en' ? 'en' : 'nb';
-    var toFormat = (0, parseNumber_1.parseNumber)(number, supportedLocale);
+const parseNumber_1 = require("./internal/parseNumber");
+const formatNumber = (number, opts) => {
+    const { decimals = 0, locale } = opts;
+    const supportedLocale = locale === 'en' ? 'en' : 'nb';
+    const toFormat = (0, parseNumber_1.parseNumber)(number, supportedLocale);
     if (typeof toFormat !== 'number') {
         return number;
     }

package/lib/formatPercentage.js

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatPercentage = void 0;
-var unicode_1 = require("./internal/unicode");
-var formatPercentage = function (amount, opts) {
-    if (opts === void 0) { opts = {
-        minDecimals: 0,
-        maxDecimals: 2,
-    }; }
+const unicode_1 = require("./internal/unicode");
+const formatPercentage = (amount, opts = {
+    minDecimals: 0,
+    maxDecimals: 2,
+}) => {
     if (typeof amount !== 'number') {
-        return "".concat(amount.replace('.', ',')).concat(unicode_1.NON_BREAKING_SPACE, "%");
+        return `${amount.replace('.', ',')}${unicode_1.NON_BREAKING_SPACE}%`;
     }
-    var percentage = amount.toLocaleString('nb-NO', {
+    const percentage = amount.toLocaleString('nb-NO', {
         minimumFractionDigits: opts.minDecimals,
         maximumFractionDigits: opts.maxDecimals,
     });
-    return "".concat(percentage.replace('.', ',')).concat(unicode_1.NON_BREAKING_SPACE, "%");
+    return `${percentage.replace('.', ',')}${unicode_1.NON_BREAKING_SPACE}%`;
 };
 exports.formatPercentage = formatPercentage;

package/lib/internal/parseNumber.js

@@ -2,35 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseNumber = void 0;
 // https://observablehq.com/@mbostock/localized-number-parsing
-var NumberParser = /** @class */ (function () {
-    function NumberParser(locale) {
+class NumberParser {
+    constructor(locale) {
         var _a, _b;
-        var parts = new Intl.NumberFormat(locale).formatToParts(12345.6);
-        var numerals = new Intl.NumberFormat(locale, { useGrouping: false })
+        const parts = new Intl.NumberFormat(locale).formatToParts(12345.6);
+        const numerals = new Intl.NumberFormat(locale, { useGrouping: false })
             .format(9876543210)
             .split('')
             .reverse();
-        var index = new Map(numerals.map(function (d, i) { return [d, i]; }));
-        this._group = new RegExp("[".concat((_a = parts.find(function (d) { return d.type === 'group'; })) === null || _a === void 0 ? void 0 : _a.value, "]"), 'g');
-        this._decimal = new RegExp("[".concat((_b = parts.find(function (d) { return d.type === 'decimal'; })) === null || _b === void 0 ? void 0 : _b.value, "]"));
-        this._numeral = new RegExp("[".concat(numerals.join(''), "]"), 'g');
-        this._index = function (d) { return "".concat(index.get(d)); };
+        const index = new Map(numerals.map((d, i) => [d, i]));
+        this._group = new RegExp(`[${(_a = parts.find(d => d.type === 'group')) === null || _a === void 0 ? void 0 : _a.value}]`, 'g');
+        this._decimal = new RegExp(`[${(_b = parts.find(d => d.type === 'decimal')) === null || _b === void 0 ? void 0 : _b.value}]`);
+        this._numeral = new RegExp(`[${numerals.join('')}]`, 'g');
+        this._index = d => `${index.get(d)}`;
     }
-    NumberParser.prototype.parse = function (input) {
-        var string = input
+    parse(input) {
+        const string = input
             .trim()
             .replace(this._group, '')
             .replace(this._decimal, '.')
             .replace(this._numeral, this._index);
         return string ? +string : Number.NaN;
-    };
-    return NumberParser;
-}());
-var nbParser = new NumberParser('nb');
-var enParser = new NumberParser('en');
-var parseNumber = function (number, locale) {
-    var parser = locale === 'en' ? enParser : nbParser;
-    var parsed = parser.parse("".concat(number).replace(/\s/g, ''));
+    }
+}
+const nbParser = new NumberParser('nb');
+const enParser = new NumberParser('en');
+const parseNumber = (number, locale) => {
+    const parser = locale === 'en' ? enParser : nbParser;
+    const parsed = parser.parse(`${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": "100.12.3",
+    "version": "101.0.0",
     "description": "JavaScript general use string formatters",
     "keywords": [
         "ffe"
@@ -27,11 +27,11 @@
         "test:watch": "jest --watch"
     },
     "devDependencies": {
-        "@sb1/ffe-buildtool": "^100.12.3",
-        "eslint": "^9.22.0"
+        "@sb1/ffe-buildtool": "^101.0.0",
+        "eslint": "^10.2.0"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "c250edc3d20e5ed115c5c5951495d700e96a3be3"
+    "gitHead": "7714019dbb9001551cb5d1c262c58afd609d4fb0"
 }