Simplify constructors for Intl types

Author: cknitt

src/intl/Core__Intl__Collator.res

@@ -25,16 +25,10 @@ type resolvedOptions = {
 
 type supportedLocalesOptions = {localeMatcher: Core__Intl__Common.localeMatcher}
 
-@new external make: unit => t = "Intl.Collator"
-@new external makeWithLocale: string => t = "Intl.Collator"
-@new external makeWithLocales: array<string> => t = "Intl.Collator"
-@new external makeWithLocaleAndOptions: (string, options) => t = "Intl.Collator"
-@new external makeWithLocalesAndOptions: (array<string>, options) => t = "Intl.Collator"
-@new external makeWithOptions: (@as(json`undefined`) _, options) => t = "Intl.Collator"
-
-@val external supportedLocalesOf: array<string> => t = "Intl.Collator.supportedLocalesOf"
+@new external make: (~locales: array<string>=?, ~options: options=?) => t = "Intl.Collator"
+
 @val
-external supportedLocalesOfWithOptions: (array<string>, supportedLocalesOptions) => t =
+external supportedLocalesOf: (array<string>, ~options: supportedLocalesOptions=?) => t =
   "Intl.Collator.supportedLocalesOf"
 
 @send external resolvedOptions: t => resolvedOptions = "resolvedOptions"

test/intl/Intl__CollatorTest.mjs

@@ -5,16 +5,16 @@ console.log("---");
 
 console.log("Intl.Collator");
 
-new Intl.Collator();
+new Intl.Collator(undefined, undefined);
 
-new Intl.Collator("en-US");
+new Intl.Collator(["en-US"], undefined);
 
 var _collator = new Intl.Collator([
       "en-US",
       "en-GB"
-    ]);
+    ], undefined);
 
-var collator = new Intl.Collator("en-US", {
+var collator = new Intl.Collator(["en-US"], {
       sensitivity: "base",
       ignorePunctuation: true,
       numeric: true,
@@ -24,7 +24,7 @@ var collator = new Intl.Collator("en-US", {
 Intl.Collator.supportedLocalesOf([
       "en-US",
       "en-GB"
-    ]);
+    ], undefined);
 
 Intl.Collator.supportedLocalesOf([
       "en-US",
@@ -37,7 +37,7 @@ console.log(collator.resolvedOptions());
 
 console.log(collator.compare("hi", "hï"));
 
-console.log(Intl.Collator.supportedLocalesOf(["hi"]));
+console.log(Intl.Collator.supportedLocalesOf(["hi"], undefined));
 
 export {
   _collator ,

test/intl/Intl__CollatorTest.res

@@ -4,14 +4,14 @@ Console.log("---")
 Console.log("Intl.Collator")
 
 let _collator = Intl.Collator.make()
-let _collator = Intl.Collator.makeWithLocale("en-US")
-let _collator = Intl.Collator.makeWithLocales(["en-US", "en-GB"])
-let collator = Intl.Collator.makeWithLocaleAndOptions(
-  "en-US",
-  {caseFirst: #upper, sensitivity: #base, ignorePunctuation: true, numeric: true},
+let _collator = Intl.Collator.make(~locales=["en-US"])
+let _collator = Intl.Collator.make(~locales=["en-US", "en-GB"])
+let collator = Intl.Collator.make(
+  ~locales=["en-US"],
+  ~options={caseFirst: #upper, sensitivity: #base, ignorePunctuation: true, numeric: true},
 )
 Intl.Collator.supportedLocalesOf(["en-US", "en-GB"])->ignore
-Intl.Collator.supportedLocalesOfWithOptions(["en-US", "en-GB"], {localeMatcher: #lookup})->ignore
+Intl.Collator.supportedLocalesOf(["en-US", "en-GB"], ~options={localeMatcher: #lookup})->ignore
 
 collator->Intl.Collator.resolvedOptions->Console.log
 collator->Intl.Collator.compare("hi", "hï")->Console.log