fix a regression (see the commit in msg)

jscomp/all.depend

@@ -884,7 +884,7 @@ bsb/bsb_package_specs.cmx : ext/string_map.cmx ext/literals.cmx \
     bsb/bsb_exception.cmx bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx \
     bsb/bsb_package_specs.cmi
 bsb/bsb_parse_sources.cmx : ext/string_vec.cmx ext/string_set.cmx \
-    ext/string_map.cmx ext/literals.cmx ext/ext_string.cmx \
+    ext/string_map.cmx ext/literals.cmx ext/ext_string.cmx ext/ext_path.cmx \
     ext/ext_namespace.cmx ext/ext_list.cmx ext/ext_json_types.cmx \
     ext/ext_json.cmx ext/ext_filename.cmx ext/ext_file_pp.cmx \
     ext/ext_array.cmx bsb/bsb_log.cmx bsb/bsb_exception.cmx \

jscomp/bin/all_ounit_tests.ml

@@ -11578,7 +11578,7 @@ type t
 
 
 (**
-  [combine path1 path2]
+   [combine path1 path2]
    1. add some simplifications when concatenating
    2. when [path2] is absolute, return [path2]
 *)  
@@ -11596,7 +11596,7 @@ val chop_extension_if_any : string -> string
 
 val chop_all_extensions_if_any : 
   string -> string 
-  
+
 (**
    {[
      get_extension "a.txt" = ".txt"
@@ -11633,6 +11633,12 @@ val normalize_absolute_path : string -> string
 
 val absolute_path : string Lazy.t -> string -> string
 
+(** [concat dirname filename]
+    The same as {!Filename.concat} except a tiny optimization 
+    for current directory simplification
+*)
+val concat : string -> string -> string 
+
 val check_suffix_case : 
   string -> string -> bool
 end = struct
@@ -11935,6 +11941,12 @@ let absolute cwd s =
   | File x -> File (absolute_path cwd x )
   | Dir x -> Dir (absolute_path cwd x)
 
+let concat dirname filename =
+  if filename = Filename.current_dir_name then dirname
+  else if dirname = Filename.current_dir_name then filename
+  else Filename.concat dirname filename
+
+
 let check_suffix_case =
   Ext_string.ends_with
 end

jscomp/bin/bsb.ml

@@ -5247,7 +5247,7 @@ type t
 
 
 (**
-  [combine path1 path2]
+   [combine path1 path2]
    1. add some simplifications when concatenating
    2. when [path2] is absolute, return [path2]
 *)  
@@ -5265,7 +5265,7 @@ val chop_extension_if_any : string -> string
 
 val chop_all_extensions_if_any : 
   string -> string 
-  
+
 (**
    {[
      get_extension "a.txt" = ".txt"
@@ -5302,6 +5302,12 @@ val normalize_absolute_path : string -> string
 
 val absolute_path : string Lazy.t -> string -> string
 
+(** [concat dirname filename]
+    The same as {!Filename.concat} except a tiny optimization 
+    for current directory simplification
+*)
+val concat : string -> string -> string 
+
 val check_suffix_case : 
   string -> string -> bool
 end = struct
@@ -5604,6 +5610,12 @@ let absolute cwd s =
   | File x -> File (absolute_path cwd x )
   | Dir x -> Dir (absolute_path cwd x)
 
+let concat dirname filename =
+  if filename = Filename.current_dir_name then dirname
+  else if dirname = Filename.current_dir_name then filename
+  else Filename.concat dirname filename
+
+
 let check_suffix_case =
   Ext_string.ends_with
 end
@@ -9665,7 +9677,7 @@ let rec
               (
                 parsing_source_dir_map
                   {cxt with 
-                   cwd = Filename.concat cxt.cwd (Ext_filename.simple_convert_node_path_to_os_path x);
+                   cwd = Ext_path.concat cxt.cwd (Ext_filename.simple_convert_node_path_to_os_path x);
                    traverse = true
                   } String_map.empty ++ origin 
               )
@@ -9720,7 +9732,7 @@ and parsing_single_source ({not_dev; dir_index ; cwd} as cxt ) (x : Ext_json_typ
     else 
       parsing_source_dir_map 
         {cxt with 
-         cwd = Filename.concat cwd (Ext_filename.simple_convert_node_path_to_os_path dir)}
+         cwd = Ext_path.concat cwd (Ext_filename.simple_convert_node_path_to_os_path dir)}
         String_map.empty  
   | Obj {map} ->
     let current_dir_index = 
@@ -9743,7 +9755,7 @@ and parsing_single_source ({not_dev; dir_index ; cwd} as cxt ) (x : Ext_json_typ
       in
       parsing_source_dir_map 
         {cxt with dir_index = current_dir_index; 
-                  cwd= Filename.concat cwd dir} map
+                  cwd= Ext_path.concat cwd dir} map
   | _ -> empty 
 and  parsing_arr_sources cxt (file_groups : Ext_json_types.t array)  = 
   Array.fold_left (fun  origin x ->

jscomp/bin/bsb_helper.ml

@@ -2155,7 +2155,7 @@ type t
 
 
 (**
-  [combine path1 path2]
+   [combine path1 path2]
    1. add some simplifications when concatenating
    2. when [path2] is absolute, return [path2]
 *)  
@@ -2173,7 +2173,7 @@ val chop_extension_if_any : string -> string
 
 val chop_all_extensions_if_any : 
   string -> string 
-  
+
 (**
    {[
      get_extension "a.txt" = ".txt"
@@ -2210,6 +2210,12 @@ val normalize_absolute_path : string -> string
 
 val absolute_path : string Lazy.t -> string -> string
 
+(** [concat dirname filename]
+    The same as {!Filename.concat} except a tiny optimization 
+    for current directory simplification
+*)
+val concat : string -> string -> string 
+
 val check_suffix_case : 
   string -> string -> bool
 end = struct
@@ -2512,6 +2518,12 @@ let absolute cwd s =
   | File x -> File (absolute_path cwd x )
   | Dir x -> Dir (absolute_path cwd x)
 
+let concat dirname filename =
+  if filename = Filename.current_dir_name then dirname
+  else if dirname = Filename.current_dir_name then filename
+  else Filename.concat dirname filename
+
+
 let check_suffix_case =
   Ext_string.ends_with
 end

jscomp/bin/whole_compiler.ml

@@ -24819,7 +24819,7 @@ type t
 
 
 (**
-  [combine path1 path2]
+   [combine path1 path2]
    1. add some simplifications when concatenating
    2. when [path2] is absolute, return [path2]
 *)  
@@ -24837,7 +24837,7 @@ val chop_extension_if_any : string -> string
 
 val chop_all_extensions_if_any : 
   string -> string 
-  
+
 (**
    {[
      get_extension "a.txt" = ".txt"
@@ -24874,6 +24874,12 @@ val normalize_absolute_path : string -> string
 
 val absolute_path : string Lazy.t -> string -> string
 
+(** [concat dirname filename]
+    The same as {!Filename.concat} except a tiny optimization 
+    for current directory simplification
+*)
+val concat : string -> string -> string 
+
 val check_suffix_case : 
   string -> string -> bool
 end = struct
@@ -25176,6 +25182,12 @@ let absolute cwd s =
   | File x -> File (absolute_path cwd x )
   | Dir x -> Dir (absolute_path cwd x)
 
+let concat dirname filename =
+  if filename = Filename.current_dir_name then dirname
+  else if dirname = Filename.current_dir_name then filename
+  else Filename.concat dirname filename
+
+
 let check_suffix_case =
   Ext_string.ends_with
 end

jscomp/bsb/bsb_parse_sources.ml

@@ -360,7 +360,7 @@ let rec
               (
                 parsing_source_dir_map
                   {cxt with 
-                   cwd = Filename.concat cxt.cwd (Ext_filename.simple_convert_node_path_to_os_path x);
+                   cwd = Ext_path.concat cxt.cwd (Ext_filename.simple_convert_node_path_to_os_path x);
                    traverse = true
                   } String_map.empty ++ origin 
               )
@@ -415,7 +415,7 @@ and parsing_single_source ({not_dev; dir_index ; cwd} as cxt ) (x : Ext_json_typ
     else 
       parsing_source_dir_map 
         {cxt with 
-         cwd = Filename.concat cwd (Ext_filename.simple_convert_node_path_to_os_path dir)}
+         cwd = Ext_path.concat cwd (Ext_filename.simple_convert_node_path_to_os_path dir)}
         String_map.empty  
   | Obj {map} ->
     let current_dir_index = 
@@ -438,7 +438,7 @@ and parsing_single_source ({not_dev; dir_index ; cwd} as cxt ) (x : Ext_json_typ
       in
       parsing_source_dir_map 
         {cxt with dir_index = current_dir_index; 
-                  cwd= Filename.concat cwd dir} map
+                  cwd= Ext_path.concat cwd dir} map
   | _ -> empty 
 and  parsing_arr_sources cxt (file_groups : Ext_json_types.t array)  = 
   Array.fold_left (fun  origin x ->

jscomp/build_tests/namespace/input.js

@@ -7,7 +7,8 @@ child_process.execSync(`bsb -clean-world && bsb -make-world`, {cwd:__dirname, st
 
 var x = require('./src/demo.bs.js')
 var assert = require('assert')
-
+var demo_bs_js = fs.readFileSync('./src/demo.bs.js','utf8')
+assert.ok(demo_bs_js.includes('liba/src/demo.bs.js'))
 assert.equal(x.v, 3 )
 
 var merlin = fs.readFileSync(path.join(__dirname,'.merlin'), 'utf8')

jscomp/ext/ext_path.ml

@@ -296,5 +296,11 @@ let absolute cwd s =
   | File x -> File (absolute_path cwd x )
   | Dir x -> Dir (absolute_path cwd x)
 
+let concat dirname filename =
+  if filename = Filename.current_dir_name then dirname
+  else if dirname = Filename.current_dir_name then filename
+  else Filename.concat dirname filename
+
+
 let check_suffix_case =
   Ext_string.ends_with

jscomp/ext/ext_path.mli

@@ -29,7 +29,7 @@ type t
 
 
 (**
-  [combine path1 path2]
+   [combine path1 path2]
    1. add some simplifications when concatenating
    2. when [path2] is absolute, return [path2]
 *)  
@@ -47,7 +47,7 @@ val chop_extension_if_any : string -> string
 
 val chop_all_extensions_if_any : 
   string -> string 
-  
+
 (**
    {[
      get_extension "a.txt" = ".txt"
@@ -84,5 +84,11 @@ val normalize_absolute_path : string -> string
 
 val absolute_path : string Lazy.t -> string -> string
 
+(** [concat dirname filename]
+    The same as {!Filename.concat} except a tiny optimization 
+    for current directory simplification
+*)
+val concat : string -> string -> string 
+
 val check_suffix_case : 
   string -> string -> bool