Make filename pure

Author: bobzhang

jscomp/bsb/bsb_parse_sources.ml

@@ -390,7 +390,7 @@ let rec
                   parsing_source_dir_map
                     {cxt with 
                      cwd = Ext_path.concat cxt.cwd 
-                         (Ext_filename.simple_convert_node_path_to_os_path x);
+                         (Ext_path.simple_convert_node_path_to_os_path x);
                      traverse = true
                     } String_map.empty)  origin               
             else origin  
@@ -423,7 +423,7 @@ and parsing_single_source ({not_dev; dir_index ; cwd} as cxt ) (x : Ext_json_typ
     else 
       parsing_source_dir_map 
         {cxt with 
-         cwd = Ext_path.concat cwd (Ext_filename.simple_convert_node_path_to_os_path dir)}
+         cwd = Ext_path.concat cwd (Ext_path.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
       let dir = 
         match String_map.find_opt map Bsb_build_schemas.dir with 
         | Some (Str{str}) -> 
-          Ext_filename.simple_convert_node_path_to_os_path str 
+          Ext_path.simple_convert_node_path_to_os_path str 
         | Some x -> Bsb_exception.config_error x "dir expected to be a string"
         | None -> 
           Bsb_exception.config_error x
@@ -501,13 +501,13 @@ and walk_single_source cxt (x : Ext_json_types.t) =
   match x with 
   | Str {str = dir} 
     -> 
-    let dir = Ext_filename.simple_convert_node_path_to_os_path dir in
+    let dir = Ext_path.simple_convert_node_path_to_os_path dir in
     walk_source_dir_map 
     {cxt with cwd = Ext_path.concat cxt.cwd dir } None 
   | Obj {map} ->       
     begin match String_map.find_opt map Bsb_build_schemas.dir with 
     | Some (Str{str}) -> 
-      let dir = Ext_filename.simple_convert_node_path_to_os_path str  in 
+      let dir = Ext_path.simple_convert_node_path_to_os_path str  in 
       walk_source_dir_map 
       {cxt with cwd = Ext_path.concat cxt.cwd dir} (String_map.find_opt map Bsb_build_schemas.subdirs)
     | _ -> ()
@@ -535,7 +535,7 @@ and walk_source_dir_map (cxt : walk_cxt)  sub_dirs_field =
               {cxt with 
                cwd = 
                  Ext_path.concat cxt.cwd
-                   (Ext_filename.simple_convert_node_path_to_os_path f);
+                   (Ext_path.simple_convert_node_path_to_os_path f);
                traverse = true
               } None 
         end   

jscomp/ext/ext_filename.ml

@@ -26,11 +26,6 @@
 
 
 
-let simple_convert_node_path_to_os_path =
-  if Sys.unix then fun x -> x 
-  else if Sys.win32 || Sys.cygwin then 
-    Ext_string.replace_slash_backward 
-  else failwith ("Unknown OS : " ^ Sys.os_type)
 
 (* reference ninja.cc IsKnownShellSafeCharacter *)
 let maybe_quote ( s : string) = 

jscomp/ext/ext_filename.mli

@@ -39,16 +39,6 @@
     TODO : this short name will have to change upon renaming the file.
 *)
 
-(** Js_output is node style, which means 
-    separator is only '/'
-
-    if the path contains 'node_modules', 
-    [node_relative_path] will discard its prefix and 
-    just treat it as a library instead
-*)
-
-
-val simple_convert_node_path_to_os_path : string -> string
 
 val maybe_quote:
   string -> 

jscomp/ext/ext_path.ml

@@ -27,6 +27,11 @@ type t =
   | Dir of string 
 
 
+let simple_convert_node_path_to_os_path =
+  if Sys.unix then fun x -> x 
+  else if Sys.win32 || Sys.cygwin then 
+    Ext_string.replace_slash_backward 
+  else failwith ("Unknown OS : " ^ Sys.os_type)
 
 
 let cwd = lazy (Sys.getcwd())

jscomp/ext/ext_path.mli

@@ -25,6 +25,14 @@
 type t 
 
 
+(** Js_output is node style, which means 
+    separator is only '/'
+
+    if the path contains 'node_modules', 
+    [node_relative_path] will discard its prefix and 
+    just treat it as a library instead
+*)
+val simple_convert_node_path_to_os_path : string -> string