diff options
| author | Kitson Kelly <me@kitsonkelly.com> | 2022-02-01 09:33:57 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 09:33:57 +1100 |
| commit | 7d356250e8bbe4e37e3651b328fda76178489588 (patch) | |
| tree | 2034053509e324fef72ead3e13e52ec66a06e59d /cli/tools/doc.rs | |
| parent | 5490cfed2000a063ef0baec500ab7d539203067c (diff) | |
refactor: integrate deno_graph breaking changes (#13495)
Co-authored-by: Bartek Iwańczuk <biwanczuk@gmail.com>
Diffstat (limited to 'cli/tools/doc.rs')
| -rw-r--r-- | cli/tools/doc.rs | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs index e52693b16..6e17c9fca 100644 --- a/cli/tools/doc.rs +++ b/cli/tools/doc.rs @@ -18,7 +18,9 @@ use deno_graph::create_graph; use deno_graph::source::LoadFuture; use deno_graph::source::LoadResponse; use deno_graph::source::Loader; +use deno_graph::source::ResolveResponse; use deno_graph::source::Resolver; +use deno_graph::ModuleKind; use deno_graph::ModuleSpecifier; use deno_runtime::permissions::Permissions; use import_map::ImportMap; @@ -47,17 +49,18 @@ impl Resolver for DocResolver { &self, specifier: &str, referrer: &ModuleSpecifier, - ) -> Result<ModuleSpecifier, AnyError> { + ) -> ResolveResponse { if let Some(import_map) = &self.import_map { - return import_map - .resolve(specifier, referrer) - .map_err(AnyError::from); + return match import_map.resolve(specifier, referrer) { + Ok(specifier) => ResolveResponse::Specifier(specifier), + Err(err) => ResolveResponse::Err(err.into()), + }; } - let module_specifier = - deno_core::resolve_import(specifier, referrer.as_str())?; - - Ok(module_specifier) + match deno_core::resolve_import(specifier, referrer.as_str()) { + Ok(specifier) => ResolveResponse::Specifier(specifier), + Err(err) => ResolveResponse::Err(err.into()), + } } } @@ -104,7 +107,7 @@ pub async fn print_docs( let source_file_specifier = ModuleSpecifier::parse("deno://lib.deno.d.ts").unwrap(); let graph = create_graph( - vec![source_file_specifier.clone()], + vec![(source_file_specifier.clone(), ModuleKind::Esm)], false, None, &mut loader, @@ -144,7 +147,7 @@ pub async fn print_docs( import_map: ps.maybe_import_map.clone(), }; let graph = create_graph( - vec![root_specifier.clone()], + vec![(root_specifier.clone(), ModuleKind::Esm)], false, None, &mut loader, |