foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-09 21:57:40 -04:00
Code Issues Packages 1 Wiki Activity

private CliOptions::flags again

Browse source
This commit is contained in:
Nayeem Rahman 2024-12-11 13:48:22 +00:00
parent f8be309def
commit 8f5d50c787
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cli/args/mod.rs
View file

@ -811,7 +811,7 @@ pub struct ScopeOptions {
pub struct CliOptions { pub struct CliOptions {
// the source of the options is a detail the rest of the // the source of the options is a detail the rest of the
// application need not concern itself with, so keep these private // application need not concern itself with, so keep these private
pub flags: Arc<Flags>, flags: Arc<Flags>,
initial_cwd: PathBuf, initial_cwd: PathBuf,
main_module_cell: std::sync::OnceLock<Result<ModuleSpecifier, AnyError>>, main_module_cell: std::sync::OnceLock<Result<ModuleSpecifier, AnyError>>,
maybe_node_modules_folder: Option<PathBuf>, maybe_node_modules_folder: Option<PathBuf>,
@ -960,6 +960,24 @@ impl CliOptions {
) )
} }
pub fn with_new_start_dir_and_scope_options(
&self,
start_dir: Arc<WorkspaceDirectory>,
scope_options: Option<ScopeOptions>,
) -> Result<Self, AnyError> {
let (npmrc, _) = discover_npmrc_from_workspace(&start_dir.workspace)?;
let lockfile = CliLockfile::discover(&self.flags, &start_dir.workspace)?;
Self::new(
self.flags.clone(),
self.initial_cwd().to_path_buf(),
lockfile.map(Arc::new),
npmrc,
start_dir,
false,
scope_options.map(Arc::new),
)
}
/// This method is purposefully verbose to disourage its use. Do not use it /// This method is purposefully verbose to disourage its use. Do not use it
/// except in the factory structs. Instead, prefer specific methods on `CliOptions` /// except in the factory structs. Instead, prefer specific methods on `CliOptions`
/// that can take all sources of information into account (ex. config files or env vars). /// that can take all sources of information into account (ex. config files or env vars).

18
cli/factory.rs
View file

@ -1,10 +1,8 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
use crate::args::check_warn_tsconfig; use crate::args::check_warn_tsconfig;
use crate::args::discover_npmrc_from_workspace;
use crate::args::get_root_cert_store; use crate::args::get_root_cert_store;
use crate::args::CaData; use crate::args::CaData;
use crate::args::CliLockfile;
use crate::args::CliOptions; use crate::args::CliOptions;
use crate::args::DenoSubcommand; use crate::args::DenoSubcommand;
use crate::args::Flags; use crate::args::Flags;
@ -1131,24 +1129,16 @@ impl WorkspaceFileContainer {
let dir_count = workspace_dirs_with_files.len(); let dir_count = workspace_dirs_with_files.len();
let mut entries = Vec::with_capacity(dir_count); let mut entries = Vec::with_capacity(dir_count);
for (workspace_dir, files) in workspace_dirs_with_files { for (workspace_dir, files) in workspace_dirs_with_files {
let (npmrc, _) = discover_npmrc_from_workspace(&workspace_dir.workspace)?;
let lockfile =
CliLockfile::discover(&cli_options.flags, &workspace_dir.workspace)?;
let scope_options = (dir_count > 1).then(|| ScopeOptions { let scope_options = (dir_count > 1).then(|| ScopeOptions {
scope: workspace_dir scope: workspace_dir
.has_deno_or_pkg_json() .has_deno_or_pkg_json()
.then(|| workspace_dir.dir_url().clone()), .then(|| workspace_dir.dir_url().clone()),
all_scopes: all_scopes.clone(), all_scopes: all_scopes.clone(),
}); });
let cli_options = Arc::new(CliOptions::new( let cli_options = Arc::new(
cli_options.flags.clone(), cli_options
cli_options.initial_cwd().to_path_buf(), .with_new_start_dir_and_scope_options(workspace_dir, scope_options)?,
lockfile.map(Arc::new), );
npmrc,
workspace_dir,
false,
scope_options.map(Arc::new),
)?);
let mut factory = CliFactory::from_cli_options(cli_options.clone()); let mut factory = CliFactory::from_cli_options(cli_options.clone());
factory.watcher_communicator = watcher_communicator.clone(); factory.watcher_communicator = watcher_communicator.clone();
let file_fetcher = factory.file_fetcher()?; let file_fetcher = factory.file_fetcher()?;