Ensure hoisted package is found.

Author: nojaf

rewatch/src/build/compile.rs

@@ -521,7 +521,9 @@ fn get_dependency_paths(
                     .as_ref()
                     .map(|package| package.path.clone())
             } else {
-                packages::read_dependency(package_name, project_context).ok()
+                // packages will only be None when called by build::get_compiler_args
+                // in that case we can safely pass config as the package config.
+                packages::read_dependency(package_name, config, project_context).ok()
             }
             .map(|canonicalized_path| {
                 vec![

rewatch/src/build/packages.rs

@@ -250,20 +250,45 @@ pub fn read_config(package_dir: &Path) -> Result<Config> {
     }
 }
 
-pub fn read_dependency(package_name: &str, project_context: &ProjectContext) -> Result<PathBuf> {
+pub fn read_dependency(
+    package_name: &str,
+    package_config: &Config,
+    project_context: &ProjectContext,
+) -> Result<PathBuf> {
+    // package folder + node_modules + package_name
+    // This can happen in the following scenario:
+    // The ProjectContext has a MonoRepoContext::MonorepoRoot.
+    // We are reading a dependency from the root package.
+    // And that local dependency has a hoisted dependency.
+    let path_from_current_package = package_config
+        .path
+        .parent()
+        .ok_or_else(|| {
+            anyhow!(
+                "Expected {} to have a parent folder",
+                package_config.path.to_string_lossy()
+            )
+        })
+        .map(|parent_path| helpers::package_path(parent_path, package_name))?;
+
     // current folder + node_modules + package_name
-    let path_from_current_config = {
-        match project_context.current_config.path.parent() {
-            None => Err(anyhow!(
+    let path_from_current_config = project_context
+        .current_config
+        .path
+        .parent()
+        .ok_or_else(|| {
+            anyhow!(
                 "Expected {} to have a parent folder",
                 project_context.current_config.path.to_string_lossy()
-            )),
-            Some(parent_path) => Ok(helpers::package_path(parent_path, package_name)),
-        }
-    }?;
+            )
+        })
+        .map(|parent_path| helpers::package_path(parent_path, package_name))?;
+
     // root folder + node_modules + package_name
     let path_from_root = helpers::package_path(project_context.get_root_path(), package_name);
-    let path = (if path_from_current_config.exists() {
+    let path = (if path_from_current_package.exists() {
+        Ok(path_from_current_package)
+    } else if path_from_current_config.exists() {
         Ok(path_from_current_config)
     } else if path_from_root.exists() {
         Ok(path_from_root)
@@ -324,7 +349,7 @@ fn read_dependencies(
         .par_iter()
         .map(|package_name| {
             let (config, canonical_path) =
-                match read_dependency(package_name, project_context) {
+                match read_dependency(package_name, package_config, project_context) {
                     Err(error) => {
                         if show_progress {
                             println!(

rewatch/testrepo/packages/nohoist/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@testrepo/nohoist",
+  "dependencies": {
+    "rescript": "12.0.0-beta.3",
+    "rescript-bun": "2.0.1"
+  }
+}

rewatch/testrepo/packages/nohoist/rescript.json

@@ -0,0 +1,5 @@
+{
+  "name": "@testrepo/nohoist",
+  "sources": ["src"],
+  "dependencies": ["rescript-bun"]
+}

rewatch/testrepo/packages/nohoist/src/BunSample.mjs

@@ -0,0 +1,6 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+
+console.log(import.meta.dir);
+
+/*  Not a pure module */

rewatch/testrepo/packages/nohoist/src/BunSample.res

@@ -0,0 +1,4 @@
+open RescriptBun
+open RescriptBun.Globals
+
+Console.log(import.meta.dir)

rewatch/testrepo/rescript.json

@@ -26,7 +26,8 @@
     "@testrepo/deprecated-config",
     "@testrepo/file-casing",
     "@testrepo/file-casing-no-namespace",
-    "@testrepo/with-ppx"
+    "@testrepo/with-ppx",
+    "@testrepo/nohoist"
   ],
   "dev-dependencies": [
     "@testrepo/pure-dev"