diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2024-07-23 20:22:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-24 00:22:24 +0000 |
| commit | 52ababc4bf948904092cff54c2ab8b91f6b9b443 (patch) | |
| tree | 77dc2fe4a9eb79ce893e1593822df4de1f564260 /cli/npm/managed/resolvers/global.rs | |
| parent | 445e05a39d005eab6f7d2f1f67a7ae2d7c85b1b3 (diff) | |
fix(node): better detection for when to surface node resolution errors (#24653)
Diffstat (limited to 'cli/npm/managed/resolvers/global.rs')
| -rw-r--r-- | cli/npm/managed/resolvers/global.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cli/npm/managed/resolvers/global.rs b/cli/npm/managed/resolvers/global.rs index d16fe7cd0..e7a57fc23 100644 --- a/cli/npm/managed/resolvers/global.rs +++ b/cli/npm/managed/resolvers/global.rs @@ -15,7 +15,8 @@ use deno_npm::NpmPackageId; use deno_npm::NpmSystemInfo; use deno_runtime::deno_fs::FileSystem; use deno_runtime::deno_node::errors::PackageFolderResolveError; -use deno_runtime::deno_node::errors::PackageFolderResolveErrorKind; +use deno_runtime::deno_node::errors::PackageNotFoundError; +use deno_runtime::deno_node::errors::ReferrerNotFoundError; use deno_runtime::deno_node::NodePermissions; use super::super::cache::NpmCache; @@ -84,7 +85,7 @@ impl NpmPackageFsResolver for GlobalNpmPackageResolver { .resolve_package_folder_id_from_specifier(referrer) else { return Err( - PackageFolderResolveErrorKind::NotFoundReferrer { + ReferrerNotFoundError { referrer: referrer.clone(), referrer_extra: None, } @@ -98,7 +99,7 @@ impl NpmPackageFsResolver for GlobalNpmPackageResolver { Ok(pkg) => match self.maybe_package_folder(&pkg.id) { Some(folder) => Ok(folder), None => Err( - PackageFolderResolveErrorKind::NotFoundPackage { + PackageNotFoundError { package_name: name.to_string(), referrer: referrer.clone(), referrer_extra: Some(format!( @@ -112,7 +113,7 @@ impl NpmPackageFsResolver for GlobalNpmPackageResolver { }, Err(err) => match *err { PackageNotFoundFromReferrerError::Referrer(cache_folder_id) => Err( - PackageFolderResolveErrorKind::NotFoundReferrer { + ReferrerNotFoundError { referrer: referrer.clone(), referrer_extra: Some(cache_folder_id.to_string()), } @@ -122,7 +123,7 @@ impl NpmPackageFsResolver for GlobalNpmPackageResolver { name, referrer: cache_folder_id_referrer, } => Err( - PackageFolderResolveErrorKind::NotFoundPackage { + PackageNotFoundError { package_name: name, referrer: referrer.clone(), referrer_extra: Some(cache_folder_id_referrer.to_string()), |