fix: resolve module ipaddr.js correctly when extensionAlias is provided

Boshen · Boshen · commit 6244ef95446b · 2024-07-15T22:15:02.000+08:00
closes #227
diff --git a/examples/resolver.rs b/examples/resolver.rs
@@ -18,7 +18,7 @@ fn main() {
         alias_fields: vec![vec!["browser".into()]],
         alias: vec![("asdf".into(), vec![AliasValue::from("./test.js")])],
         extensions: vec![".js".into(), ".ts".into()],
-        extension_alias: vec![(".js".into(), vec![".ts".into()])],
+        extension_alias: vec![(".js".into(), vec![".ts".into(), ".js".into()])],
         ..ResolveOptions::default()
     };
 
diff --git a/fixtures/pnpm/package.json b/fixtures/pnpm/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "devDependencies": {
     "axios": "1.6.2",
-    "styled-components": "6.1.1",
-    "postcss": "8.4.33"
+    "ipaddr.js": "2.2.0",
+    "postcss": "8.4.33",
+    "styled-components": "6.1.1"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/error.rs b/src/error.rs
@@ -43,8 +43,8 @@ pub enum ResolveError {
     Builtin(String),
 
     /// All of the aliased extension are not found
-    #[error("All of the aliased extension are not found")]
-    ExtensionAlias,
+    #[error("All of the aliased extensions are not found for {0}")]
+    ExtensionAlias(PathBuf),
 
     /// The provided path specifier cannot be parsed
     #[error("{0}")]
diff --git a/src/lib.rs b/src/lib.rs
@@ -510,9 +510,7 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
         // 2. If X.js is a file, load X.js as JavaScript text. STOP
         // 3. If X.json is a file, parse X.json to a JavaScript Object. STOP
         // 4. If X.node is a file, load X.node as binary addon. STOP
-        if let Some(path) =
-            self.load_extensions(cached_path.path(), &self.options.extensions, ctx)?
-        {
+        if let Some(path) = self.load_extensions(cached_path, &self.options.extensions, ctx)? {
             return Ok(Some(path));
         }
         Ok(None)
@@ -571,11 +569,16 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
         Ok(None)
     }
 
-    fn load_extensions(&self, path: &Path, extensions: &[String], ctx: &mut Ctx) -> ResolveResult {
+    fn load_extensions(
+        &self,
+        path: &CachedPath,
+        extensions: &[String],
+        ctx: &mut Ctx,
+    ) -> ResolveResult {
         if ctx.fully_specified {
             return Ok(None);
         }
-        let path = path.as_os_str();
+        let path = path.path().as_os_str();
         for extension in extensions {
             let mut path_with_extension = path.to_os_string();
             path_with_extension.reserve_exact(extension.len());
@@ -637,9 +640,7 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
             // 1. If X/index.js is a file, load X/index.js as JavaScript text. STOP
             // 2. If X/index.json is a file, parse X/index.json to a JavaScript object. STOP
             // 3. If X/index.node is a file, load X/index.node as binary addon. STOP
-            if let Some(path) =
-                self.load_extensions(cached_path.path(), &self.options.extensions, ctx)?
-            {
+            if let Some(path) = self.load_extensions(&cached_path, &self.options.extensions, ctx)? {
                 return Ok(Some(path));
             }
         }
@@ -972,7 +973,7 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
         Ok(None)
     }
 
-    /// Given an extension alias map `{".js": [".ts", "js"]}`,
+    /// Given an extension alias map `{".js": [".ts", ".js"]}`,
     /// load the mapping instead of the provided extension
     ///
     /// This is an enhanced-resolve feature
@@ -996,11 +997,24 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
             return Ok(None);
         };
         let path = cached_path.path().with_extension("");
-        ctx.with_fully_specified(false);
-        if let Some(path) = self.load_extensions(&path, extensions, ctx)? {
-            return Ok(Some(path));
+        let path = path.as_os_str();
+        ctx.with_fully_specified(true);
+        for extension in extensions {
+            let mut path_with_extension = path.to_os_string();
+            path_with_extension.reserve_exact(extension.len());
+            path_with_extension.push(extension);
+            let cached_path = self.cache.value(Path::new(&path_with_extension));
+            // Bail if path is module directory such as `ipaddr.js`
+            if cached_path.is_dir(&self.cache.fs, ctx) {
+                ctx.with_fully_specified(false);
+                return Ok(None);
+            }
+            if let Some(path) = self.load_alias_or_file(&cached_path, ctx)? {
+                ctx.with_fully_specified(false);
+                return Ok(Some(path));
+            }
         }
-        Err(ResolveError::ExtensionAlias)
+        Err(ResolveError::ExtensionAlias(cached_path.to_path_buf()))
     }
 
     /// enhanced-resolve: RootsPlugin
diff --git a/src/tests/exports_field.rs b/src/tests/exports_field.rs
@@ -269,7 +269,7 @@ fn extension_alias_throw_error() {
     let fail = [
         // enhanced-resolve has two test cases that are exactly the same here
         // https://github.com/webpack/enhanced-resolve/blob/a998c7d218b7a9ec2461fc4fddd1ad5dd7687485/test/exportsField.test.js#L2976-L3024
-        ("should throw error with the `extensionAlias` option", f, "pkg/string.js", ResolveError::ExtensionAlias),
+        ("should throw error with the `extensionAlias` option", f.clone(), "pkg/string.js", ResolveError::ExtensionAlias(f.join("node_modules/pkg/dist/string.js"))),
         // TODO: The error is PackagePathNotExported in enhanced-resolve
         // ("should throw error with the `extensionAlias` option", f.clone(), "pkg/string.js", ResolveError::PackagePathNotExported("node_modules/pkg/dist/string.ts".to_string())),
     ];
diff --git a/src/tests/extension_alias.rs b/src/tests/extension_alias.rs
@@ -31,12 +31,16 @@ fn extension_alias() {
 
     #[rustfmt::skip]
     let fail = [
-        ("should not allow to fallback to the original extension or add extensions", f, "./index.mjs"),
+        ("should not allow to fallback to the original extension or add extensions", f.clone(), "./index.mjs"),
     ];
 
     for (comment, path, request) in fail {
         let resolution = resolver.resolve(&path, request);
-        assert_eq!(resolution, Err(ResolveError::ExtensionAlias), "{comment} {path:?} {request}");
+        assert_eq!(
+            resolution,
+            Err(ResolveError::ExtensionAlias(f.join(request))),
+            "{comment} {path:?} {request}"
+        );
     }
 }
 
diff --git a/tests/resolve_test.rs b/tests/resolve_test.rs
@@ -102,3 +102,31 @@ fn postcss() {
     let resolution = resolver.resolve(&module_path, "./lib/terminal-highlight");
     assert_eq!(resolution, Err(ResolveError::Ignored(module_path.join("lib/terminal-highlight"))));
 }
+
+#[test]
+fn ipaddr_js() {
+    let dir = dir();
+    let path = dir.join("fixtures/pnpm");
+    let module_path =
+        dir.join("node_modules/.pnpm/ipaddr.js@2.2.0/node_modules/ipaddr.js/lib/ipaddr.js");
+
+    let resolvers = [
+        // with `extension_alias`
+        Resolver::new(ResolveOptions {
+            extension_alias: vec![(".js".into(), vec![".js".into(), ".ts".into(), ".tsx".into()])],
+            ..ResolveOptions::default()
+        }),
+        // with `extensions` should still resolve to module main
+        Resolver::new(ResolveOptions {
+            extensions: vec![(".ts".into())],
+            ..ResolveOptions::default()
+        }),
+        // default
+        Resolver::default(),
+    ];
+
+    for resolver in resolvers {
+        let resolution = resolver.resolve(&path, "ipaddr.js").map(|r| r.full_path());
+        assert_eq!(resolution, Ok(module_path.clone()));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`	`"private": true,`
`5`	`5`	`"devDependencies": {`
`6`	`6`	`"axios": "1.6.2",`
`7`		`- "styled-components": "6.1.1",`
`8`		`- "postcss": "8.4.33"`
	`7`	`+ "ipaddr.js": "2.2.0",`
	`8`	`+ "postcss": "8.4.33",`
	`9`	`+ "styled-components": "6.1.1"`
`9`	`10`	`}`
`10`	`11`	`}`