rework "all symbols" page

Author: crowlKats

examples/ddoc/main.rs

@@ -186,12 +186,8 @@ impl HrefResolver for EmptyResolver {
     None
   }
 
-  fn resolve_usage(
-    &self,
-    current_specifier: &deno_ast::ModuleSpecifier,
-    _current_file: Option<&ShortPath>,
-  ) -> Option<String> {
-    Some(current_specifier.to_string())
+  fn resolve_usage(&self, current_file: &ShortPath) -> Option<String> {
+    Some(current_file.specifier.to_string())
   }
 
   fn resolve_source(&self, location: &deno_doc::Location) -> Option<String> {

src/html/comrak_adapters.rs

@@ -2,6 +2,7 @@
 
 //! Adapter for the Syntect syntax highlighter plugin.
 
+use crate::html::ShortPath;
 use comrak::adapters::HeadingAdapter;
 use comrak::adapters::HeadingMeta;
 use comrak::adapters::SyntaxHighlighterAdapter;
@@ -264,6 +265,5 @@ impl HeadingAdapter for HeadingToCAdapter {
 }
 
 #[cfg(feature = "ammonia")]
-pub type URLRewriter = Arc<
-  dyn (Fn(Option<&deno_ast::ModuleSpecifier>, &str) -> String) + Send + Sync,
->;
+pub type URLRewriter =
+  Arc<dyn (Fn(Option<&ShortPath>, &str) -> String) + Send + Sync>;

src/html/jsdoc.rs

@@ -1,6 +1,7 @@
 use super::render_context::RenderContext;
 use super::util::*;
 use crate::html::usage::UsagesCtx;
+use crate::html::ShortPath;
 use crate::js_doc::JsDoc;
 use crate::js_doc::JsDocTag;
 use crate::DocNodeKind;
@@ -9,7 +10,6 @@ use comrak::nodes::AstNode;
 use comrak::nodes::NodeHtmlBlock;
 use comrak::nodes::NodeValue;
 use comrak::Arena;
-use deno_ast::ModuleSpecifier;
 use serde::Serialize;
 use std::borrow::Cow;
 use std::cell::RefCell;
@@ -79,6 +79,8 @@ fn split_markdown_title(md: &str) -> (Option<&str>, &str) {
 
   let index = newline.min(codeblock).min(md.len());
 
+  dbg!(md.split_at(index));
+
   match md.split_at(index) {
     ("", body) => (None, body),
     (title, "") => (None, title),
@@ -88,14 +90,14 @@ fn split_markdown_title(md: &str) -> (Option<&str>, &str) {
 
 #[cfg(feature = "ammonia")]
 struct AmmoniaRelativeUrlEvaluator {
-  current_specifier: Option<ModuleSpecifier>,
+  current_file: Option<ShortPath>,
   url_rewriter: URLRewriter,
 }
 
 #[cfg(feature = "ammonia")]
 impl ammonia::UrlRelativeEvaluate for AmmoniaRelativeUrlEvaluator {
   fn evaluate<'a>(&self, url: &'a str) -> Option<Cow<'a, str>> {
-    Some((self.url_rewriter)(self.current_specifier.as_ref(), url).into())
+    Some((self.url_rewriter)(self.current_file.as_ref(), url).into())
   }
 }
 
@@ -241,7 +243,7 @@ fn render_node<'a>(
   String::from_utf8(bw.into_inner().unwrap()).unwrap()
 }
 
-#[derive(Debug, Serialize, Clone)]
+#[derive(Debug, Serialize, Clone, Default)]
 pub struct Markdown {
   pub html: String,
   pub toc: Option<String>,
@@ -252,7 +254,7 @@ pub fn markdown_to_html(
   md: &str,
   summary: bool,
   render_toc: bool,
-) -> Markdown {
+) -> Option<Markdown> {
   // TODO(bartlomieju): this should be initialized only once
   let mut options = comrak::Options::default();
   options.extension.autolink = true;
@@ -281,12 +283,16 @@ pub fn markdown_to_html(
   let md = parse_links(md, render_ctx);
 
   let md = if summary {
-    let (title, body) = split_markdown_title(md.as_ref());
-    title.unwrap_or(body)
+    let (title, _body) = split_markdown_title(&md);
+    title.unwrap_or_default()
   } else {
     md.as_ref()
   };
 
+  if md.is_empty() {
+    return None;
+  }
+
   let class_name = if summary {
     "markdown_summary"
   } else {
@@ -356,7 +362,7 @@ pub fn markdown_to_html(
         ammonia::UrlRelative::PassThrough,
         |url_rewriter| {
           ammonia::UrlRelative::Custom(Box::new(AmmoniaRelativeUrlEvaluator {
-            current_specifier: render_ctx.get_current_specifier().cloned(),
+            current_file: render_ctx.get_current_resolve().get_file().cloned(),
             url_rewriter: url_rewriter.clone(),
           }))
         },
@@ -407,21 +413,25 @@ pub fn markdown_to_html(
     None
   };
 
-  Markdown {
+  Some(Markdown {
     html: format!(r#"<div class="{class_name} flex-1">{html}</div>"#),
     toc,
-  }
+  })
 }
 
 pub(crate) fn render_markdown_summary(
   render_ctx: &RenderContext,
   md: &str,
 ) -> String {
-  markdown_to_html(render_ctx, md, true, false).html
+  markdown_to_html(render_ctx, md, true, false)
+    .unwrap_or_default()
+    .html
 }
 
 pub(crate) fn render_markdown(render_ctx: &RenderContext, md: &str) -> String {
-  markdown_to_html(render_ctx, md, false, false).html
+  markdown_to_html(render_ctx, md, false, false)
+    .unwrap_or_default()
+    .html
 }
 
 pub(crate) fn jsdoc_body_to_html(
@@ -430,11 +440,7 @@ pub(crate) fn jsdoc_body_to_html(
   summary: bool,
 ) -> Option<String> {
   if let Some(doc) = js_doc.doc.as_deref() {
-    if doc.is_empty() {
-      None
-    } else {
-      Some(markdown_to_html(ctx, doc, summary, false).html)
-    }
+    markdown_to_html(ctx, doc, summary, false).map(|markdown| markdown.html)
   } else {
     None
   }
@@ -461,10 +467,10 @@ pub(crate) fn jsdoc_examples(
     .collect::<Vec<ExampleCtx>>();
 
   if !examples.is_empty() {
-    Some(SectionCtx {
-      title: "Examples".to_string(),
-      content: SectionContentCtx::Example(examples),
-    })
+    Some(SectionCtx::new(
+      "Examples",
+      SectionContentCtx::Example(examples),
+    ))
   } else {
     None
   }
@@ -513,13 +519,13 @@ pub struct ModuleDocCtx {
 impl ModuleDocCtx {
   pub fn new(
     render_ctx: &RenderContext,
-    specifier: &ModuleSpecifier,
+    short_path: &ShortPath,
     doc_nodes_by_url: &super::ContextDocNodesByUrl,
   ) -> Self {
-    let module_doc_nodes = doc_nodes_by_url.get(specifier).unwrap();
+    let module_doc_nodes = doc_nodes_by_url.get(&short_path.specifier).unwrap();
 
     let title = if !render_ctx.ctx.hide_module_doc_title {
-      Some(render_ctx.ctx.url_to_short_path(specifier).to_name())
+      Some(short_path.display_name())
     } else {
       None
     };
@@ -546,7 +552,7 @@ impl ModuleDocCtx {
         .js_doc
         .doc
         .as_ref()
-        .map(|doc| markdown_to_html(render_ctx, doc, false, true))
+        .and_then(|doc| markdown_to_html(render_ctx, doc, false, true))
       {
         (Some(markdown.html), markdown.toc)
       } else {
@@ -558,18 +564,25 @@ impl ModuleDocCtx {
       (None, None, None)
     };
 
-    if !render_ctx
-      .ctx
-      .main_entrypoint
-      .as_ref()
-      .is_some_and(|main_entrypoint| main_entrypoint == specifier)
-    {
+    if short_path.is_main {
       let partitions_by_kind =
         super::partition::partition_nodes_by_kind(module_doc_nodes, true);
 
       sections.extend(super::namespace::render_namespace(
         render_ctx,
-        partitions_by_kind,
+        partitions_by_kind
+          .into_iter()
+          .map(|(title, nodes)| {
+            (
+              SectionHeaderCtx {
+                title,
+                href: None,
+                doc: None,
+              },
+              nodes,
+            )
+          })
+          .collect(),
       ));
     }