fix: repair API docs and playground assets

Closes #467 and closes #468.

Author: ubugeeei

crates/ox_content_docs/src/extractor/items.rs

@@ -74,11 +74,12 @@ impl<'a> DocVisitor<'a> {
                         oxc_ast::ast::MethodDefinitionKind::Method => DocItemKind::Method,
                     };
 
-                    let (method_jsdoc, method_doc, method_tags) = self
+                    let (method_jsdoc, method_doc, mut method_tags) = self
                         .extract_jsdoc(method.span.start)
                         .map_or((None, None, Vec::new()), |(jsdoc, doc, tags)| {
                             (Some(jsdoc), (!doc.is_empty()).then_some(doc), tags)
                         });
+                    Self::apply_ts_private_accessibility(method.accessibility, &mut method_tags);
                     if self.should_skip_by_visibility(&method_tags) {
                         continue;
                     }
@@ -129,11 +130,12 @@ impl<'a> DocVisitor<'a> {
                         _ => continue,
                     };
 
-                    let (prop_jsdoc, prop_doc, prop_tags) = self
+                    let (prop_jsdoc, prop_doc, mut prop_tags) = self
                         .extract_jsdoc(prop.span.start)
                         .map_or((None, None, Vec::new()), |(jsdoc, doc, tags)| {
                             (Some(jsdoc), (!doc.is_empty()).then_some(doc), tags)
                         });
+                    Self::apply_ts_private_accessibility(prop.accessibility, &mut prop_tags);
                     if self.should_skip_by_visibility(&prop_tags) {
                         continue;
                     }

crates/ox_content_docs/src/extractor/tags.rs

@@ -18,6 +18,20 @@ impl<'a> DocVisitor<'a> {
             || (!self.include_internal && Self::has_internal_tag(tags))
     }
 
+    /// Folds a TypeScript `private` accessibility modifier into the tag list,
+    /// so class members declared `private` flow through the same visibility
+    /// filtering (and `private` output flag) as members tagged `@private`.
+    pub(super) fn apply_ts_private_accessibility(
+        accessibility: Option<oxc_ast::ast::TSAccessibility>,
+        tags: &mut Vec<DocTag>,
+    ) {
+        if matches!(accessibility, Some(oxc_ast::ast::TSAccessibility::Private))
+            && !Self::has_private_tag(tags)
+        {
+            tags.push(DocTag::new("private".to_string(), String::new()));
+        }
+    }
+
     fn split_leading_jsdoc_type(value: &str) -> (Option<String>, &str) {
         let value = value.trim_start();
         let Some(rest) = value.strip_prefix('{') else {

crates/ox_content_docs/src/extractor/tests/member_shapes.rs

@@ -142,3 +142,32 @@ export class DefaultTranslation implements TranslationAdapter {
         Some("export class DefaultTranslation implements TranslationAdapter")
     );
 }
+
+#[test]
+fn ts_private_class_members_are_filtered_like_private_tags() {
+    let source = r"
+/** A counter. */
+export class Counter {
+    private count: number = 0;
+    /** Documented, still private. */
+    private readonly step: number = 1;
+    private bump(): void {}
+    /** Public API. */
+    increment(): number { return 0; }
+}
+";
+
+    let public_only =
+        DocExtractor::new().extract_source(source, "counter.ts", SourceType::ts()).unwrap();
+    let counter = public_only.iter().find(|item| item.name == "Counter").unwrap();
+    let names: Vec<&str> = counter.children.iter().map(|child| child.name.as_str()).collect();
+    assert_eq!(names, vec!["increment"]);
+
+    let with_private = DocExtractor::with_visibility(true, false)
+        .extract_source(source, "counter.ts", SourceType::ts())
+        .unwrap();
+    let counter = with_private.iter().find(|item| item.name == "Counter").unwrap();
+    assert_eq!(counter.children.len(), 4);
+    let count = counter.children.iter().find(|child| child.name == "count").unwrap();
+    assert!(count.tags.iter().any(|tag| tag.tag == "private"));
+}

crates/ox_content_parser/src/parser/tests.rs

@@ -23,7 +23,7 @@ fn test_parse_image() {
                     assert_eq!(img.alt, "Alt text");
                     assert_eq!(img.url, "/path/to/image.png");
                 }
-                _ => panic!("expected image, got {:?}", &p.children[0]),
+                _ => panic!("expected image, got {:?}", p.children[0]),
             }
         }
         _ => panic!("expected paragraph"),
@@ -59,7 +59,7 @@ fn indented_heading_like_text_does_not_loop() {
     assert!(
         matches!(&doc.children[0], Node::Paragraph(_)),
         "expected leading-indented `#` to parse as paragraph text, got {:?}",
-        &doc.children[0]
+        doc.children[0]
     );
 }
 
@@ -168,7 +168,7 @@ fn test_parse_table() {
         Node::Table(t) => {
             assert_eq!(t.children.len(), 2); // header + 1 body row
         }
-        _ => panic!("expected table, got {:?}", &doc.children[0]),
+        _ => panic!("expected table, got {:?}", doc.children[0]),
     }
 }
 
@@ -184,7 +184,7 @@ fn test_parse_unordered_list() {
             assert!(!list.ordered);
             assert_eq!(list.children.len(), 3);
         }
-        _ => panic!("expected list, got {:?}", &doc.children[0]),
+        _ => panic!("expected list, got {:?}", doc.children[0]),
     }
 }
 
@@ -200,7 +200,7 @@ fn test_parse_ordered_list() {
             assert!(list.ordered);
             assert_eq!(list.children.len(), 3);
         }
-        _ => panic!("expected list, got {:?}", &doc.children[0]),
+        _ => panic!("expected list, got {:?}", doc.children[0]),
     }
 }
 
@@ -214,7 +214,7 @@ fn test_parse_block_quote() {
             assert_eq!(bq.children.len(), 1);
             assert!(matches!(&bq.children[0], Node::Paragraph(_)));
         }
-        _ => panic!("expected block quote, got {:?}", &doc.children[0]),
+        _ => panic!("expected block quote, got {:?}", doc.children[0]),
     }
 }
 
@@ -227,7 +227,7 @@ fn test_parse_block_quote_multiline() {
         Node::BlockQuote(bq) => {
             assert_eq!(bq.children.len(), 1);
         }
-        _ => panic!("expected block quote, got {:?}", &doc.children[0]),
+        _ => panic!("expected block quote, got {:?}", doc.children[0]),
     }
 }
 
@@ -241,6 +241,6 @@ fn test_parse_nested_block_quote() {
             assert_eq!(bq.children.len(), 1);
             assert!(matches!(&bq.children[0], Node::BlockQuote(_)));
         }
-        _ => panic!("expected block quote, got {:?}", &doc.children[0]),
+        _ => panic!("expected block quote, got {:?}", doc.children[0]),
     }
 }

crates/ox_content_renderer/src/html/renderer/links.rs

@@ -72,7 +72,11 @@ impl HtmlRenderer {
                             continue;
                         };
                         let value = &html[value_start..value_end];
-                        if let Some(rewritten) = self.apply_base_to_root_absolute_url(value) {
+                        // Raw anchors link pages the same way Markdown links
+                        // do; convert .md targets first, then fall back to
+                        // rebasing root-absolute URLs.
+                        let rewritten = self.convert_markdown_url(value);
+                        if let Some(rewritten) = rewritten {
                             output.push_str(&html[i..value_start]);
                             output.push_str(&rewritten);
                             i = value_end;
@@ -132,6 +136,9 @@ impl HtmlRenderer {
             let base = &self.options.base_url;
             if path_without_slash.is_empty() || path_without_slash == "index" {
                 join2(base, "index.html")
+            } else if let Some(dir) = path_without_slash.strip_suffix("/index") {
+                // /lib/index.md names the lib/ directory page
+                join3(base, dir, "/index.html")
             } else {
                 join3(base, path_without_slash, "/index.html")
             }
@@ -141,6 +148,13 @@ impl HtmlRenderer {
             if name == "index" {
                 // ./index.md -> ./index.html (stay in same directory)
                 "./index.html".to_string()
+            } else if let Some(dir) = name.strip_suffix("/index") {
+                // ./lib/index.md names the lib/ directory page
+                if source_is_index {
+                    join3("./", dir, "/index.html")
+                } else {
+                    join3("../", dir, "/index.html")
+                }
             } else if source_is_index {
                 // Source is index.md, so we're at directory level
                 // ./types.md -> ./types/index.html
@@ -157,8 +171,9 @@ impl HtmlRenderer {
             if source_is_index {
                 // Source is index.md at directory level
                 // ../types.md -> ../types/index.html
-                if rest == "index" || rest.ends_with("/index") {
-                    let dir = rest.trim_end_matches("/index").trim_end_matches("index");
+                if let Some(dir) =
+                    rest.strip_suffix("/index").or_else(|| (rest == "index").then_some(""))
+                {
                     if dir.is_empty() {
                         "../index.html".to_string()
                     } else {
@@ -170,8 +185,9 @@ impl HtmlRenderer {
             } else {
                 // Source is not index.md, need extra ../
                 // ../types.md -> ../../types/index.html
-                if rest == "index" || rest.ends_with("/index") {
-                    let dir = rest.trim_end_matches("/index").trim_end_matches("index");
+                if let Some(dir) =
+                    rest.strip_suffix("/index").or_else(|| (rest == "index").then_some(""))
+                {
                     if dir.is_empty() {
                         "../../index.html".to_string()
                     } else {
@@ -183,8 +199,10 @@ impl HtmlRenderer {
             }
         } else {
             // Plain relative path: types.md
-            if path_without_ext == "index" || path_without_ext.ends_with("/index") {
-                let dir = path_without_ext.trim_end_matches("/index").trim_end_matches("index");
+            if let Some(dir) = path_without_ext
+                .strip_suffix("/index")
+                .or_else(|| (path_without_ext == "index").then_some(""))
+            {
                 if dir.is_empty() {
                     "./index.html".to_string()
                 } else if source_is_index {

crates/ox_content_renderer/src/html/tests/links.rs

@@ -94,3 +94,74 @@ fn test_convert_md_link_parent_relative_from_non_index() {
     let html = renderer.render(&doc);
     insta::assert_snapshot!(html);
 }
+
+#[test]
+fn test_convert_md_link_to_child_index_file() {
+    // A link to a directory's index page (./lib/index.md) names the directory
+    // page itself — it must become ./lib/index.html, never ./lib/index/index.html
+    // (a page that does not exist in the output tree). Same for absolute links.
+    let allocator = Allocator::new();
+    let doc =
+        Parser::new(&allocator, "[Lib](./lib/index.md) [Abs](/lib/index.md)").parse().unwrap();
+    let mut renderer = HtmlRenderer::with_options(HtmlRendererOptions {
+        convert_md_links: true,
+        base_url: "/".to_string(),
+        source_path: "api/index.md".to_string(),
+        ..Default::default()
+    });
+    let html = renderer.render(&doc);
+    insta::assert_snapshot!(html);
+}
+
+#[test]
+fn test_convert_md_link_to_sibling_dir_index_from_non_index() {
+    // From a non-index page, ./lib/index.md resolves one level up like every
+    // other ./ link, then collapses the index segment.
+    let allocator = Allocator::new();
+    let doc = Parser::new(&allocator, "[Lib](./lib/index.md)").parse().unwrap();
+    let mut renderer = HtmlRenderer::with_options(HtmlRendererOptions {
+        convert_md_links: true,
+        base_url: "/".to_string(),
+        source_path: "api/types.md".to_string(),
+        ..Default::default()
+    });
+    let html = renderer.render(&doc);
+    insta::assert_snapshot!(html);
+}
+
+#[test]
+fn test_convert_md_link_removes_only_the_final_index_segment() {
+    let allocator = Allocator::new();
+    let doc = Parser::new(&allocator, "[Plain](a/index/index.md) [Parent](../a/index/index.md)")
+        .parse()
+        .unwrap();
+    let mut renderer = HtmlRenderer::with_options(HtmlRendererOptions {
+        convert_md_links: true,
+        base_url: "/".to_string(),
+        source_path: "api/types.md".to_string(),
+        ..Default::default()
+    });
+    let html = renderer.render(&doc);
+    insta::assert_snapshot!(html);
+}
+
+#[test]
+fn test_convert_md_href_inside_raw_html_anchor() {
+    // The docs generator emits raw <a href="X.md"> anchors alongside Markdown
+    // links; both must be converted or the raw ones 404 in the output tree.
+    let allocator = Allocator::new();
+    let doc = Parser::new(
+        &allocator,
+        "<a class=\"x\" href=\"../type-aliases/CounterOptions.md\">CounterOptions</a>",
+    )
+    .parse()
+    .unwrap();
+    let mut renderer = HtmlRenderer::with_options(HtmlRendererOptions {
+        convert_md_links: true,
+        base_url: "/".to_string(),
+        source_path: "lib/functions/createCounter.md".to_string(),
+        ..Default::default()
+    });
+    let html = renderer.render(&doc);
+    insta::assert_snapshot!(html);
+}

crates/ox_content_renderer/src/html/tests/snapshots/ox_content_renderer__html__tests__links__convert_md_href_inside_raw_html_anchor.snap

@@ -0,0 +1,6 @@
+---
+source: crates/ox_content_renderer/src/html/tests/links.rs
+assertion_line: 149
+expression: html
+---
+<p><a class="x" href="../../type-aliases/CounterOptions/index.html">CounterOptions</a></p>

crates/ox_content_renderer/src/html/tests/snapshots/ox_content_renderer__html__tests__links__convert_md_link_removes_only_the_final_index_segment.snap

@@ -0,0 +1,5 @@
+---
+source: crates/ox_content_renderer/src/html/tests/links.rs
+expression: html
+---
+<p><a href="../a/index/index.html">Plain</a> <a href="../../a/index/index.html">Parent</a></p>

crates/ox_content_renderer/src/html/tests/snapshots/ox_content_renderer__html__tests__links__convert_md_link_to_child_index_file.snap

@@ -0,0 +1,6 @@
+---
+source: crates/ox_content_renderer/src/html/tests/links.rs
+assertion_line: 112
+expression: html
+---
+<p><a href="./lib/index.html">Lib</a> <a href="/lib/index.html">Abs</a></p>

crates/ox_content_renderer/src/html/tests/snapshots/ox_content_renderer__html__tests__links__convert_md_link_to_sibling_dir_index_from_non_index.snap

@@ -0,0 +1,6 @@
+---
+source: crates/ox_content_renderer/src/html/tests/links.rs
+assertion_line: 128
+expression: html
+---
+<p><a href="../lib/index.html">Lib</a></p>