Fix sourcedirs.json generation (#7671)

* Catch potential symlinks

* Generate sourcedirs.json

* Revert build

* Only write sourcedirs for local packages with files.

* Revert build changes

* Verify package_path is part of project_root

* Updat comment

* Add changelog entry

* Rename in CI

* Revert "Rename in CI"

This reverts commit 170c1a6.

Author: nojaf

CHANGELOG.md

@@ -28,6 +28,10 @@
 
 - Add rust linting to CI with `clippy`. https://github.com/rescript-lang/rescript/pull/7675
 
+#### :bug: Bug fix
+
+- Fix `--create-sourcedirs` generation with for a single project. https://github.com/rescript-lang/rescript/pull/7671
+
 # 12.0.0-beta.2
 
 #### :boom: Breaking Change

rewatch/src/build/packages.rs

@@ -331,14 +331,14 @@ fn read_dependencies(
             let (config, canonical_path) =
                 match read_dependency(package_name, parent_path, project_root, workspace_root) {
                     Err(error) => {
-                    if show_progress {
-                        println!(
-                            "{} {} Error building package tree. {}",
-                            style("[1/2]").bold().dim(),
-                            CROSS,
-                            error
-                        );
-                    }
+                        if show_progress {
+                            println!(
+                                "{} {} Error building package tree. {}",
+                                style("[1/2]").bold().dim(),
+                                CROSS,
+                                error
+                            );
+                        }
 
                         let parent_path_str = parent_path.to_string_lossy();
                         log::error!(
@@ -356,9 +356,9 @@ fn read_dependencies(
                                     "We could not build package tree  '{package_name}', at path '{parent_path_str}'. Error: {error}",
                                 );
                                 std::process::exit(2)
-                                    }
-                                }
+                            }
                         }
+                    }
                 };
 
             let is_pinned = parent_config
@@ -374,7 +374,7 @@ fn read_dependencies(
                 project_root,
                 workspace_root,
                 show_progress,
-                build_dev_deps
+                build_dev_deps,
             );
 
             Dependency {
@@ -413,7 +413,13 @@ pub fn read_package_name(package_dir: &Path) -> Result<String> {
         .ok_or_else(|| anyhow!("No name field found in package.json"))
 }
 
-fn make_package(config: config::Config, package_path: &Path, is_pinned_dep: bool, is_root: bool) -> Package {
+fn make_package(
+    config: config::Config,
+    package_path: &Path,
+    is_pinned_dep: bool,
+    is_root: bool,
+    project_root: &Path,
+) -> Package {
     let source_folders = match config.sources.to_owned() {
         Some(config::OneOrMore::Single(source)) => get_source_dirs(source, None),
         Some(config::OneOrMore::Multiple(sources)) => {
@@ -452,6 +458,11 @@ This inconsistency will cause issues with package resolution.\n",
         );
     }
 
+    let is_local_dep = {
+        package_path.starts_with(project_root)
+            && !package_path.components().any(|c| c.as_os_str() == "node_modules")
+    };
+
     Package {
         name: package_name,
         config: config.to_owned(),
@@ -466,7 +477,7 @@ This inconsistency will cause issues with package resolution.\n",
             .expect("Could not canonicalize"),
         dirs: None,
         is_pinned_dep,
-        is_local_dep: !package_path.components().any(|c| c.as_os_str() == "node_modules"),
+        is_local_dep,
         is_root,
     }
 }
@@ -481,7 +492,7 @@ fn read_packages(
 
     // Store all packages and completely deduplicate them
     let mut map: AHashMap<String, Package> = AHashMap::new();
-    let root_package = make_package(root_config.to_owned(), project_root, false, true);
+    let root_package = make_package(root_config.to_owned(), project_root, false, true, project_root);
     map.insert(root_package.name.to_string(), root_package);
 
     let mut registered_dependencies_set: AHashSet<String> = AHashSet::new();
@@ -496,7 +507,7 @@ fn read_packages(
     ));
     dependencies.iter().for_each(|d| {
         if !map.contains_key(&d.name) {
-            let package = make_package(d.config.to_owned(), &d.path, d.is_pinned, false);
+            let package = make_package(d.config.to_owned(), &d.path, d.is_pinned, false, project_root);
             map.insert(d.name.to_string(), package);
         }
     });

rewatch/src/sourcedirs.rs

@@ -21,15 +21,16 @@ pub struct SourceDirs<'a> {
 }
 
 fn package_to_dirs(package: &Package, root_package_path: &Path) -> AHashSet<Dir> {
-    let relative_path = package.path.strip_prefix(root_package_path).unwrap();
-
-    package
-        .dirs
-        .as_ref()
-        .unwrap_or(&AHashSet::new())
-        .iter()
-        .map(|path| relative_path.join(path))
-        .collect::<AHashSet<PathBuf>>()
+    match package.path.strip_prefix(root_package_path) {
+        Err(_) => AHashSet::new(),
+        Ok(relative_path) => package
+            .dirs
+            .as_ref()
+            .unwrap_or(&AHashSet::new())
+            .iter()
+            .map(|path| relative_path.join(path))
+            .collect::<AHashSet<PathBuf>>(),
+    }
 }
 
 fn deps_to_pkgs<'a>(
@@ -61,11 +62,13 @@ pub fn print(buildstate: &BuildState) {
         .find(|(_name, package)| package.is_root)
         .expect("Could not find root package");
 
-    // Take all packages apart from the root package
+    // Take all local packages with source files.
+    // In the case of a monorepo, the root package typically won't have any source files.
+    // But in the case of a single package, it will be both local, root and have source files.
     let (dirs, pkgs): (Vec<AHashSet<Dir>>, Vec<AHashMap<PackageName, AbsolutePath>>) = buildstate
         .packages
         .par_iter()
-        .filter(|(_name, package)| !package.is_root)
+        .filter(|(_name, package)| package.is_local_dep && package.source_files.is_some())
         .map(|(_name, package)| {
             // Extract Directories
             let dirs = package_to_dirs(package, &root_package.path);