feat: return not found when recursing non-existent file (#36)

relates to #32

Author: Boshen

fixtures/enhanced_resolve/test/fixtures/browser-module/lib/self.js

@@ -7,6 +7,10 @@
     "module-c": "module-c",
     "./toString": "./lib/toString.js",
     "./lib/main.js": "./lib/main.js",
+    "./main.js": "./lib/main.js",
+    "./lib/xyz.js": "./xyz.js",
+    "./xyz.js": "./lib/xyz.js",
+    "./lib/non-existent.js": "./lib/non-existent.js",
     ".": false
   },
   "innerBrowser1": {

fixtures/enhanced_resolve/test/fixtures/browser-module/package.json

@@ -780,24 +780,28 @@ impl<Fs: FileSystem + Default> ResolverGeneric<Fs> {
     fn load_browser_field(
         &self,
         cached_path: &CachedPath,
-        specifier: Option<&str>,
+        module_specifier: Option<&str>,
         package_json: &PackageJson,
         ctx: &mut ResolveContext,
     ) -> ResolveState {
         let path = cached_path.path();
-        let Some(new_specifier) = package_json.resolve_browser_field(path, specifier)? else {
+        let Some(new_specifier) = package_json.resolve_browser_field(path, module_specifier)?
+        else {
             return Ok(None);
         };
-        // Finish when resolving to self `{"./a.js": "./a.js"}`
-        if let Some(new_specifier) = new_specifier.strip_prefix("./") {
-            if path.ends_with(Path::new(new_specifier)) {
-                return Ok(Some(cached_path.clone()));
-            }
-        }
-        if specifier.is_some_and(|s| s == new_specifier) {
+        // Abort when resolving recursive module
+        if module_specifier.is_some_and(|s| s == new_specifier) {
             return Ok(None);
         }
         if ctx.resolving_alias.as_ref().is_some_and(|s| s == new_specifier) {
+            // Complete when resolving to self `{"./a.js": "./a.js"}`
+            if new_specifier.strip_prefix("./").filter(|s| path.ends_with(Path::new(s))).is_some() {
+                return if cached_path.is_file(&self.cache.fs) {
+                    Ok(Some(cached_path.clone()))
+                } else {
+                    Err(ResolveError::NotFound(cached_path.path().to_path_buf()))
+                };
+            }
             return Err(ResolveError::Recursion);
         }
         let specifier = Specifier::parse(new_specifier).map_err(ResolveError::Specifier)?;

src/lib.rs

@@ -61,7 +61,8 @@ fn replace_file() {
         ("should check only alias field properties", f.clone(), "./toString", f.join("lib/toString.js")),
         // not part of enhanced-resolve
         ("recursion", f.clone(), "module-c", f.join("node_modules/module-c.js")),
-        ("resolve self", f.clone(), "./lib/main.js", f.join("lib/main.js")),
+        ("resolve self 1", f.clone(), "./lib/main.js", f.join("lib/main.js")),
+        ("resolve self 2", f.clone(), "./main.js", f.join("lib/main.js")),
     ];
 
     for (comment, path, request, expected) in data {
@@ -70,6 +71,28 @@ fn replace_file() {
     }
 }
 
+#[test]
+fn recurse_fail() {
+    let f = super::fixture();
+
+    let resolver = Resolver::new(ResolveOptions {
+        alias_fields: vec![vec!["browser".into()]],
+        ..ResolveOptions::default()
+    });
+
+    #[rustfmt::skip]
+    let data = [
+        ("recurse non existent", f.clone(), "./lib/non-existent.js", ResolveError::NotFound(f.join("lib/non-existent.js"))),
+        ("path partial match 1", f.clone(), "./xyz.js", ResolveError::NotFound(f.join("xyz.js"))),
+        ("path partial match 2", f.clone(), "./lib/xyz.js", ResolveError::NotFound(f.join("lib/xyz.js"))),
+    ];
+
+    for (comment, path, request, expected) in data {
+        let resolved_path = resolver.resolve(&path, request).map(|r| r.full_path());
+        assert_eq!(resolved_path, Err(expected), "{comment} {path:?} {request}");
+    }
+}
+
 #[test]
 fn broken() {
     let f = super::fixture();