classify js bigint type correctly

Changes.md

@@ -6,6 +6,7 @@
 
 - Add support for `@new @variadic` (see https://github.com/rescript-lang/rescript-compiler/pull/5364)
 - New records with `@optional` fields [#5423](https://github.com/rescript-lang/rescript-compiler/pull/5423) [#5452](https://github.com/rescript-lang/rescript-compiler/issues/5452)
+- Classify bigint correctly [#5351](https://github.com/rescript-lang/rescript-compiler/pull/5351)
 
 **Syntax**
 

jscomp/others/js_types.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,18 +71,20 @@ 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 = "bigint" then
+    JSBigInt (Obj.magic x) else
   if ty = "string" then
     JSString (Obj.magic x) else
   if ty = "boolean" then
-    if (Obj.magic x) =  true then JSTrue
+    if (Obj.magic x) = true then JSTrue
     else JSFalse else
+  if ty = "symbol" then
+    JSSymbol (Obj.magic x) else
   if ty = "function" then
-    JSFunction (Obj.magic x) else
-  if ty = "object" then
-    JSObject (Obj.magic x)
+    JSFunction (Obj.magic x)
   else
-    JSSymbol (Obj.magic x)
+    JSObject (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/others/js_types.mli

@@ -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
@@ -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
 (**
@@ -69,5 +73,6 @@ type tagged_t =
   | JSFunction of function_val
   | JSObject of obj_val
   | JSSymbol of symbol
+  | JSBigInt of bigint_val
 
 val classify : 'a -> tagged_t

jscomp/test/typeof_test.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") );

lib/4.06.1/rescript.ml

@@ -5492,10 +5492,8 @@ end = struct
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-let version = "10.0.0"
-
+let version = "10.0.0-beta.1"
 let header = "// Generated by ReScript, PLEASE EDIT WITH CARE"
-
 let package_name = ref "rescript"
 
 end

lib/es6/js_types.js

@@ -12,6 +12,11 @@ function classify(x) {
             TAG: /* JSNumber */0,
             _0: x
           };
+  } else if (ty === "bigint") {
+    return {
+            TAG: /* JSBigInt */5,
+            _0: x
+          };
   } else if (ty === "string") {
     return {
             TAG: /* JSString */1,
@@ -23,19 +28,19 @@ function classify(x) {
     } else {
       return /* JSFalse */0;
     }
-  } else if (ty === "function") {
+  } else if (ty === "symbol") {
     return {
-            TAG: /* JSFunction */2,
+            TAG: /* JSSymbol */4,
             _0: x
           };
-  } else if (ty === "object") {
+  } else if (ty === "function") {
     return {
-            TAG: /* JSObject */3,
+            TAG: /* JSFunction */2,
             _0: x
           };
   } else {
     return {
-            TAG: /* JSSymbol */4,
+            TAG: /* JSObject */3,
             _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";
 
   }
 }

lib/js/js_types.js

@@ -12,6 +12,11 @@ function classify(x) {
             TAG: /* JSNumber */0,
             _0: x
           };
+  } else if (ty === "bigint") {
+    return {
+            TAG: /* JSBigInt */5,
+            _0: x
+          };
   } else if (ty === "string") {
     return {
             TAG: /* JSString */1,
@@ -23,19 +28,19 @@ function classify(x) {
     } else {
       return /* JSFalse */0;
     }
-  } else if (ty === "function") {
+  } else if (ty === "symbol") {
     return {
-            TAG: /* JSFunction */2,
+            TAG: /* JSSymbol */4,
             _0: x
           };
-  } else if (ty === "object") {
+  } else if (ty === "function") {
     return {
-            TAG: /* JSObject */3,
+            TAG: /* JSFunction */2,
             _0: x
           };
   } else {
     return {
-            TAG: /* JSSymbol */4,
+            TAG: /* JSObject */3,
             _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";
 
   }
 }