Unboxed variants stdlib types (#6218)

Author: zth

CHANGELOG.md

@@ -20,6 +20,7 @@
 
 - Add location information to duplicate type definition error messages. https://github.com/rescript-lang/rescript-compiler/pull/6199
 - Replace normal module errors with Super_error module, and clean up Super_error. https://github.com/rescript-lang/rescript-compiler/pull/6199
+- `Js.Json.t`, `Js.null` and `Js.nullable` are now untagged variants representing their runtime values, instead of abstract types. https://github.com/rescript-lang/rescript-compiler/pull/6218
 
 # 11.0.0-alpha.5
 

jscomp/others/js.ml

@@ -86,7 +86,10 @@ end
 
 (**/**)
 
-type +'a null
+type +'a null =
+  | Value of 'a
+  | Null [@as null]
+[@@unboxed]
 (**
   Nullable value of this type can be either null or 'a. This type is equivalent to Js.Null.t.
 *)
@@ -96,7 +99,12 @@ type +'a undefined
   A value of this type can be either undefined or 'a. This type is equivalent to Js.Undefined.t.
 *)
 
-type +'a nullable
+type +'a nullable =
+  | Value of 'a
+  | Null [@as null]
+  | Undefined [@as undefined]
+[@@unboxed]
+
 (**
   A value of this type can be undefined, null or 'a. This type is equivalent to Js.Null_undefined.t.
 *)

jscomp/others/js_json.ml

@@ -24,7 +24,15 @@
 
 (** Efficient JSON encoding using JavaScript API *)
 
-type t
+type t =
+  | False [@as false]
+  | True [@as true]
+  | Null [@as null]
+  | String of string
+  | Number of float
+  | Object of t Js.Dict.t
+  | Array of t array
+[@@unboxed]
 
 type _ kind =
   | String : Js_string.t kind

jscomp/others/js_json.mli

@@ -30,7 +30,15 @@
 
 (** ## Types *)
 
-type t
+type t =
+  | False [@as false]
+  | True [@as true]
+  | Null [@as null]
+  | String of string
+  | Number of float
+  | Object of t Js.Dict.t
+  | Array of t array
+[@@unboxed]
 (** The JSON data structure *)
 
 (** Underlying type of a JSON value *)

jscomp/others/js_null.ml

@@ -25,7 +25,10 @@
 (** Provides functionality for dealing with the `'a Js.null` type *)
 
 
-type + 'a t = 'a Js.null
+type + 'a t = 'a Js.null =
+  | Value of 'a
+  | Null [@as null]
+[@@unboxed]
 
 external to_opt : 'a t -> 'a option = "#null_to_opt"
 external toOption : 'a t -> 'a option = "#null_to_opt"

jscomp/others/js_null.mli

@@ -26,7 +26,10 @@
 
 (** Provides functionality for dealing with the `Js.null('a)` type *)
 
-type +'a t = 'a Js.null
+type +'a t = 'a Js.null =
+  | Value of 'a
+  | Null [@as null]
+[@@unboxed]
 (** Local alias for `Js.null('a)` *)
 
 external return : 'a -> 'a t = "%identity"

jscomp/others/js_null_undefined.ml

@@ -24,7 +24,12 @@
 
 (** Contains functionality for dealing with values that can be both `null` and `undefined` *)
 
-type + 'a t = 'a Js.nullable
+type + 'a t = 'a Js.nullable = 
+  | Value of 'a
+  | Null [@as null]
+  | Undefined [@as undefined]
+[@@unboxed]
+
 external toOption : 'a t -> 'a option = "#nullable_to_opt"
 external to_opt : 'a t -> 'a option = "#nullable_to_opt"
 external return : 'a -> 'a t = "%identity"

jscomp/others/js_null_undefined.mli

@@ -24,7 +24,11 @@
 
 (** Contains functionality for dealing with values that can be both `null` and `undefined` *)
 
-type +'a t = 'a Js.null_undefined
+type +'a t = 'a Js.nullable = 
+  | Value of 'a
+  | Null [@as null]
+  | Undefined [@as undefined]
+[@@unboxed]
 (** Local alias for `Js.null_undefined('a)`. *)
 
 external return : 'a -> 'a t = "%identity"

jscomp/others/release.ninja

@@ -32,7 +32,7 @@ o others/js_float.cmi others/js_float.cmj : cc others/js_float.ml | others/belt_
 o others/js_global.cmi others/js_global.cmj : cc others/js_global.ml | others/belt_internals.cmi others/js.cmi $bsc
 o others/js_int.cmi others/js_int.cmj : cc others/js_int.ml | others/belt_internals.cmi others/js.cmi $bsc
 o others/js_json.cmj : cc_cmi others/js_json.ml | others/belt_internals.cmi others/js.cmi others/js.cmj others/js_array2.cmj others/js_dict.cmj others/js_json.cmi others/js_string.cmj others/js_types.cmj $bsc
-o others/js_json.cmi : cc others/js_json.mli | others/belt_internals.cmi others/js.cmi others/js_dict.cmi others/js_null.cmi others/js_string.cmj others/js_types.cmi $bsc
+o others/js_json.cmi : cc others/js_json.mli | others/belt_internals.cmi others/js.cmi others/js.cmj others/js_dict.cmi others/js_null.cmi others/js_string.cmj others/js_types.cmi $bsc
 o others/js_list.cmj : cc_cmi others/js_list.ml | others/belt_internals.cmi others/js.cmi others/js_array2.cmj others/js_list.cmi others/js_vector.cmj $bsc
 o others/js_list.cmi : cc others/js_list.mli | others/belt_internals.cmi others/js.cmi $bsc
 o others/js_map.cmi others/js_map.cmj : cc others/js_map.ml | others/belt_internals.cmi others/js.cmi $bsc

jscomp/runtime/js.ml

@@ -57,7 +57,10 @@ end
 (**/**)
 
 
-type + 'a null
+type + 'a null =
+  | Value of 'a
+  | Null [@as null]
+[@@unboxed]
 (** nullable, value of this type can be either [null] or ['a]
     this type is the same as type [t] in {!Null}
 *)
@@ -66,7 +69,11 @@ type + 'a undefined
 (** value of this type can be either [undefined] or ['a]
     this type is the same as type [t] in {!Undefined}  *)
 
-type + 'a nullable
+type + 'a nullable =
+  | Value of 'a
+  | Null [@as null]
+  | Undefined [@as undefined]
+[@@unboxed]
 (** value of this type can be [undefined], [null] or ['a]
     this type is the same as type [t] n {!Null_undefined} *)