From 3fc19dab47492e06043fc7add28e64693a4eb775 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Thu, 7 Sep 2023 08:09:16 -0500 Subject: feat: support import attributes (#20342) --- cli/tools/info.rs | 12 +++++++++--- cli/tools/vendor/test.rs | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'cli/tools') diff --git a/cli/tools/info.rs b/cli/tools/info.rs index c0dd686f8..941ba1cbd 100644 --- a/cli/tools/info.rs +++ b/cli/tools/info.rs @@ -645,7 +645,7 @@ impl<'a> GraphDisplayContext<'a> { match err { ModuleGraphError::ModuleError(err) => match err { ModuleError::InvalidTypeAssertion { .. } => { - self.build_error_msg(specifier, "(invalid import assertion)") + self.build_error_msg(specifier, "(invalid import attribute)") } ModuleError::LoadingErr(_, _, _) => { self.build_error_msg(specifier, "(loading error)") @@ -653,8 +653,8 @@ impl<'a> GraphDisplayContext<'a> { ModuleError::ParseErr(_, _) => { self.build_error_msg(specifier, "(parsing error)") } - ModuleError::UnsupportedImportAssertionType { .. } => { - self.build_error_msg(specifier, "(unsupported import assertion)") + ModuleError::UnsupportedImportAttributeType { .. } => { + self.build_error_msg(specifier, "(unsupported import attribute)") } ModuleError::UnsupportedMediaType { .. } => { self.build_error_msg(specifier, "(unsupported)") @@ -662,6 +662,12 @@ impl<'a> GraphDisplayContext<'a> { ModuleError::Missing(_, _) | ModuleError::MissingDynamic(_, _) => { self.build_error_msg(specifier, "(missing)") } + ModuleError::UnknownPackage { .. } => { + self.build_error_msg(specifier, "(unknown package)") + } + ModuleError::UnknownPackageReq { .. } => { + self.build_error_msg(specifier, "(unknown package constraint)") + } }, ModuleGraphError::ResolutionError(_) => { self.build_error_msg(specifier, "(resolution error)") diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs index c00cc654d..a8b83bb91 100644 --- a/cli/tools/vendor/test.rs +++ b/cli/tools/vendor/test.rs @@ -116,6 +116,7 @@ impl Loader for TestLoader { &mut self, specifier: &ModuleSpecifier, _is_dynamic: bool, + _cache_setting: deno_graph::source::CacheSetting, ) -> LoadFuture { let specifier = self.redirects.get(specifier).unwrap_or(specifier); let result = self.files.get(specifier).map(|result| match result { -- cgit v1.2.3