make namespace(Ns) and package name(ns) separate and meaningful

Author: bobzhang

jscomp/bin/all_ounit_tests.ml

@@ -13630,7 +13630,7 @@ val remove_package_suffix: string -> string
 *)
 val js_name_of_basename :  string -> string 
 
-val module_name_of_package_name : string -> string
+val namespace_of_package_name : string -> string
 
 end = struct
 #1 "ext_package_name.ml"
@@ -13684,7 +13684,7 @@ let js_name_of_basename s =
   remove_package_suffix (String.uncapitalize s) ^ Literals.suffix_js
 
 
-let module_name_of_package_name (s : string) : string = 
+let namespace_of_package_name (s : string) : string = 
   let len = String.length s in 
   let buf = Buffer.create len in 
   let add capital ch = 
@@ -14026,14 +14026,14 @@ let suites =
     end;
 
     __LOC__ >:: begin fun _ ->
-      Ext_package_name.module_name_of_package_name "bs-json"
+      Ext_package_name.namespace_of_package_name "bs-json"
       =~ "BsJson"
     end;
     __LOC__ >:: begin fun _ ->
-      Ext_package_name.module_name_of_package_name
+      Ext_package_name.namespace_of_package_name
         "reason-react"
       =~ "ReasonReact";
-      Ext_package_name.module_name_of_package_name
+      Ext_package_name.namespace_of_package_name
         "reason"
       =~ "Reason"
     end;

jscomp/bin/bsb.ml

@@ -7301,8 +7301,8 @@ type t =
   }
 
 
-let magic_number = "BS_DEP_INFOS_20170809"
-let bsb_version = "20170809+dev"
+let magic_number = "BS_DEP_INFOS_20170822"
+let bsb_version = "20170822+dev"
 (* TODO: for such small data structure, maybe text format is better *)
 
 let write (fname : string)  (x : t) =
@@ -7325,15 +7325,15 @@ type check_result =
 
 let pp_check_result fmt (check_resoult : check_result) =
   Format.pp_print_string fmt (match check_resoult with
-  | Good -> "OK"
-  | Bsb_file_not_exist -> "Dependencies information missing"
-  | Bsb_source_directory_changed ->
-    "Bsb source directory changed"
-  | Bsb_bsc_version_mismatch ->
-    "Bsc or bsb version mismatch"
-  | Bsb_forced ->
-    "Bsb forced rebuild"
-  | Other s -> s)
+      | Good -> "OK"
+      | Bsb_file_not_exist -> "Dependencies information missing"
+      | Bsb_source_directory_changed ->
+        "Bsb source directory changed"
+      | Bsb_bsc_version_mismatch ->
+        "Bsc or bsb version mismatch"
+      | Bsb_forced ->
+        "Bsb forced rebuild"
+      | Other s -> s)
 
 let rec check_aux cwd xs i finish =
   if i = finish then Good
@@ -7431,7 +7431,7 @@ val remove_package_suffix: string -> string
 *)
 val js_name_of_basename :  string -> string 
 
-val module_name_of_package_name : string -> string
+val namespace_of_package_name : string -> string
 
 end = struct
 #1 "ext_package_name.ml"
@@ -7485,7 +7485,7 @@ let js_name_of_basename s =
   remove_package_suffix (String.uncapitalize s) ^ Literals.suffix_js
 
 
-let module_name_of_package_name (s : string) : string = 
+let namespace_of_package_name (s : string) : string = 
   let len = String.length s in 
   let buf = Buffer.create len in 
   let add capital ch = 
@@ -10514,7 +10514,9 @@ type reason_react_jsx = string option
 type t = 
   {
     package_name : string ; 
+    (* [captial-package] *)
     namespace : string option; 
+    (* CapitalPackage *)
     external_includes : string list ; 
     bsc_flags : string list ;
     ppx_flags : string list ;
@@ -11012,32 +11014,32 @@ let (|?)  m (key, cb) =
 
 let parse_entries (field : Ext_json_types.t array) =
   Ext_array.to_list_map (function
-    | Ext_json_types.Obj {map} ->
-      (* kind defaults to bytecode *)
-      let kind = ref "js" in
-      let main = ref None in
-      let _ = map
-        |? (Bsb_build_schemas.kind, `Str (fun x -> kind := x))
-        |? (Bsb_build_schemas.main, `Str (fun x -> main := Some x))
-      in
-      let path = begin match !main with
-      (* This is technically optional when compiling to js *)
-      | None when !kind = Literals.js ->
-        "Index"
-      | None -> 
-        failwith "Missing field 'main'. That field is required its value needs to be the main module for the target"
-      | Some path -> path
-      end in
-      if !kind = Literals.native then
-        Some (Bsb_config_types.NativeTarget path)
-      else if !kind = Literals.bytecode then
-        Some (Bsb_config_types.BytecodeTarget path)
-      else if !kind = Literals.js then
-        Some (Bsb_config_types.JsTarget path)
-      else
-        failwith "Missing field 'kind'. That field is required and its value be 'js', 'native' or 'bytecode'"
-    | _ -> failwith "Unrecognized object inside array 'entries' field.") 
-  field
+      | Ext_json_types.Obj {map} ->
+        (* kind defaults to bytecode *)
+        let kind = ref "js" in
+        let main = ref None in
+        let _ = map
+                |? (Bsb_build_schemas.kind, `Str (fun x -> kind := x))
+                |? (Bsb_build_schemas.main, `Str (fun x -> main := Some x))
+        in
+        let path = begin match !main with
+          (* This is technically optional when compiling to js *)
+          | None when !kind = Literals.js ->
+            "Index"
+          | None -> 
+            failwith "Missing field 'main'. That field is required its value needs to be the main module for the target"
+          | Some path -> path
+        end in
+        if !kind = Literals.native then
+          Some (Bsb_config_types.NativeTarget path)
+        else if !kind = Literals.bytecode then
+          Some (Bsb_config_types.BytecodeTarget path)
+        else if !kind = Literals.js then
+          Some (Bsb_config_types.JsTarget path)
+        else
+          failwith "Missing field 'kind'. That field is required and its value be 'js', 'native' or 'bytecode'"
+      | _ -> failwith "Unrecognized object inside array 'entries' field.") 
+    field
 
 
 
@@ -11074,7 +11076,7 @@ let interpret_json
     cwd  
 
   : Bsb_config_types.t =
-  
+
   let reason_react_jsx = ref None in 
   let config_json = (cwd // Literals.bsconfig_json) in
   let refmt = ref None in
@@ -11126,27 +11128,27 @@ let interpret_json
     in
     map
     |? (Bsb_build_schemas.reason, `Obj begin fun m -> 
-      match String_map.find_opt Bsb_build_schemas.react_jsx m with 
-      
-      | Some (False _)
-      | None -> ()
-      | Some (Flo{loc; flo}) -> 
-        begin match flo with 
-        | "1" -> 
-        reason_react_jsx := 
-            Some (Filename.quote (Filename.concat bsc_dir Literals.reactjs_jsx_ppx_exe) )
-        | "2" -> 
+        match String_map.find_opt Bsb_build_schemas.react_jsx m with 
+
+        | Some (False _)
+        | None -> ()
+        | Some (Flo{loc; flo}) -> 
+          begin match flo with 
+            | "1" -> 
+              reason_react_jsx := 
+                Some (Filename.quote (Filename.concat bsc_dir Literals.reactjs_jsx_ppx_exe) )
+            | "2" -> 
+              reason_react_jsx := 
+                Some (Filename.quote 
+                        (Filename.concat bsc_dir Literals.reactjs_jsx_ppx_2_exe) )
+            | _ -> Bsb_exception.failf ~loc "Unsupported jsx version %s" flo
+          end
+        | Some (True _) -> 
           reason_react_jsx := 
-            Some (Filename.quote 
-              (Filename.concat bsc_dir Literals.reactjs_jsx_ppx_2_exe) )
-        | _ -> Bsb_exception.failf ~loc "Unsupported jsx version %s" flo
-        end
-      | Some (True _) -> 
-        reason_react_jsx := 
             Some (Filename.quote (Filename.concat bsc_dir Literals.reactjs_jsx_ppx_exe) 
-            )
-      | Some x -> Bsb_exception.failf ~loc:(Ext_json.loc_of x) 
-      "Unexpected input for jsx"
+                 )
+        | Some x -> Bsb_exception.failf ~loc:(Ext_json.loc_of x) 
+                      "Unexpected input for jsx"
       end)
 
     |? (Bsb_build_schemas.generate_merlin, `Bool (fun b ->
@@ -11155,7 +11157,7 @@ let interpret_json
     |? (Bsb_build_schemas.name, `Str (fun s -> package_name := Some s))
     |? (Bsb_build_schemas.namespace, `Bool (fun b ->
         namespace := b
-     ))
+      ))
     |? (Bsb_build_schemas.js_post_build, `Obj begin fun m ->
         m |? (Bsb_build_schemas.cmd , `Str (fun s -> 
             js_post_build_cmd := Some (Bsb_build_util.resolve_bsb_magic_file ~cwd ~desc:Bsb_build_schemas.js_post_build s)
@@ -11187,16 +11189,16 @@ let interpret_json
     |? (Bsb_build_schemas.generators, `Arr (fun s ->
         generators :=
           Array.fold_left (fun acc json -> 
-            match (json : Ext_json_types.t) with 
-            | Obj {map = m ; loc}  -> 
-              begin match String_map.find_opt  Bsb_build_schemas.name m,
-                          String_map.find_opt  Bsb_build_schemas.command m with 
-              | Some (Str {str = name}), Some ( Str {str = command}) -> 
-                String_map.add name command acc 
-              | _, _ -> 
-                Bsb_exception.failf ~loc {| generators exepect format like { "name" : "cppo",  "command"  : "cppo $in -o $out"} |}
-              end
-            | _ -> acc ) String_map.empty  s  ))
+              match (json : Ext_json_types.t) with 
+              | Obj {map = m ; loc}  -> 
+                begin match String_map.find_opt  Bsb_build_schemas.name m,
+                            String_map.find_opt  Bsb_build_schemas.command m with 
+                | Some (Str {str = name}), Some ( Str {str = command}) -> 
+                  String_map.add name command acc 
+                | _, _ -> 
+                  Bsb_exception.failf ~loc {| generators exepect format like { "name" : "cppo",  "command"  : "cppo $in -o $out"} |}
+                end
+              | _ -> acc ) String_map.empty  s  ))
     |? (Bsb_build_schemas.refmt, `Str (fun s -> 
         refmt := Some (Bsb_build_util.resolve_bsb_magic_file ~cwd ~desc:Bsb_build_schemas.refmt s) ))
     |? (Bsb_build_schemas.refmt_flags, `Arr (fun s -> refmt_flags := get_list_string s))
@@ -11226,14 +11228,14 @@ let interpret_json
             Unix.rename output_file config_json
         end;
         let package_name =       
-          (match !package_name with
-             | Some name -> name
-             | None ->
-               failwith "Error: Package name is required. Please specify a `name` in `bsconfig.json`"
-            ) in 
-         let namespace =     
+          match !package_name with
+          | Some name -> name
+          | None ->
+            failwith "Error: Package name is required. Please specify a `name` in `bsconfig.json`"
+        in 
+        let namespace =     
           if !namespace then 
-            Some (Ext_package_name.module_name_of_package_name package_name)
+            Some (Ext_package_name.namespace_of_package_name package_name)
           else   None  in  
         {
           package_name ;
@@ -11248,8 +11250,8 @@ let interpret_json
           js_post_build_cmd =  !js_post_build_cmd ;
           package_specs = 
             (match override_package_specs with 
-            | None ->  package_specs
-            | Some x -> x );
+             | None ->  package_specs
+             | Some x -> x );
           globbed_dirs = res.globbed_dirs; 
           bs_file_groups = res.files; 
           files_to_install = String_hash_set.create 96;
@@ -11391,9 +11393,9 @@ let output_merlin_namespace buffer ns=
 
 let bsc_flg_to_merlin_ocamlc_flg bsc_flags  =
   merlin_flg ^ 
-      String.concat Ext_string.single_space 
-        (List.filter (fun x -> not (Ext_string.starts_with x bs_flg_prefix )) @@ 
-        Literals.dash_nostdlib::bsc_flags) 
+  String.concat Ext_string.single_space 
+    (List.filter (fun x -> not (Ext_string.starts_with x bs_flg_prefix )) @@ 
+     Literals.dash_nostdlib::bsc_flags) 
 
 
 let merlin_file_gen ~cwd
@@ -11413,22 +11415,17 @@ let merlin_file_gen ~cwd
   =
   if generate_merlin then begin     
     let buffer = Buffer.create 1024 in
-    (* let namespace = 
-        if namespace then 
-          (Some (Ext_package_name.module_name_of_package_name package_name))
-        else None
-    in          *)
     output_merlin_namespace buffer namespace; 
     ppx_flags
     |> List.iter (fun x ->
         Buffer.add_string buffer (merlin_flg_ppx ^ x )
       );
     (match reason_react_jsx with
-    | Some s -> 
-      begin 
-        Buffer.add_string buffer (merlin_flg_ppx ^ s)
-      end
-    | None -> ());
+     | Some s -> 
+       begin 
+         Buffer.add_string buffer (merlin_flg_ppx ^ s)
+       end
+     | None -> ());
     Buffer.add_string buffer (merlin_flg_ppx  ^ built_in_ppx);
     (*
     (match external_includes with 
@@ -12589,10 +12586,7 @@ let output_ninja_and_namespace_map
     Bsb_build_util.flag_concat dash_i @@ List.map 
       (fun (x : Bsb_config_types.dependency) -> x.package_install_path) bs_dev_dependencies
   in  
-  (* let namespace =
-    if namespace then 
-      Some ( Ext_package_name.module_name_of_package_name package_name) 
-    else None in *)
+
   begin
     let () =
       let bs_package_flags , namespace_flag = 
@@ -13128,14 +13122,11 @@ let install_targets cwd (config : Bsb_config_types.t option) =
       Format.fprintf Format.std_formatter "@{<info>Installing started@}@.";
       (*Format.pp_print_flush Format.std_formatter ();*)
       (* Format.fprintf Format.std_formatter "@{<info>%s@} Installed @." x;  *)
-      (* let namespace = 
-        if namespace then
-          Some (Ext_package_name.module_name_of_package_name package_name) 
-        else None in *)
-      (match namespace with 
-      | None -> ()
-      | Some x -> 
-          install_filename_sans_extension destdir None  x);
+      begin match namespace with 
+        | None -> ()
+        | Some x -> 
+          install_filename_sans_extension destdir None  x
+      end;
       String_hash_set.iter (install_filename_sans_extension destdir namespace) files_to_install;
       Format.fprintf Format.std_formatter "@{<info>Installing finished@} @.";
     end

jscomp/bin/bsb_helper.ml

@@ -2705,7 +2705,7 @@ val remove_package_suffix: string -> string
 *)
 val js_name_of_basename :  string -> string 
 
-val module_name_of_package_name : string -> string
+val namespace_of_package_name : string -> string
 
 end = struct
 #1 "ext_package_name.ml"
@@ -2759,7 +2759,7 @@ let js_name_of_basename s =
   remove_package_suffix (String.uncapitalize s) ^ Literals.suffix_js
 
 
-let module_name_of_package_name (s : string) : string = 
+let namespace_of_package_name (s : string) : string = 
   let len = String.length s in 
   let buf = Buffer.create len in 
   let add capital ch =