dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 04:08:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(linter): initialize resolver lazily and automatically read tsconfig.json for now (#2482)

Browse source
This commit is contained in:
Boshen 2024-02-23 23:19:33 +08:00 committed by GitHub
parent 135e56a401
commit 6aa8c2daee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/oxc_linter/src/service.rs
View file

@ -14,7 +14,7 @@ use rustc_hash::FxHashSet;
use oxc_allocator::Allocator;
use oxc_diagnostics::{DiagnosticSender, DiagnosticService, Error, FailedToOpenFileError};
use oxc_parser::Parser;
use oxc_resolver::{ResolveOptions, Resolver};
use oxc_resolver::Resolver;
use oxc_semantic::{ModuleRecord, SemanticBuilder};
use oxc_span::{SourceType, VALID_EXTENSIONS};
@ -117,27 +117,34 @@ pub struct Runtime {
/// All paths to lint
paths: FxHashSet<Box<Path>>,
linter: Linter,
resolver: Resolver,
resolver: Option<Resolver>,
module_map: ModuleMap,
cache_state: CacheState,
}
impl Runtime {
fn new(cwd: Box<Path>, paths: &[Box<Path>], linter: Linter) -> Self {
let resolver = linter.options().import_plugin.then(Self::get_resolver);
Self {
cwd,
paths: paths.iter().cloned().collect(),
linter,
resolver: Self::resolver(),
resolver,
module_map: ModuleMap::default(),
cache_state: CacheState::default(),
}
}
fn resolver() -> Resolver {
fn get_resolver() -> Resolver {
use oxc_resolver::{ResolveOptions, TsconfigOptions, TsconfigReferences};
let tsconfig_path = std::env::current_dir().map(|p| p.join("tsconfig.json")).ok();
let tsconfig = tsconfig_path
.filter(|p| p.exists())
.map(|p| TsconfigOptions { config_file: p, references: TsconfigReferences::Auto });
Resolver::new(ResolveOptions {
extensions: VALID_EXTENSIONS.iter().map(|ext| format!(".{ext}")).collect(),
condition_names: vec!["require".into(), "module".into()],
tsconfig,
..ResolveOptions::default()
})
}
@ -257,7 +264,7 @@ impl Runtime {
.requested_modules
.keys()
.par_bridge()
.map_with(&self.resolver, |resolver, specifier| {
.map_with(self.resolver.as_ref().unwrap(), |resolver, specifier| {
resolver.resolve(dir, specifier).ok().map(|r| (specifier, r))
})
.flatten()