Merge branch 'master' into loader/wasm

Author: kevinkassimo

cli/compilers/ts.rs

@@ -156,20 +156,23 @@ impl CompiledFileMetadata {
 }
 /// Creates the JSON message send to compiler.ts's onmessage.
 fn req(
+  request_type: msg::CompilerRequestType,
   root_names: Vec<String>,
   compiler_config: CompilerConfig,
-  bundle: Option<String>,
+  out_file: Option<String>,
 ) -> Buf {
   let j = match (compiler_config.path, compiler_config.content) {
     (Some(config_path), Some(config_data)) => json!({
+      "type": request_type as i32,
       "rootNames": root_names,
-      "bundle": bundle,
+      "outFile": out_file,
       "configPath": config_path,
       "config": str::from_utf8(&config_data).unwrap(),
     }),
     _ => json!({
+      "type": request_type as i32,
       "rootNames": root_names,
-      "bundle": bundle,
+      "outFile": out_file,
     }),
   };
 
@@ -250,15 +253,20 @@ impl TsCompiler {
     self: &Self,
     global_state: ThreadSafeGlobalState,
     module_name: String,
-    out_file: String,
+    out_file: Option<String>,
   ) -> impl Future<Item = (), Error = ErrBox> {
     debug!(
       "Invoking the compiler to bundle. module_name: {}",
       module_name
     );
 
     let root_names = vec![module_name.clone()];
-    let req_msg = req(root_names, self.config.clone(), Some(out_file));
+    let req_msg = req(
+      msg::CompilerRequestType::Bundle,
+      root_names,
+      self.config.clone(),
+      out_file,
+    );
 
     let worker = TsCompiler::setup_worker(global_state.clone());
     let worker_ = worker.clone();
@@ -360,7 +368,12 @@ impl TsCompiler {
     );
 
     let root_names = vec![module_url.to_string()];
-    let req_msg = req(root_names, self.config.clone(), None);
+    let req_msg = req(
+      msg::CompilerRequestType::Compile,
+      root_names,
+      self.config.clone(),
+      None,
+    );
 
     let worker = TsCompiler::setup_worker(global_state.clone());
     let worker_ = worker.clone();
@@ -709,7 +722,7 @@ mod tests {
         .bundle_async(
           state.clone(),
           module_name,
-          String::from("$deno$/bundle.js"),
+          Some(String::from("$deno$/bundle.js")),
         )
         .then(|result| {
           assert!(result.is_ok());

cli/compilers/wasm.rs

@@ -10,7 +10,7 @@ use crate::file_fetcher::SourceFile;
 
 // Ref: https://webassembly.github.io/esm-integration/js-api/index.html#esm-integration
 
-// Only default exports is support atm.
+// Only default exports is support ATM.
 // Node.js supports named import since its dynamic module creation allows
 // running some code before transformation:
 // https://github.com/nodejs/node/blob/35ec01097b2a397ad0a22aac536fe07514876e21/lib/internal/modules/esm/translators.js#L190-L210

cli/flags.rs

@@ -6,7 +6,6 @@ use clap::Arg;
 use clap::ArgMatches;
 use clap::Shell;
 use clap::SubCommand;
-use deno::ModuleSpecifier;
 use log::Level;
 use std;
 use std::str;
@@ -259,11 +258,16 @@ compiler.",
       SubCommand::with_name("bundle")
         .about("Bundle module and dependencies into single file")
         .long_about(
-          "Output a single JavaScript file with all dependencies
+          "Output a single JavaScript file with all dependencies.
+
+If a out_file argument is omitted, the output of the bundle will be sent to
+standard out.
 
 Example:
 
-  deno bundle https://deno.land/std/examples/colors.ts"
+  deno bundle https://deno.land/std/examples/colors.ts
+  
+  deno bundle https://deno.land/std/examples/colors.ts colors.bundle.js"
         )
           .arg(Arg::with_name("source_file").takes_value(true).required(true))
           .arg(Arg::with_name("out_file").takes_value(true).required(false)),
@@ -335,12 +339,111 @@ This command has implicit access to all permissions (equivalent to deno run --al
 Automatically downloads Prettier dependencies on first run.
 
   deno fmt myfile1.ts myfile2.ts",
-        ).arg(
+        )
+        .arg(
           Arg::with_name("stdout")
             .long("stdout")
             .help("Output formated code to stdout")
             .takes_value(false),
-        ).arg(
+        )
+        .arg(
+          Arg::with_name("print-width")
+            .long("print-width")
+            .value_name("int")
+            .help("Specify the line length that the printer will wrap on.")
+            .takes_value(true)
+            .require_equals(true)
+        )
+        .arg(
+          Arg::with_name("tab-width")
+            .long("tab-width")
+            .value_name("int")
+            .help("Specify the number of spaces per indentation-level.")
+            .takes_value(true)
+            .require_equals(true)
+        )
+        .arg(
+          Arg::with_name("use-tabs")
+            .long("use-tabs")
+            .help("Indent lines with tabs instead of spaces.")
+            .takes_value(false)
+        )
+        .arg(
+          Arg::with_name("no-semi")
+            .long("no-semi")
+            .help("Print semicolons at the ends of statements.")
+            .takes_value(false)
+        )
+        .arg(
+          Arg::with_name("single-quote")
+            .long("single-quote")
+            .help("Use single quotes instead of double quotes.")
+            .takes_value(false)
+        )
+        .arg(
+          Arg::with_name("quote-props")
+            .long("quote-props")
+            .value_name("as-needed|consistent|preserve")
+            .help("Change when properties in objects are quoted.")
+            .takes_value(true)
+            .possible_values(&["as-needed", "consistent", "preserve"])
+            .require_equals(true)
+        )
+        .arg(
+          Arg::with_name("jsx-single-quote")
+            .long("jsx-single-quote")
+            .help("Use single quotes instead of double quotes in JSX.")
+            .takes_value(false)
+        )
+        .arg(
+          Arg::with_name("jsx-bracket-same-line")
+            .long("jsx-bracket-same-line")
+            .help(
+              "Put the > of a multi-line JSX element at the end of the last line
+instead of being alone on the next line (does not apply to self closing elements)."
+            )
+            .takes_value(false)
+        )
+        .arg(
+          Arg::with_name("trailing-comma")
+            .long("trailing-comma")
+            .help("Print trailing commas wherever possible when multi-line.")
+            .takes_value(false)
+        )
+        .arg(
+          Arg::with_name("no-bracket-spacing")
+            .long("no-bracket-spacing")
+            .help("Print spaces between brackets in object literals.")
+            .takes_value(false)
+        )
+        .arg(
+          Arg::with_name("arrow-parens")
+            .long("arrow-parens")
+            .value_name("avoid|always")
+            .help("Include parentheses around a sole arrow function parameter.")
+            .takes_value(true)
+            .possible_values(&["avoid", "always"])
+            .require_equals(true)
+        )
+        .arg(
+          Arg::with_name("prose-wrap")
+            .long("prose-wrap")
+            .value_name("always|never|preserve")
+            .help("How to wrap prose.")
+            .takes_value(true)
+            .possible_values(&["always", "never", "preserve"])
+            .require_equals(true)
+        )
+        .arg(
+          Arg::with_name("end-of-line")
+            .long("end-of-line")
+            .value_name("auto|lf|crlf|cr")
+            .help("Which end of line characters to apply.")
+            .takes_value(true)
+            .possible_values(&["auto", "lf", "crlf", "cr"])
+            .require_equals(true)
+        )
+        .arg(
           Arg::with_name("files")
             .takes_value(true)
             .multiple(true)
@@ -793,32 +896,6 @@ pub enum DenoSubcommand {
   Version,
 }
 
-fn get_default_bundle_filename(source_file: &str) -> String {
-  let specifier = ModuleSpecifier::resolve_url_or_path(source_file).unwrap();
-  let path_segments = specifier.as_url().path_segments().unwrap();
-  let file_name = path_segments.filter(|s| !s.is_empty()).last().unwrap();
-  let file_stem = file_name.trim_end_matches(".ts").trim_end_matches(".js");
-  format!("{}.bundle.js", file_stem)
-}
-
-#[test]
-fn test_get_default_bundle_filename() {
-  assert_eq!(get_default_bundle_filename("blah.ts"), "blah.bundle.js");
-  assert_eq!(
-    get_default_bundle_filename("http://example.com/blah.ts"),
-    "blah.bundle.js"
-  );
-  assert_eq!(get_default_bundle_filename("blah.js"), "blah.bundle.js");
-  assert_eq!(
-    get_default_bundle_filename("http://example.com/blah.js"),
-    "blah.bundle.js"
-  );
-  assert_eq!(
-    get_default_bundle_filename("http://zombo.com/stuff/"),
-    "stuff.bundle.js"
-  );
-}
-
 pub fn flags_from_vec(
   args: Vec<String>,
 ) -> (DenoFlags, DenoSubcommand, Vec<String>) {
@@ -835,11 +912,13 @@ pub fn flags_from_vec(
     ("bundle", Some(bundle_match)) => {
       flags.allow_write = true;
       let source_file: &str = bundle_match.value_of("source_file").unwrap();
-      let out_file = bundle_match
-        .value_of("out_file")
-        .map(String::from)
-        .unwrap_or_else(|| get_default_bundle_filename(source_file));
-      argv.extend(vec![source_file.to_string(), out_file.to_string()]);
+      let out_file = bundle_match.value_of("out_file").map(String::from);
+      match out_file {
+        Some(out_file) => {
+          argv.extend(vec![source_file.to_string(), out_file.to_string()])
+        }
+        _ => argv.extend(vec![source_file.to_string()]),
+      }
       DenoSubcommand::Bundle
     }
     ("completions", Some(completions_match)) => {
@@ -886,6 +965,36 @@ pub fn flags_from_vec(
         argv.push("--write".to_string());
       }
 
+      let prettier_flags = [
+        ["1", "print-width"],
+        ["1", "tab-width"],
+        ["0", "use-tabs"],
+        ["0", "no-semi"],
+        ["0", "single-quote"],
+        ["1", "quote-props"],
+        ["0", "jsx-single-quote"],
+        ["0", "jsx-bracket-same-line"],
+        ["0", "trailing-comma"],
+        ["0", "no-bracket-spacing"],
+        ["1", "arrow-parens"],
+        ["1", "prose-wrap"],
+        ["1", "end-of-line"],
+      ];
+
+      for opt in &prettier_flags {
+        let t = opt[0];
+        let keyword = opt[1];
+
+        if fmt_match.is_present(&keyword) {
+          if t == "0" {
+            argv.push(format!("--{}", keyword));
+          } else {
+            argv.push(format!("--{}", keyword));
+            argv.push(fmt_match.value_of(keyword).unwrap().to_string());
+          }
+        }
+      }
+
       DenoSubcommand::Run
     }
     ("info", Some(info_match)) => {
@@ -1928,4 +2037,59 @@ mod tests {
     assert_eq!(subcommand, DenoSubcommand::Run);
     assert_eq!(argv, svec!["deno", "script.ts"])
   }
+
+  #[test]
+  fn test_flags_from_vec_39() {
+    let (flags, subcommand, argv) = flags_from_vec(svec![
+      "deno",
+      "fmt",
+      "--print-width=100",
+      "--tab-width=4",
+      "--use-tabs",
+      "--no-semi",
+      "--single-quote",
+      "--arrow-parens=always",
+      "--prose-wrap=preserve",
+      "--end-of-line=crlf",
+      "--quote-props=preserve",
+      "--jsx-single-quote",
+      "--jsx-bracket-same-line",
+      "script.ts"
+    ]);
+    assert_eq!(
+      flags,
+      DenoFlags {
+        allow_write: true,
+        allow_read: true,
+        ..DenoFlags::default()
+      }
+    );
+    assert_eq!(subcommand, DenoSubcommand::Run);
+    assert_eq!(
+      argv,
+      svec![
+        "deno",
+        PRETTIER_URL,
+        "script.ts",
+        "--write",
+        "--print-width",
+        "100",
+        "--tab-width",
+        "4",
+        "--use-tabs",
+        "--no-semi",
+        "--single-quote",
+        "--quote-props",
+        "preserve",
+        "--jsx-single-quote",
+        "--jsx-bracket-same-line",
+        "--arrow-parens",
+        "always",
+        "--prose-wrap",
+        "preserve",
+        "--end-of-line",
+        "crlf"
+      ]
+    );
+  }
 }