diff options
Diffstat (limited to 'cli/flags.rs')
| -rw-r--r-- | cli/flags.rs | 158 |
1 files changed, 16 insertions, 142 deletions
diff --git a/cli/flags.rs b/cli/flags.rs index 866b36820..239382e03 100644 --- a/cli/flags.rs +++ b/cli/flags.rs @@ -6,7 +6,6 @@ use clap::Arg; use clap::ArgMatches; use clap::SubCommand; use log::Level; -use std::collections::HashSet; use std::net::SocketAddr; use std::path::{Path, PathBuf}; @@ -14,14 +13,6 @@ use std::path::{Path, PathBuf}; macro_rules! svec { ($($x:expr),*) => (vec![$($x.to_string()),*]); } -/// Creates HashSet<String> from string literals -macro_rules! sset { - ($($x:expr),*) => {{ - let _v = svec![$($x.to_string()),*]; - let hash_set: HashSet<String> = _v.iter().cloned().collect(); - hash_set - }} -} #[derive(Clone, Debug, PartialEq)] pub enum DenoSubcommand { @@ -196,17 +187,15 @@ Docs: https://deno.land/std/manual.md Modules: https://deno.land/std/ https://deno.land/x/ Bugs: https://github.com/denoland/deno/issues -To start the REPL, supply no arguments: +To start the REPL: deno To execute a script: deno run https://deno.land/std/examples/welcome.ts - deno https://deno.land/std/examples/welcome.ts To evaluate code in the shell: deno eval \"console.log(30933 + 404)\" - -Run 'deno help run' for 'run'-specific flags."; +"; lazy_static! { static ref LONG_VERSION: String = format!( @@ -228,7 +217,6 @@ pub fn flags_from_vec(args: Vec<String>) -> Flags { /// Same as flags_from_vec but does not exit on error. pub fn flags_from_vec_safe(args: Vec<String>) -> clap::Result<Flags> { - let args = arg_hacks(args); let app = clap_root(); let matches = app.get_matches_from_safe(args)?; @@ -272,7 +260,7 @@ pub fn flags_from_vec_safe(args: Vec<String>) -> clap::Result<Flags> { } else if let Some(m) = matches.subcommand_matches("doc") { doc_parse(&mut flags, m); } else { - unimplemented!(); + repl_parse(&mut flags, &matches); } Ok(flags) @@ -1342,80 +1330,12 @@ fn resolve_hosts(paths: Vec<String>) -> Vec<String> { out } -fn arg_hacks(mut args: Vec<String>) -> Vec<String> { - // Hack #1 We want to default the subcommand to "run" - // Clap does not let us have a default sub-command. But we want to allow users - // to do "deno script.js" instead of "deno run script.js". - // This function insert the "run" into the second position of the args. - assert!(!args.is_empty()); - // Rational: - // deno -> deno repl - if args.len() == 1 { - args.insert(1, "repl".to_string()); - return args; - } - let subcommands = sset![ - "bundle", - "completions", - "doc", - "eval", - "cache", - "fmt", - "test", - "info", - "repl", - "run", - "types", - "install", - "help", - "version", - "upgrade" - ]; - let modifier_flags = sset!["-h", "--help", "-V", "--version"]; - // deno [subcommand|behavior modifier flags] -> do nothing - if subcommands.contains(&args[1]) || modifier_flags.contains(&args[1]) { - return args; - } - // This is not perfect either, since originally we should also - // support e.g. `-L debug` which `debug` would be treated as main module. - // Instead `-L=debug` must be used - let mut has_main_module = false; - for arg in args.iter().skip(1) { - if !arg.starts_with('-') { - has_main_module = true; - break; - } - } - if has_main_module { - // deno ...-[flags] NAME ... -> deno run ...-[flags] NAME ... - args.insert(1, "run".to_string()); - } else { - // deno ...-[flags] -> deno repl ...-[flags] - args.insert(1, "repl".to_string()); - } - args -} - #[cfg(test)] mod tests { use super::*; use std::env::current_dir; #[test] - fn arg_hacks_test() { - let args0 = arg_hacks(svec!["deno", "--version"]); - assert_eq!(args0, ["deno", "--version"]); - let args1 = arg_hacks(svec!["deno"]); - assert_eq!(args1, ["deno", "repl"]); - let args2 = arg_hacks(svec!["deno", "-L=debug", "-h"]); - assert_eq!(args2, ["deno", "repl", "-L=debug", "-h"]); - let args3 = arg_hacks(svec!["deno", "script.js"]); - assert_eq!(args3, ["deno", "run", "script.js"]); - let args4 = arg_hacks(svec!["deno", "-A", "script.js", "-L=info"]); - assert_eq!(args4, ["deno", "run", "-A", "script.js", "-L=info"]); - } - - #[test] fn upgrade() { let r = flags_from_vec_safe(svec!["deno", "upgrade", "--dry-run", "--force"]); @@ -1968,41 +1888,6 @@ mod tests { } #[test] - fn default_to_run() { - let r = flags_from_vec_safe(svec!["deno", "script.ts"]); - assert_eq!( - r.unwrap(), - Flags { - subcommand: DenoSubcommand::Run { - script: "script.ts".to_string(), - }, - ..Flags::default() - } - ); - } - - #[test] - fn default_to_run_with_permissions() { - let r = flags_from_vec_safe(svec![ - "deno", - "--allow-net", - "--allow-read", - "script.ts" - ]); - assert_eq!( - r.unwrap(), - Flags { - subcommand: DenoSubcommand::Run { - script: "script.ts".to_string(), - }, - allow_net: true, - allow_read: true, - ..Flags::default() - } - ); - } - - #[test] fn bundle() { let r = flags_from_vec_safe(svec!["deno", "bundle", "source.ts"]); assert_eq!( @@ -2072,25 +1957,6 @@ mod tests { } #[test] - fn default_to_run_importmap() { - let r = flags_from_vec_safe(svec![ - "deno", - "--importmap=importmap.json", - "script.ts" - ]); - assert_eq!( - r.unwrap(), - Flags { - subcommand: DenoSubcommand::Run { - script: "script.ts".to_string(), - }, - import_map_path: Some("importmap.json".to_owned()), - ..Flags::default() - } - ); - } - - #[test] fn cache_importmap() { let r = flags_from_vec_safe(svec![ "deno", @@ -2250,8 +2116,12 @@ mod tests { #[test] fn log_level() { - let r = - flags_from_vec_safe(svec!["deno", "--log-level=debug", "script.ts"]); + let r = flags_from_vec_safe(svec![ + "deno", + "run", + "--log-level=debug", + "script.ts" + ]); assert_eq!( r.unwrap(), Flags { @@ -2266,7 +2136,7 @@ mod tests { #[test] fn quiet() { - let r = flags_from_vec_safe(svec!["deno", "-q", "script.ts"]); + let r = flags_from_vec_safe(svec!["deno", "run", "-q", "script.ts"]); assert_eq!( r.unwrap(), Flags { @@ -2350,7 +2220,8 @@ mod tests { #[test] fn no_remote() { - let r = flags_from_vec_safe(svec!["deno", "--no-remote", "script.ts"]); + let r = + flags_from_vec_safe(svec!["deno", "run", "--no-remote", "script.ts"]); assert_eq!( r.unwrap(), Flags { @@ -2365,7 +2236,8 @@ mod tests { #[test] fn cached_only() { - let r = flags_from_vec_safe(svec!["deno", "--cached-only", "script.ts"]); + let r = + flags_from_vec_safe(svec!["deno", "run", "--cached-only", "script.ts"]); assert_eq!( r.unwrap(), Flags { @@ -2382,6 +2254,7 @@ mod tests { fn allow_net_whitelist_with_ports() { let r = flags_from_vec_safe(svec![ "deno", + "run", "--allow-net=deno.land,:8000,:4545", "script.ts" ]); @@ -2409,6 +2282,7 @@ mod tests { fn lock_write() { let r = flags_from_vec_safe(svec![ "deno", + "run", "--lock-write", "--lock=lock.json", "script.ts" |