Clean generated outputs without a build graph

Signed-off-by: Florian Hammerschmidt <florianh89@gmail.com>

Author: fhammerschmidt

rewatch/src/build/clean.rs

@@ -68,32 +68,35 @@ pub fn remove_compile_assets(package: &packages::Package, source_file: &Path) {
 }
 
 fn clean_source_files(packages: &AHashMap<String, Package>, root_config: &Config) {
-    let rescript_file_locations = packages
-        .values()
-        .filter_map(|package| package.source_files.as_ref().map(|files| (package, files)))
-        .flat_map(|(package, files)| {
-            files
-                .keys()
-                .filter(|file| {
-                    file.extension()
-                        .and_then(|extension| extension.to_str())
-                        .is_some_and(helpers::is_implementation_file)
-                })
-                .flat_map(move |file| {
-                    root_config
-                        .get_package_specs()
-                        .into_iter()
-                        .filter(|spec| spec.in_source)
-                        .map(move |spec| {
-                            let suffix = match spec.suffix {
-                                None => root_config.get_suffix(&spec),
-                                Some(suffix) => suffix,
-                            };
-                            (package.path.join(file), suffix)
-                        })
-                })
-        })
-        .collect::<Vec<(PathBuf, String)>>();
+    let mut rescript_file_locations = Vec::new();
+    for package in packages.values() {
+        let Some(source_files) = &package.source_files else {
+            continue;
+        };
+        for source_file in source_files.keys().filter(|source_file| {
+            source_file
+                .extension()
+                .and_then(|extension| extension.to_str())
+                .is_some_and(helpers::is_implementation_file)
+        }) {
+            for spec in root_config.get_package_specs() {
+                let output_base = if spec.in_source {
+                    package.path.join(source_file)
+                } else {
+                    package
+                        .path
+                        .join("lib")
+                        .join(spec.get_out_of_source_dir())
+                        .join(source_file)
+                };
+                let suffix = match &spec.suffix {
+                    None => root_config.get_suffix(&spec),
+                    Some(suffix) => suffix.clone(),
+                };
+                rescript_file_locations.push((output_base, suffix));
+            }
+        }
+    }
 
     rescript_file_locations
         .par_iter()

rewatch/tests/clean/05-clean-invalid-module-graph.sh

@@ -6,29 +6,53 @@ cd ../../testrepo
 bold "Test: Clean succeeds when the module graph is invalid"
 
 rewatch clean > /dev/null 2>&1
+cp rescript.json rescript.json.clean-invalid.bak
+
+restore_fixture() {
+  rm -rf src/dupe-a src/dupe-b
+  if [ -f rescript.json.clean-invalid.bak ]; then
+    mv rescript.json.clean-invalid.bak rescript.json
+  fi
+  rewatch build > /dev/null 2>&1 || true
+}
+trap restore_fixture EXIT
+
+node -e '
+  const fs = require("fs");
+  const path = process.argv[1];
+  const config = JSON.parse(fs.readFileSync(path, "utf8"));
+  config["package-specs"] = [
+    {module: "esmodule", "in-source": true},
+    {module: "esmodule", "in-source": false, suffix: ".out.mjs"},
+  ];
+  fs.writeFileSync(path, `${JSON.stringify(config, null, 2)}\n`);
+' rescript.json
+
 rewatch build > /dev/null 2>&1
 
-mkdir -p packages/main/src/dupe-a packages/main/src/dupe-b
-echo 'let value = 1' > packages/main/src/dupe-a/DuplicateModule.res
-echo 'let value = 2' > packages/main/src/dupe-b/DuplicateModule.res
+if [ ! -f src/Test.mjs ] || [ ! -f lib/es6/src/Test.out.mjs ]; then
+  error "Test setup did not produce both in-source and out-of-source outputs"
+  exit 1
+fi
+
+mkdir -p src/dupe-a src/dupe-b
+echo 'let value = 1' > src/dupe-a/DuplicateModule.res
+echo 'let value = 2' > src/dupe-b/DuplicateModule.res
 
 error_output=$(rewatch clean 2>&1)
 clean_status=$?
 
-rm -rf packages/main/src/dupe-a packages/main/src/dupe-b
-
 if [ $clean_status -ne 0 ]; then
   error "Clean failed for an invalid module graph"
   printf "%s\n" "$error_output" >&2
-  rewatch build > /dev/null 2>&1
   exit 1
 fi
 
-if [ -f packages/main/src/Main.bs.js ]; then
-  error "Clean left an in-source output behind"
-  rewatch build > /dev/null 2>&1
+if [ -f src/Test.mjs ] || [ -f lib/es6/src/Test.out.mjs ]; then
+  error "Clean left a generated output behind"
   exit 1
 fi
 
-rewatch build > /dev/null 2>&1
+restore_fixture
+trap - EXIT
 success "Invalid module graph cleaned"