use git deno_graph

Author: nathanwhit

Cargo.lock

@@ -11,7 +11,7 @@ repository = "https://github.com/denoland/deno_doc"
 members = ["lib"]
 
 [workspace.dependencies]
-deno_graph = { path = "../deno_graph", default-features = false, features = [
+deno_graph = { git = "https://github.com/nathanwhit/deno_graph", branch = "oxc-port", default-features = false, features = [
   "swc",
   "symbols",
 ] }
@@ -20,9 +20,6 @@ import_map = "0.25.0"
 serde = { version = "1.0.204", features = ["derive"] }
 serde_json = { version = "1.0.122", features = ["preserve_order"] }
 
-[patch."https://github.com/nathanwhit/deno_ast"]
-deno_ast = { path = "../deno_ast" }
-
 [lib]
 name = "deno_doc"
 

Cargo.toml

@@ -259,13 +259,13 @@ async fn run() -> anyhow::Result<()> {
         // This allows comparing renamed modules.
         let old_by_original = old_specifiers
           .iter()
-          .zip(old_docs.into_iter())
+          .zip(old_docs)
           .map(|(orig, (_, nodes))| (orig.clone(), nodes))
           .collect::<IndexMap<_, _>>();
 
         let new_by_original = new_specifiers
           .iter()
-          .zip(new_docs.into_iter())
+          .zip(new_docs)
           .map(|(orig, (_, nodes))| (orig.clone(), nodes))
           .collect::<IndexMap<_, _>>();
 

examples/ddoc/main.rs

@@ -10,6 +10,7 @@ use serde::Serialize;
 use std::borrow::Cow;
 use std::cmp::Ordering;
 use std::collections::HashMap;
+use std::path::Path;
 use std::path::PathBuf;
 use std::sync::Arc;
 
@@ -1766,8 +1767,7 @@ pub fn find_common_ancestor<'a>(
     }
   }
 
-  if common_ancestor.as_os_str().is_empty()
-    || common_ancestor == PathBuf::from("/")
+  if common_ancestor.as_os_str().is_empty() || common_ancestor == Path::new("/")
   {
     None
   } else {

src/html/mod.rs

@@ -565,41 +565,40 @@ impl<'a> DocParser<'a> {
     for stmt in module_info.statements() {
       if let Statement::ImportDeclaration(import_decl) = stmt
         && let Some(js_doc) = js_doc_for_range(module_info, import_decl.span)
+        && let Some(specifiers) = &import_decl.specifiers
       {
-        if let Some(specifiers) = &import_decl.specifiers {
-          for specifier in specifiers {
-            let (imported_name, original_name, src) = match specifier {
-              ImportDeclarationSpecifier::ImportSpecifier(named_specifier) => (
-                named_specifier.local.name.to_string(),
-                Some(module_export_name_value(&named_specifier.imported)),
-                &import_decl.source.value,
-              ),
-              ImportDeclarationSpecifier::ImportDefaultSpecifier(
-                default_specifier,
-              ) => (
-                default_specifier.local.name.to_string(),
-                Some("default".to_string()),
-                &import_decl.source.value,
-              ),
-              ImportDeclarationSpecifier::ImportNamespaceSpecifier(
-                namespace_specifier,
-              ) => (
-                namespace_specifier.local.name.to_string(),
-                None,
-                &import_decl.source.value,
-              ),
-            };
-
-            let resolved_specifier =
-              self.resolve_dependency(&src.to_string(), referrer)?;
-
-            imports.push(Import {
-              imported_name: imported_name.into_boxed_str(),
-              js_doc: js_doc.clone(),
-              src: resolved_specifier.to_string(),
-              original_name,
-            });
-          }
+        for specifier in specifiers {
+          let (imported_name, original_name, src) = match specifier {
+            ImportDeclarationSpecifier::ImportSpecifier(named_specifier) => (
+              named_specifier.local.name.to_string(),
+              Some(module_export_name_value(&named_specifier.imported)),
+              &import_decl.source.value,
+            ),
+            ImportDeclarationSpecifier::ImportDefaultSpecifier(
+              default_specifier,
+            ) => (
+              default_specifier.local.name.to_string(),
+              Some("default".to_string()),
+              &import_decl.source.value,
+            ),
+            ImportDeclarationSpecifier::ImportNamespaceSpecifier(
+              namespace_specifier,
+            ) => (
+              namespace_specifier.local.name.to_string(),
+              None,
+              &import_decl.source.value,
+            ),
+          };
+
+          let resolved_specifier =
+            self.resolve_dependency(src.as_ref(), referrer)?;
+
+          imports.push(Import {
+            imported_name: imported_name.into_boxed_str(),
+            js_doc: js_doc.clone(),
+            src: resolved_specifier.to_string(),
+            original_name,
+          });
         }
       }
     }