Partial reload

cli/file_fetcher.rs

@@ -70,6 +70,7 @@ pub struct SourceFileFetcher {
   deps_cache: DiskCache,
   progress: Progress,
   source_file_cache: SourceFileCache,
+  cache_blacklist: Vec<String>,
   use_disk_cache: bool,
   no_remote_fetch: bool,
 }
@@ -79,12 +80,14 @@ impl SourceFileFetcher {
     deps_cache: DiskCache,
     progress: Progress,
     use_disk_cache: bool,
+    cache_blacklist: Vec<String>,
     no_remote_fetch: bool,
   ) -> std::io::Result<Self> {
     let file_fetcher = Self {
       deps_cache,
       progress,
       source_file_cache: SourceFileCache::default(),
+      cache_blacklist,
       use_disk_cache,
       no_remote_fetch,
     };
@@ -308,8 +311,10 @@ impl SourceFileFetcher {
       return Box::new(futures::future::err(too_many_redirects()));
     }
 
+    let is_blacklisted =
+      check_cache_blacklist(module_url, self.cache_blacklist.as_ref());
     // First try local cache
-    if use_disk_cache {
+    if use_disk_cache && !is_blacklisted {
       match self.fetch_cached_remote_source(&module_url) {
         Ok(Some(source_file)) => {
           return Box::new(futures::future::ok(source_file));
@@ -533,6 +538,26 @@ fn filter_shebang(bytes: Vec<u8>) -> Vec<u8> {
   }
 }
 
+fn check_cache_blacklist(url: &Url, black_list: &[String]) -> bool {
+  let mut url_without_fragmets = url.clone();
+  url_without_fragmets.set_fragment(None);
+  if black_list.contains(&String::from(url_without_fragmets.as_str())) {
+    return true;
+  }
+  let mut url_without_query_strings = url_without_fragmets;
+  url_without_query_strings.set_query(None);
+  let mut path_buf = PathBuf::from(url_without_query_strings.as_str());
+  loop {
+    if black_list.contains(&String::from(path_buf.to_str().unwrap())) {
+      return true;
+    }
+    if !path_buf.pop() {
+      break;
+    }
+  }
+  false
+}
+
 #[derive(Debug, Default)]
 /// Header metadata associated with a particular "symbolic" source code file.
 /// (the associated source code file might not be cached, while remaining
@@ -617,6 +642,7 @@ mod tests {
       DiskCache::new(&dir_path.to_path_buf().join("deps")),
       Progress::new(),
       true,
+      vec![],
       false,
     )
     .expect("setup fail")
@@ -638,6 +664,70 @@ mod tests {
     };
   }
 
+  #[test]
+  fn test_cache_blacklist() {
+    let args = crate::flags::resolve_urls(vec![
+      String::from("http://deno.land/std"),
+      String::from("http://github.com/example/mod.ts"),
+      String::from("http://fragment.com/mod.ts#fragment"),
+      String::from("http://query.com/mod.ts?foo=bar"),
+      String::from("http://queryandfragment.com/mod.ts?foo=bar#fragment"),
+    ]);
+
+    let url1: Url = "http://deno.land/std/fs/mod.ts".parse().unwrap();
+    let url2: Url = "http://github.com/example/file.ts".parse().unwrap();
+    let url3: Url = "http://github.com/example/mod.ts".parse().unwrap();
+    let url4: Url = "http://github.com/example/mod.ts?foo=bar".parse().unwrap();
+    let url5: Url =
+      "http://github.com/example/mod.ts#fragment".parse().unwrap();
+    let url6: Url = "http://fragment.com/mod.ts".parse().unwrap();
+    let url7: Url = "http://query.com/mod.ts".parse().unwrap();
+    let url8: Url = "http://fragment.com/mod.ts#fragment".parse().unwrap();
+    let url9: Url = "http://query.com/mod.ts?foo=bar".parse().unwrap();
+    let url10: Url = "http://queryandfragment.com/mod.ts".parse().unwrap();
+    let url11: Url = "http://queryandfragment.com/mod.ts?foo=bar"
+      .parse()
+      .unwrap();
+    let url12: Url = "http://queryandfragment.com/mod.ts#fragment"
+      .parse()
+      .unwrap();
+    let url13: Url =
+      "http://query.com/mod.ts?foo=bar#fragment".parse().unwrap();
+    let url14: Url = "http://fragment.com/mod.ts?foo=bar#fragment"
+      .parse()
+      .unwrap();
+
+    let result1 = check_cache_blacklist(&url1, &args);
+    let result2 = check_cache_blacklist(&url2, &args);
+    let result3 = check_cache_blacklist(&url3, &args);
+    let result4 = check_cache_blacklist(&url4, &args);
+    let result5 = check_cache_blacklist(&url5, &args);
+    let result6 = check_cache_blacklist(&url6, &args);
+    let result7 = check_cache_blacklist(&url7, &args);
+    let result8 = check_cache_blacklist(&url8, &args);
+    let result9 = check_cache_blacklist(&url9, &args);
+    let result10 = check_cache_blacklist(&url10, &args);
+    let result11 = check_cache_blacklist(&url11, &args);
+    let result12 = check_cache_blacklist(&url12, &args);
+    let result13 = check_cache_blacklist(&url13, &args);
+    let result14 = check_cache_blacklist(&url14, &args);
+
+    assert_eq!(result1, true);
+    assert_eq!(result2, false);
+    assert_eq!(result3, true);
+    assert_eq!(result4, true);
+    assert_eq!(result5, true);
+    assert_eq!(result6, true);
+    assert_eq!(result7, false);
+    assert_eq!(result8, true);
+    assert_eq!(result9, true);
+    assert_eq!(result10, false);
+    assert_eq!(result11, true);
+    assert_eq!(result12, false);
+    assert_eq!(result13, true);
+    assert_eq!(result14, true);
+  }
+
   #[test]
   fn test_source_code_headers_get_and_save() {
     let (_temp_dir, fetcher) = test_setup();

cli/flags.rs

@@ -11,6 +11,7 @@ use log::Level;
 use std;
 use std::str;
 use std::str::FromStr;
+use url::Url;
 
 macro_rules! std_url {
   ($x:expr) => {
@@ -45,6 +46,7 @@ pub struct DenoFlags {
   pub import_map_path: Option<String>,
   pub allow_read: bool,
   pub read_whitelist: Vec<String>,
+  pub cache_blacklist: Vec<String>,
   pub allow_write: bool,
   pub write_whitelist: Vec<String>,
   pub allow_net: bool,
@@ -172,8 +174,18 @@ To get help on the another subcommands (run in this case):
     ).arg(
       Arg::with_name("reload")
         .short("r")
+        .min_values(0)
+        .multiple(true)
+        .takes_value(true)
+        .use_delimiter(true)
+        .require_equals(true)
         .long("reload")
-        .help("Reload source code cache (recompile TypeScript)")
+        .help("Reload source code cache (recompile TypeScript). Supports blacklist")
+        .value_name("blacklist")
+        .long_help("Reload source code cache (recompile TypeScript). Supports blacklist\
+        --reload    // Reload everything\
+        --reload=https://deno.land/std    // Reload everything from the standard module\
+        --reload=https://deno.land/std/fs/utils.ts,https://deno.land/std/fmt/colors.ts  // Reload only fs/utils and fmt/colors modules")
         .global(true),
     ).arg(
       Arg::with_name("config")
@@ -509,6 +521,23 @@ fn resolve_paths(paths: Vec<String>) -> Vec<String> {
   out
 }
 
+pub fn resolve_urls(urls: Vec<String>) -> Vec<String> {
+  let mut out: Vec<String> = vec![];
+  for urlstr in urls.iter() {
+    let result = Url::from_str(urlstr);
+    if result.is_err() {
+      panic!("Bad Url: {}", urlstr);
+    }
+    let mut url = result.unwrap();
+    url.set_fragment(None);
+    let mut full_url = String::from(url.as_str());
+    if full_url.len() > 1 && full_url.ends_with('/') {
+      full_url.pop();
+    }
+    out.push(full_url);
+  }
+  out
+}
 /// This function expands "bare port" paths (eg. ":8080")
 /// into full paths with hosts. It expands to such paths
 /// into 3 paths with following hosts: `0.0.0.0:port`, `127.0.0.1:port` and `localhost:port`.
@@ -566,7 +595,16 @@ pub fn parse_flags(
     flags.version = true;
   }
   if matches.is_present("reload") {
-    flags.reload = true;
+    if matches.value_of("reload").is_some() {
+      let cache_bl = matches.values_of("reload").unwrap();
+      let raw_cache_blacklist: Vec<String> =
+        cache_bl.map(std::string::ToString::to_string).collect();
+      flags.cache_blacklist = resolve_urls(raw_cache_blacklist);
+      debug!("cache blacklist: {:#?}", &flags.cache_blacklist);
+      flags.reload = false;
+    } else {
+      flags.reload = true;
+    }
   }
   flags.config_path = matches.value_of("config").map(ToOwned::to_owned);
   if matches.is_present("v8-options") {

cli/state.rs

@@ -221,10 +221,13 @@ impl ThreadSafeState {
 
     let dir = deno_dir::DenoDir::new(custom_root)?;
 
+    let cache_bl = flags.cache_blacklist.clone();
+
     let file_fetcher = SourceFileFetcher::new(
       dir.deps_cache.clone(),
       progress.clone(),
       !flags.reload,
+      cache_bl,
       flags.no_fetch,
     )?;