summaryrefslogtreecommitdiff
path: root/cli/args
diff options
context:
space:
mode:
Diffstat (limited to 'cli/args')
-rw-r--r--cli/args/flags.rs265
-rw-r--r--cli/args/flags_net.rs2
-rw-r--r--cli/args/mod.rs153
-rw-r--r--cli/args/package_json.rs25
4 files changed, 325 insertions, 120 deletions
diff --git a/cli/args/flags.rs b/cli/args/flags.rs
index d59e5ac1a..39db12b5f 100644
--- a/cli/args/flags.rs
+++ b/cli/args/flags.rs
@@ -36,6 +36,7 @@ use deno_path_util::normalize_path;
use deno_path_util::url_to_file_path;
use deno_runtime::deno_permissions::PermissionsOptions;
use deno_runtime::deno_permissions::SysDescriptor;
+use deno_runtime::ops::otel::OtelConfig;
use log::debug;
use log::Level;
use serde::Deserialize;
@@ -575,7 +576,7 @@ fn parse_packages_allowed_scripts(s: &str) -> Result<String, AnyError> {
pub struct UnstableConfig {
// TODO(bartlomieju): remove in Deno 2.5
pub legacy_flag_enabled: bool, // --unstable
- pub bare_node_builtins: bool, // --unstable-bare-node-builts
+ pub bare_node_builtins: bool,
pub sloppy_imports: bool,
pub features: Vec<String>, // --unstabe-kv --unstable-cron
}
@@ -612,7 +613,7 @@ pub struct Flags {
pub internal: InternalFlags,
pub ignore: Vec<String>,
pub import_map_path: Option<String>,
- pub env_file: Option<String>,
+ pub env_file: Option<Vec<String>>,
pub inspect_brk: Option<SocketAddr>,
pub inspect_wait: Option<SocketAddr>,
pub inspect: Option<SocketAddr>,
@@ -967,6 +968,24 @@ impl Flags {
args
}
+ pub fn otel_config(&self) -> Option<OtelConfig> {
+ if self
+ .unstable_config
+ .features
+ .contains(&String::from("otel"))
+ {
+ Some(OtelConfig {
+ runtime_name: Cow::Borrowed("deno"),
+ runtime_version: Cow::Borrowed(crate::version::DENO_VERSION_INFO.deno),
+ deterministic: std::env::var("DENO_UNSTABLE_OTEL_DETERMINISTIC")
+ .is_ok(),
+ ..Default::default()
+ })
+ } else {
+ None
+ }
+ }
+
/// Extract the paths the config file should be discovered from.
///
/// Returns `None` if the config file should not be auto-discovered.
@@ -1177,9 +1196,9 @@ static DENO_HELP: &str = cstr!(
<y>Dependency management:</>
<g>add</> Add dependencies
- <p(245)>deno add @std/assert | deno add npm:express</>
- <g>install</> Install script as an executable
- <g>uninstall</> Uninstall a script previously installed with deno install
+ <p(245)>deno add jsr:@std/assert | deno add npm:express</>
+ <g>install</> Installs dependencies either in the local project or globally to a bin directory
+ <g>uninstall</> Uninstalls a dependency or an executable script in the installation root's bin directory
<g>remove</> Remove dependencies from the configuration file
<y>Tooling:</>
@@ -1528,7 +1547,7 @@ pub fn clap_root() -> Command {
);
run_args(Command::new("deno"), true)
- .args(unstable_args(UnstableArgsConfig::ResolutionAndRuntime))
+ .with_unstable_args(UnstableArgsConfig::ResolutionAndRuntime)
.next_line_help(false)
.bin_name("deno")
.styles(
@@ -1630,7 +1649,7 @@ fn command(
) -> Command {
Command::new(name)
.about(about)
- .args(unstable_args(unstable_args_config))
+ .with_unstable_args(unstable_args_config)
}
fn help_subcommand(app: &Command) -> Command {
@@ -1658,10 +1677,10 @@ fn add_subcommand() -> Command {
"add",
cstr!(
"Add dependencies to your configuration file.
- <p(245)>deno add @std/path</>
+ <p(245)>deno add jsr:@std/path</>
You can add multiple dependencies at once:
- <p(245)>deno add @std/path @std/assert</>"
+ <p(245)>deno add jsr:@std/path jsr:@std/assert</>"
),
UnstableArgsConfig::None,
)
@@ -1855,6 +1874,7 @@ Unless --reload is specified, this command will not re-download already cached d
.required_unless_present("help")
.value_hint(ValueHint::FilePath),
)
+ .arg(frozen_lockfile_arg())
.arg(allow_import_arg())
}
)
@@ -1919,6 +1939,7 @@ On the first invocation with deno will download the proper binary and cache it i
])
.help_heading(COMPILE_HEADING),
)
+ .arg(no_code_cache_arg())
.arg(
Arg::new("no-terminal")
.long("no-terminal")
@@ -2272,7 +2293,7 @@ Ignore formatting a file by adding an ignore comment at the top of the file:
"sass", "less", "html", "svelte", "vue", "astro", "yml", "yaml",
"ipynb",
])
- .help_heading(FMT_HEADING),
+ .help_heading(FMT_HEADING).requires("files"),
)
.arg(
Arg::new("ignore")
@@ -2469,7 +2490,7 @@ in the package cache. If no dependency is specified, installs all dependencies l
If the <p(245)>--entrypoint</> flag is passed, installs the dependencies of the specified entrypoint(s).
<p(245)>deno install</>
- <p(245)>deno install @std/bytes</>
+ <p(245)>deno install jsr:@std/bytes</>
<p(245)>deno install npm:chalk</>
<p(245)>deno install --entrypoint entry1.ts entry2.ts</>
@@ -2768,8 +2789,13 @@ It is especially useful for quick prototyping and checking snippets of code.
TypeScript is supported, however it is not type-checked, only transpiled."
), UnstableArgsConfig::ResolutionAndRuntime)
- .defer(|cmd| runtime_args(cmd, true, true, true)
- .arg(check_arg(false))
+ .defer(|cmd| {
+ let cmd = compile_args_without_check_args(cmd);
+ let cmd = inspect_args(cmd);
+ let cmd = permission_args(cmd, None);
+ let cmd = runtime_misc_args(cmd);
+
+ cmd
.arg(
Arg::new("eval-file")
.long("eval-file")
@@ -2788,7 +2814,7 @@ TypeScript is supported, however it is not type-checked, only transpiled."
.after_help(cstr!("<y>Environment variables:</>
<g>DENO_REPL_HISTORY</> Set REPL history file path. History file is disabled when the value is empty.
<p(245)>[default: $DENO_DIR/deno_history.txt]</>"))
- )
+ })
.arg(env_file_arg())
.arg(
Arg::new("args")
@@ -3381,8 +3407,7 @@ fn permission_args(app: Command, requires: Option<&'static str>) -> Command {
.value_name("IP_OR_HOSTNAME")
.help("Allow network access. Optionally specify allowed IP addresses and host names, with ports as necessary")
.value_parser(flags_net::validator)
- .hide(true)
- ;
+ .hide(true);
if let Some(requires) = requires {
arg = arg.requires(requires)
}
@@ -3661,6 +3686,10 @@ fn runtime_args(
} else {
app
};
+ runtime_misc_args(app)
+}
+
+fn runtime_misc_args(app: Command) -> Command {
app
.arg(frozen_lockfile_arg())
.arg(cached_only_arg())
@@ -3747,12 +3776,14 @@ fn env_file_arg() -> Arg {
.help(cstr!(
"Load environment variables from local file
<p(245)>Only the first environment variable with a given key is used.
- Existing process environment variables are not overwritten.</>"
+ Existing process environment variables are not overwritten, so if variables with the same names already exist in the environment, their values will be preserved.
+ Where multiple declarations for the same environment variable exist in your .env file, the first one encountered is applied. This is determined by the order of the files you pass as arguments.</>"
))
.value_hint(ValueHint::FilePath)
.default_missing_value(".env")
.require_equals(true)
.num_args(0..=1)
+ .action(ArgAction::Append)
}
fn reload_arg() -> Arg {
@@ -4142,23 +4173,29 @@ enum UnstableArgsConfig {
ResolutionAndRuntime,
}
-struct UnstableArgsIter {
- idx: usize,
- cfg: UnstableArgsConfig,
+trait CommandExt {
+ fn with_unstable_args(self, cfg: UnstableArgsConfig) -> Self;
}
-impl Iterator for UnstableArgsIter {
- type Item = Arg;
+impl CommandExt for Command {
+ fn with_unstable_args(self, cfg: UnstableArgsConfig) -> Self {
+ let mut next_display_order = {
+ let mut value = 1000;
+ move || {
+ value += 1;
+ value
+ }
+ };
- fn next(&mut self) -> Option<Self::Item> {
- let arg = if self.idx == 0 {
+ let mut cmd = self.arg(
Arg::new("unstable")
- .long("unstable")
- .help(cstr!("Enable all unstable features and APIs. Instead of using this flag, consider enabling individual unstable features
+ .long("unstable")
+ .help(cstr!("Enable all unstable features and APIs. Instead of using this flag, consider enabling individual unstable features
<p(245)>To view the list of individual unstable feature flags, run this command again with --help=unstable</>"))
- .action(ArgAction::SetTrue)
- .hide(matches!(self.cfg, UnstableArgsConfig::None))
- } else if self.idx == 1 {
+ .action(ArgAction::SetTrue)
+ .hide(matches!(cfg, UnstableArgsConfig::None))
+ .display_order(next_display_order())
+ ).arg(
Arg::new("unstable-bare-node-builtins")
.long("unstable-bare-node-builtins")
.help("Enable unstable bare node builtins feature")
@@ -4166,20 +4203,36 @@ impl Iterator for UnstableArgsIter {
.value_parser(FalseyValueParser::new())
.action(ArgAction::SetTrue)
.hide(true)
- .long_help(match self.cfg {
+ .long_help(match cfg {
UnstableArgsConfig::None => None,
UnstableArgsConfig::ResolutionOnly
| UnstableArgsConfig::ResolutionAndRuntime => Some("true"),
})
.help_heading(UNSTABLE_HEADING)
- } else if self.idx == 2 {
+ .display_order(next_display_order()),
+ ).arg(
+ Arg::new("unstable-detect-cjs")
+ .long("unstable-detect-cjs")
+ .help("Reads the package.json type field in a project to treat .js files as .cjs")
+ .value_parser(FalseyValueParser::new())
+ .action(ArgAction::SetTrue)
+ .hide(true)
+ .long_help(match cfg {
+ UnstableArgsConfig::None => None,
+ UnstableArgsConfig::ResolutionOnly
+ | UnstableArgsConfig::ResolutionAndRuntime => Some("true"),
+ })
+ .help_heading(UNSTABLE_HEADING)
+ .display_order(next_display_order())
+ ).arg(
Arg::new("unstable-byonm")
.long("unstable-byonm")
.value_parser(FalseyValueParser::new())
.action(ArgAction::SetTrue)
.hide(true)
.help_heading(UNSTABLE_HEADING)
- } else if self.idx == 3 {
+ .display_order(next_display_order()),
+ ).arg(
Arg::new("unstable-sloppy-imports")
.long("unstable-sloppy-imports")
.help("Enable unstable resolving of specifiers by extension probing, .js to .ts, and directory probing")
@@ -4187,40 +4240,39 @@ impl Iterator for UnstableArgsIter {
.value_parser(FalseyValueParser::new())
.action(ArgAction::SetTrue)
.hide(true)
- .long_help(match self.cfg {
+ .long_help(match cfg {
UnstableArgsConfig::None => None,
UnstableArgsConfig::ResolutionOnly | UnstableArgsConfig::ResolutionAndRuntime => Some("true")
})
.help_heading(UNSTABLE_HEADING)
- } else if self.idx > 3 {
- let granular_flag = crate::UNSTABLE_GRANULAR_FLAGS.get(self.idx - 4)?;
- Arg::new(format!("unstable-{}", granular_flag.name))
- .long(format!("unstable-{}", granular_flag.name))
- .help(granular_flag.help_text)
- .action(ArgAction::SetTrue)
- .hide(true)
- .help_heading(UNSTABLE_HEADING)
- // we don't render long help, so using it here as a sort of metadata
- .long_help(if granular_flag.show_in_help {
- match self.cfg {
- UnstableArgsConfig::None | UnstableArgsConfig::ResolutionOnly => {
- None
+ .display_order(next_display_order())
+ );
+
+ for granular_flag in crate::UNSTABLE_GRANULAR_FLAGS.iter() {
+ cmd = cmd.arg(
+ Arg::new(format!("unstable-{}", granular_flag.name))
+ .long(format!("unstable-{}", granular_flag.name))
+ .help(granular_flag.help_text)
+ .action(ArgAction::SetTrue)
+ .hide(true)
+ .help_heading(UNSTABLE_HEADING)
+ // we don't render long help, so using it here as a sort of metadata
+ .long_help(if granular_flag.show_in_help {
+ match cfg {
+ UnstableArgsConfig::None | UnstableArgsConfig::ResolutionOnly => {
+ None
+ }
+ UnstableArgsConfig::ResolutionAndRuntime => Some("true"),
}
- UnstableArgsConfig::ResolutionAndRuntime => Some("true"),
- }
- } else {
- None
- })
- } else {
- return None;
- };
- self.idx += 1;
- Some(arg.display_order(self.idx + 1000))
- }
-}
+ } else {
+ None
+ })
+ .display_order(next_display_order()),
+ );
+ }
-fn unstable_args(cfg: UnstableArgsConfig) -> impl IntoIterator<Item = Arg> {
- UnstableArgsIter { idx: 0, cfg }
+ cmd
+ }
}
fn allow_scripts_arg_parse(
@@ -4342,6 +4394,7 @@ fn check_parse(
flags.type_check_mode = TypeCheckMode::Local;
compile_args_without_check_parse(flags, matches)?;
unstable_args_parse(flags, matches, UnstableArgsConfig::ResolutionAndRuntime);
+ frozen_lockfile_arg_parse(flags, matches);
let files = matches.remove_many::<String>("file").unwrap().collect();
if matches.get_flag("all") || matches.get_flag("remote") {
flags.type_check_mode = TypeCheckMode::All;
@@ -4379,6 +4432,8 @@ fn compile_parse(
};
ext_arg_parse(flags, matches);
+ flags.code_cache_enabled = !matches.get_flag("no-code-cache");
+
flags.subcommand = DenoSubcommand::Compile(CompileFlags {
source_file,
output,
@@ -4858,8 +4913,18 @@ fn repl_parse(
flags: &mut Flags,
matches: &mut ArgMatches,
) -> clap::error::Result<()> {
- runtime_args_parse(flags, matches, true, true, true)?;
- unsafely_ignore_certificate_errors_parse(flags, matches);
+ unstable_args_parse(flags, matches, UnstableArgsConfig::ResolutionAndRuntime);
+ compile_args_without_check_parse(flags, matches)?;
+ cached_only_arg_parse(flags, matches);
+ frozen_lockfile_arg_parse(flags, matches);
+ permission_args_parse(flags, matches)?;
+ inspect_arg_parse(flags, matches);
+ location_arg_parse(flags, matches);
+ v8_flags_arg_parse(flags, matches);
+ seed_arg_parse(flags, matches);
+ enable_testing_features_arg_parse(flags, matches);
+ env_file_arg_parse(flags, matches);
+ strace_ops_parse(flags, matches);
let eval_files = matches
.remove_many::<String>("eval-file")
@@ -5427,7 +5492,9 @@ fn import_map_arg_parse(flags: &mut Flags, matches: &mut ArgMatches) {
}
fn env_file_arg_parse(flags: &mut Flags, matches: &mut ArgMatches) {
- flags.env_file = matches.remove_one::<String>("env-file");
+ flags.env_file = matches
+ .get_many::<String>("env-file")
+ .map(|values| values.cloned().collect());
}
fn reload_arg_parse(
@@ -6758,6 +6825,32 @@ mod tests {
..Flags::default()
}
);
+
+ let r = flags_from_vec(svec!["deno", "fmt", "--ext", "html"]);
+ assert!(r.is_err());
+ let r = flags_from_vec(svec!["deno", "fmt", "--ext", "html", "./**"]);
+ assert_eq!(
+ r.unwrap(),
+ Flags {
+ subcommand: DenoSubcommand::Fmt(FmtFlags {
+ check: false,
+ files: FileFlags {
+ include: vec!["./**".to_string()],
+ ignore: vec![],
+ },
+ use_tabs: None,
+ line_width: None,
+ indent_width: None,
+ single_quote: None,
+ prose_wrap: None,
+ no_semicolons: None,
+ unstable_component: false,
+ watch: Default::default(),
+ }),
+ ext: Some("html".to_string()),
+ ..Flags::default()
+ }
+ );
}
#[test]
@@ -7337,7 +7430,7 @@ mod tests {
allow_all: true,
..Default::default()
},
- env_file: Some(".example.env".to_owned()),
+ env_file: Some(vec![".example.env".to_owned()]),
..Flags::default()
}
);
@@ -7406,7 +7499,7 @@ mod tests {
#[test]
fn repl_with_flags() {
#[rustfmt::skip]
- let r = flags_from_vec(svec!["deno", "repl", "-A", "--import-map", "import_map.json", "--no-remote", "--config", "tsconfig.json", "--no-check", "--reload", "--lock", "lock.json", "--cert", "example.crt", "--cached-only", "--location", "https:foo", "--v8-flags=--help", "--seed", "1", "--inspect=127.0.0.1:9229", "--unsafely-ignore-certificate-errors", "--env=.example.env"]);
+ let r = flags_from_vec(svec!["deno", "repl", "-A", "--import-map", "import_map.json", "--no-remote", "--config", "tsconfig.json", "--reload", "--lock", "lock.json", "--cert", "example.crt", "--cached-only", "--location", "https:foo", "--v8-flags=--help", "--seed", "1", "--inspect=127.0.0.1:9229", "--unsafely-ignore-certificate-errors", "--env=.example.env"]);
assert_eq!(
r.unwrap(),
Flags {
@@ -7431,7 +7524,7 @@ mod tests {
allow_all: true,
..Default::default()
},
- env_file: Some(".example.env".to_owned()),
+ env_file: Some(vec![".example.env".to_owned()]),
unsafely_ignore_certificate_errors: Some(vec![]),
..Flags::default()
}
@@ -7454,7 +7547,6 @@ mod tests {
allow_write: Some(vec![]),
..Default::default()
},
- type_check_mode: TypeCheckMode::None,
..Flags::default()
}
);
@@ -7476,7 +7568,6 @@ mod tests {
eval: None,
is_default_command: false,
}),
- type_check_mode: TypeCheckMode::None,
..Flags::default()
}
);
@@ -8081,7 +8172,7 @@ mod tests {
subcommand: DenoSubcommand::Run(RunFlags::new_default(
"script.ts".to_string(),
)),
- env_file: Some(".env".to_owned()),
+ env_file: Some(vec![".env".to_owned()]),
code_cache_enabled: true,
..Flags::default()
}
@@ -8097,7 +8188,7 @@ mod tests {
subcommand: DenoSubcommand::Run(RunFlags::new_default(
"script.ts".to_string(),
)),
- env_file: Some(".env".to_owned()),
+ env_file: Some(vec![".env".to_owned()]),
code_cache_enabled: true,
..Flags::default()
}
@@ -8130,7 +8221,7 @@ mod tests {
subcommand: DenoSubcommand::Run(RunFlags::new_default(
"script.ts".to_string(),
)),
- env_file: Some(".another_env".to_owned()),
+ env_file: Some(vec![".another_env".to_owned()]),
code_cache_enabled: true,
..Flags::default()
}
@@ -8151,7 +8242,29 @@ mod tests {
subcommand: DenoSubcommand::Run(RunFlags::new_default(
"script.ts".to_string(),
)),
- env_file: Some(".another_env".to_owned()),
+ env_file: Some(vec![".another_env".to_owned()]),
+ code_cache_enabled: true,
+ ..Flags::default()
+ }
+ );
+ }
+
+ #[test]
+ fn run_multiple_env_file_defined() {
+ let r = flags_from_vec(svec![
+ "deno",
+ "run",
+ "--env-file",
+ "--env-file=.two_env",
+ "script.ts"
+ ]);
+ assert_eq!(
+ r.unwrap(),
+ Flags {
+ subcommand: DenoSubcommand::Run(RunFlags::new_default(
+ "script.ts".to_string(),
+ )),
+ env_file: Some(vec![".env".to_owned(), ".two_env".to_owned()]),
code_cache_enabled: true,
..Flags::default()
}
@@ -8294,7 +8407,7 @@ mod tests {
allow_read: Some(vec![]),
..Default::default()
},
- env_file: Some(".example.env".to_owned()),
+ env_file: Some(vec![".example.env".to_owned()]),
..Flags::default()
}
);
@@ -9930,6 +10043,7 @@ mod tests {
include: vec![]
}),
type_check_mode: TypeCheckMode::Local,
+ code_cache_enabled: true,
..Flags::default()
}
);
@@ -9938,7 +10052,7 @@ mod tests {
#[test]
fn compile_with_flags() {
#[rustfmt::skip]
- let r = flags_from_vec(svec!["deno", "compile", "--import-map", "import_map.json", "--no-remote", "--config", "tsconfig.json", "--no-check", "--unsafely-ignore-certificate-errors", "--reload", "--lock", "lock.json", "--cert", "example.crt", "--cached-only", "--location", "https:foo", "--allow-read", "--allow-net", "--v8-flags=--help", "--seed", "1", "--no-terminal", "--icon", "favicon.ico", "--output", "colors", "--env=.example.env", "https://examples.deno.land/color-logging.ts", "foo", "bar", "-p", "8080"]);
+ let r = flags_from_vec(svec!["deno", "compile", "--import-map", "import_map.json", "--no-code-cache", "--no-remote", "--config", "tsconfig.json", "--no-check", "--unsafely-ignore-certificate-errors", "--reload", "--lock", "lock.json", "--cert", "example.crt", "--cached-only", "--location", "https:foo", "--allow-read", "--allow-net", "--v8-flags=--help", "--seed", "1", "--no-terminal", "--icon", "favicon.ico", "--output", "colors", "--env=.example.env", "https://examples.deno.land/color-logging.ts", "foo", "bar", "-p", "8080"]);
assert_eq!(
r.unwrap(),
Flags {
@@ -9954,6 +10068,7 @@ mod tests {
}),
import_map_path: Some("import_map.json".to_string()),
no_remote: true,
+ code_cache_enabled: false,
config_flag: ConfigFlag::Path("tsconfig.json".to_owned()),
type_check_mode: TypeCheckMode::None,
reload: true,
@@ -9969,7 +10084,7 @@ mod tests {
unsafely_ignore_certificate_errors: Some(vec![]),
v8_flags: svec!["--help", "--random-seed=1"],
seed: Some(1),
- env_file: Some(".example.env".to_owned()),
+ env_file: Some(vec![".example.env".to_owned()]),
..Flags::default()
}
);
diff --git a/cli/args/flags_net.rs b/cli/args/flags_net.rs
index 88ffcf0e4..abfcf2838 100644
--- a/cli/args/flags_net.rs
+++ b/cli/args/flags_net.rs
@@ -51,7 +51,7 @@ pub fn parse(paths: Vec<String>) -> clap::error::Result<Vec<String>> {
}
} else {
NetDescriptor::parse(&host_and_port).map_err(|e| {
- clap::Error::raw(clap::error::ErrorKind::InvalidValue, format!("{e:?}"))
+ clap::Error::raw(clap::error::ErrorKind::InvalidValue, e.to_string())
})?;
out.push(host_and_port)
}
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index 07906a86a..ec75d7a10 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -7,6 +7,7 @@ mod import_map;
mod lockfile;
mod package_json;
+use deno_ast::MediaType;
use deno_ast::SourceMapOption;
use deno_config::deno_json::NodeModulesDirMode;
use deno_config::workspace::CreateResolverOptions;
@@ -27,13 +28,13 @@ use deno_npm::npm_rc::ResolvedNpmRc;
use deno_npm::resolution::ValidSerializedNpmResolutionSnapshot;
use deno_npm::NpmSystemInfo;
use deno_path_util::normalize_path;
+use deno_runtime::ops::otel::OtelConfig;
use deno_semver::npm::NpmPackageReqReference;
use import_map::resolve_import_map_value_from_specifier;
pub use deno_config::deno_json::BenchConfig;
pub use deno_config::deno_json::ConfigFile;
pub use deno_config::deno_json::FmtOptionsConfig;
-pub use deno_config::deno_json::JsxImportSourceConfig;
pub use deno_config::deno_json::LintRulesConfig;
pub use deno_config::deno_json::ProseWrap;
pub use deno_config::deno_json::TsConfig;
@@ -46,6 +47,7 @@ pub use flags::*;
pub use lockfile::CliLockfile;
pub use lockfile::CliLockfileReadFromPathOptions;
pub use package_json::NpmInstallDepsProvider;
+pub use package_json::PackageJsonDepValueParseWithLocationError;
use deno_ast::ModuleSpecifier;
use deno_core::anyhow::bail;
@@ -200,6 +202,8 @@ pub fn ts_config_to_transpile_and_emit_options(
precompile_jsx_dynamic_props: None,
transform_jsx,
var_decl_imports: false,
+ // todo(dsherret): support verbatim_module_syntax here properly
+ verbatim_module_syntax: false,
},
deno_ast::EmitOptions {
inline_sources: options.inline_sources,
@@ -578,6 +582,7 @@ fn discover_npmrc(
let resolved = npmrc
.as_resolved(npm_registry_url())
.context("Failed to resolve .npmrc options")?;
+ log::debug!(".npmrc found at: '{}'", path.display());
Ok(Arc::new(resolved))
}
@@ -818,10 +823,8 @@ impl CliOptions {
};
let msg =
format!("DANGER: TLS certificate validation is disabled {}", domains);
- #[allow(clippy::print_stderr)]
{
- // use eprintln instead of log::warn so this always gets shown
- eprintln!("{}", colors::yellow(msg));
+ log::error!("{}", colors::yellow(msg));
}
}
@@ -865,12 +868,8 @@ impl CliOptions {
} else {
&[]
};
- let config_parse_options = deno_config::deno_json::ConfigParseOptions {
- include_task_comments: matches!(
- flags.subcommand,
- DenoSubcommand::Task(..)
- ),
- };
+ let config_parse_options =
+ deno_config::deno_json::ConfigParseOptions::default();
let discover_pkg_json = flags.config_flag != ConfigFlag::Disabled
&& !flags.no_npm
&& !has_flag_env_var("DENO_NO_PACKAGE_JSON");
@@ -963,6 +962,9 @@ impl CliOptions {
match self.sub_command() {
DenoSubcommand::Cache(_) => GraphKind::All,
DenoSubcommand::Check(_) => GraphKind::TypesOnly,
+ DenoSubcommand::Install(InstallFlags {
+ kind: InstallKind::Local(_),
+ }) => GraphKind::All,
_ => self.type_check_mode().as_graph_kind(),
}
}
@@ -1122,7 +1124,11 @@ impl CliOptions {
}
}
- pub fn env_file_name(&self) -> Option<&String> {
+ pub fn otel_config(&self) -> Option<OtelConfig> {
+ self.flags.otel_config()
+ }
+
+ pub fn env_file_name(&self) -> Option<&Vec<String>> {
self.flags.env_file.as_ref()
}
@@ -1130,21 +1136,34 @@ impl CliOptions {
self
.main_module_cell
.get_or_init(|| {
- let main_module = match &self.flags.subcommand {
+ Ok(match &self.flags.subcommand {
DenoSubcommand::Compile(compile_flags) => {
resolve_url_or_path(&compile_flags.source_file, self.initial_cwd())?
}
DenoSubcommand::Eval(_) => {
- resolve_url_or_path("./$deno$eval.ts", self.initial_cwd())?
+ resolve_url_or_path("./$deno$eval.mts", self.initial_cwd())?
}
DenoSubcommand::Repl(_) => {
- resolve_url_or_path("./$deno$repl.ts", self.initial_cwd())?
+ resolve_url_or_path("./$deno$repl.mts", self.initial_cwd())?
}
DenoSubcommand::Run(run_flags) => {
if run_flags.is_stdin() {
- resolve_url_or_path("./$deno$stdin.ts", self.initial_cwd())?
+ resolve_url_or_path("./$deno$stdin.mts", self.initial_cwd())?
} else {
- resolve_url_or_path(&run_flags.script, self.initial_cwd())?
+ let url =
+ resolve_url_or_path(&run_flags.script, self.initial_cwd())?;
+ if self.is_node_main()
+ && url.scheme() == "file"
+ && MediaType::from_specifier(&url) == MediaType::Unknown
+ {
+ try_resolve_node_binary_main_entrypoint(
+ &run_flags.script,
+ self.initial_cwd(),
+ )?
+ .unwrap_or(url)
+ } else {
+ url
+ }
}
}
DenoSubcommand::Serve(run_flags) => {
@@ -1153,9 +1172,7 @@ impl CliOptions {
_ => {
bail!("No main module.")
}
- };
-
- Ok(main_module)
+ })
})
.as_ref()
.map_err(|err| deno_core::anyhow::anyhow!("{}", err))
@@ -1204,7 +1221,7 @@ impl CliOptions {
// This is triggered via a secret environment variable which is used
// for functionality like child_process.fork. Users should NOT depend
// on this functionality.
- pub fn is_npm_main(&self) -> bool {
+ pub fn is_node_main(&self) -> bool {
NPM_PROCESS_STATE.is_some()
}
@@ -1450,6 +1467,12 @@ impl CliOptions {
}) = &self.flags.subcommand
{
*hmr
+ } else if let DenoSubcommand::Serve(ServeFlags {
+ watch: Some(WatchFlagsWithPaths { hmr, .. }),
+ ..
+ }) = &self.flags.subcommand
+ {
+ *hmr
} else {
false
}
@@ -1576,6 +1599,13 @@ impl CliOptions {
|| self.workspace().has_unstable("bare-node-builtins")
}
+ pub fn detect_cjs(&self) -> bool {
+ // only enabled when there's a package.json in order to not have a
+ // perf penalty for non-npm Deno projects of searching for the closest
+ // package.json beside each module
+ self.workspace().package_jsons().next().is_some() || self.is_node_main()
+ }
+
fn byonm_enabled(&self) -> bool {
// check if enabled via unstable
self.node_modules_dir().ok().flatten() == Some(NodeModulesDirMode::Manual)
@@ -1586,6 +1616,15 @@ impl CliOptions {
}
pub fn use_byonm(&self) -> bool {
+ if matches!(
+ self.sub_command(),
+ DenoSubcommand::Install(_)
+ | DenoSubcommand::Add(_)
+ | DenoSubcommand::Remove(_)
+ ) {
+ // For `deno install/add/remove` we want to force the managed resolver so it can set up `node_modules/` directory.
+ return false;
+ }
if self.node_modules_dir().ok().flatten().is_none()
&& self.maybe_node_modules_folder.is_some()
&& self
@@ -1620,21 +1659,16 @@ impl CliOptions {
});
if !from_config_file.is_empty() {
- // collect unstable granular flags
- let mut all_valid_unstable_flags: Vec<&str> =
- crate::UNSTABLE_GRANULAR_FLAGS
- .iter()
- .map(|granular_flag| granular_flag.name)
- .collect();
-
- let mut another_unstable_flags = Vec::from([
- "sloppy-imports",
- "byonm",
- "bare-node-builtins",
- "fmt-component",
- ]);
- // add more unstable flags to the same vector holding granular flags
- all_valid_unstable_flags.append(&mut another_unstable_flags);
+ let all_valid_unstable_flags: Vec<&str> = crate::UNSTABLE_GRANULAR_FLAGS
+ .iter()
+ .map(|granular_flag| granular_flag.name)
+ .chain([
+ "sloppy-imports",
+ "byonm",
+ "bare-node-builtins",
+ "fmt-component",
+ ])
+ .collect();
// check and warn if the unstable flag of config file isn't supported, by
// iterating through the vector holding the unstable flags
@@ -1667,6 +1701,10 @@ impl CliOptions {
if let DenoSubcommand::Run(RunFlags {
watch: Some(WatchFlagsWithPaths { paths, .. }),
..
+ })
+ | DenoSubcommand::Serve(ServeFlags {
+ watch: Some(WatchFlagsWithPaths { paths, .. }),
+ ..
}) = &self.flags.subcommand
{
full_paths.extend(paths.iter().map(|path| self.initial_cwd.join(path)));
@@ -1766,6 +1804,36 @@ fn resolve_node_modules_folder(
Ok(Some(canonicalize_path_maybe_not_exists(&path)?))
}
+fn try_resolve_node_binary_main_entrypoint(
+ specifier: &str,
+ initial_cwd: &Path,
+) -> Result<Option<Url>, AnyError> {
+ // node allows running files at paths without a `.js` extension
+ // or at directories with an index.js file
+ let path = deno_core::normalize_path(initial_cwd.join(specifier));
+ if path.is_dir() {
+ let index_file = path.join("index.js");
+ Ok(if index_file.is_file() {
+ Some(deno_path_util::url_from_file_path(&index_file)?)
+ } else {
+ None
+ })
+ } else {
+ let path = path.with_extension(
+ path
+ .extension()
+ .and_then(|s| s.to_str())
+ .map(|s| format!("{}.js", s))
+ .unwrap_or("js".to_string()),
+ );
+ if path.is_file() {
+ Ok(Some(deno_path_util::url_from_file_path(&path)?))
+ } else {
+ Ok(None)
+ }
+ }
+}
+
fn resolve_import_map_specifier(
maybe_import_map_path: Option<&str>,
maybe_config_file: Option<&ConfigFile>,
@@ -1867,19 +1935,22 @@ pub fn config_to_deno_graph_workspace_member(
})
}
-fn load_env_variables_from_env_file(filename: Option<&String>) {
- let Some(env_file_name) = filename else {
+fn load_env_variables_from_env_file(filename: Option<&Vec<String>>) {
+ let Some(env_file_names) = filename else {
return;
};
- match from_filename(env_file_name) {
- Ok(_) => (),
- Err(error) => {
- match error {
+
+ for env_file_name in env_file_names.iter().rev() {
+ match from_filename(env_file_name) {
+ Ok(_) => (),
+ Err(error) => {
+ match error {
dotenvy::Error::LineParse(line, index)=> log::info!("{} Parsing failed within the specified environment file: {} at index: {} of the value: {}",colors::yellow("Warning"), env_file_name, index, line),
dotenvy::Error::Io(_)=> log::info!("{} The `--env-file` flag was used, but the environment file specified '{}' was not found.",colors::yellow("Warning"),env_file_name),
dotenvy::Error::EnvVar(_)=> log::info!("{} One or more of the environment variables isn't present or not unicode within the specified environment file: {}",colors::yellow("Warning"),env_file_name),
_ => log::info!("{} Unknown failure occurred with the specified environment file: {}", colors::yellow("Warning"), env_file_name),
}
+ }
}
}
}
diff --git a/cli/args/package_json.rs b/cli/args/package_json.rs
index 2ef39a30d..7dc75550c 100644
--- a/cli/args/package_json.rs
+++ b/cli/args/package_json.rs
@@ -5,10 +5,12 @@ use std::sync::Arc;
use deno_config::workspace::Workspace;
use deno_core::serde_json;
+use deno_core::url::Url;
use deno_package_json::PackageJsonDepValue;
use deno_package_json::PackageJsonDepValueParseError;
use deno_semver::npm::NpmPackageReqReference;
use deno_semver::package::PackageReq;
+use thiserror::Error;
#[derive(Debug)]
pub struct InstallNpmRemotePkg {
@@ -23,11 +25,20 @@ pub struct InstallNpmWorkspacePkg {
pub target_dir: PathBuf,
}
+#[derive(Debug, Error, Clone)]
+#[error("Failed to install '{}'\n at {}", alias, location)]
+pub struct PackageJsonDepValueParseWithLocationError {
+ pub location: Url,
+ pub alias: String,
+ #[source]
+ pub source: PackageJsonDepValueParseError,
+}
+
#[derive(Debug, Default)]
pub struct NpmInstallDepsProvider {
remote_pkgs: Vec<InstallNpmRemotePkg>,
workspace_pkgs: Vec<InstallNpmWorkspacePkg>,
- pkg_json_dep_errors: Vec<PackageJsonDepValueParseError>,
+ pkg_json_dep_errors: Vec<PackageJsonDepValueParseWithLocationError>,
}
impl NpmInstallDepsProvider {
@@ -89,7 +100,13 @@ impl NpmInstallDepsProvider {
let dep = match dep {
Ok(dep) => dep,
Err(err) => {
- pkg_json_dep_errors.push(err);
+ pkg_json_dep_errors.push(
+ PackageJsonDepValueParseWithLocationError {
+ location: pkg_json.specifier(),
+ alias,
+ source: err,
+ },
+ );
continue;
}
};
@@ -150,7 +167,9 @@ impl NpmInstallDepsProvider {
&self.workspace_pkgs
}
- pub fn pkg_json_dep_errors(&self) -> &[PackageJsonDepValueParseError] {
+ pub fn pkg_json_dep_errors(
+ &self,
+ ) -> &[PackageJsonDepValueParseWithLocationError] {
&self.pkg_json_dep_errors
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 22:05:24 +0000