language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-08-03 10:33:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(cli): represent bare imports as module graph error slots (#10804)

Browse source 
Fixes #10795
This commit is contained in:
Nayeem Rahman 2021-06-01 07:45:37 +01:00 • committed by GitHub
parent 595700c993
commit 6dd7a7ecd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

44
cli/module_graph.rs
View file

@ -38,6 +38,7 @@ use deno_core::serde::Serialize;
use deno_core::serde::Serializer;
use deno_core::serde_json::json;
use deno_core::serde_json::Value;
use deno_core::url::Url;
use deno_core::ModuleResolutionError;
use deno_core::ModuleSource;
use deno_core::ModuleSpecifier;
@ -398,9 +399,13 @@ impl Module {
Ok(specifier) => Some(specifier),
Err(any_error) => {
match any_error.downcast_ref::<ModuleResolutionError>() {
Some(ModuleResolutionError::ImportPrefixMissing(..)) => None,
Some(ModuleResolutionError::ImportPrefixMissing(..)) => {
Some(Url::parse(&format!("bare:{}", &desc.specifier)).unwrap())
}
_ => match any_error.downcast_ref::<ImportMapError>() {
Some(ImportMapError::UnmappedBareSpecifier(..)) => None,
Some(ImportMapError::UnmappedBareSpecifier(..)) => Some(
Url::parse(&format!("bare:{}", &desc.specifier)).unwrap(),
),
_ => {
return Err(any_error);
}
@ -1908,19 +1913,28 @@ impl GraphBuilder {
}
for (_, dep) in module.dependencies.iter() {
let maybe_referrer = Some(dep.location.clone());
if let Some(specifier) = dep.maybe_code.as_ref() {
self.fetch(
specifier,
&maybe_referrer,
is_root_dynamic || dep.is_dynamic,
);
}
if let Some(specifier) = dep.maybe_type.as_ref() {
self.fetch(
specifier,
&maybe_referrer,
is_root_dynamic || dep.is_dynamic,
);
for maybe_specifier in &[dep.maybe_code.as_ref(), dep.maybe_type.as_ref()]
{
if let Some(&dep_specifier) = maybe_specifier.as_ref() {
if dep_specifier.scheme() == "bare" {
self.graph.modules.insert(
dep_specifier.clone(),
ModuleSlot::Err(Arc::new(
ModuleResolutionError::ImportPrefixMissing(
dep_specifier.path().to_string(),
Some(specifier.to_string()),
)
.into(),
)),
);
} else {
self.fetch(
dep_specifier,
&maybe_referrer,
is_root_dynamic || dep.is_dynamic,
);
}
}
}
}
if let Some((_, specifier)) = module.maybe_types.as_ref() {