Address PR comments

KhafraDev · Apr 12, 2023 · 4857386 · 4857386
1 parent e0e1bde
commit 4857386
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 74 deletions.
diff --git a/src/lib/es2022.intl.d.ts b/src/lib/es2022.intl.d.ts
@@ -88,17 +88,4 @@ declare namespace Intl {
          */
         supportedLocalesOf(locales: BCP47LanguageTag | BCP47LanguageTag[], options?: Pick<SegmenterOptions, "localeMatcher">): BCP47LanguageTag[];
     };
-
-    type EnumerationKeys = "calendar" | "collation" | "currency" | "numberingSystem" | "timeZone" | "unit";
-
-    /**
-     * Returns a list of the supported collation, calendar, currency, numbering system, timezones, and units by the implementation.
-     *
-     * @param key A string indicating the category of values to return.
-     *
-     * @returns {string[]} A list of the supported values.
-     *
-     * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/supportedValuesOf)
-     */
-    function supportedValuesOf(key: EnumerationKeys): string[];
 }
diff --git a/src/lib/esnext.intl.d.ts b/src/lib/esnext.intl.d.ts
@@ -1,10 +1,19 @@
 declare namespace Intl {
-  interface NumberRangeFormatPart extends NumberFormatPart {
-    source: "startRange" | "endRange" | "shared"
-  }
+    interface NumberRangeFormatPart extends NumberFormatPart {
+        source: "startRange" | "endRange" | "shared"
+    }
 
-  interface NumberFormat {
-    formatRange(start: number | bigint, end: number | bigint): string;
-    formatRangeToParts(start: number | bigint, end: number | bigint): NumberRangeFormatPart[];
-  }
+    interface NumberFormat {
+        formatRange(start: number | bigint, end: number | bigint): string;
+        formatRangeToParts(start: number | bigint, end: number | bigint): NumberRangeFormatPart[];
+    }
+
+    /**
+     * Returns a sorted array of the supported collation, calendar, currency, numbering system, timezones, and units by the implementation.
+     * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/supportedValuesOf)
+     *
+     * @param key A string indicating the category of values to return.
+     * @returns A sorted array of the supported values.
+     */
+    function supportedValuesOf(key: "calendar" | "collation" | "currency" | "numberingSystem" | "timeZone" | "unit"): string[];
 }
diff --git a/tests/baselines/reference/es2022IntlAPIs.js b/tests/baselines/reference/es2022IntlAPIs.js
@@ -7,11 +7,6 @@ for (const zoneName of timezoneNames) {
     timeZoneName: zoneName,
   });
 }
-
-const enumerationKeys = ['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] as const;
-for (const key of enumerationKeys) {
-  var supported = Intl.supportedValuesOf(key);
-}
 
 
 //// [es2022IntlAPIs.js]
@@ -23,7 +18,3 @@ for (const zoneName of timezoneNames) {
         timeZoneName: zoneName,
     });
 }
-const enumerationKeys = ['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'];
-for (const key of enumerationKeys) {
-    var supported = Intl.supportedValuesOf(key);
-}
diff --git a/tests/baselines/reference/es2022IntlAPIs.symbols b/tests/baselines/reference/es2022IntlAPIs.symbols
@@ -24,19 +24,3 @@ for (const zoneName of timezoneNames) {
   });
 }
 
-const enumerationKeys = ['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] as const;
->enumerationKeys : Symbol(enumerationKeys, Decl(es2022IntlAPIs.ts, 9, 5))
->const : Symbol(const)
-
-for (const key of enumerationKeys) {
->key : Symbol(key, Decl(es2022IntlAPIs.ts, 10, 10))
->enumerationKeys : Symbol(enumerationKeys, Decl(es2022IntlAPIs.ts, 9, 5))
-
-  var supported = Intl.supportedValuesOf(key);
->supported : Symbol(supported, Decl(es2022IntlAPIs.ts, 11, 5))
->Intl.supportedValuesOf : Symbol(Intl.supportedValuesOf, Decl(lib.es2022.intl.d.ts, --, --))
->Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --) ... and 3 more)
->supportedValuesOf : Symbol(Intl.supportedValuesOf, Decl(lib.es2022.intl.d.ts, --, --))
->key : Symbol(key, Decl(es2022IntlAPIs.ts, 10, 10))
-}
-
diff --git a/tests/baselines/reference/es2022IntlAPIs.types b/tests/baselines/reference/es2022IntlAPIs.types
@@ -35,27 +35,3 @@ for (const zoneName of timezoneNames) {
   });
 }
 
-const enumerationKeys = ['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] as const;
->enumerationKeys : readonly ["calendar", "collation", "currency", "numberingSystem", "timeZone", "unit"]
->['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] as const : readonly ["calendar", "collation", "currency", "numberingSystem", "timeZone", "unit"]
->['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] : readonly ["calendar", "collation", "currency", "numberingSystem", "timeZone", "unit"]
->'calendar' : "calendar"
->'collation' : "collation"
->'currency' : "currency"
->'numberingSystem' : "numberingSystem"
->'timeZone' : "timeZone"
->'unit' : "unit"
-
-for (const key of enumerationKeys) {
->key : "calendar" | "collation" | "currency" | "numberingSystem" | "timeZone" | "unit"
->enumerationKeys : readonly ["calendar", "collation", "currency", "numberingSystem", "timeZone", "unit"]
-
-  var supported = Intl.supportedValuesOf(key);
->supported : string[]
->Intl.supportedValuesOf(key) : string[]
->Intl.supportedValuesOf : (key: Intl.EnumerationKeys) => string[]
->Intl : typeof Intl
->supportedValuesOf : (key: Intl.EnumerationKeys) => string[]
->key : "calendar" | "collation" | "currency" | "numberingSystem" | "timeZone" | "unit"
-}
-
diff --git a/tests/baselines/reference/esNextIntlAPIs.js b/tests/baselines/reference/esNextIntlAPIs.js
@@ -0,0 +1,12 @@
+//// [esNextIntlAPIs.ts]
+const enumerationKeys = ['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] as const;
+for (const key of enumerationKeys) {
+  var supported = Intl.supportedValuesOf(key);
+}
+
+
+//// [esNextIntlAPIs.js]
+const enumerationKeys = ['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'];
+for (const key of enumerationKeys) {
+    var supported = Intl.supportedValuesOf(key);
+}
diff --git a/tests/baselines/reference/esNextIntlAPIs.symbols b/tests/baselines/reference/esNextIntlAPIs.symbols
@@ -0,0 +1,17 @@
+=== tests/cases/conformance/esnext/esNextIntlAPIs.ts ===
+const enumerationKeys = ['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] as const;
+>enumerationKeys : Symbol(enumerationKeys, Decl(esNextIntlAPIs.ts, 0, 5))
+>const : Symbol(const)
+
+for (const key of enumerationKeys) {
+>key : Symbol(key, Decl(esNextIntlAPIs.ts, 1, 10))
+>enumerationKeys : Symbol(enumerationKeys, Decl(esNextIntlAPIs.ts, 0, 5))
+
+  var supported = Intl.supportedValuesOf(key);
+>supported : Symbol(supported, Decl(esNextIntlAPIs.ts, 2, 5))
+>Intl.supportedValuesOf : Symbol(Intl.supportedValuesOf, Decl(lib.esnext.intl.d.ts, --, --))
+>Intl : Symbol(Intl, Decl(lib.es5.d.ts, --, --), Decl(lib.es2017.intl.d.ts, --, --), Decl(lib.es2018.intl.d.ts, --, --), Decl(lib.es2019.intl.d.ts, --, --), Decl(lib.es2020.bigint.d.ts, --, --) ... and 4 more)
+>supportedValuesOf : Symbol(Intl.supportedValuesOf, Decl(lib.esnext.intl.d.ts, --, --))
+>key : Symbol(key, Decl(esNextIntlAPIs.ts, 1, 10))
+}
+
diff --git a/tests/baselines/reference/esNextIntlAPIs.types b/tests/baselines/reference/esNextIntlAPIs.types
@@ -0,0 +1,25 @@
+=== tests/cases/conformance/esnext/esNextIntlAPIs.ts ===
+const enumerationKeys = ['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] as const;
+>enumerationKeys : readonly ["calendar", "collation", "currency", "numberingSystem", "timeZone", "unit"]
+>['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] as const : readonly ["calendar", "collation", "currency", "numberingSystem", "timeZone", "unit"]
+>['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] : readonly ["calendar", "collation", "currency", "numberingSystem", "timeZone", "unit"]
+>'calendar' : "calendar"
+>'collation' : "collation"
+>'currency' : "currency"
+>'numberingSystem' : "numberingSystem"
+>'timeZone' : "timeZone"
+>'unit' : "unit"
+
+for (const key of enumerationKeys) {
+>key : "calendar" | "collation" | "currency" | "numberingSystem" | "timeZone" | "unit"
+>enumerationKeys : readonly ["calendar", "collation", "currency", "numberingSystem", "timeZone", "unit"]
+
+  var supported = Intl.supportedValuesOf(key);
+>supported : string[]
+>Intl.supportedValuesOf(key) : string[]
+>Intl.supportedValuesOf : (key: "calendar" | "collation" | "currency" | "numberingSystem" | "timeZone" | "unit") => string[]
+>Intl : typeof Intl
+>supportedValuesOf : (key: "calendar" | "collation" | "currency" | "numberingSystem" | "timeZone" | "unit") => string[]
+>key : "calendar" | "collation" | "currency" | "numberingSystem" | "timeZone" | "unit"
+}
+
diff --git a/tests/cases/conformance/es2022/es2022IntlAPIs.ts b/tests/cases/conformance/es2022/es2022IntlAPIs.ts
@@ -8,8 +8,3 @@ for (const zoneName of timezoneNames) {
     timeZoneName: zoneName,
   });
 }
-
-const enumerationKeys = ['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] as const;
-for (const key of enumerationKeys) {
-  var supported = Intl.supportedValuesOf(key);
-}
diff --git a/tests/cases/conformance/esnext/esNextIntlAPIs.ts b/tests/cases/conformance/esnext/esNextIntlAPIs.ts
@@ -0,0 +1,5 @@
+// @target: esnext
+const enumerationKeys = ['calendar', 'collation', 'currency', 'numberingSystem', 'timeZone', 'unit'] as const;
+for (const key of enumerationKeys) {
+  var supported = Intl.supportedValuesOf(key);
+}