Merge remote-tracking branch 'oxc' into merge/oxc

Author: JounQin

README.md

@@ -18,7 +18,7 @@
 >
 > We also sync with [oxc-resolver] and [rspack-resolver] regularly to keep up with the latest changes:
 >
-> - `oxc-resolver`: [#15](https://github.com/unrs/unrs-resolver/pull/15), [#49](https://github.com/unrs/unrs-resolver/pull/49), [#62](https://github.com/unrs/unrs-resolver/pull/62) and [#86](https://github.com/unrs/unrs-resolver/pull/86)
+> - `oxc-resolver`: [#15](https://github.com/unrs/unrs-resolver/pull/15), [#49](https://github.com/unrs/unrs-resolver/pull/49), [#62](https://github.com/unrs/unrs-resolver/pull/62), [#86](https://github.com/unrs/unrs-resolver/pull/86) and [#94](https://github.com/unrs/unrs-resolver/pull/94)
 > - `rspack-resolver`(planned): [#59](https://github.com/unrs/unrs-resolver/issues/59)
 >
 > Last but not least, we prepare some bug fix PRs first on our side and PR back into upstream projects, and we will keep doing this in the future:

fixtures/misc/package-json-with-bom/index.js

@@ -0,0 +1,7 @@
+{
+  "name": "@oxc-resolver/test-package-json-with-bom",
+  "private": true,
+  "version": "0.0.0",
+  "main": "index.js",
+  "type": "module"
+}

fixtures/misc/package-json-with-bom/package.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "foo": ["bar.js"]
+    }
+  }
+}

fixtures/tsconfig/cases/with-bom/bar.js

@@ -513,7 +513,7 @@ impl<C: Cache<Cp = FsCachedPath>> ResolverGeneric<C> {
         specifier: &str,
         ctx: &mut Ctx,
     ) -> Result<C::Cp, ResolveError> {
-        let (_, subpath) = Self::parse_package_specifier(specifier);
+        let (package_name, subpath) = Self::parse_package_specifier(specifier);
         if subpath.is_empty() {
             ctx.with_fully_specified(false);
         }
@@ -522,7 +522,9 @@ impl<C: Cache<Cp = FsCachedPath>> ResolverGeneric<C> {
             return Ok(path);
         }
         // 6. LOAD_NODE_MODULES(X, dirname(Y))
-        if let Some(path) = self.load_node_modules(cached_path, specifier, ctx)? {
+        if let Some(path) =
+            self.load_node_modules(cached_path, specifier, package_name, subpath, ctx)?
+        {
             return Ok(path);
         }
         // 7. THROW "not found"
@@ -749,6 +751,8 @@ impl<C: Cache<Cp = FsCachedPath>> ResolverGeneric<C> {
         &self,
         cached_path: &C::Cp,
         specifier: &str,
+        package_name: &str,
+        subpath: &str,
         ctx: &mut Ctx,
     ) -> ResolveResult<C::Cp> {
         #[cfg(feature = "yarn_pnp")]
@@ -758,7 +762,6 @@ impl<C: Cache<Cp = FsCachedPath>> ResolverGeneric<C> {
             }
         }
 
-        let (package_name, subpath) = Self::parse_package_specifier(specifier);
         // 1. let DIRS = NODE_MODULES_PATHS(START)
         // 2. for each DIR in DIRS:
         for module_name in &self.options.modules {

fixtures/tsconfig/cases/with-bom/tsconfig.json

@@ -134,6 +134,7 @@ impl PackageJsonSerde {
         realpath: PathBuf,
         json: &str,
     ) -> Result<Self, serde_json::Error> {
+        let json = json.trim_start_matches("\u{feff}"); // strip bom
         let mut raw_json: JSONValue = serde_json::from_str(json)?;
         let mut package_json = Self::default();
 

src/lib.rs

@@ -93,6 +93,22 @@ fn json_with_comments() {
     assert_eq!(resolved_path, Ok(f.join("bar.js")));
 }
 
+#[test]
+fn with_bom() {
+    let f = super::fixture_root().join("tsconfig/cases/with-bom");
+
+    let resolver = Resolver::new(ResolveOptions {
+        tsconfig: Some(TsconfigOptions {
+            config_file: f.join("tsconfig.json"),
+            references: TsconfigReferences::Auto,
+        }),
+        ..ResolveOptions::default()
+    });
+
+    let resolved_path = resolver.resolve(&f, "foo").map(|f| f.full_path());
+    assert_eq!(resolved_path, Ok(f.join("bar.js")));
+}
+
 #[test]
 fn broken() {
     let f = super::fixture_root().join("tsconfig");

src/package_json_serde.rs

@@ -269,10 +269,20 @@ impl TsConfigSerde {
     ///
     /// * Any error that can be returned by `serde_json::from_str()`.
     pub fn parse(root: bool, path: &Path, json: &mut str) -> Result<Self, serde_json::Error> {
+        let json = trim_start_matches_mut(json, '\u{feff}'); // strip bom
         _ = json_strip_comments::strip(json);
         let mut tsconfig: Self = serde_json::from_str(json)?;
         tsconfig.root = root;
         tsconfig.path = path.to_path_buf();
         Ok(tsconfig)
     }
 }
+
+fn trim_start_matches_mut(s: &mut str, pat: char) -> &mut str {
+    if s.starts_with(pat) {
+        // trim the prefix
+        &mut s[pat.len_utf8()..]
+    } else {
+        s
+    }
+}

src/tests/tsconfig_paths.rs

@@ -235,3 +235,15 @@ fn windows_symlinked_longfilename() {
         Resolver::new(ResolveOptions::default()).resolve(&path, specifier).map(|r| r.full_path());
     assert_eq!(resolution, Ok(module_path));
 }
+
+#[test]
+fn package_json_with_bom() {
+    let dir = dir();
+    let dir = dir.join("fixtures/misc");
+    assert_eq!(
+        Resolver::new(ResolveOptions::default())
+            .resolve(&dir, "./package-json-with-bom")
+            .map(Resolution::into_path_buf),
+        Ok(dir.join("package-json-with-bom/index.js"))
+    );
+}