@@ -25,6 +25,7 @@ use node_resolver::InNpmPackageChecker;
25
25
use node_resolver:: IsBuiltInNodeModuleChecker ;
26
26
use node_resolver:: NpmPackageFolderResolver ;
27
27
use node_resolver:: UrlOrPath ;
28
+ use node_resolver:: errors:: NodeJsErrorCoded ;
28
29
use url:: Url ;
29
30
30
31
use crate :: DenoResolveError ;
@@ -51,7 +52,7 @@ pub struct ResolveWithGraphError(pub Box<ResolveWithGraphErrorKind>);
51
52
impl ResolveWithGraphError {
52
53
pub fn maybe_specifier ( & self ) -> Option < Cow < ' _ , UrlOrPath > > {
53
54
match self . as_kind ( ) {
54
- ResolveWithGraphErrorKind :: CouldNotResolve ( err) => {
55
+ ResolveWithGraphErrorKind :: CouldNotResolveNpmNv ( err) => {
55
56
err. source . maybe_specifier ( )
56
57
}
57
58
ResolveWithGraphErrorKind :: ResolveNpmReqRef ( err) => {
@@ -85,7 +86,7 @@ impl ResolveWithGraphError {
85
86
pub enum ResolveWithGraphErrorKind {
86
87
#[ error( transparent) ]
87
88
#[ class( inherit) ]
88
- CouldNotResolve ( #[ from] CouldNotResolveError ) ,
89
+ CouldNotResolveNpmNv ( #[ from] CouldNotResolveNpmNvError ) ,
89
90
#[ error( transparent) ]
90
91
#[ class( inherit) ]
91
92
ResolvePkgFolderFromDenoModule (
@@ -108,11 +109,17 @@ pub enum ResolveWithGraphErrorKind {
108
109
#[ derive( Debug , thiserror:: Error , deno_error:: JsError ) ]
109
110
#[ class( inherit) ]
110
111
#[ error( "Could not resolve '{reference}'" ) ]
111
- pub struct CouldNotResolveError {
112
- reference : deno_semver:: npm:: NpmPackageNvReference ,
112
+ pub struct CouldNotResolveNpmNvError {
113
+ pub reference : deno_semver:: npm:: NpmPackageNvReference ,
113
114
#[ source]
114
115
#[ inherit]
115
- source : node_resolver:: errors:: PackageSubpathFromDenoModuleResolveError ,
116
+ pub source : node_resolver:: errors:: PackageSubpathFromDenoModuleResolveError ,
117
+ }
118
+
119
+ impl NodeJsErrorCoded for CouldNotResolveNpmNvError {
120
+ fn code ( & self ) -> node_resolver:: errors:: NodeJsErrorCode {
121
+ self . source . code ( )
122
+ }
116
123
}
117
124
118
125
impl FoundPackageJsonDepFlag {
@@ -359,7 +366,7 @@ impl<
359
366
resolution_mode,
360
367
resolution_kind,
361
368
)
362
- . map_err ( |source| CouldNotResolveError {
369
+ . map_err ( |source| CouldNotResolveNpmNvError {
363
370
reference : nv_ref. clone ( ) ,
364
371
source,
365
372
} ) ?
0 commit comments