fix(ids): more on dl ids

Author: fiji-flo

Diff for: crates/diff-test/src/main.rs

@@ -160,7 +160,17 @@ fn is_html(s: &str) -> bool {
     s.starts_with('<') && s.ends_with('>')
 }
 
-const IGNORE: &[&str] = &["doc.flaws", "blogMeta.readTime"];
+const IGNORE: &[&str] = &[
+    "doc.flaws",
+    "blogMeta.readTime",
+    "doc.modified",
+    "doc.popularity",
+    "doc.source.github_url",
+    "doc.source.last_commit_url",
+    "doc.sidebarHTML",
+];
+
+static LOWER_CASE: &[&str] = &[];
 static WS_DIFF: Lazy<Regex> = Lazy::new(|| Regex::new(r#"(?<x>>)[\n ]+|[\n ]+(?<y></)"#).unwrap());
 
 fn full_diff(lhs: &Value, rhs: &Value, path: &[PathIndex], diff: &mut BTreeMap<String, String>) {
@@ -203,12 +213,23 @@ fn full_diff(lhs: &Value, rhs: &Value, path: &[PathIndex], diff: &mut BTreeMap<S
             (Value::String(lhs), Value::String(rhs)) => {
                 let mut lhs = lhs.to_owned();
                 let mut rhs = rhs.to_owned();
+                let key = make_key(path);
+                match key.as_str() {
+                    "doc.sidebarMacro" => {
+                        lhs = lhs.to_lowercase();
+                        rhs = rhs.to_lowercase();
+                    }
+                    "doc.summary" => {
+                        lhs = lhs.replace("\n  ", "\n");
+                        rhs = rhs.replace("\n  ", "\n");
+                    }
+                    _ => {}
+                };
                 if is_html(&lhs) && is_html(&rhs) {
                     lhs = html_minifier::minify(WS_DIFF.replace_all(&lhs, "$x$y")).unwrap();
                     rhs = html_minifier::minify(WS_DIFF.replace_all(&rhs, "$x$y")).unwrap();
                 }
                 if lhs != rhs {
-                    let key = make_key(path);
                     if IGNORE.contains(&key.as_str()) {
                         return;
                     }

Diff for: crates/rari-doc/src/html/rewriter.rs

@@ -117,10 +117,13 @@ pub fn post_process_html<T: PageLike>(
             el.remove_attribute("data-add-link");
             if let Some(id) = el.get_attribute("id") {
                 el.prepend(&format!("<a href=\"#{id}\">"), ContentType::Html);
-                el.append("</a>", ContentType::Html);
             }
             Ok(())
         }),
+        element!("dt[data-add-link] *:first-child", |el| {
+            el.append("</a>", ContentType::Html);
+            Ok(())
+        }),
         element!("pre[class*=brush]:not(.hidden)", |el| {
             let class = el.get_attribute("class");
             let class = class.as_deref().unwrap_or_default();

Diff for: crates/rari-doc/src/templ/api.rs

@@ -74,7 +74,7 @@ impl RariApi {
     }
 
     pub fn interactive_examples_base_url() -> &'static str {
-        "https://interactive-examples.mdn.mozilla.net/"
+        &settings().interactive_examples_base_url
     }
 
     pub fn link(

Diff for: crates/rari-doc/src/templ/macros/badges.rs

@@ -24,6 +24,14 @@ pub fn deprecated() -> Result<String, DocError> {
     Ok(out)
 }
 
+#[rari_f]
+pub fn optional() -> Result<String, DocError> {
+    let str = rari_l10n::l10n("optional", env.locale);
+    Ok(format!(
+        r#"<span class="badge inline optional">{str}</span>"#
+    ))
+}
+
 pub fn write_experimental(out: &mut impl std::fmt::Write, locale: Locale) -> std::fmt::Result {
     let title = rari_l10n::l10n("experimental_badge_title", locale);
     let abbreviation = rari_l10n::l10n("experimental_badge_abbreviation", locale);

Diff for: crates/rari-doc/src/templ/macros/embedinteractiveexample.rs

@@ -14,7 +14,7 @@ use crate::templ::api::RariApi;
 #[rari_f]
 pub fn embed_interactive_example(path: String, height: Option<String>) -> Result<String, DocError> {
     let title = l10n("interactive_example_cta", env.locale);
-    let url = format!("{}{path}", RariApi::interactive_examples_base_url());
+    let url = format!("{}/{path}", RariApi::interactive_examples_base_url());
     let height_class = match height.as_deref() {
         h @ Some("shorter" | "taller" | "tabbed-shorter" | "tabbed-standard" | "tabbed-taller") => {
             h.unwrap()

Diff for: crates/rari-doc/src/templ/macros/mod.rs

@@ -31,6 +31,7 @@ pub fn invoke(env: &RariEnv, ident: &str, args: Vec<Option<Arg>>) -> Result<Stri
         "experimentalbadge" | "experimental_inline" => badges::experimental_any,
         "nonstandardbadge" | "non-standard_inline" => badges::non_standard_any,
         "deprecated_inline" => badges::deprecated_any,
+        "optional_inline" => badges::optional_any,
 
         // links
         "jsxref" => jsxref::jsxref_any,

Diff for: crates/rari-l10n/src/lib.rs

@@ -72,6 +72,16 @@ pub fn l10n(key: &str, locale: Locale) -> &'static str {
             Locale::ZhTw => "嘗試一下",
         },
 
+        "optional" => match locale {
+            Locale::Fr => "Facultatif",
+            Locale::Ja => "省略可",
+            Locale::Ru => "Необязательный",
+            Locale::ZhCn => "可选",
+            Locale::ZhTw => "選擇性",
+            Locale::Es => "Opcional",
+            Locale::EnUs | _ => "Optional",
+        },
+
         _ => "l10n missing",
     }
 }

Diff for: crates/rari-md/src/html.rs

@@ -473,6 +473,21 @@ impl<'o> HtmlFormatter<'o> {
         }
     }
 
+    fn collect_first_child_text<'a>(node: &'a AstNode<'a>, output: &mut Vec<u8>) {
+        if let Some(child) = node.children().next() {
+            if matches!(child.data.borrow().value, NodeValue::Paragraph) {
+                if let Some(child) = child.children().next() {
+                    if !matches!(child.data.borrow().value, NodeValue::HtmlInline(_)) {
+                        return Self::collect_text(child, output);
+                    }
+                }
+            }
+            Self::collect_text(child, output)
+        } else {
+            Self::collect_text(node, output)
+        }
+    }
+
     fn next_is_link<'a>(node: &'a AstNode<'a>) -> bool {
         if let Some(child) = node.children().next() {
             if matches!(child.data.borrow().value, NodeValue::Link(_)) {
@@ -587,7 +602,7 @@ impl<'o> HtmlFormatter<'o> {
                 if entering {
                     self.cr()?;
                     let mut text_content = Vec::with_capacity(20);
-                    Self::collect_text(node, &mut text_content);
+                    Self::collect_first_child_text(node, &mut text_content);
                     let mut id = String::from_utf8(text_content).unwrap();
                     id = self.anchorizer.anchorize(id);
                     write!(self.output, "<dt id=\"{}\"", id)?;

Diff for: crates/rari-types/src/settings.rs

@@ -16,6 +16,7 @@ pub struct Settings {
     pub base_url: String,
     pub live_samples_base_url: String,
     pub legacy_live_samples_base_url: String,
+    pub interactive_examples_base_url: String,
 }
 
 impl Settings {