fix(npm): translate CJS to ESM with name clashes for files and dirs (#15697)

cli/node/mod.rs

@@ -738,7 +738,6 @@ pub fn translate_cjs_to_esm(
   // if there are reexports, handle them first
   for (idx, reexport) in analysis.reexports.iter().enumerate() {
     // Firstly, resolve relate reexport specifier
-    // todo(dsherret): call module_resolve instead?
     let resolved_reexport = resolve(
       reexport,
       specifier,
@@ -1039,19 +1038,29 @@ fn is_relative_specifier(specifier: &str) -> bool {
 }
 
 fn file_extension_probe(
-  mut p: PathBuf,
+  p: PathBuf,
   referrer: &Path,
 ) -> Result<PathBuf, AnyError> {
-  if p.exists() && !p.is_dir() {
+  let p = p.clean();
-    Ok(p.clean())
+  if p.exists() {
-  } else {
+    let mut p_js = p.clone();
-    p.set_extension("js");
+    p_js.set_extension("js");
-    if p.exists() && !p.is_dir() {
+    if p_js.exists() && p_js.is_file() {
-      Ok(p)
+      return Ok(p_js);
+    } else if p.is_dir() {
+      return Ok(p.join("index.js"));
     } else {
-      Err(not_found(&p.clean().to_string_lossy(), referrer))
+      return Ok(p);
+    }
+  } else {
+    let mut p_js = p.clone();
+    p_js.set_extension("js");
+    if p_js.exists() && p_js.is_file() {
+      return Ok(p_js);
     }
   }
+
+  Err(not_found(&p.to_string_lossy(), referrer))
 }
 
 fn not_found(path: &str, referrer: &Path) -> AnyError {

cli/tests/integration/npm_tests.rs

@@ -61,6 +61,13 @@ itest!(cjs_reexport_collision {
   http_server: true,
 });
 
+itest!(translate_cjs_to_esm {
+  args: "run --unstable -A --quiet npm/translate_cjs_to_esm/main.js",
+  output: "npm/translate_cjs_to_esm/main.out",
+  envs: env_vars(),
+  http_server: true,
+});
+
 itest!(compare_globals {
   args: "run --allow-read --unstable npm/compare_globals/main.js",
   output: "npm/compare_globals/main.out",

cli/tests/testdata/npm/translate_cjs_to_esm/main.js

@@ -0,0 +1,2 @@
+import fsx from "npm:fs-extra@10.1.0";
+console.log(fsx.access);

cli/tests/testdata/npm/translate_cjs_to_esm/main.out

@@ -0,0 +1 @@
+[Function: access]