@sb1/ffe-formatters 4.2.8 → 5.0.0

package/es/formatCurrency.js

@@ -13,15 +13,17 @@ 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({ prefix: "kr".concat(NON_BREAKING_SPACE), postfix: ',–' }, opts), prefix = _a.prefix, postfix = _a.postfix;
-    var parsed = parseNumber(amount);
+    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/
     if (typeof parsed === 'number' && parsed % 1 !== 0) {
         var decimalPostfix = ![',–', ',-'].includes(postfix) ? postfix : '';
         return "".concat(prefix).concat(formatNumber(amount, {
             decimals: 2,
+            locale: locale,
         })).concat(decimalPostfix);
     }
-    return "".concat(prefix).concat(formatNumber(amount)).concat(postfix);
+    return "".concat(prefix).concat(formatNumber(amount, { locale: locale })).concat(postfix);
 };

package/es/formatDate.js

@@ -1,8 +1,5 @@
 var ensureTwoDigits = function (d) { return "00".concat(d).slice(-2); };
 export var formatDate = function (timestamp) {
-    if (!(Number.isInteger(timestamp) || timestamp instanceof Date)) {
-        return null;
-    }
     var date = timestamp instanceof Date ? timestamp : new Date(timestamp);
     var dd = ensureTwoDigits(date.getDate());
     var mm = ensureTwoDigits(date.getMonth() + 1);

package/es/formatDistance.js

@@ -3,9 +3,8 @@ 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' }; }
-    var toFormat = parseNumber(distance);
-    if (toFormat !== 0 && !toFormat) {
-        return '';
-    }
-    return "".concat(formatNumber(toFormat)).concat(NON_BREAKING_SPACE).concat(opts.unit);
+    var toFormat = parseNumber(distance, 'nb');
+    return toFormat === null
+        ? ''
+        : "".concat(formatNumber(toFormat, { locale: 'nb' })).concat(NON_BREAKING_SPACE).concat(opts.unit);
 };

package/es/formatNumber.js

@@ -1,23 +1,12 @@
-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 { numberFormat } from 'underscore.string';
-import { NON_BREAKING_SPACE } from './internal/unicode';
 import { parseNumber } from './internal/parseNumber';
 export var formatNumber = function (number, opts) {
-    if (opts === void 0) { opts = {}; }
-    var _a = __assign({ decimals: 0, thousandSeparator: NON_BREAKING_SPACE, decimalMark: ',' }, opts), decimals = _a.decimals, thousandSeparator = _a.thousandSeparator, decimalMark = _a.decimalMark;
-    var toFormat = parseNumber(number);
+    var _a = opts.decimals, decimals = _a === void 0 ? 0 : _a, locale = opts.locale;
+    var toFormat = parseNumber(number, locale);
     if (typeof toFormat !== 'number') {
         return number;
     }
-    return "".concat(numberFormat(toFormat, decimals, decimalMark, thousandSeparator));
+    return new Intl.NumberFormat(locale === 'en' ? 'en' : 'nb', {
+        maximumFractionDigits: decimals,
+        minimumFractionDigits: decimals,
+    }).format(toFormat);
 };

package/es/internal/parseNumber.js

@@ -1,10 +1,29 @@
-export var parseNumber = function (number) {
-    if (!number || typeof number === 'number') {
-        return number;
+// https://observablehq.com/@mbostock/localized-number-parsing
+var NumberParser = /** @class */ (function () {
+    function NumberParser(locale) {
+        var _a, _b;
+        var parts = new Intl.NumberFormat(locale).formatToParts(12345.6);
+        var 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)); };
     }
-    var parsed = parseFloat(number.replace(/[^\d,.-]/g, '').replace(/,/g, '.'));
-    if (Number.isNaN(parsed)) {
-        return null;
-    }
-    return parsed;
+    NumberParser.prototype.parse = function (input) {
+        var string = input
+            .trim()
+            .replace(this._group, '')
+            .replace(this._decimal, '.')
+            .replace(this._numeral, this._index);
+        return string ? +string : Number.NaN;
+    };
+    return NumberParser;
+}());
+export var parseNumber = function (number, locale) {
+    var parsed = new NumberParser(locale).parse("".concat(number).replace(/\s/g, ''));
+    return Number.isNaN(parsed) ? null : parsed;
 };

package/es/tsconfig.esm.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../src/formatAccountNumber.ts","../src/formatCurrency.ts","../src/formatDate.ts","../src/formatDistance.ts","../src/formatFodselsnummer.ts","../src/formatNumber.ts","../src/formatPercentage.ts","../src/index.ts","../src/types.ts","../src/internal/parseNumber.ts","../src/internal/unicode.ts"],"version":"5.6.3"}

package/es/types.js

@@ -0,0 +1 @@
+export {};

package/lib/formatCurrency.js

@@ -16,16 +16,18 @@ 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({ prefix: "kr".concat(unicode_1.NON_BREAKING_SPACE), postfix: ',–' }, opts), prefix = _a.prefix, postfix = _a.postfix;
-    var parsed = (0, parseNumber_1.parseNumber)(amount);
+    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/
     if (typeof parsed === 'number' && parsed % 1 !== 0) {
         var decimalPostfix = ![',–', ',-'].includes(postfix) ? postfix : '';
         return "".concat(prefix).concat((0, formatNumber_1.formatNumber)(amount, {
             decimals: 2,
+            locale: locale,
         })).concat(decimalPostfix);
     }
-    return "".concat(prefix).concat((0, formatNumber_1.formatNumber)(amount)).concat(postfix);
+    return "".concat(prefix).concat((0, formatNumber_1.formatNumber)(amount, { locale: locale })).concat(postfix);
 };
 exports.formatCurrency = formatCurrency;

package/lib/formatDate.js

@@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatDate = void 0;
 var ensureTwoDigits = function (d) { return "00".concat(d).slice(-2); };
 var formatDate = function (timestamp) {
-    if (!(Number.isInteger(timestamp) || timestamp instanceof Date)) {
-        return null;
-    }
     var date = timestamp instanceof Date ? timestamp : new Date(timestamp);
     var dd = ensureTwoDigits(date.getDate());
     var mm = ensureTwoDigits(date.getMonth() + 1);

package/lib/formatDistance.js

@@ -6,10 +6,9 @@ var parseNumber_1 = require("./internal/parseNumber");
 var unicode_1 = require("./internal/unicode");
 var formatDistance = function (distance, opts) {
     if (opts === void 0) { opts = { unit: 'km' }; }
-    var toFormat = (0, parseNumber_1.parseNumber)(distance);
-    if (toFormat !== 0 && !toFormat) {
-        return '';
-    }
-    return "".concat((0, formatNumber_1.formatNumber)(toFormat)).concat(unicode_1.NON_BREAKING_SPACE).concat(opts.unit);
+    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);
 };
 exports.formatDistance = formatDistance;

package/lib/formatNumber.js

@@ -1,27 +1,16 @@
 "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.formatNumber = void 0;
-var underscore_string_1 = require("underscore.string");
-var unicode_1 = require("./internal/unicode");
 var parseNumber_1 = require("./internal/parseNumber");
 var formatNumber = function (number, opts) {
-    if (opts === void 0) { opts = {}; }
-    var _a = __assign({ decimals: 0, thousandSeparator: unicode_1.NON_BREAKING_SPACE, decimalMark: ',' }, opts), decimals = _a.decimals, thousandSeparator = _a.thousandSeparator, decimalMark = _a.decimalMark;
-    var toFormat = (0, parseNumber_1.parseNumber)(number);
+    var _a = opts.decimals, decimals = _a === void 0 ? 0 : _a, locale = opts.locale;
+    var toFormat = (0, parseNumber_1.parseNumber)(number, locale);
     if (typeof toFormat !== 'number') {
         return number;
     }
-    return "".concat((0, underscore_string_1.numberFormat)(toFormat, decimals, decimalMark, thousandSeparator));
+    return new Intl.NumberFormat(locale === 'en' ? 'en' : 'nb', {
+        maximumFractionDigits: decimals,
+        minimumFractionDigits: decimals,
+    }).format(toFormat);
 };
 exports.formatNumber = formatNumber;

package/lib/internal/parseNumber.js

@@ -1,14 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseNumber = void 0;
-var parseNumber = function (number) {
-    if (!number || typeof number === 'number') {
-        return number;
+// https://observablehq.com/@mbostock/localized-number-parsing
+var NumberParser = /** @class */ (function () {
+    function NumberParser(locale) {
+        var _a, _b;
+        var parts = new Intl.NumberFormat(locale).formatToParts(12345.6);
+        var 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)); };
     }
-    var parsed = parseFloat(number.replace(/[^\d,.-]/g, '').replace(/,/g, '.'));
-    if (Number.isNaN(parsed)) {
-        return null;
-    }
-    return parsed;
+    NumberParser.prototype.parse = function (input) {
+        var string = input
+            .trim()
+            .replace(this._group, '')
+            .replace(this._decimal, '.')
+            .replace(this._numeral, this._index);
+        return string ? +string : Number.NaN;
+    };
+    return NumberParser;
+}());
+var parseNumber = function (number, locale) {
+    var parsed = new NumberParser(locale).parse("".concat(number).replace(/\s/g, ''));
+    return Number.isNaN(parsed) ? null : parsed;
 };
 exports.parseNumber = parseNumber;

package/lib/tsconfig.cjs.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../src/formatAccountNumber.ts","../src/formatCurrency.ts","../src/formatDate.ts","../src/formatDistance.ts","../src/formatFodselsnummer.ts","../src/formatNumber.ts","../src/formatPercentage.ts","../src/index.ts","../src/types.ts","../src/internal/parseNumber.ts","../src/internal/unicode.ts"],"version":"5.6.3"}

package/lib/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sb1/ffe-formatters",
-    "version": "4.2.8",
+    "version": "5.0.0",
     "description": "JavaScript general use string formatters",
     "keywords": [
         "ffe"
@@ -27,10 +27,6 @@
         "test": "jest",
         "test:watch": "jest --watch"
     },
-    "dependencies": {
-        "@types/underscore.string": "^0.0.41",
-        "underscore.string": "^3.3.4"
-    },
     "devDependencies": {
         "@sb1/ffe-buildtool": "^0.9.0",
         "eslint": "^8.57.0"
@@ -38,5 +34,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "0d513edf288646f9be670fd3c642961d01823899"
+    "gitHead": "d753b8a8ecbc46fdfd2bb8a3c916819a186414ce"
 }

package/types/formatCurrency.d.ts

@@ -1,6 +1,8 @@
+import { Locale } from './types';
 interface Opts {
     prefix?: string;
     postfix?: string;
+    locale: Locale;
 }
-export declare const formatCurrency: (amount: number | string, opts?: Opts) => string;
+export declare const formatCurrency: (amount: number | string, opts: Opts) => string;
 export {};

package/types/formatDate.d.ts

@@ -1 +1 @@
-export declare const formatDate: (timestamp: Date | number) => string | null;
+export declare const formatDate: (timestamp: Date | number) => string;

package/types/formatNumber.d.ts

@@ -1 +1,5 @@
-export declare const formatNumber: (number: number | string | null | undefined, opts?: {}) => string | number | null | undefined;
+import { Locale } from './types';
+export declare const formatNumber: (number: number | string | null | undefined, opts: {
+    locale: Locale;
+    decimals?: number;
+}) => string | number | null | undefined;

package/types/internal/parseNumber.d.ts

@@ -1 +1,2 @@
-export declare const parseNumber: (number: number | string | null | undefined) => string | number | null | undefined;
+import { Locale } from '../types';
+export declare const parseNumber: (number: number | string | null | undefined, locale: Locale) => number | null;

package/types/tsconfig.types.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../src/formatAccountNumber.ts","../src/formatCurrency.ts","../src/formatDate.ts","../src/formatDistance.ts","../src/formatFodselsnummer.ts","../src/formatNumber.ts","../src/formatPercentage.ts","../src/index.ts","../src/types.ts","../src/internal/parseNumber.ts","../src/internal/unicode.ts"],"version":"5.6.3"}

package/types/types.d.ts

@@ -0,0 +1 @@
+export type Locale = 'nb' | 'nn' | 'en';