summaryrefslogtreecommitdiff
path: root/cli/main.rs
diff options
context:
space:
mode:
Diffstat (limited to 'cli/main.rs')
-rw-r--r--cli/main.rs59
1 files changed, 29 insertions, 30 deletions
diff --git a/cli/main.rs b/cli/main.rs
index acf49bb3f..f8c8e695a 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -395,13 +395,11 @@ async fn compile_command(
) -> Result<i32, AnyError> {
let debug = flags.log_level == Some(log::Level::Debug);
- let run_flags = tools::standalone::compile_to_runtime_flags(
- flags.clone(),
- compile_flags.args,
- )?;
+ let run_flags =
+ tools::standalone::compile_to_runtime_flags(&flags, compile_flags.args)?;
let module_specifier = resolve_url_or_path(&compile_flags.source_file)?;
- let ps = ProcState::build(flags.clone()).await?;
+ let ps = ProcState::build(Arc::new(flags)).await?;
let deno_dir = &ps.dir;
let output = compile_flags.output.and_then(|output| {
@@ -432,7 +430,7 @@ async fn compile_command(
})
.flatten()
.unwrap_or_else(|| {
- bundle_module_graph(graph.as_ref(), &ps, &flags).map(|r| r.0)
+ bundle_module_graph(graph.as_ref(), &ps, &ps.flags).map(|r| r.0)
})?;
info!(
@@ -468,7 +466,7 @@ async fn info_command(
flags: Flags,
info_flags: InfoFlags,
) -> Result<i32, AnyError> {
- let ps = ProcState::build(flags).await?;
+ let ps = ProcState::build(Arc::new(flags)).await?;
if let Some(specifier) = info_flags.file {
let specifier = resolve_url_or_path(&specifier)?;
let mut cache = cache::FetchCacher::new(
@@ -526,8 +524,9 @@ async fn install_command(
let mut preload_flags = flags.clone();
preload_flags.inspect = None;
preload_flags.inspect_brk = None;
- let permissions = Permissions::from_options(&preload_flags.clone().into());
- let ps = ProcState::build(preload_flags).await?;
+ let permissions =
+ Permissions::from_options(&preload_flags.permissions_options());
+ let ps = ProcState::build(Arc::new(preload_flags)).await?;
let main_module = resolve_url_or_path(&install_flags.module_url)?;
let mut worker =
create_main_worker(&ps, main_module.clone(), permissions, vec![]);
@@ -571,7 +570,7 @@ async fn cache_command(
} else {
emit::TypeLib::DenoWindow
};
- let ps = ProcState::build(flags).await?;
+ let ps = ProcState::build(Arc::new(flags)).await?;
for file in cache_flags.files {
let specifier = resolve_url_or_path(&file)?;
@@ -597,8 +596,8 @@ async fn eval_command(
// type, and so our "fake" specifier needs to have the proper extension.
let main_module =
resolve_url_or_path(&format!("./$deno$eval.{}", eval_flags.ext)).unwrap();
- let permissions = Permissions::from_options(&flags.clone().into());
- let ps = ProcState::build(flags.clone()).await?;
+ let permissions = Permissions::from_options(&flags.permissions_options());
+ let ps = ProcState::build(Arc::new(flags)).await?;
let mut worker =
create_main_worker(&ps, main_module.clone(), permissions, vec![]);
// Create a dummy source file.
@@ -622,7 +621,7 @@ async fn eval_command(
// to allow module access by TS compiler.
ps.file_fetcher.insert_cached(file);
debug!("main_module {}", &main_module);
- if flags.compat {
+ if ps.flags.compat {
worker.execute_side_module(&compat::GLOBAL_URL).await?;
}
worker.execute_main_module(&main_module).await?;
@@ -786,7 +785,7 @@ async fn bundle_command(
bundle_flags: BundleFlags,
) -> Result<i32, AnyError> {
let debug = flags.log_level == Some(log::Level::Debug);
-
+ let flags = Arc::new(flags);
let resolver = |_| {
let flags = flags.clone();
let source_file1 = bundle_flags.source_file.clone();
@@ -795,7 +794,7 @@ async fn bundle_command(
let module_specifier = resolve_url_or_path(&source_file1)?;
debug!(">>>>> bundle START");
- let ps = ProcState::build(flags.clone()).await?;
+ let ps = ProcState::build(flags).await?;
let graph =
create_graph_and_maybe_check(module_specifier, &ps, debug).await?;
@@ -831,11 +830,10 @@ async fn bundle_command(
};
let operation = |(ps, graph): (ProcState, Arc<deno_graph::ModuleGraph>)| {
- let flags = flags.clone();
let out_file = bundle_flags.out_file.clone();
async move {
let (bundle_emit, maybe_bundle_map) =
- bundle_module_graph(graph.as_ref(), &ps, &flags)?;
+ bundle_module_graph(graph.as_ref(), &ps, &ps.flags)?;
debug!(">>>>> bundle END");
if let Some(out_file) = out_file.as_ref() {
@@ -908,7 +906,7 @@ async fn format_command(
flags: Flags,
fmt_flags: FmtFlags,
) -> Result<i32, AnyError> {
- let ps = ProcState::build(flags.clone()).await?;
+ let ps = ProcState::build(Arc::new(flags)).await?;
let maybe_fmt_config = if let Some(config_file) = &ps.maybe_config_file {
config_file.to_fmt_config()?
} else {
@@ -923,7 +921,7 @@ async fn format_command(
return Ok(0);
}
- tools::fmt::format(flags, fmt_flags, maybe_fmt_config).await?;
+ tools::fmt::format(ps.flags.as_ref(), fmt_flags, maybe_fmt_config).await?;
Ok(0)
}
@@ -932,11 +930,11 @@ async fn repl_command(
repl_flags: ReplFlags,
) -> Result<i32, AnyError> {
let main_module = resolve_url_or_path("./$deno$repl.ts").unwrap();
- let permissions = Permissions::from_options(&flags.clone().into());
- let ps = ProcState::build(flags.clone()).await?;
+ let permissions = Permissions::from_options(&flags.permissions_options());
+ let ps = ProcState::build(Arc::new(flags)).await?;
let mut worker =
create_main_worker(&ps, main_module.clone(), permissions, vec![]);
- if flags.compat {
+ if ps.flags.compat {
worker.execute_side_module(&compat::GLOBAL_URL).await?;
compat::add_global_require(&mut worker.js_runtime, main_module.as_str())?;
worker.run_event_loop(false).await?;
@@ -948,8 +946,8 @@ async fn repl_command(
}
async fn run_from_stdin(flags: Flags) -> Result<i32, AnyError> {
- let ps = ProcState::build(flags.clone()).await?;
- let permissions = Permissions::from_options(&flags.clone().into());
+ let ps = ProcState::build(Arc::new(flags)).await?;
+ let permissions = Permissions::from_options(&ps.flags.permissions_options());
let main_module = resolve_url_or_path("./$deno$stdin.ts").unwrap();
let mut worker =
create_main_worker(&ps.clone(), main_module.clone(), permissions, vec![]);
@@ -970,7 +968,7 @@ async fn run_from_stdin(flags: Flags) -> Result<i32, AnyError> {
ps.file_fetcher.insert_cached(source_file);
debug!("main_module {}", main_module);
- if flags.compat {
+ if ps.flags.compat {
worker.execute_side_module(&compat::GLOBAL_URL).await?;
}
worker.execute_main_module(&main_module).await?;
@@ -983,6 +981,7 @@ async fn run_from_stdin(flags: Flags) -> Result<i32, AnyError> {
// TODO(bartlomieju): this function is not handling `exit_code` set by the runtime
// code properly.
async fn run_with_watch(flags: Flags, script: String) -> Result<i32, AnyError> {
+ let flags = Arc::new(flags);
let resolver = |_| {
let script1 = script.clone();
let script2 = script.clone();
@@ -1131,7 +1130,7 @@ async fn run_with_watch(flags: Flags, script: String) -> Result<i32, AnyError> {
let operation = |(ps, main_module): (ProcState, ModuleSpecifier)| {
let flags = flags.clone();
- let permissions = Permissions::from_options(&flags.clone().into());
+ let permissions = Permissions::from_options(&flags.permissions_options());
async move {
// We make use an module executor guard to ensure that unload is always fired when an
// operation is called.
@@ -1177,8 +1176,8 @@ async fn run_command(
// map specified and bare specifier is used on the command line - this should
// probably call `ProcState::resolve` instead
let main_module = resolve_url_or_path(&run_flags.script)?;
- let ps = ProcState::build(flags.clone()).await?;
- let permissions = Permissions::from_options(&flags.clone().into());
+ let ps = ProcState::build(Arc::new(flags)).await?;
+ let permissions = Permissions::from_options(&ps.flags.permissions_options());
let mut worker =
create_main_worker(&ps, main_module.clone(), permissions, vec![]);
@@ -1199,7 +1198,7 @@ async fn run_command(
debug!("main_module {}", main_module);
- if flags.compat {
+ if ps.flags.compat {
// TODO(bartlomieju): fix me
assert_eq!(main_module.scheme(), "file");
@@ -1326,7 +1325,7 @@ fn init_v8_flags(v8_flags: &[String]) {
fn get_subcommand(
flags: Flags,
) -> Pin<Box<dyn Future<Output = Result<i32, AnyError>>>> {
- match flags.clone().subcommand {
+ match flags.subcommand.clone() {
DenoSubcommand::Bundle(bundle_flags) => {
bundle_command(flags, bundle_flags).boxed_local()
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 16:38:36 +0000