@formatjs/ecma402-abstract 2.3.0 → 2.3.2

package/lib/NumberFormat/format_to_parts.js

@@ -1,5 +1,4 @@
 import Decimal from 'decimal.js';
-import { TEN } from '../constants';
 import { S_UNICODE_REGEX } from '../regex.generated';
 import { digitMapping } from './digit-mapping.generated';
 import { GetUnsignedRoundingMode } from './GetUnsignedRoundingMode';
@@ -12,6 +11,7 @@ var CARET_S_UNICODE_REGEX = new RegExp("^".concat(S_UNICODE_REGEX.source));
 var S_DOLLAR_UNICODE_REGEX = new RegExp("".concat(S_UNICODE_REGEX.source, "$"));
 var CLDR_NUMBER_PATTERN = /[#0](?:[\.,][#0]+)*/g;
 export default function formatToParts(numberResult, data, pl, options) {
+    var _a;
     var sign = numberResult.sign, exponent = numberResult.exponent, magnitude = numberResult.magnitude;
     var notation = options.notation, style = options.style, numberingSystem = options.numberingSystem;
     var defaultNumberingSystem = data.numbers.nu[0];
@@ -120,7 +120,7 @@ export default function formatToParts(numberResult, data, pl, options) {
                 // We only need to handle scientific and engineering notation here.
                 numberParts.push.apply(numberParts, partitionNumberIntoParts(symbols, numberResult, notation, exponent, numberingSystem, 
                 // If compact number pattern exists, do not insert group separators.
-                !compactNumberPattern && Boolean(options.useGrouping), decimalNumberPattern, style, options.roundingIncrement, GetUnsignedRoundingMode(options.roundingMode, sign === -1)));
+                !compactNumberPattern && ((_a = options.useGrouping) !== null && _a !== void 0 ? _a : true), decimalNumberPattern, style, options.roundingIncrement, GetUnsignedRoundingMode(options.roundingMode, sign === -1)));
                 break;
             }
             case '-':
@@ -163,7 +163,9 @@ export default function formatToParts(numberResult, data, pl, options) {
                 var unitName = void 0;
                 var currencyNameData = data.currencies[options.currency];
                 if (currencyNameData) {
-                    unitName = selectPlural(pl, numberResult.roundedNumber.times(TEN.pow(exponent)).toNumber(), currencyNameData.displayName);
+                    unitName = selectPlural(pl, numberResult.roundedNumber
+                        .times(Decimal.pow(10, exponent))
+                        .toNumber(), currencyNameData.displayName);
                 }
                 else {
                     // Fallback for unknown currency
@@ -172,8 +174,8 @@ export default function formatToParts(numberResult, data, pl, options) {
                 // Do {0} and {1} substitution
                 var unitPatternParts = unitPattern.split(/(\{[01]\})/g);
                 var result = [];
-                for (var _a = 0, unitPatternParts_1 = unitPatternParts; _a < unitPatternParts_1.length; _a++) {
-                    var part = unitPatternParts_1[_a];
+                for (var _b = 0, unitPatternParts_1 = unitPatternParts; _b < unitPatternParts_1.length; _b++) {
+                    var part = unitPatternParts_1[_b];
                     switch (part) {
                         case '{0}':
                             result.push.apply(result, numberParts);
@@ -200,15 +202,19 @@ export default function formatToParts(numberResult, data, pl, options) {
             var unitPattern = void 0;
             if (unitData) {
                 // Simple unit pattern
-                unitPattern = selectPlural(pl, numberResult.roundedNumber.times(TEN.pow(exponent)).toNumber(), data.units.simple[unit][unitDisplay]);
+                unitPattern = selectPlural(pl, numberResult.roundedNumber
+                    .times(Decimal.pow(10, exponent))
+                    .toNumber(), data.units.simple[unit][unitDisplay]);
             }
             else {
                 // See: http://unicode.org/reports/tr35/tr35-general.html#perUnitPatterns
                 // If cannot find unit in the simple pattern, it must be "per" compound pattern.
                 // Implementation note: we are not following TR-35 here because we need to format to parts!
-                var _b = unit.split('-per-'), numeratorUnit = _b[0], denominatorUnit = _b[1];
+                var _c = unit.split('-per-'), numeratorUnit = _c[0], denominatorUnit = _c[1];
                 unitData = data.units.simple[numeratorUnit];
-                var numeratorUnitPattern = selectPlural(pl, numberResult.roundedNumber.times(TEN.pow(exponent)).toNumber(), data.units.simple[numeratorUnit][unitDisplay]);
+                var numeratorUnitPattern = selectPlural(pl, numberResult.roundedNumber
+                    .times(Decimal.pow(10, exponent))
+                    .toNumber(), data.units.simple[numeratorUnit][unitDisplay]);
                 var perUnitPattern = data.units.simple[denominatorUnit].perUnit[unitDisplay];
                 if (perUnitPattern) {
                     // perUnitPattern exists, combine it with numeratorUnitPattern
@@ -226,8 +232,8 @@ export default function formatToParts(numberResult, data, pl, options) {
             }
             var result = [];
             // We need spacing around "{0}" because they are not treated as "unit" parts, but "literal".
-            for (var _c = 0, _d = unitPattern.split(/(\s*\{0\}\s*)/); _c < _d.length; _c++) {
-                var part = _d[_c];
+            for (var _d = 0, _e = unitPattern.split(/(\s*\{0\}\s*)/); _d < _e.length; _d++) {
+                var part = _e[_d];
                 var interpolateMatch = /^(\s*)\{0\}(\s*)$/.exec(part);
                 if (interpolateMatch) {
                     // Space before "{0}"
@@ -294,8 +300,17 @@ decimalNumberPattern, style, roundingIncrement, unsignedRoundingMode) {
     // unless the rounded number is greater than 10000:
     //   NumberFormat('de', {notation: 'compact', compactDisplay: 'short'}).format(1234) //=> "1234"
     //   NumberFormat('de').format(1234) //=> "1.234"
-    if (useGrouping &&
-        (notation !== 'compact' || x.greaterThanOrEqualTo(10000))) {
+    var shouldUseGrouping = false;
+    if (useGrouping === 'always') {
+        shouldUseGrouping = true;
+    }
+    else if (useGrouping === 'min2') {
+        shouldUseGrouping = x.greaterThanOrEqualTo(10000);
+    }
+    else if (useGrouping === 'auto' || useGrouping) {
+        shouldUseGrouping = notation !== 'compact' || x.greaterThanOrEqualTo(10000);
+    }
+    if (shouldUseGrouping) {
         // 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

package/lib/ToIntlMathematicalValue.d.ts

@@ -0,0 +1,2 @@
+import Decimal from 'decimal.js';
+export declare function ToIntlMathematicalValue(input: unknown): Decimal;

package/lib/ToIntlMathematicalValue.js

@@ -0,0 +1,27 @@
+import Decimal from 'decimal.js';
+import { ToPrimitive } from './262';
+export function ToIntlMathematicalValue(input) {
+    var primValue = ToPrimitive(input, 'number');
+    if (typeof primValue === 'bigint') {
+        return new Decimal(primValue);
+    }
+    // IMPL
+    if (primValue === undefined) {
+        return new Decimal(NaN);
+    }
+    if (primValue === true) {
+        return new Decimal(1);
+    }
+    if (primValue === false) {
+        return new Decimal(0);
+    }
+    if (primValue === null) {
+        return new Decimal(0);
+    }
+    try {
+        return new Decimal(primValue);
+    }
+    catch (e) {
+        return new Decimal(NaN);
+    }
+}

package/lib/index.d.ts

@@ -16,6 +16,7 @@ export * from './NumberFormat/ComputeExponentForMagnitude';
 export * from './NumberFormat/CurrencyDigits';
 export { default as _formatToParts } from './NumberFormat/format_to_parts';
 export * from './NumberFormat/FormatApproximately';
+export * from './NumberFormat/FormatNumeric';
 export * from './NumberFormat/FormatNumericRange';
 export * from './NumberFormat/FormatNumericRangeToParts';
 export * from './NumberFormat/FormatNumericToParts';
@@ -43,3 +44,4 @@ export * from './types/plural-rules';
 export * from './types/relative-time';
 export { createMemoizedDateTimeFormat, createMemoizedListFormat, createMemoizedLocale, createMemoizedNumberFormat, createMemoizedPluralRules, invariant, } from './utils';
 export { ZERO } from './constants';
+export { ToIntlMathematicalValue } from './ToIntlMathematicalValue';

package/lib/index.js

@@ -16,6 +16,7 @@ export * from './NumberFormat/ComputeExponentForMagnitude';
 export * from './NumberFormat/CurrencyDigits';
 export { default as _formatToParts } from './NumberFormat/format_to_parts';
 export * from './NumberFormat/FormatApproximately';
+export * from './NumberFormat/FormatNumeric';
 export * from './NumberFormat/FormatNumericRange';
 export * from './NumberFormat/FormatNumericRangeToParts';
 export * from './NumberFormat/FormatNumericToParts';
@@ -41,3 +42,4 @@ export * from './types/plural-rules';
 export * from './types/relative-time';
 export { createMemoizedDateTimeFormat, createMemoizedListFormat, createMemoizedLocale, createMemoizedNumberFormat, createMemoizedPluralRules, invariant, } from './utils';
 export { ZERO } from './constants';
+export { ToIntlMathematicalValue } from './ToIntlMathematicalValue';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/ecma402-abstract",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "A collection of implementation for ECMAScript abstract operations",
   "keywords": [
     "intl",
@@ -16,8 +16,8 @@
   "dependencies": {
     "decimal.js": "10",
     "tslib": "2",
-    "@formatjs/fast-memoize": "2.2.5",
-    "@formatjs/intl-localematcher": "0.5.9"
+    "@formatjs/intl-localematcher": "0.5.10",
+    "@formatjs/fast-memoize": "2.2.6"
   },
   "author": "Long Ho <holevietlong@gmail.com",
   "bugs": {