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

refactor(node): internally add .code() to node resolution errors (#24610)

Browse source 
This makes it easier to tell what kind of error something is (even for
deeply nested errors) and will help in the future once we add error
codes to the JS errors this returns.
This commit is contained in:
David Sherret 2024-07-16 18:32:41 -04:00 • committed by GitHub
parent c9da27e147
commit 568dd132fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 313 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

61
cli/resolver.rs
View file

@ -24,6 +24,8 @@ use deno_npm::resolution::NpmResolutionError;
use deno_runtime::deno_fs;
use deno_runtime::deno_fs::FileSystem;
use deno_runtime::deno_node::errors::ClosestPkgJsonError;
use deno_runtime::deno_node::errors::NodeResolveError;
use deno_runtime::deno_node::errors::ResolvePkgSubpathFromDenoModuleError;
use deno_runtime::deno_node::errors::UrlToNodeResolutionError;
use deno_runtime::deno_node::is_builtin_node_module;
use deno_runtime::deno_node::parse_npm_pkg_name;
@ -105,7 +107,7 @@ impl CliNodeResolver {
specifier: &str,
referrer: &ModuleSpecifier,
mode: NodeResolutionMode,
) -> Option<Result<Option<NodeResolution>, AnyError>> {
) -> Option<Result<Option<NodeResolution>, NodeResolveError>> {
if self.in_npm_package(referrer) {
// we're in an npm package, so use node resolution
Some(self.resolve(specifier, referrer, mode))
@ -119,19 +121,18 @@ impl CliNodeResolver {
specifier: &str,
referrer: &ModuleSpecifier,
mode: NodeResolutionMode,
) -> Result<Option<NodeResolution>, AnyError> {
) -> Result<Option<NodeResolution>, NodeResolveError> {
let referrer_kind = if self.cjs_resolutions.contains(referrer) {
NodeModuleKind::Cjs
} else {
NodeModuleKind::Esm
};
self.handle_node_resolve_result(
let maybe_res =
self
.node_resolver
.resolve(specifier, referrer, referrer_kind, mode)
.map_err(AnyError::from),
)
.resolve(specifier, referrer, referrer_kind, mode)?;
Ok(self.handle_node_resolution(maybe_res))
}
pub fn resolve_req_reference(
@ -218,18 +219,16 @@ impl CliNodeResolver {
sub_path: Option<&str>,
maybe_referrer: Option<&ModuleSpecifier>,
mode: NodeResolutionMode,
) -> Result<Option<NodeResolution>, AnyError> {
self.handle_node_resolve_result(
self
.node_resolver
.resolve_package_subpath_from_deno_module(
package_folder,
sub_path,
maybe_referrer,
mode,
)
.map_err(AnyError::from),
)
) -> Result<Option<NodeResolution>, ResolvePkgSubpathFromDenoModuleError> {
let maybe_res = self
.node_resolver
.resolve_package_subpath_from_deno_module(
package_folder,
sub_path,
maybe_referrer,
mode,
)?;
Ok(self.handle_node_resolution(maybe_res))
}
pub fn handle_if_in_node_modules(
@ -266,20 +265,15 @@ impl CliNodeResolver {
self.node_resolver.url_to_node_resolution(specifier)
}
fn handle_node_resolve_result(
fn handle_node_resolution(
&self,
result: Result<Option<NodeResolution>, AnyError>,
) -> Result<Option<NodeResolution>, AnyError> {
match result? {
Some(response) => {
if let NodeResolution::CommonJs(specifier) = &response {
// remember that this was a common js resolution
self.cjs_resolutions.insert(specifier.clone());
}
Ok(Some(response))
}
None => Ok(None),
maybe_resolution: Option<NodeResolution>,
) -> Option<NodeResolution> {
if let Some(NodeResolution::CommonJs(specifier)) = &maybe_resolution {
// remember that this was a common js resolution
self.cjs_resolutions.insert(specifier.clone());
}
maybe_resolution
}
}
@ -465,7 +459,7 @@ impl CliGraphResolver {
}
}
// todo(dsherret): if we returned structured errors from the NodeResolver we wouldn't need this
// todo(dsherret): update this and the surrounding code to handle the structured errors from NodeResolver
fn check_surface_byonm_node_error(
&self,
specifier: &str,
@ -681,7 +675,10 @@ impl Resolver for CliGraphResolver {
Err(err) => {
self
.check_surface_byonm_node_error(
specifier, referrer, err, resolver,
specifier,
referrer,
err.into(),
resolver,
)
.map_err(ResolveError::Other)?;
}