part 2: support external-stdlib config

Author: bobzhang

docs/docson/build-schema.json

@@ -481,6 +481,10 @@
             "type": "boolean",
             "description": "(Experimental) whether to use the OCaml standard library. Default: true"
         },
+        "external-stdlib" : {
+            "type" : "string",
+            "description": "Use the external stdlib library instead of the one shipped with the compiler package"
+        },
         "bs-external-includes": {
             "type": "array",
             "items": {

jscomp/bsb/bsb_build_schemas.ml

@@ -65,6 +65,7 @@ let export_none = "none"
 
 
 let use_stdlib = "use-stdlib"
+let external_stdlib = "external-stdlib"
 let reason = "reason"
 let react_jsx = "react-jsx"
 

jscomp/bsb/bsb_config_parse.ml

@@ -388,7 +388,7 @@ let interpret_json
           js_post_build_cmd = (extract_js_post_build map per_proj_dir);
           package_specs = 
             (match package_kind with 
-             | Toplevel ->  Bsb_package_specs.from_map map                
+             | Toplevel ->  Bsb_package_specs.from_map ~cwd:per_proj_dir map                
              | Pinned_dependency x
              | Dependency x -> x);          
           file_groups = groups; 
@@ -412,7 +412,7 @@ let package_specs_from_bsconfig () =
   let json = Ext_json_parse.parse_json_from_file Literals.bsconfig_json in
   begin match json with
     | Obj {map} ->
-      Bsb_package_specs.from_map map,
+      Bsb_package_specs.from_map ~cwd:Bsb_global_paths.cwd map,
       extract_pinned_dependencies map
     | _ -> assert false
   end

jscomp/bsb/bsb_package_specs.ml

@@ -37,13 +37,17 @@ type spec = {
   suffix : Ext_js_suffix.t 
 }
 
+(*FIXME: use assoc list instead *)
 module Spec_set = Set.Make( struct type t = spec 
     let compare = Pervasives.compare 
   end)
 
 type t = {
   modules : Spec_set.t;
-  (* runtime: Bsb_pkg_types.t option;   *)
+  runtime: string option;  
+  (* This has to be resolved as early as possible, since 
+    the path will be inherited in sub projects
+  *)
 }
 
 let (.?()) = Map_string.find_opt 
@@ -147,10 +151,13 @@ let package_flag ({format; in_source; suffix } : spec) dir =
 (* FIXME: we should adapt it *)    
 let package_flag_of_package_specs (package_specs : t) 
     ~(dirname : string ) : string  = 
-  Spec_set.fold (fun format acc ->
+  let res = Spec_set.fold (fun format acc ->
       Ext_string.inter2 acc (package_flag format dirname )
-    ) package_specs.modules Ext_string.empty
-
+    ) package_specs.modules Ext_string.empty in 
+  match package_specs.runtime with 
+  | None -> res
+  | Some x -> 
+    res ^ " -runtime " ^ x 
 let default_package_specs suffix = 
   Spec_set.singleton 
     { format = NodeJS ; in_source = false; suffix  }
@@ -202,13 +209,20 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t =
     Bsb_exception.config_error config 
       "expect a string exteion like \".js\" here"
 
-let from_map map =  
+let from_map ~(cwd:string) map =  
   let suffix = extract_bs_suffix_exn map in   
   let modules = match map.?(Bsb_build_schemas.package_specs) with 
   | Some x ->
     from_json suffix x 
   | None ->  default_package_specs suffix in 
+  let runtime = 
+    match map.?(Bsb_build_schemas.external_stdlib) with
+    | None -> None 
+    | Some(Str{str; _}) ->
+       Some (Bsb_pkg.resolve_bs_package ~cwd (Bsb_pkg_types.string_as_package str))
+    | _ -> assert false in   
   {
+    runtime;  
     modules 
   }
 

jscomp/bsb/bsb_package_specs.mli

@@ -28,6 +28,7 @@ type t
 
 
 val from_map:
+  cwd:string ->
   Ext_json_types.t Map_string.t -> t 
 
 val get_list_of_output_js : 

jscomp/bsb/bsb_pkg.mli

@@ -38,6 +38,7 @@ val resolve_bs_package :
     cwd:string ->  Bsb_pkg_types.t -> string 
 
 
+(** used by watcher *)    
 val to_list:    
   (Bsb_pkg_types.t  ->
    string ->

jscomp/bsb/bsb_pkg_types.ml

@@ -95,7 +95,10 @@ let string_as_package (s : string) : t =
   if v = '@' then 
     let scope_id = 
         Ext_string.no_slash_idx s in 
-    assert (scope_id > 0);
+    assert (scope_id > 0); 
+    (* better-eror message for invalid scope package:
+      @rescript/std
+    *)
     Scope(
       String.sub s (scope_id + 1) (len - scope_id - 1),
       String.sub s 0 scope_id

jscomp/common/js_config.ml

@@ -92,3 +92,4 @@ let as_ppx = ref false
 
 let mono_empty_array = ref true
 
+let customize_runtime = ref None 

jscomp/common/js_config.mli

@@ -100,3 +100,4 @@ val no_export: bool ref
 val as_ppx : bool ref 
 
 val mono_empty_array : bool ref
+val customize_runtime : string option ref 

jscomp/core/js_name_of_module_id.ml

@@ -80,8 +80,13 @@ let get_runtime_module_path
           (*Invariant: the package path to bs-platform, it is used to 
             calculate relative js path
           *)
-          ((Filename.dirname (Filename.dirname Sys.executable_name)) // dep_path // js_file)  
-          (*FIXME: the runtime path needs changed when customize runtime*)
+          (match !Js_config.customize_runtime with 
+           | None ->
+             ((Filename.dirname (Filename.dirname Sys.executable_name)) // dep_path // js_file)
+           | Some path -> 
+             path //dep_path // js_file 
+          )  
+
 
 
 (* [output_dir] is decided by the command line argument *)
@@ -142,6 +147,9 @@ let string_of_module_id
                   which is guaranteed by [-bs-package-output]
               *)
           else  
+          if Js_packages_info.is_runtime_package dep_package_info then 
+            get_runtime_module_path dep_module_id current_package_info module_system
+          else 
             begin match module_system with 
               | NodeJS | Es6 -> 
                 dep_pkg.pkg_rel_path // js_file

jscomp/core/js_packages_info.ml

@@ -94,7 +94,19 @@ let runtime_test_package_specs : t = {
   name = Pkg_runtime; 
   module_systems = []
 }
-let same_package_by_name (x : t) (y : t) = x.name = y.name 
+
+let same_package_by_name (x : t) (y : t) =
+  match x.name with 
+  | Pkg_empty -> 
+    y.name = Pkg_empty
+  | Pkg_runtime -> 
+    y.name = Pkg_runtime 
+  | Pkg_normal s -> 
+    begin match y.name with 
+    | Pkg_normal y -> s = y
+    | Pkg_empty | Pkg_runtime -> false
+    end
+   
 
 let is_runtime_package (x : t) = 
     x.name = Pkg_runtime

jscomp/main/js_main.ml

@@ -32,7 +32,18 @@ let setup_error_printer (syntax_kind : [ `ml | `reason | `rescript ])=
 
 
 
-  
+let setup_runtime_path path = 
+  let u0 = Filename.dirname path in 
+  let std = Filename.basename path in 
+  let _path = Filename.dirname u0 in 
+  let rescript = Filename.basename u0 in 
+  (match rescript.[0] with 
+   | '@' -> (* scoped package *)
+     Bs_version.package_name := rescript ^ "/" ^ std;
+   | _ -> Bs_version.package_name := std
+   | exception _ -> 
+     Bs_version.package_name := std);
+  Js_config.customize_runtime := Some path
 
 let handle_reason (type a) (kind : a Ml_binary.kind) sourcefile ppf  = 
   setup_error_printer `reason;
@@ -443,6 +454,8 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     "<list>  Enable or disable error status for warnings according\n\
          to <list>.  See option -w for the syntax of <list>.\n\
          Default setting is " ^ Bsc_warnings.defaults_warn_error;    
+    "-runtime",string_call setup_runtime_path,     
+    "*internal* Set the runtime directory";
     "-make-runtime", unit_call Js_packages_state.make_runtime,
     "*internal* make runtime library";  
     "-make-runtime-test", unit_call Js_packages_state.make_runtime_test,