continue clean up path handling

Author: bobzhang

jscomp/bin/all_ounit_tests.ml

@@ -11258,12 +11258,18 @@ type t =
 
 val sep_char : char 
 
-val node_relative_path : 
+(* val node_relative_path : 
   from:t -> 
   t -> 
-  string
+  string *)
 
-val node_concat : dir:string -> string -> string 
+(* val node_concat : dir:string -> string -> string  *)
+
+val node_rebase_file :
+  from:string -> 
+  to_:string ->
+  string -> 
+  string 
 
 (**
    1. add some simplifications when concatenating
@@ -11405,7 +11411,12 @@ let node_relative_path
 let node_concat ~dir base =
   dir ^ Literals.node_sep ^ base 
 
-
+let node_rebase_file ~from ~to_ file = 
+  node_concat
+    ~dir:(node_relative_path ~from:(Dir from) (Dir to_)) 
+    file
+    
+    
 (***
    {[
      Filename.concat "." "";;
@@ -11519,7 +11530,7 @@ let rel_normalized_absolute_path ~from to_ =
         List.fold_left (fun acc _ -> acc // Ext_string.parent_dir_lit )
           Ext_string.parent_dir_lit xs in
     let v =  go paths1 paths2  in 
-    
+
     if Ext_string.is_empty v then  Literals.node_current
     else 
     if
@@ -11722,7 +11733,7 @@ let suites =
         "./node_modules/xx/./xx.js" =~ "./node_modules/xx/xx.js"        
     end;
 
-    __LOC__ >:: begin fun _ -> 
+    (* __LOC__ >:: begin fun _ -> 
       Ext_path.node_relative_path 
         (Dir "lib/js/src/a")
         ~from:(Dir "lib/js/src") =~ "./a" ;
@@ -11748,7 +11759,7 @@ let suites =
         (Dir "lib/js/src/a/") 
         ~from:(Dir "lib/js/src/a/")
       =~ "."
-    end    
+    end     *)
   ]
 
 end

jscomp/bin/bsb.ml

@@ -4748,12 +4748,18 @@ type t =
 
 val sep_char : char 
 
-val node_relative_path : 
+(* val node_relative_path : 
   from:t -> 
   t -> 
-  string
+  string *)
+
+(* val node_concat : dir:string -> string -> string  *)
 
-val node_concat : dir:string -> string -> string 
+val node_rebase_file :
+  from:string -> 
+  to_:string ->
+  string -> 
+  string 
 
 (**
    1. add some simplifications when concatenating
@@ -4895,7 +4901,12 @@ let node_relative_path
 let node_concat ~dir base =
   dir ^ Literals.node_sep ^ base 
 
-
+let node_rebase_file ~from ~to_ file = 
+  node_concat
+    ~dir:(node_relative_path ~from:(Dir from) (Dir to_)) 
+    file
+    
+    
 (***
    {[
      Filename.concat "." "";;
@@ -5009,7 +5020,7 @@ let rel_normalized_absolute_path ~from to_ =
         List.fold_left (fun acc _ -> acc // Ext_string.parent_dir_lit )
           Ext_string.parent_dir_lit xs in
     let v =  go paths1 paths2  in 
-    
+
     if Ext_string.is_empty v then  Literals.node_current
     else 
     if
@@ -8986,10 +8997,6 @@ module Ext_filename : sig
     just treat it as a library instead
 *)
 
-(* val node_relative_path : 
-  bool -> 
-  from:Ext_path.t -> 
-  string -> string *)
 val cwd : string Lazy.t
 
 (* It is lazy so that it will not hit errors when in script mode *)
@@ -9037,52 +9044,6 @@ type t = Ext_path.t
 let cwd = lazy (Sys.getcwd ())
 
 
-(** path2: a/b 
-    path1: a 
-    result:  ./b 
-    TODO: [Filename.concat] with care
-
-    [file1] is currently compilation file 
-    [file2] is the dependency
-
-    TODO: this is a hackish function: FIXME
-*)
-let node_relative_path node_modules_shorten 
-    ~from:(file1 : Ext_path.t) 
-    (file2 : string) = 
-  let v = Ext_string.find  file2 ~sub:Literals.node_modules in 
-  let len = String.length file2 in 
-  if node_modules_shorten && v >= 0 then
-
-    let rec skip  i =       
-      if i >= len then
-        Ext_pervasives.failwithf ~loc:__LOC__ "invalid path: %s"  file2
-      else 
-        (* https://en.wikipedia.org/wiki/Path_(computing))
-           most path separator are a single char 
-        *)
-        let curr_char = String.unsafe_get file2 i  in 
-        if curr_char = Ext_path.sep_char || curr_char = '.' then 
-          skip (i + 1) 
-        else i
-        (*
-          TODO: we need do more than this suppose user 
-          input can be
-           {[
-             "xxxghsoghos/ghsoghso/node_modules/../buckle-stdlib/list.js"
-           ]}
-           This seems weird though
-        *)
-    in 
-    Ext_string.tail_from file2
-      (skip (v + Literals.node_modules_length)) 
-  else 
-    Ext_path.node_relative_path 
-      (File (Ext_path.absolute_path cwd file2))
-      ~from:(Ext_path.absolute cwd file1)
-    ^ Literals.node_sep ^
-    (Filename.basename file2)
-
 
 
 (* Input must be absolute directory *)

jscomp/bin/bsb_helper.ml

@@ -1321,12 +1321,18 @@ type t =
 
 val sep_char : char 
 
-val node_relative_path : 
+(* val node_relative_path : 
   from:t -> 
   t -> 
-  string
+  string *)
 
-val node_concat : dir:string -> string -> string 
+(* val node_concat : dir:string -> string -> string  *)
+
+val node_rebase_file :
+  from:string -> 
+  to_:string ->
+  string -> 
+  string 
 
 (**
    1. add some simplifications when concatenating
@@ -1468,7 +1474,12 @@ let node_relative_path
 let node_concat ~dir base =
   dir ^ Literals.node_sep ^ base 
 
-
+let node_rebase_file ~from ~to_ file = 
+  node_concat
+    ~dir:(node_relative_path ~from:(Dir from) (Dir to_)) 
+    file
+    
+    
 (***
    {[
      Filename.concat "." "";;
@@ -1582,7 +1593,7 @@ let rel_normalized_absolute_path ~from to_ =
         List.fold_left (fun acc _ -> acc // Ext_string.parent_dir_lit )
           Ext_string.parent_dir_lit xs in
     let v =  go paths1 paths2  in 
-    
+
     if Ext_string.is_empty v then  Literals.node_current
     else 
     if

jscomp/bin/whole_compiler.ml

@@ -23417,12 +23417,18 @@ type t =
 
 val sep_char : char 
 
-val node_relative_path : 
+(* val node_relative_path : 
   from:t -> 
   t -> 
-  string
+  string *)
+
+(* val node_concat : dir:string -> string -> string  *)
 
-val node_concat : dir:string -> string -> string 
+val node_rebase_file :
+  from:string -> 
+  to_:string ->
+  string -> 
+  string 
 
 (**
    1. add some simplifications when concatenating
@@ -23564,7 +23570,12 @@ let node_relative_path
 let node_concat ~dir base =
   dir ^ Literals.node_sep ^ base 
 
-
+let node_rebase_file ~from ~to_ file = 
+  node_concat
+    ~dir:(node_relative_path ~from:(Dir from) (Dir to_)) 
+    file
+    
+    
 (***
    {[
      Filename.concat "." "";;
@@ -23678,7 +23689,7 @@ let rel_normalized_absolute_path ~from to_ =
         List.fold_left (fun acc _ -> acc // Ext_string.parent_dir_lit )
           Ext_string.parent_dir_lit xs in
     let v =  go paths1 paths2  in 
-    
+
     if Ext_string.is_empty v then  Literals.node_current
     else 
     if
@@ -59130,10 +59141,6 @@ module Ext_filename : sig
     just treat it as a library instead
 *)
 
-(* val node_relative_path : 
-  bool -> 
-  from:Ext_path.t -> 
-  string -> string *)
 val cwd : string Lazy.t
 
 (* It is lazy so that it will not hit errors when in script mode *)
@@ -59181,52 +59188,6 @@ type t = Ext_path.t
 let cwd = lazy (Sys.getcwd ())
 
 
-(** path2: a/b 
-    path1: a 
-    result:  ./b 
-    TODO: [Filename.concat] with care
-
-    [file1] is currently compilation file 
-    [file2] is the dependency
-
-    TODO: this is a hackish function: FIXME
-*)
-let node_relative_path node_modules_shorten 
-    ~from:(file1 : Ext_path.t) 
-    (file2 : string) = 
-  let v = Ext_string.find  file2 ~sub:Literals.node_modules in 
-  let len = String.length file2 in 
-  if node_modules_shorten && v >= 0 then
-
-    let rec skip  i =       
-      if i >= len then
-        Ext_pervasives.failwithf ~loc:__LOC__ "invalid path: %s"  file2
-      else 
-        (* https://en.wikipedia.org/wiki/Path_(computing))
-           most path separator are a single char 
-        *)
-        let curr_char = String.unsafe_get file2 i  in 
-        if curr_char = Ext_path.sep_char || curr_char = '.' then 
-          skip (i + 1) 
-        else i
-        (*
-          TODO: we need do more than this suppose user 
-          input can be
-           {[
-             "xxxghsoghos/ghsoghso/node_modules/../buckle-stdlib/list.js"
-           ]}
-           This seems weird though
-        *)
-    in 
-    Ext_string.tail_from file2
-      (skip (v + Literals.node_modules_length)) 
-  else 
-    Ext_path.node_relative_path 
-      (File (Ext_path.absolute_path cwd file2))
-      ~from:(Ext_path.absolute cwd file1)
-    ^ Literals.node_sep ^
-    (Filename.basename file2)
-
 
 
 (* Input must be absolute directory *)
@@ -63449,15 +63410,18 @@ let string_of_module_id
           Bs_exception.error (Dependency_script_module_dependent_not js_file)
         | (Package_script  | Package_found _ ), Package_not_found -> assert false
 
+        | Package_found(dep_package_name, dep_path), 
+          Package_script 
+          ->    
+          dep_package_name // dep_path // js_file
 
         | Package_found(dep_package_name, dep_path),
           Package_found(cur_package_name, cur_path) -> 
           if  cur_package_name = dep_package_name then 
-            Ext_path.node_concat 
-              ~dir:(Ext_path.node_relative_path 
-                      ~from:(Dir cur_path)
-                      (Dir dep_path )                       
-                   ) js_file 
+            Ext_path.node_rebase_file
+              ~from:cur_path
+              ~to_:dep_path 
+              js_file
               (** TODO: we assume that both [x] and [path] could only be relative path
                   which is guaranteed by [-bs-package-output]
               *)
@@ -63484,33 +63448,23 @@ let string_of_module_id
                         (Filename.dirname (Filename.dirname cmj_path))) // dep_path // js_file)              
                 end
             end
-        | Package_found(dep_package_name, dep_path), 
-          Package_script 
-          ->    
-          dep_package_name // dep_path // js_file
-        |
-          Package_script , 
+        | Package_script , 
           Package_script 
           -> 
           begin match Config_util.find_opt js_file with 
             | Some file -> 
-              (* let package_dir = Lazy.force Ext_filename.package_dir in *)
-              (* let rebase  ~dependency  ~different_package package_dir=                    
-                 Ext_filename.node_relative_path 
-                  different_package 
-                  ~from:(Dir output_dir) 
-                  dependency 
-                 in                  *)
-              (* rebase ~different_package:true package_dir ~dependency:file *)
-              Ext_path.node_concat
-                ~dir:(Ext_path.node_relative_path 
-                   ~from:(Ext_path.absolute 
-                            Ext_filename.cwd (Dir output_dir))
-                   (File(Ext_path.absolute_path Ext_filename.cwd file)))      
-                  (Filename.basename file)
-            (* Code path: when dependency is commonjs 
-               while depedent is Empty or PackageScript
-            *)
+              let basename = Filename.basename file in 
+              let dirname = Filename.dirname file in 
+              Ext_path.node_rebase_file
+                ~from:(
+                  Ext_path.absolute_path 
+                  Ext_filename.cwd output_dir)
+                ~to_:(
+                  Ext_path.absolute_path 
+                  Ext_filename.cwd
+                  dirname
+                )
+                basename  
             | None -> 
               Bs_exception.error (Js_not_found js_file)
           end