Merge pull request #5070 from renatoalencar/fix/js_string-match_

Fix Js.String.match_ return type
rescript-lang · Apr 18, 2021 · b525837 · b525837
2 parents 100da8a + 5ae4b1b
commit b525837
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/jscomp/others/js_string.ml b/jscomp/others/js_string.ml
@@ -276,7 +276,7 @@ external localeCompare : t -> float = "localeCompare" [@@bs.send.pipe: t]
 ]}
 
 *)
-external match_ : Js_re.t -> t array option = "match" [@@bs.send.pipe: t] [@@bs.return {null_to_opt}]
+external match_ : Js_re.t -> t option array option = "match" [@@bs.send.pipe: t] [@@bs.return {null_to_opt}]
 
 (** [normalize str] returns the normalized Unicode string using Normalization Form Canonical (NFC) Composition.
 

diff --git a/jscomp/others/js_string2.ml b/jscomp/others/js_string2.ml
@@ -273,7 +273,7 @@ external localeCompare : t -> t -> float = "localeCompare" [@@bs.send]
 ]}
 
 *)
-external match_ : t -> Js_re.t -> t array option = "match" [@@bs.send] [@@bs.return {null_to_opt}]
+external match_ : t -> Js_re.t -> t option array option = "match" [@@bs.send] [@@bs.return {null_to_opt}]
 
 (** [normalize str] returns the normalized Unicode string using Normalization Form Canonical (NFC) Composition.
 

diff --git a/jscomp/test/js_string_test.ml b/jscomp/test/js_string_test.ml
@@ -84,11 +84,14 @@ let suites = Mt.[
     );
 
     "match", (fun _ ->
-      Eq(Some [| "na"; "na" |], "banana" |. Js.String2.match_ [%re "/na+/g"])
+      Eq(Some [| Some "na"; Some "na" |], "banana" |. Js.String2.match_ [%re "/na+/g"])
     );
     "match - no match", (fun _ ->
       Eq(None, "banana" |. Js.String2.match_ [%re "/nanana+/g"])
     );
+    "match - not found capture groups", (fun _ ->
+      Eq(Some [| Some "hello "; None |], "hello word" |. Js.String2.match_ [%re "/hello (world)?/"] |. Belt.Option.map Js.Array.copy )
+    );
 
     (* es2015 *)
     "normalize", (fun _ ->