Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1505,17 +1505,12 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
if cached_path.inside_node_modules() {
return Ok(None);
}

let mut cache_value = cached_path.clone();
// Go up directories when the querying path is not a directory
while !self.cache.is_dir(&cache_value, ctx) {
if let Some(cv) = cache_value.parent() {
cache_value = cv;
} else {
break;
}
// Skip non-absolute paths (e.g. virtual modules)
if !cached_path.path.is_absolute() {
return Ok(None);
}
let mut cache_value = Some(cache_value);

let mut cache_value = Some(cached_path.clone());
while let Some(cv) = cache_value {
if let Some(tsconfig) = cv.tsconfig.get_or_try_init(|| {
let tsconfig_path = cv.path.join("tsconfig.json");
Expand Down
17 changes: 17 additions & 0 deletions src/tests/tsconfig_discovery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,24 @@
//!
//! Tests that tsconfig.json can be auto-discovered when no explicit tsconfig option is provided.

use crate::{ResolveError, ResolveOptions, Resolver, TsconfigDiscovery};

#[test]
fn tsconfig_discovery() {
super::tsconfig_paths::tsconfig_resolve_impl(/* tsconfig_discovery */ true);
}

#[test]
fn tsconfig_discovery_virtual_file_importer() {
let f = super::fixture_root().join("tsconfig");

let resolver = Resolver::new(ResolveOptions {
tsconfig: Some(TsconfigDiscovery::Auto),
cwd: Some(f.join("cases/index")),
..ResolveOptions::default()
});

let resolved_path =
resolver.resolve("\0virtual-module", "random-import").map(|f| f.full_path());
assert_eq!(resolved_path, Err(ResolveError::NotFound("random-import".into())));
}