do everything proper from the package specs

Author: jfrolich

src/build/clean.rs

@@ -70,16 +70,31 @@ pub fn clean_mjs_files(build_state: &BuildState) {
                     .packages
                     .get(&build_state.root_config_name)
                     .expect("Could not find root package");
-                Some((
-                    std::path::PathBuf::from(package.path.to_string())
-                        .join(&source_file.implementation.path)
-                        .to_string_lossy()
-                        .to_string(),
-                    root_package.config.get_suffix(),
-                ))
+
+                Some(
+                    root_package
+                        .config
+                        .get_package_specs()
+                        .iter()
+                        .filter_map(|spec| {
+                            if spec.in_source {
+                                Some((
+                                    std::path::PathBuf::from(package.path.to_string())
+                                        .join(&source_file.implementation.path)
+                                        .to_string_lossy()
+                                        .to_string(),
+                                    spec.get_suffix(),
+                                ))
+                            } else {
+                                None
+                            }
+                        })
+                        .collect::<Vec<(String, String)>>(),
+                )
             }
             _ => None,
         })
+        .flatten()
         .collect::<Vec<(String, String)>>();
 
     rescript_file_locations

src/build/compile.rs

@@ -488,7 +488,7 @@ pub fn compiler_args(
                                 .unwrap()
                             )
                         },
-                        root_config.get_suffix()
+                        spec.get_suffix()
                     ),
                 ];
             })
@@ -671,26 +671,31 @@ fn compile_file(
             }
 
             // copy js file
-            match &module.source_type {
-                SourceType::SourceFile(SourceFile {
-                    implementation: Implementation { path, .. },
-                    ..
-                }) => {
-                    let source = helpers::get_source_file_from_rescript_file(
-                        &std::path::Path::new(&package.path).join(path),
-                        &root_package.config.get_suffix(),
-                    );
-                    let destination = helpers::get_source_file_from_rescript_file(
-                        &std::path::Path::new(&package.get_build_path()).join(path),
-                        &root_package.config.get_suffix(),
-                    );
-
-                    if source.exists() {
-                        let _ = std::fs::copy(&source, &destination).expect("copying source file failed");
+            root_package.config.get_package_specs().iter().for_each(|spec| {
+                if spec.in_source {
+                    match &module.source_type {
+                        SourceType::SourceFile(SourceFile {
+                            implementation: Implementation { path, .. },
+                            ..
+                        }) => {
+                            let source = helpers::get_source_file_from_rescript_file(
+                                &std::path::Path::new(&package.path).join(path),
+                                &spec.get_suffix(),
+                            );
+                            let destination = helpers::get_source_file_from_rescript_file(
+                                &std::path::Path::new(&package.get_build_path()).join(path),
+                                &spec.get_suffix(),
+                            );
+
+                            if source.exists() {
+                                let _ =
+                                    std::fs::copy(&source, &destination).expect("copying source file failed");
+                            }
+                        }
+                        _ => (),
                     }
                 }
-                _ => (),
-            }
+            });
 
             if helpers::contains_ascii_characters(&err) {
                 if package.is_pinned_dep || package.is_local_dep {

src/build/read_compile_state.rs

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

src/config.rs

@@ -126,6 +126,10 @@ impl PackageSpec {
             _ => false,
         }
     }
+
+    pub fn get_suffix(&self) -> String {
+        self.suffix.to_owned().unwrap_or(".js".to_string())
+    }
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -413,31 +417,6 @@ impl Config {
         }
     }
 
-    pub fn get_module(&self) -> String {
-        match &self.package_specs {
-            Some(OneOrMore::Single(PackageSpec { module, .. })) => module.to_string(),
-            Some(OneOrMore::Multiple(vec)) => match vec.first() {
-                Some(PackageSpec { module, .. }) => module.to_string(),
-                None => "commonjs".to_string(),
-            },
-            _ => "commonjs".to_string(),
-        }
-    }
-
-    pub fn get_suffix(&self) -> String {
-        match &self.package_specs {
-            Some(OneOrMore::Single(PackageSpec { suffix, .. })) => suffix.to_owned(),
-            Some(OneOrMore::Multiple(vec)) => match vec.first() {
-                Some(PackageSpec { suffix, .. }) => suffix.to_owned(),
-                None => None,
-            },
-
-            _ => None,
-        }
-        .or(self.suffix.to_owned())
-        .unwrap_or(".js".to_string())
-    }
-
     pub fn get_gentype_arg(&self) -> Vec<String> {
         match &self.gentype_config {
             Some(_) => vec!["-bs-gentype".to_string()],
@@ -447,7 +426,11 @@ impl Config {
 
     pub fn get_package_specs(&self) -> Vec<PackageSpec> {
         match self.package_specs.clone() {
-            None => vec![],
+            None => vec![PackageSpec {
+                module: "commonjs".to_string(),
+                in_source: true,
+                suffix: Some(".js".to_string()),
+            }],
             Some(OneOrMore::Single(spec)) => vec![spec],
             Some(OneOrMore::Multiple(vec)) => vec,
         }