upstream new version of rewatch

Author: jfrolich

rewatch/.gitignore

@@ -1,3 +1,3 @@
 /target
-/docs
 .DS_Store
+/docs

rewatch/src/build/clean.rs

@@ -83,7 +83,7 @@ pub fn clean_mjs_files(build_state: &BuildState) {
                                         .join(&source_file.implementation.path)
                                         .to_string_lossy()
                                         .to_string(),
-                                    spec.get_suffix(),
+                                    root_package.config.get_suffix(spec),
                                 ))
                             } else {
                                 None

rewatch/src/build/compile.rs

@@ -460,7 +460,7 @@ pub fn compiler_args(
         vec![]
     } else {
         debug!("Compiling file: {}", &module_name);
-        let specs = config.get_package_specs();
+        let specs = root_config.get_package_specs();
 
         specs
             .iter()
@@ -488,7 +488,7 @@ pub fn compiler_args(
                                 .unwrap()
                             )
                         },
-                        spec.get_suffix()
+                        root_config.get_suffix(spec),
                     ),
                 ];
             })
@@ -680,11 +680,11 @@ fn compile_file(
                         }) => {
                             let source = helpers::get_source_file_from_rescript_file(
                                 &std::path::Path::new(&package.path).join(path),
-                                &spec.get_suffix(),
+                                &root_package.config.get_suffix(spec),
                             );
                             let destination = helpers::get_source_file_from_rescript_file(
                                 &std::path::Path::new(&package.get_build_path()).join(path),
-                                &spec.get_suffix(),
+                                &root_package.config.get_suffix(spec),
                             );
 
                             if source.exists() {

rewatch/src/build/read_compile_state.rs

@@ -105,10 +105,7 @@ pub fn read(build_state: &mut BuildState) -> CompileAssetsState {
                                 is_root: *package_is_root,
                                 suffix: root_package
                                     .config
-                                    .get_package_specs()
-                                    .first()
-                                    .map(|spec| spec.get_suffix())
-                                    .unwrap(),
+                                    .get_suffix(root_package.config.get_package_specs().first().unwrap()),
                             },
                         );
                         let _ = ast_rescript_file_locations.insert(res_file_path);

rewatch/src/config.rs

@@ -127,8 +127,8 @@ impl PackageSpec {
         }
     }
 
-    pub fn get_suffix(&self) -> String {
-        self.suffix.to_owned().unwrap_or(".js".to_string())
+    pub fn get_suffix(&self) -> Option<String> {
+        self.suffix.to_owned()
     }
 }
 
@@ -203,13 +203,13 @@ pub struct Config {
     pub suffix: Option<String>,
     #[serde(rename = "pinned-dependencies")]
     pub pinned_dependencies: Option<Vec<String>>,
-    #[serde(rename = "bs-dependencies")]
+    #[serde(rename = "dependencies", alias = "bs-dependencies")]
     pub bs_dependencies: Option<Vec<String>>,
-    #[serde(rename = "bs-dev-dependencies")]
+    #[serde(rename = "bs-dev-dependencies", alias = "dev-dependencies")]
     pub bs_dev_dependencies: Option<Vec<String>>,
     #[serde(rename = "ppx-flags")]
     pub ppx_flags: Option<Vec<OneOrMore<String>>>,
-    #[serde(rename = "bsc-flags")]
+    #[serde(rename = "bsc-flags", alias = "compiler-flags")]
     pub bsc_flags: Option<Vec<OneOrMore<String>>>,
     pub reason: Option<Reason>,
     pub namespace: Option<NamespaceConfig>,
@@ -435,6 +435,12 @@ impl Config {
             Some(OneOrMore::Multiple(vec)) => vec,
         }
     }
+
+    pub fn get_suffix(&self, spec: &PackageSpec) -> String {
+        spec.get_suffix()
+            .or(self.suffix.clone())
+            .unwrap_or(".js".to_string())
+    }
 }
 
 #[cfg(test)]
@@ -455,8 +461,11 @@ mod tests {
         "#;
 
         let config = serde_json::from_str::<Config>(json).unwrap();
-        assert_eq!(config.get_suffix(), ".mjs");
-        assert_eq!(config.get_module(), "es6");
+        let specs = config.get_package_specs();
+        assert_eq!(specs.len(), 1);
+        let spec = specs.first().unwrap();
+        assert_eq!(spec.module, "es6");
+        assert_eq!(config.get_suffix(spec), ".mjs");
     }
 
     #[test]
@@ -543,6 +552,134 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_get_suffix() {
+        let json = r#"
+        {
+            "name": "testrepo",
+            "sources": {
+                "dir": "src",
+                "subdirs": true
+            },
+            "package-specs": [
+                {
+                "module": "es6",
+                "in-source": true
+                }
+            ],
+            "suffix": ".mjs"
+        }
+        "#;
+
+        let config = serde_json::from_str::<Config>(json).unwrap();
+        assert_eq!(
+            config.get_suffix(&config.get_package_specs().first().unwrap()),
+            ".mjs"
+        );
+    }
+
+    #[test]
+    fn test_dependencies() {
+        let json = r#"
+        {
+            "name": "testrepo",
+            "sources": {
+                "dir": "src",
+                "subdirs": true
+            },
+            "package-specs": [
+                {
+                "module": "es6",
+                "in-source": true
+                }
+            ],
+            "suffix": ".mjs",
+            "bs-dependencies": [ "@testrepo/main" ]
+        }
+        "#;
+
+        let config = serde_json::from_str::<Config>(json).unwrap();
+        assert_eq!(config.bs_dependencies, Some(vec!["@testrepo/main".to_string()]));
+    }
+
+    #[test]
+    fn test_dependencies_alias() {
+        let json = r#"
+        {
+            "name": "testrepo",
+            "sources": {
+                "dir": "src",
+                "subdirs": true
+            },
+            "package-specs": [
+                {
+                "module": "es6",
+                "in-source": true
+                }
+            ],
+            "suffix": ".mjs",
+            "dependencies": [ "@testrepo/main" ]
+        }
+        "#;
+
+        let config = serde_json::from_str::<Config>(json).unwrap();
+        assert_eq!(config.bs_dependencies, Some(vec!["@testrepo/main".to_string()]));
+    }
+
+    #[test]
+    fn test_dev_dependencies() {
+        let json = r#"
+        {
+            "name": "testrepo",
+            "sources": {
+                "dir": "src",
+                "subdirs": true
+            },
+            "package-specs": [
+                {
+                "module": "es6",
+                "in-source": true
+                }
+            ],
+            "suffix": ".mjs",
+            "bs-dev-dependencies": [ "@testrepo/main" ]
+        }
+        "#;
+
+        let config = serde_json::from_str::<Config>(json).unwrap();
+        assert_eq!(
+            config.bs_dev_dependencies,
+            Some(vec!["@testrepo/main".to_string()])
+        );
+    }
+
+    #[test]
+    fn test_dev_dependencies_alias() {
+        let json = r#"
+        {
+            "name": "testrepo",
+            "sources": {
+                "dir": "src",
+                "subdirs": true
+            },
+            "package-specs": [
+                {
+                "module": "es6",
+                "in-source": true
+                }
+            ],
+            "suffix": ".mjs",
+            "dev-dependencies": [ "@testrepo/main" ]
+        }
+        "#;
+
+        let config = serde_json::from_str::<Config>(json).unwrap();
+        assert_eq!(
+            config.bs_dev_dependencies,
+            Some(vec!["@testrepo/main".to_string()])
+        );
+    }
+
     #[test]
     fn test_check_if_rescript11_or_higher() {
         assert_eq!(check_if_rescript11_or_higher("11.0.0"), Ok(true));