feat: remove Belt dependency from Stdlib (#796)

* feat: remove `Belt` dependency from Stdlib

* chore: add changelog entry

* fix: test

* fix runtime tests

Changes.md

@@ -1,3 +1,10 @@
+Unreleased
+---------------
+
+- Remove `Belt` as a dependency of `Stdlib`
+  ([#796](https://github.com/melange-re/melange/pull/796))
+
+
 2.1.0 2023-10-22
 ---------------
 

jscomp/others/belt_Result.ml

@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-type ('a, 'b) t = Ok of 'a | Error of 'b
+type ('a, 'b) t = ('a, 'b) Stdlib.result = Ok of 'a | Error of 'b
 
 let getExn = function Ok x -> x | Error _ -> raise Not_found
 

jscomp/others/belt_Result.mli

@@ -41,7 +41,7 @@
   ]}
 *)
 
-type ('a, 'b) t = Ok of 'a | Error of 'b
+type ('a, 'b) t = ('a, 'b) Stdlib.result = Ok of 'a | Error of 'b
 
 val getExn : ('a, 'b) t -> 'a
 (**

jscomp/others/dune

@@ -4,7 +4,7 @@
  (public_name melange.belt)
  (preprocess
   (pps melange.ppx -unsafe))
- (libraries melange.js)
+ (libraries melange)
  (modules
   :standard
   \

jscomp/stdlib/camlinternalOO.cppo.ml

@@ -96,26 +96,14 @@ let public_method_label s : tag =
 (**** Sparse array ****)
 
 module Vars =
-#ifdef BS
-  Belt.Map.String
-#else
   Map.Make(struct type t = string let compare (x:t) y = compare x y end)
-#endif
 type vars = int Vars.t
 
 module Meths =
-#ifdef BS
-  Belt.Map.String
-#else
   Map.Make(struct type t = string let compare (x:t) y = compare x y end)
-#endif
 type meths = label Meths.t
 module Labs =
-#ifdef BS
-  Belt.Map.Int
-#else
   Map.Make(struct type t = label let compare (x:t) y = compare x y end)
-#endif
 type labs = bool Labs.t
 
 (* The compiler assumes that the first field of this structure is [size]. *)
@@ -196,36 +184,21 @@ let new_method table =
   index
 
 let get_method_label table name =
-#ifdef BS
-    match Js.undefinedToOption (Meths.getUndefined table.methods_by_name name)
-    with
-    | Some x -> x
-    | None ->
-      let label = new_method table in
-      table.methods_by_name <- Meths.set  table.methods_by_name name label;
-      table.methods_by_label <- Labs.set  table.methods_by_label label true;
-      label
-#else
   try
     Meths.find name table.methods_by_name
   with Not_found ->
     let label = new_method table in
     table.methods_by_name <- Meths.add name label table.methods_by_name;
     table.methods_by_label <- Labs.add label true table.methods_by_label;
     label
-#endif
 
 let get_method_labels table names =
   Array.map (get_method_label table) names
 
 let set_method table label element =
   incr method_count;
   if
-#ifdef BS
-    Labs.getExn table.methods_by_label label
-#else
   Labs.find label table.methods_by_label
-#endif
   then
     put table label element
   else
@@ -249,31 +222,12 @@ let narrow table vars virt_meths concr_meths =
       table.vars, virt_meth_labs, vars)
      :: table.previous_states;
   table.vars <-
-#ifdef BS
-     Vars.reduceU table.vars Vars.empty
-      (fun[@u] tvars lab info  ->
-        if List.mem lab vars then Vars.set tvars lab info  else tvars);
-#else
     Vars.fold
       (fun lab info tvars ->
         if List.mem lab vars then Vars.add lab info tvars else tvars)
       table.vars Vars.empty;
-#endif
   let by_name = ref Meths.empty in
   let by_label = ref Labs.empty in
-#ifdef BS
-  List.iter2 (fun met label ->
-     by_name := Meths.set !by_name met label;
-     by_label :=
-          Labs.set !by_label label
-            (Labs.getWithDefault table.methods_by_label label true)
-  ) concr_meths concr_meth_labs;
-  List.iter2
-    (fun met label ->
-      by_name := Meths.set !by_name met label;
-      by_label := Labs.set !by_label label false;
-    ) virt_meths virt_meth_labs;
-#else
   List.iter2
     (fun met label ->
        by_name := Meths.add met label !by_name;
@@ -287,7 +241,6 @@ let narrow table vars virt_meths concr_meths =
        by_name := Meths.add met label !by_name;
        by_label := Labs.add label false !by_label)
     virt_meths virt_meth_labs;
-#endif
   table.methods_by_name <- !by_name;
   table.methods_by_label <- !by_label;
   table.hidden_meths <-
@@ -304,11 +257,7 @@ let widen table =
   table.previous_states <- List.tl table.previous_states;
   table.vars <-
      List.fold_left
-#ifdef BS
-       (fun s v -> Vars.set s v (Vars.getExn table.vars v))
-#else
        (fun s v -> Vars.add v (Vars.find v table.vars) s)
-#endif
        saved_vars vars;
   table.methods_by_name <- by_name;
   table.methods_by_label <- by_label;
@@ -325,20 +274,11 @@ let new_slot table =
   index
 
 let new_variable table name =
-#ifdef BS
-    match Js.undefinedToOption (Vars.getUndefined table.vars name : int Js.undefined)  with
-    | Some x -> x
-    | None ->
-      let index = new_slot table in
-      if name <> "" then table.vars <- Vars.set table.vars name index ;
-      index
-#else
   try Vars.find name table.vars
   with Not_found ->
     let index = new_slot table in
     if name <> "" then table.vars <- Vars.add name index table.vars;
     index
-#endif
 
 let to_array arr =
   if arr = Obj.magic 0 then [||] else arr
@@ -357,11 +297,7 @@ let new_methods_variables table meths vals =
 
 let get_variable table name =
   try
-#ifdef BS
-    (Vars.getExn table.vars name)
-#else
     Vars.find name table.vars
-#endif
   with Not_found -> assert false
 
 let get_variables table names =
@@ -389,13 +325,8 @@ let create_table public_methods =
   Array.iteri
     (fun i met ->
       let lab = i*2+2 in
-#ifdef BS
-      table.methods_by_name  <- Meths.set table.methods_by_name met lab ;
-      table.methods_by_label <- Labs.set table.methods_by_label lab true )
-#else
       table.methods_by_name  <- Meths.add met lab table.methods_by_name;
       table.methods_by_label <- Labs.add lab true table.methods_by_label)
-#endif
     public_methods;
   table
 

jscomp/stdlib/dune

@@ -32,7 +32,7 @@
  (modes melange)
  (preprocess
   (pps melange.ppx))
- (libraries melange.js melange.belt)
+ (libraries melange.js)
  (stdlib
   (modules_before_stdlib CamlinternalFormatBasics CamlinternalAtomic)
   (internal_modules Camlinternal*))

jscomp/stdlib/stdlib.cppo.ml

@@ -324,7 +324,7 @@ external decr : int ref -> unit = "%decr"
 
 (* Result type *)
 
-type ('a,'b) result = ('a, 'b) Belt.Result.t = Ok of 'a | Error of 'b
+type ('a,'b) result = Ok of 'a | Error of 'b
 
 (* String conversion functions *)
 

jscomp/stdlib/stdlib.cppo.mli

@@ -1382,7 +1382,7 @@ external decr : int ref -> unit = "%decr"
 (** {1 Result type} *)
 
 (** @since 4.03 *)
-type ('a,'b) result = ('a, 'b) Belt.Result.t = Ok of 'a | Error of 'b
+type ('a,'b) result = Ok of 'a | Error of 'b
 
 (** {1 Operations on format strings} *)
 

jscomp/test/dune

@@ -11,7 +11,7 @@
 (library
  (name melange_runtime_tests)
  (modes melange)
- (libraries test_runner melange.dom)
+ (libraries test_runner melange.dom melange.belt)
  (wrapped false)
  (preprocess
   (pps melange.ppx))
@@ -29,7 +29,7 @@
  (library
   (name melange_tests_re_res)
   (modes melange)
-  (libraries test_runner melange.dom)
+  (libraries test_runner melange.dom melange.belt)
   (wrapped false)
   (preprocess
    (pps melange.ppx reason-react-ppx))

test/blackbox-tests/belt-and-runtime.t

@@ -17,7 +17,7 @@ Try commonjs first
   > (melange.emit
   >  (target melange)
   >  (alias melange)
-  >  (libraries melange)
+  >  (libraries melange melange.belt)
   >  (emit_stdlib false)
   >  (module_systems commonjs))
   > EOF
@@ -35,7 +35,7 @@ Now es6
   > (melange.emit
   >  (target melange)
   >  (alias melange)
-  >  (libraries melange)
+  >  (libraries melange melange.belt)
   >  (emit_stdlib false)
   >  (module_systems es6))
   > EOF