fix: restrictions with extensions (#66)

Author: SyMind

src/lib.rs

@@ -1173,11 +1173,11 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
             }
         }
         // Bail if path is module directory such as `ipaddr.js`
-        if !cached_path.is_file(&self.cache.fs, ctx).await {
+        if !cached_path.is_file(&self.cache.fs, ctx).await
+            || !self.check_restrictions(cached_path.path())
+        {
             ctx.with_fully_specified(false);
             return Ok(None);
-        } else if !self.check_restrictions(cached_path.path()) {
-            return Ok(None);
         }
         // Create a meaningful error message.
         let dir = path.parent().unwrap().to_path_buf();

src/tests/restrictions.rs

@@ -91,3 +91,22 @@ async fn should_try_to_find_alternative_3() {
     let resolution = resolver1.resolve(&f, "pck2").await.map(|r| r.full_path());
     assert_eq!(resolution, Ok(f.join("node_modules/pck2/index.css")));
 }
+
+#[tokio::test]
+async fn should_try_to_find_alternative_4() {
+    let f = super::fixture().join("restrictions");
+
+    let re = Regex::new(r"\.(sass|scss|css)$").unwrap();
+    let resolver1 = Resolver::new(ResolveOptions {
+        extensions: vec![".css".into()],
+        main_fields: vec!["main".into()],
+        extension_alias: vec![(".js".into(), vec![".js".into(), ".jsx".into()])],
+        restrictions: vec![Restriction::Fn(Arc::new(move |path| {
+            path.as_os_str().to_str().map_or(false, |s| re.is_match(s))
+        }))],
+        ..ResolveOptions::default()
+    });
+
+    let resolution = resolver1.resolve(&f, "pck2").await.map(|r| r.full_path());
+    assert_eq!(resolution, Ok(f.join("node_modules/pck2/index.css")));
+}