@formatjs/intl-pluralrules 5.3.6 → 5.4.1

package/abstract/GetOperands.d.ts

@@ -1,8 +1,9 @@
+import Decimal from 'decimal.js';
 export interface OperandsRecord {
     /**
      * Absolute value of the source number (integer and decimals)
      */
-    Number: number;
+    Number: Decimal;
     /**
      * Number of digits of `number`
      */

package/abstract/GetOperands.js

@@ -9,7 +9,7 @@ var ecma402_abstract_1 = require("@formatjs/ecma402-abstract");
 function GetOperands(s) {
     (0, ecma402_abstract_1.invariant)(typeof s === 'string', "GetOperands should have been called with a string");
     var n = (0, ecma402_abstract_1.ToNumber)(s);
-    (0, ecma402_abstract_1.invariant)(isFinite(n), 'n should be finite');
+    (0, ecma402_abstract_1.invariant)(n.isFinite(), 'n should be finite');
     var dp = s.indexOf('.');
     var iv;
     var f;
@@ -17,7 +17,7 @@ function GetOperands(s) {
     var fv = '';
     if (dp === -1) {
         iv = n;
-        f = 0;
+        f = ecma402_abstract_1.ZERO;
         v = 0;
     }
     else {
@@ -26,24 +26,24 @@ function GetOperands(s) {
         f = (0, ecma402_abstract_1.ToNumber)(fv);
         v = fv.length;
     }
-    var i = Math.abs((0, ecma402_abstract_1.ToNumber)(iv));
+    var i = (0, ecma402_abstract_1.ToNumber)(iv).abs();
     var w;
     var t;
-    if (f !== 0) {
+    if (!f.isZero()) {
         var ft = fv.replace(/0+$/, '');
         w = ft.length;
         t = (0, ecma402_abstract_1.ToNumber)(ft);
     }
     else {
         w = 0;
-        t = 0;
+        t = ecma402_abstract_1.ZERO;
     }
     return {
         Number: n,
-        IntegerDigits: i,
+        IntegerDigits: i.toNumber(),
         NumberOfFractionDigits: v,
         NumberOfFractionDigitsWithoutTrailing: w,
-        FractionDigits: f,
-        FractionDigitsWithoutTrailing: t,
+        FractionDigits: f.toNumber(),
+        FractionDigitsWithoutTrailing: t.toNumber(),
     };
 }

package/abstract/InitializePluralRules.d.ts

@@ -1,4 +1,4 @@
-import { PluralRulesInternal, PluralRulesData } from '@formatjs/ecma402-abstract';
+import { PluralRulesData, PluralRulesInternal } from '@formatjs/ecma402-abstract';
 export declare function InitializePluralRules(pl: Intl.PluralRules, locales: string | string[] | undefined, options: Intl.PluralRulesOptions | undefined, { availableLocales, relevantExtensionKeys, localeData, getDefaultLocale, getInternalSlots, }: {
     availableLocales: Set<string>;
     relevantExtensionKeys: string[];

package/abstract/InitializePluralRules.js

@@ -12,9 +12,9 @@ function InitializePluralRules(pl, locales, options, _a) {
     internalSlots.initializedPluralRules = true;
     var matcher = (0, ecma402_abstract_1.GetOption)(opts, 'localeMatcher', 'string', ['best fit', 'lookup'], 'best fit');
     opt.localeMatcher = matcher;
-    internalSlots.type = (0, ecma402_abstract_1.GetOption)(opts, 'type', 'string', ['cardinal', 'ordinal'], 'cardinal');
-    (0, ecma402_abstract_1.SetNumberFormatDigitOptions)(internalSlots, opts, 0, 3, 'standard');
     var r = (0, intl_localematcher_1.ResolveLocale)(availableLocales, requestedLocales, opt, relevantExtensionKeys, localeData, getDefaultLocale);
     internalSlots.locale = r.locale;
+    internalSlots.type = (0, ecma402_abstract_1.GetOption)(opts, 'type', 'string', ['cardinal', 'ordinal'], 'cardinal');
+    (0, ecma402_abstract_1.SetNumberFormatDigitOptions)(internalSlots, opts, 0, 3, 'standard');
     return pl;
 }

package/abstract/ResolvePlural.d.ts

@@ -1,4 +1,5 @@
-import { PluralRulesInternal, LDMLPluralRule } from '@formatjs/ecma402-abstract';
+import { LDMLPluralRule, PluralRulesInternal } from '@formatjs/ecma402-abstract';
+import Decimal from 'decimal.js';
 import { OperandsRecord } from './GetOperands';
 /**
  * http://ecma-international.org/ecma-402/7.0/index.html#sec-resolveplural
@@ -6,7 +7,7 @@ import { OperandsRecord } from './GetOperands';
  * @param n
  * @param PluralRuleSelect Has to pass in bc it's implementation-specific
  */
-export declare function ResolvePlural(pl: Intl.PluralRules, n: number, { getInternalSlots, PluralRuleSelect, }: {
+export declare function ResolvePlural(pl: Intl.PluralRules, n: Decimal, { getInternalSlots, PluralRuleSelect, }: {
     getInternalSlots(pl: Intl.PluralRules): PluralRulesInternal;
-    PluralRuleSelect: (locale: string, type: 'cardinal' | 'ordinal', n: number, operands: OperandsRecord) => LDMLPluralRule;
+    PluralRuleSelect: (locale: string, type: 'cardinal' | 'ordinal', n: Decimal, operands: OperandsRecord) => LDMLPluralRule;
 }): LDMLPluralRule;

package/abstract/ResolvePlural.js

@@ -14,8 +14,7 @@ function ResolvePlural(pl, n, _a) {
     var internalSlots = getInternalSlots(pl);
     (0, ecma402_abstract_1.invariant)((0, ecma402_abstract_1.Type)(internalSlots) === 'Object', 'pl has to be an object');
     (0, ecma402_abstract_1.invariant)('initializedPluralRules' in internalSlots, 'pluralrules must be initialized');
-    (0, ecma402_abstract_1.invariant)((0, ecma402_abstract_1.Type)(n) === 'Number', 'n must be a number');
-    if (!isFinite(n)) {
+    if (!n.isFinite()) {
         return 'other';
     }
     var locale = internalSlots.locale, type = internalSlots.type;

package/index.d.ts

@@ -6,7 +6,7 @@ export interface PluralRulesInternal extends NumberFormatDigitInternalSlots {
 }
 export declare class PluralRules implements Intl.PluralRules {
     constructor(locales?: string | string[], options?: Intl.PluralRulesOptions);
-    resolvedOptions(): any;
+    resolvedOptions(): Intl.ResolvedPluralRulesOptions;
     select(val: number): LDMLPluralRule;
     toString(): string;
     static supportedLocalesOf(locales?: string | string[], options?: Pick<Intl.PluralRulesOptions, 'localeMatcher'>): string[];

package/lib/abstract/GetOperands.d.ts

@@ -1,8 +1,9 @@
+import Decimal from 'decimal.js';
 export interface OperandsRecord {
     /**
      * Absolute value of the source number (integer and decimals)
      */
-    Number: number;
+    Number: Decimal;
     /**
      * Number of digits of `number`
      */

package/lib/abstract/GetOperands.js

@@ -1,4 +1,4 @@
-import { invariant, ToNumber } from '@formatjs/ecma402-abstract';
+import { invariant, ToNumber, ZERO } from '@formatjs/ecma402-abstract';
 /**
  * http://ecma-international.org/ecma-402/7.0/index.html#sec-getoperands
  * @param s
@@ -6,7 +6,7 @@ import { invariant, ToNumber } from '@formatjs/ecma402-abstract';
 export function GetOperands(s) {
     invariant(typeof s === 'string', "GetOperands should have been called with a string");
     var n = ToNumber(s);
-    invariant(isFinite(n), 'n should be finite');
+    invariant(n.isFinite(), 'n should be finite');
     var dp = s.indexOf('.');
     var iv;
     var f;
@@ -14,7 +14,7 @@ export function GetOperands(s) {
     var fv = '';
     if (dp === -1) {
         iv = n;
-        f = 0;
+        f = ZERO;
         v = 0;
     }
     else {
@@ -23,24 +23,24 @@ export function GetOperands(s) {
         f = ToNumber(fv);
         v = fv.length;
     }
-    var i = Math.abs(ToNumber(iv));
+    var i = ToNumber(iv).abs();
     var w;
     var t;
-    if (f !== 0) {
+    if (!f.isZero()) {
         var ft = fv.replace(/0+$/, '');
         w = ft.length;
         t = ToNumber(ft);
     }
     else {
         w = 0;
-        t = 0;
+        t = ZERO;
     }
     return {
         Number: n,
-        IntegerDigits: i,
+        IntegerDigits: i.toNumber(),
         NumberOfFractionDigits: v,
         NumberOfFractionDigitsWithoutTrailing: w,
-        FractionDigits: f,
-        FractionDigitsWithoutTrailing: t,
+        FractionDigits: f.toNumber(),
+        FractionDigitsWithoutTrailing: t.toNumber(),
     };
 }

package/lib/abstract/InitializePluralRules.d.ts

@@ -1,4 +1,4 @@
-import { PluralRulesInternal, PluralRulesData } from '@formatjs/ecma402-abstract';
+import { PluralRulesData, PluralRulesInternal } from '@formatjs/ecma402-abstract';
 export declare function InitializePluralRules(pl: Intl.PluralRules, locales: string | string[] | undefined, options: Intl.PluralRulesOptions | undefined, { availableLocales, relevantExtensionKeys, localeData, getDefaultLocale, getInternalSlots, }: {
     availableLocales: Set<string>;
     relevantExtensionKeys: string[];

package/lib/abstract/InitializePluralRules.js

@@ -9,9 +9,9 @@ export function InitializePluralRules(pl, locales, options, _a) {
     internalSlots.initializedPluralRules = true;
     var matcher = GetOption(opts, 'localeMatcher', 'string', ['best fit', 'lookup'], 'best fit');
     opt.localeMatcher = matcher;
-    internalSlots.type = GetOption(opts, 'type', 'string', ['cardinal', 'ordinal'], 'cardinal');
-    SetNumberFormatDigitOptions(internalSlots, opts, 0, 3, 'standard');
     var r = ResolveLocale(availableLocales, requestedLocales, opt, relevantExtensionKeys, localeData, getDefaultLocale);
     internalSlots.locale = r.locale;
+    internalSlots.type = GetOption(opts, 'type', 'string', ['cardinal', 'ordinal'], 'cardinal');
+    SetNumberFormatDigitOptions(internalSlots, opts, 0, 3, 'standard');
     return pl;
 }

package/lib/abstract/ResolvePlural.d.ts

@@ -1,4 +1,5 @@
-import { PluralRulesInternal, LDMLPluralRule } from '@formatjs/ecma402-abstract';
+import { LDMLPluralRule, PluralRulesInternal } from '@formatjs/ecma402-abstract';
+import Decimal from 'decimal.js';
 import { OperandsRecord } from './GetOperands';
 /**
  * http://ecma-international.org/ecma-402/7.0/index.html#sec-resolveplural
@@ -6,7 +7,7 @@ import { OperandsRecord } from './GetOperands';
  * @param n
  * @param PluralRuleSelect Has to pass in bc it's implementation-specific
  */
-export declare function ResolvePlural(pl: Intl.PluralRules, n: number, { getInternalSlots, PluralRuleSelect, }: {
+export declare function ResolvePlural(pl: Intl.PluralRules, n: Decimal, { getInternalSlots, PluralRuleSelect, }: {
     getInternalSlots(pl: Intl.PluralRules): PluralRulesInternal;
-    PluralRuleSelect: (locale: string, type: 'cardinal' | 'ordinal', n: number, operands: OperandsRecord) => LDMLPluralRule;
+    PluralRuleSelect: (locale: string, type: 'cardinal' | 'ordinal', n: Decimal, operands: OperandsRecord) => LDMLPluralRule;
 }): LDMLPluralRule;

package/lib/abstract/ResolvePlural.js

@@ -1,4 +1,4 @@
-import { Type, invariant, FormatNumericToString, } from '@formatjs/ecma402-abstract';
+import { FormatNumericToString, invariant, Type, } from '@formatjs/ecma402-abstract';
 import { GetOperands } from './GetOperands';
 /**
  * http://ecma-international.org/ecma-402/7.0/index.html#sec-resolveplural
@@ -11,8 +11,7 @@ export function ResolvePlural(pl, n, _a) {
     var internalSlots = getInternalSlots(pl);
     invariant(Type(internalSlots) === 'Object', 'pl has to be an object');
     invariant('initializedPluralRules' in internalSlots, 'pluralrules must be initialized');
-    invariant(Type(n) === 'Number', 'n must be a number');
-    if (!isFinite(n)) {
+    if (!n.isFinite()) {
         return 'other';
     }
     var locale = internalSlots.locale, type = internalSlots.type;

package/lib/index.d.ts

@@ -6,7 +6,7 @@ export interface PluralRulesInternal extends NumberFormatDigitInternalSlots {
 }
 export declare class PluralRules implements Intl.PluralRules {
     constructor(locales?: string | string[], options?: Intl.PluralRulesOptions);
-    resolvedOptions(): any;
+    resolvedOptions(): Intl.ResolvedPluralRulesOptions;
     select(val: number): LDMLPluralRule;
     toString(): string;
     static supportedLocalesOf(locales?: string | string[], options?: Pick<Intl.PluralRulesOptions, 'localeMatcher'>): string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/intl-pluralrules",
-  "version": "5.3.6",
+  "version": "5.4.1",
   "description": "Polyfill for Intl.PluralRules",
   "keywords": [
     "polyfill",
@@ -20,13 +20,14 @@
     "url": "git+https://github.com/formatjs/formatjs.git"
   },
   "dependencies": {
+    "decimal.js": "10",
     "tslib": "2",
-    "@formatjs/ecma402-abstract": "2.2.5",
-    "@formatjs/intl-localematcher": "0.5.8"
+    "@formatjs/intl-localematcher": "0.5.9",
+    "@formatjs/ecma402-abstract": "2.3.1"
   },
   "devDependencies": {
-    "@formatjs/intl-getcanonicallocales": "2.5.3",
-    "@formatjs/intl-locale": "4.2.6"
+    "@formatjs/intl-getcanonicallocales": "2.5.4",
+    "@formatjs/intl-locale": "4.2.8"
   },
   "bugs": {
     "url": "https://github.com/formatjs/formatjs/issues"