refactor: rename `RootConfig` to `CliOptions` (#15007)

1 files changed, 15 insertions, 13 deletions

diff --git a/cli/tools/test.rs b/cli/tools/test.rs
index 3b3f8dc4b..ab6ded1b0 100644
--- a/cli/tools/test.rs
+++ b/cli/tools/test.rs
@@ -1020,7 +1020,7 @@ pub async fn check_specifiers(
   permissions: Permissions,
   specifiers: Vec<(ModuleSpecifier, TestMode)>,
 ) -> Result<(), AnyError> {
-  let lib = ps.config.ts_type_lib_window();
+  let lib = ps.options.ts_type_lib_window();
   let inline_files = fetch_inline_files(
     ps.clone(),
     specifiers
@@ -1088,7 +1088,7 @@ async fn test_specifiers(
   specifiers_with_mode: Vec<(ModuleSpecifier, TestMode)>,
   options: TestSpecifierOptions,
 ) -> Result<(), AnyError> {
-  let log_level = ps.config.log_level();
+  let log_level = ps.options.log_level();
   let specifiers_with_mode = if let Some(seed) = options.shuffle {
     let mut rng = SmallRng::seed_from_u64(seed);
     let mut specifiers_with_mode = specifiers_with_mode.clone();
@@ -1333,7 +1333,8 @@ pub async fn run_tests(
   test_flags: TestFlags,
 ) -> Result<(), AnyError> {
   let ps = ProcState::build(flags).await?;
-  let permissions = Permissions::from_options(&ps.config.permissions_options());
+  let permissions =
+    Permissions::from_options(&ps.options.permissions_options());
   let specifiers_with_mode = fetch_specifiers_with_test_mode(
     &ps,
     test_flags.include.unwrap_or_else(|| vec![".".to_string()]),
@@ -1353,7 +1354,7 @@ pub async fn run_tests(
     return Ok(());
   }
 
-  let compat = ps.config.compat();
+  let compat = ps.options.compat();
   test_specifiers(
     ps,
     permissions,
@@ -1377,12 +1378,13 @@ pub async fn run_tests_with_watch(
   test_flags: TestFlags,
 ) -> Result<(), AnyError> {
   let ps = ProcState::build(flags).await?;
-  let permissions = Permissions::from_options(&ps.config.permissions_options());
+  let permissions =
+    Permissions::from_options(&ps.options.permissions_options());
 
   let include = test_flags.include.unwrap_or_else(|| vec![".".to_string()]);
   let ignore = test_flags.ignore.clone();
   let paths_to_watch: Vec<_> = include.iter().map(PathBuf::from).collect();
-  let no_check = ps.config.type_check_mode() == TypeCheckMode::None;
+  let no_check = ps.options.type_check_mode() == TypeCheckMode::None;
 
   let resolver = |changed: Option<Vec<PathBuf>>| {
     let mut cache = cache::FetchCacher::new(
@@ -1398,15 +1400,15 @@ pub async fn run_tests_with_watch(
     let maybe_import_map_resolver =
       ps.maybe_import_map.clone().map(ImportMapResolver::new);
     let maybe_jsx_resolver = ps
-      .config
+      .options
       .to_maybe_jsx_import_source_module()
       .map(|im| JsxResolver::new(im, maybe_import_map_resolver.clone()));
     let maybe_locker = lockfile::as_maybe_locker(ps.lockfile.clone());
-    let maybe_imports_result = ps.config.to_maybe_imports();
+    let maybe_imports_result = ps.options.to_maybe_imports();
     let files_changed = changed.is_some();
     let include = include.clone();
     let ignore = ignore.clone();
-    let check_js = ps.config.check_js();
+    let check_js = ps.options.check_js();
 
     async move {
       let test_modules = if test_flags.doc {
@@ -1535,9 +1537,9 @@ pub async fn run_tests_with_watch(
     })
   };
 
-  let root_config = ps.config.clone();
+  let cli_options = ps.options.clone();
   let operation = |modules_to_reload: Vec<(ModuleSpecifier, ModuleKind)>| {
-    let root_config = root_config.clone();
+    let cli_options = cli_options.clone();
     let filter = test_flags.filter.clone();
     let include = include.clone();
     let ignore = ignore.clone();
@@ -1571,7 +1573,7 @@ pub async fn run_tests_with_watch(
         permissions.clone(),
         specifiers_with_mode,
         TestSpecifierOptions {
-          compat_mode: root_config.compat(),
+          compat_mode: cli_options.compat(),
           concurrent_jobs: test_flags.concurrent_jobs,
           fail_fast: test_flags.fail_fast,
           filter: filter.clone(),
@@ -1590,7 +1592,7 @@ pub async fn run_tests_with_watch(
     operation,
     file_watcher::PrintConfig {
       job_name: "Test".to_string(),
-      clear_screen: !root_config.no_clear_screen(),
+      clear_screen: !cli_options.no_clear_screen(),
     },
   )
   .await?;