@uxf/localize 11.11.3 → 11.13.0

package/README.md

@@ -54,8 +54,12 @@ const en: LocalizeConfig<DateTimes> = {
     currency: {
         thousandsSeparator: ",",
         decimalSeparator: ".",
-        pattern: "!#",
-        negativePattern: "-!#",
+        specialCases: {
+            USD: {
+                pattern: "#\xa0$",
+                negativePattern: "-$\xa0$",
+            },
+        },
     },
     dateTime: {
         timeShort: "H:mm A",
@@ -79,8 +83,12 @@ const cs: LocalizeConfig<DateTimes> = {
     currency: {
         thousandsSeparator: "\xa0",
         decimalSeparator: ",",
-        pattern: "#\xa0!",
-        negativePattern: "-#\xa0!",
+        specialCases: {
+            CZK: {
+                pattern: "#\xa0Kč",
+                negativePattern: "-#\xa0Kč",
+            },
+        },
     },
     dateTime: {
         timeShort: "H:mm",

package/locale/cs.js

@@ -8,8 +8,16 @@ const locale = {
     currency: {
         thousandsSeparator: "\xa0",
         decimalSeparator: ",",
-        pattern: "#\xa0!",
-        negativePattern: "-#\xa0!",
+        specialCases: {
+            CZK: {
+                pattern: "#\xa0Kč",
+                negativePattern: "-#\xa0Kč",
+            },
+            USD: {
+                pattern: "#\xa0$",
+                negativePattern: "-$\xa0$",
+            },
+        },
     },
     dateTime: {
         timeShort: "H:mm",

package/locale/de.js

@@ -8,8 +8,6 @@ const locale = {
     currency: {
         thousandsSeparator: ".",
         decimalSeparator: ",",
-        pattern: "! #",
-        negativePattern: "-! #",
     },
     dateTime: {
         timeShort: "H:mm",

package/locale/en.js

@@ -8,8 +8,6 @@ const locale = {
     currency: {
         thousandsSeparator: ",",
         decimalSeparator: ".",
-        pattern: "!#",
-        negativePattern: "-!#",
     },
     dateTime: {
         timeShort: "H:mm A",

package/locale/es.js

@@ -8,8 +8,6 @@ const locale = {
     currency: {
         thousandsSeparator: ".",
         decimalSeparator: ",",
-        pattern: "! #",
-        negativePattern: "-! #",
     },
     dateTime: {
         timeShort: "H:mm",

package/locale/fr.js

@@ -8,8 +8,12 @@ const locale = {
     currency: {
         thousandsSeparator: " ",
         decimalSeparator: ",",
-        pattern: "! #",
-        negativePattern: "-! #",
+        specialCases: {
+            EUR: {
+                pattern: "€#",
+                negativePattern: "-€#",
+            },
+        },
     },
     dateTime: {
         timeShort: "HH:mm",

package/locale/pl.js

@@ -8,8 +8,6 @@ const locale = {
     currency: {
         thousandsSeparator: " ",
         decimalSeparator: ",",
-        pattern: "# !",
-        negativePattern: "-# !",
     },
     dateTime: {
         timeShort: "HH:mm",

package/locale/sk.js

@@ -8,8 +8,12 @@ const locale = {
     currency: {
         thousandsSeparator: "\xa0",
         decimalSeparator: ",",
-        pattern: "#\xa0!",
-        negativePattern: "-#\xa0!",
+        specialCases: {
+            CZK: {
+                pattern: "#\xa0Kč",
+                negativePattern: "-#\xa0Kč",
+            },
+        },
     },
     dateTime: {
         timeShort: "H:mm",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/localize",
-  "version": "11.11.3",
+  "version": "11.13.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/format-money/format-money.js

@@ -8,18 +8,35 @@ const currency_js_1 = __importDefault(require("currency.js"));
 const react_1 = require("react");
 const context_1 = require("../context/context");
 const curry_1 = require("../utils/curry");
-const data_1 = require("../utils/data");
-const map_options_1 = require("../utils/map-options");
+const money_defaults_1 = require("../utils/money-defaults");
+const defaultPatterns = {
+    pattern: "#\xa0!",
+    negativePattern: "-#\xa0!",
+};
+const noSymbolPatterns = {
+    pattern: "#",
+    negativePattern: "-#",
+};
 function createFormatMoney(localizeConfigs) {
     return (locale, money, options) => {
         var _a, _b, _c;
         const precision = (_a = options === null || options === void 0 ? void 0 : options.precision) !== null && _a !== void 0 ? _a : 0;
-        const symbol = (options === null || options === void 0 ? void 0 : options.preferIsoCode) ? money.currency : data_1.CURRENCIES[money.currency].symbol;
-        const formatOptions = { ...(0, map_options_1._mapOptions)(localizeConfigs[locale].currency), precision, symbol };
-        if (options === null || options === void 0 ? void 0 : options.hideSymbol) {
-            formatOptions.pattern = (_b = formatOptions.pattern) === null || _b === void 0 ? void 0 : _b.replace("!", "").trim();
-            formatOptions.negativePattern = (_c = formatOptions.negativePattern) === null || _c === void 0 ? void 0 : _c.replace("!", "").trim();
-        }
+        const symbol = money.currency;
+        const config = localizeConfigs[locale].currency;
+        const specialCasesConfig = config.specialCases;
+        const currentPatterns = (_c = (_b = (specialCasesConfig !== null && specialCasesConfig !== void 0 ? specialCasesConfig : {})[money.currency]) !== null && _b !== void 0 ? _b : money_defaults_1.MoneyDefaults[money.currency]) !== null && _c !== void 0 ? _c : defaultPatterns;
+        const patterns = (options === null || options === void 0 ? void 0 : options.hideSymbol)
+            ? noSymbolPatterns
+            : !(options === null || options === void 0 ? void 0 : options.preferIsoCode)
+                ? currentPatterns
+                : defaultPatterns;
+        const formatOptions = {
+            ...patterns,
+            decimal: config.decimalSeparator,
+            separator: config.thousandsSeparator,
+            precision,
+            symbol,
+        };
         return (0, currency_js_1.default)(money.amount, { precision }).format(formatOptions);
     };
 }

package/src/format-money/format-money.test.js

@@ -19,13 +19,13 @@ describe("money formatter", function () {
         expect(formatMoneyWithLocales("cs", { amount: "2000.78", currency: "USD" }, { precision: 1, hideSymbol: true })).toBe("2\xa0000,8");
     });
     it("format money with 'en' locale", function () {
-        expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "CZK" })).toBe("Kč2,001");
-        expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "CZK" }, { precision: 1 })).toBe("Kč2,000.8");
-        expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "CZK" }, { precision: 1, preferIsoCode: true })).toBe("CZK2,000.8");
+        expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "CZK" })).toBe("2,001\xa0CZK");
+        expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "CZK" }, { precision: 1 })).toBe("2,000.8\xa0CZK");
+        expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "CZK" }, { precision: 1, preferIsoCode: true })).toBe("2,000.8\xa0CZK");
         expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "CZK" }, { precision: 1, hideSymbol: true })).toBe("2,000.8");
         expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "USD" })).toBe("$2,001");
         expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "USD" }, { precision: 1 })).toBe("$2,000.8");
-        expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "USD" }, { precision: 1, preferIsoCode: true })).toBe("USD2,000.8");
+        expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "USD" }, { precision: 1, preferIsoCode: true })).toBe("2,000.8\xa0USD");
         expect(formatMoneyWithLocales("en", { amount: "2000.78", currency: "USD" }, { precision: 1, hideSymbol: true })).toBe("2,000.8");
     });
 });

package/src/types.d.ts

@@ -7,10 +7,9 @@ export type LocalizeConfig<DT extends string> = {
         decimalSeparator: string;
     };
     currency: {
+        specialCases?: Partial<Record<Currency, FormatMoneyPattern>>;
         thousandsSeparator: string;
         decimalSeparator: string;
-        pattern: string;
-        negativePattern: string;
     };
     dateTime: Record<DT, string>;
 };
@@ -71,6 +70,10 @@ export type FormatMoneyOptions = {
     precision?: number;
     preferIsoCode?: boolean;
 };
+export type FormatMoneyPattern = {
+    pattern: string;
+    negativePattern: string;
+};
 export type FormatNumberOptions = {
     precision?: number;
 };

package/src/utils/map-options.d.ts

@@ -1,3 +1,3 @@
 import currencyjs from "currency.js";
 import { DateTimes, LocalizeConfig } from "../types";
-export declare const _mapOptions: (options: LocalizeConfig<DateTimes>["number"] | LocalizeConfig<DateTimes>["currency"]) => currencyjs.Options;
+export declare const _mapOptions: (options: LocalizeConfig<DateTimes>["number"]) => currencyjs.Options;

package/src/utils/map-options.js

@@ -5,8 +5,8 @@ const _mapOptions = (options) => {
     return {
         separator: options.thousandsSeparator,
         decimal: options.decimalSeparator,
-        pattern: "pattern" in options ? options.pattern : "#",
-        negativePattern: "negativePattern" in options ? options.negativePattern : "-#",
+        pattern: "#",
+        negativePattern: "-#",
     };
 };
 exports._mapOptions = _mapOptions;

package/src/utils/money-defaults.d.ts

@@ -0,0 +1,2 @@
+import { Currency, FormatMoneyPattern } from "../types";
+export declare const MoneyDefaults: Partial<Record<Currency, FormatMoneyPattern>>;

package/src/utils/money-defaults.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MoneyDefaults = void 0;
+exports.MoneyDefaults = {
+    EUR: {
+        pattern: "#\xa0€",
+        negativePattern: "-#\xa0€",
+    },
+    USD: {
+        pattern: "$#",
+        negativePattern: "-$#",
+    },
+};