Be more aware of the workspace during clean (#7752)

* Be more aware of the workspace during clean

* Only clean current package

* fmt

* Return is_child from packages make

* Invert if

* Introduce PackageMap to make things a bit more clear.

* Use workspace extension if there is a link, otherwise root_package.

* Add a TODO that we need to clean up some confusing bits.

* Refactor using project_context

* A rescript.json with an unrelated parent can still be a monorepo.

* Remove all from format command.

* get_rescript_legacy inside rescript repository.

* sigh

* StrippedVerbatimPath in before local dep check

* Use proper --version

* Add playground to monorepo

* Copilot nitpicks

* Add test for only formatting the current project.

* Add clean single project test

* Add test for compiler-args

* Get root config from project_context

* Return Result for get_root_package

* Make a conscious split between dev and non-dev local dependencies for MonorepoRoot.

* Add dev project to root of test-repo

* Try and add test for format --dev

* Respect --dev for packages::make in format

* Improve success message

* Add test to ensure we clean dev-dependency with --dev.

* Pass in actual rescript.json

* Ensure dependencies are cleaned as well.

* restore instead of clean

* Address code review remarks of clean.rs

* Store path to config in Config struct

* Format

* Add with-ppx example

* Ensure parse arguments of source package are used.

* Add compiled file from with-ppx

* Update snapshot because new test project.

* Update suffix test.

* One more file to format

* Moar code review suggestions.

* Print if a package is local after checking.

* Remove debug log

* Windows fix of the day

* Wait a bit more on watch file for Windows CI

* Add changelog entry

* Extract common data from enum.

Author: nojaf

CHANGELOG.md

@@ -14,19 +14,25 @@
 
 #### :boom: Breaking Change
 
+- `rescript format` no longer accepts `--all`. All (non-dev) files of the current rescript.json are now formatted by default. https://github.com/rescript-lang/rescript/pull/7752
+
 #### :eyeglasses: Spec Compliance
 
 #### :rocket: New Feature
 
 - Add new Stdlib helpers: `String.capitalize`, `String.isEmpty`, `Dict.size`, `Dict.isEmpty`, `Array.isEmpty`, `Map.isEmpty`, `Set.isEmpty`. https://github.com/rescript-lang/rescript/pull/7516
 
 #### :bug: Bug fix
+
 - Fix issue with ast conversion (for ppx use) on functions with attributes on first argument. https://github.com/rescript-lang/rescript/pull/7761
 
 #### :memo: Documentation
 
 #### :nail_care: Polish
 
+- `rescript format` now has a `--dev` flag that works similar to `rescript clean`. https://github.com/rescript-lang/rescript/pull/7752
+- `rescript clean` now will clean an individual project (see [#7707](https://github.com/rescript-lang/rescript/issues/7707)). https://github.com/rescript-lang/rescript/pull/7752
+
 #### :house: Internal
 
 - AST: Use jsx_tag_name instead of Longindent.t to store jsx tag name. https://github.com/rescript-lang/rescript/pull/7760

rescript.json

@@ -1,4 +1,4 @@
 {
   "name": "rescript",
-  "dependencies": ["@tests/gentype-react-example"]
+  "dependencies": ["@tests/gentype-react-example", "playground"]
 }

rewatch/src/build.rs

@@ -8,11 +8,11 @@ pub mod packages;
 pub mod parse;
 pub mod read_compile_state;
 
-use self::compile::compiler_args;
 use self::parse::parser_args;
 use crate::build::compile::{mark_modules_with_deleted_deps_dirty, mark_modules_with_expired_deps_dirty};
 use crate::helpers::emojis::*;
-use crate::helpers::{self, get_workspace_root};
+use crate::helpers::{self};
+use crate::project_context::ProjectContext;
 use crate::{config, sourcedirs};
 use anyhow::{Result, anyhow};
 use build_types::*;
@@ -55,31 +55,30 @@ pub struct CompilerArgs {
     pub parser_args: Vec<String>,
 }
 
-pub fn get_compiler_args(path: &Path) -> Result<String> {
-    let filename = &helpers::get_abs_path(path);
-    let package_root =
-        helpers::get_abs_path(&helpers::get_nearest_config(path).expect("Couldn't find package root"));
-    let workspace_root = get_workspace_root(&package_root).map(|p| helpers::get_abs_path(&p));
-    let root_rescript_config =
-        packages::read_config(&workspace_root.to_owned().unwrap_or(package_root.to_owned()))?;
-    let rescript_config = packages::read_config(&package_root)?;
-    let is_type_dev = match filename.strip_prefix(&package_root) {
+pub fn get_compiler_args(rescript_file_path: &Path) -> Result<String> {
+    let filename = &helpers::get_abs_path(rescript_file_path);
+    let current_package = helpers::get_abs_path(
+        &helpers::get_nearest_config(rescript_file_path).expect("Couldn't find package root"),
+    );
+    let project_context = ProjectContext::new(&current_package)?;
+
+    let is_type_dev = match filename.strip_prefix(&current_package) {
         Err(_) => false,
-        Ok(relative_path) => root_rescript_config.find_is_type_dev_for_path(relative_path),
+        Ok(relative_path) => project_context
+            .current_config
+            .find_is_type_dev_for_path(relative_path),
     };
 
     // make PathBuf from package root and get the relative path for filename
-    let relative_filename = filename.strip_prefix(PathBuf::from(&package_root)).unwrap();
+    let relative_filename = filename.strip_prefix(PathBuf::from(&current_package)).unwrap();
 
-    let file_path = PathBuf::from(&package_root).join(filename);
+    let file_path = PathBuf::from(&current_package).join(filename);
     let contents = helpers::read_file(&file_path).expect("Error reading file");
 
     let (ast_path, parser_args) = parser_args(
-        &rescript_config,
-        &root_rescript_config,
+        &project_context,
+        &project_context.current_config,
         relative_filename,
-        &workspace_root,
-        workspace_root.as_ref().unwrap_or(&package_root),
         &contents,
     );
     let is_interface = filename.to_string_lossy().ends_with('i');
@@ -90,15 +89,13 @@ pub fn get_compiler_args(path: &Path) -> Result<String> {
         interface_filename.push('i');
         PathBuf::from(&interface_filename).exists()
     };
-    let compiler_args = compiler_args(
-        &rescript_config,
-        &root_rescript_config,
+    let compiler_args = compile::compiler_args(
+        &project_context.current_config,
         &ast_path,
         relative_filename,
         is_interface,
         has_interface,
-        &package_root,
-        &workspace_root,
+        &project_context,
         &None,
         is_type_dev,
         true,
@@ -120,24 +117,16 @@ pub fn initialize_build(
     build_dev_deps: bool,
     snapshot_output: bool,
 ) -> Result<BuildState> {
-    let project_root = helpers::get_abs_path(path);
-    let workspace_root = helpers::get_workspace_root(&project_root);
     let bsc_path = helpers::get_bsc();
-    let root_config_name = packages::read_package_name(&project_root)?;
+    let project_context = ProjectContext::new(path)?;
 
     if !snapshot_output && show_progress {
         print!("{} {}Building package tree...", style("[1/7]").bold().dim(), TREE);
         let _ = stdout().flush();
     }
 
     let timing_package_tree = Instant::now();
-    let packages = packages::make(
-        filter,
-        &project_root,
-        &workspace_root,
-        show_progress,
-        build_dev_deps,
-    )?;
+    let packages = packages::make(filter, &project_context, show_progress, build_dev_deps)?;
     let timing_package_tree_elapsed = timing_package_tree.elapsed();
 
     if !snapshot_output && show_progress {
@@ -167,7 +156,7 @@ pub fn initialize_build(
         let _ = stdout().flush();
     }
 
-    let mut build_state = BuildState::new(project_root, root_config_name, packages, workspace_root, bsc_path);
+    let mut build_state = BuildState::new(project_context, packages, bsc_path);
     packages::parse_packages(&mut build_state);
     let timing_source_files_elapsed = timing_source_files.elapsed();
 
@@ -190,7 +179,7 @@ pub fn initialize_build(
         let _ = stdout().flush();
     }
     let timing_compile_state = Instant::now();
-    let compile_assets_state = read_compile_state::read(&mut build_state);
+    let compile_assets_state = read_compile_state::read(&mut build_state)?;
     let timing_compile_state_elapsed = timing_compile_state.elapsed();
 
     if !snapshot_output && show_progress {
@@ -563,9 +552,8 @@ pub fn build(
 
 pub fn pass_through_legacy(mut args: Vec<OsString>) -> i32 {
     let project_root = helpers::get_abs_path(Path::new("."));
-    let workspace_root = helpers::get_workspace_root(&project_root);
-
-    let rescript_legacy_path = helpers::get_rescript_legacy(&project_root, workspace_root);
+    let project_context = ProjectContext::new(&project_root).unwrap();
+    let rescript_legacy_path = helpers::get_rescript_legacy(&project_context);
 
     args.insert(0, rescript_legacy_path.into());
     let status = std::process::Command::new("node")

rewatch/src/build/build_types.rs

@@ -1,4 +1,6 @@
 use crate::build::packages::{Namespace, Package};
+use crate::config::Config;
+use crate::project_context::ProjectContext;
 use ahash::{AHashMap, AHashSet};
 use std::{fmt::Display, path::PathBuf, time::SystemTime};
 
@@ -89,14 +91,12 @@ impl Module {
 
 #[derive(Debug)]
 pub struct BuildState {
+    pub project_context: ProjectContext,
     pub modules: AHashMap<String, Module>,
     pub packages: AHashMap<String, Package>,
     pub module_names: AHashSet<String>,
-    pub project_root: PathBuf,
-    pub root_config_name: String,
     pub deleted_modules: AHashSet<String>,
     pub bsc_path: PathBuf,
-    pub workspace_root: Option<PathBuf>,
     pub deps_initialized: bool,
 }
 
@@ -109,20 +109,16 @@ impl BuildState {
         self.modules.get(module_name)
     }
     pub fn new(
-        project_root: PathBuf,
-        root_config_name: String,
+        project_context: ProjectContext,
         packages: AHashMap<String, Package>,
-        workspace_root: Option<PathBuf>,
         bsc_path: PathBuf,
     ) -> Self {
         Self {
+            project_context,
             module_names: AHashSet::new(),
             modules: AHashMap::new(),
             packages,
-            project_root,
-            root_config_name,
             deleted_modules: AHashSet::new(),
-            workspace_root,
             bsc_path,
             deps_initialized: false,
         }
@@ -132,6 +128,10 @@ impl BuildState {
         self.modules.insert(module_name.to_owned(), module);
         self.module_names.insert(module_name.to_owned());
     }
+
+    pub fn get_root_config(&self) -> &Config {
+        self.project_context.get_root_config()
+    }
 }
 
 #[derive(Debug)]