@formatjs/ecma402-abstract 1.18.2 → 2.0.0

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.
@@ -339,7 +343,10 @@ decimalNumberPattern) {
     }
     // #endregion
     if (fraction !== undefined) {
-        result.push({ type: 'decimal', value: symbols.decimal }, { type: 'fraction', value: fraction });
+        var decimalSepSymbol = style === 'currency' && symbols.currencyDecimal != null
+            ? symbols.currencyDecimal
+            : symbols.decimal;
+        result.push({ type: 'decimal', value: decimalSepSymbol }, { type: 'fraction', value: fraction });
     }
     if ((notation === 'scientific' || notation === 'engineering') &&
         isFinite(x)) {

package/index.d.ts

@@ -30,15 +30,15 @@ export * from './NumberFormat/ToRawPrecision';
 export { default as _formatToParts } from './NumberFormat/format_to_parts';
 export * from './PartitionPattern';
 export * from './SupportedLocales';
-export { getInternalSlot, getMultiInternalSlots, isLiteralPart, setInternalSlot, setMultiInternalSlots, getMagnitude, defineProperty, } from './utils';
+export { createDataProperty, defineProperty, getInternalSlot, getMagnitude, getMultiInternalSlots, isLiteralPart, setInternalSlot, setMultiInternalSlots, } from './utils';
 export type { LiteralPart } from './utils';
+export * from './262';
 export { isMissingLocaleDataError } from './data';
-export * from './types/relative-time';
+export type { LocaleData } from './types/core';
 export * from './types/date-time';
+export * from './types/displaynames';
 export * from './types/list';
-export * from './types/plural-rules';
 export * from './types/number';
-export * from './types/displaynames';
+export * from './types/plural-rules';
+export * from './types/relative-time';
 export { invariant } from './utils';
-export type { LocaleData } from './types/core';
-export * from './262';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.invariant = exports.isMissingLocaleDataError = exports.defineProperty = exports.getMagnitude = exports.setMultiInternalSlots = exports.setInternalSlot = exports.isLiteralPart = exports.getMultiInternalSlots = exports.getInternalSlot = exports._formatToParts = void 0;
+exports.invariant = exports.isMissingLocaleDataError = exports.setMultiInternalSlots = exports.setInternalSlot = exports.isLiteralPart = exports.getMultiInternalSlots = exports.getMagnitude = exports.getInternalSlot = exports.defineProperty = exports.createDataProperty = exports._formatToParts = void 0;
 var tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./CanonicalizeLocaleList"), exports);
 tslib_1.__exportStar(require("./CanonicalizeTimeZoneName"), exports);
@@ -36,21 +36,22 @@ Object.defineProperty(exports, "_formatToParts", { enumerable: true, get: functi
 tslib_1.__exportStar(require("./PartitionPattern"), exports);
 tslib_1.__exportStar(require("./SupportedLocales"), exports);
 var utils_1 = require("./utils");
+Object.defineProperty(exports, "createDataProperty", { enumerable: true, get: function () { return utils_1.createDataProperty; } });
+Object.defineProperty(exports, "defineProperty", { enumerable: true, get: function () { return utils_1.defineProperty; } });
 Object.defineProperty(exports, "getInternalSlot", { enumerable: true, get: function () { return utils_1.getInternalSlot; } });
+Object.defineProperty(exports, "getMagnitude", { enumerable: true, get: function () { return utils_1.getMagnitude; } });
 Object.defineProperty(exports, "getMultiInternalSlots", { enumerable: true, get: function () { return utils_1.getMultiInternalSlots; } });
 Object.defineProperty(exports, "isLiteralPart", { enumerable: true, get: function () { return utils_1.isLiteralPart; } });
 Object.defineProperty(exports, "setInternalSlot", { enumerable: true, get: function () { return utils_1.setInternalSlot; } });
 Object.defineProperty(exports, "setMultiInternalSlots", { enumerable: true, get: function () { return utils_1.setMultiInternalSlots; } });
-Object.defineProperty(exports, "getMagnitude", { enumerable: true, get: function () { return utils_1.getMagnitude; } });
-Object.defineProperty(exports, "defineProperty", { enumerable: true, get: function () { return utils_1.defineProperty; } });
+tslib_1.__exportStar(require("./262"), exports);
 var data_1 = require("./data");
 Object.defineProperty(exports, "isMissingLocaleDataError", { enumerable: true, get: function () { return data_1.isMissingLocaleDataError; } });
-tslib_1.__exportStar(require("./types/relative-time"), exports);
 tslib_1.__exportStar(require("./types/date-time"), exports);
+tslib_1.__exportStar(require("./types/displaynames"), exports);
 tslib_1.__exportStar(require("./types/list"), exports);
-tslib_1.__exportStar(require("./types/plural-rules"), exports);
 tslib_1.__exportStar(require("./types/number"), exports);
-tslib_1.__exportStar(require("./types/displaynames"), exports);
+tslib_1.__exportStar(require("./types/plural-rules"), exports);
+tslib_1.__exportStar(require("./types/relative-time"), exports);
 var utils_2 = require("./utils");
 Object.defineProperty(exports, "invariant", { enumerable: true, get: function () { return utils_2.invariant; } });
-tslib_1.__exportStar(require("./262"), exports);

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.
@@ -336,7 +340,10 @@ decimalNumberPattern) {
     }
     // #endregion
     if (fraction !== undefined) {
-        result.push({ type: 'decimal', value: symbols.decimal }, { type: 'fraction', value: fraction });
+        var decimalSepSymbol = style === 'currency' && symbols.currencyDecimal != null
+            ? symbols.currencyDecimal
+            : symbols.decimal;
+        result.push({ type: 'decimal', value: decimalSepSymbol }, { type: 'fraction', value: fraction });
     }
     if ((notation === 'scientific' || notation === 'engineering') &&
         isFinite(x)) {

package/lib/index.d.ts

@@ -30,15 +30,15 @@ export * from './NumberFormat/ToRawPrecision';
 export { default as _formatToParts } from './NumberFormat/format_to_parts';
 export * from './PartitionPattern';
 export * from './SupportedLocales';
-export { getInternalSlot, getMultiInternalSlots, isLiteralPart, setInternalSlot, setMultiInternalSlots, getMagnitude, defineProperty, } from './utils';
+export { createDataProperty, defineProperty, getInternalSlot, getMagnitude, getMultiInternalSlots, isLiteralPart, setInternalSlot, setMultiInternalSlots, } from './utils';
 export type { LiteralPart } from './utils';
+export * from './262';
 export { isMissingLocaleDataError } from './data';
-export * from './types/relative-time';
+export type { LocaleData } from './types/core';
 export * from './types/date-time';
+export * from './types/displaynames';
 export * from './types/list';
-export * from './types/plural-rules';
 export * from './types/number';
-export * from './types/displaynames';
+export * from './types/plural-rules';
+export * from './types/relative-time';
 export { invariant } from './utils';
-export type { LocaleData } from './types/core';
-export * from './262';

package/lib/index.js

@@ -30,13 +30,13 @@ export * from './NumberFormat/ToRawPrecision';
 export { default as _formatToParts } from './NumberFormat/format_to_parts';
 export * from './PartitionPattern';
 export * from './SupportedLocales';
-export { getInternalSlot, getMultiInternalSlots, isLiteralPart, setInternalSlot, setMultiInternalSlots, getMagnitude, defineProperty, } from './utils';
+export { createDataProperty, defineProperty, getInternalSlot, getMagnitude, getMultiInternalSlots, isLiteralPart, setInternalSlot, setMultiInternalSlots, } from './utils';
+export * from './262';
 export { isMissingLocaleDataError } from './data';
-export * from './types/relative-time';
 export * from './types/date-time';
+export * from './types/displaynames';
 export * from './types/list';
-export * from './types/plural-rules';
 export * from './types/number';
-export * from './types/displaynames';
+export * from './types/plural-rules';
+export * from './types/relative-time';
 export { invariant } from './utils';
-export * from './262';

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,8 @@ export interface SymbolsData {
     timeSeparator: string;
     approximatelySign: string;
     rangeSign: string;
+    currencyGroup?: string;
+    currencyDecimal?: string;
 }
 export interface RawNumberData {
     nu: string[];

package/lib/utils.d.ts

@@ -19,5 +19,12 @@ export declare function isLiteralPart(patternPart: LiteralPart | {
 export declare function defineProperty<T extends object>(target: T, name: string | symbol, { value }: {
     value: any;
 } & ThisType<any>): void;
+/**
+ * 7.3.5 CreateDataProperty
+ * @param target
+ * @param name
+ * @param value
+ */
+export declare function createDataProperty<T extends object>(target: T, name: string | symbol, value: any): void;
 export declare const UNICODE_EXTENSION_SEQUENCE_REGEX: RegExp;
 export declare function invariant(condition: boolean, message: string, Err?: any): asserts condition;

package/lib/utils.js

@@ -69,6 +69,20 @@ export function defineProperty(target, name, _a) {
         value: value,
     });
 }
+/**
+ * 7.3.5 CreateDataProperty
+ * @param target
+ * @param name
+ * @param value
+ */
+export function createDataProperty(target, name, value) {
+    Object.defineProperty(target, name, {
+        configurable: true,
+        enumerable: true,
+        writable: true,
+        value: value,
+    });
+}
 export var UNICODE_EXTENSION_SEQUENCE_REGEX = /-u(?:-[0-9a-z]{2,8})+/gi;
 export function invariant(condition, message, Err) {
     if (Err === void 0) { Err = Error; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/ecma402-abstract",
-  "version": "1.18.2",
+  "version": "2.0.0",
   "description": "A collection of implementation for ECMAScript abstract operations",
   "keywords": [
     "intl",

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,8 @@ export interface SymbolsData {
     timeSeparator: string;
     approximatelySign: string;
     rangeSign: string;
+    currencyGroup?: string;
+    currencyDecimal?: string;
 }
 export interface RawNumberData {
     nu: string[];

package/utils.d.ts

@@ -19,5 +19,12 @@ export declare function isLiteralPart(patternPart: LiteralPart | {
 export declare function defineProperty<T extends object>(target: T, name: string | symbol, { value }: {
     value: any;
 } & ThisType<any>): void;
+/**
+ * 7.3.5 CreateDataProperty
+ * @param target
+ * @param name
+ * @param value
+ */
+export declare function createDataProperty<T extends object>(target: T, name: string | symbol, value: any): void;
 export declare const UNICODE_EXTENSION_SEQUENCE_REGEX: RegExp;
 export declare function invariant(condition: boolean, message: string, Err?: any): asserts condition;

package/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.invariant = exports.UNICODE_EXTENSION_SEQUENCE_REGEX = exports.defineProperty = exports.isLiteralPart = exports.getMultiInternalSlots = exports.getInternalSlot = exports.setMultiInternalSlots = exports.setInternalSlot = exports.repeat = exports.getMagnitude = void 0;
+exports.invariant = exports.UNICODE_EXTENSION_SEQUENCE_REGEX = exports.createDataProperty = exports.defineProperty = exports.isLiteralPart = exports.getMultiInternalSlots = exports.getInternalSlot = exports.setMultiInternalSlots = exports.setInternalSlot = exports.repeat = exports.getMagnitude = void 0;
 /**
  * Cannot do Math.log(x) / Math.log(10) bc if IEEE floating point issue
  * @param x number
@@ -80,6 +80,21 @@ function defineProperty(target, name, _a) {
     });
 }
 exports.defineProperty = defineProperty;
+/**
+ * 7.3.5 CreateDataProperty
+ * @param target
+ * @param name
+ * @param value
+ */
+function createDataProperty(target, name, value) {
+    Object.defineProperty(target, name, {
+        configurable: true,
+        enumerable: true,
+        writable: true,
+        value: value,
+    });
+}
+exports.createDataProperty = createDataProperty;
 exports.UNICODE_EXTENSION_SEQUENCE_REGEX = /-u(?:-[0-9a-z]{2,8})+/gi;
 function invariant(condition, message, Err) {
     if (Err === void 0) { Err = Error; }