@formatjs/ecma402-abstract 1.18.1 → 1.18.3

package/NumberFormat/format_to_parts.d.ts

@@ -1,4 +1,4 @@
-import { NumberFormatOptionsStyle, NumberFormatOptionsNotation, NumberFormatOptionsCompactDisplay, NumberFormatOptionsCurrencyDisplay, NumberFormatOptionsCurrencySign, NumberFormatOptionsUnitDisplay, NumberFormatLocaleInternalData, NumberFormatPart, UseGroupingType } from '../types/number';
+import { NumberFormatLocaleInternalData, NumberFormatOptionsCompactDisplay, NumberFormatOptionsCurrencyDisplay, NumberFormatOptionsCurrencySign, NumberFormatOptionsNotation, NumberFormatOptionsStyle, NumberFormatOptionsUnitDisplay, NumberFormatPart, UseGroupingType } from '../types/number';
 interface NumberResult {
     formattedString: string;
     roundedNumber: number;

package/NumberFormat/format_to_parts.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var regex_generated_1 = require("../regex.generated");
 var ToRawFixed_1 = require("./ToRawFixed");
 var digit_mapping_generated_1 = require("./digit-mapping.generated");
-var regex_generated_1 = require("../regex.generated");
 // This is from: unicode-12.1.0/General_Category/Symbol/regex.js
 // IE11 does not support unicode flag, otherwise this is just /\p{S}/u.
 // /^\p{S}/u
@@ -119,7 +119,7 @@ function formatToParts(numberResult, data, pl, options) {
                 // We only need to handle scientific and engineering notation here.
                 numberParts.push.apply(numberParts, paritionNumberIntoParts(symbols, numberResult, notation, exponent, numberingSystem, 
                 // If compact number pattern exists, do not insert group separators.
-                !compactNumberPattern && Boolean(options.useGrouping), decimalNumberPattern));
+                !compactNumberPattern && Boolean(options.useGrouping), decimalNumberPattern, style));
                 break;
             }
             case '-':
@@ -262,7 +262,7 @@ function paritionNumberIntoParts(symbols, numberResult, notation, exponent, numb
  * A typical value looks like "#,##0.00" (primary group size is 3).
  * Some locales like Hindi has secondary group size of 2 (e.g. "#,##,##0.00").
  */
-decimalNumberPattern) {
+decimalNumberPattern, style) {
     var result = [];
     // eslint-disable-next-line prefer-const
     var n = numberResult.formattedString, x = numberResult.roundedNumber;
@@ -295,7 +295,11 @@ decimalNumberPattern) {
     //   NumberFormat('de', {notation: 'compact', compactDisplay: 'short'}).format(1234) //=> "1234"
     //   NumberFormat('de').format(1234) //=> "1.234"
     if (useGrouping && (notation !== 'compact' || x >= 10000)) {
-        var groupSepSymbol = symbols.group;
+        // a. Let groupSepSymbol be the implementation-, locale-, and numbering system-dependent (ILND) String representing the grouping separator.
+        // For currency we should use `currencyGroup` instead of generic `group`
+        var groupSepSymbol = style === 'currency' && symbols.currencyGroup != null
+            ? symbols.currencyGroup
+            : symbols.group;
         var groups = [];
         // > There may be two different grouping sizes: The primary grouping size used for the least
         // > significant integer group, and the secondary grouping size used for more significant groups.

package/lib/NumberFormat/format_to_parts.d.ts

@@ -1,4 +1,4 @@
-import { NumberFormatOptionsStyle, NumberFormatOptionsNotation, NumberFormatOptionsCompactDisplay, NumberFormatOptionsCurrencyDisplay, NumberFormatOptionsCurrencySign, NumberFormatOptionsUnitDisplay, NumberFormatLocaleInternalData, NumberFormatPart, UseGroupingType } from '../types/number';
+import { NumberFormatLocaleInternalData, NumberFormatOptionsCompactDisplay, NumberFormatOptionsCurrencyDisplay, NumberFormatOptionsCurrencySign, NumberFormatOptionsNotation, NumberFormatOptionsStyle, NumberFormatOptionsUnitDisplay, NumberFormatPart, UseGroupingType } from '../types/number';
 interface NumberResult {
     formattedString: string;
     roundedNumber: number;

package/lib/NumberFormat/format_to_parts.js

@@ -1,6 +1,6 @@
+import { S_UNICODE_REGEX } from '../regex.generated';
 import { ToRawFixed } from './ToRawFixed';
 import { digitMapping } from './digit-mapping.generated';
-import { S_UNICODE_REGEX } from '../regex.generated';
 // This is from: unicode-12.1.0/General_Category/Symbol/regex.js
 // IE11 does not support unicode flag, otherwise this is just /\p{S}/u.
 // /^\p{S}/u
@@ -117,7 +117,7 @@ export default function formatToParts(numberResult, data, pl, options) {
                 // We only need to handle scientific and engineering notation here.
                 numberParts.push.apply(numberParts, paritionNumberIntoParts(symbols, numberResult, notation, exponent, numberingSystem, 
                 // If compact number pattern exists, do not insert group separators.
-                !compactNumberPattern && Boolean(options.useGrouping), decimalNumberPattern));
+                !compactNumberPattern && Boolean(options.useGrouping), decimalNumberPattern, style));
                 break;
             }
             case '-':
@@ -259,7 +259,7 @@ function paritionNumberIntoParts(symbols, numberResult, notation, exponent, numb
  * A typical value looks like "#,##0.00" (primary group size is 3).
  * Some locales like Hindi has secondary group size of 2 (e.g. "#,##,##0.00").
  */
-decimalNumberPattern) {
+decimalNumberPattern, style) {
     var result = [];
     // eslint-disable-next-line prefer-const
     var n = numberResult.formattedString, x = numberResult.roundedNumber;
@@ -292,7 +292,11 @@ decimalNumberPattern) {
     //   NumberFormat('de', {notation: 'compact', compactDisplay: 'short'}).format(1234) //=> "1234"
     //   NumberFormat('de').format(1234) //=> "1.234"
     if (useGrouping && (notation !== 'compact' || x >= 10000)) {
-        var groupSepSymbol = symbols.group;
+        // a. Let groupSepSymbol be the implementation-, locale-, and numbering system-dependent (ILND) String representing the grouping separator.
+        // For currency we should use `currencyGroup` instead of generic `group`
+        var groupSepSymbol = style === 'currency' && symbols.currencyGroup != null
+            ? symbols.currencyGroup
+            : symbols.group;
         var groups = [];
         // > There may be two different grouping sizes: The primary grouping size used for the least
         // > significant integer group, and the secondary grouping size used for more significant groups.

package/lib/types/number.d.ts

@@ -1,5 +1,5 @@
-import { LDMLPluralRule } from './plural-rules';
 import { LocaleData } from './core';
+import { LDMLPluralRule } from './plural-rules';
 export type NumberFormatNotation = 'standard' | 'scientific' | 'engineering' | 'compact';
 export type RoundingPriorityType = 'auto' | 'morePrecision' | 'lessPrecision';
 export type NumberFormatRoundingType = 'morePrecision' | 'lessPrecision' | 'significantDigits' | 'fractionDigits';
@@ -87,6 +87,7 @@ export interface SymbolsData {
     timeSeparator: string;
     approximatelySign: string;
     rangeSign: string;
+    currencyGroup?: string;
 }
 export interface RawNumberData {
     nu: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/ecma402-abstract",
-  "version": "1.18.1",
+  "version": "1.18.3",
   "description": "A collection of implementation for ECMAScript abstract operations",
   "keywords": [
     "intl",
@@ -15,7 +15,7 @@
   ],
   "dependencies": {
     "tslib": "^2.4.0",
-    "@formatjs/intl-localematcher": "0.5.3"
+    "@formatjs/intl-localematcher": "0.5.4"
   },
   "author": "Long Ho <holevietlong@gmail.com",
   "bugs": {

package/types/number.d.ts

@@ -1,5 +1,5 @@
-import { LDMLPluralRule } from './plural-rules';
 import { LocaleData } from './core';
+import { LDMLPluralRule } from './plural-rules';
 export type NumberFormatNotation = 'standard' | 'scientific' | 'engineering' | 'compact';
 export type RoundingPriorityType = 'auto' | 'morePrecision' | 'lessPrecision';
 export type NumberFormatRoundingType = 'morePrecision' | 'lessPrecision' | 'significantDigits' | 'fractionDigits';
@@ -87,6 +87,7 @@ export interface SymbolsData {
     timeSeparator: string;
     approximatelySign: string;
     rangeSign: string;
+    currencyGroup?: string;
 }
 export interface RawNumberData {
     nu: string[];