Add basic test

denoland · dsherret · Dec 7, 2023 · Nov 28, 2023 · Dec 4, 2023 · Dec 4, 2023
commit 36506ba81650b18a029b4d393c52526e77439ca0
diff --git a/cli/args/flags.rs b/cli/args/flags.rs
@@ -976,7 +976,9 @@ fn clap_root() -> Command {
     .arg(
       Arg::new("unstable-loose-imports")
         .long("unstable-loose-imports")
-        .help("Enable unstable resolving of .js file specifiers to .ts files")
+        .help(
+          "Enable unstable resolving of file specifiers by extension probing and .js to .ts.",
+        )
         .env("DENO_UNSTABLE_LOOSE_IMPORTS")
         .value_parser(FalseyValueParser::new())
         .action(ArgAction::SetTrue)

diff --git a/cli/cache/mod.rs b/cli/cache/mod.rs
@@ -114,6 +114,7 @@ pub struct FetchCacher {
 }
 
 impl FetchCacher {
+  #[allow(clippy::too_many_arguments)]
   pub fn new(
     emit_cache: EmitCache,
     file_fetcher: Arc<FileFetcher>,

diff --git a/cli/resolver.rs b/cli/resolver.rs
@@ -488,9 +488,9 @@ impl UnstableLooseImportsResolver {
       return Cow::Borrowed(specifier);
     }
 
-    let media_type = MediaType::from_specifier(&specifier);
+    let media_type = MediaType::from_specifier(specifier);
     let probe_media_type_types = match media_type {
-      MediaType::JavaScript => vec![MediaType::TypeScript],
+      MediaType::JavaScript => vec![MediaType::TypeScript, MediaType::Tsx],
       MediaType::Jsx => vec![MediaType::Tsx],
       MediaType::Mjs => vec![MediaType::Mts],
       MediaType::Cjs => vec![MediaType::Cts],
@@ -555,6 +555,9 @@ impl UnstableLooseImportsResolver {
 mod test {
   use std::collections::BTreeMap;
 
+  use deno_runtime::deno_fs::RealFs;
+  use test_util::TestContext;
+
   use super::*;
 
   #[test]
@@ -616,4 +619,64 @@ mod test {
     // non-existent bare specifier
     assert_eq!(resolve("non-existent", &deps).unwrap(), None);
   }
+
+  #[test]
+  fn test_unstable_loose_imports() {
+    // It would be more ideal to use an in memory file system, but
+    // we haven't written one.
+    let context = TestContext::default();
+    let temp_dir = context.temp_dir().path();
+    let fs = Arc::new(RealFs);
+    let resolver = UnstableLooseImportsResolver::new(fs);
+
+    // scenarios like resolving ./example.js to ./example.ts
+    for (ext_from, ext_to) in [("js", "ts"), ("js", "tsx"), ("mjs", "mts")] {
+      let ts_file = temp_dir.join(format!("file.{}", ext_to));
+      ts_file.write("");
+      assert_eq!(
+        resolver.resolve(&ts_file.uri_file()).to_string(),
+        ts_file.uri_file().to_string(),
+      );
+      assert_eq!(
+        resolver
+          .resolve(
+            &temp_dir
+              .uri_dir()
+              .join(&format!("file.{}", ext_from))
+              .unwrap()
+          )
+          .to_string(),
+        ts_file.uri_file().to_string(),
+      );
+      ts_file.remove_file();
+    }
+
+    // no extension scenarios
+    for ext in ["js", "ts", "js", "tsx", "jsx", "mjs", "mts"] {
+      let file = temp_dir.join(format!("file.{}", ext));
+      file.write("");
+      assert_eq!(
+        resolver
+          .resolve(
+            &temp_dir
+              .uri_dir()
+              .join("file") // no ext
+              .unwrap()
+          )
+          .to_string(),
+        file.uri_file().to_string(),
+      );
+      file.remove_file();
+    }
+
+    // .ts and .js exists, .js specified (goes to specified)
+    let ts_file = temp_dir.join("file.ts");
+    ts_file.write("");
+    let js_file = temp_dir.join("file.js");
+    js_file.write("");
+    assert_eq!(
+      resolver.resolve(&js_file.uri_file()).to_string(),
+      js_file.uri_file().to_string(),
+    );
+  }
 }