summaryrefslogtreecommitdiff
path: root/cli/flags.rs
diff options
context:
space:
mode:
Diffstat (limited to 'cli/flags.rs')
-rw-r--r--cli/flags.rs53
1 files changed, 27 insertions, 26 deletions
diff --git a/cli/flags.rs b/cli/flags.rs
index 63bad9f14..440c2aeea 100644
--- a/cli/flags.rs
+++ b/cli/flags.rs
@@ -468,7 +468,7 @@ fn eval_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
fn info_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
reload_arg_parse(flags, matches);
- importmap_arg_parse(flags, matches);
+ import_map_arg_parse(flags, matches);
ca_file_arg_parse(flags, matches);
let json = matches.is_present("json");
flags.subcommand = DenoSubcommand::Info {
@@ -499,7 +499,7 @@ fn lock_args_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
fn compile_args<'a, 'b>(app: App<'a, 'b>) -> App<'a, 'b> {
app
- .arg(importmap_arg())
+ .arg(import_map_arg())
.arg(no_remote_arg())
.arg(config_arg())
.arg(no_check_arg())
@@ -510,7 +510,7 @@ fn compile_args<'a, 'b>(app: App<'a, 'b>) -> App<'a, 'b> {
}
fn compile_args_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
- importmap_arg_parse(flags, matches);
+ import_map_arg_parse(flags, matches);
no_remote_arg_parse(flags, matches);
config_arg_parse(flags, matches);
no_check_arg_parse(flags, matches);
@@ -622,7 +622,7 @@ fn upgrade_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
}
fn doc_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
- importmap_arg_parse(flags, matches);
+ import_map_arg_parse(flags, matches);
reload_arg_parse(flags, matches);
let source_file = matches.value_of("source_file").map(String::from);
@@ -861,7 +861,7 @@ TypeScript compiler cache: Subdirectory containing TS compiler output.",
.arg(ca_file_arg())
// TODO(lucacasonato): remove for 2.0
.arg(no_check_arg().hidden(true))
- .arg(importmap_arg())
+ .arg(import_map_arg())
.arg(
Arg::with_name("json")
.long("json")
@@ -954,7 +954,7 @@ Show documentation for runtime built-ins:
deno doc
deno doc --builtin Deno.Listener",
)
- .arg(importmap_arg())
+ .arg(import_map_arg())
.arg(reload_arg())
.arg(
Arg::with_name("json")
@@ -1320,9 +1320,10 @@ fn reload_arg_parse(flags: &mut Flags, matches: &ArgMatches) {
}
}
-fn importmap_arg<'a, 'b>() -> Arg<'a, 'b> {
- Arg::with_name("importmap")
- .long("importmap")
+fn import_map_arg<'a, 'b>() -> Arg<'a, 'b> {
+ Arg::with_name("import-map")
+ .long("import-map")
+ .alias("importmap")
.value_name("FILE")
.requires("unstable")
.help("UNSTABLE: Load import map file")
@@ -1336,8 +1337,8 @@ Examples: https://github.com/WICG/import-maps#the-import-map",
.takes_value(true)
}
-fn importmap_arg_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
- flags.import_map_path = matches.value_of("importmap").map(ToOwned::to_owned);
+fn import_map_arg_parse(flags: &mut Flags, matches: &clap::ArgMatches) {
+ flags.import_map_path = matches.value_of("import-map").map(ToOwned::to_owned);
}
fn v8_flags_arg<'a, 'b>() -> Arg<'a, 'b> {
@@ -2082,7 +2083,7 @@ mod tests {
#[test]
fn eval_with_flags() {
#[rustfmt::skip]
- let r = flags_from_vec_safe(svec!["deno", "eval", "--unstable", "--importmap", "import_map.json", "--no-remote", "--config", "tsconfig.json", "--no-check", "--reload", "--lock", "lock.json", "--lock-write", "--cert", "example.crt", "--cached-only", "--v8-flags=--help", "--seed", "1", "--inspect=127.0.0.1:9229", "42"]);
+ let r = flags_from_vec_safe(svec!["deno", "eval", "--unstable", "--import-map", "import_map.json", "--no-remote", "--config", "tsconfig.json", "--no-check", "--reload", "--lock", "lock.json", "--lock-write", "--cert", "example.crt", "--cached-only", "--v8-flags=--help", "--seed", "1", "--inspect=127.0.0.1:9229", "42"]);
assert_eq!(
r.unwrap(),
Flags {
@@ -2139,7 +2140,7 @@ mod tests {
#[test]
fn repl_with_flags() {
#[rustfmt::skip]
- let r = flags_from_vec_safe(svec!["deno", "repl", "--unstable", "--importmap", "import_map.json", "--no-remote", "--config", "tsconfig.json", "--no-check", "--reload", "--lock", "lock.json", "--lock-write", "--cert", "example.crt", "--cached-only", "--v8-flags=--help", "--seed", "1", "--inspect=127.0.0.1:9229"]);
+ let r = flags_from_vec_safe(svec!["deno", "repl", "--unstable", "--import-map", "import_map.json", "--no-remote", "--config", "tsconfig.json", "--no-check", "--reload", "--lock", "lock.json", "--lock-write", "--cert", "example.crt", "--cached-only", "--v8-flags=--help", "--seed", "1", "--inspect=127.0.0.1:9229"]);
assert_eq!(
r.unwrap(),
Flags {
@@ -2356,12 +2357,12 @@ mod tests {
}
#[test]
- fn run_importmap() {
+ fn run_import_map() {
let r = flags_from_vec_safe(svec![
"deno",
"run",
"--unstable",
- "--importmap=importmap.json",
+ "--import-map=import_map.json",
"script.ts"
]);
assert_eq!(
@@ -2371,19 +2372,19 @@ mod tests {
script: "script.ts".to_string(),
},
unstable: true,
- import_map_path: Some("importmap.json".to_owned()),
+ import_map_path: Some("import_map.json".to_owned()),
..Flags::default()
}
);
}
#[test]
- fn info_importmap() {
+ fn info_import_map() {
let r = flags_from_vec_safe(svec![
"deno",
"info",
"--unstable",
- "--importmap=importmap.json",
+ "--import-map=import_map.json",
"script.ts"
]);
assert_eq!(
@@ -2394,19 +2395,19 @@ mod tests {
json: false,
},
unstable: true,
- import_map_path: Some("importmap.json".to_owned()),
+ import_map_path: Some("import_map.json".to_owned()),
..Flags::default()
}
);
}
#[test]
- fn cache_importmap() {
+ fn cache_import_map() {
let r = flags_from_vec_safe(svec![
"deno",
"cache",
"--unstable",
- "--importmap=importmap.json",
+ "--import-map=import_map.json",
"script.ts"
]);
assert_eq!(
@@ -2416,19 +2417,19 @@ mod tests {
files: svec!["script.ts"],
},
unstable: true,
- import_map_path: Some("importmap.json".to_owned()),
+ import_map_path: Some("import_map.json".to_owned()),
..Flags::default()
}
);
}
#[test]
- fn doc_importmap() {
+ fn doc_import_map() {
let r = flags_from_vec_safe(svec![
"deno",
"doc",
"--unstable",
- "--importmap=importmap.json",
+ "--import-map=import_map.json",
"script.ts"
]);
assert_eq!(
@@ -2441,7 +2442,7 @@ mod tests {
filter: None,
},
unstable: true,
- import_map_path: Some("importmap.json".to_owned()),
+ import_map_path: Some("import_map.json".to_owned()),
..Flags::default()
}
);
@@ -2527,7 +2528,7 @@ mod tests {
#[test]
fn install_with_flags() {
#[rustfmt::skip]
- let r = flags_from_vec_safe(svec!["deno", "install", "--unstable", "--importmap", "import_map.json", "--no-remote", "--config", "tsconfig.json", "--no-check", "--reload", "--lock", "lock.json", "--lock-write", "--cert", "example.crt", "--cached-only", "--allow-read", "--allow-net", "--v8-flags=--help", "--seed", "1", "--inspect=127.0.0.1:9229", "--name", "file_server", "--root", "/foo", "--force", "https://deno.land/std/http/file_server.ts", "foo", "bar"]);
+ let r = flags_from_vec_safe(svec!["deno", "install", "--unstable", "--import-map", "import_map.json", "--no-remote", "--config", "tsconfig.json", "--no-check", "--reload", "--lock", "lock.json", "--lock-write", "--cert", "example.crt", "--cached-only", "--allow-read", "--allow-net", "--v8-flags=--help", "--seed", "1", "--inspect=127.0.0.1:9229", "--name", "file_server", "--root", "/foo", "--force", "https://deno.land/std/http/file_server.ts", "foo", "bar"]);
assert_eq!(
r.unwrap(),
Flags {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-29 09:32:11 +0000