Compile dev deps (#159)

Author: Bushuo

src/build.rs

@@ -134,6 +134,7 @@ pub fn initialize_build(
     show_progress: bool,
     path: &str,
     bsc_path: Option<String>,
+    build_dev_deps: bool,
 ) -> Result<BuildState> {
     let project_root = helpers::get_abs_path(path);
     let workspace_root = helpers::get_workspace_root(&project_root);
@@ -150,7 +151,13 @@ pub fn initialize_build(
     }
 
     let timing_package_tree = Instant::now();
-    let packages = packages::make(filter, &project_root, &workspace_root, show_progress)?;
+    let packages = packages::make(
+        filter,
+        &project_root,
+        &workspace_root,
+        show_progress,
+        build_dev_deps,
+    )?;
     let timing_package_tree_elapsed = timing_package_tree.elapsed();
 
     if show_progress {
@@ -476,8 +483,15 @@ pub fn build(
         None
     };
     let timing_total = Instant::now();
-    let mut build_state = initialize_build(default_timing, filter, show_progress, path, bsc_path)
-        .map_err(|e| anyhow!("Could not initialize build. Error: {e}"))?;
+    let mut build_state = initialize_build(
+        default_timing,
+        filter,
+        show_progress,
+        path,
+        bsc_path,
+        build_dev_deps,
+    )
+    .map_err(|e| anyhow!("Could not initialize build. Error: {e}"))?;
 
     match incremental_build(
         &mut build_state,

src/build/clean.rs

@@ -326,7 +326,14 @@ pub fn cleanup_after_build(build_state: &BuildState) {
 pub fn clean(path: &str, show_progress: bool, bsc_path: Option<String>) -> Result<()> {
     let project_root = helpers::get_abs_path(path);
     let workspace_root = helpers::get_workspace_root(&project_root);
-    let packages = packages::make(&None, &project_root, &workspace_root, show_progress)?;
+    let packages = packages::make(
+        &None,
+        &project_root,
+        &workspace_root,
+        show_progress,
+        // Always clean dev dependencies
+        true,
+    )?;
     let root_config_name = packages::read_package_name(&project_root)?;
     let bsc_path = match bsc_path {
         Some(bsc_path) => bsc_path,

src/build/compile.rs

@@ -148,7 +148,7 @@ pub fn compile(
                                 "cmi",
                             );
 
-                            let cmi_digest = helpers::compute_file_hash(&Path::new(&cmi_path));
+                            let cmi_digest = helpers::compute_file_hash(Path::new(&cmi_path));
 
                             let package = build_state
                                 .get_package(&module.package_name)
@@ -189,7 +189,7 @@ pub fn compile(
                                 &build_state.workspace_root,
                                 build_dev_deps,
                             );
-                            let cmi_digest_after = helpers::compute_file_hash(&Path::new(&cmi_path));
+                            let cmi_digest_after = helpers::compute_file_hash(Path::new(&cmi_path));
 
                             // we want to compare both the hash of interface and the implementation
                             // compile assets to verify that nothing changed. We also need to checke the interface
@@ -326,7 +326,7 @@ pub fn compile(
         if files_total_count == compile_universe_count {
             break;
         }
-        if in_progress_modules.len() == 0 || in_progress_modules.eq(&current_in_progres_modules) {
+        if in_progress_modules.is_empty() || in_progress_modules.eq(&current_in_progres_modules) {
             // find the dependency cycle
             let cycle = dependency_cycle::find(
                 &compile_universe

src/build/packages.rs

@@ -480,6 +480,7 @@ pub fn get_source_files(
     package_dir: &Path,
     filter: &Option<regex::Regex>,
     source: &config::PackageSource,
+    build_dev_deps: bool,
 ) -> AHashMap<String, SourceFileMeta> {
     let mut map: AHashMap<String, SourceFileMeta> = AHashMap::new();
 
@@ -493,16 +494,9 @@ pub fn get_source_files(
     };
 
     let path_dir = Path::new(&source.dir);
-    // don't include dev sources for now
-    if type_ != &Some("dev".to_string()) {
+    if (build_dev_deps && type_ == &Some("dev".to_string())) || type_ != &Some("dev".to_string()) {
         match read_folders(filter, package_dir, path_dir, recurse) {
             Ok(files) => map.extend(files),
-            // Err(_e) if type_ == &Some("dev".to_string()) => {
-            //     log::warn!(
-            //         "Could not read folder: {}... Probably ok as type is dev",
-            //         path_dir.to_string_lossy()
-            //     )
-            // }
             Err(_e) => log::error!(
                 "Could not read folder: {:?}. Specified in dependency: {}, located {:?}...",
                 path_dir.to_path_buf().into_os_string(),
@@ -520,13 +514,22 @@ pub fn get_source_files(
 fn extend_with_children(
     filter: &Option<regex::Regex>,
     mut build: AHashMap<String, Package>,
+    build_dev_deps: bool,
 ) -> AHashMap<String, Package> {
     for (_key, package) in build.iter_mut() {
         let mut map: AHashMap<String, SourceFileMeta> = AHashMap::new();
         package
             .source_folders
             .par_iter()
-            .map(|source| get_source_files(&package.name, Path::new(&package.path), filter, source))
+            .map(|source| {
+                get_source_files(
+                    &package.name,
+                    Path::new(&package.path),
+                    filter,
+                    source,
+                    build_dev_deps,
+                )
+            })
             .collect::<Vec<AHashMap<String, SourceFileMeta>>>()
             .into_iter()
             .for_each(|source| map.extend(source));
@@ -568,12 +571,13 @@ pub fn make(
     root_folder: &str,
     workspace_root: &Option<String>,
     show_progress: bool,
+    build_dev_deps: bool,
 ) -> Result<AHashMap<String, Package>> {
     let map = read_packages(root_folder, workspace_root.to_owned(), show_progress)?;
 
     /* Once we have the deduplicated packages, we can add the source files for each - to minimize
      * the IO */
-    let result = extend_with_children(filter, map);
+    let result = extend_with_children(filter, map, build_dev_deps);
 
     Ok(result)
 }

src/config.rs

@@ -505,6 +505,40 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_dev_sources_multiple() {
+        let json = r#"
+        {
+            "name": "@rescript/core",
+            "version": "0.5.0",
+            "sources": [
+                { "dir": "src" },
+                { "dir": "test", "type": "dev" }
+            ],
+            "package-specs": {
+              "module": "esmodule",
+              "in-source": true
+            },
+            "bs-dev-dependencies": ["@rescript/tools"],
+            "suffix": ".mjs",
+            "warnings": {
+              "error": "+101"
+            }
+        }
+        "#;
+
+        let config = serde_json::from_str::<Config>(json).unwrap();
+        if let Some(OneOrMore::Multiple(sources)) = config.sources {
+            let src_dir = sources[0].to_qualified_without_children(None);
+            let test_dir = sources[1].to_qualified_without_children(None);
+
+            assert_eq!(test_dir.type_, Some(String::from("dev")));
+        } else {
+            dbg!(config.sources);
+            unreachable!()
+        }
+    }
+
     #[test]
     fn test_detect_gentypeconfig() {
         let json = r#"

src/watcher.rs

@@ -55,8 +55,8 @@ async fn async_watch(
     create_sourcedirs: bool,
     build_dev_deps: bool,
 ) -> notify::Result<()> {
-    let mut build_state =
-        build::initialize_build(None, filter, show_progress, path, None).expect("Can't initialize build");
+    let mut build_state = build::initialize_build(None, filter, show_progress, path, None, build_dev_deps)
+        .expect("Can't initialize build");
     let mut needs_compile_type = CompileType::Incremental;
     // create a mutex to capture if ctrl-c was pressed
     let ctrlc_pressed = Arc::new(Mutex::new(false));
@@ -214,8 +214,9 @@ async fn async_watch(
             }
             CompileType::Full => {
                 let timing_total = Instant::now();
-                build_state = build::initialize_build(None, filter, show_progress, path, None)
-                    .expect("Can't initialize build");
+                build_state =
+                    build::initialize_build(None, filter, show_progress, path, None, build_dev_deps)
+                        .expect("Can't initialize build");
                 let _ = build::incremental_build(
                     &mut build_state,
                     None,

testrepo/bsconfig.json

@@ -19,15 +19,16 @@
     "@testrepo/dep01",
     "@testrepo/dep02",
     "@testrepo/new-namespace",
-    "@testrepo/namespace-casing"
-
+    "@testrepo/namespace-casing",
+    "@testrepo/with-dev-deps"
   ],
   "bs-dependencies": [
     "@testrepo/main",
     "@testrepo/dep01",
     "@testrepo/dep02",
     "@testrepo/new-namespace",
-    "@testrepo/namespace-casing"
+    "@testrepo/namespace-casing",
+    "@testrepo/with-dev-deps"
   ],
   "reason": {
     "react-jsx": 3

testrepo/package.json

@@ -7,7 +7,8 @@
       "packages/dep01",
       "packages/dep02",
       "packages/new-namespace",
-      "packages/namespace-casing"
+      "packages/namespace-casing",
+      "packages/with-dev-deps"
     ]
   },
   "scripts": {

testrepo/packages/with-dev-deps/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "@testrepo/with-dev-deps",
+  "version": "0.0.1",
+  "keywords": [
+    "rescript"
+  ],
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "rescript": "*"
+  }
+}

testrepo/packages/with-dev-deps/rescript.json

@@ -0,0 +1,17 @@
+{
+  "name": "@testrepo/with-dev-deps",
+  "sources": [
+    {
+      "dir": "src"
+    },
+    {
+      "dir": "test",
+      "type": "dev"
+    }
+  ],
+  "package-specs": {
+    "module": "es6",
+    "in-source": true
+  },
+  "suffix": ".res.js"
+}