js: classify bigint type correctly

Author: cometkim

jscomp/main/builtin_cmi_datasets.ml

@@ -27,6 +27,9 @@
 type symbol
 (** Js symbol type only available in ES6 *)
 
+type bigint_val
+(** Js bigint type only available in ES2020 *)
+
 type obj_val
 type undefined_val
 (** This type has only one value `undefined` *)
@@ -45,6 +48,7 @@ type _ t =
   | Function : function_val t
   | Object : obj_val t
   | Symbol : symbol t
+  | BigInt : bigint_val t
 
 
 
@@ -58,6 +62,7 @@ type tagged_t =
   | JSFunction of function_val
   | JSObject of obj_val
   | JSSymbol of symbol
+  | JSBigInt of bigint_val
 
 let classify (x : 'a) : tagged_t =
   let ty = Js.typeof x in
@@ -66,7 +71,7 @@ let classify (x : 'a) : tagged_t =
   if x == (Obj.magic Js_null.empty)  then
     JSNull else
   if ty = "number" then
-    JSNumber (Obj.magic x ) else
+    JSNumber (Obj.magic x) else
   if ty = "string" then
     JSString (Obj.magic x) else
   if ty = "boolean" then
@@ -75,9 +80,11 @@ let classify (x : 'a) : tagged_t =
   if ty = "function" then
     JSFunction (Obj.magic x) else
   if ty = "object" then
-    JSObject (Obj.magic x)
-  else
+    JSObject (Obj.magic x) else
+  if ty = "symbol" then
     JSSymbol (Obj.magic x)
+  else
+    JSBigInt (Obj.magic x)
 
 
 let test (type a) (x : 'a) (v : a t) : bool =
@@ -105,5 +112,7 @@ let test (type a) (x : 'a) (v : a t) : bool =
     Js.typeof x = "object"
   | Symbol
     ->
-     Js.typeof x = "symbol"
-
+    Js.typeof x = "symbol"
+  | BigInt
+    ->
+    Js.typeof x = "bigint"

jscomp/main/builtin_cmj_datasets.ml

@@ -28,6 +28,9 @@
 type symbol
 (** Js symbol type only available in ES6 *)
 
+type bigint_val
+(** Js bigint type only available in ES2020 *)
+
 type obj_val
 type undefined_val
 (** This type has only one value `undefined` *)
@@ -46,6 +49,7 @@ type _ t =
   | Function : function_val t
   | Object : obj_val t
   | Symbol : symbol t
+  | BigInt : bigint_val t
 
 
 val test : 'a -> 'b t -> bool
@@ -66,6 +70,7 @@ type tagged_t =
   | JSFunction of function_val
   | JSObject of obj_val
   | JSSymbol of symbol
+  | JSBigInt of bigint_val
 
 
 val classify : 'a -> tagged_t

jscomp/others/js_types.ml

@@ -10,7 +10,8 @@ let string_or_number (type t) x =
   | JSFalse | JSTrue -> false
   | JSFunction _ -> Js.log ("Function"); false
   | JSObject _ ->  false
-  | JSSymbol _ ->  false 
+  | JSSymbol _ ->  false
+  | JSBigInt _ ->  false
 
 let suites = Mt.[
     "int_type", (fun _ -> Eq(Js.typeof 3, "number") );

jscomp/others/js_types.mli

@@ -33,11 +33,16 @@ function classify(x) {
             TAG: /* JSObject */3,
             _0: x
           };
-  } else {
+  } else if (ty === "symbol") {
     return {
             TAG: /* JSSymbol */4,
             _0: x
           };
+  } else {
+    return {
+            TAG: /* JSBigInt */5,
+            _0: x
+          };
   }
 }
 
@@ -59,6 +64,8 @@ function test(x, v) {
         return typeof x === "object";
     case /* Symbol */7 :
         return typeof x === "symbol";
+    case /* BigInt */8 :
+        return typeof x === "bigint";
 
   }
 }

jscomp/test/typeof_test.ml

@@ -33,11 +33,16 @@ function classify(x) {
             TAG: /* JSObject */3,
             _0: x
           };
-  } else {
+  } else if (ty === "symbol") {
     return {
             TAG: /* JSSymbol */4,
             _0: x
           };
+  } else {
+    return {
+            TAG: /* JSBigInt */5,
+            _0: x
+          };
   }
 }
 
@@ -59,6 +64,8 @@ function test(x, v) {
         return typeof x === "object";
     case /* Symbol */7 :
         return typeof x === "symbol";
+    case /* BigInt */8 :
+        return typeof x === "bigint";
 
   }
 }