make sure filenames are unique across the project

Author: bobzhang

jscomp/bin/whole_compiler.ml

@@ -63271,14 +63271,14 @@ let string_of_module_id
       | Ml  -> 
         let id = x.id in
         let js_file =  Ext_namespace.js_name_of_basename id.name in 
-        let rebase different_package package_dir dep =
+        let rebase  ~dependency  ~different_package package_dir=
           let current_unit_dir =
             `Dir (get_output_dir 
                   ~pkg_dir:package_dir module_system 
                   ~hint_output_dir
                   current_package_info
                   ) in
-          Ext_filename.node_relative_path  different_package current_unit_dir dep 
+          Ext_filename.node_relative_path  different_package current_unit_dir dependency 
         in 
         let cmj_path, dependency_pkg_info = 
           match get_package_path_from_cmj x with 
@@ -63313,7 +63313,7 @@ let string_of_module_id
             Package_found(current_package, path) -> 
             if  current_package = package_name then 
               let package_dir = Lazy.force Ext_filename.package_dir in
-              rebase false package_dir (`File (package_dir // x // js_file)) 
+              rebase ~different_package:false package_dir ~dependency:(`File (package_dir // x // js_file)) 
             else 
               begin match module_system with 
               | AmdJS | NodeJS | Es6 -> 
@@ -63343,7 +63343,7 @@ let string_of_module_id
             ->    
             if current_package = package_name then 
               let package_dir = Lazy.force Ext_filename.package_dir in
-              rebase false package_dir (`File (
+              rebase ~different_package:false package_dir ~dependency:(`File (
                   package_dir // x // js_file)) 
             else 
               package_name // x // js_file
@@ -63357,7 +63357,7 @@ let string_of_module_id
             begin match Config_util.find_opt js_file with 
               | Some file -> 
                 let package_dir = Lazy.force Ext_filename.package_dir in
-                rebase true package_dir (`File file) 
+                rebase ~different_package:true package_dir ~dependency:(`File file) 
               (* Code path: when dependency is commonjs 
                  while depedent is Empty or PackageScript
               *)
@@ -70194,7 +70194,7 @@ type t = {
   npm_package_path : Js_packages_info.t ;
 }
 
-let cmj_magic_number =  "BUCKLE20170811"
+let cmj_magic_number =  "BUCKLE20170901"
 let cmj_magic_number_length = 
   String.length cmj_magic_number
 

jscomp/core/js_cmj_format.ml

@@ -50,7 +50,7 @@ type t = {
   npm_package_path : Js_packages_info.t ;
 }
 
-let cmj_magic_number =  "BUCKLE20170811"
+let cmj_magic_number =  "BUCKLE20170901"
 let cmj_magic_number_length = 
   String.length cmj_magic_number
 

jscomp/core/js_packages_info.ml

@@ -204,14 +204,14 @@ let string_of_module_id
       | Ml  -> 
         let id = x.id in
         let js_file =  Ext_namespace.js_name_of_basename id.name in 
-        let rebase different_package package_dir dep =
+        let rebase  ~dependency  ~different_package package_dir=
           let current_unit_dir =
             `Dir (get_output_dir 
                   ~pkg_dir:package_dir module_system 
                   ~hint_output_dir
                   current_package_info
                   ) in
-          Ext_filename.node_relative_path  different_package current_unit_dir dep 
+          Ext_filename.node_relative_path  different_package current_unit_dir dependency 
         in 
         let cmj_path, dependency_pkg_info = 
           match get_package_path_from_cmj x with 
@@ -246,7 +246,7 @@ let string_of_module_id
             Package_found(current_package, path) -> 
             if  current_package = package_name then 
               let package_dir = Lazy.force Ext_filename.package_dir in
-              rebase false package_dir (`File (package_dir // x // js_file)) 
+              rebase ~different_package:false package_dir ~dependency:(`File (package_dir // x // js_file)) 
             else 
               begin match module_system with 
               | AmdJS | NodeJS | Es6 -> 
@@ -276,7 +276,7 @@ let string_of_module_id
             ->    
             if current_package = package_name then 
               let package_dir = Lazy.force Ext_filename.package_dir in
-              rebase false package_dir (`File (
+              rebase ~different_package:false package_dir ~dependency:(`File (
                   package_dir // x // js_file)) 
             else 
               package_name // x // js_file
@@ -290,7 +290,7 @@ let string_of_module_id
             begin match Config_util.find_opt js_file with 
               | Some file -> 
                 let package_dir = Lazy.force Ext_filename.package_dir in
-                rebase true package_dir (`File file) 
+                rebase ~different_package:true package_dir ~dependency:(`File file) 
               (* Code path: when dependency is commonjs 
                  while depedent is Empty or PackageScript
               *)

jscomp/test/.depend

@@ -9,8 +9,8 @@ config2_test.cmi : ../runtime/js.cmi
 const_block_test.cmi :
 demo_int_map.cmi :
 derive_projector_test.cmi :
-ext_pervasives.cmi : ../stdlib/int32.cmi ../stdlib/format.cmi
-ext_sys.cmi :
+ext_pervasives_test.cmi : ../stdlib/int32.cmi ../stdlib/format.cmi
+ext_sys_test.cmi :
 float_record.cmi :
 flow_parser_reg_test.cmi :
 gpr_405_test.cmi :
@@ -42,11 +42,11 @@ ui_defs.cmi :
 unsafe_this.cmi : ../runtime/js.cmi
 a.cmj : test_order.cmj ../stdlib/string.cmj ../stdlib/set.cmj \
     ../stdlib/list.cmj
-a_filename_test.cmj : mt.cmj ext_filename.cmj ../stdlib/array.cmj
-a_list_test.cmj : mt.cmj ext_list.cmj
+a_filename_test.cmj : mt.cmj ext_filename_test.cmj ../stdlib/array.cmj
+a_list_test.cmj : mt.cmj ext_list_test.cmj
 a_recursive_type.cmj : a_recursive_type.cmi
 a_scope_bug.cmj :
-a_string_test.cmj : mt.cmj ../stdlib/list.cmj ext_string.cmj
+a_string_test.cmj : mt.cmj ../stdlib/list.cmj ext_string_test.cmj
 abstract_type.cmj : abstract_type.cmi
 alias_test.cmj : ../stdlib/string.cmj alias_test.cmi
 and_or_tailcall_test.cmj : mt.cmj
@@ -137,7 +137,7 @@ derive_dyntype.cmj : ../others/bs_dyn.cmj
 derive_projector_test.cmj : derive_projector_test.cmi
 derive_type_test.cmj :
 digest_test.cmj : ../stdlib/string.cmj ../stdlib/printf.cmj mt.cmj \
-    ext_array.cmj ../stdlib/digest.cmj ../stdlib/array.cmj
+    ext_array_test.cmj ../stdlib/digest.cmj ../stdlib/array.cmj
 div_by_zero_test.cmj : mt.cmj ../stdlib/int64.cmj ../stdlib/int32.cmj
 dollar_escape_test.cmj : mt.cmj
 earger_curry_test.cmj : mt.cmj ../runtime/js.cmj ../stdlib/array.cmj
@@ -158,20 +158,22 @@ exception_repr_test.cmj : ../stdlib/printexc.cmj mt.cmj ../stdlib/format.cmj \
 exception_value_test.cmj : ../runtime/js.cmj
 exn_error_pattern.cmj :
 export_keyword.cmj :
-ext_array.cmj : ../stdlib/list.cmj ../stdlib/array.cmj
-ext_bytes.cmj : ../stdlib/pervasives.cmj ../stdlib/bytes.cmj
-ext_filename.cmj : ../stdlib/sys.cmj ../stdlib/string.cmj literals.cmj \
+ext_array_test.cmj : ../stdlib/list.cmj ../stdlib/array.cmj
+ext_bytes_test.cmj : ../stdlib/pervasives.cmj ../stdlib/bytes.cmj
+ext_filename_test.cmj : ../stdlib/sys.cmj ../stdlib/string.cmj literals.cmj \
     ../stdlib/list.cmj ../stdlib/lazy.cmj ../stdlib/filename.cmj \
-    ext_string.cmj ext_pervasives.cmj
-ext_list.cmj : ../stdlib/list.cmj ext_string.cmj ../stdlib/array.cmj
-ext_log.cmj : ../stdlib/format.cmj
-ext_pervasives.cmj : ../stdlib/string.cmj ../stdlib/printf.cmj \
+    ext_string_test.cmj ext_pervasives_test.cmj
+ext_list_test.cmj : ../stdlib/list.cmj ext_string_test.cmj \
+    ../stdlib/array.cmj
+ext_log_test.cmj : ../stdlib/format.cmj
+ext_pervasives_test.cmj : ../stdlib/string.cmj ../stdlib/printf.cmj \
     ../stdlib/obj.cmj ../stdlib/list.cmj ../stdlib/int32.cmj \
     ../stdlib/format.cmj ../stdlib/char.cmj ../stdlib/array.cmj \
-    ../stdlib/arg.cmj ext_pervasives.cmi
-ext_string.cmj : ../stdlib/string.cmj ../stdlib/list.cmj ext_bytes.cmj \
-    ../stdlib/char.cmj ../stdlib/bytes.cmj ../stdlib/array.cmj
-ext_sys.cmj : ../stdlib/sys.cmj ext_sys.cmi
+    ../stdlib/arg.cmj ext_pervasives_test.cmi
+ext_string_test.cmj : ../stdlib/string.cmj ../stdlib/list.cmj \
+    ext_bytes_test.cmj ../stdlib/char.cmj ../stdlib/bytes.cmj \
+    ../stdlib/array.cmj
+ext_sys_test.cmj : ../stdlib/sys.cmj ext_sys_test.cmi
 extensible_variant_test.cmj : mt.cmj
 external_ppx.cmj :
 fail_comp.cmj :
@@ -285,12 +287,12 @@ inner_unused.cmj : ../stdlib/set.cmj ../runtime/js.cmj
 installation_test.cmj : ../others/node.cmj mt.cmj ../runtime/js.cmj \
     app_root_finder.cmj
 int32_test.cmj : mt.cmj ../stdlib/int32.cmj ../stdlib/format.cmj \
-    ext_array.cmj ../stdlib/array.cmj
+    ext_array_test.cmj ../stdlib/array.cmj
 int64_mul_div_test.cmj : ../stdlib/printf.cmj mt.cmj ../stdlib/list.cmj \
     ../stdlib/int64.cmj ../stdlib/array.cmj
 int64_test.cmj : ../stdlib/pervasives.cmj ../stdlib/nativeint.cmj mt.cmj \
     ../runtime/js_int64.cmj ../stdlib/int64.cmj ../stdlib/int32.cmj \
-    ../stdlib/format.cmj ext_array.cmj ../stdlib/array.cmj
+    ../stdlib/format.cmj ext_array_test.cmj ../stdlib/array.cmj
 int_hashtbl_test.cmj : mt.cmj ../stdlib/list.cmj ../stdlib/hashtbl.cmj \
     ../stdlib/array.cmj
 int_map.cmj : ../stdlib/map.cmj
@@ -495,7 +497,7 @@ string_set.cmj : ../stdlib/string.cmj set_gen.cmj ../stdlib/list.cmj \
     ../stdlib/array.cmj
 string_set_test.cmj : string_set.cmj mt.cmj
 string_test.cmj : ../stdlib/string.cmj mt.cmj ../stdlib/list.cmj \
-    ext_string.cmj ../stdlib/bytes.cmj
+    ext_string_test.cmj ../stdlib/bytes.cmj
 string_unicode_test.cmj : ../runtime/js.cmj
 stringmatch_test.cmj : ../stdlib/string.cmj
 submodule.cmj : ../runtime/js.cmj

jscomp/test/Makefile

@@ -22,8 +22,11 @@ OTHERS := literals a test_ari test_export2 test_internalOO test_obj_simple_ffi t
 	test_simple_ref test_incr_ref ocaml_array ticker test_filename test_alias mt\
 	mock_mt array_test test_nullary test_for_map2 int_map test_tuple\
 	list_test map_test lexer_test google_closure_test boolean_test equal_exception_test\
-	lazy_test ext_string ext_bytes a_string_test ext_filename a_filename_test test_nested_print\
-	a_scope_bug a_recursive_type test_array_append ext_list a_list_test test_type_based_arity\
+	lazy_test ext_string_test\
+	ext_bytes_test a_string_test \
+	ext_filename_test a_filename_test test_nested_print\
+	a_scope_bug a_recursive_type test_array_append ext_list_test\
+	a_list_test test_type_based_arity\
 	abstract_type curry test_formatter test_cps test_closure test_for_loop test_while_closure\
 	test_while_side_effect for_side_effect_test cps_test for_loop_test queue_test libqueue_test\
 	libarg_test loop_suites_test const_block_test stack_test test_stack\
@@ -35,17 +38,18 @@ OTHERS := literals a test_ari test_export2 test_internalOO test_obj_simple_ffi t
 	regression_print global_exception_regression_test printf_test format_regression loop_regression_test\
 	and_or_tailcall_test const_defs const_defs_test genlex_test cross_module_inline_test runtime_encoding_test\
 	obj_magic_test caml_compare_test rec_module_test guide_for_ext local_exception_test js_obj_test extensible_variant_test\
-	ext_log lam_current_unit test_zero_nullable int64_test string_literal_print_test js_bool_test class_type_ffi_test unsafe_ppx_test\
+	ext_log_test lam_current_unit test_zero_nullable int64_test string_literal_print_test js_bool_test class_type_ffi_test unsafe_ppx_test\
 	js_date js_date_test es6_module_test int_overflow_test float_test bigarray_test float_of_bits_test swap_test int64_mul_div_test\
 	ffi_test shift_test debugger_test caml_format_test js_val epsilon_test io_test random_test ffi_js_test\
-	stringmatch_test printf_sim test_external_unit ext_array int32_test hamming_test pr_regression_test\
+	stringmatch_test printf_sim test_external_unit \
+	ext_array_test int32_test hamming_test pr_regression_test\
 	to_string_test print_alpha_test ffi_arity_test digest_test string_get_set_test exception_raise_test\
 	class_test debug_keep_test demo_int_map const_test class3_test class4_test class5_test class6_test\
 	class7_test class8_test class_repr pq_test mt_global event_ffi hash_test exception_value_test sprintf_reg_test\
 	scanf_test testing tscanf_test scanf_reference_error_regression_test sprintf_reg_test scanf_io fail_comp\
 	stack_comp_test float_array float_record tfloat_record_test basic_module_test offset\
-	pr6726 undef_regression_test tuple_alloc test_unsupported_primitive module_alias ext_pervasives\
-	test_const_propogate limits_test ext_sys test_unsafe_obj_ffi module_missing_conversion\
+	pr6726 undef_regression_test tuple_alloc test_unsupported_primitive module_alias ext_pervasives_test\
+	test_const_propogate limits_test ext_sys_test test_unsafe_obj_ffi module_missing_conversion\
 	ocaml_proto_test test_unsafe_obj_ffi_ppx ppx_apply_test test_http_server\
 	http_types ignore_test test_index obj_literal_ppx_test obj_literal_ppx\
 	gpr_405_test attr_test uncurry_glob_test nested_obj_test nested_obj_literal\

jscomp/test/a_filename_test.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var Mt           = require("./mt.js");
-var $$Array      = require("../../lib/js/array.js");
-var Block        = require("../../lib/js/block.js");
-var Ext_filename = require("./ext_filename.js");
+var Mt                = require("./mt.js");
+var $$Array           = require("../../lib/js/array.js");
+var Block             = require("../../lib/js/block.js");
+var Ext_filename_test = require("./ext_filename_test.js");
 
 var suites = [/* [] */0];
 
@@ -27,13 +27,13 @@ function eq(loc, x, y) {
 }
 
 function test(param, param$1) {
-  return Ext_filename.node_relative_path(/* true */1, param, param$1);
+  return Ext_filename_test.node_relative_path(/* true */1, param, param$1);
 }
 
 eq("File \"a_filename_test.ml\", line 10, characters 5-12", /* tuple */[
-      Ext_filename.combine("/tmp", "subdir/file.txt"),
-      Ext_filename.combine("/tmp", "/a/tmp.txt"),
-      Ext_filename.combine("/a/tmp.txt", "subdir/file.txt")
+      Ext_filename_test.combine("/tmp", "subdir/file.txt"),
+      Ext_filename_test.combine("/tmp", "/a/tmp.txt"),
+      Ext_filename_test.combine("/a/tmp.txt", "subdir/file.txt")
     ], /* tuple */[
       "/tmp/subdir/file.txt",
       "/a/tmp.txt",
@@ -96,13 +96,13 @@ eq("File \"a_filename_test.ml\", line 55, characters 5-12", test(/* `Dir */[
           "./a/b.js"
         ]), "./b.js");
 
-eq("File \"a_filename_test.ml\", line 60, characters 5-12", Ext_filename.get_extension("a.txt"), ".txt");
+eq("File \"a_filename_test.ml\", line 60, characters 5-12", Ext_filename_test.get_extension("a.txt"), ".txt");
 
-eq("File \"a_filename_test.ml\", line 64, characters 5-12", Ext_filename.get_extension("a"), "");
+eq("File \"a_filename_test.ml\", line 64, characters 5-12", Ext_filename_test.get_extension("a"), "");
 
-eq("File \"a_filename_test.ml\", line 68, characters 5-12", Ext_filename.get_extension(".txt"), ".txt");
+eq("File \"a_filename_test.ml\", line 68, characters 5-12", Ext_filename_test.get_extension(".txt"), ".txt");
 
-eq("File \"a_filename_test.ml\", line 73, characters 5-12", $$Array.map(Ext_filename.normalize_absolute_path, /* array */[
+eq("File \"a_filename_test.ml\", line 73, characters 5-12", $$Array.map(Ext_filename_test.normalize_absolute_path, /* array */[
           "/gsho/./..",
           "/a/b/../c../d/e/f",
           "/a/b/../c/../d/e/f",

jscomp/test/a_filename_test.ml

@@ -5,10 +5,10 @@ let eq loc x y =
   suites := 
     (loc ^" id " ^ (string_of_int !test_id), (fun _ -> Mt.Eq(x,y))) :: !suites
 
-let test = Ext_filename.node_relative_path true 
+let test = Ext_filename_test.node_relative_path true 
 let () =
   eq __LOC__ 
-    (let (//) = Ext_filename.combine in 
+    (let (//) = Ext_filename_test.combine in 
      ("/tmp"// "subdir/file.txt",
       "/tmp"// "/a/tmp.txt",
       "/a/tmp.txt" // "subdir/file.txt"      
@@ -58,20 +58,20 @@ let () =
            (`File "./a/b.js"))
     "./b.js";
   eq __LOC__ 
-    (Ext_filename.get_extension "a.txt"
+    (Ext_filename_test.get_extension "a.txt"
     )
     ".txt";
   eq __LOC__ 
-    (Ext_filename.get_extension "a"
+    (Ext_filename_test.get_extension "a"
     )
     "";
   eq __LOC__ 
-    (Ext_filename.get_extension ".txt"
+    (Ext_filename_test.get_extension ".txt"
     )
     ".txt";
 
   eq __LOC__
-    (Array.map Ext_filename.normalize_absolute_path
+    (Array.map Ext_filename_test.normalize_absolute_path
        [|
          "/gsho/./..";
          "/a/b/../c../d/e/f";

jscomp/test/a_list_test.js

@@ -1,14 +1,14 @@
 'use strict';
 
-var Mt       = require("./mt.js");
-var Block    = require("../../lib/js/block.js");
-var Ext_list = require("./ext_list.js");
+var Mt            = require("./mt.js");
+var Block         = require("../../lib/js/block.js");
+var Ext_list_test = require("./ext_list_test.js");
 
 var suites_000 = /* tuple */[
   "drop",
   (function () {
       return /* Eq */Block.__(0, [
-                Ext_list.drop(3, /* :: */[
+                Ext_list_test.drop(3, /* :: */[
                       0,
                       /* :: */[
                         1,
@@ -28,7 +28,7 @@ var suites_001 = /* :: */[
     "drop1",
     (function () {
         return /* Eq */Block.__(0, [
-                  Ext_list.drop(2, /* :: */[
+                  Ext_list_test.drop(2, /* :: */[
                         0,
                         /* :: */[
                           1,
@@ -66,7 +66,7 @@ var suites_001 = /* :: */[
                         ]
                       ]
                     ],
-                    Ext_list.flat_map((function (x) {
+                    Ext_list_test.flat_map((function (x) {
                             if (x % 2) {
                               return /* :: */[
                                       1,

jscomp/test/a_list_test.ml

@@ -2,12 +2,12 @@
 
 let suites = Mt.[
   "drop", (fun _ -> 
-    Eq (Ext_list.drop 3 [0;1;2], []));
+    Eq (Ext_list_test.drop 3 [0;1;2], []));
   "drop1", (fun _ -> 
-    Eq (Ext_list.drop 2 [0;1;2], [2]));
+    Eq (Ext_list_test.drop 2 [0;1;2], [2]));
   "flat_map", (fun _ -> 
     Eq( [0; 0; 1; 1; 0],
-        Ext_list.flat_map (fun x -> if x mod 2 ==0 then [0] else [1;1]) [0;0;3;0]
+        Ext_list_test.flat_map (fun x -> if x mod 2 ==0 then [0] else [1;1]) [0;0;3;0]
               ))
 ]