Merge pull request #4045 from Coobaha/feat/duplicated-symlinks

Fix duplicated packages warning for same symlinked packages

Author: bobzhang

jscomp/bsb/bsb_pkg.ml

@@ -151,7 +151,7 @@ let resolve_bs_package ~cwd (package : t) =
     | Some x
       ->
       let result = resolve_bs_package_aux ~cwd package in
-      if result <> x then
+      if not (Bsb_real_path.is_same_paths_via_io result x) then
         begin
           Bsb_log.warn
             "@{<warning>Duplicated package:@} %a %s (chosen) vs %s in %s @." 

jscomp/bsb/bsb_real_path.ml

@@ -0,0 +1,35 @@
+let (//) = Filename.concat
+
+let getchdir s =
+  let p = Sys.getcwd () in
+  Unix.chdir s;
+  p
+
+let normalize s = getchdir (getchdir s)
+
+let real_path p =
+  match (try Some (Sys.is_directory p) with Sys_error _ -> None) with
+  | None ->
+    let rec resolve dir =
+      if Sys.file_exists dir then normalize dir else
+      let parent = Filename.dirname dir in
+      if dir = parent then dir
+      else  (resolve parent) // (Filename.basename dir)
+    in
+    let p =
+      if Filename.is_relative p then (Sys.getcwd ()) // p
+      else p
+    in
+    resolve p
+  | Some true -> normalize p
+  | Some false ->
+    let dir = normalize (Filename.dirname p) in
+    match Filename.basename p with
+    | "." -> dir
+    | base -> dir // base
+
+
+let is_same_paths_via_io a b =
+  if a = b
+  then true
+  else (real_path a) = (real_path b)

jscomp/bsb/bsb_real_path.mli

@@ -0,0 +1,3 @@
+val real_path : string -> string 
+
+val is_same_paths_via_io : string -> string -> bool 

jscomp/build_tests/duplicated_symlinked_packages/.gitignore

@@ -0,0 +1,2 @@
+.merlin
+**/lib

jscomp/build_tests/duplicated_symlinked_packages/README.md

@@ -0,0 +1,36 @@
+Special tests for duplicated symlink warnings
+
+
+```
+.
+├── a
+│   ├── node_modules
+│   │   ├── c -> ../../c
+│   │   └── z
+│   │       ├── lib
+│   │       │   ├── bs
+│   │       │   └── ocaml
+│   │       └── src
+│   └── src
+├── b
+│   ├── node_modules
+│   │   └── c -> ../../c
+│   └── src
+├── c
+│   └── src
+├── node_modules
+│   ├── a -> ../a
+│   ├── b -> ../b
+│   └── z
+│       └── src
+└── out.expected
+└── src
+
+```
+
+`c` is symlinked everywhere, while `z` is actually conflicting package. 
+
+`out.expected` has exactly 1 warning for `z` conflict
+
+Run `node ./jscomp/build_tests/duplicated_symlinked_packages/input.js` to check the tests against previous snapshots.
+Run `node ./jscomp/build_tests/duplicated_symlinked_packages/input.js update` to update the snapshots (assuming you've made some changes to duplicated)

jscomp/build_tests/duplicated_symlinked_packages/a/bsconfig.json

@@ -0,0 +1,22 @@
+{
+  "name": "a",
+  "version": "0.1.0",
+  "sources": {
+    "dir" : "src",
+    "subdirs" : true
+  },
+  "package-specs": {
+    "module": "commonjs",
+    "in-source": true
+  },
+  "suffix": ".bs.js",
+  "bs-dependencies": [
+    "c",
+    "z"
+  ],
+  "warnings": {
+    "error" : "+101"
+  },
+  "namespace": true,
+  "refmt": 3
+}