(- re) change_ext_ns_suffix: Label ambiguous string-args, clarify name

Author: ELLIOTTCABLE

jscomp/bsb/bsb_package_specs.ml

@@ -202,8 +202,9 @@ let get_list_of_output_js (package_specs : Spec_set.t) (bs_suffix : bool)
   Spec_set.fold
     (fun (spec : spec) acc ->
       let basename =
-        Ext_namespace.change_ext_ns_suffix output_file_sans_extension
-          (if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js)
+        Ext_namespace.replace_namespace_with_extension
+          ~name:output_file_sans_extension
+          ~ext:(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js)
       in
       ( Bsb_config.proj_rel
       @@

jscomp/core/lam_compile_main.ml

@@ -278,10 +278,11 @@ let (//) = Filename.concat
 let lambda_as_module (lambda_output : J.deps_program) (output_prefix : string) :
     unit =
   let basename =
-    Ext_namespace.change_ext_ns_suffix
-      (Filename.basename output_prefix)
-      ( if !Js_config.bs_suffix then Literals.suffix_bs_js
-      else Literals.suffix_js )
+    Ext_namespace.replace_namespace_with_extension
+      ~name:(Filename.basename output_prefix)
+      ~ext:
+        ( if !Js_config.bs_suffix then Literals.suffix_bs_js
+        else Literals.suffix_js )
   in
   let package_info = Js_packages_state.get_packages_info () in
   if Js_packages_info.is_empty package_info && !Js_config.js_stdout then

jscomp/ext/ext_namespace.ml

@@ -54,7 +54,7 @@ let rec rindex_rec s i =
    #1933 when removing ns suffix, don't pass the bound of basename
 
    FIXME: micro-optimizaiton *)
-let change_ext_ns_suffix name ext =
+let replace_namespace_with_extension ~name ~ext =
   let i = rindex_rec name (String.length name - 1) in
   if i < 0 then name ^ ext else String.sub name 0 i ^ ext
 
@@ -70,20 +70,24 @@ type file_kind = Upper_js | Upper_bs | Little_js | Little_bs
 
 
 (* let js_name_of_basename bs_suffix s =
-  change_ext_ns_suffix s
-    (if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) *)
+  replace_namespace_with_extension ~name:s
+    ~ext:(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) *)
 
 
 let js_name_of_modulename s little =
   match little with
   | Little_js ->
-      change_ext_ns_suffix (Ext_string.uncapitalize_ascii s) Literals.suffix_js
+      replace_namespace_with_extension
+        ~name:(Ext_string.uncapitalize_ascii s)
+        ~ext:Literals.suffix_js
   | Little_bs ->
-      change_ext_ns_suffix
-        (Ext_string.uncapitalize_ascii s)
-        Literals.suffix_bs_js
-  | Upper_js -> change_ext_ns_suffix s Literals.suffix_js
-  | Upper_bs -> change_ext_ns_suffix s Literals.suffix_bs_js
+      replace_namespace_with_extension
+        ~name:(Ext_string.uncapitalize_ascii s)
+        ~ext:Literals.suffix_bs_js
+  | Upper_js -> replace_namespace_with_extension ~name:s ~ext:Literals.suffix_js
+  | Upper_bs ->
+      replace_namespace_with_extension ~name:s ~ext:Literals.suffix_bs_js
+
 
 (* https://docs.npmjs.com/files/package.json
    Some rules:

jscomp/ext/ext_namespace.mli

@@ -30,7 +30,10 @@ val make : ?ns:string -> string -> string
 
 val try_split_module_name : string -> (string * string) option
 
-val change_ext_ns_suffix : string -> string -> string
+val replace_namespace_with_extension : name:string -> ext:string -> string
+(** [replace_namespace_with_extension ~name ~ext] removes the part of [name]
+    after [ns_sep_char], if any; and appends [ext].
+*)
 
 type file_kind = Upper_js | Upper_bs | Little_js | Little_bs
 

jscomp/ounit_tests/ounit_string_tests.ml

@@ -378,10 +378,16 @@ let suites =
         =~"ABb"
     end;
     __LOC__ >:: begin fun _ ->
-      Ext_namespace.change_ext_ns_suffix "a-b" Literals.suffix_js =~ "a.js";
-      Ext_namespace.change_ext_ns_suffix "a-" Literals.suffix_js =~ "a.js";
-      Ext_namespace.change_ext_ns_suffix "a--" Literals.suffix_js =~ "a-.js";
-      Ext_namespace.change_ext_ns_suffix "AA-b" Literals.suffix_js =~ "AA.js";
+      Ext_namespace.replace_namespace_with_extension
+        ~name:"a-b" ~ext:Literals.suffix_js =~ "a.js";
+      Ext_namespace.replace_namespace_with_extension
+        ~name:"a-" ~ext:Literals.suffix_js =~ "a.js";
+      Ext_namespace.replace_namespace_with_extension
+        ~name:"a--" ~ext:Literals.suffix_js =~ "a-.js";
+      Ext_namespace.replace_namespace_with_extension
+        ~name:"AA-b" ~ext:Literals.suffix_js =~ "AA.js";
+      Ext_namespace.replace_namespace_with_extension
+        ~name:"AA-b" ~ext:Literals.suffix_js =~ "AA.js";
       Ext_namespace.js_name_of_modulename "AA-b" Little_js =~ "aA.js";
       Ext_namespace.js_name_of_modulename "AA-b" Upper_js =~ "AA.js";
       Ext_namespace.js_name_of_modulename "AA-b" Upper_bs =~ "AA.bs.js"