🚚 - Rename bsconfig -> config

Author: rolandpeelen

src/build.rs

@@ -57,12 +57,12 @@ pub struct CompilerArgs {
 pub fn get_compiler_args(path: &str, rescript_version: Option<String>, bsc_path: Option<String>) -> String {
     let filename = &helpers::get_abs_path(path);
     let package_root = helpers::get_abs_path(
-        &helpers::get_nearest_bsconfig(&std::path::PathBuf::from(path)).expect("Couldn't find package root"),
+        &helpers::get_nearest_config(&std::path::PathBuf::from(path)).expect("Couldn't find package root"),
     );
     let workspace_root = get_workspace_root(&package_root).map(|p| helpers::get_abs_path(&p));
     let root_rescript_config =
-        packages::read_bsconfig(&workspace_root.to_owned().unwrap_or(package_root.to_owned()));
-    let rescript_config = packages::read_bsconfig(&package_root);
+        packages::read_config(&workspace_root.to_owned().unwrap_or(package_root.to_owned()));
+    let rescript_config = packages::read_config(&package_root);
     let rescript_version = if let Some(rescript_version) = rescript_version {
         rescript_version
     } else {

src/build/build_types.rs

@@ -119,6 +119,7 @@ impl BuildState {
             deps_initialized: false,
         }
     }
+
     pub fn insert_module(&mut self, module_name: &str, module: Module) {
         self.modules.insert(module_name.to_owned(), module);
         self.module_names.insert(module_name.to_owned());

src/build/clean.rs

@@ -74,7 +74,7 @@ pub fn clean_mjs_files(build_state: &BuildState) {
                         .join(&source_file.implementation.path)
                         .to_string_lossy()
                         .to_string(),
-                    root_package.bsconfig.get_suffix(),
+                    root_package.config.get_suffix(),
                 ))
             }
             _ => None,

src/build/compile.rs

@@ -5,7 +5,7 @@ mod dependency_cycle;
 use super::build_types::*;
 use super::logs;
 use super::packages;
-use crate::bsconfig;
+use crate::config;
 use crate::helpers;
 use ahash::{AHashMap, AHashSet};
 use console::style;
@@ -359,8 +359,8 @@ pub fn compile(
 }
 
 pub fn compiler_args(
-    config: &bsconfig::Config,
-    root_config: &bsconfig::Config,
+    config: &config::Config,
+    root_config: &config::Config,
     ast_path: &str,
     version: &str,
     file_path: &str,
@@ -374,11 +374,11 @@ pub fn compiler_args(
 ) -> Vec<String> {
     let normal_deps = config.bs_dependencies.as_ref().unwrap_or(&vec![]).to_owned();
 
-    let bsc_flags = bsconfig::flatten_flags(&config.bsc_flags);
+    let bsc_flags = config::flatten_flags(&config.bsc_flags);
     // don't compile dev-deps yet
     // let dev_deps = source
     //     .package
-    //     .bsconfig
+    //     .config
     //     .bs_dev_dependencies
     //     .as_ref()
     //     .unwrap_or(&vec![])
@@ -442,10 +442,10 @@ pub fn compiler_args(
             };
 
             let warn_error = match warnings.error {
-                Some(bsconfig::Error::Catchall(true)) => {
+                Some(config::Error::Catchall(true)) => {
                     vec!["-warn-error".to_string(), "A".to_string()]
                 }
-                Some(bsconfig::Error::Qualified(errors)) => {
+                Some(config::Error::Qualified(errors)) => {
                     vec!["-warn-error".to_string(), errors.to_string()]
                 }
                 _ => vec![],
@@ -532,8 +532,8 @@ fn compile_file(
     let module_name = helpers::file_path_to_module_name(implementation_file_path, &package.namespace);
     let has_interface = module.get_interface().is_some();
     let to_mjs_args = compiler_args(
-        &package.bsconfig,
-        &root_package.bsconfig,
+        &package.config,
+        &root_package.config,
         ast_path,
         version,
         implementation_file_path,