Resolve workspace dependencies in editor analysis (#8392)

* Resolve workspace dependencies in editor analysis

* CHANGELOG

Author: cknitt

CHANGELOG.md

@@ -30,6 +30,7 @@
 #### :nail_care: Polish
 
 - Improve default argument type mismatch errors. https://github.com/rescript-lang/rescript/pull/8389
+- Resolve workspace dependencies in editor analysis. https://github.com/rescript-lang/rescript/pull/8392
 
 #### :house: Internal
 

analysis/src/FindFiles.ml

@@ -135,6 +135,32 @@ let collectFiles directory =
          | None -> None
          | Some res -> Some (modName, SharedTypes.Impl {cmt; res}))
 
+(* Dependency resolution uses the package graph recorded by the build system in
+   .sourcedirs.json when available. If a package is not listed there, analysis
+   falls back to walking up node_modules from the project root. *)
+let readSourcedirsPackageRoots base =
+  let sourceDirsFile = base /+ "lib" /+ "bs" /+ ".sourcedirs.json" in
+  let readPackageEntry = function
+    | Json.Array [Json.String name; Json.String path] ->
+      let path = if Filename.is_relative path then base /+ path else path in
+      Some (name, path)
+    | _ -> None
+  in
+  match Files.readFile sourceDirsFile with
+  | None -> []
+  | Some text -> (
+    match Json.parse text with
+    | None -> []
+    | Some json -> (
+      match json |> Json.get "pkgs" |> bind Json.array with
+      | None -> []
+      | Some packages -> packages |> List.filter_map readPackageEntry))
+
+let findPackageRoot ~base ~sourcedirsPackageRoots name =
+  match List.assoc_opt name sourcedirsPackageRoots with
+  | Some path when Files.exists path -> Some path
+  | _ -> ModuleResolution.resolveNodeModulePath ~startPath:base name
+
 (* returns a list of (absolute path to cmt(i), relative path from base to source file) *)
 let findProjectFiles ~public ~namespace ~path ~sourceDirectories ~libBs =
   let dirs =
@@ -233,12 +259,12 @@ let findDependencyFiles base config =
   in
   let deps = deps @ devDeps in
   Log.log ("Dependencies: " ^ String.concat " " deps);
+  let sourcedirsPackageRoots = readSourcedirsPackageRoots base in
   let depFiles =
     deps
     |> List.map (fun name ->
            let result =
-             Json.bind
-               (ModuleResolution.resolveNodeModulePath ~startPath:base name)
+             Json.bind (findPackageRoot ~base ~sourcedirsPackageRoots name)
                (fun path ->
                  let rescriptJsonPath = path /+ "rescript.json" in
 

tests/analysis_tests/Makefile

@@ -4,6 +4,7 @@ test-analysis-binary:
 	make -C tests test
 	make -C tests-generic-jsx-transform test
 	make -C tests-incremental-typechecking test
+	make -C tests-sourcedirs-dependency test
 
 test-reanalyze:
 	make -C tests-reanalyze test
@@ -14,6 +15,7 @@ clean:
 	make -C tests clean
 	make -C tests-generic-jsx-transform clean
 	make -C tests-incremental-typechecking clean
+	make -C tests-sourcedirs-dependency clean
 	make -C tests-reanalyze clean
 
 .PHONY: test-analysis-binary test-reanalyze clean test

tests/analysis_tests/tests-sourcedirs-dependency/.gitignore

@@ -0,0 +1,2 @@
+lib/
+node_modules/

tests/analysis_tests/tests-sourcedirs-dependency/Makefile

@@ -0,0 +1,14 @@
+SHELL = /bin/bash
+
+build:
+	yarn build
+
+test: build
+	./test.sh
+
+clean:
+	yarn clean
+
+.DEFAULT_GOAL := test
+
+.PHONY: clean test

tests/analysis_tests/tests-sourcedirs-dependency/dependency/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "@tests/sourcedirs-dependency-lib",
+  "private": true,
+  "scripts": {
+    "build": "rescript build",
+    "clean": "rescript clean"
+  },
+  "dependencies": {
+    "rescript": "workspace:^"
+  }
+}

tests/analysis_tests/tests-sourcedirs-dependency/dependency/rescript.json

@@ -0,0 +1,11 @@
+{
+  "name": "@tests/sourcedirs-dependency-lib",
+  "sources": [
+    {
+      "dir": "src",
+      "subdirs": true
+    }
+  ],
+  "package-specs": [{ "module": "commonjs", "in-source": false }],
+  "suffix": ".res.js"
+}

tests/analysis_tests/tests-sourcedirs-dependency/dependency/src/WorkspaceDep.res

@@ -0,0 +1 @@
+let valueFromDependency = 1

tests/analysis_tests/tests-sourcedirs-dependency/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "@tests/sourcedirs-dependency",
+  "private": true,
+  "scripts": {
+    "build": "rescript build",
+    "clean": "rescript clean"
+  },
+  "dependencies": {
+    "@tests/sourcedirs-dependency-lib": "workspace:*",
+    "rescript": "workspace:^"
+  }
+}

tests/analysis_tests/tests-sourcedirs-dependency/rescript.json

@@ -0,0 +1,12 @@
+{
+  "name": "@tests/sourcedirs-dependency",
+  "sources": [
+    {
+      "dir": "src",
+      "subdirs": true
+    }
+  ],
+  "dependencies": ["@tests/sourcedirs-dependency-lib"],
+  "package-specs": [{ "module": "commonjs", "in-source": false }],
+  "suffix": ".res.js"
+}