Merge pull request #2742 from cristianoc/deprecate_js_boolean

Deprecate type Js.boolean

Author: bobzhang

jscomp/others/js_boolean.ml

@@ -24,5 +24,5 @@
 
 (** Contains functions for dealing with JavaScript booleans *)
 
-external to_js_boolean : bool -> Js.boolean = "%identity"
+external to_js_boolean : bool -> bool = "%identity"
 

jscomp/others/js_boolean.mli

@@ -24,5 +24,5 @@
 
 (** Contains functions for dealing with JavaScript booleans *)
 
-external to_js_boolean : bool -> Js.boolean = "%identity"
+external to_js_boolean : bool -> bool = "%identity"
 [@@ocaml.deprecated "This function is not needed any more"]

jscomp/others/js_json.ml

@@ -31,7 +31,7 @@ type _ kind =
   | Number : float kind 
   | Object : t Js_dict.t kind 
   | Array : t array kind 
-  | Boolean : Js.boolean kind
+  | Boolean : bool kind
   | Null : Js_types.null_val kind
 
 
@@ -94,7 +94,7 @@ let decodeArray json =
 
 let decodeBoolean json = 
   if Js.typeof json = "boolean"
-  then Some (Obj.magic (json:t) : Js.boolean)
+  then Some (Obj.magic (json:t) : bool)
   else None 
 
 let decodeNull json = 
@@ -115,15 +115,15 @@ external stringifyAny : 'a -> string option =
 external null : t = "" [@@bs.val]
 external string : string -> t = "%identity"
 external number : float -> t = "%identity"
-external boolean : Js.boolean -> t = "%identity" 
+external boolean : bool -> t = "%identity" 
 external object_ : t Js_dict.t -> t = "%identity"
 
 external array_ : t array -> t = "%identity"
 
 external array : t array -> t = "%identity"
 external stringArray : string array -> t = "%identity"
 external numberArray : float array -> t = "%identity"
-external booleanArray : Js.boolean array -> t = "%identity"
+external booleanArray : bool array -> t = "%identity"
 external objectArray : t Js_dict.t array -> t = "%identity"
 external stringify: t -> string = "stringify" 
   [@@bs.val] [@@bs.scope "JSON"]

jscomp/others/js_json.mli

@@ -38,7 +38,7 @@ type _ kind =
   | Number : float kind 
   | Object : t Js_dict.t kind 
   | Array : t array kind 
-  | Boolean : Js.boolean kind
+  | Boolean : bool kind
   | Null : Js_types.null_val kind
 
 type tagged_t = 
@@ -75,7 +75,7 @@ val decodeArray : t -> t array option
 (** [decodeArray json] returns [Some a] if [json] is an array, [None]
     otherwise *)
 
-val decodeBoolean : t -> Js.boolean option
+val decodeBoolean : t -> bool option
 (** [decodeBoolean json] returns [Some b] if [json] is a boolean, [None]
     otherwise *)
 
@@ -98,8 +98,8 @@ external string : string -> t = "%identity"
 external number : float -> t = "%identity"
 (** [number n] makes a JSON number of the [float] [n] *)
 
-external boolean : Js.boolean -> t = "%identity" 
-(** [boolean b] makes a JSON boolean of the [Js.boolean] [b] *)
+external boolean : bool -> t = "%identity" 
+(** [boolean b] makes a JSON boolean of the [bool] [b] *)
 
 external object_ : t Js_dict.t -> t = "%identity"
 (** [object_ dict] makes a JSON objet of the [Js.Dict.t] [dict] *)
@@ -118,8 +118,8 @@ external stringArray : string array -> t = "%identity"
 external numberArray : float array -> t = "%identity"
 (** [numberArray a] makes a JSON array of the [float array] [a] *)
 
-external booleanArray : Js.boolean array -> t = "%identity"
-(** [booleanArray] makes a JSON array of the [Js.boolean array] [a] *)
+external booleanArray : bool array -> t = "%identity"
+(** [booleanArray] makes a JSON array of the [bool array] [a] *)
 
 external objectArray : t Js_dict.t array -> t = "%identity"
 (** [objectArray a] makes a JSON array of the [JsDict.t array] [a] *)

jscomp/others/js_types.ml

@@ -37,7 +37,7 @@ type function_val
 type _ t = 
   | Undefined :  undefined_val t
   | Null : null_val t
-  | Boolean : Js.boolean t
+  | Boolean : bool t
   | Number : float t
   | String : string t
   | Function : function_val t

jscomp/others/js_types.mli

@@ -38,7 +38,7 @@ type function_val
 type _ t =
   | Undefined :  undefined_val t
   | Null : null_val t
-  | Boolean : Js.boolean t
+  | Boolean : bool t
   | Number : float t
   | String : string t
   | Function : function_val t

jscomp/others/node.ml

@@ -45,7 +45,7 @@ type node_module = <
 
        filename : string ;       
 
-       loaded : Js.boolean;
+       loaded : bool;
        children : node_module array ;
        paths : string array;       
 > Js.t

jscomp/others/node_fs.ml

@@ -47,8 +47,8 @@ module Watch = struct
   type t
   type config 
   external config :
-    ?persistent:Js.boolean ->
-    ?recursive:Js.boolean -> 
+    ?persistent: bool ->
+    ?recursive: bool -> 
     ?encoding: Js_string.t -> 
     unit -> config = 
     "" [@@bs.obj]

jscomp/runtime/caml_basic.mli

@@ -27,7 +27,7 @@
 
 val none : 'a option
 val some : 'a -> 'a option
-val is_none : 'a option -> Js.boolean
+val is_none : 'a option -> bool
 val to_def : 'a option -> 'a Js_undefined.t
 val cons : 'a -> 'a list -> 'a list
-val is_list_empty : 'a list -> Js.boolean
+val is_list_empty : 'a list -> bool

jscomp/runtime/js.mli

@@ -83,6 +83,7 @@ external test : 'a nullable -> bool = "#is_nil_undef"
 external testAny : 'a -> bool = "#is_nil_undef"
 
 type boolean = bool
+[@@ocaml.deprecated "Use type bool instead"]
 (** The value could be either  {!Js.true_} or {!Js.false_}.
      Note in BuckleScript, [boolean] has different representation from OCaml's [bool],
      see conversion functions in {!Boolean} *)
@@ -93,10 +94,10 @@ type (+'a, +'e) promise
 *)
 
 
-val true_ : boolean
+val true_ : bool
 [@@ocaml.deprecated "Use true directly"]
 
-val false_ : boolean
+val false_ : bool
 [@@ocaml.deprecated "Use false directly"]
 
 external null : 'a null = "#null" 
@@ -106,7 +107,8 @@ external undefined : 'a undefined = "#undefined"
 (** The same as  [empty] {!Js.Undefined} will be compiled as [undefined]*)
 
 
-external to_bool : boolean -> bool = "%identity"
+external to_bool : bool -> bool = "%identity"
+[@@ocaml.deprecated "This function is not needed any more"]
 (** convert Js boolean to OCaml bool *)
 
 external typeof : 'a -> string = "#typeof"