summaryrefslogtreecommitdiff
path: root/cli/tools
diff options
context:
space:
mode:
Diffstat (limited to 'cli/tools')
-rw-r--r--cli/tools/bench.rs26
-rw-r--r--cli/tools/doc.rs2
-rw-r--r--cli/tools/fmt.rs4
-rw-r--r--cli/tools/lint.rs6
-rw-r--r--cli/tools/task.rs6
-rw-r--r--cli/tools/test.rs28
-rw-r--r--cli/tools/vendor/mod.rs8
7 files changed, 42 insertions, 38 deletions
diff --git a/cli/tools/bench.rs b/cli/tools/bench.rs
index d2cf4f00b..9dfe2cd37 100644
--- a/cli/tools/bench.rs
+++ b/cli/tools/bench.rs
@@ -336,7 +336,7 @@ async fn check_specifiers(
permissions: Permissions,
specifiers: Vec<ModuleSpecifier>,
) -> Result<(), AnyError> {
- let lib = ps.config.ts_type_lib_window();
+ let lib = ps.options.ts_type_lib_window();
ps.prepare_module_load(
specifiers,
false,
@@ -366,7 +366,7 @@ async fn bench_specifier(
vec![ops::bench::init(
channel.clone(),
filter,
- ps.config.unstable(),
+ ps.options.unstable(),
)],
Default::default(),
);
@@ -424,7 +424,7 @@ async fn bench_specifiers(
specifiers: Vec<ModuleSpecifier>,
options: BenchSpecifierOptions,
) -> Result<(), AnyError> {
- let log_level = ps.config.log_level();
+ let log_level = ps.options.log_level();
let (sender, mut receiver) = unbounded_channel::<BenchEvent>();
@@ -527,7 +527,8 @@ pub async fn run_benchmarks(
bench_flags: BenchFlags,
) -> 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 = collect_specifiers(
bench_flags.include.unwrap_or_else(|| vec![".".to_string()]),
&bench_flags.ignore.clone(),
@@ -540,7 +541,7 @@ pub async fn run_benchmarks(
check_specifiers(&ps, permissions.clone(), specifiers.clone()).await?;
- let compat = ps.config.compat();
+ let compat = ps.options.compat();
bench_specifiers(
ps,
permissions,
@@ -561,12 +562,13 @@ pub async fn run_benchmarks_with_watch(
bench_flags: BenchFlags,
) -> 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 = bench_flags.include.unwrap_or_else(|| vec![".".to_string()]);
let ignore = bench_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(
@@ -582,15 +584,15 @@ pub async fn run_benchmarks_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 bench_modules =
@@ -734,7 +736,7 @@ pub async fn run_benchmarks_with_watch(
check_specifiers(&ps, permissions.clone(), specifiers.clone()).await?;
let specifier_options = BenchSpecifierOptions {
- compat_mode: ps.config.compat(),
+ compat_mode: ps.options.compat(),
filter: filter.clone(),
};
bench_specifiers(ps, permissions.clone(), specifiers, specifier_options)
@@ -749,7 +751,7 @@ pub async fn run_benchmarks_with_watch(
operation,
file_watcher::PrintConfig {
job_name: "Bench".to_string(),
- clear_screen: !ps.config.no_clear_screen(),
+ clear_screen: !ps.options.no_clear_screen(),
},
)
.await?;
diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs
index 068a98389..fbb784f98 100644
--- a/cli/tools/doc.rs
+++ b/cli/tools/doc.rs
@@ -122,7 +122,7 @@ pub async fn print_docs(
doc_parser.parse_source(
&source_file_specifier,
MediaType::Dts,
- get_types(ps.config.unstable()).into(),
+ get_types(ps.options.unstable()).into(),
)
} else {
let module_specifier = resolve_url_or_path(&source_file)?;
diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs
index 267b21d88..585bf6e92 100644
--- a/cli/tools/fmt.rs
+++ b/cli/tools/fmt.rs
@@ -7,10 +7,10 @@
//! the future it can be easily extended to provide
//! the same functions as ops available in JS runtime.
+use crate::args::CliOptions;
use crate::args::FmtFlags;
use crate::args::FmtOptionsConfig;
use crate::args::ProseWrap;
-use crate::args::RootConfig;
use crate::colors;
use crate::diff::diff;
use crate::file_watcher;
@@ -43,7 +43,7 @@ use super::incremental_cache::IncrementalCache;
/// Format JavaScript/TypeScript files.
pub async fn format(
- config: &RootConfig,
+ config: &CliOptions,
fmt_flags: FmtFlags,
) -> Result<(), AnyError> {
let maybe_fmt_config = config.to_fmt_config()?;
diff --git a/cli/tools/lint.rs b/cli/tools/lint.rs
index 4e8f8fb0c..61129b752 100644
--- a/cli/tools/lint.rs
+++ b/cli/tools/lint.rs
@@ -76,7 +76,7 @@ pub async fn lint(flags: Flags, lint_flags: LintFlags) -> Result<(), AnyError> {
let mut exclude_files = ignore.clone();
let ps = ProcState::build(flags).await?;
- let maybe_lint_config = ps.config.to_lint_config()?;
+ let maybe_lint_config = ps.options.to_lint_config()?;
if let Some(lint_config) = maybe_lint_config.as_ref() {
if include_files.is_empty() {
@@ -202,7 +202,7 @@ pub async fn lint(flags: Flags, lint_flags: LintFlags) -> Result<(), AnyError> {
Ok(())
};
- if ps.config.watch_paths().is_some() {
+ if ps.options.watch_paths().is_some() {
if args.len() == 1 && args[0].to_string_lossy() == "-" {
return Err(generic_error(
"Lint watch on standard input is not supported.",
@@ -213,7 +213,7 @@ pub async fn lint(flags: Flags, lint_flags: LintFlags) -> Result<(), AnyError> {
operation,
file_watcher::PrintConfig {
job_name: "Lint".to_string(),
- clear_screen: !ps.config.no_clear_screen(),
+ clear_screen: !ps.options.no_clear_screen(),
},
)
.await?;
diff --git a/cli/tools/task.rs b/cli/tools/task.rs
index fa9f30d7d..88a0f5be0 100644
--- a/cli/tools/task.rs
+++ b/cli/tools/task.rs
@@ -30,8 +30,8 @@ pub async fn execute_script(
crate::colors::yellow("Warning"),
);
let ps = ProcState::build(flags).await?;
- let tasks_config = ps.config.resolve_tasks_config()?;
- let config_file_url = ps.config.maybe_config_file_specifier().unwrap();
+ let tasks_config = ps.options.resolve_tasks_config()?;
+ let config_file_url = ps.options.maybe_config_file_specifier().unwrap();
let config_file_path = if config_file_url.scheme() == "file" {
config_file_url.to_file_path().unwrap()
} else {
@@ -52,7 +52,7 @@ pub async fn execute_script(
if let Some(script) = maybe_script {
let additional_args = ps
- .config
+ .options
.argv()
.iter()
// surround all the additional arguments in double quotes
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?;
diff --git a/cli/tools/vendor/mod.rs b/cli/tools/vendor/mod.rs
index fc7684b5b..7c36b5074 100644
--- a/cli/tools/vendor/mod.rs
+++ b/cli/tools/vendor/mod.rs
@@ -134,12 +134,12 @@ fn validate_output_dir(
fn maybe_update_config_file(output_dir: &Path, ps: &ProcState) -> bool {
assert!(output_dir.is_absolute());
- let config_file_specifier = match ps.config.maybe_config_file_specifier() {
+ let config_file_specifier = match ps.options.maybe_config_file_specifier() {
Some(f) => f,
None => return false,
};
let fmt_config = ps
- .config
+ .options
.to_fmt_config()
.unwrap_or_default()
.unwrap_or_default();
@@ -263,11 +263,11 @@ async fn create_graph(
Permissions::allow_all(),
);
let maybe_locker = lockfile::as_maybe_locker(ps.lockfile.clone());
- let maybe_imports = ps.config.to_maybe_imports()?;
+ let maybe_imports = ps.options.to_maybe_imports()?;
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_resolver = if maybe_jsx_resolver.is_some() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 06:15:13 +0000