fix(@formatjs/intl-unified-numberformat): validate numbering system (#…

…676)

.vscode/settings.json

@@ -22,5 +22,8 @@
       "url": "http://json.schemastore.org/lerna"
     }
   ],
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "npm.packageManager": "yarn",
+  "prettier.packageManager": "yarn",
+  "eslint.packageManager": "yarn"
 }

.vscode/tasks.json

@@ -0,0 +1,16 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "npm",
+			"script": "dev:cjs",
+			"problemMatcher": ["$tsc-watch"],
+			"label": "yarn: dev:cjs",
+			"detail": "tsc -b packages/* --watch",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}

packages/formatjs-extract-cldr-data/src/extract-numbers.ts

@@ -3,8 +3,8 @@
  * Copyrights licensed under the New BSD License.
  * See the accompanying LICENSE file for terms.
  */
-'use strict';
 import * as NumbersData from 'cldr-numbers-full/main/ar/numbers.json';
+import * as numberingSystems from 'cldr-core/supplemental/numberingSystems.json';
 import {Locale} from './types';
 import generateFieldExtractorFn, {
   collapseSingleValuePluralRule,
@@ -148,6 +148,13 @@ export function generateDataForLocales(
   }, {});
 }
 
+export function extractNumberingSystemNames() {
+  // Export an object instead of array to be more compatible with rollup.
+  return {
+    names: Object.keys(numberingSystems.supplemental.numberingSystems),
+  };
+}
+
 export default generateFieldExtractorFn<RawNumberData>(
   loadNumbers,
   hasNumbers,

packages/formatjs-extract-cldr-data/src/index.ts

@@ -49,5 +49,8 @@ export {
   generateDataForLocales as generateCurrencyDataForLocales,
 } from './extract-currencies';
 export {generateDataForLocales as generateUnitDataForLocales} from './extract-units';
-export {generateDataForLocales as generateNumberDataForLocales} from './extract-numbers';
+export {
+  extractNumberingSystemNames,
+  generateDataForLocales as generateNumberDataForLocales,
+} from './extract-numbers';
 export {getAllLocales as getAllDisplayNamesLocales} from './extract-displaynames';

packages/intl-unified-numberformat/scripts/cldr.ts

@@ -4,6 +4,7 @@ import {
   generateNumberDataForLocales,
   locales,
   extractCurrencyDigits,
+  extractNumberingSystemNames,
 } from 'formatjs-extract-cldr-data';
 import {
   SANCTIONED_UNITS,
@@ -146,6 +147,12 @@ outputJSONSync(
   extractCurrencyDigits()
 );
 
+// Output numbering systems file
+outputJSONSync(
+  resolve(__dirname, '../src/numbering-systems.json'),
+  extractNumberingSystemNames()
+);
+
 // For test262
 // Only a subset of locales
 outputFileSync(

packages/intl-unified-numberformat/src/core.ts

@@ -47,6 +47,14 @@ import {
 import {extractILD, Patterns} from './data';
 import * as currencyDigitsData from './currency-digits.json';
 import * as ILND from './ilnd-numbers.json';
+import {names as numberingSystemNames} from './numbering-systems.json';
+
+const VALID_NUMBERING_SYSTEM_NAMES: Record<string, boolean> = Object.create(
+  null
+);
+for (const nu of numberingSystemNames) {
+  VALID_NUMBERING_SYSTEM_NAMES[nu] = true;
+}
 
 const RESOLVED_OPTIONS_KEYS = [
   'locale',
@@ -140,6 +148,7 @@ export type UnifiedNumberFormatOptions = Intl.NumberFormatOptions &
     signDisplay?: UnifiedNumberFormatOptionsSignDisplay;
     unit?: Unit;
     unitDisplay?: UnifiedNumberFormatOptionsUnitDisplay;
+    numberingSystem?: string;
   };
 
 export type ResolvedUnifiedNumberFormatOptions = Intl.ResolvedNumberFormatOptions &
@@ -203,7 +212,8 @@ function initializeNumberFormat(
   opts?: UnifiedNumberFormatOptions
 ) {
   const requestedLocales = getCanonicalLocales(locales);
-  const options = opts === undefined ? Object.create(null) : toObject(opts);
+  const options: UnifiedNumberFormatOptions =
+    opts === undefined ? Object.create(null) : toObject(opts);
   const opt: any = Object.create(null);
   const matcher = getOption(
     options,
@@ -213,6 +223,24 @@ function initializeNumberFormat(
     'best fit'
   );
   opt.localeMatcher = matcher;
+
+  const numberingSystem = getOption(
+    options,
+    'numberingSystem',
+    'string',
+    undefined,
+    undefined
+  );
+  if (
+    numberingSystem !== undefined &&
+    !VALID_NUMBERING_SYSTEM_NAMES[numberingSystem]
+  ) {
+    // 8.a. If numberingSystem does not match the Unicode Locale Identifier type nonterminal,
+    // throw a RangeError exception.
+    throw RangeError(`Invalid numberingSystems: ${numberingSystem}`);
+  }
+  opt.nu = numberingSystem;
+
   const {localeData} = UnifiedNumberFormat;
   const r = createResolveLocale(UnifiedNumberFormat.getDefaultLocale)(
     UnifiedNumberFormat.availableLocales,
@@ -223,17 +251,11 @@ function initializeNumberFormat(
     localeData
   );
   const ildData = localeData[removeUnicodeExtensionFromLocale(r.locale)];
-  const numberingSystem = r.nu;
   setMultiInternalSlots(__INTERNAL_SLOT_MAP__, nf, {
     locale: r.locale,
     dataLocale: r.dataLocale,
-    numberingSystem,
-    ild: extractILD(
-      ildData.units,
-      ildData.currencies,
-      ildData.numbers,
-      numberingSystem
-    ),
+    numberingSystem: r.nu,
+    ild: extractILD(ildData.units, ildData.currencies, ildData.numbers, r.nu),
   });
 
   // https://tc39.es/proposal-unified-intl-numberformat/section11/numberformat_proposed_out.html#sec-setnumberformatunitoptions

packages/intl-unified-numberformat/src/numbering-systems.json

@@ -0,0 +1 @@
+{"names":["adlm","ahom","arab","arabext","armn","armnlow","bali","beng","bhks","brah","cakm","cham","cyrl","deva","ethi","fullwide","geor","gong","gonm","grek","greklow","gujr","guru","hanidays","hanidec","hans","hansfin","hant","hantfin","hebr","hmng","hmnp","java","jpan","jpanfin","jpanyear","kali","khmr","knda","lana","lanatham","laoo","latn","lepc","limb","mathbold","mathdbl","mathmono","mathsanb","mathsans","mlym","modi","mong","mroo","mtei","mymr","mymrshan","mymrtlng","newa","nkoo","olck","orya","osma","rohg","roman","romanlow","saur","shrd","sind","sinh","sora","sund","takr","talu","taml","tamldec","telu","thai","tibt","tirh","vaii","wara","wcho"]}

packages/intl-unified-numberformat/tests/runner.ts

@@ -1,7 +1,7 @@
 import {spawnSync} from 'child_process';
 import {resolve} from 'path';
 import {cpus} from 'os';
-import chalk from 'chalk';
+import * as chalk from 'chalk';
 
 if (process.version.startsWith('v13')) {
   console.log(

packages/intl-unified-numberformat/tsconfig.json

@@ -4,8 +4,6 @@
         "lib": ["dom", "es5", "esnext.intl", "es2017.intl", "es2018.intl"],
         "outDir": "dist",
         "rootDir": "src",
-        "allowSyntheticDefaultImports": true,
-        "noFallthroughCasesInSwitch": true,
         "types": [
             "babel__core",
             "babel__generator",

tsconfig.json

@@ -10,6 +10,8 @@
         "noUnusedLocals": true,
         "noUnusedParameters": true,
         "preserveConstEnums": true,
+        "allowSyntheticDefaultImports": true,
+        "noFallthroughCasesInSwitch": true,
         "declarationMap": true,
         "sourceMap": true,
         "composite": true,