dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(resolver): fix cases with conflicting node_modules path (#835)

Browse source
This commit is contained in:
Boshen 2023-09-02 14:45:10 +08:00 committed by GitHub
parent fa1d7da090
commit d74da2f3bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
crates/oxc_resolver/src/lib.rs
View file

@ -579,21 +579,20 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
ctx: &ResolveContext, ctx: &ResolveContext,
) -> ResolveState { ) -> ResolveState {
// 1. let DIRS = NODE_MODULES_PATHS(START) // 1. let DIRS = NODE_MODULES_PATHS(START)
// Use a buffer to reduce total memory allocation.
let mut node_module_path = cached_path.path().to_path_buf();
// 2. for each DIR in DIRS: // 2. for each DIR in DIRS:
loop { for path in cached_path.path().ancestors() {
for module_name in &self.options.modules { for module_name in &self.options.modules {
// node_module_path = foo/node_modules/ // node_module_path = foo/node_modules/
node_module_path.push(module_name); let cached_path = if path.ends_with(module_name) {
let cached_path = self.cache.value(&node_module_path); self.cache.value(path)
} else {
self.cache.value(&path.join(module_name))
};
// Skip if foo/node_modules does not exist // Skip if foo/node_modules does not exist
if !cached_path.is_dir(&self.cache.fs) { if !cached_path.is_dir(&self.cache.fs) {
node_module_path.pop();
continue; continue;
} }
// Optimize node_modules lookup by inspecting whether the package exists // Optimize node_modules lookup by inspecting whether the package exists
// From LOAD_PACKAGE_EXPORTS(X, DIR) // From LOAD_PACKAGE_EXPORTS(X, DIR)
// 1. Try to interpret X as a combination of NAME and SUBPATH where the name // 1. Try to interpret X as a combination of NAME and SUBPATH where the name
@ -601,7 +600,7 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
let (package_name, subpath) = Self::parse_package_specifier(specifier); let (package_name, subpath) = Self::parse_package_specifier(specifier);
if !package_name.is_empty() { if !package_name.is_empty() {
let package_path = node_module_path.join(package_name); let package_path = cached_path.path().join(package_name);
let cached_path = self.cache.value(&package_path); let cached_path = self.cache.value(&package_path);
// Try foo/node_modules/package_name // Try foo/node_modules/package_name
if cached_path.is_dir(&self.cache.fs) { if cached_path.is_dir(&self.cache.fs) {
@ -612,7 +611,6 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
} else { } else {
// foo/node_modules/package_name is not a directory, so useless to check inside it // foo/node_modules/package_name is not a directory, so useless to check inside it
if !subpath.is_empty() { if !subpath.is_empty() {
node_module_path.pop();
continue; continue;
} }
} }
@ -621,17 +619,11 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
// Try as file or directory for all other cases // Try as file or directory for all other cases
// b. LOAD_AS_FILE(DIR/X) // b. LOAD_AS_FILE(DIR/X)
// c. LOAD_AS_DIRECTORY(DIR/X) // c. LOAD_AS_DIRECTORY(DIR/X)
let node_module_file = node_module_path.normalize_with(specifier); let node_module_file = cached_path.path().normalize_with(specifier);
let cached_path = self.cache.value(&node_module_file); let cached_path = self.cache.value(&node_module_file);
if let Some(path) = self.load_as_file_or_directory(&cached_path, specifier, ctx)? { if let Some(path) = self.load_as_file_or_directory(&cached_path, specifier, ctx)? {
return Ok(Some(path)); return Ok(Some(path));
} }
node_module_path.pop();
}
if !node_module_path.pop() {
break;
} }
} }
Ok(None) Ok(None)

14
crates/oxc_resolver/src/tests/resolve.rs
View file

@ -51,8 +51,18 @@ fn resolve() {
} }
} }
// #[test] #[test]
// fn issue238_resolve() {} fn issue238_resolve() {
let f = super::fixture().join("issue-238");
let resolver = Resolver::new(ResolveOptions {
extensions: vec![".js".into(), ".jsx".into(), ".ts".into(), ".tsx".into()],
modules: vec!["src/a".into(), "src/b".into(), "src/common".into(), "node_modules".into()],
..ResolveOptions::default()
});
let resolved_path =
resolver.resolve(f.join("src/common"), "config/myObjectFile").map(|r| r.full_path());
assert_eq!(resolved_path, Ok(f.join("src/common/config/myObjectFile.js")),);
}
#[test] #[test]
fn prefer_relative() { fn prefer_relative() {