summaryrefslogtreecommitdiff
path: root/cli/tools/check.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2023-04-17 15:36:23 -0400
committerGitHub <noreply@github.com>2023-04-17 15:36:23 -0400
commitd2d62b6312f9c09f91e26acd0b4d88b3ddcf94cf (patch)
treef2f5f0eb14e76e38876b3c219c859405fa664aef /cli/tools/check.rs
parent559a61b879366c01fbbc078c03743cd836189ae7 (diff)
refactor(npm): add CliNodeResolver (#18742)
Diffstat (limited to 'cli/tools/check.rs')
-rw-r--r--cli/tools/check.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/cli/tools/check.rs b/cli/tools/check.rs
index eee82adcf..c7f404223 100644
--- a/cli/tools/check.rs
+++ b/cli/tools/check.rs
@@ -21,6 +21,7 @@ use crate::cache::Caches;
use crate::cache::DenoDir;
use crate::cache::FastInsecureHasher;
use crate::cache::TypeCheckCache;
+use crate::node::CliNodeResolver;
use crate::npm::NpmPackageResolver;
use crate::tsc;
use crate::version;
@@ -41,6 +42,7 @@ pub struct TypeChecker {
deno_dir: DenoDir,
caches: Arc<Caches>,
cli_options: Arc<CliOptions>,
+ node_resolver: Arc<CliNodeResolver>,
npm_resolver: Arc<NpmPackageResolver>,
}
@@ -49,12 +51,14 @@ impl TypeChecker {
deno_dir: DenoDir,
caches: Arc<Caches>,
cli_options: Arc<CliOptions>,
+ node_resolver: Arc<CliNodeResolver>,
npm_resolver: Arc<NpmPackageResolver>,
) -> Self {
Self {
deno_dir,
caches,
cli_options,
+ node_resolver,
npm_resolver,
}
}
@@ -133,7 +137,7 @@ impl TypeChecker {
debug,
graph: graph.clone(),
hash_data,
- maybe_npm_resolver: Some(self.npm_resolver.clone()),
+ maybe_node_resolver: Some(self.node_resolver.clone()),
maybe_tsbuildinfo,
root_names,
check_mode: type_check_mode,
@@ -144,7 +148,7 @@ impl TypeChecker {
if let Some(file_name) = &d.file_name {
if !file_name.starts_with("http") {
if ModuleSpecifier::parse(file_name)
- .map(|specifier| !self.npm_resolver.in_npm_package(&specifier))
+ .map(|specifier| !self.node_resolver.in_npm_package(&specifier))
.unwrap_or(true)
{
Some(d.clone())