Fix tests

Author: jfrolich

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

src/build/compile.rs

@@ -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() {

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);

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()
     }
 }
 
@@ -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]