add more instanceof backed type

Author: zth

jscomp/ml/ast_untagged_variants.ml

@@ -1,6 +1,10 @@
 module Instance = struct
-  type t = Array | Promise
-  let to_string = function Array -> "Array" | Promise -> "Promise"
+  type t = Array | Promise | Date | RegExp
+  let to_string = function 
+      Array -> "Array" 
+    | Promise -> "Promise" 
+    | Date -> "Date" 
+    | RegExp -> "RegExp"
 end
 
 type untaggedError =
@@ -126,9 +130,20 @@ let type_is_builtin_object (t : Types.type_expr) =
   match t.desc with
   | Tconstr (path, _, _) ->
     let name = Path.name path in
-    name = "Js.Dict.t" || name = "Js_dict.t" || name = "Js.Re.t" || name = "RescriptCore.Re.t"
+    name = "Js.Dict.t" || name = "Js_dict.t"
   | _ -> false
 
+let type_to_instanceof_backed_obj (t : Types.type_expr) =
+  match t.desc with
+  | Tconstr (path, _, _) -> (
+    match Path.name path with
+    | "Js.Date.t" -> Some(Instance.Date)
+    | "Js.Re.t" | "RescriptCore.Re.t" -> 
+      (* TODO: Get rid of explicit Core by digging through aliases *) 
+      Some(RegExp)
+    | _ -> None)
+  | _ -> None
+
 let get_block_type ~env (cstr : Types.constructor_declaration) :
     block_type option =
   match (process_untagged cstr.cd_attributes, cstr.cd_args) with
@@ -158,6 +173,11 @@ let get_block_type ~env (cstr : Types.constructor_declaration) :
   | true, Cstr_tuple [({desc = Tconstr _} as t)] when type_is_builtin_object t
     ->
     Some ObjectType
+  | true, Cstr_tuple [({desc = Tconstr _} as t)] when type_to_instanceof_backed_obj t |> Option.is_some
+    ->
+    (match type_to_instanceof_backed_obj t with 
+    | None -> None 
+    | Some instanceType -> Some (InstanceType instanceType))
   | true, Cstr_tuple [ty] -> (
     let default = Some UnknownType in
     match !extract_concrete_typedecl env ty with

jscomp/test/UntaggedVariants.js

@@ -383,3 +383,28 @@ module Arr = {
     | TestInt => Js.log(12)
     }
 }
+
+module AllInstanceofTypes = {
+  type record = {userName: string}
+
+  @unboxed
+  type t =
+    | String(string)
+    | Array(array<string>)
+    | Promise(promise<string>)
+    | Object(record)
+    | Date(Js.Date.t)
+    | RegExp(Js.Re.t)
+    | BigInt(Js.Bigint.t)
+
+  let classifyAll = async (t: t) =>
+    switch t {
+    | String(s) => Js.log(s)
+    | Promise(p) => Js.log(await p)
+    | Object({userName}) => Js.log(userName)
+    | Date(date) => Js.log(date->Js.Date.toString)
+    | RegExp(re) => Js.log(re->Js.Re.test_("test"))
+    | BigInt(i) => Js.log(Js.String.make(i))
+    | Array(arr) => Js.log(arr->Belt.Array.joinWith("-"))
+    }
+}