Switch to jsoo_refmt_main build target

This will restore the original `jsoo_main.ml` and introduce an
enhanced `jsoo_refmt_main` with the `Refmt_Api` dependency built in.

Also adds a rule to `jscomp/snapshot.ninja` to build bytecode for the
new `jsoo_refmt_main.ml` file, so we can `repl.js` it into a
bundle file.

`repl.js` will build the new jsoo_refmt_main bytecode target instead.

Author: ryyppy

jscomp/main/jsoo_main.ml

@@ -56,22 +56,6 @@ end
      *    type: "error" // or "warning" or "info"
      *  }
 *)
-let mk_js_error loc msg = 
-  let (file,line,startchar) = Location.get_pos_info loc.Location.loc_start in
-  let (file,endline,endchar) = Location.get_pos_info loc.Location.loc_end in
-  Js.Unsafe.(obj
-      [|
-        "js_error_msg",
-          inject @@ Js.string (Printf.sprintf "Line %d, %d:\n  %s"  line startchar msg);
-            "row"    , inject (line - 1);
-            "column" , inject startchar;
-            "endRow" , inject (endline - 1);
-            "endColumn" , inject endchar;
-            "text" , inject @@ Js.string msg;
-            "type" , inject @@ Js.string "error"
-      |]
-    )
-
 let () =  
   Bs_conditional_initial.setup_env ();
   Clflags.binary_annotations := false
@@ -88,7 +72,7 @@ let error_of_exn e =
 
 type react_ppx_version = V2 | V3
 
-let implementation ~use_super_errors ?(react_ppx_version=V3) ?prefix impl str  : Js.Unsafe.obj =
+let implementation ~use_super_errors ?(react_ppx_version=V3) prefix impl str  : Js.Unsafe.obj =
   let modulename = "Test" in
   (* let env = !Toploop.toplevel_env in *)
   (* Compmisc.init_path false; *)
@@ -107,10 +91,9 @@ let implementation ~use_super_errors ?(react_ppx_version=V3) ?prefix impl str  :
   Warnings.parse_options false Bsb_warning.default_warning;
 
   try
-    let code = match prefix with
-      | None -> str
-      | Some(prefix) -> prefix ^ str in
-    let ast = impl (Lexing.from_string code) in
+    let ast = impl 
+      (Lexing.from_string
+        (if prefix then "[@@@bs.config{no_export}]\n#1 \"repl.ml\"\n"  ^ str else str )) in 
     let ast = match react_ppx_version with
     | V2 -> Reactjs_jsx_ppx_v2.rewrite_implementation ast
     | V3 -> Reactjs_jsx_ppx_v3.rewrite_implementation ast in 
@@ -141,29 +124,38 @@ let implementation ~use_super_errors ?(react_ppx_version=V3) ?prefix impl str  :
       (* Format.fprintf output_ppf {| { "js_code" : %S }|} v ) *)
   with
   | e ->
-      begin match error_of_exn e with
+      begin match error_of_exn  e with
       | Some error ->
-        Location.report_error Format.err_formatter  error;
-        mk_js_error error.loc error.msg
+          Location.report_error Format.err_formatter  error;
+          let (file,line,startchar) = Location.get_pos_info error.loc.loc_start in
+          let (file,endline,endchar) = Location.get_pos_info error.loc.loc_end in
+          Js.Unsafe.(obj
+          [|
+            "js_error_msg",
+              inject @@ Js.string (Printf.sprintf "Line %d, %d:\n  %s"  line startchar error.msg);
+               "row"    , inject (line - 1);
+               "column" , inject startchar;
+               "endRow" , inject (endline - 1);
+               "endColumn" , inject endchar;
+               "text" , inject @@ Js.string error.msg;
+               "type" , inject @@ Js.string "error"
+          |]
+          );
+
       | None ->
-        let msg = Printexc.to_string e in
-        match e with
-        | Refmt_api.Migrate_parsetree.Def.Migration_error (_,loc)
-        | Refmt_api.Reason_errors.Reason_error (_,loc) ->
-          mk_js_error loc msg
-        | _ -> 
-          Js.Unsafe.(obj [|
-            "js_error_msg" , inject @@ Js.string msg;
-            "type" , inject @@ Js.string "error"
-          |])
+        Js.Unsafe.(obj [|
+        "js_error_msg" , inject @@ Js.string (Printexc.to_string e)
+        |])
+
       end
 
 
 let compile impl ~use_super_errors ?react_ppx_version =
-    implementation ~use_super_errors ?react_ppx_version impl
+    implementation ~use_super_errors ?react_ppx_version false impl
 
-let shake_compile impl ~use_super_errors ?react_ppx_version prefix =
-   implementation ~use_super_errors ?react_ppx_version ~prefix impl
+(** TODO: add `[@@bs.config{no_export}]\n# 1 "repl.ml"`*)
+let shake_compile impl ~use_super_errors ?react_ppx_version =
+   implementation ~use_super_errors ?react_ppx_version true impl
 
 
 
@@ -188,12 +180,7 @@ let dir_directory d =
 let () =
   dir_directory "/static/cmis"
 
-module Converter = Refmt_api.Migrate_parsetree.Convert(Refmt_api.Migrate_parsetree.OCaml_404)(Refmt_api.Migrate_parsetree.OCaml_406)
-
-let reason_parse lexbuf = 
-  Refmt_api.Reason_toolchain.RE.implementation lexbuf |> Converter.copy_structure;;
-
-let make_compiler name impl prefix =
+let make_compiler name impl =
   export name
     (Js.Unsafe.(obj
                   [|"compile",
@@ -205,7 +192,7 @@ let make_compiler name impl prefix =
                     inject @@
                     Js.wrap_meth_callback
                       (fun _ code ->
-                         (shake_compile impl ~use_super_errors:false (Js.to_string code) prefix));
+                         (shake_compile impl ~use_super_errors:false (Js.to_string code)));
                     "compile_super_errors",
                     inject @@
                     Js.wrap_meth_callback
@@ -224,8 +211,8 @@ let make_compiler name impl prefix =
                     "shake_compile_super_errors",
                     inject @@
                     Js.wrap_meth_callback
-                      (fun _ code -> (shake_compile impl ~use_super_errors:true (Js.to_string code) prefix));
-                    "version", Js.Unsafe.inject (Js.string (match name with | "reason" -> Refmt_api.version | _ -> Bs_version.version));
+                      (fun _ code -> (shake_compile impl ~use_super_errors:true (Js.to_string code)));
+                    "version", Js.Unsafe.inject (Js.string (Bs_version.version));
                     "load_module",
                     inject @@
                     Js.wrap_meth_callback
@@ -236,9 +223,7 @@ let make_compiler name impl prefix =
                         Js.Unsafe.set cmj_bytestring "t" 9;
                         load_module cmi_path cmi_content (Js.to_string cmj_name) cmj_bytestring);
                   |]))
-
-let () = make_compiler "ocaml" Parse.implementation "[@@@bs.config{no_export}]\n#1 \"repl.ml\"\n"
-let () = make_compiler "reason" reason_parse "[@bs.config {no_export: no_export}];\n#1 \"repl.re\";\n"
+let () = make_compiler "ocaml" Parse.implementation
 
 (* local variables: *)
 (* compile-command: "ocamlbuild -use-ocamlfind -pkg compiler-libs -no-hygiene driver.cmo" *)

jscomp/main/jsoo_main.mli

@@ -22,4 +22,4 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-val make_compiler : string -> (Lexing.lexbuf -> Parsetree.structure) -> string -> unit
+val make_compiler : string -> (Lexing.lexbuf -> Parsetree.structure) -> unit